Jelajahi Sumber

删除easy-trans集成

Gaokun Wang 1 bulan lalu
induk
melakukan
69b430ec80

+ 0 - 12
config/local/easy-trans.yml

@@ -1,12 +0,0 @@
-# easy-trans 配置
-easy-trans:
-  # 字典缓存是否放到redis中 做二级缓存,微服务模式推荐开启
-  dict-use-redis: false
-  # 开启redis支持 微服务模式推荐使用redis
-  is-enable-redis: false
-  # 启用全局翻译(拦截所有responseBody进行自动翻译),如果关闭需要手动调用翻译方法或者方法加注解,具体看文档
-  is-enable-global: true
-  # 启平铺模式(transMap的key平铺到和vo一个级别)
-  is-enable-tile: true
-  # 默认为true 如果前期先单体跑,后期可能改为springcloud微服务,可以先设置为false,后期设置为true,设置为false RPC翻译会走SIMPLE的逻辑
-  is-enable-cloud: false

+ 6 - 16
eco-bom/pom.xml

@@ -23,11 +23,9 @@
         <mybatis-flex.version>1.10.9</mybatis-flex.version>
         <HikariCP.version>6.2.1</HikariCP.version>
         <hutool-5.version>5.8.36</hutool-5.version>
-        <easy-trans.version>3.0.6</easy-trans.version>
         <jackson.version>2.18.3</jackson.version>
         <jakarta.version>6.1.0</jakarta.version>
         <mapstruct-plus.version>1.4.8</mapstruct-plus.version>
-        <easy-trans.version>3.0.6</easy-trans.version>
         <deepseek4j.version>1.4.5</deepseek4j.version>
         <milvus.version>2.5.5</milvus.version>
         <jsqlparser.version>5.1</jsqlparser.version>
@@ -89,6 +87,12 @@
                 <artifactId>com-security</artifactId>
                 <version>${revision}</version>
             </dependency>
+            <!-- com-mapper -->
+            <dependency>
+                <groupId>org.eco.vip</groupId>
+                <artifactId>com-mapper</artifactId>
+                <version>${revision}</version>
+            </dependency>
 
             <!-- lombok -->
             <dependency>
@@ -125,20 +129,6 @@
                 <version>${jackson.version}</version>
             </dependency>
 
-            <!-- easy-trans 注解翻译 -->
-            <dependency>
-                <groupId>com.fhs-opensource</groupId>
-                <artifactId>easy-trans-spring-boot-starter</artifactId>
-                <version>${easy-trans.version}</version>
-            </dependency>
-
-            <!-- easy-trans-mybatis-plus-extend -->
-            <dependency>
-                <groupId>com.fhs-opensource</groupId>
-                <artifactId>easy-trans-mybatis-flex-extend</artifactId>
-                <version>${easy-trans.version}</version>
-            </dependency>
-
             <!-- https://mvnrepository.com/artifact/com.dameng/DmJdbcDriver18 -->
             <dependency>
                 <groupId>com.dameng</groupId>

+ 12 - 0
eco-common/com-mapper/pom.xml

@@ -0,0 +1,12 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.eco.vip</groupId>
+        <artifactId>eco-common</artifactId>
+        <version>1.0.0</version>
+    </parent>
+    <artifactId>com-mapper</artifactId>
+    <name>Archetype - com-mapper</name>
+    <url>http://maven.apache.org</url>
+</project>

+ 9 - 0
eco-common/com-mapper/src/main/resources/META-INF/maven/archetype.xml

@@ -0,0 +1,9 @@
+<archetype>
+  <id>com-mapper</id>
+  <sources>
+    <source>src/main/java/App.java</source>
+  </sources>
+  <testSources>
+    <source>src/test/java/AppTest.java</source>
+  </testSources>
+</archetype>

+ 15 - 0
eco-common/com-mapper/src/main/resources/archetype-resources/pom.xml

@@ -0,0 +1,15 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>$org.eco.vip</groupId>
+  <artifactId>$com-mapper</artifactId>
+  <version>$1.0.0</version>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>

+ 13 - 0
eco-common/com-mapper/src/main/resources/archetype-resources/src/main/java/App.java

@@ -0,0 +1,13 @@
+package $org.eco.vip;
+
+/**
+ * Hello world!
+ *
+ */
+public class App 
+{
+    public static void main( String[] args )
+    {
+        System.out.println( "Hello World!" );
+    }
+}

+ 38 - 0
eco-common/com-mapper/src/main/resources/archetype-resources/src/test/java/AppTest.java

@@ -0,0 +1,38 @@
+package $org.eco.vip;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest 
+    extends TestCase
+{
+    /**
+     * Create the test case
+     *
+     * @param testName name of the test case
+     */
+    public AppTest( String testName )
+    {
+        super( testName );
+    }
+
+    /**
+     * @return the suite of tests being tested
+     */
+    public static Test suite()
+    {
+        return new TestSuite( AppTest.class );
+    }
+
+    /**
+     * Rigourous Test :-)
+     */
+    public void testApp()
+    {
+        assertTrue( true );
+    }
+}

+ 0 - 12
eco-common/com-orm/pom.xml

@@ -17,17 +17,5 @@
             <groupId>org.eco.vip</groupId>
             <artifactId>com-core</artifactId>
         </dependency>
-
-        <!-- easy-trans -->
-        <dependency>
-            <groupId>com.fhs-opensource</groupId>
-            <artifactId>easy-trans-spring-boot-starter</artifactId>
-        </dependency>
-
-        <!-- easy-trans-mybatis-plus-extend -->
-        <dependency>
-            <groupId>com.fhs-opensource</groupId>
-            <artifactId>easy-trans-mybatis-flex-extend</artifactId>
-        </dependency>
     </dependencies>
 </project>

+ 1 - 6
eco-common/com-orm/src/main/java/org/eco/vip/orm/domain/BaseEntity.java

@@ -7,9 +7,6 @@ package org.eco.vip.orm.domain;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fhs.core.trans.anno.Trans;
-import com.fhs.core.trans.constant.TransType;
-import com.fhs.core.trans.vo.TransPojo;
 import com.mybatisflex.annotation.Column;
 import lombok.Data;
 
@@ -23,7 +20,7 @@ import java.util.Date;
  * @date 2025/3/9 20:30
  */
 @Data
-public class BaseEntity implements Serializable, TransPojo {
+public class BaseEntity implements Serializable {
 
     /**
      * 租户编号
@@ -54,7 +51,6 @@ public class BaseEntity implements Serializable, TransPojo {
     /**
      * 创建者
      */
-    @Trans(type = TransType.SIMPLE, targetClassName = "org.eco.vip.auth.domain.user.User", fields = "userName", ref = "createByName")
     private String createBy;
 
     /**
@@ -72,7 +68,6 @@ public class BaseEntity implements Serializable, TransPojo {
     /**
      * 更新者
      */
-    @Trans(type = TransType.SIMPLE, targetClassName = "org.eco.vip.auth.domain.user.User", fields = "userName", ref = "updateByName")
     private String updateBy;
 
     /**

+ 1 - 0
eco-common/pom.xml

@@ -17,5 +17,6 @@
         <module>com-core</module>
         <module>com-orm</module>
         <module>com-security</module>
+        <module>com-mapper</module>
     </modules>
 </project>

+ 0 - 3
eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/domain/org/Org.java

@@ -5,8 +5,6 @@
 package org.eco.vip.auth.domain.org;
 
 
-import com.fhs.core.trans.anno.Trans;
-import com.fhs.core.trans.constant.TransType;
 import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.Table;
@@ -61,7 +59,6 @@ public class Org extends BaseEntity {
     /**
      * 负责人
      */
-    @Trans(type = TransType.SIMPLE, targetClassName = "org.eco.vip.auth.domain.user.User", fields = "userName", ref = "leader")
     private Long leaderId;
 
     /**

+ 0 - 5
eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/domain/org/pojo/OrgVO.java

@@ -5,9 +5,6 @@
 package org.eco.vip.auth.domain.org.pojo;
 
 
-import com.fhs.core.trans.anno.Trans;
-import com.fhs.core.trans.constant.TransType;
-import com.mybatisflex.annotation.Id;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -27,7 +24,6 @@ public class OrgVO extends BaseEntity {
     /**
      * 部门ID
      */
-    @Id
     private String orgId;
 
     /**
@@ -53,7 +49,6 @@ public class OrgVO extends BaseEntity {
     /**
      * 负责人
      */
-    @Trans(type = TransType.SIMPLE, targetClassName = "org.eco.vip.auth.domain.user.User", fields = "userName", ref = "leader")
     private Long leaderId;
 
     /**

+ 0 - 2
eco-nexus-core/auth-biz/src/main/java/org/eco/vip/auth/domain/user/pojo/UserVO.java

@@ -5,7 +5,6 @@
 
 package org.eco.vip.auth.domain.user.pojo;
 
-import com.mybatisflex.annotation.Id;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -27,7 +26,6 @@ public class UserVO extends BaseEntity {
     /**
      * 用户ID
      */
-    @Id
     private String userId;
 
     /**

+ 0 - 1
eco-start/src/main/resources/application.yml

@@ -21,7 +21,6 @@ spring:
       - file:config/${spring.profiles.active}/sa-token.yml
       - file:config/${spring.profiles.active}/datasource-${eco.db}.yml
       - file:config/${spring.profiles.active}/logging.yml
-      - file:config/${spring.profiles.active}/easy-trans.yml
       - file:config/${spring.profiles.active}/security.yml
   mvc:
     format: