:whale: 将 itemId 改为 itemTypeId ，避免理解上的分歧

logic/bag-logic/src/main/java/com/iohao/mmo/bag/action/ItemAction.java

@@ -21,10 +21,10 @@ package com.iohao.mmo.bag.action;
 import com.iohao.game.action.skeleton.annotation.ActionController;
 import com.iohao.game.action.skeleton.annotation.ActionMethod;
 import com.iohao.mmo.bag.cmd.ItemCmd;
-import com.iohao.mmo.bag.entity.ItemConfig;
+import com.iohao.mmo.bag.entity.ItemTypeConfig;
 import com.iohao.mmo.bag.mapper.ItemMapper;
 import com.iohao.mmo.bag.proto.ItemMessage;
-import com.iohao.mmo.bag.region.ItemConfigRegion;
+import com.iohao.mmo.bag.region.ItemTypeConfigRegion;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
@@ -48,7 +48,7 @@ public class ItemAction {
      */
     @ActionMethod(ItemCmd.listItem)
     public List<ItemMessage> listItem() {
-        Collection<ItemConfig> values = ItemConfigRegion.values();
+        Collection<ItemTypeConfig> values = ItemTypeConfigRegion.values();
         return ItemMapper.ME.convert(values);
     }
 }

logic/bag-logic/src/main/java/com/iohao/mmo/bag/config/ItemCommandLineRunner.java

@@ -18,9 +18,9 @@
  */
 package com.iohao.mmo.bag.config;
 
-import com.iohao.mmo.bag.ItemIdConst;
-import com.iohao.mmo.bag.entity.ItemConfig;
-import com.iohao.mmo.bag.region.ItemConfigRegion;
+import com.iohao.mmo.bag.ItemTypeIdConst;
+import com.iohao.mmo.bag.entity.ItemTypeConfig;
+import com.iohao.mmo.bag.region.ItemTypeConfigRegion;
 import com.iohao.mmo.bag.region.UseRegion;
 import com.iohao.mmo.bag.region.internal.DefaultUseProcess;
 import com.iohao.mmo.bag.region.internal.equip.BuildEquipUseProcess;
@@ -48,44 +48,44 @@ public class ItemCommandLineRunner implements CommandLineRunner {
 
     @Override
     public void run(String... args) {
-        List<ItemConfig> itemConfigs = initConfigExcel();
-        itemConfigs.forEach(ItemConfigRegion::addItemConfig);
+        List<ItemTypeConfig> itemTypeConfigs = initConfigExcel();
+        itemTypeConfigs.forEach(ItemTypeConfigRegion::addItemTypeConfig);
 
         useRegion.addUseProcess(defaultUseProcess);
         useRegion.addUseProcess(buildEquipUseProcess);
     }
 
-    private List<ItemConfig> initConfigExcel() {
+    private List<ItemTypeConfig> initConfigExcel() {
 
-        List<ItemConfig> configList = new ArrayList<>();
-        ItemConfig config = new ItemConfig();
+        List<ItemTypeConfig> configList = new ArrayList<>();
+        ItemTypeConfig config = new ItemTypeConfig();
         configList.add(config);
 
-        config.setItemId(ItemIdConst.expId);
+        config.setItemTypeId(ItemTypeIdConst.expId);
         config.setName("经验值道具");
         config.setDescription("增加经验值");
 
-        config = new ItemConfig();
+        config = new ItemTypeConfig();
         configList.add(config);
-        config.setItemId(ItemIdConst.hpId);
+        config.setItemTypeId(ItemTypeIdConst.hpId);
         config.setName("气血药");
         config.setDescription("增加气血值");
 
-        config = new ItemConfig();
+        config = new ItemTypeConfig();
         configList.add(config);
-        config.setItemId(ItemIdConst.equipWeaponBook10);
+        config.setItemTypeId(ItemTypeIdConst.equipWeaponBook10);
         config.setName("10级-武器书");
         config.setDescription("装备制造书");
 
-        config = new ItemConfig();
+        config = new ItemTypeConfig();
         configList.add(config);
-        config.setItemId(ItemIdConst.iron10);
+        config.setItemTypeId(ItemTypeIdConst.iron10);
         config.setName("10级-铁");
         config.setDescription("合成装备的精铁");
 
-        config = new ItemConfig();
+        config = new ItemTypeConfig();
         configList.add(config);
-        config.setItemId(ItemIdConst.equipWeapon10);
+        config.setItemTypeId(ItemTypeIdConst.equipWeapon10);
         config.setName("10级-飞龙在天");
         config.setDescription("赵云的私房枪之一，因害怕被张飞拿错，而一直放在房内！");
         // 临时配置

logic/bag-logic/src/main/java/com/iohao/mmo/bag/entity/BagItem.java

@@ -42,18 +42,18 @@ public class BagItem {
     /**
      * 背包物品 id
      * <pre>
-     *     如果 id 与 itemId 一致
+     *     如果 id 与 itemTypeId 一致
      *     表示物品可叠加，比如一些药品可叠加存放
      *
-     *     如果 id 与 itemId 不一致
+     *     如果 id 与 itemTypeId 不一致
      *     表示物品不可叠加，每一件物品都需要分开存放；
      *     比如，装备、品质不同的药品等。
      * </pre>
      */
     @Id
     String id;
-    /** 物品 id */
-    String itemId;
+    /** 物品类型 id */
+    String itemTypeId;
     /** 物品数量 */
     int quantity;
 
@@ -67,6 +67,6 @@ public class BagItem {
      * @return true 表示类似仓库，物品可以叠加存放
      */
     public boolean isStash() {
-        return Objects.equals(id, itemId);
+        return Objects.equals(id, itemTypeId);
     }
 }

logic/bag-logic/src/main/java/com/iohao/mmo/bag/entity/ItemConfig.java → logic/bag-logic/src/main/java/com/iohao/mmo/bag/entity/ItemTypeConfig.java

@@ -33,9 +33,9 @@ import org.springframework.data.mongodb.core.mapping.Document;
 @Document
 @Accessors(chain = true)
 @FieldDefaults(level = AccessLevel.PRIVATE)
-public class ItemConfig {
+public class ItemTypeConfig {
     @Id
-    String itemId;
+    String itemTypeId;
     /** 物品名 */
     String name;
     /** 物品描述 */

logic/bag-logic/src/main/java/com/iohao/mmo/bag/mapper/ItemMapper.java

@@ -18,7 +18,7 @@
  */
 package com.iohao.mmo.bag.mapper;
 
-import com.iohao.mmo.bag.entity.ItemConfig;
+import com.iohao.mmo.bag.entity.ItemTypeConfig;
 import com.iohao.mmo.bag.proto.ItemMessage;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
@@ -34,7 +34,7 @@ import java.util.List;
 public interface ItemMapper {
     ItemMapper ME = Mappers.getMapper(ItemMapper.class);
 
-    ItemMessage convert(ItemConfig itemConfig);
+    ItemMessage convert(ItemTypeConfig itemTypeConfig);
 
-    List<ItemMessage> convert(Collection<ItemConfig> itemConfigs);
+    List<ItemMessage> convert(Collection<ItemTypeConfig> itemTypeConfigs);
 }

logic/bag-logic/src/main/java/com/iohao/mmo/bag/mapper/UseItemMapper.java

@@ -55,7 +55,7 @@ public interface UseItemMapper {
         Map<String, UseItemPOJO> map = new HashMap<>();
         for (UseItemMessage useItem : useItems) {
             UseItemPOJO convert = convert(useItem);
-            map.put(useItem.itemId, convert);
+            map.put(useItem.itemTypeId, convert);
         }
 
         return map;

logic/bag-logic/src/main/java/com/iohao/mmo/bag/pojo/UseItemPOJO.java

@@ -31,8 +31,8 @@ import lombok.experimental.FieldDefaults;
 public class UseItemPOJO {
     /** 背包物品 id */
     String id;
-    /** 物品 id */
-    String itemId;
+    /** 物品类型 id */
+    String itemTypeId;
     /** 使用数量 */
     int quantity;
 }

logic/bag-logic/src/main/java/com/iohao/mmo/bag/pojo/UsePOJO.java

@@ -36,7 +36,7 @@ public class UsePOJO {
     /**
      * 使用项
      * <pre>
-     *     key 为 itemId；
+     *     key 为 itemTypeId；
      *     比如我们在强化某个装备时，通常是需要两个物品
      *     1 强化符
      *     2 需要强化的装备

logic/bag-logic/src/main/java/com/iohao/mmo/bag/region/ItemConfigRegion.java → logic/bag-logic/src/main/java/com/iohao/mmo/bag/region/ItemTypeConfigRegion.java

@@ -18,7 +18,7 @@
  */
 package com.iohao.mmo.bag.region;
 
-import com.iohao.mmo.bag.entity.ItemConfig;
+import com.iohao.mmo.bag.entity.ItemTypeConfig;
 import lombok.NonNull;
 import lombok.experimental.UtilityClass;
 
@@ -31,23 +31,23 @@ import java.util.Map;
  * @date 2023-08-06
  */
 @UtilityClass
-public class ItemConfigRegion {
+public class ItemTypeConfigRegion {
 
-    private final Map<String, ItemConfig> map = new HashMap<>();
+    private final Map<String, ItemTypeConfig> map = new HashMap<>();
 
-    public void addItemConfig(@NonNull ItemConfig itemConfig) {
-        map.put(itemConfig.getItemId(), itemConfig);
+    public void addItemTypeConfig(@NonNull ItemTypeConfig itemTypeConfig) {
+        map.put(itemTypeConfig.getItemTypeId(), itemTypeConfig);
     }
 
-    public boolean contains(String itemId) {
-        return map.containsKey(itemId);
+    public boolean contains(String itemTypeId) {
+        return map.containsKey(itemTypeId);
     }
 
-    public ItemConfig getItemConfig(String itemId) {
-        return map.get(itemId);
+    public ItemTypeConfig getItemTypeConfig(String itemTypeId) {
+        return map.get(itemTypeId);
     }
 
-    public Collection<ItemConfig> values() {
+    public Collection<ItemTypeConfig> values() {
         return map.values();
     }
 }

logic/bag-logic/src/main/java/com/iohao/mmo/bag/region/internal/DefaultUseProcess.java

@@ -20,7 +20,7 @@ package com.iohao.mmo.bag.region.internal;
 
 import com.iohao.game.action.skeleton.core.exception.ActionErrorEnum;
 import com.iohao.game.action.skeleton.core.flow.FlowContext;
-import com.iohao.mmo.bag.ItemIdConst;
+import com.iohao.mmo.bag.ItemTypeIdConst;
 import com.iohao.mmo.bag.entity.BagItem;
 import com.iohao.mmo.bag.mapper.UseItemMapper;
 import com.iohao.mmo.bag.pojo.UseItemPOJO;
@@ -81,8 +81,8 @@ public class DefaultUseProcess implements UseProcess {
          * 由于我们第一阶段的道具内容并不多，使用 if 这样的代码，对于新手来说也更好理解。
          */
 
-        String itemId = useItem.itemId;
-        if (ItemIdConst.expId.equals(itemId)) {
+        String itemTypeId = useItem.itemTypeId;
+        if (ItemTypeIdConst.expId.equals(itemTypeId)) {
             extractedExp(useItem, flowContext);
             return;
         }

logic/bag-logic/src/main/java/com/iohao/mmo/bag/region/internal/equip/BuildEquipParse.java

@@ -20,7 +20,7 @@ package com.iohao.mmo.bag.region.internal.equip;
 
 import com.iohao.game.action.skeleton.core.exception.ActionErrorEnum;
 import com.iohao.game.external.client.kit.SplitParam;
-import com.iohao.mmo.bag.ItemIdTypeConst;
+import com.iohao.mmo.bag.ItemTypeConst;
 import com.iohao.mmo.bag.pojo.UseItemPOJO;
 import com.iohao.mmo.common.config.GameCode;
 import lombok.AccessLevel;
@@ -44,9 +44,9 @@ class BuildEquipParse {
         for (Map.Entry<String, UseItemPOJO> entry : useItemMap.entrySet()) {
             UseItemPOJO value = entry.getValue();
             // 物品 id
-            String itemId = value.itemId;
+            String itemTypeId = value.itemTypeId;
 
-            var param = new BuildParam(itemId, value);
+            var param = new BuildParam(itemTypeId, value);
             paramMap.put(param.getItemType(), param);
         }
     }
@@ -89,7 +89,7 @@ class BuildEquipParse {
      */
     BuildParam getEquipBuildParam() {
         // 得到装备
-        return paramMap.get(ItemIdTypeConst.equip);
+        return paramMap.get(ItemTypeConst.equip);
     }
 
     /**
@@ -99,7 +99,7 @@ class BuildEquipParse {
      */
     BuildParam getIronBuildParam() {
         // 得到装备制造材料 - 铁
-        return paramMap.get(ItemIdTypeConst.iron);
+        return paramMap.get(ItemTypeConst.iron);
     }
 
     @Getter
@@ -107,8 +107,8 @@ class BuildEquipParse {
     static class BuildParam extends SplitParam {
         final UseItemPOJO useItem;
 
-        public BuildParam(String itemId, UseItemPOJO useItem) {
-            super(itemId, "_");
+        public BuildParam(String itemTypeId, UseItemPOJO useItem) {
+            super(itemTypeId, "_");
             this.useItem = useItem;
         }
 
@@ -126,9 +126,9 @@ class BuildEquipParse {
             return this.getSplit().length;
         }
 
-        String getEquipItemId() {
-            String itemId = useItem.itemId;
-            return itemId.replace("book_", "");
+        String getEquipItemTypeId() {
+            String itemTypeId = useItem.itemTypeId;
+            return itemTypeId.replace("book_", "");
         }
     }
 }

logic/bag-logic/src/main/java/com/iohao/mmo/bag/region/internal/equip/BuildEquipUseProcess.java

@@ -92,18 +92,19 @@ public class BuildEquipUseProcess implements UseProcess {
     }
 
     private BagItem createEquip(BuildEquipParse.BuildParam buildParam, FlowContext flowContext) {
-        // 得到对应装备的 itemId
-        String equipItemId = buildParam.getEquipItemId();
+        // 得到对应装备的 itemTypeId
+        String equipItemTypeId = buildParam.getEquipItemTypeId();
+
         CreateEquipMessage createEquipMessage = new CreateEquipMessage();
-        createEquipMessage.itemId = equipItemId; // TODO 这里应该取装备库表（EquipTemplate）的itemId传入
-        createEquipMessage.itemId = "5B17184CDDDBB285018E8DC8";
+        createEquipMessage.itemTypeId = equipItemTypeId;
+
         NewEquipMessage newEquipMessage = EquipExchange.createEquip(createEquipMessage, flowContext);
+        String equipId = newEquipMessage.equipId;
 
         // 将新装备放到背包中
-        String equipId = newEquipMessage.equipId;
         BagItem bagItem = new BagItem();
         bagItem.setId(equipId);
-        bagItem.setItemId(equipItemId);
+        bagItem.setItemTypeId(equipItemTypeId);
         bagItem.setQuantity(1);
 
         return bagItem;

logic/bag-logic/src/main/java/com/iohao/mmo/bag/service/BagService.java

@@ -59,7 +59,7 @@ public class BagService {
         // merge 让多个相同的物品做整合
         Map<String, BagItem> bagItemMessageMap = new HashMap<>();
         incrementItems.forEach(incrementItem -> {
-            String key = incrementItem.getItemId();
+            String key = incrementItem.getItemTypeId();
             BagItem bagItem = bagItemMessageMap.get(key);
             if (Objects.isNull(bagItem)) {
                 bagItemMessageMap.put(key, incrementItem);

logic/equip-logic/src/main/java/com/iohao/mmo/equip/action/EquipAction.java

@@ -7,7 +7,6 @@ import com.iohao.game.action.skeleton.protocol.wrapper.StringValue;
 import com.iohao.mmo.common.config.GameCode;
 import com.iohao.mmo.equip.cmd.EquipCmd;
 import com.iohao.mmo.equip.entity.Equip;
-import com.iohao.mmo.equip.entity.EquipTemplate;
 import com.iohao.mmo.equip.mapper.EquipMapper;
 import com.iohao.mmo.equip.proto.CreateEquipMessage;
 import com.iohao.mmo.equip.proto.EquipMessage;
@@ -18,11 +17,9 @@ import com.iohao.mmo.equip.service.EquipTemplateService;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.bson.types.ObjectId;
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
-import java.time.LocalTime;
 import java.util.Arrays;
 import java.util.List;
 
@@ -103,7 +100,7 @@ public class EquipAction {
         // 玩家
         long userId = flowContext.getUserId();
 
-        Equip equip = equipTemplateService.randomEquip(createEquipMessage.itemId,BigDecimal.valueOf(createEquipMessage.excellentRate),userId);
+        Equip equip = equipTemplateService.randomEquip(createEquipMessage.itemTypeId, BigDecimal.valueOf(createEquipMessage.excellentRate), userId);
 
         /*
          * 将新装备信息给到调用方，
@@ -112,7 +109,7 @@ public class EquipAction {
 
         NewEquipMessage newEquipMessage = new NewEquipMessage();
         newEquipMessage.equipId = equip.getId();
-        newEquipMessage.itemId = equip.getItemId();
+        newEquipMessage.itemTypeId = equip.getItemId();
 
         return newEquipMessage;
     }

logic/mail-logic/src/main/java/com/iohao/mmo/mail/entity/MailAttachment.java

@@ -36,8 +36,8 @@ import org.springframework.data.mongodb.core.mapping.Document;
 public class MailAttachment {
     @Id
     String id;
-    /** 物品 id */
-    String itemId;
+    /** 物品类型 id */
+    String itemTypeId;
     /** 物品数量 */
     int quantity;
 }

logic/mail-logic/src/main/java/com/iohao/mmo/mail/mapper/MailAttachmentMapper.java

@@ -34,7 +34,7 @@ import java.util.List;
 public interface MailAttachmentMapper {
     MailAttachmentMapper ME = Mappers.getMapper(MailAttachmentMapper.class);
 
-    @Mapping(source = "itemId", target = "id")
+    @Mapping(source = "getItemTypeId", target = "id")
     BagItemMessage convert(MailAttachment mailAttachment);
 
     List<BagItemMessage> convertBagItems(List<MailAttachment> mailAttachments);

provide/bag-provide/src/main/java/com/iohao/mmo/bag/ItemIdTypeConst.java → provide/bag-provide/src/main/java/com/iohao/mmo/bag/ItemTypeConst.java

@@ -24,7 +24,7 @@ package com.iohao.mmo.bag;
  * @author 渔民小镇
  * @date 2023-08-08
  */
-public interface ItemIdTypeConst {
+public interface ItemTypeConst {
     String equip = "equip";
     String iron = "iron";
 }

provide/bag-provide/src/main/java/com/iohao/mmo/bag/ItemIdConst.java → provide/bag-provide/src/main/java/com/iohao/mmo/bag/ItemTypeIdConst.java

@@ -19,19 +19,19 @@
 package com.iohao.mmo.bag;
 
 /**
- * 物品 id - itemId
+ * 物品类型 id - itemTypeId
  *
  * @author 渔民小镇
  * @date 2023-08-06
  */
-public interface ItemIdConst {
+public interface ItemTypeIdConst {
     String expId = "exp";
     String hpId = "hp";
     /** 装备 - 武器书 - 10 级 */
-    String equipWeaponBook10 = ItemIdTypeConst.equip + "_weapon_book_10";
+    String equipWeaponBook10 = ItemTypeConst.equip + "_weapon_book_10";
     /** 铁 - 10 级 */
-    String iron10 = ItemIdTypeConst.iron + "_10";
+    String iron10 = ItemTypeConst.iron + "_10";
     /** 装备 - 武器 - 10 级 */
-    String equipWeapon10 = ItemIdTypeConst.equip + "_weapon_10";
+    String equipWeapon10 = ItemTypeConst.equip + "_weapon_10";
 
 }

provide/bag-provide/src/main/java/com/iohao/mmo/bag/client/BagInputCommandRegion.java

@@ -26,7 +26,7 @@ import com.iohao.game.external.client.AbstractInputCommandRegion;
 import com.iohao.game.external.client.command.InputRequestData;
 import com.iohao.game.external.client.kit.ScannerKit;
 import com.iohao.game.external.client.kit.SplitParam;
-import com.iohao.mmo.bag.ItemIdConst;
+import com.iohao.mmo.bag.ItemTypeIdConst;
 import com.iohao.mmo.bag.cmd.BagCmd;
 import com.iohao.mmo.bag.proto.BagItemMessage;
 import com.iohao.mmo.bag.proto.BagMessage;
@@ -69,19 +69,19 @@ public class BagInputCommandRegion extends AbstractInputCommandRegion {
 
         List<BagItemMessage> list = new ArrayList<>();
         // 添加一些经验值道具
-        BagItemMessage bagItemMessage = BagInternalHelper.ofBagItemMessage(ItemIdConst.expId);
+        BagItemMessage bagItemMessage = BagInternalHelper.ofBagItemMessage(ItemTypeIdConst.expId);
         bagItemMessage.quantity = 10;
         list.add(bagItemMessage);
         log.info("添加 {} 个经验值道具 {}", bagItemMessage.quantity, bagItemMessage);
 
         // 添加一些装备制造书材料
-        bagItemMessage = BagInternalHelper.ofBagItemMessage(ItemIdConst.equipWeaponBook10);
+        bagItemMessage = BagInternalHelper.ofBagItemMessage(ItemTypeIdConst.equipWeaponBook10);
         bagItemMessage.quantity = 1;
         list.add(bagItemMessage);
         log.info("添加 {} 【装备-武器】制造书材料 {}", bagItemMessage.quantity, bagItemMessage);
 
         // 添加一些装备制造书材料
-        bagItemMessage = BagInternalHelper.ofBagItemMessage(ItemIdConst.iron10);
+        bagItemMessage = BagInternalHelper.ofBagItemMessage(ItemTypeIdConst.iron10);
         bagItemMessage.quantity = 1;
         list.add(bagItemMessage);
         log.info("添加 {} 装备-制造材料-铁 {}", bagItemMessage.quantity, bagItemMessage);
@@ -95,9 +95,9 @@ public class BagInputCommandRegion extends AbstractInputCommandRegion {
             BagMessage value = result.getValue();
 
             List<JSONObject> list = value.itemMap.values().stream().map(bagItemMessage -> {
-                String itemId = bagItemMessage.itemId;
+                String itemTypeId = bagItemMessage.itemTypeId;
                 JSONObject bagItemMessageJson = JsonKit.toJSON(bagItemMessage);
-                JSONObject itemMessageJson = ItemKit.toJSON(itemId);
+                JSONObject itemMessageJson = ItemKit.toJSON(itemTypeId);
                 return JsonKit.merge(bagItemMessageJson, itemMessageJson);
             }).toList();
 
@@ -123,7 +123,7 @@ public class BagInputCommandRegion extends AbstractInputCommandRegion {
 
             BagItemMessage bagItemMessage = new BagItemMessage();
             bagItemMessage.id = id;
-            bagItemMessage.itemId = itemId;
+            bagItemMessage.itemTypeId = itemId;
             bagItemMessage.quantity = 1;
 
             ScannerKit.log(() -> log.info("{}", bagItemMessage));
@@ -188,15 +188,15 @@ public class BagInputCommandRegion extends AbstractInputCommandRegion {
             log.info("格式 [制造书物品id-制造铁物品id]");
         });
 
-        String defaultValue = ItemIdConst.equipWeaponBook10 + "-" + ItemIdConst.iron10;
+        String defaultValue = ItemTypeIdConst.equipWeaponBook10 + "-" + ItemTypeIdConst.iron10;
         String inputType = defaultValue;
 //         inputType = ScannerKit.nextLine(defaultValue);
         SplitParam param = new SplitParam(inputType);
 
-        String equipWeaponBook = param.getString(0, ItemIdConst.equipWeaponBook10);
+        String equipWeaponBook = param.getString(0, ItemTypeIdConst.equipWeaponBook10);
         UseItemMessage useItemMessageEquip = BagInternalHelper.ofUseItemMessage(equipWeaponBook);
 
-        String iron = param.getString(1, ItemIdConst.iron10);
+        String iron = param.getString(1, ItemTypeIdConst.iron10);
         UseItemMessage useItemMessageIron = BagInternalHelper.ofUseItemMessage(iron);
 
         return List.of(useItemMessageEquip, useItemMessageIron);

provide/bag-provide/src/main/java/com/iohao/mmo/bag/client/BagInternalHelper.java

@@ -30,18 +30,18 @@ import lombok.experimental.UtilityClass;
  */
 @UtilityClass
 class BagInternalHelper {
-    BagItemMessage ofBagItemMessage(String itemId) {
+    BagItemMessage ofBagItemMessage(String itemTypeId) {
         BagItemMessage bagItemMessage = new BagItemMessage();
-        bagItemMessage.id = itemId;
-        bagItemMessage.itemId = itemId;
+        bagItemMessage.id = itemTypeId;
+        bagItemMessage.itemTypeId = itemTypeId;
         bagItemMessage.quantity = 1;
         return bagItemMessage;
     }
 
-    UseItemMessage ofUseItemMessage(String itemId) {
+    UseItemMessage ofUseItemMessage(String itemTypeId) {
         UseItemMessage useItemMessage = new UseItemMessage();
-        useItemMessage.id = itemId;
-        useItemMessage.itemId = itemId;
+        useItemMessage.id = itemTypeId;
+        useItemMessage.itemTypeId = itemTypeId;
         useItemMessage.quantity = 1;
         return useItemMessage;
     }

provide/bag-provide/src/main/java/com/iohao/mmo/bag/client/ItemInputCommandRegion.java

@@ -39,7 +39,7 @@ public class ItemInputCommandRegion extends AbstractInputCommandRegion {
 
         ofCommand(ItemCmd.listItem).callback(ByteValueList.class, result -> {
             List<ItemMessage> list = result.toList(ItemMessage.class);
-            list.forEach(itemMessage -> ItemKit.itemNodeMap.add(itemMessage.itemId, itemMessage.name, itemMessage.description));
+            list.forEach(itemMessage -> ItemKit.itemNodeMap.add(itemMessage.itemTypeId, itemMessage.name, itemMessage.description));
         }).setDescription("物品配置列表");
     }
 

provide/bag-provide/src/main/java/com/iohao/mmo/bag/proto/BagItemMessage.java

@@ -35,8 +35,8 @@ import lombok.experimental.FieldDefaults;
 public class BagItemMessage {
     /** 背包物品 id */
     String id;
-    /** 物品 id */
-    String itemId;
+    /** 物品类型 id */
+    String itemTypeId;
     /** 物品数量 */
     int quantity;
 }

provide/bag-provide/src/main/java/com/iohao/mmo/bag/proto/ItemMessage.java

@@ -33,8 +33,8 @@ import lombok.experimental.FieldDefaults;
 @ProtobufClass
 @FieldDefaults(level = AccessLevel.PUBLIC)
 public class ItemMessage {
-    /** itemId */
-    String itemId;
+    /** 物品类型 id */
+    String itemTypeId;
     /** 物品名 */
     String name;
     /** 物品描述 */

provide/bag-provide/src/main/java/com/iohao/mmo/bag/proto/UseItemMessage.java

@@ -37,23 +37,23 @@ import java.util.Objects;
 public class UseItemMessage {
     /** 背包物品 id */
     String id;
-    /** 物品 id */
-    String itemId;
+    /** 物品类型 id */
+    String itemTypeId;
     /** 使用数量 */
     int quantity;
 
     /**
      * 数据验证
      * <pre>
-     *     id 与 itemId 相同，表示简单物品，是允许有数量的。
+     *     id 与 itemTypeId 相同，表示简单物品，是允许有数量的。
      *
-     *     当 id 与 itemId 不相同时，则只能使用 1 表示。
+     *     当 id 与 itemTypeId 不相同时，则只能使用 1 表示。
      * </pre>
      *
      * @return true 表示验证通过
      */
     public boolean verify() {
-        if (Objects.equals(id, itemId)) {
+        if (Objects.equals(id, itemTypeId)) {
             //
             return quantity > 0;
         }

provide/common-provide/src/main/java/com/iohao/mmo/common/provide/client/CommonInputCommandRegion.java

@@ -52,6 +52,6 @@ public class CommonInputCommandRegion extends AbstractInputCommandRegion {
     }
 
     ItemNode convert(ShowItemMessage showItemMessage) {
-        return new ItemNode(showItemMessage.itemId, showItemMessage.quantity);
+        return new ItemNode(showItemMessage.itemTypeId, showItemMessage.quantity);
     }
 }

provide/common-provide/src/main/java/com/iohao/mmo/common/provide/kit/ItemNodeMap.java

@@ -36,10 +36,10 @@ import java.util.Map;
 public class ItemNodeMap {
     final Map<String, TheItemInfo> map = new HashMap<>();
 
-    public void add(String itemId, String name, String description) {
-        TheItemInfo theItemInfo = new TheItemInfo(itemId, name, description);
+    public void add(String itemTypeId, String name, String description) {
+        TheItemInfo theItemInfo = new TheItemInfo(itemTypeId, name, description);
 
-        map.put(itemId, theItemInfo);
+        map.put(itemTypeId, theItemInfo);
     }
 
     public TheItemInfo getItem(String itemId) {

provide/common-provide/src/main/java/com/iohao/mmo/common/provide/proto/ShowItemMessage.java

@@ -33,8 +33,8 @@ import lombok.experimental.FieldDefaults;
 @ProtobufClass
 @FieldDefaults(level = AccessLevel.PUBLIC)
 public class ShowItemMessage {
-    /** 物品 id */
-    String itemId;
+    /** 物品类型 id */
+    String itemTypeId;
     /** 物品数量 */
     int quantity;
 }

provide/equip-provide/src/main/java/com/iohao/mmo/equip/proto/CreateEquipMessage.java

@@ -34,8 +34,8 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PUBLIC)
 public class CreateEquipMessage {
 
-    /** 打造的装备部位，这个 itemId 是系统的所有物品表 */
-    String itemId;
+    /** 打造的装备部位，这个物品类型 id 是系统的所有物品表 */
+    String itemTypeId;
     /**
      * 极品率，就是生成装备时，相对极品的概率。
      * 因为玩家可能使用更好的材料，而在装备模块的角度，是不关心使用的是什么材料

provide/equip-provide/src/main/java/com/iohao/mmo/equip/proto/NewEquipMessage.java

@@ -35,5 +35,5 @@ public class NewEquipMessage {
     /** 新装备的id */
     String equipId;
     /** 对应的物品表（装备所属部位） */
-    String itemId;
+    String itemTypeId;
 }

provide/mail-provide/src/main/java/com/iohao/mmo/mail/client/MailInputCommandRegion.java

@@ -25,7 +25,7 @@ import com.iohao.game.action.skeleton.protocol.wrapper.WrapperKit;
 import com.iohao.game.common.kit.TimeKit;
 import com.iohao.game.external.client.AbstractInputCommandRegion;
 import com.iohao.game.external.client.kit.ScannerKit;
-import com.iohao.mmo.bag.ItemIdConst;
+import com.iohao.mmo.bag.ItemTypeIdConst;
 import com.iohao.mmo.common.provide.kit.ItemKit;
 import com.iohao.mmo.common.provide.kit.ItemNode;
 import com.iohao.mmo.mail.cmd.MailCmd;
@@ -71,9 +71,9 @@ public class MailInputCommandRegion extends AbstractInputCommandRegion {
             String body = "玩家编号[%s]，系统感觉你今天很弱鸡，特意送你一些物品";
 
             InternalMailBuilder internalMailBuilder = InternalMailBuilder.newSystemMailBuilder(String.format(body, userId));
-            internalMailBuilder.addMailAttachment(ItemIdConst.expId, 2)
-                    .addMailAttachment(ItemIdConst.equipWeaponBook10, 1)
-                    .addMailAttachment(ItemIdConst.iron10, 1);
+            internalMailBuilder.addMailAttachment(ItemTypeIdConst.expId, 2)
+                    .addMailAttachment(ItemTypeIdConst.equipWeaponBook10, 1)
+                    .addMailAttachment(ItemTypeIdConst.iron10, 1);
 
             InternalMailMessage internalMailMessage = internalMailBuilder.build(userId);
             return WrapperKit.ofListByteValue(List.of(internalMailMessage));
@@ -143,7 +143,7 @@ public class MailInputCommandRegion extends AbstractInputCommandRegion {
         }
 
         ItemNode convert(MailAttachmentMessage attachmentMessage) {
-            return new ItemNode(attachmentMessage.itemId, attachmentMessage.quantity);
+            return new ItemNode(attachmentMessage.itemTypeId, attachmentMessage.quantity);
         }
     }
 }

provide/mail-provide/src/main/java/com/iohao/mmo/mail/kit/InternalMailBuilder.java

@@ -84,21 +84,21 @@ public class InternalMailBuilder {
     /**
      * 添加奖励附件
      *
-     * @param itemId   物品 id
-     * @param quantity 奖励数量
+     * @param itemTypeId 物品类型 id
+     * @param quantity   奖励数量
      * @return MailBuilder
      */
-    public InternalMailBuilder addMailAttachment(String itemId, int quantity) {
+    public InternalMailBuilder addMailAttachment(String itemTypeId, int quantity) {
 
         if (quantity < 0) {
             throw new IllegalArgumentException();
         }
 
-        Objects.requireNonNull(itemId);
+        Objects.requireNonNull(itemTypeId);
 
         MailAttachmentMessage attachmentMessage = new MailAttachmentMessage();
-        attachmentMessage.id = itemId;
-        attachmentMessage.itemId = itemId;
+        attachmentMessage.id = itemTypeId;
+        attachmentMessage.itemTypeId = itemTypeId;
         attachmentMessage.quantity = quantity;
 
         mailAttachments.add(attachmentMessage);

provide/mail-provide/src/main/java/com/iohao/mmo/mail/proto/MailAttachmentMessage.java

@@ -34,8 +34,8 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PUBLIC)
 public class MailAttachmentMessage {
     String id;
-    /** 物品 id */
-    String itemId;
+    /** 物品类型 id */
+    String itemTypeId;
     /** 物品数量 */
     int quantity;
 }