fix: 调整适配新架构

T13MAX · Oct 31, 2024 · c51fb64 · c51fb64
1 parent 73ab021
commit c51fb64
Show file tree

Hide file tree

Showing 46 changed files with 145 additions and 728 deletions.
diff --git a/common-data/pom.xml b/common-data/pom.xml
@@ -24,6 +24,16 @@
             <artifactId>common-game</artifactId>
             <version>${common-game.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.t13max.data.mongo</groupId>
+            <artifactId>t13max-data-mongo</artifactId>
+            <version>${t13max-data-mongo.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.t13max.data.redis</groupId>
+            <artifactId>t13max-data-redis</artifactId>
+            <version>${t13max-data-redis.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.xerial</groupId>

diff --git a/common-data/src/main/java/com/t13max/data/dao/DefaultRedisUtil.java b/common-data/src/main/java/com/t13max/data/dao/DefaultRedisUtil.java
diff --git a/common-data/src/main/java/com/t13max/data/dao/IRedisUtil.java b/common-data/src/main/java/com/t13max/data/dao/IRedisUtil.java
diff --git a/common-data/src/main/java/com/t13max/data/dao/MemoryRedisUtil.java b/common-data/src/main/java/com/t13max/data/dao/MemoryRedisUtil.java
diff --git a/common-data/src/main/java/com/t13max/data/dao/MongoUtil.java b/common-data/src/main/java/com/t13max/data/dao/MongoUtil.java
diff --git a/common-data/src/main/java/com/t13max/data/dao/SqlLiteUtil.java b/common-data/src/main/java/com/t13max/data/dao/SqlLiteUtil.java
@@ -1,9 +1,9 @@
 package com.t13max.data.dao;
 
+import com.t13max.common.config.BaseConfig;
+import com.t13max.common.run.Application;
 import com.t13max.data.entity.AccountData;
-import com.t13max.game.config.BaseConfig;
 import com.t13max.game.exception.DataException;
-import com.t13max.game.run.Application;
 import com.t13max.game.util.Log;
 import com.t13max.util.TextUtil;
 import lombok.experimental.UtilityClass;
@@ -18,7 +18,6 @@
  * @since: 11:10 2024/5/29
  */
 @UtilityClass
-@Deprecated
 public class SqlLiteUtil {
 
     //暂时就单链接 后续补充优化

diff --git a/common-data/src/main/java/com/t13max/data/entity/EquipData.java b/common-data/src/main/java/com/t13max/data/entity/EquipData.java
@@ -1,5 +1,6 @@
 package com.t13max.data.entity;
 
+import com.t13max.data.mongo.IData;
 import lombok.Data;
 
 /**

diff --git a/common-data/src/main/java/com/t13max/data/entity/IData.java b/common-data/src/main/java/com/t13max/data/entity/IData.java
diff --git a/common-data/src/main/java/com/t13max/data/entity/ItemData.java b/common-data/src/main/java/com/t13max/data/entity/ItemData.java
@@ -1,5 +1,6 @@
 package com.t13max.data.entity;
 
+import com.t13max.data.mongo.IData;
 import lombok.Data;
 
 import java.util.HashMap;
@@ -33,6 +34,7 @@ public ItemData(long uuid) {
      * @Author t13max
      * @Date 19:24 2024/6/4
      */
+    @Override
     public long getId() {
         return uuid;
     }

diff --git a/common-data/src/main/java/com/t13max/data/entity/RankDumpData.java b/common-data/src/main/java/com/t13max/data/entity/RankDumpData.java
@@ -1,8 +1,24 @@
 package com.t13max.data.entity;
 
+import com.t13max.data.mongo.IData;
+import lombok.Data;
+
 /**
+ * 排行榜dump数据
+ *
  * @author t13max
  * @since 17:39 2024/9/4
  */
-public class RankDumpData {
+@Data
+public class RankDumpData implements IData {
+
+    private long id;
+
+    private String rankKey;
+
+    private byte[] scoredSet;
+
+    private byte[] mapperMap;
+
+    private byte[] rankData;
 }
diff --git a/common-data/src/main/java/com/t13max/data/entity/RoleData.java b/common-data/src/main/java/com/t13max/data/entity/RoleData.java
@@ -1,13 +1,14 @@
 package com.t13max.data.entity;
 
+import com.t13max.data.mongo.IData;
 import lombok.Data;
 
 /**
  * @author: t13max
  * @since: 11:05 2024/5/24
  */
 @Data
-public class RoleData implements IData{
+public class RoleData implements IData {
 
     //所属玩家的唯一id
     private long uuid;

diff --git a/common-data/src/main/java/com/t13max/data/manager/AsyncSaveManager.java b/common-data/src/main/java/com/t13max/data/manager/AsyncSaveManager.java
diff --git a/common-data/src/main/java/com/t13max/data/util/UuidUtil.java b/common-data/src/main/java/com/t13max/data/util/UuidUtil.java
diff --git a/common-game/pom.xml b/common-game/pom.xml
@@ -30,7 +30,11 @@
             <artifactId>t13max-core</artifactId>
             <version>${t13max-core.version}</version>
         </dependency>
-
+        <dependency>
+            <groupId>com.t13max.common.rpc</groupId>
+            <artifactId>t13max-rpc</artifactId>
+            <version>${t13max-rpc.version}</version>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/common-game/src/main/java/com/t13max/game/api/IRankService.java b/common-game/src/main/java/com/t13max/game/api/IRankService.java
@@ -0,0 +1,11 @@
+package com.t13max.game.api;
+
+import com.t13max.rpc.anno.RpcInterface;
+
+/**
+ * @author t13max
+ * @since 14:24 2024/10/31
+ */
+@RpcInterface
+public interface IRankService {
+}
diff --git a/common-game/src/main/java/com/t13max/game/config/ActionConfig.java b/common-game/src/main/java/com/t13max/game/config/ActionConfig.java