diff --git a/.gitignore b/.gitignore index 86a4c8357e2eece87c9c0ddf9eb90f53efc0c476..6d830d5eb45f631f710f94628c78fe1cc2c0d87e 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ hs_err_pid* .flattened-pom.xml /easy-trans-mybatis-flex-extend/.flattened-pom.xml /easy-trans-mybatis-flex-extend/target +/easy-trans-easy-query-extend/target diff --git a/README.md b/README.md index 3f30cc90ad2ff103c8e5225da2bd7a711aa1abe6..0123762bc0afa2e06c907bba963cda46d0493a34 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,48 @@ -# easy_trans + +# AD部分 + 公司有整套商业版数据中台源码出售，基于doris实现的数据仓库，支持PB级别的数据存储分析，功能模块如下： +## 功能模块 +### 1、数据源管理 +支持各类关系型数据库、非关系型数据库。 +### 2、元数据管理 +元模型、最新元数据、定版元数据、数据全景图、数据血缘、数据影响分析、多版本元数据对比 +### 3、数据标准管理 +标准词根、标准字典、数据元、标准模型、发布、多版本维护、数据标准核对 +### 4、数据仓库管理 +支持主题域、主题、数仓集群、维度建模、模型运维、模型审计、模型数据查看 +### 5、数据质量 +规则定义，任务执行，结果查看，统计分析，质量问题修复日志 +### 6、数据指标 +数据指标在线开发，数据指标地图 +### 7、数据标签 +标签对象、标签管理、置标任务、标签圈群、标签画像 +### 8、数据安全 +分级分类、数据脱敏、分级分类授权 +### 9、数据生命周期 +数据归档，数据恢复 +### 10、数据服务 +接口在线开发(支持通过JS脚本对数据进行处理后返回，支持动态SQL)，API注册(手写代码开发的接口注册到数据服务中)，接口测试，接口发布，应用管理，应用授权 +## 11、数据资产 +数据资产标签、数据资产目录、数据资产门户、数据资产申请试用 +### 10、数据集成/开发 +实时开发(支持CDC)、离线开发(支持数据库、csv、excel、接口、ftp、kafka、mqtt、mongodb等数据源接入)，在线拖拉拽生成数据集成任务 +### 11、数据可视化 +数据集，报表管理，报表设计，报表查看、知识图谱构建、知识图谱查看 +### 12、数据运维 +微服务监控、中间件监控、服务器监控、数据仓库定时备份恢复、数据服务接口监控。 +### 13、系统日志 +syslog查询、syslog实时查看、登录日志、审计日志 +### 14、主数据 +主数据模型管理、自动生成代码码段管理、主数据管理、主数据分发 +## 技术栈 +后端：Java springboot2.7 springcloud/alibaba mybatis plus hutool 等常见技术 +前端：vue elementui vite 等常见技术 +中间件：doris，mysql，redis，rabbitmq，minio，zookeeper。 +### 有演示环境和方案PPT，需要加V:abcd19920605 +## 架构 +![输入图片说明](https://gitee.com/dromara/easy_trans/raw/master/images/jiagou.png) +# 以下为本项目正文 +# Dromara Easy Trans ![输入图片说明](images/logo.png) # 介绍 @@ -8,12 +52,13 @@ # 插件文档 有问题先看文档哦！！！ -http://easy-trans.fhs-opensource.top/ (如果服务器访问不了，需要看文档自己clone代码 npm run吧) -https://gitee.com/fhs-opensource/vite_press_easy_trans + +主站：http://easy-trans.dromara.org/ 备用站：http://easy-trans.fhs-opensource.cn/ +文档源码：https://gitee.com/fhs-opensource/vite_press_easy_trans # 求star 我们非常需要您的star支持，就是右上角的那个小星星，帮忙点一下吧，抱拳啦！ -## easy trans适用于6种场景 +## Dromara Easy Trans适用于6种场景 1 我有一个id，但是我需要给客户展示他的title/name 但是我又不想自己手动做表关联查询 2 我有一个字典码 sex 和 一个字典值0 我希望能翻译成 男 给客户展示。 @@ -21,39 +66,43 @@ https://gitee.com/fhs-opensource/vite_press_easy_trans 4 我有一个枚举，枚举里有一个title字段，我想给前端展示title的值 给客户 5 我有一个唯一键(比如手机号，身份证号码，但是非其他表id字段)，但是我需要给客户展示他的title/name 但是我又不想自己手动做表关联查询 6 Excel导入场景，把 用户名 admin 反向翻译为 userid1 把男 反向翻译为 gender_1 (具体看官网文档) +# 最新版本 +springboot3.x 最新easy-trans版本：3.1.1 springboot 2.x 最新easy-trans版本 2.3.1 +# groupid和包名变更说明 +从3.1.0和2.3.0开始，包名和maven的groupid由com.fhs变更为dormara社区统一的org.dromara，以下版本不变。 # 食用步骤 ## 技术经理/架构 需要做的事情 1 、先把maven 引用加上（主starter+根据自己的ORM框架引入扩展,扩展只需要引入一个) - 目前镜像仓库下载不到2.2.8 可以用2.2.7版本或者使用m2的中央仓库下载2.2.8! + starter--必须！！！ ``` xml - com.fhs-opensource + org.dromara easy-trans-spring-boot-starter - 2.2.9 + 2.3.0 ``` Mybatis plus 扩展： ``` xml - com.fhs-opensource + org.dromara easy-trans-mybatis-plus-extend - 2.2.9 + 2.3.0 ``` JPA 扩展： ``` xml - com.fhs-opensource + org.dromara easy-trans-jpa-extend - 2.2.9 + 2.3.0 ``` JPA SpringBoot3 扩展(本扩如果没bug后面发布版本不在更新版本号)： ``` xml - com.fhs-opensource + org.dromara easy-trans-jpa-sb3-extend 2.2.3 @@ -61,19 +110,40 @@ starter--必须！！！ Beetl SQL 扩展： ``` xml - com.fhs-opensource + org.dromara easy-trans-beetl-sql-extend - 2.2.9 + 2.3.0 ``` TK Mybatis(通用mapper) 扩展： ``` xml - com.fhs-opensource + org.dromara easy-trans-tk-extend - 2.2.9 + 2.3.0 + +``` + +easy-query 扩展： +``` xml + + org.dromara + easy-trans-easy-query-extend + 2.2.17 ``` + +mybatis-flex 扩展： +``` xml + + org.dromara + easy-trans-mybatis-flex-extend + 2.2.17 + +``` + + + 如果使用Redis请添加redis的引用(如果之前加过了请不要重复添加) ``` xml @@ -148,7 +218,7 @@ public class Student implements TransPojo { private String schoolId; //远程翻译，调用其他微服务的数据源进行翻译 - @Trans(type = TransType.RPC,targetClassName = "com.fhs.test.pojo.School",fields = "schoolName",serviceName = "easyTrans",alias = "middle") + @Trans(type = TransType.RPC,targetClassName = "pojo.com.xhb.test.School",fields = "schoolName",serviceName = "easyTrans",alias = "middle") private String middleSchoolId; // 枚举翻译，返回文科还是理科给前端 @@ -196,26 +266,27 @@ https://gitee.com/fhs-opensource/easy_trans_springboot_demo # 已经使用此插件的企业 -1、陕西小伙伴网络科技有限公司 -2、中软国际云智能业务集团 -3、深圳市易流科技股份有限公司 -4、陕西逐道科技有限公司 -5、深圳市易联联盟科技有限公司 -6、中体数科（北京）体育发展有限公司 -7、首都信息发展股份有限公司 -8、航天神舟智慧系统技术有限公司 -9、小诺V2 https://gitee.com/xiaonuobase/snowy -10、山东大小同屏科技有限公司 -11、山东酸橙网络科技有限公司 -12、桔子数字科技有限公司 -13、成都新潮传媒集团股份有限公司 -14、陕西汇每家信息科技有限公司(每一天便利店连锁) -15、江西云牛科技 -16、广州彩讯数字技术有限公司 -17、江苏誉鸣航智能科技有限公司 -18、maku-boot https://gitee.com/makunet/maku-boot -19、北京大美星空科技有限公司 - +1、陕西小伙伴网络科技有限公司 +2、ruoyi-vue-pro https://gitee.com/zhijiantianya/ruoyi-vue-pro +3、中软国际云智能业务集团 +4、深圳市易流科技股份有限公司 +5、陕西逐道科技有限公司 +6、深圳市易联联盟科技有限公司 +7、中体数科（北京）体育发展有限公司 +8、首都信息发展股份有限公司 +9、航天神舟智慧系统技术有限公司 +10、小诺V2 https://gitee.com/xiaonuobase/snowy +11、山东大小同屏科技有限公司 +12、山东酸橙网络科技有限公司 +13、桔子数字科技有限公司 +14、成都新潮传媒集团股份有限公司 +15、陕西汇每家信息科技有限公司(每一天便利店连锁) +16、江西云牛科技 +17、广州彩讯数字技术有限公司 +18、江苏誉鸣航智能科技有限公司 +19、maku-boot https://gitee.com/makunet/maku-boot +20、北京大美星空科技有限公司 +21、四川学道社人力资源有限公司 # 作者二维码 加作者二维码邀请进入官方群 diff --git a/easy-trans-anno/pom.xml b/easy-trans-anno/pom.xml index aa2c9057690d49a237943faf8767206720a1a59b..38f6e3c156a40416dcf8a93556b6add8ad98222b 100644 --- a/easy-trans-anno/pom.xml +++ b/easy-trans-anno/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.fhs-opensource + org.dromara easy-trans ${revision} diff --git a/easy-trans-anno/src/main/java/com/fhs/core/trans/anno/AutoTrans.java b/easy-trans-anno/src/main/java/org/dromara/core/trans/anno/AutoTrans.java similarity index 95% rename from easy-trans-anno/src/main/java/com/fhs/core/trans/anno/AutoTrans.java rename to easy-trans-anno/src/main/java/org/dromara/core/trans/anno/AutoTrans.java index 62b07bfc08589e37914cb2f2c2c4e69df884574e..35b6a36a64c833a185e2d181009c112390e65dd0 100644 --- a/easy-trans-anno/src/main/java/com/fhs/core/trans/anno/AutoTrans.java +++ b/easy-trans-anno/src/main/java/org/dromara/core/trans/anno/AutoTrans.java @@ -1,6 +1,6 @@ -package com.fhs.core.trans.anno; +package org.dromara.core.trans.anno; -import com.fhs.core.trans.vo.VO; +import org.dromara.core.trans.vo.VO; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/easy-trans-anno/src/main/java/com/fhs/core/trans/anno/IgnoreTrans.java b/easy-trans-anno/src/main/java/org/dromara/core/trans/anno/IgnoreTrans.java similarity index 77% rename from easy-trans-anno/src/main/java/com/fhs/core/trans/anno/IgnoreTrans.java rename to easy-trans-anno/src/main/java/org/dromara/core/trans/anno/IgnoreTrans.java index 87d132bb932c48f9399c86152bcda7052ff17093..36dbf56a9b386b964daa00be8cd7a31c5a6b1670 100644 --- a/easy-trans-anno/src/main/java/com/fhs/core/trans/anno/IgnoreTrans.java +++ b/easy-trans-anno/src/main/java/org/dromara/core/trans/anno/IgnoreTrans.java @@ -1,4 +1,4 @@ -package com.fhs.core.trans.anno; +package org.dromara.core.trans.anno; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -9,6 +9,6 @@ import java.lang.annotation.Target; * 忽略翻译--需要加到controller上 */ @Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.METHOD}) +@Target({ElementType.METHOD,ElementType.FIELD}) public @interface IgnoreTrans { } diff --git a/easy-trans-anno/src/main/java/org/dromara/core/trans/anno/RpcTrans.java b/easy-trans-anno/src/main/java/org/dromara/core/trans/anno/RpcTrans.java new file mode 100644 index 0000000000000000000000000000000000000000..8ac84b057cefb0ab46d70d1256d88fc56acdb6c6 --- /dev/null +++ b/easy-trans-anno/src/main/java/org/dromara/core/trans/anno/RpcTrans.java @@ -0,0 +1,18 @@ +package org.dromara.core.trans.anno; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * @Description: 标注的PO(有的团队叫DO) 可以被RPC翻译 + * @Author: wanglei + * @Date: Created in 10:14 2024/04/03 + */ +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.TYPE}) +public @interface RpcTrans { + + +} diff --git a/easy-trans-anno/src/main/java/com/fhs/core/trans/anno/Trans.java b/easy-trans-anno/src/main/java/org/dromara/core/trans/anno/Trans.java similarity index 94% rename from easy-trans-anno/src/main/java/com/fhs/core/trans/anno/Trans.java rename to easy-trans-anno/src/main/java/org/dromara/core/trans/anno/Trans.java index 678f1d977638bf1d3fe0da05202b8b25570f2363..fe5a8ae2aed018b1a975dc45ef5198a5628fb303 100644 --- a/easy-trans-anno/src/main/java/com/fhs/core/trans/anno/Trans.java +++ b/easy-trans-anno/src/main/java/org/dromara/core/trans/anno/Trans.java @@ -1,7 +1,7 @@ -package com.fhs.core.trans.anno; +package org.dromara.core.trans.anno; -import com.fhs.core.trans.vo.TransPojo; -import com.fhs.core.trans.vo.VO; +import org.dromara.core.trans.vo.TransPojo; +import org.dromara.core.trans.vo.VO; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/easy-trans-anno/src/main/java/com/fhs/core/trans/anno/TransCacheType.java b/easy-trans-anno/src/main/java/org/dromara/core/trans/anno/TransCacheType.java similarity index 84% rename from easy-trans-anno/src/main/java/com/fhs/core/trans/anno/TransCacheType.java rename to easy-trans-anno/src/main/java/org/dromara/core/trans/anno/TransCacheType.java index 954f2e31fd82651638e86482785565c11c3623e1..316034dd9f951f1b9a4de6b30b8bf49461bf9ee9 100644 --- a/easy-trans-anno/src/main/java/com/fhs/core/trans/anno/TransCacheType.java +++ b/easy-trans-anno/src/main/java/org/dromara/core/trans/anno/TransCacheType.java @@ -1,4 +1,4 @@ -package com.fhs.core.trans.anno; +package org.dromara.core.trans.anno; /** * 缓存类型 diff --git a/easy-trans-anno/src/main/java/com/fhs/core/trans/anno/TransDefaultSett.java b/easy-trans-anno/src/main/java/org/dromara/core/trans/anno/TransDefaultSett.java similarity index 97% rename from easy-trans-anno/src/main/java/com/fhs/core/trans/anno/TransDefaultSett.java rename to easy-trans-anno/src/main/java/org/dromara/core/trans/anno/TransDefaultSett.java index 08381c3072f565f3966838f8e14015cf9f70f9eb..27ee31206026a32eaab6a34b9f76962fc8c07a77 100644 --- a/easy-trans-anno/src/main/java/com/fhs/core/trans/anno/TransDefaultSett.java +++ b/easy-trans-anno/src/main/java/org/dromara/core/trans/anno/TransDefaultSett.java @@ -1,4 +1,4 @@ -package com.fhs.core.trans.anno; +package org.dromara.core.trans.anno; import java.lang.annotation.*; diff --git a/easy-trans-anno/src/main/java/com/fhs/core/trans/anno/TransMethodResult.java b/easy-trans-anno/src/main/java/org/dromara/core/trans/anno/TransMethodResult.java similarity index 90% rename from easy-trans-anno/src/main/java/com/fhs/core/trans/anno/TransMethodResult.java rename to easy-trans-anno/src/main/java/org/dromara/core/trans/anno/TransMethodResult.java index 6dbd7b8f90807cd68a68e669666db03f4daa05bb..662623ec781ee094b5bfd6ab65d2df44c1ab2f61 100644 --- a/easy-trans-anno/src/main/java/com/fhs/core/trans/anno/TransMethodResult.java +++ b/easy-trans-anno/src/main/java/org/dromara/core/trans/anno/TransMethodResult.java @@ -1,4 +1,4 @@ -package com.fhs.core.trans.anno; +package org.dromara.core.trans.anno; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/easy-trans-anno/src/main/java/com/fhs/core/trans/anno/TransSett.java b/easy-trans-anno/src/main/java/org/dromara/core/trans/anno/TransSett.java similarity index 92% rename from easy-trans-anno/src/main/java/com/fhs/core/trans/anno/TransSett.java rename to easy-trans-anno/src/main/java/org/dromara/core/trans/anno/TransSett.java index 0ba64cf48eff87bea3808d70f0fff1877a2222ad..39640169deea43e18b013537b802b2b2552c8920 100644 --- a/easy-trans-anno/src/main/java/com/fhs/core/trans/anno/TransSett.java +++ b/easy-trans-anno/src/main/java/org/dromara/core/trans/anno/TransSett.java @@ -1,4 +1,4 @@ -package com.fhs.core.trans.anno; +package org.dromara.core.trans.anno; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/easy-trans-anno/src/main/java/com/fhs/core/trans/anno/UnTrans.java b/easy-trans-anno/src/main/java/org/dromara/core/trans/anno/UnTrans.java similarity index 89% rename from easy-trans-anno/src/main/java/com/fhs/core/trans/anno/UnTrans.java rename to easy-trans-anno/src/main/java/org/dromara/core/trans/anno/UnTrans.java index e5ef88617b8afa83a16dcad5c60df669218f58df..cc1aef8b98359a70630787912157e2dd57061a92 100644 --- a/easy-trans-anno/src/main/java/com/fhs/core/trans/anno/UnTrans.java +++ b/easy-trans-anno/src/main/java/org/dromara/core/trans/anno/UnTrans.java @@ -1,7 +1,4 @@ -package com.fhs.core.trans.anno; - -import com.fhs.core.trans.vo.TransPojo; -import com.fhs.core.trans.vo.VO; +package org.dromara.core.trans.anno; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/easy-trans-anno/src/main/java/com/fhs/core/trans/constant/TransType.java b/easy-trans-anno/src/main/java/org/dromara/core/trans/constant/TransType.java similarity index 91% rename from easy-trans-anno/src/main/java/com/fhs/core/trans/constant/TransType.java rename to easy-trans-anno/src/main/java/org/dromara/core/trans/constant/TransType.java index 1b67a467aaa85c19959b973d8d6ce3b26ffa4853..d50ab69aac79e3a5628e98a4fcdefb67e24d136d 100644 --- a/easy-trans-anno/src/main/java/com/fhs/core/trans/constant/TransType.java +++ b/easy-trans-anno/src/main/java/org/dromara/core/trans/constant/TransType.java @@ -1,4 +1,4 @@ -package com.fhs.core.trans.constant; +package org.dromara.core.trans.constant; /** * 翻译类型 diff --git a/easy-trans-anno/src/main/java/com/fhs/core/trans/constant/UnTransType.java b/easy-trans-anno/src/main/java/org/dromara/core/trans/constant/UnTransType.java similarity index 85% rename from easy-trans-anno/src/main/java/com/fhs/core/trans/constant/UnTransType.java rename to easy-trans-anno/src/main/java/org/dromara/core/trans/constant/UnTransType.java index 5ccd40b8cd41c977d273ef91015d534ea7447e5e..3cbaa0d0f8e4944fec6f3396615be840cf700885 100644 --- a/easy-trans-anno/src/main/java/com/fhs/core/trans/constant/UnTransType.java +++ b/easy-trans-anno/src/main/java/org/dromara/core/trans/constant/UnTransType.java @@ -1,4 +1,4 @@ -package com.fhs.core.trans.constant; +package org.dromara.core.trans.constant; /** * 翻译类型 diff --git a/easy-trans-anno/src/main/java/com/fhs/core/trans/convert/Convert.java b/easy-trans-anno/src/main/java/org/dromara/core/trans/convert/Convert.java similarity index 72% rename from easy-trans-anno/src/main/java/com/fhs/core/trans/convert/Convert.java rename to easy-trans-anno/src/main/java/org/dromara/core/trans/convert/Convert.java index 70585373133d090a06cb01c671b0f8a1e3a008a1..e6599b64ead4a4bc32a41762e885c295cc102bf6 100644 --- a/easy-trans-anno/src/main/java/com/fhs/core/trans/convert/Convert.java +++ b/easy-trans-anno/src/main/java/org/dromara/core/trans/convert/Convert.java @@ -1,4 +1,4 @@ -package com.fhs.core.trans.convert; +package org.dromara.core.trans.convert; public interface Convert { T convert(Object o, Class targetType) throws ClassCastException; diff --git a/easy-trans-anno/src/main/java/com/fhs/core/trans/convert/SimpleConvert.java b/easy-trans-anno/src/main/java/org/dromara/core/trans/convert/SimpleConvert.java similarity index 85% rename from easy-trans-anno/src/main/java/com/fhs/core/trans/convert/SimpleConvert.java rename to easy-trans-anno/src/main/java/org/dromara/core/trans/convert/SimpleConvert.java index 5bec4cc497a2cb3a0e702834cc20dacdc6c1a83e..7d1b181fbc36d715eeec564b88f8d6ee38f428d1 100644 --- a/easy-trans-anno/src/main/java/com/fhs/core/trans/convert/SimpleConvert.java +++ b/easy-trans-anno/src/main/java/org/dromara/core/trans/convert/SimpleConvert.java @@ -1,10 +1,12 @@ -package com.fhs.core.trans.convert; +package org.dromara.core.trans.convert; + +import org.dromara.core.trans.util.ConvertUtil; import java.math.BigDecimal; /** * 默认转换器，只进行各基本类型包装类的转换 - * 用户可使用{@link com.fhs.core.trans.util.ConvertUtil#setConvert}自定义转换器 + * 用户可使用{@link ConvertUtil#setConvert}自定义转换器 */ public class SimpleConvert implements Convert { @Override @@ -43,7 +45,9 @@ public class SimpleConvert implements Convert { if (targetType == BigDecimal.class) { return (T) new BigDecimal(s); } - + if (targetType == String.class) { + return (T) s; + } // 这里会抛出ClassCastException return (T) o; } diff --git a/easy-trans-anno/src/main/java/com/fhs/core/trans/util/ConvertUtil.java b/easy-trans-anno/src/main/java/org/dromara/core/trans/util/ConvertUtil.java similarity index 70% rename from easy-trans-anno/src/main/java/com/fhs/core/trans/util/ConvertUtil.java rename to easy-trans-anno/src/main/java/org/dromara/core/trans/util/ConvertUtil.java index 131eb3d1c5b3e0c882ff7dd69384060a98bd0521..1a40aa07cbe87256fa453351b41916198df85cf0 100644 --- a/easy-trans-anno/src/main/java/com/fhs/core/trans/util/ConvertUtil.java +++ b/easy-trans-anno/src/main/java/org/dromara/core/trans/util/ConvertUtil.java @@ -1,7 +1,7 @@ -package com.fhs.core.trans.util; +package org.dromara.core.trans.util; -import com.fhs.core.trans.convert.Convert; -import com.fhs.core.trans.convert.SimpleConvert; +import org.dromara.core.trans.convert.Convert; +import org.dromara.core.trans.convert.SimpleConvert; public class ConvertUtil { private static Convert convert = new SimpleConvert(); diff --git a/easy-trans-anno/src/main/java/com/fhs/core/trans/util/ReflectUtils.java b/easy-trans-anno/src/main/java/org/dromara/core/trans/util/ReflectUtils.java similarity index 98% rename from easy-trans-anno/src/main/java/com/fhs/core/trans/util/ReflectUtils.java rename to easy-trans-anno/src/main/java/org/dromara/core/trans/util/ReflectUtils.java index c63b91f4cbf8e83d3ef7e50cfa458bad6074fa17..2c2d9e8b46dd40b3fac4a767353b63068cddbd34 100644 --- a/easy-trans-anno/src/main/java/com/fhs/core/trans/util/ReflectUtils.java +++ b/easy-trans-anno/src/main/java/org/dromara/core/trans/util/ReflectUtils.java @@ -1,7 +1,5 @@ -package com.fhs.core.trans.util; +package org.dromara.core.trans.util; -import com.alibaba.fastjson.annotation.JSONField; -import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.extern.slf4j.Slf4j; import java.lang.annotation.Annotation; diff --git a/easy-trans-anno/src/main/java/com/fhs/core/trans/vo/TransPojo.java b/easy-trans-anno/src/main/java/org/dromara/core/trans/vo/TransPojo.java similarity index 78% rename from easy-trans-anno/src/main/java/com/fhs/core/trans/vo/TransPojo.java rename to easy-trans-anno/src/main/java/org/dromara/core/trans/vo/TransPojo.java index aa45e55e183cd6f184c1bc640a0014b17a674a1f..81d9a65b33c00ffe4d084125d0915e97a312a3ab 100644 --- a/easy-trans-anno/src/main/java/com/fhs/core/trans/vo/TransPojo.java +++ b/easy-trans-anno/src/main/java/org/dromara/core/trans/vo/TransPojo.java @@ -1,4 +1,4 @@ -package com.fhs.core.trans.vo; +package org.dromara.core.trans.vo; /** * 可被翻译的pojo diff --git a/easy-trans-anno/src/main/java/com/fhs/core/trans/vo/VO.java b/easy-trans-anno/src/main/java/org/dromara/core/trans/vo/VO.java similarity index 95% rename from easy-trans-anno/src/main/java/com/fhs/core/trans/vo/VO.java rename to easy-trans-anno/src/main/java/org/dromara/core/trans/vo/VO.java index 0ac40d2d9f2287ca3b9857b882473e3837b9156c..0fbf387759eb61c52c960777d3e6f2e85891162d 100644 --- a/easy-trans-anno/src/main/java/com/fhs/core/trans/vo/VO.java +++ b/easy-trans-anno/src/main/java/org/dromara/core/trans/vo/VO.java @@ -1,9 +1,9 @@ -package com.fhs.core.trans.vo; +package org.dromara.core.trans.vo; import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fhs.core.trans.util.ReflectUtils; +import org.dromara.core.trans.util.ReflectUtils; import java.lang.reflect.Field; import java.util.*; diff --git a/easy-trans-beetl-sql-extend/pom.xml b/easy-trans-beetl-sql-extend/pom.xml index c0431709ba1de4664311a722a4ea26df482250d1..1e4a3ce137352718e58a42efed9d3fb0ab48b25d 100644 --- a/easy-trans-beetl-sql-extend/pom.xml +++ b/easy-trans-beetl-sql-extend/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> easy-trans - com.fhs-opensource + org.dromara ${revision} 4.0.0 @@ -18,7 +18,7 @@ - com.fhs-opensource + org.dromara easy-trans-service diff --git a/easy-trans-beetl-sql-extend/src/main/java/com/fhs/trans/config/EasyTransBeetlSqlConfig.java b/easy-trans-beetl-sql-extend/src/main/java/org/dromara/trans/config/EasyTransBeetlSqlConfig.java similarity index 84% rename from easy-trans-beetl-sql-extend/src/main/java/com/fhs/trans/config/EasyTransBeetlSqlConfig.java rename to easy-trans-beetl-sql-extend/src/main/java/org/dromara/trans/config/EasyTransBeetlSqlConfig.java index 15db0c7e733726b7fd5ec4483896637e2fb53e1c..e7d141582498fa1403f91a40fd49ab118513563e 100644 --- a/easy-trans-beetl-sql-extend/src/main/java/com/fhs/trans/config/EasyTransBeetlSqlConfig.java +++ b/easy-trans-beetl-sql-extend/src/main/java/org/dromara/trans/config/EasyTransBeetlSqlConfig.java @@ -1,8 +1,7 @@ -package com.fhs.trans.config; +package org.dromara.trans.config; -import com.fhs.core.trans.util.ReflectUtils; -import com.fhs.core.trans.vo.VO; -import com.fhs.trans.extend.BeetlSqlTransDiver; +import org.dromara.core.trans.util.ReflectUtils; +import org.dromara.trans.extend.BeetlSqlTransDiver; import lombok.extern.slf4j.Slf4j; import org.beetl.sql.annotation.entity.AssignID; import org.beetl.sql.core.SQLManager; diff --git a/easy-trans-beetl-sql-extend/src/main/java/com/fhs/trans/extend/BeetlSqlTransDiver.java b/easy-trans-beetl-sql-extend/src/main/java/org/dromara/trans/extend/BeetlSqlTransDiver.java similarity index 88% rename from easy-trans-beetl-sql-extend/src/main/java/com/fhs/trans/extend/BeetlSqlTransDiver.java rename to easy-trans-beetl-sql-extend/src/main/java/org/dromara/trans/extend/BeetlSqlTransDiver.java index 915f4cb565888ece11d3f0d1374cfb143e16fd6c..5d1678907bc19bc9163d607b99905518bb41617a 100644 --- a/easy-trans-beetl-sql-extend/src/main/java/com/fhs/trans/extend/BeetlSqlTransDiver.java +++ b/easy-trans-beetl-sql-extend/src/main/java/org/dromara/trans/extend/BeetlSqlTransDiver.java @@ -1,7 +1,7 @@ -package com.fhs.trans.extend; +package org.dromara.trans.extend; -import com.fhs.core.trans.vo.VO; -import com.fhs.trans.service.impl.SimpleTransService; +import org.dromara.core.trans.vo.VO; +import org.dromara.trans.service.impl.SimpleTransService; import lombok.extern.slf4j.Slf4j; import org.beetl.sql.clazz.kit.BeetlSQLException; import org.beetl.sql.core.SQLManager; diff --git a/easy-trans-beetl-sql-extend/src/main/resources/META-INF/spring.factories b/easy-trans-beetl-sql-extend/src/main/resources/META-INF/spring.factories index f0ab6f64b173732b2af6e994c9ac4118a320b986..152eb1561e59613fd7b124119e249a13fb6b93a8 100644 --- a/easy-trans-beetl-sql-extend/src/main/resources/META-INF/spring.factories +++ b/easy-trans-beetl-sql-extend/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.fhs.trans.config.EasyTransBeetlSqlConfig + org.dromara.trans.config.EasyTransBeetlSqlConfig diff --git a/easy-trans-beetl-sql-extend/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/easy-trans-beetl-sql-extend/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 4a4566d8fa1654a0785eaf0622551f5a1253412a..854fa10fa6cb274afbebedac1e92c352eced3b24 100644 --- a/easy-trans-beetl-sql-extend/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/easy-trans-beetl-sql-extend/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.fhs.trans.config.EasyTransBeetlSqlConfig \ No newline at end of file +org.dromara.trans.config.EasyTransBeetlSqlConfig \ No newline at end of file diff --git a/easy-trans-dependencies/pom.xml b/easy-trans-dependencies/pom.xml index c1a3175f53ae429083fc207f19d9ff1779a78606..d0c75ee2f7f438a87ca287101f036b3f0053e6ab 100644 --- a/easy-trans-dependencies/pom.xml +++ b/easy-trans-dependencies/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.fhs-opensource + org.dromara easy-trans ${revision} @@ -16,49 +16,44 @@ - com.fhs-opensource + org.dromara easy-trans-anno ${revision} - com.fhs-opensource + org.dromara easy-trans-spring-boot-starter ${revision} - com.fhs-opensource + org.dromara easy-trans-beetl-sql-extend ${revision} - com.fhs-opensource + org.dromara easy-trans-mybatis-plus-extend ${revision} - com.fhs-opensource + org.dromara easy-trans-mybatis-flex-extend ${revision} - - - com.fhs-opensource - easy-trans-jpa-extend - ${revision} - + - com.fhs-opensource + org.dromara easy-trans-tk-extend ${revision} diff --git a/easy-trans-dependencies/target/easy-trans-dependencies-3.1.0.pom b/easy-trans-dependencies/target/easy-trans-dependencies-3.1.0.pom new file mode 100644 index 0000000000000000000000000000000000000000..d358836dc9124483d7c81867c7c68ccdf249fa64 --- /dev/null +++ b/easy-trans-dependencies/target/easy-trans-dependencies-3.1.0.pom @@ -0,0 +1,54 @@ + + + 4.0.0 + + org.dromara + easy-trans + 3.1.0 + + org.dromara + easy-trans-dependencies + 3.1.0 + pom + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + + + + + org.dromara + easy-trans-anno + ${revision} + + + org.dromara + easy-trans-spring-boot-starter + ${revision} + + + org.dromara + easy-trans-beetl-sql-extend + ${revision} + + + org.dromara + easy-trans-mybatis-plus-extend + ${revision} + + + org.dromara + easy-trans-mybatis-flex-extend + ${revision} + + + org.dromara + easy-trans-tk-extend + ${revision} + + + + diff --git a/easy-trans-dependencies/target/easy-trans-dependencies-3.1.0.pom.asc b/easy-trans-dependencies/target/easy-trans-dependencies-3.1.0.pom.asc new file mode 100644 index 0000000000000000000000000000000000000000..d2d2942e6826b28e9aa8f60eaae1585cbe191479 --- /dev/null +++ b/easy-trans-dependencies/target/easy-trans-dependencies-3.1.0.pom.asc @@ -0,0 +1,14 @@ +-----BEGIN PGP SIGNATURE----- + +iQGzBAABCAAdFiEEReTtXCh9VkDlzgVFf96UeDvg/LgFAmcWEiYACgkQf96UeDvg +/LjvBQwAxA3BKOEmddC+c6RTxTwmxC8y8HpqfN/GHpO47O5mTwQUXSsmhxIyqla4 +WR7NAcQSOu7o7pdz4ZIdXX9kbHlIU2GrCibiT5HP+bRv8HpTjj/czqs+ejyjlPdn +QYJBit4w0z+jN7N0Yb2deco35o53shfrIa/lCQTh5LiZGLDM/gL0oSeTKo8A0jYA +pE3omqMBGF8LWTyIt5pVkUy4UDfEGpf9p7jswrqYzV4Mm2GBuSharHFHHSPYbwFT +XsXdUgVLuIHa3awdHWXbcHRE+gEVt3dLn7duYoQUw5d+yhsaTb3qhUB07XBz6mgI +xRjy3j3eCLiApyXC/WLZgjEef7KM4vDm3d2ApT85bmlN/FbKxcZdofixck7iFL5m +Ylwj6stKLRNfcXF+bmGGQlnZ4imWYZtlvGSmW4PFPOQ/od9evztdgA1kfXuYeFbm +7he1zDWAFhfDkQzda688QvLfdDG6o4D/XGLgq91i7fX4roB1O++NEOw4s0pKK20B +ocWc8FbL +=0HQk +-----END PGP SIGNATURE----- diff --git a/easy-trans-jpa-extend/pom.xml b/easy-trans-easy-query-extend/pom.xml similarity index 42% rename from easy-trans-jpa-extend/pom.xml rename to easy-trans-easy-query-extend/pom.xml index 5620d1c88b336bc8f0737257e3da0d9f5a2542c5..be632a200c013c61e905199a1c9caed29d2ee757 100644 --- a/easy-trans-jpa-extend/pom.xml +++ b/easy-trans-easy-query-extend/pom.xml @@ -3,15 +3,16 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.fhs-opensource + org.dromara easy-trans ${revision} 4.0.0 - easy-trans-jpa-extend + easy-trans-easy-query-extend + - com.fhs-opensource + org.dromara easy-trans-service @@ -23,41 +24,15 @@ spring-boot-autoconfigure - javax.persistence - javax.persistence-api - 2.2 + com.easy-query + sql-api4j true - jakarta.persistence - jakarta.persistence-api - 3.1.0 + com.easy-query + sql-core true - - org.hibernate - hibernate-core - true - - - jboss-transaction-api_1.2_spec - org.jboss.spec.javax.transaction - - - javax.activation-api - javax.activation - - - javax.persistence-api - javax.persistence - - - jaxb-api - javax.xml.bind - - - - diff --git a/easy-trans-easy-query-extend/src/main/java/org/dromara/trans/anno/Id4Trans.java b/easy-trans-easy-query-extend/src/main/java/org/dromara/trans/anno/Id4Trans.java new file mode 100644 index 0000000000000000000000000000000000000000..075de0a15e1595789a9591a798b571794cad7c0d --- /dev/null +++ b/easy-trans-easy-query-extend/src/main/java/org/dromara/trans/anno/Id4Trans.java @@ -0,0 +1,11 @@ +package org.dromara.trans.anno; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.METHOD, ElementType.FIELD}) +public @interface Id4Trans { +} \ No newline at end of file diff --git a/easy-trans-easy-query-extend/src/main/java/org/dromara/trans/config/EasyTransEasyQueryConfig.java b/easy-trans-easy-query-extend/src/main/java/org/dromara/trans/config/EasyTransEasyQueryConfig.java new file mode 100644 index 0000000000000000000000000000000000000000..a01f07ffed13dbb94b065d1f74ea22bc66f3831f --- /dev/null +++ b/easy-trans-easy-query-extend/src/main/java/org/dromara/trans/config/EasyTransEasyQueryConfig.java @@ -0,0 +1,31 @@ +package org.dromara.trans.config; + +import com.easy.query.core.api.client.EasyQueryClient; +import org.dromara.core.trans.util.ReflectUtils; +import org.dromara.trans.anno.Id4Trans; +import org.dromara.trans.extend.EasyQuerySimpleTransDiver; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * mybatis plus适配器 + * + * @author wanglei + */ +@Slf4j +@Configuration +public class EasyTransEasyQueryConfig { + + @Autowired + private EasyQueryClient easyQueryClient; + + @Bean + public EasyQuerySimpleTransDiver easyQueryTransDiver() { + ReflectUtils.ID_ANNO.add(Id4Trans.class); + EasyQuerySimpleTransDiver result = new EasyQuerySimpleTransDiver(easyQueryClient); + return result; + } + +} diff --git a/easy-trans-easy-query-extend/src/main/java/org/dromara/trans/extend/EasyQuerySimpleTransDiver.java b/easy-trans-easy-query-extend/src/main/java/org/dromara/trans/extend/EasyQuerySimpleTransDiver.java new file mode 100644 index 0000000000000000000000000000000000000000..5074ef87d782d157d85a010fabfc3d01dae43637 --- /dev/null +++ b/easy-trans-easy-query-extend/src/main/java/org/dromara/trans/extend/EasyQuerySimpleTransDiver.java @@ -0,0 +1,73 @@ +package org.dromara.trans.extend; + +import com.easy.query.core.api.client.EasyQueryClient; +import com.easy.query.core.expression.builder.Selector; +import org.dromara.core.trans.vo.VO; +import org.dromara.trans.service.impl.SimpleTransService; +import lombok.extern.slf4j.Slf4j; + +import java.io.Serializable; +import java.util.List; +import java.util.Set; + +/** + * mybatis plus 简单翻译驱动 + */ +@Slf4j +public class EasyQuerySimpleTransDiver implements SimpleTransService.SimpleTransDiver { + + private EasyQueryClient easyQueryClient; + + public EasyQuerySimpleTransDiver(EasyQueryClient easyQueryClient){ + this.easyQueryClient = easyQueryClient; + } + + @Override + public List findByIds(List ids, Class targetClass, String uniqueField, Set targetFields) { + return easyQueryClient.queryable(targetClass) + .whereByIds(ids) + .select(o->{ + Selector selector = o.getSelector(); + for (String targetField : targetFields) { + selector.column(o.getTable(),targetField); + } + }) + .toList(); + } + + @Override + public VO findById(Serializable id, Class targetClass, String uniqueField, Set targetFields) { + VO vo = easyQueryClient.queryable(targetClass) + .whereById(id) + .select(o -> { + Selector selector = o.getSelector(); + for (String targetField : targetFields) { + selector.column(o.getTable(), targetField); + } + }) + .firstOrNull(); + if(vo==null){ + log.error(targetClass + " 根据id:" + id + "没有查询到数据"); + } + return vo; + } + + @Override + public List findByIds(List ids, Class targetClass, String uniqueField) { + return easyQueryClient.queryable(targetClass) + .whereByIds(ids) + .toList(); + } + + @Override + public VO findById(Serializable id, Class targetClass, String uniqueField) { + VO vo = easyQueryClient.queryable(targetClass) + .whereById(id).firstOrNull(); + if(vo==null){ + log.error(targetClass + " 根据id:" + id + "没有查询到数据"); + } + return vo; + } + + +} diff --git a/easy-trans-jpa-extend/src/main/resources/META-INF/spring.factories b/easy-trans-easy-query-extend/src/main/resources/META-INF/spring.factories similarity index 55% rename from easy-trans-jpa-extend/src/main/resources/META-INF/spring.factories rename to easy-trans-easy-query-extend/src/main/resources/META-INF/spring.factories index 0b735c7fadbee98529a9f35010c026dd6494fcd1..a2da7673760b7ad1e30b3b8fbf157e6700435aed 100644 --- a/easy-trans-jpa-extend/src/main/resources/META-INF/spring.factories +++ b/easy-trans-easy-query-extend/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.fhs.trans.config.EasyTransJPA2Config + org.dromara.trans.config.EasyTransEasyQueryConfig diff --git a/easy-trans-easy-query-extend/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/easy-trans-easy-query-extend/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000000000000000000000000000000000000..c83072fef2e897d9db53652438529528f6dcaa6a --- /dev/null +++ b/easy-trans-easy-query-extend/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +org.dromara.trans.config.EasyTransEasyQueryConfig \ No newline at end of file diff --git a/easy-trans-jpa-extend/src/main/java/com/fhs/trans/config/EasyTransJPA2Config.java b/easy-trans-jpa-extend/src/main/java/com/fhs/trans/config/EasyTransJPA2Config.java deleted file mode 100644 index 66ef444036d77908117bcd715f8fc28fcef67fce..0000000000000000000000000000000000000000 --- a/easy-trans-jpa-extend/src/main/java/com/fhs/trans/config/EasyTransJPA2Config.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.fhs.trans.config; - -import com.fhs.core.trans.util.ReflectUtils; -import com.fhs.trans.extend.JPA2SimpleTransDiver; -import com.fhs.trans.extend.JPA2TransableRegister; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -import javax.persistence.EntityManager; -import javax.persistence.Id; - -/** - * JPA2适配器 - * - * @author wanglei - */ -@Slf4j -@Configuration -@ConditionalOnClass(EntityManager.class) -public class EasyTransJPA2Config { - - /** - * service的包路径 - */ - @Value("${easy-trans.autotrans.package:com.*.*.service.impl}") - private String packageNames; - - @Bean - @ConditionalOnProperty(name = "easy-trans.is-enable-auto", havingValue = "true") - public JPA2TransableRegister jpaTransableRegister() { - JPA2TransableRegister result = new JPA2TransableRegister(); - result.setPackageNames(packageNames); - return result; - } - - @Bean - public JPA2SimpleTransDiver jpaSimpleTransDiver(EntityManager em) { - ReflectUtils.ID_ANNO.add(Id.class); - JPA2SimpleTransDiver result = new JPA2SimpleTransDiver(em); - return result; - } - -} diff --git a/easy-trans-jpa-extend/src/main/java/com/fhs/trans/extend/JPA2SimpleTransDiver.java b/easy-trans-jpa-extend/src/main/java/com/fhs/trans/extend/JPA2SimpleTransDiver.java deleted file mode 100644 index 585f24481b4e7c70cc35368e4b2e8374f262686c..0000000000000000000000000000000000000000 --- a/easy-trans-jpa-extend/src/main/java/com/fhs/trans/extend/JPA2SimpleTransDiver.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.fhs.trans.extend; - -import com.fhs.core.trans.util.ReflectUtils; -import com.fhs.core.trans.vo.VO; -import com.fhs.trans.service.impl.SimpleTransService; -import org.springframework.util.StringUtils; - -import javax.persistence.EntityManager; -import javax.persistence.NoResultException; -import javax.persistence.TypedQuery; -import java.io.Serializable; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.List; - -/** - * JPA2简单翻译驱动 - */ -public class JPA2SimpleTransDiver implements SimpleTransService.SimpleTransDiver { - private EntityManager em; - - public JPA2SimpleTransDiver(EntityManager em) { - this.em = em; - } - - @Override - public List findByIds(List ids, Class targetClass,String uniqueField) { - if(!StringUtils.isEmpty(uniqueField)){ - throw new RuntimeException("JPA不支持唯一索引来代替ID查询"); - } - if (ids == null || ids.isEmpty()) { - return new ArrayList(); - } - TypedQuery query = em.createQuery(getSelectSql(targetClass) - + " WHERE tbl." + getPkeyFieldName(targetClass) + " IN :ids", targetClass); - query.setParameter("ids", ids); - return query.getResultList(); - } - - @Override - public VO findById(Serializable id, Class targetClass,String uniqueField) { - if(!StringUtils.isEmpty(uniqueField)){ - throw new RuntimeException("JPA不支持唯一索引来代替ID查询"); - } - TypedQuery query = em.createQuery(getSelectSql(targetClass) - + " WHERE tbl." + getPkeyFieldName(targetClass) + " = :id", targetClass); - query.setParameter("id", id); - try{ - return (VO) query.getSingleResult(); - }catch (NoResultException e) { - return null; - } - } - - private String getSelectSql(Class targetClass) { - return "FROM " + targetClass.getSimpleName() + " AS tbl "; - } - - private String getPkeyFieldName(Class targetClass) { - List fieldList = ReflectUtils.getAnnotationField(targetClass, javax.persistence.Id.class); - if (fieldList == null || fieldList.isEmpty()) { - throw new RuntimeException(targetClass.getName() + "没有@Id标记"); - } - return fieldList.get(0).getName(); - } - -} diff --git a/easy-trans-jpa-extend/src/main/java/com/fhs/trans/extend/JPA2TransableAdapter.java b/easy-trans-jpa-extend/src/main/java/com/fhs/trans/extend/JPA2TransableAdapter.java deleted file mode 100644 index ed7ed77373078a20b3da277de482bf885716921b..0000000000000000000000000000000000000000 --- a/easy-trans-jpa-extend/src/main/java/com/fhs/trans/extend/JPA2TransableAdapter.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.fhs.trans.extend; - -import com.fhs.core.trans.util.ReflectUtils; -import com.fhs.core.trans.vo.VO; -import com.fhs.trans.service.AutoTransable; - -import javax.persistence.EntityManager; -import javax.persistence.TypedQuery; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.List; - -public class JPA2TransableAdapter implements AutoTransable { - - private EntityManager em; - - private Class voClass; - - public JPA2TransableAdapter(Class voClass, EntityManager em) { - this.em = em; - this.voClass = voClass; - } - - - @Override - public List findByIds(List ids) { - if (ids == null || ids.isEmpty()) { - return new ArrayList(); - } - TypedQuery query = em.createQuery(getSelectSql() - + " WHERE tbl." + getPkeyFieldName() + " IN :ids", voClass); - query.setParameter("ids", ids); - return query.getResultList(); - } - - private String getSelectSql() { - return "FROM " + voClass.getSimpleName() + " AS tbl "; - } - - private String getPkeyFieldName() { - List fieldList = ReflectUtils.getAnnotationField(voClass, javax.persistence.Id.class); - if (fieldList == null || fieldList.isEmpty()) { - throw new RuntimeException(voClass.getName() + "没有@Id标记"); - } - return fieldList.get(0).getName(); - } - - @Override - public List select() { - TypedQuery query = em.createQuery(getSelectSql(), voClass); - return query.getResultList(); - } - - @Override - public VO selectById(Object pkey) { - TypedQuery query = em.createQuery(getSelectSql() - + " WHERE tbl." + getPkeyFieldName() + " = :id", voClass); - query.setParameter("id", pkey); - return (VO) query.getSingleResult(); - } - - -} diff --git a/easy-trans-jpa-extend/src/main/java/com/fhs/trans/extend/JPA2TransableRegister.java b/easy-trans-jpa-extend/src/main/java/com/fhs/trans/extend/JPA2TransableRegister.java deleted file mode 100644 index 2a70aa10457b45dcfa640ac90665eb2d3f3f38be..0000000000000000000000000000000000000000 --- a/easy-trans-jpa-extend/src/main/java/com/fhs/trans/extend/JPA2TransableRegister.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.fhs.trans.extend; - -import com.fhs.common.spring.SpringContextUtil; -import com.fhs.core.trans.anno.AutoTrans; -import com.fhs.core.trans.vo.VO; -import com.fhs.trans.service.AutoTransable; -import com.fhs.trans.service.impl.AutoTransService; -import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.context.event.ApplicationReadyEvent; -import org.springframework.context.ApplicationListener; - -import javax.persistence.Entity; -import javax.persistence.EntityManager; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; - -/** - * 用来注册 - */ -@Data -public class JPA2TransableRegister implements ApplicationListener { - - /** - * service的包路径 - */ - private String packageNames; - - @Autowired - private AutoTransService autoTransService; - - - @Autowired - private EntityManager em; - - @Override - public void onApplicationEvent(ApplicationReadyEvent applicationReadyEvent) { - //spring容器初始化完成之后，就会自行此方法。 - Set> entitySet = AutoTransService.scan(AutoTrans.class, packageNames.split(";")); - // 遍历所有class，获取所有用@autowareYLM注释的字段 - if (entitySet != null) { - final List namespaceList = new ArrayList<>(); - for (Class entity : entitySet) { - AutoTrans autoTransSett = entity.getAnnotation(AutoTrans.class); - if (autoTransSett.ref() == VO.class || (!autoTransSett.ref().isAnnotationPresent(Entity.class))) { - continue; - } - // 获取该类 - Object baseService = SpringContextUtil.getBeanByClass(entity); - if ((baseService instanceof AutoTransable)) { - continue; - } - namespaceList.add(autoTransSett.namespace()); - autoTransService.regTransable(new JPA2TransableAdapter(autoTransSett.ref(), em), autoTransSett); - } - new Thread(() -> { - Thread.currentThread().setName("refresh auto trans cache"); - for (String namespace : namespaceList) { - autoTransService.refreshOneNamespace(namespace); - } - }).start(); - - } - } - -} diff --git a/easy-trans-jpa-extend/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/easy-trans-jpa-extend/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index defdd5ed02ea1bd254f9b8422ff606d5389e8519..0000000000000000000000000000000000000000 --- a/easy-trans-jpa-extend/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -com.fhs.trans.config.EasyTransJPA2Config \ No newline at end of file diff --git a/easy-trans-jpa-sb3-extend/pom.xml b/easy-trans-jpa-sb3-extend/pom.xml index 1e2e0d7e93d75e13950f630809f5bf5a2eb92331..4213acd965599e274f97b4a3d31fcaf0c4a39d76 100644 --- a/easy-trans-jpa-sb3-extend/pom.xml +++ b/easy-trans-jpa-sb3-extend/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.fhs-opensource + org.dromara easy-trans ${revision} @@ -13,11 +13,10 @@ 11 4.0.0 - 2.2.4 easy-trans-jpa-sb3-extend - com.fhs-opensource + org.dromara easy-trans-service diff --git a/easy-trans-jpa-sb3-extend/src/main/java/com/fhs/trans/config/EasyTransJPA3Config.java b/easy-trans-jpa-sb3-extend/src/main/java/org/dromara/trans/config/EasyTransJPA3Config.java similarity index 86% rename from easy-trans-jpa-sb3-extend/src/main/java/com/fhs/trans/config/EasyTransJPA3Config.java rename to easy-trans-jpa-sb3-extend/src/main/java/org/dromara/trans/config/EasyTransJPA3Config.java index e32fd7610739a1f84b23ab8b05cda483ede6e2b4..955ad02c5a184fb573c5e05864f1edc06bf64529 100644 --- a/easy-trans-jpa-sb3-extend/src/main/java/com/fhs/trans/config/EasyTransJPA3Config.java +++ b/easy-trans-jpa-sb3-extend/src/main/java/org/dromara/trans/config/EasyTransJPA3Config.java @@ -1,8 +1,8 @@ -package com.fhs.trans.config; +package org.dromara.trans.config; -import com.fhs.core.trans.util.ReflectUtils; -import com.fhs.trans.extend.JPA3SimpleTransDiver; -import com.fhs.trans.extend.JPA3TransableRegister; +import org.dromara.core.trans.util.ReflectUtils; +import org.dromara.trans.extend.JPA3SimpleTransDiver; +import org.dromara.trans.extend.JPA3TransableRegister; import jakarta.persistence.EntityManager; import jakarta.persistence.Id; import lombok.extern.slf4j.Slf4j; diff --git a/easy-trans-jpa-sb3-extend/src/main/java/com/fhs/trans/extend/JPA3SimpleTransDiver.java b/easy-trans-jpa-sb3-extend/src/main/java/org/dromara/trans/extend/JPA3SimpleTransDiver.java similarity index 92% rename from easy-trans-jpa-sb3-extend/src/main/java/com/fhs/trans/extend/JPA3SimpleTransDiver.java rename to easy-trans-jpa-sb3-extend/src/main/java/org/dromara/trans/extend/JPA3SimpleTransDiver.java index dccccf7d28b107751fa14a2bdbca04d869488467..bc1207783d5cfd648830e54f31534a2b8ca38e23 100644 --- a/easy-trans-jpa-sb3-extend/src/main/java/com/fhs/trans/extend/JPA3SimpleTransDiver.java +++ b/easy-trans-jpa-sb3-extend/src/main/java/org/dromara/trans/extend/JPA3SimpleTransDiver.java @@ -1,8 +1,8 @@ -package com.fhs.trans.extend; +package org.dromara.trans.extend; -import com.fhs.core.trans.util.ReflectUtils; -import com.fhs.core.trans.vo.VO; -import com.fhs.trans.service.impl.SimpleTransService; +import org.dromara.core.trans.util.ReflectUtils; +import org.dromara.core.trans.vo.VO; +import org.dromara.trans.service.impl.SimpleTransService; import jakarta.persistence.EntityManager; import jakarta.persistence.NoResultException; import jakarta.persistence.TypedQuery; diff --git a/easy-trans-jpa-sb3-extend/src/main/java/com/fhs/trans/extend/JPA3TransableAdapter.java b/easy-trans-jpa-sb3-extend/src/main/java/org/dromara/trans/extend/JPA3TransableAdapter.java similarity index 90% rename from easy-trans-jpa-sb3-extend/src/main/java/com/fhs/trans/extend/JPA3TransableAdapter.java rename to easy-trans-jpa-sb3-extend/src/main/java/org/dromara/trans/extend/JPA3TransableAdapter.java index 77a43b554259b421e37da293897f5f7303e46982..969166e82fddfbc97bfb012fd791e85570af901f 100644 --- a/easy-trans-jpa-sb3-extend/src/main/java/com/fhs/trans/extend/JPA3TransableAdapter.java +++ b/easy-trans-jpa-sb3-extend/src/main/java/org/dromara/trans/extend/JPA3TransableAdapter.java @@ -1,8 +1,8 @@ -package com.fhs.trans.extend; +package org.dromara.trans.extend; -import com.fhs.core.trans.util.ReflectUtils; -import com.fhs.core.trans.vo.VO; -import com.fhs.trans.service.AutoTransable; +import org.dromara.core.trans.util.ReflectUtils; +import org.dromara.core.trans.vo.VO; +import org.dromara.trans.service.AutoTransable; import jakarta.persistence.EntityManager; import jakarta.persistence.TypedQuery; diff --git a/easy-trans-jpa-sb3-extend/src/main/java/com/fhs/trans/extend/JPA3TransableRegister.java b/easy-trans-jpa-sb3-extend/src/main/java/org/dromara/trans/extend/JPA3TransableRegister.java similarity index 88% rename from easy-trans-jpa-sb3-extend/src/main/java/com/fhs/trans/extend/JPA3TransableRegister.java rename to easy-trans-jpa-sb3-extend/src/main/java/org/dromara/trans/extend/JPA3TransableRegister.java index a8ae0dde07af03e899d4fbf24dd04649be928568..421ba713e31873014696e2fa7af2b200df0ae790 100644 --- a/easy-trans-jpa-sb3-extend/src/main/java/com/fhs/trans/extend/JPA3TransableRegister.java +++ b/easy-trans-jpa-sb3-extend/src/main/java/org/dromara/trans/extend/JPA3TransableRegister.java @@ -1,10 +1,10 @@ -package com.fhs.trans.extend; +package org.dromara.trans.extend; -import com.fhs.common.spring.SpringContextUtil; -import com.fhs.core.trans.anno.AutoTrans; -import com.fhs.core.trans.vo.VO; -import com.fhs.trans.service.AutoTransable; -import com.fhs.trans.service.impl.AutoTransService; +import org.dromara.common.spring.SpringContextUtil; +import org.dromara.core.trans.anno.AutoTrans; +import org.dromara.core.trans.vo.VO; +import org.dromara.trans.service.AutoTransable; +import org.dromara.trans.service.impl.AutoTransService; import jakarta.persistence.Entity; import jakarta.persistence.EntityManager; import lombok.Data; diff --git a/easy-trans-jpa-sb3-extend/src/main/resources/META-INF/spring.factories b/easy-trans-jpa-sb3-extend/src/main/resources/META-INF/spring.factories index 90d6e4ca40ee85c18a8407d826ecfe7f87261bfd..ed3e5b4d260095970b70e68d8ee4ab4080924847 100644 --- a/easy-trans-jpa-sb3-extend/src/main/resources/META-INF/spring.factories +++ b/easy-trans-jpa-sb3-extend/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.fhs.trans.config.EasyTransJPA3Config + org.dromara.trans.config.EasyTransJPA3Config diff --git a/easy-trans-jpa-sb3-extend/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/easy-trans-jpa-sb3-extend/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index e9836bdbdf4a85a8ed201a3d62bff649e1a7b946..6db7bdc62ec14e42c4cc89ac561e00d33709951b 100644 --- a/easy-trans-jpa-sb3-extend/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/easy-trans-jpa-sb3-extend/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.fhs.trans.config.EasyTransJPA3Config \ No newline at end of file +org.dromara.trans.config.EasyTransJPA3Config \ No newline at end of file diff --git a/easy-trans-mybatis-flex-extend/pom.xml b/easy-trans-mybatis-flex-extend/pom.xml index 08565bd337b5a6a1c4bc739197fc1d819150c820..1c6c439321976a94f31b132469008e1edfcfda72 100644 --- a/easy-trans-mybatis-flex-extend/pom.xml +++ b/easy-trans-mybatis-flex-extend/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.fhs-opensource + org.dromara easy-trans ${revision} @@ -11,12 +11,12 @@ easy-trans-mybatis-flex-extend - 1.5.7 + 1.8.7 - com.fhs-opensource + org.dromara easy-trans-service diff --git a/easy-trans-mybatis-flex-extend/src/main/java/com/fhs/trans/config/EasyTransMybatisFlexConfig.java b/easy-trans-mybatis-flex-extend/src/main/java/org/dromara/trans/config/EasyTransMybatisFlexConfig.java similarity index 85% rename from easy-trans-mybatis-flex-extend/src/main/java/com/fhs/trans/config/EasyTransMybatisFlexConfig.java rename to easy-trans-mybatis-flex-extend/src/main/java/org/dromara/trans/config/EasyTransMybatisFlexConfig.java index 1c249c14c6d9048dc96a70c12ab8d6f18c387f37..b5acbc374d9455c728fafe92489804eb79d74c9c 100644 --- a/easy-trans-mybatis-flex-extend/src/main/java/com/fhs/trans/config/EasyTransMybatisFlexConfig.java +++ b/easy-trans-mybatis-flex-extend/src/main/java/org/dromara/trans/config/EasyTransMybatisFlexConfig.java @@ -1,8 +1,8 @@ -package com.fhs.trans.config; +package org.dromara.trans.config; -import com.fhs.core.trans.util.ReflectUtils; -import com.fhs.trans.extend.MybatisFlexSimpleTransDiver; -import com.fhs.trans.extend.MybatisFlexTransableRegister; +import org.dromara.core.trans.util.ReflectUtils; +import org.dromara.trans.extend.MybatisFlexSimpleTransDiver; +import org.dromara.trans.extend.MybatisFlexTransableRegister; import com.mybatisflex.annotation.Id; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; diff --git a/easy-trans-mybatis-flex-extend/src/main/java/com/fhs/trans/extend/MybatisFlexSimpleTransDiver.java b/easy-trans-mybatis-flex-extend/src/main/java/org/dromara/trans/extend/MybatisFlexSimpleTransDiver.java similarity index 75% rename from easy-trans-mybatis-flex-extend/src/main/java/com/fhs/trans/extend/MybatisFlexSimpleTransDiver.java rename to easy-trans-mybatis-flex-extend/src/main/java/org/dromara/trans/extend/MybatisFlexSimpleTransDiver.java index 89091c67f66f7e51974649819e1f08f019f4c80b..dbc13c046336299bbc1cf8014bdae8bf6bb974e2 100644 --- a/easy-trans-mybatis-flex-extend/src/main/java/com/fhs/trans/extend/MybatisFlexSimpleTransDiver.java +++ b/easy-trans-mybatis-flex-extend/src/main/java/org/dromara/trans/extend/MybatisFlexSimpleTransDiver.java @@ -1,8 +1,8 @@ -package com.fhs.trans.extend; +package org.dromara.trans.extend; -import com.fhs.common.utils.StringUtil; -import com.fhs.core.trans.vo.VO; -import com.fhs.trans.service.impl.SimpleTransService; +import org.dromara.common.utils.StringUtil; +import org.dromara.core.trans.vo.VO; +import org.dromara.trans.service.impl.SimpleTransService; import com.mybatisflex.core.BaseMapper; import com.mybatisflex.core.mybatis.Mappers; import com.mybatisflex.core.query.QueryColumn; @@ -28,7 +28,7 @@ public class MybatisFlexSimpleTransDiver implements SimpleTransService.SimpleTra @Override public List findByIds(List ids, Class targetClass, String uniqueField) { - return findByIds(ids, targetClass, uniqueField, null); + return this.findByIds(ids, targetClass, uniqueField, (Set)null); } @Override @@ -42,7 +42,7 @@ public class MybatisFlexSimpleTransDiver implements SimpleTransService.SimpleTra @Override public VO findById(Serializable id, Class targetClass, String uniqueField) { - return findById(id, targetClass, uniqueField, null); + return this.findById(id, targetClass, uniqueField, (Set)null); } @Override @@ -50,40 +50,12 @@ public class MybatisFlexSimpleTransDiver implements SimpleTransService.SimpleTra TableInfo tableInfo = TableInfoFactory.ofEntityClass(targetClass); uniqueField = this.getUniqueField(tableInfo, uniqueField); QueryWrapper queryWrapper = genWrapper(tableInfo, targetFields, uniqueField); - queryWrapper.where(getQueryColumn(tableInfo, uniqueField).eq(id)); - return (VO) getMapper(targetClass).selectOneById(id); - } + queryWrapper.where(getQueryColumn(tableInfo, uniqueField).in(id)); + return (VO)getMapper(targetClass).selectOneById(id); - /** - * 生成查询 {@link QueryWrapper} 对象。 - * - * @param tableInfo 表信息 - * @param targetFields 目标字段 - * @param uniqueField 唯一键 - * @return {@link QueryWrapper} - */ - private QueryWrapper genWrapper(TableInfo tableInfo, Set targetFields, String uniqueField) { - QueryWrapper queryWrapper = QueryWrapper.create(); - if (targetFields != null && !targetFields.isEmpty()) { - targetFields.add(getKeyProperty(tableInfo)); - if (!StringUtil.isEmpty(uniqueField)) { - targetFields.add(uniqueField); - } - queryWrapper.select(targetFields.stream() - .map(tableInfo::getColumnByProperty) - .map(tableInfo::buildQueryColumn) - .toArray(QueryColumn[]::new)); - } - return queryWrapper; } - /** - * 如果配置了 {@code uniqueField} 则返回 {@code uniqueField} 没有就返回主键。 - * - * @param tableInfo 表信息 - * @param uniqueField 唯一键 - * @return 唯一键 - */ + private String getUniqueField(TableInfo tableInfo, String uniqueField) { if (!StringUtil.isEmpty(uniqueField)) { return uniqueField; @@ -107,24 +79,27 @@ public class MybatisFlexSimpleTransDiver implements SimpleTransService.SimpleTra return primaryKeyList.get(0).getProperty(); } - /** - * 获取查询列。 - * - * @param tableInfo 表信息 - * @param field 类属性 - * @return {@link QueryColumn} - */ + + private QueryWrapper genWrapper(TableInfo tableInfo, Set targetFields, String uniqueField) { + QueryWrapper queryWrapper = QueryWrapper.create(); + if (targetFields != null && !targetFields.isEmpty()) { + targetFields.add(getKeyProperty(tableInfo)); + if (!StringUtil.isEmpty(uniqueField)) { + targetFields.add(uniqueField); + } + queryWrapper.select(targetFields.stream() + .map(tableInfo::getColumnByProperty) + .map(tableInfo::getQueryColumnByProperty) + .toArray(QueryColumn[]::new)); + } + return queryWrapper; + } + private QueryColumn getQueryColumn(TableInfo tableInfo, String field) { String column = tableInfo.getColumnByProperty(field); - return tableInfo.buildQueryColumn(column); + return tableInfo.getQueryColumnByProperty(column); } - /** - * 根据实体类获取 {@link BaseMapper} 对象。 - * - * @param entity 实体类 - * @return {@link BaseMapper} - */ public BaseMapper getMapper(Class entity) { return Mappers.ofEntityClass(entity); } diff --git a/easy-trans-mybatis-flex-extend/src/main/java/com/fhs/trans/extend/MybatisFlexTransableAdapter.java b/easy-trans-mybatis-flex-extend/src/main/java/org/dromara/trans/extend/MybatisFlexTransableAdapter.java similarity index 89% rename from easy-trans-mybatis-flex-extend/src/main/java/com/fhs/trans/extend/MybatisFlexTransableAdapter.java rename to easy-trans-mybatis-flex-extend/src/main/java/org/dromara/trans/extend/MybatisFlexTransableAdapter.java index afbb37e3f9632450a7f637550bd56d9831323b71..d3973ea04532eea7bf0b21a30c49378f9778487d 100644 --- a/easy-trans-mybatis-flex-extend/src/main/java/com/fhs/trans/extend/MybatisFlexTransableAdapter.java +++ b/easy-trans-mybatis-flex-extend/src/main/java/org/dromara/trans/extend/MybatisFlexTransableAdapter.java @@ -1,7 +1,7 @@ -package com.fhs.trans.extend; +package org.dromara.trans.extend; -import com.fhs.core.trans.vo.VO; -import com.fhs.trans.service.AutoTransable; +import org.dromara.core.trans.vo.VO; +import org.dromara.trans.service.AutoTransable; import com.mybatisflex.core.BaseMapper; import com.mybatisflex.core.mybatis.Mappers; import com.mybatisflex.core.query.QueryWrapper; diff --git a/easy-trans-mybatis-flex-extend/src/main/java/com/fhs/trans/extend/MybatisFlexTransableRegister.java b/easy-trans-mybatis-flex-extend/src/main/java/org/dromara/trans/extend/MybatisFlexTransableRegister.java similarity index 89% rename from easy-trans-mybatis-flex-extend/src/main/java/com/fhs/trans/extend/MybatisFlexTransableRegister.java rename to easy-trans-mybatis-flex-extend/src/main/java/org/dromara/trans/extend/MybatisFlexTransableRegister.java index debf8857dc03a88a11b9b72be4fd4b8fd46a8595..a023595ac7991f99bddd5a64161be955e9d8a532 100644 --- a/easy-trans-mybatis-flex-extend/src/main/java/com/fhs/trans/extend/MybatisFlexTransableRegister.java +++ b/easy-trans-mybatis-flex-extend/src/main/java/org/dromara/trans/extend/MybatisFlexTransableRegister.java @@ -1,10 +1,10 @@ -package com.fhs.trans.extend; +package org.dromara.trans.extend; -import com.fhs.common.spring.SpringContextUtil; -import com.fhs.core.trans.anno.AutoTrans; -import com.fhs.core.trans.vo.VO; -import com.fhs.trans.service.AutoTransable; -import com.fhs.trans.service.impl.AutoTransService; +import org.dromara.common.spring.SpringContextUtil; +import org.dromara.core.trans.anno.AutoTrans; +import org.dromara.core.trans.vo.VO; +import org.dromara.trans.service.AutoTransable; +import org.dromara.trans.service.impl.AutoTransService; import com.mybatisflex.annotation.Table; import lombok.Data; import org.springframework.beans.factory.annotation.Autowired; diff --git a/easy-trans-mybatis-flex-extend/src/main/resources/META-INF/spring.factories b/easy-trans-mybatis-flex-extend/src/main/resources/META-INF/spring.factories index e4cf0b41d8cd5a2ce887bc7944d38efa606bee3e..504a1e42bea93c75e9a291cadcab54fb51e94bd6 100644 --- a/easy-trans-mybatis-flex-extend/src/main/resources/META-INF/spring.factories +++ b/easy-trans-mybatis-flex-extend/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.fhs.trans.config.EasyTransMybatisFlexConfig + org.dromara.trans.config.EasyTransMybatisFlexConfig diff --git a/easy-trans-mybatis-flex-extend/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/easy-trans-mybatis-flex-extend/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 4ede2c232c4dc1885a63d6ee438d980e50becfc1..a873b378f7045e1ce7601c39c0f1d9a38e491ed9 100644 --- a/easy-trans-mybatis-flex-extend/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/easy-trans-mybatis-flex-extend/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.fhs.trans.config.EasyTransMybatisFlexConfig \ No newline at end of file +org.dromara.trans.config.EasyTransMybatisFlexConfig \ No newline at end of file diff --git a/easy-trans-mybatis-plus-extend/pom.xml b/easy-trans-mybatis-plus-extend/pom.xml index 7548bb346eae5c6f5331004da07d87214a733693..4becbafaca6e2e39044c5d76b481f761c3f5c6fe 100644 --- a/easy-trans-mybatis-plus-extend/pom.xml +++ b/easy-trans-mybatis-plus-extend/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.fhs-opensource + org.dromara easy-trans ${revision} @@ -12,7 +12,7 @@ - com.fhs-opensource + org.dromara easy-trans-service diff --git a/easy-trans-mybatis-plus-extend/src/main/java/com/fhs/trans/config/EasyTransMybatisPlusConfig.java b/easy-trans-mybatis-plus-extend/src/main/java/org/dromara/trans/config/EasyTransMybatisPlusConfig.java similarity index 85% rename from easy-trans-mybatis-plus-extend/src/main/java/com/fhs/trans/config/EasyTransMybatisPlusConfig.java rename to easy-trans-mybatis-plus-extend/src/main/java/org/dromara/trans/config/EasyTransMybatisPlusConfig.java index 66f9dd4cfb3e9997200d53904f4b427ba770146e..23d1d384a9e81c48a6133121840b78445fcd6458 100644 --- a/easy-trans-mybatis-plus-extend/src/main/java/com/fhs/trans/config/EasyTransMybatisPlusConfig.java +++ b/easy-trans-mybatis-plus-extend/src/main/java/org/dromara/trans/config/EasyTransMybatisPlusConfig.java @@ -1,9 +1,9 @@ -package com.fhs.trans.config; +package org.dromara.trans.config; import com.baomidou.mybatisplus.annotation.TableId; -import com.fhs.core.trans.util.ReflectUtils; -import com.fhs.trans.extend.MybatisPlusSimpleTransDiver; -import com.fhs.trans.extend.MybatisPlusTransableRegister; +import org.dromara.core.trans.util.ReflectUtils; +import org.dromara.trans.extend.MybatisPlusSimpleTransDiver; +import org.dromara.trans.extend.MybatisPlusTransableRegister; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/easy-trans-mybatis-plus-extend/src/main/java/com/fhs/trans/extend/MybatisPlusSimpleTransDiver.java b/easy-trans-mybatis-plus-extend/src/main/java/org/dromara/trans/extend/MybatisPlusSimpleTransDiver.java similarity index 96% rename from easy-trans-mybatis-plus-extend/src/main/java/com/fhs/trans/extend/MybatisPlusSimpleTransDiver.java rename to easy-trans-mybatis-plus-extend/src/main/java/org/dromara/trans/extend/MybatisPlusSimpleTransDiver.java index c8d0433c1dea1fcdee42218f23b10a6d3ee3e33d..317ca4ffc497b2bc7f737a0c0e6f406fb3565c3a 100644 --- a/easy-trans-mybatis-plus-extend/src/main/java/com/fhs/trans/extend/MybatisPlusSimpleTransDiver.java +++ b/easy-trans-mybatis-plus-extend/src/main/java/org/dromara/trans/extend/MybatisPlusSimpleTransDiver.java @@ -1,4 +1,4 @@ -package com.fhs.trans.extend; +package org.dromara.trans.extend; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -7,10 +7,10 @@ import com.baomidou.mybatisplus.core.metadata.TableInfoHelper; import com.baomidou.mybatisplus.core.toolkit.*; import com.baomidou.mybatisplus.core.toolkit.support.ColumnCache; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; -import com.fhs.common.utils.StringUtil; -import com.fhs.core.trans.util.ReflectUtils; -import com.fhs.core.trans.vo.VO; -import com.fhs.trans.service.impl.SimpleTransService; +import org.dromara.common.utils.StringUtil; +import org.dromara.core.trans.util.ReflectUtils; +import org.dromara.core.trans.vo.VO; +import org.dromara.trans.service.impl.SimpleTransService; import org.apache.ibatis.session.Configuration; import org.apache.ibatis.session.SqlSession; import org.mybatis.spring.SqlSessionUtils; @@ -22,7 +22,6 @@ import java.util.Map; import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; -import java.util.stream.Stream; /** * mybatis plus 简单翻译驱动 diff --git a/easy-trans-mybatis-plus-extend/src/main/java/com/fhs/trans/extend/MybatisPlusTransableAdapter.java b/easy-trans-mybatis-plus-extend/src/main/java/org/dromara/trans/extend/MybatisPlusTransableAdapter.java similarity index 95% rename from easy-trans-mybatis-plus-extend/src/main/java/com/fhs/trans/extend/MybatisPlusTransableAdapter.java rename to easy-trans-mybatis-plus-extend/src/main/java/org/dromara/trans/extend/MybatisPlusTransableAdapter.java index ba94b8c634bea68bf8b405ff383f250963440244..5afb07c0fd77015b71fbc00e6c585647d01cb1e6 100644 --- a/easy-trans-mybatis-plus-extend/src/main/java/com/fhs/trans/extend/MybatisPlusTransableAdapter.java +++ b/easy-trans-mybatis-plus-extend/src/main/java/org/dromara/trans/extend/MybatisPlusTransableAdapter.java @@ -1,11 +1,11 @@ -package com.fhs.trans.extend; +package org.dromara.trans.extend; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.enums.SqlMethod; import com.baomidou.mybatisplus.core.toolkit.GlobalConfigUtils; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; -import com.fhs.core.trans.vo.VO; -import com.fhs.trans.service.AutoTransable; +import org.dromara.core.trans.vo.VO; +import org.dromara.trans.service.AutoTransable; import org.apache.ibatis.session.SqlSession; import org.mybatis.spring.SqlSessionUtils; diff --git a/easy-trans-mybatis-plus-extend/src/main/java/com/fhs/trans/extend/MybatisPlusTransableRegister.java b/easy-trans-mybatis-plus-extend/src/main/java/org/dromara/trans/extend/MybatisPlusTransableRegister.java similarity index 88% rename from easy-trans-mybatis-plus-extend/src/main/java/com/fhs/trans/extend/MybatisPlusTransableRegister.java rename to easy-trans-mybatis-plus-extend/src/main/java/org/dromara/trans/extend/MybatisPlusTransableRegister.java index 21c071838aea8e5aa919e8d82ae4435e26f3b433..2a064bc9fff3ce08ebd277a651d1c2221486b54f 100644 --- a/easy-trans-mybatis-plus-extend/src/main/java/com/fhs/trans/extend/MybatisPlusTransableRegister.java +++ b/easy-trans-mybatis-plus-extend/src/main/java/org/dromara/trans/extend/MybatisPlusTransableRegister.java @@ -1,11 +1,11 @@ -package com.fhs.trans.extend; +package org.dromara.trans.extend; import com.baomidou.mybatisplus.annotation.TableName; -import com.fhs.common.spring.SpringContextUtil; -import com.fhs.core.trans.anno.AutoTrans; -import com.fhs.core.trans.vo.VO; -import com.fhs.trans.service.AutoTransable; -import com.fhs.trans.service.impl.AutoTransService; +import org.dromara.common.spring.SpringContextUtil; +import org.dromara.core.trans.anno.AutoTrans; +import org.dromara.core.trans.vo.VO; +import org.dromara.trans.service.AutoTransable; +import org.dromara.trans.service.impl.AutoTransService; import lombok.Data; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.event.ApplicationReadyEvent; diff --git a/easy-trans-mybatis-plus-extend/src/main/resources/META-INF/spring.factories b/easy-trans-mybatis-plus-extend/src/main/resources/META-INF/spring.factories index e20942572c5fe0ab4a209aeda9f0ebd155937b70..3b1d53492e5710cf0c737b11159178885a645db7 100644 --- a/easy-trans-mybatis-plus-extend/src/main/resources/META-INF/spring.factories +++ b/easy-trans-mybatis-plus-extend/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.fhs.trans.config.EasyTransMybatisPlusConfig +org.dromara.trans.config.EasyTransMybatisPlusConfig diff --git a/easy-trans-mybatis-plus-extend/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/easy-trans-mybatis-plus-extend/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 10fe13a76cde6d653ff38e566632958a4b64c7f1..a44f295b77aca0bfa90fa03543f408910d0802cd 100644 --- a/easy-trans-mybatis-plus-extend/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/easy-trans-mybatis-plus-extend/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.fhs.trans.config.EasyTransMybatisPlusConfig \ No newline at end of file +org.dromara.trans.config.EasyTransMybatisPlusConfig \ No newline at end of file diff --git a/easy-trans-service/pom.xml b/easy-trans-service/pom.xml index a13924c858b0177124cf11918e8f0b90d1921b6c..7be415b132a0dc88b1366316fa2be44dc2637002 100644 --- a/easy-trans-service/pom.xml +++ b/easy-trans-service/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.fhs-opensource + org.dromara easy-trans ${revision} @@ -21,7 +21,7 @@ spring-data-redis - com.fhs-opensource + org.dromara easy-trans-anno diff --git a/easy-trans-service/src/main/java/com/fhs/cache/service/BothCacheService.java b/easy-trans-service/src/main/java/org/dromara/cache/service/BothCacheService.java similarity index 93% rename from easy-trans-service/src/main/java/com/fhs/cache/service/BothCacheService.java rename to easy-trans-service/src/main/java/org/dromara/cache/service/BothCacheService.java index 8bc7b23579ace3978e5ce02c09efc0be1b385e24..288c4189343f0b1ec32642be062821effef20617 100644 --- a/easy-trans-service/src/main/java/com/fhs/cache/service/BothCacheService.java +++ b/easy-trans-service/src/main/java/org/dromara/cache/service/BothCacheService.java @@ -1,11 +1,9 @@ -package com.fhs.cache.service; +package org.dromara.cache.service; -import com.fhs.common.utils.StringUtil; +import org.dromara.common.utils.StringUtil; import lombok.Data; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Primary; -import org.springframework.stereotype.Component; import java.util.*; import java.util.concurrent.ConcurrentHashMap; diff --git a/easy-trans-service/src/main/java/com/fhs/cache/service/RedisCacheService.java b/easy-trans-service/src/main/java/org/dromara/cache/service/RedisCacheService.java similarity index 92% rename from easy-trans-service/src/main/java/com/fhs/cache/service/RedisCacheService.java rename to easy-trans-service/src/main/java/org/dromara/cache/service/RedisCacheService.java index 980fd6509adffa3b7685e7106c36ac8392104eef..24218a3c62efdc442935a021d8eecce7feab919f 100644 --- a/easy-trans-service/src/main/java/com/fhs/cache/service/RedisCacheService.java +++ b/easy-trans-service/src/main/java/org/dromara/cache/service/RedisCacheService.java @@ -1,15 +1,11 @@ -package com.fhs.cache.service; +package org.dromara.cache.service; -import com.fhs.common.constant.Constant; import lombok.Data; import org.springframework.dao.DataAccessException; import org.springframework.data.redis.connection.RedisConnection; import org.springframework.data.redis.core.*; import org.springframework.data.redis.serializer.RedisSerializer; -import org.springframework.util.CollectionUtils; -import java.util.HashSet; -import java.util.List; import java.util.Set; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; diff --git a/easy-trans-service/src/main/java/com/fhs/cache/service/TransCacheManager.java b/easy-trans-service/src/main/java/org/dromara/cache/service/TransCacheManager.java similarity index 85% rename from easy-trans-service/src/main/java/com/fhs/cache/service/TransCacheManager.java rename to easy-trans-service/src/main/java/org/dromara/cache/service/TransCacheManager.java index e52cadd178e0d6d9e03a420bb8049df7ffe96227..269108480f82160ffbbfe97add29ccde3ed62ce4 100644 --- a/easy-trans-service/src/main/java/com/fhs/cache/service/TransCacheManager.java +++ b/easy-trans-service/src/main/java/org/dromara/cache/service/TransCacheManager.java @@ -1,13 +1,11 @@ -package com.fhs.cache.service; +package org.dromara.cache.service; -import com.fhs.common.utils.ConverterUtils; -import com.fhs.common.utils.JsonUtils; -import com.fhs.core.trans.constant.TransType; -import com.fhs.trans.service.impl.RpcTransService; -import com.fhs.trans.service.impl.SimpleTransService; -import org.springframework.beans.factory.InitializingBean; +import org.dromara.common.utils.ConverterUtils; +import org.dromara.common.utils.JsonUtils; +import org.dromara.core.trans.constant.TransType; +import org.dromara.trans.service.impl.RpcTransService; +import org.dromara.trans.service.impl.SimpleTransService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; import java.util.HashMap; import java.util.Map; diff --git a/easy-trans-service/src/main/java/com/fhs/common/constant/Constant.java b/easy-trans-service/src/main/java/org/dromara/common/constant/Constant.java similarity index 99% rename from easy-trans-service/src/main/java/com/fhs/common/constant/Constant.java rename to easy-trans-service/src/main/java/org/dromara/common/constant/Constant.java index 3afbe74ed1a15ea7ae00725040c767738a00133c..c41b0a76448c392cc19bd05bcec0c54045c86f21 100644 --- a/easy-trans-service/src/main/java/com/fhs/common/constant/Constant.java +++ b/easy-trans-service/src/main/java/org/dromara/common/constant/Constant.java @@ -1,4 +1,4 @@ -package com.fhs.common.constant; +package org.dromara.common.constant; /** * <公共常量接口> diff --git a/easy-trans-service/src/main/java/com/fhs/common/constant/TransConfig.java b/easy-trans-service/src/main/java/org/dromara/common/constant/TransConfig.java similarity index 75% rename from easy-trans-service/src/main/java/com/fhs/common/constant/TransConfig.java rename to easy-trans-service/src/main/java/org/dromara/common/constant/TransConfig.java index 6d5f99afec86bcd50c49c805265e3aae76fa90d8..68fefedcbf6f9868bb007e9218ae0aaa294b1adf 100644 --- a/easy-trans-service/src/main/java/com/fhs/common/constant/TransConfig.java +++ b/easy-trans-service/src/main/java/org/dromara/common/constant/TransConfig.java @@ -1,6 +1,6 @@ -package com.fhs.common.constant; +package org.dromara.common.constant; -import com.fhs.trans.ds.DataSourceSetter; +import org.dromara.trans.ds.DataSourceSetter; /** * 配置类 * diff --git a/easy-trans-service/src/main/java/com/fhs/common/spring/AnnotationTypeFilterBuilder.java b/easy-trans-service/src/main/java/org/dromara/common/spring/AnnotationTypeFilterBuilder.java similarity index 92% rename from easy-trans-service/src/main/java/com/fhs/common/spring/AnnotationTypeFilterBuilder.java rename to easy-trans-service/src/main/java/org/dromara/common/spring/AnnotationTypeFilterBuilder.java index c71a23330b3eacc790a5024df7f5540177e88cf6..10468aadb26a187b75c9a96c083b412c1cc94174 100644 --- a/easy-trans-service/src/main/java/com/fhs/common/spring/AnnotationTypeFilterBuilder.java +++ b/easy-trans-service/src/main/java/org/dromara/common/spring/AnnotationTypeFilterBuilder.java @@ -1,4 +1,4 @@ -package com.fhs.common.spring; +package org.dromara.common.spring; import org.springframework.core.type.filter.AnnotationTypeFilter; import org.springframework.core.type.filter.TypeFilter; diff --git a/easy-trans-service/src/main/java/com/fhs/common/spring/ScannerUtils.java b/easy-trans-service/src/main/java/org/dromara/common/spring/ScannerUtils.java similarity index 97% rename from easy-trans-service/src/main/java/com/fhs/common/spring/ScannerUtils.java rename to easy-trans-service/src/main/java/org/dromara/common/spring/ScannerUtils.java index b4f164ac872b739a9bd9c006987876d783bfba0a..b0463e0c6239ae34f2e0f2133eaa713987d423d3 100644 --- a/easy-trans-service/src/main/java/com/fhs/common/spring/ScannerUtils.java +++ b/easy-trans-service/src/main/java/org/dromara/common/spring/ScannerUtils.java @@ -1,4 +1,4 @@ -package com.fhs.common.spring; +package org.dromara.common.spring; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/easy-trans-service/src/main/java/com/fhs/common/spring/SpelUtil.java b/easy-trans-service/src/main/java/org/dromara/common/spring/SpelUtil.java similarity index 97% rename from easy-trans-service/src/main/java/com/fhs/common/spring/SpelUtil.java rename to easy-trans-service/src/main/java/org/dromara/common/spring/SpelUtil.java index fe7450a92f4cb0fbd418e5b2b21ad082b2a38131..978ba5f107d8b9cc0883ad161ee0032afb49f2c0 100644 --- a/easy-trans-service/src/main/java/com/fhs/common/spring/SpelUtil.java +++ b/easy-trans-service/src/main/java/org/dromara/common/spring/SpelUtil.java @@ -1,4 +1,4 @@ -package com.fhs.common.spring; +package org.dromara.common.spring; import org.springframework.context.expression.MethodBasedEvaluationContext; import org.springframework.core.LocalVariableTableParameterNameDiscoverer; @@ -12,7 +12,7 @@ import java.lang.reflect.Method; * Spel 表达式解析器 * * @ProjectName: framework_v2_idea2 - * @Package: com.fhs.common.spring + * @Package: org.dromara.common.spring * @ClassName: SpelUtil * @Author: JackWang * @CreateDate: 2019/1/8 0008 14:24 diff --git a/easy-trans-service/src/main/java/com/fhs/common/spring/SpringClassScanner.java b/easy-trans-service/src/main/java/org/dromara/common/spring/SpringClassScanner.java similarity index 99% rename from easy-trans-service/src/main/java/com/fhs/common/spring/SpringClassScanner.java rename to easy-trans-service/src/main/java/org/dromara/common/spring/SpringClassScanner.java index 9ff7b78d3adb9e7a768a51813d444e33a5a52bea..846436fa8f4ece21c21e63162e25a2c8757db4bf 100644 --- a/easy-trans-service/src/main/java/com/fhs/common/spring/SpringClassScanner.java +++ b/easy-trans-service/src/main/java/org/dromara/common/spring/SpringClassScanner.java @@ -1,4 +1,4 @@ -package com.fhs.common.spring; +package org.dromara.common.spring; import org.springframework.core.io.Resource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; diff --git a/easy-trans-service/src/main/java/com/fhs/common/spring/SpringContextUtil.java b/easy-trans-service/src/main/java/org/dromara/common/spring/SpringContextUtil.java similarity index 99% rename from easy-trans-service/src/main/java/com/fhs/common/spring/SpringContextUtil.java rename to easy-trans-service/src/main/java/org/dromara/common/spring/SpringContextUtil.java index 03daf328bde711bea74b061dc825d977eb476412..1d6321fe77186a8c63ea05f4a70c41364a67c894 100644 --- a/easy-trans-service/src/main/java/com/fhs/common/spring/SpringContextUtil.java +++ b/easy-trans-service/src/main/java/org/dromara/common/spring/SpringContextUtil.java @@ -1,4 +1,4 @@ -package com.fhs.common.spring; +package org.dromara.common.spring; import lombok.extern.slf4j.Slf4j; import org.springframework.aop.framework.AdvisedSupport; @@ -8,7 +8,6 @@ import org.springframework.beans.BeansException; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; -import org.springframework.stereotype.Component; import java.lang.reflect.Field; import java.lang.reflect.ParameterizedType; diff --git a/easy-trans-service/src/main/java/com/fhs/common/utils/CheckUtils.java b/easy-trans-service/src/main/java/org/dromara/common/utils/CheckUtils.java similarity index 98% rename from easy-trans-service/src/main/java/com/fhs/common/utils/CheckUtils.java rename to easy-trans-service/src/main/java/org/dromara/common/utils/CheckUtils.java index 913c6a3dd5dc18297c97fbf0309c2003ff4dc7de..7cb289b19c28bc806859fd7332c5f7579574263e 100644 --- a/easy-trans-service/src/main/java/com/fhs/common/utils/CheckUtils.java +++ b/easy-trans-service/src/main/java/org/dromara/common/utils/CheckUtils.java @@ -1,10 +1,8 @@ -package com.fhs.common.utils; +package org.dromara.common.utils; -import com.fhs.common.constant.Constant; +import org.dromara.common.constant.Constant; -import java.util.ArrayList; import java.util.Collection; -import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Stream; diff --git a/easy-trans-service/src/main/java/com/fhs/common/utils/ConverterUtils.java b/easy-trans-service/src/main/java/org/dromara/common/utils/ConverterUtils.java similarity index 99% rename from easy-trans-service/src/main/java/com/fhs/common/utils/ConverterUtils.java rename to easy-trans-service/src/main/java/org/dromara/common/utils/ConverterUtils.java index 4f5390471a7eb5b0e823709ecf87c4437cbb37e2..af105802058e663041dc4f389fb419c70f37b87e 100644 --- a/easy-trans-service/src/main/java/com/fhs/common/utils/ConverterUtils.java +++ b/easy-trans-service/src/main/java/org/dromara/common/utils/ConverterUtils.java @@ -1,4 +1,4 @@ -package com.fhs.common.utils; +package org.dromara.common.utils; import java.util.*; diff --git a/easy-trans-service/src/main/java/com/fhs/common/utils/JsonUtils.java b/easy-trans-service/src/main/java/org/dromara/common/utils/JsonUtils.java similarity index 98% rename from easy-trans-service/src/main/java/com/fhs/common/utils/JsonUtils.java rename to easy-trans-service/src/main/java/org/dromara/common/utils/JsonUtils.java index 172e6549a6d49d930ab6f1757b9b2f5f1fced05b..ddb040ce036d54193e50f4d0e0029fa2b9d307ee 100644 --- a/easy-trans-service/src/main/java/com/fhs/common/utils/JsonUtils.java +++ b/easy-trans-service/src/main/java/org/dromara/common/utils/JsonUtils.java @@ -1,4 +1,4 @@ -package com.fhs.common.utils; +package org.dromara.common.utils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; @@ -6,10 +6,7 @@ import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.alibaba.fastjson.serializer.SerializeConfig; import com.alibaba.fastjson.serializer.SerializerFeature; -import com.alibaba.fastjson.serializer.SimpleDateFormatSerializer; -import java.io.IOException; -import java.io.PrintWriter; import java.util.*; /** diff --git a/easy-trans-service/src/main/java/com/fhs/common/utils/StringUtil.java b/easy-trans-service/src/main/java/org/dromara/common/utils/StringUtil.java similarity index 99% rename from easy-trans-service/src/main/java/com/fhs/common/utils/StringUtil.java rename to easy-trans-service/src/main/java/org/dromara/common/utils/StringUtil.java index 4d897edaa81fd58f9be35ad75be00ce4e51b338d..0425b7a9a16b28691cdd9c995a75d5b77bd59758 100644 --- a/easy-trans-service/src/main/java/com/fhs/common/utils/StringUtil.java +++ b/easy-trans-service/src/main/java/org/dromara/common/utils/StringUtil.java @@ -1,6 +1,6 @@ -package com.fhs.common.utils; +package org.dromara.common.utils; -import com.fhs.core.trans.util.ReflectUtils; +import org.dromara.core.trans.util.ReflectUtils; import lombok.extern.slf4j.Slf4j; import java.io.UnsupportedEncodingException; diff --git a/easy-trans-service/src/main/java/com/fhs/exception/ParamException.java b/easy-trans-service/src/main/java/org/dromara/exception/ParamException.java similarity index 86% rename from easy-trans-service/src/main/java/com/fhs/exception/ParamException.java rename to easy-trans-service/src/main/java/org/dromara/exception/ParamException.java index c2fbf29a9b66b1a6024e6e24bec0a5e0f5f64ece..46a31e40a1cd108244474217dd688eca4a17201e 100644 --- a/easy-trans-service/src/main/java/com/fhs/exception/ParamException.java +++ b/easy-trans-service/src/main/java/org/dromara/exception/ParamException.java @@ -1,4 +1,4 @@ -package com.fhs.exception; +package org.dromara.exception; /** diff --git a/easy-trans-service/src/main/java/com/fhs/trans/advice/EasyTransResponseBodyAdvice.java b/easy-trans-service/src/main/java/org/dromara/trans/advice/EasyTransResponseBodyAdvice.java similarity index 90% rename from easy-trans-service/src/main/java/com/fhs/trans/advice/EasyTransResponseBodyAdvice.java rename to easy-trans-service/src/main/java/org/dromara/trans/advice/EasyTransResponseBodyAdvice.java index 93b465f479cdab18ada4dba1b2142561f464371d..dbcc7ea4957ffeb704716af50ce5254d66614018 100644 --- a/easy-trans-service/src/main/java/com/fhs/trans/advice/EasyTransResponseBodyAdvice.java +++ b/easy-trans-service/src/main/java/org/dromara/trans/advice/EasyTransResponseBodyAdvice.java @@ -1,10 +1,9 @@ -package com.fhs.trans.advice; +package org.dromara.trans.advice; -import com.fhs.core.trans.anno.IgnoreTrans; -import com.fhs.core.trans.anno.TransSett; -import com.fhs.core.trans.vo.VO; -import com.fhs.trans.service.impl.TransService; -import com.fhs.trans.utils.TransUtil; +import org.dromara.core.trans.anno.IgnoreTrans; +import org.dromara.core.trans.anno.TransSett; +import org.dromara.trans.service.impl.TransService; +import org.dromara.trans.utils.TransUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; diff --git a/easy-trans-service/src/main/java/com/fhs/trans/advice/ReleaseTransCacheAdvice.java b/easy-trans-service/src/main/java/org/dromara/trans/advice/ReleaseTransCacheAdvice.java similarity index 89% rename from easy-trans-service/src/main/java/com/fhs/trans/advice/ReleaseTransCacheAdvice.java rename to easy-trans-service/src/main/java/org/dromara/trans/advice/ReleaseTransCacheAdvice.java index e82d8e8384c00b4ede6158943c778a2fa4f5c105..b7c00c00ca0a51fc64cc2eb3b2e579ebf9a60480 100644 --- a/easy-trans-service/src/main/java/com/fhs/trans/advice/ReleaseTransCacheAdvice.java +++ b/easy-trans-service/src/main/java/org/dromara/trans/advice/ReleaseTransCacheAdvice.java @@ -1,6 +1,6 @@ -package com.fhs.trans.advice; +package org.dromara.trans.advice; -import com.fhs.core.trans.vo.VO; +import org.dromara.core.trans.vo.VO; import com.github.benmanes.caffeine.cache.Caffeine; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.ControllerAdvice; diff --git a/easy-trans-service/src/main/java/com/fhs/trans/aop/TransMethodResultAop.java b/easy-trans-service/src/main/java/org/dromara/trans/aop/TransMethodResultAop.java similarity index 89% rename from easy-trans-service/src/main/java/com/fhs/trans/aop/TransMethodResultAop.java rename to easy-trans-service/src/main/java/org/dromara/trans/aop/TransMethodResultAop.java index ced2775357132a302bada0b3d4d5dfcd029ab083..a623dddf261ae9ba96d9a35a5522433fcd404892 100644 --- a/easy-trans-service/src/main/java/com/fhs/trans/aop/TransMethodResultAop.java +++ b/easy-trans-service/src/main/java/org/dromara/trans/aop/TransMethodResultAop.java @@ -1,10 +1,8 @@ -package com.fhs.trans.aop; +package org.dromara.trans.aop; -import com.fhs.core.trans.anno.TransSett; -import com.fhs.core.trans.util.ReflectUtils; -import com.fhs.core.trans.vo.VO; -import com.fhs.trans.service.impl.TransService; -import com.fhs.trans.utils.TransUtil; +import org.dromara.core.trans.anno.TransSett; +import org.dromara.trans.service.impl.TransService; +import org.dromara.trans.utils.TransUtil; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; @@ -14,7 +12,6 @@ import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.*; @@ -43,7 +40,7 @@ public class TransMethodResultAop implements InitializingBean { @Autowired private TransService transService; - @Around("@annotation(com.fhs.core.trans.anno.TransMethodResult)") + @Around("@annotation(org.dromara.core.trans.anno.TransMethodResult)") public Object transResult(ProceedingJoinPoint joinPoint) throws Throwable { Object proceed = null; Set includeFields = null; diff --git a/easy-trans-service/src/main/java/com/fhs/trans/controller/TransProxyController.java b/easy-trans-service/src/main/java/org/dromara/trans/controller/TransProxyController.java similarity index 71% rename from easy-trans-service/src/main/java/com/fhs/trans/controller/TransProxyController.java rename to easy-trans-service/src/main/java/org/dromara/trans/controller/TransProxyController.java index be2d11b280942675034c43513fd8dca8e419cc06..1f88670b5bada049cb4c311bdeea8c84f4765a19 100644 --- a/easy-trans-service/src/main/java/com/fhs/trans/controller/TransProxyController.java +++ b/easy-trans-service/src/main/java/org/dromara/trans/controller/TransProxyController.java @@ -1,16 +1,19 @@ -package com.fhs.trans.controller; +package org.dromara.trans.controller; -import com.fhs.common.utils.ConverterUtils; -import com.fhs.common.utils.StringUtil; -import com.fhs.core.trans.util.ReflectUtils; -import com.fhs.core.trans.vo.VO; -import com.fhs.trans.service.impl.SimpleTransService; -import com.fhs.trans.vo.BasicVO; -import com.fhs.trans.vo.FindByIdsQueryPayload; +import org.dromara.common.utils.ConverterUtils; +import org.dromara.common.utils.StringUtil; +import org.dromara.core.trans.anno.RpcTrans; +import org.dromara.core.trans.util.ReflectUtils; +import org.dromara.core.trans.vo.VO; +import org.dromara.trans.service.impl.SimpleTransService; +import org.dromara.trans.vo.BasicVO; +import org.dromara.trans.vo.FindByIdsQueryPayload; import lombok.Data; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; + import java.io.Serializable; import java.lang.reflect.Field; import java.util.Arrays; @@ -28,6 +31,9 @@ import java.util.stream.Collectors; @RequestMapping("/easyTrans/proxy") public class TransProxyController { + @Value("${easy-trans.is-enable-custom-rpc:false}") + private Boolean customRpc; + private SimpleTransService.SimpleTransDiver simpleTransDiver; @@ -40,7 +46,11 @@ public class TransProxyController { public List findByIds(@PathVariable("targetClass") String targetClass, @RequestBody FindByIdsQueryPayload payload) throws ClassNotFoundException { Assert.notNull(targetClass, "targetClass 不可为空"); List ids = payload.getIds(); - Class fieldType = getPkeyFieldType(targetClass); + Class poClazz = (Class) Class.forName(targetClass); + if(customRpc && !poClazz.isAnnotationPresent(RpcTrans.class)){ + throw new IllegalArgumentException(targetClass + "没有被标记@RpcTrans 注解"); + } + Class fieldType = getPkeyFieldType(poClazz); // 如果字段类型不是String，则转换 if (fieldType == int.class || fieldType == Integer.class) { ids = payload.getIds().stream().filter(id -> { @@ -55,7 +65,7 @@ public class TransProxyController { if(payload.getTargetFields()!=null && payload.getTargetFields().length!=0){ targetFields = new HashSet<>(Arrays.asList(payload.getTargetFields())); } - return simpleTransDiver.findByIds(ids, (Class) Class.forName(targetClass),payload.getUniqueField(),targetFields).stream().map(vo -> { + return simpleTransDiver.findByIds(ids, poClazz,payload.getUniqueField(),targetFields).stream().map(vo -> { try { return vo2BasicVO(vo); } catch (IllegalAccessException e) { @@ -70,8 +80,8 @@ public class TransProxyController { * @return 主键字段类型 * @throws ClassNotFoundException 如果类不存在 */ - private Class getPkeyFieldType(String targetClass) throws ClassNotFoundException { - return ReflectUtils.getIdField(Class.forName(targetClass),true).getType(); + private Class getPkeyFieldType(Class targetClass) throws ClassNotFoundException { + return ReflectUtils.getIdField(targetClass,true).getType(); } /** @@ -102,7 +112,11 @@ public class TransProxyController { Assert.notNull(targetClass, "targetClass 不可为空"); Assert.notNull(targetClass, "id 不可为空"); Serializable sid = id; - Class fieldType = getPkeyFieldType(targetClass); + Class poClazz = (Class) Class.forName(targetClass); + if(customRpc && !poClazz.isAnnotationPresent(RpcTrans.class)){ + throw new IllegalArgumentException(targetClass + "没有被标记@RpcTrans 注解"); + } + Class fieldType = getPkeyFieldType(poClazz); // 如果字段类型不是String，则转换 if (fieldType == int.class || fieldType == Integer.class) { sid = Integer.valueOf(id); @@ -113,7 +127,7 @@ public class TransProxyController { if(!StringUtil.isEmpty(targetFields) && !"null".equals(targetFields)){ targetFieldSet = new HashSet<>(Arrays.asList(targetFields.split(","))); } - VO vo = simpleTransDiver.findById(sid, (Class) Class.forName(targetClass),uniqueField,targetFieldSet); + VO vo = simpleTransDiver.findById(sid, poClazz,uniqueField,targetFieldSet); if (vo == null) { return null; } diff --git a/easy-trans-service/src/main/java/com/fhs/trans/ds/DataSourceSetter.java b/easy-trans-service/src/main/java/org/dromara/trans/ds/DataSourceSetter.java similarity index 65% rename from easy-trans-service/src/main/java/com/fhs/trans/ds/DataSourceSetter.java rename to easy-trans-service/src/main/java/org/dromara/trans/ds/DataSourceSetter.java index 1a9b4d18fe6642b424969455fc27607f44e676b4..3fecaefc7ba516e004468fad7137e2ff1410fa04 100644 --- a/easy-trans-service/src/main/java/com/fhs/trans/ds/DataSourceSetter.java +++ b/easy-trans-service/src/main/java/org/dromara/trans/ds/DataSourceSetter.java @@ -1,4 +1,4 @@ -package com.fhs.trans.ds; +package org.dromara.trans.ds; import java.util.Map; @@ -24,4 +24,12 @@ public interface DataSourceSetter { * @param context */ void setContext(Map context); + + /** + * 清空本地线程数据源 + *

+ * 防止内存泄漏，如手动调用了push可调用此方法确保清除 + *

+ */ + void clear(String dataSourceName); } diff --git a/easy-trans-service/src/main/java/com/fhs/trans/fi/LocaleGetter.java b/easy-trans-service/src/main/java/org/dromara/trans/fi/LocaleGetter.java similarity index 85% rename from easy-trans-service/src/main/java/com/fhs/trans/fi/LocaleGetter.java rename to easy-trans-service/src/main/java/org/dromara/trans/fi/LocaleGetter.java index 7ac07c805a1dec03386231f3c2a1c92ad804d004..114cb65aa6bcbe024d9191e55fefdc89d18e9210 100644 --- a/easy-trans-service/src/main/java/com/fhs/trans/fi/LocaleGetter.java +++ b/easy-trans-service/src/main/java/org/dromara/trans/fi/LocaleGetter.java @@ -1,4 +1,4 @@ -package com.fhs.trans.fi; +package org.dromara.trans.fi; /** * 国际化 diff --git a/easy-trans-service/src/main/java/com/fhs/trans/fi/TransRefresher.java b/easy-trans-service/src/main/java/org/dromara/trans/fi/TransRefresher.java similarity index 92% rename from easy-trans-service/src/main/java/com/fhs/trans/fi/TransRefresher.java rename to easy-trans-service/src/main/java/org/dromara/trans/fi/TransRefresher.java index 3013f9bad23cd05cda87c8d05455a60d1f864113..9dbfa6a2338825f50260672d420e6cc2de282e92 100644 --- a/easy-trans-service/src/main/java/com/fhs/trans/fi/TransRefresher.java +++ b/easy-trans-service/src/main/java/org/dromara/trans/fi/TransRefresher.java @@ -1,4 +1,4 @@ -package com.fhs.trans.fi; +package org.dromara.trans.fi; import java.util.Map; diff --git a/easy-trans-service/src/main/java/com/fhs/trans/listener/TransMessageListener.java b/easy-trans-service/src/main/java/org/dromara/trans/listener/TransMessageListener.java similarity index 89% rename from easy-trans-service/src/main/java/com/fhs/trans/listener/TransMessageListener.java rename to easy-trans-service/src/main/java/org/dromara/trans/listener/TransMessageListener.java index 86b4de91473adca720f7bf339464c974b9b575d3..e7536dfda973c4174c0c57050685a5f24a4fbe06 100644 --- a/easy-trans-service/src/main/java/com/fhs/trans/listener/TransMessageListener.java +++ b/easy-trans-service/src/main/java/org/dromara/trans/listener/TransMessageListener.java @@ -1,10 +1,9 @@ -package com.fhs.trans.listener; +package org.dromara.trans.listener; -import com.fhs.common.utils.JsonUtils; +import org.dromara.common.utils.JsonUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; -import com.fhs.trans.fi.TransRefresher; +import org.dromara.trans.fi.TransRefresher; import java.util.HashMap; import java.util.Map; diff --git a/easy-trans-service/src/main/java/com/fhs/trans/manager/CacheManager.java b/easy-trans-service/src/main/java/org/dromara/trans/manager/CacheManager.java similarity index 91% rename from easy-trans-service/src/main/java/com/fhs/trans/manager/CacheManager.java rename to easy-trans-service/src/main/java/org/dromara/trans/manager/CacheManager.java index 26077bf6d0a249326992b66e8b440e36aa0ac50b..5599962dcb852854e7428ad4adad669fe65c5796 100644 --- a/easy-trans-service/src/main/java/com/fhs/trans/manager/CacheManager.java +++ b/easy-trans-service/src/main/java/org/dromara/trans/manager/CacheManager.java @@ -1,4 +1,4 @@ -package com.fhs.trans.manager; +package org.dromara.trans.manager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/easy-trans-service/src/main/java/com/fhs/trans/manager/ClassInfo.java b/easy-trans-service/src/main/java/org/dromara/trans/manager/ClassInfo.java similarity index 96% rename from easy-trans-service/src/main/java/com/fhs/trans/manager/ClassInfo.java rename to easy-trans-service/src/main/java/org/dromara/trans/manager/ClassInfo.java index cae577b9ff6a6b40012bdc2b233e9e05fe32115e..cd1abb4a2335e8b113323bad5879689fa74186c6 100644 --- a/easy-trans-service/src/main/java/com/fhs/trans/manager/ClassInfo.java +++ b/easy-trans-service/src/main/java/org/dromara/trans/manager/ClassInfo.java @@ -1,8 +1,8 @@ -package com.fhs.trans.manager; +package org.dromara.trans.manager; -import com.fhs.core.trans.anno.Trans; -import com.fhs.core.trans.anno.UnTrans; -import com.fhs.core.trans.util.ReflectUtils; +import org.dromara.core.trans.anno.Trans; +import org.dromara.core.trans.anno.UnTrans; +import org.dromara.core.trans.util.ReflectUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/easy-trans-service/src/main/java/com/fhs/trans/manager/ClassManager.java b/easy-trans-service/src/main/java/org/dromara/trans/manager/ClassManager.java similarity index 95% rename from easy-trans-service/src/main/java/com/fhs/trans/manager/ClassManager.java rename to easy-trans-service/src/main/java/org/dromara/trans/manager/ClassManager.java index 40e5c4287544867f2c5dcf540bc0c771185a4628..89b1d25ef7c823d1d4d3c5a15c325c5fda8d9149 100644 --- a/easy-trans-service/src/main/java/com/fhs/trans/manager/ClassManager.java +++ b/easy-trans-service/src/main/java/org/dromara/trans/manager/ClassManager.java @@ -1,6 +1,6 @@ -package com.fhs.trans.manager; +package org.dromara.trans.manager; -import com.fhs.exception.ParamException; +import org.dromara.exception.ParamException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; diff --git a/easy-trans-service/src/main/java/com/fhs/trans/service/AutoTransable.java b/easy-trans-service/src/main/java/org/dromara/trans/service/AutoTransable.java similarity index 92% rename from easy-trans-service/src/main/java/com/fhs/trans/service/AutoTransable.java rename to easy-trans-service/src/main/java/org/dromara/trans/service/AutoTransable.java index 23e39222116cfad1efe1b8971cd8155cd9eac2be..312ed6b1608e6f60d7ed02a301a3afb0df2c7d7b 100644 --- a/easy-trans-service/src/main/java/com/fhs/trans/service/AutoTransable.java +++ b/easy-trans-service/src/main/java/org/dromara/trans/service/AutoTransable.java @@ -1,7 +1,7 @@ -package com.fhs.trans.service; +package org.dromara.trans.service; -import com.fhs.core.trans.vo.VO; +import org.dromara.core.trans.vo.VO; import java.util.ArrayList; import java.util.List; diff --git a/easy-trans-service/src/main/java/com/fhs/trans/service/impl/AutoTransService.java b/easy-trans-service/src/main/java/org/dromara/trans/service/impl/AutoTransService.java similarity index 94% rename from easy-trans-service/src/main/java/com/fhs/trans/service/impl/AutoTransService.java rename to easy-trans-service/src/main/java/org/dromara/trans/service/impl/AutoTransService.java index 51456493146c4dab0d499b9157201392a3aa7b18..a554a51f4797a2c08ec4cc9d1cbf4930eadc0fe7 100644 --- a/easy-trans-service/src/main/java/com/fhs/trans/service/impl/AutoTransService.java +++ b/easy-trans-service/src/main/java/org/dromara/trans/service/impl/AutoTransService.java @@ -1,22 +1,21 @@ -package com.fhs.trans.service.impl; - - -import com.fhs.cache.service.RedisCacheService; -import com.fhs.common.spring.AnnotationTypeFilterBuilder; -import com.fhs.common.spring.SpringClassScanner; -import com.fhs.common.utils.CheckUtils; -import com.fhs.common.utils.ConverterUtils; -import com.fhs.core.trans.anno.AutoTrans; -import com.fhs.core.trans.anno.Trans; -import com.fhs.core.trans.constant.TransType; -import com.fhs.core.trans.util.ReflectUtils; -import com.fhs.core.trans.vo.VO; -import com.fhs.trans.listener.TransMessageListener; -import com.fhs.trans.service.AutoTransable; +package org.dromara.trans.service.impl; + + +import org.dromara.cache.service.RedisCacheService; +import org.dromara.common.spring.AnnotationTypeFilterBuilder; +import org.dromara.common.spring.SpringClassScanner; +import org.dromara.common.utils.CheckUtils; +import org.dromara.common.utils.ConverterUtils; +import org.dromara.core.trans.anno.AutoTrans; +import org.dromara.core.trans.anno.Trans; +import org.dromara.core.trans.constant.TransType; +import org.dromara.core.trans.util.ReflectUtils; +import org.dromara.core.trans.vo.VO; +import org.dromara.trans.listener.TransMessageListener; +import org.dromara.trans.service.AutoTransable; import lombok.Data; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.aop.support.AopUtils; import org.springframework.beans.factory.InitializingBean; import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.context.ApplicationListener; @@ -231,13 +230,7 @@ public class AutoTransService implements ITransTypeService, InitializingBean, Ap continue; } Class baseServiceClass = baseService.getClass(); - AutoTrans autoTransSett; - // 判断是否为代理类 如果是代理类需要获取原始类 - if(AopUtils.isAopProxy(baseService)){ - autoTransSett = AnnotationUtils.findAnnotation(baseServiceClass, AutoTrans.class); - } else { - autoTransSett = baseServiceClass.getAnnotation(AutoTrans.class); - } + AutoTrans autoTransSett = AnnotationUtils.findAnnotation(baseServiceClass, AutoTrans.class); this.baseServiceMap.put(autoTransSett.namespace(), (AutoTransable) baseService); this.transSettMap.put(autoTransSett.namespace(), autoTransSett); } @@ -390,8 +383,7 @@ public class AutoTransService implements ITransTypeService, InitializingBean, Ap if(transCache == null || transCache.isEmpty()){ return transCache; } - Map transCacheResult = new HashMap(); - transCacheResult.putAll(transCache); + Map transCacheResult = new LinkedHashMap<>(transCache); return transCacheResult; } @@ -451,6 +443,11 @@ public class AutoTransService implements ITransTypeService, InitializingBean, Ap this.baseServiceMap.put(autoTransSett.namespace(), transAble); this.transSettMap.put(autoTransSett.namespace(), autoTransSett); } + + @Override + public void reset() { + threadLocalCache.set(null); + } } /** diff --git a/easy-trans-service/src/main/java/com/fhs/trans/service/impl/DictionaryTransService.java b/easy-trans-service/src/main/java/org/dromara/trans/service/impl/DictionaryTransService.java similarity index 93% rename from easy-trans-service/src/main/java/com/fhs/trans/service/impl/DictionaryTransService.java rename to easy-trans-service/src/main/java/org/dromara/trans/service/impl/DictionaryTransService.java index 803df4d5703409a89f0169a68e853a60d84bf45a..d9b299f5daeb1260d3d7ba7f67862ec4cc202b29 100644 --- a/easy-trans-service/src/main/java/com/fhs/trans/service/impl/DictionaryTransService.java +++ b/easy-trans-service/src/main/java/org/dromara/trans/service/impl/DictionaryTransService.java @@ -1,17 +1,17 @@ -package com.fhs.trans.service.impl; - -import com.fhs.cache.service.BothCacheService; -import com.fhs.cache.service.RedisCacheService; -import com.fhs.common.constant.Constant; -import com.fhs.common.utils.JsonUtils; -import com.fhs.common.utils.StringUtil; -import com.fhs.core.trans.anno.Trans; -import com.fhs.core.trans.anno.UnTrans; -import com.fhs.core.trans.constant.TransType; -import com.fhs.core.trans.util.ReflectUtils; -import com.fhs.core.trans.vo.VO; -import com.fhs.trans.fi.LocaleGetter; -import com.fhs.trans.listener.TransMessageListener; +package org.dromara.trans.service.impl; + +import org.dromara.cache.service.BothCacheService; +import org.dromara.cache.service.RedisCacheService; +import org.dromara.common.constant.Constant; +import org.dromara.common.utils.JsonUtils; +import org.dromara.common.utils.StringUtil; +import org.dromara.core.trans.anno.Trans; +import org.dromara.core.trans.anno.UnTrans; +import org.dromara.core.trans.constant.TransType; +import org.dromara.core.trans.util.ReflectUtils; +import org.dromara.core.trans.vo.VO; +import org.dromara.trans.fi.LocaleGetter; +import org.dromara.trans.listener.TransMessageListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; @@ -21,7 +21,6 @@ import org.springframework.util.StringUtils; import java.lang.reflect.Field; import java.util.*; -import java.util.concurrent.ConcurrentHashMap; /** * 字典翻译服务 diff --git a/easy-trans-service/src/main/java/com/fhs/trans/service/impl/EnumTransService.java b/easy-trans-service/src/main/java/org/dromara/trans/service/impl/EnumTransService.java similarity index 85% rename from easy-trans-service/src/main/java/com/fhs/trans/service/impl/EnumTransService.java rename to easy-trans-service/src/main/java/org/dromara/trans/service/impl/EnumTransService.java index 68b730b122fe577bf0faf677dc5f4ad1f34e72a1..0fb9cdc800ce6d1f21b59fc8a03fd3165fa0830d 100644 --- a/easy-trans-service/src/main/java/com/fhs/trans/service/impl/EnumTransService.java +++ b/easy-trans-service/src/main/java/org/dromara/trans/service/impl/EnumTransService.java @@ -1,17 +1,14 @@ -package com.fhs.trans.service.impl; +package org.dromara.trans.service.impl; -import com.fhs.common.utils.CheckUtils; -import com.fhs.common.utils.ConverterUtils; -import com.fhs.core.trans.anno.Trans; -import com.fhs.core.trans.constant.TransType; -import com.fhs.core.trans.util.ReflectUtils; -import com.fhs.core.trans.vo.VO; +import org.dromara.common.utils.ConverterUtils; +import org.dromara.core.trans.anno.Trans; +import org.dromara.core.trans.constant.TransType; +import org.dromara.core.trans.util.ReflectUtils; +import org.dromara.core.trans.vo.VO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.InitializingBean; -import org.springframework.util.StringUtils; -import java.io.Serializable; import java.lang.reflect.Field; import java.util.*; diff --git a/easy-trans-service/src/main/java/com/fhs/trans/service/impl/ITransTypeService.java b/easy-trans-service/src/main/java/org/dromara/trans/service/impl/ITransTypeService.java similarity index 96% rename from easy-trans-service/src/main/java/com/fhs/trans/service/impl/ITransTypeService.java rename to easy-trans-service/src/main/java/org/dromara/trans/service/impl/ITransTypeService.java index 88a525e4341e0338202e81fc07d1d236c05ed766..5576baae4fad61c48fc4e2261886e82c1990c0d6 100644 --- a/easy-trans-service/src/main/java/com/fhs/trans/service/impl/ITransTypeService.java +++ b/easy-trans-service/src/main/java/org/dromara/trans/service/impl/ITransTypeService.java @@ -1,16 +1,15 @@ -package com.fhs.trans.service.impl; +package org.dromara.trans.service.impl; -import com.fhs.common.constant.TransConfig; -import com.fhs.common.utils.CheckUtils; -import com.fhs.common.utils.ConverterUtils; -import com.fhs.common.utils.StringUtil; -import com.fhs.core.trans.anno.Trans; -import com.fhs.core.trans.util.ReflectUtils; -import com.fhs.core.trans.vo.VO; +import org.dromara.common.constant.TransConfig; +import org.dromara.common.utils.CheckUtils; +import org.dromara.common.utils.ConverterUtils; +import org.dromara.common.utils.StringUtil; +import org.dromara.core.trans.anno.Trans; +import org.dromara.core.trans.util.ReflectUtils; +import org.dromara.core.trans.vo.VO; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; -import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -361,4 +360,8 @@ public interface ITransTypeService { default void setUniqueFieldCache(String namespace, String uniqueField) { namespaceUniqueFieldMap.put(namespace, uniqueField); } + + default void reset(){ + + } } diff --git a/easy-trans-service/src/main/java/com/fhs/trans/service/impl/RpcTransService.java b/easy-trans-service/src/main/java/org/dromara/trans/service/impl/RpcTransService.java similarity index 94% rename from easy-trans-service/src/main/java/com/fhs/trans/service/impl/RpcTransService.java rename to easy-trans-service/src/main/java/org/dromara/trans/service/impl/RpcTransService.java index a4a93fc3d28f2a5d8467397bc1a8923ed963e0f8..b09bb8fcde587cf2c369837275e56af743606dfa 100644 --- a/easy-trans-service/src/main/java/com/fhs/trans/service/impl/RpcTransService.java +++ b/easy-trans-service/src/main/java/org/dromara/trans/service/impl/RpcTransService.java @@ -1,14 +1,13 @@ -package com.fhs.trans.service.impl; +package org.dromara.trans.service.impl; import com.alibaba.fastjson.JSONArray; -import com.fhs.common.utils.ConverterUtils; -import com.fhs.common.utils.StringUtil; -import com.fhs.core.trans.anno.Trans; -import com.fhs.core.trans.constant.TransType; -import com.fhs.core.trans.util.ReflectUtils; -import com.fhs.core.trans.vo.VO; -import com.fhs.trans.listener.TransMessageListener; -import com.fhs.trans.vo.BasicVO; +import org.dromara.common.utils.ConverterUtils; +import org.dromara.common.utils.StringUtil; +import org.dromara.core.trans.anno.Trans; +import org.dromara.core.trans.constant.TransType; +import org.dromara.core.trans.vo.VO; +import org.dromara.trans.listener.TransMessageListener; +import org.dromara.trans.vo.BasicVO; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.slf4j.LoggerFactory; diff --git a/easy-trans-service/src/main/java/com/fhs/trans/service/impl/SimpleTransService.java b/easy-trans-service/src/main/java/org/dromara/trans/service/impl/SimpleTransService.java similarity index 92% rename from easy-trans-service/src/main/java/com/fhs/trans/service/impl/SimpleTransService.java rename to easy-trans-service/src/main/java/org/dromara/trans/service/impl/SimpleTransService.java index da4fe2c3fbfa2496408a1f968196f22aa3238395..f6a18a9ddb09626c14b2bef76bd91ed023c93689 100644 --- a/easy-trans-service/src/main/java/com/fhs/trans/service/impl/SimpleTransService.java +++ b/easy-trans-service/src/main/java/org/dromara/trans/service/impl/SimpleTransService.java @@ -1,16 +1,17 @@ -package com.fhs.trans.service.impl; - -import com.fhs.common.utils.CheckUtils; -import com.fhs.common.utils.ConverterUtils; -import com.fhs.common.utils.StringUtil; -import com.fhs.core.trans.anno.Trans; -import com.fhs.core.trans.anno.TransDefaultSett; -import com.fhs.core.trans.anno.UnTrans; -import com.fhs.core.trans.constant.TransType; -import com.fhs.core.trans.util.ReflectUtils; -import com.fhs.core.trans.vo.VO; -import com.fhs.trans.ds.DataSourceSetter; -import com.fhs.trans.listener.TransMessageListener; +package org.dromara.trans.service.impl; + +import org.dromara.common.utils.CheckUtils; +import org.dromara.common.utils.ConverterUtils; +import org.dromara.common.utils.StringUtil; +import org.dromara.core.trans.anno.Trans; +import org.dromara.core.trans.anno.TransDefaultSett; +import org.dromara.core.trans.anno.UnTrans; +import org.dromara.core.trans.constant.TransType; +import org.dromara.core.trans.util.ReflectUtils; +import org.dromara.core.trans.vo.TransPojo; +import org.dromara.core.trans.vo.VO; +import org.dromara.trans.ds.DataSourceSetter; +import org.dromara.trans.listener.TransMessageListener; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -27,7 +28,7 @@ import java.lang.reflect.Field; import java.util.*; import java.util.stream.Collectors; -import static com.fhs.trans.service.impl.SimpleTransService.SimpleUnTransDiver.SEPARATOR; +import static org.dromara.trans.service.impl.SimpleTransService.SimpleUnTransDiver.SEPARATOR; /** * 简单翻译 @@ -207,7 +208,7 @@ public class SimpleTransService implements ITransTypeService, InitializingBean { Map> namespaceTargetFieldsGroupMap = new HashMap<>(); for (Field tempField : toTransList) { tempField.setAccessible(true); - Trans tempTrans = tempField.getAnnotation(Trans.class); + Trans tempTrans = new SimpleTrans(tempField.getAnnotation(Trans.class)); String targetClassName = getTargetClassName(tempTrans); List fields = namespaceFieldsGroupMap.containsKey(targetClassName) ? namespaceFieldsGroupMap.get(targetClassName) : new ArrayList<>(); Set targetFields = namespaceTargetFieldsGroupMap.containsKey(targetClassName) ? namespaceTargetFieldsGroupMap.get(targetClassName) : new HashSet<>(); @@ -277,7 +278,7 @@ public class SimpleTransService implements ITransTypeService, InitializingBean { * @return */ private List getTargetDefaultFields(Trans tempTrans) { - if (tempTrans.target() != com.fhs.core.trans.vo.TransPojo.class && !transCacheSettMap.containsKey(tempTrans.target()) + if (tempTrans.target() != TransPojo.class && !transCacheSettMap.containsKey(tempTrans.target()) && tempTrans.target().isAnnotationPresent(TransDefaultSett.class)) { TransDefaultSett transDefaultSett = tempTrans.target().getAnnotation(TransDefaultSett.class); return Arrays.asList(transDefaultSett.defaultFields()); @@ -309,7 +310,7 @@ public class SimpleTransService implements ITransTypeService, InitializingBean { */ public List findByIds(List ids, Trans tempTrans, Set targetFields) { return findByIds(() -> { - return transDiver.findByIds(ids, tempTrans.target(), tempTrans.uniqueField()); + return transDiver.findByIds(ids, tempTrans.target(), tempTrans.uniqueField(), targetFields); }, tempTrans.dataSource()); } @@ -370,6 +371,7 @@ public class SimpleTransService implements ITransTypeService, InitializingBean { for (String field : tempTrans.fields()) { resultMap.put(field, voCacheMap.get(field)); } + resultMap.put("targetObject",voCacheMap.get("targetObject")); return resultMap; } } @@ -381,7 +383,7 @@ public class SimpleTransService implements ITransTypeService, InitializingBean { * @return */ protected String getTargetClassName(Trans tempTrans) { - if (tempTrans.target() != com.fhs.core.trans.vo.TransPojo.class && !transCacheSettMap.containsKey(tempTrans.target()) + if (tempTrans.target() != TransPojo.class && !transCacheSettMap.containsKey(tempTrans.target()) && tempTrans.target().isAnnotationPresent(TransDefaultSett.class)) { TransDefaultSett transDefaultSett = tempTrans.target().getAnnotation(TransDefaultSett.class); if (transDefaultSett.isUseCache()) { @@ -392,7 +394,7 @@ public class SimpleTransService implements ITransTypeService, InitializingBean { transCacheSettMap.put(tempTrans.target().getName(), cacheSett); } } - return (tempTrans.target() == com.fhs.core.trans.vo.TransPojo.class + return (tempTrans.target() == TransPojo.class ? tempTrans.targetClassName() : tempTrans.target().getName()); } @@ -623,13 +625,15 @@ class SimpleTrans implements Trans { public SimpleTrans(Trans anno) { this.anno = anno; - Class clazz = (Class) anno.target(); - if (clazz != null && clazz.isAnnotationPresent(TransDefaultSett.class)) { - TransDefaultSett transDefaultSett = clazz.getAnnotation(TransDefaultSett.class); - this.fields = transDefaultSett.defaultFields(); - this.alias = transDefaultSett.defaultAlias(); - this.uniqueField = transDefaultSett.uniqueField(); - this.dataSource = transDefaultSett.dataSource(); + if (TransType.SIMPLE.equals(this.type())) { + Class clazz = (Class) this.target(); + if (clazz != null && clazz.isAnnotationPresent(TransDefaultSett.class)) { + TransDefaultSett transDefaultSett = clazz.getAnnotation(TransDefaultSett.class); + this.fields = transDefaultSett.defaultFields(); + this.alias = transDefaultSett.defaultAlias(); + this.uniqueField = transDefaultSett.uniqueField(); + this.dataSource = transDefaultSett.dataSource(); + } } } @@ -655,7 +659,14 @@ class SimpleTrans implements Trans { @Override public Class target() { - return anno.target(); + try { + return anno.target() == TransPojo.class ? (Class) Class.forName(anno.targetClassName()) : anno.target(); + } catch (ClassNotFoundException e) { + if (TransType.RPC.equals(this.type())) { + return TransPojo.class; + } + throw new RuntimeException(e); + } } @Override diff --git a/easy-trans-service/src/main/java/com/fhs/trans/service/impl/TransService.java b/easy-trans-service/src/main/java/org/dromara/trans/service/impl/TransService.java similarity index 95% rename from easy-trans-service/src/main/java/com/fhs/trans/service/impl/TransService.java rename to easy-trans-service/src/main/java/org/dromara/trans/service/impl/TransService.java index 930f8a1d18555530672297c0f8397565b77a9a1b..cebc7a11365dfdb0b1409724d0cc98cce8d50c4c 100644 --- a/easy-trans-service/src/main/java/com/fhs/trans/service/impl/TransService.java +++ b/easy-trans-service/src/main/java/org/dromara/trans/service/impl/TransService.java @@ -1,9 +1,9 @@ -package com.fhs.trans.service.impl; +package org.dromara.trans.service.impl; -import com.fhs.core.trans.anno.Trans; -import com.fhs.core.trans.vo.VO; -import com.fhs.trans.manager.ClassInfo; -import com.fhs.trans.manager.ClassManager; +import org.dromara.core.trans.anno.Trans; +import org.dromara.core.trans.vo.VO; +import org.dromara.trans.manager.ClassInfo; +import org.dromara.trans.manager.ClassManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.util.ObjectUtils; @@ -183,9 +183,11 @@ public class TransService { transSortFieldMap.put(sort,tempFieldList); } for (Integer sortNum : transSortFieldMap.keySet()) { + transTypeService.reset(); transTypeService.transMore(objList, transSortFieldMap.get(sortNum)); } } else { + transTypeService.reset(); transTypeService.transOne(obj, transFieldList); } } diff --git a/easy-trans-service/src/main/java/com/fhs/trans/utils/TransUtil.java b/easy-trans-service/src/main/java/org/dromara/trans/utils/TransUtil.java similarity index 93% rename from easy-trans-service/src/main/java/com/fhs/trans/utils/TransUtil.java rename to easy-trans-service/src/main/java/org/dromara/trans/utils/TransUtil.java index d26d116b6025e84d4a198ec8ec4d3ba2060988f1..7e689fb7ecc9da7c0b53ce1f51def5fe67e4b9a4 100644 --- a/easy-trans-service/src/main/java/com/fhs/trans/utils/TransUtil.java +++ b/easy-trans-service/src/main/java/org/dromara/trans/utils/TransUtil.java @@ -1,12 +1,13 @@ -package com.fhs.trans.utils; +package org.dromara.trans.utils; import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fhs.common.utils.ConverterUtils; -import com.fhs.common.utils.StringUtil; -import com.fhs.core.trans.util.ReflectUtils; -import com.fhs.core.trans.vo.VO; -import com.fhs.trans.service.impl.TransService; +import org.dromara.common.utils.ConverterUtils; +import org.dromara.common.utils.StringUtil; +import org.dromara.core.trans.anno.IgnoreTrans; +import org.dromara.core.trans.util.ReflectUtils; +import org.dromara.core.trans.vo.VO; +import org.dromara.trans.service.impl.TransService; import lombok.extern.slf4j.Slf4j; import net.bytebuddy.ByteBuddy; import net.bytebuddy.description.annotation.AnnotationDescription; @@ -204,8 +205,8 @@ public class TransUtil { } List fields = ReflectUtils.getAllField(object); for (Field field : fields) { - // 此段代码适配beanSearcher SearchResult - if (java.lang.reflect.Modifier.isFinal(field.getModifiers()) && object.getClass().getName().contains("bs")) { + // 此段代码适配beanSearcher SearchResult 2024-03-26 添加v3.x版本的beanSearcher 适配 + if (java.lang.reflect.Modifier.isFinal(field.getModifiers()) && (object.getClass().getName().contains("bs") ||object.getClass().getName().contains("ejlchina"))) { field.setAccessible(true); tempObj = field.get(object); if (Objects.nonNull(tempObj) && tempObj instanceof List) { @@ -217,7 +218,12 @@ public class TransUtil { } } } - if (java.lang.reflect.Modifier.isFinal(field.getModifiers()) || java.lang.reflect.Modifier.isStatic(field.getModifiers())) { + // 如果主动忽略了，final static java开头 不翻译此字段 + if (java.lang.reflect.Modifier.isFinal(field.getModifiers()) + || java.lang.reflect.Modifier.isStatic(field.getModifiers()) + || field.isAnnotationPresent(IgnoreTrans.class) + || object.getClass().getName().startsWith("java.") + ) { continue; } field.setAccessible(true); diff --git a/easy-trans-service/src/main/java/com/fhs/trans/vo/BasicVO.java b/easy-trans-service/src/main/java/org/dromara/trans/vo/BasicVO.java similarity index 80% rename from easy-trans-service/src/main/java/com/fhs/trans/vo/BasicVO.java rename to easy-trans-service/src/main/java/org/dromara/trans/vo/BasicVO.java index c86f4b3552797397c82978857b5227d5944261cb..0a94d49d2b5cf79807e117bba6821fbb5cf6290b 100644 --- a/easy-trans-service/src/main/java/com/fhs/trans/vo/BasicVO.java +++ b/easy-trans-service/src/main/java/org/dromara/trans/vo/BasicVO.java @@ -1,6 +1,6 @@ -package com.fhs.trans.vo; +package org.dromara.trans.vo; -import com.fhs.core.trans.vo.VO; +import org.dromara.core.trans.vo.VO; import lombok.Data; import java.util.HashMap; diff --git a/easy-trans-service/src/main/java/com/fhs/trans/vo/FindByIdsQueryPayload.java b/easy-trans-service/src/main/java/org/dromara/trans/vo/FindByIdsQueryPayload.java similarity index 87% rename from easy-trans-service/src/main/java/com/fhs/trans/vo/FindByIdsQueryPayload.java rename to easy-trans-service/src/main/java/org/dromara/trans/vo/FindByIdsQueryPayload.java index 34454142006491576d4a7a3adbd302f961a341ee..786a8486d2aea877d3ba7bc9fd12e7c8fb836431 100644 --- a/easy-trans-service/src/main/java/com/fhs/trans/vo/FindByIdsQueryPayload.java +++ b/easy-trans-service/src/main/java/org/dromara/trans/vo/FindByIdsQueryPayload.java @@ -1,4 +1,4 @@ -package com.fhs.trans.vo; +package org.dromara.trans.vo; import lombok.Data; diff --git a/easy-trans-spring-boot-starter/pom.xml b/easy-trans-spring-boot-starter/pom.xml index 12748b6ce704bfde0828ab40ce86b4fb6be493f6..59e3ccc69cb229595fdc3f65a5810ae520d09f49 100644 --- a/easy-trans-spring-boot-starter/pom.xml +++ b/easy-trans-spring-boot-starter/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.fhs-opensource + org.dromara easy-trans ${revision} @@ -12,7 +12,7 @@ - com.fhs-opensource + org.dromara easy-trans-service @@ -26,6 +26,7 @@ org.springframework.cloud spring-cloud-commons + true diff --git a/easy-trans-spring-boot-starter/src/main/java/com/fhs/trans/config/TransServiceConfig.java b/easy-trans-spring-boot-starter/src/main/java/org/dromara/trans/config/TransServiceConfig.java similarity index 90% rename from easy-trans-spring-boot-starter/src/main/java/com/fhs/trans/config/TransServiceConfig.java rename to easy-trans-spring-boot-starter/src/main/java/org/dromara/trans/config/TransServiceConfig.java index 021e8463dbea3f87304ac4a04b2fb428ab9edfce..cd2f1fab7ac569c4097024f68f57d911664eec27 100644 --- a/easy-trans-spring-boot-starter/src/main/java/com/fhs/trans/config/TransServiceConfig.java +++ b/easy-trans-spring-boot-starter/src/main/java/org/dromara/trans/config/TransServiceConfig.java @@ -1,21 +1,21 @@ -package com.fhs.trans.config; - -import com.fhs.cache.service.BothCacheService; -import com.fhs.cache.service.RedisCacheService; -import com.fhs.cache.service.TransCacheManager; -import com.fhs.common.constant.TransConfig; -import com.fhs.common.spring.SpringContextUtil; -import com.fhs.core.trans.convert.Convert; -import com.fhs.core.trans.util.ConvertUtil; -import com.fhs.core.trans.util.ReflectUtils; -import com.fhs.trans.advice.EasyTransResponseBodyAdvice; -import com.fhs.trans.advice.ReleaseTransCacheAdvice; -import com.fhs.trans.aop.TransMethodResultAop; -import com.fhs.trans.controller.TransProxyController; -import com.fhs.trans.ds.DataSourceSetter; -import com.fhs.trans.listener.TransMessageListener; -import com.fhs.trans.service.impl.*; +package org.dromara.trans.config; + +import org.dromara.cache.service.BothCacheService; +import org.dromara.cache.service.RedisCacheService; +import org.dromara.cache.service.TransCacheManager; +import org.dromara.common.constant.TransConfig; +import org.dromara.common.spring.SpringContextUtil; +import org.dromara.core.trans.convert.Convert; +import org.dromara.core.trans.util.ConvertUtil; +import org.dromara.core.trans.util.ReflectUtils; +import org.dromara.trans.advice.EasyTransResponseBodyAdvice; +import org.dromara.trans.advice.ReleaseTransCacheAdvice; +import org.dromara.trans.aop.TransMethodResultAop; +import org.dromara.trans.controller.TransProxyController; +import org.dromara.trans.ds.DataSourceSetter; +import org.dromara.trans.listener.TransMessageListener; import lombok.extern.slf4j.Slf4j; +import org.dromara.trans.service.impl.*; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; diff --git a/easy-trans-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/easy-trans-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json new file mode 100644 index 0000000000000000000000000000000000000000..5e03ff99c1565a4bc84db486cf0ef1cdf9f1f7f7 --- /dev/null +++ b/easy-trans-spring-boot-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -0,0 +1,51 @@ +{ + + "properties": [ + { + "defaultValue": false, + "name": "easy-trans.is-enable-redis", + "description": "是否使用redis", + "type": "java.lang.Boolean" + }, + { + "defaultValue": false, + "name": "easy-trans.is-enable-global", + "description": "是否开启全局翻译，开启后所有的application/json的返回都是尝试翻译", + "type": "java.lang.Boolean" + }, + { + "defaultValue": false, + "name": "easy-trans.is-enable-tile", + "description": "是否开启平铺，并发量大的系统不推荐开启", + "type": "java.lang.Boolean" + }, + { + "defaultValue": false, + "name": "easy-trans.dict-use-redis", + "description": "字典是否放到redis中，微服务模式推荐开启", + "type": "java.lang.Boolean" + }, + { + "defaultValue": false, + "name": "easy-trans.is-enable-map-result", + "description": "如果方法返回值是map，是否还要遍历map进行翻译，ruoyi相关的框架需要打开", + "type": "java.lang.Boolean" + }, + { + "defaultValue": "mysql", + "name": "easy-trans.db-type", + "description": "数据库类型", + "type": "java.lang.String" + },{ + "defaultValue": false, + "name": "easy-trans.mp-new", + "description": "是否是新版本的mybatis plus，MP为 3.5.3.2版本以上的3.x 版本请设置为true", + "type": "java.lang.Boolean" + },{ + "defaultValue": false, + "name": "easy-trans.is-enable-custom-rpc", + "description": "是否控制rpc翻译的权限，标记了 @RpcTrans注解的才能被RPC翻译", + "type": "java.lang.Boolean" + } + ] +} diff --git a/easy-trans-spring-boot-starter/src/main/resources/META-INF/spring.factories b/easy-trans-spring-boot-starter/src/main/resources/META-INF/spring.factories index dece69413445d37771640a75a36752e0a7748802..e5663939ed47c37c4bd7103301de676638b4a78a 100644 --- a/easy-trans-spring-boot-starter/src/main/resources/META-INF/spring.factories +++ b/easy-trans-spring-boot-starter/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.fhs.trans.config.TransServiceConfig \ No newline at end of file + org.dromara.trans.config.TransServiceConfig \ No newline at end of file diff --git a/easy-trans-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/easy-trans-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index f0a93f66c9e7ef790ab91de8c5b5ca32d69aae8c..8ae5b6b6ee9fe3861543decb1f631a01f6fd92cb 100644 --- a/easy-trans-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/easy-trans-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.fhs.trans.config.TransServiceConfig \ No newline at end of file +org.dromara.trans.config.TransServiceConfig \ No newline at end of file diff --git a/easy-trans-tk-extend/pom.xml b/easy-trans-tk-extend/pom.xml index f5758afa147980571dbd510a94987aed2263ac06..580dd654f2a96f8d2dfdda00bb594b9ce51d4963 100644 --- a/easy-trans-tk-extend/pom.xml +++ b/easy-trans-tk-extend/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> easy-trans - com.fhs-opensource + org.dromara ${revision} 4.0.0 @@ -34,7 +34,7 @@ true - com.fhs-opensource + org.dromara easy-trans-service diff --git a/easy-trans-tk-extend/src/main/java/com/fhs/trans/config/EasyTransTKConfig.java b/easy-trans-tk-extend/src/main/java/org/dromara/trans/config/EasyTransTKConfig.java similarity index 84% rename from easy-trans-tk-extend/src/main/java/com/fhs/trans/config/EasyTransTKConfig.java rename to easy-trans-tk-extend/src/main/java/org/dromara/trans/config/EasyTransTKConfig.java index 030cc599ff1cec3076fc373414dabc95ef9fedd2..3de03f18e5f28959fc96c112465d3ca1a7b308a8 100644 --- a/easy-trans-tk-extend/src/main/java/com/fhs/trans/config/EasyTransTKConfig.java +++ b/easy-trans-tk-extend/src/main/java/org/dromara/trans/config/EasyTransTKConfig.java @@ -1,13 +1,12 @@ -package com.fhs.trans.config; +package org.dromara.trans.config; -import com.fhs.core.trans.util.ReflectUtils; -import com.fhs.trans.extend.TKSimpleTransDiver; +import org.dromara.core.trans.util.ReflectUtils; +import org.dromara.trans.extend.TKSimpleTransDiver; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.session.SqlSessionFactory; import org.mybatis.spring.SqlSessionTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/easy-trans-tk-extend/src/main/java/com/fhs/trans/extend/TKSimpleTransDiver.java b/easy-trans-tk-extend/src/main/java/org/dromara/trans/extend/TKSimpleTransDiver.java similarity index 93% rename from easy-trans-tk-extend/src/main/java/com/fhs/trans/extend/TKSimpleTransDiver.java rename to easy-trans-tk-extend/src/main/java/org/dromara/trans/extend/TKSimpleTransDiver.java index a3875d3a733811e48853053712a8cd07acec2809..c15040043affe48194705932e0829a533a4f1bc9 100644 --- a/easy-trans-tk-extend/src/main/java/com/fhs/trans/extend/TKSimpleTransDiver.java +++ b/easy-trans-tk-extend/src/main/java/org/dromara/trans/extend/TKSimpleTransDiver.java @@ -1,10 +1,10 @@ -package com.fhs.trans.extend; +package org.dromara.trans.extend; -import com.fhs.common.spring.SpringContextUtil; -import com.fhs.common.utils.StringUtil; -import com.fhs.core.trans.util.ReflectUtils; -import com.fhs.core.trans.vo.VO; -import com.fhs.trans.service.impl.SimpleTransService; +import org.dromara.common.spring.SpringContextUtil; +import org.dromara.common.utils.StringUtil; +import org.dromara.core.trans.util.ReflectUtils; +import org.dromara.core.trans.vo.VO; +import org.dromara.trans.service.impl.SimpleTransService; import lombok.extern.slf4j.Slf4j; import org.mybatis.spring.support.SqlSessionDaoSupport; import org.springframework.aop.framework.AdvisedSupport; @@ -30,7 +30,7 @@ import java.util.Set; * TK mybatis 简单翻译驱动 */ @Slf4j -public class TKSimpleTransDiver extends SqlSessionDaoSupport implements SimpleTransService.SimpleTransDiver , ApplicationListener { +public class TKSimpleTransDiver extends SqlSessionDaoSupport implements SimpleTransService.SimpleTransDiver, ApplicationListener { /** * key 是entityclass value是mapperclass的名字方便拼接sqlid diff --git a/easy-trans-tk-extend/src/main/resources/META-INF/spring.factories b/easy-trans-tk-extend/src/main/resources/META-INF/spring.factories index 67b08c4023cf3857106b3602e362e95988ce03c2..3fb851ca2b13ce0c5ccc8418bbab7ba5a06f4dda 100644 --- a/easy-trans-tk-extend/src/main/resources/META-INF/spring.factories +++ b/easy-trans-tk-extend/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.fhs.trans.config.EasyTransTKConfig + org.dromara.trans.config.EasyTransTKConfig diff --git a/easy-trans-tk-extend/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/easy-trans-tk-extend/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 523b6053281e21593b764bf126e857f543f0fc3c..d29da29fa12b86320c095e1335945c0ef06fc8ee 100644 --- a/easy-trans-tk-extend/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/easy-trans-tk-extend/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.fhs.trans.config.EasyTransTKConfig \ No newline at end of file +org.dromara.trans.config.EasyTransTKConfig \ No newline at end of file diff --git a/easy-trans-untrans-driver/pom.xml b/easy-trans-untrans-driver/pom.xml index 4aaa17e44e390896c5893614c6e806d002bb2240..4524305297e97cc9412aa71ebd2401fe4e326aed 100644 --- a/easy-trans-untrans-driver/pom.xml +++ b/easy-trans-untrans-driver/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.fhs-opensource + org.dromara easy-trans ${revision} @@ -18,7 +18,7 @@ - com.fhs-opensource + org.dromara easy-trans-service diff --git a/easy-trans-untrans-driver/src/main/java/com/fhs/trans/untrans/config/UnTransDriverConfig.java b/easy-trans-untrans-driver/src/main/java/org/dromara/trans/untrans/config/UnTransDriverConfig.java similarity index 67% rename from easy-trans-untrans-driver/src/main/java/com/fhs/trans/untrans/config/UnTransDriverConfig.java rename to easy-trans-untrans-driver/src/main/java/org/dromara/trans/untrans/config/UnTransDriverConfig.java index fb6a3d634e31aacfc306e1a352061abd9f6005a2..634137dd020ee1c774ed71f6b6ecdfad73e288e2 100644 --- a/easy-trans-untrans-driver/src/main/java/com/fhs/trans/untrans/config/UnTransDriverConfig.java +++ b/easy-trans-untrans-driver/src/main/java/org/dromara/trans/untrans/config/UnTransDriverConfig.java @@ -1,8 +1,7 @@ -package com.fhs.trans.untrans.config; +package org.dromara.trans.untrans.config; -import com.fhs.trans.untrans.driver.CommonUnTransDriver; +import org.dromara.trans.untrans.driver.CommonUnTransDriver; import lombok.extern.slf4j.Slf4j; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/easy-trans-untrans-driver/src/main/java/com/fhs/trans/untrans/driver/CommonUnTransDriver.java b/easy-trans-untrans-driver/src/main/java/org/dromara/trans/untrans/driver/CommonUnTransDriver.java similarity index 87% rename from easy-trans-untrans-driver/src/main/java/com/fhs/trans/untrans/driver/CommonUnTransDriver.java rename to easy-trans-untrans-driver/src/main/java/org/dromara/trans/untrans/driver/CommonUnTransDriver.java index 4b0cfa3db5108fc9a88ab5af99d12d67d70ac109..f81d411bf62416bec275926244c1f9a034a2b9b4 100644 --- a/easy-trans-untrans-driver/src/main/java/com/fhs/trans/untrans/driver/CommonUnTransDriver.java +++ b/easy-trans-untrans-driver/src/main/java/org/dromara/trans/untrans/driver/CommonUnTransDriver.java @@ -1,8 +1,8 @@ -package com.fhs.trans.untrans.driver; +package org.dromara.trans.untrans.driver; -import com.fhs.core.trans.anno.UnTrans; -import com.fhs.trans.service.impl.SimpleTransService; -import com.fhs.trans.untrans.util.DBUtil; +import org.dromara.core.trans.anno.UnTrans; +import org.dromara.trans.service.impl.SimpleTransService; +import org.dromara.trans.untrans.util.DBUtil; import org.springframework.beans.factory.annotation.Autowired; import javax.sql.DataSource; diff --git a/easy-trans-untrans-driver/src/main/java/com/fhs/trans/untrans/util/DBUtil.java b/easy-trans-untrans-driver/src/main/java/org/dromara/trans/untrans/util/DBUtil.java similarity index 97% rename from easy-trans-untrans-driver/src/main/java/com/fhs/trans/untrans/util/DBUtil.java rename to easy-trans-untrans-driver/src/main/java/org/dromara/trans/untrans/util/DBUtil.java index 713b6b213aa706b7709b0b5e7b039e6999da493e..503373820d485a10fe0be9bd0fdca7fcd7fece26 100644 --- a/easy-trans-untrans-driver/src/main/java/com/fhs/trans/untrans/util/DBUtil.java +++ b/easy-trans-untrans-driver/src/main/java/org/dromara/trans/untrans/util/DBUtil.java @@ -1,4 +1,4 @@ -package com.fhs.trans.untrans.util; +package org.dromara.trans.untrans.util; import lombok.Data; import org.apache.commons.dbutils.DbUtils; diff --git a/easy-trans-untrans-driver/src/main/resources/META-INF/spring.factories b/easy-trans-untrans-driver/src/main/resources/META-INF/spring.factories index eae69520fc80984c37b5d27da1def6f9f2bf9446..66c9dfe0ba8cd0c776ae536df1a98e9200caf3d1 100644 --- a/easy-trans-untrans-driver/src/main/resources/META-INF/spring.factories +++ b/easy-trans-untrans-driver/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.fhs.trans.untrans.config.UnTransDriverConfig + org.dromara.trans.untrans.config.UnTransDriverConfig diff --git a/easy-trans-untrans-driver/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/easy-trans-untrans-driver/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index a057d880ed9065cd4e59d84e45440d15a8977f24..d686cdc0690280d2d0c743b3d9d3437c31400026 100644 --- a/easy-trans-untrans-driver/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/easy-trans-untrans-driver/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.fhs.trans.untrans.config.UnTransDriverConfig \ No newline at end of file +org.dromara.trans.untrans.config.UnTransDriverConfig \ No newline at end of file diff --git a/images/jiagou.png b/images/jiagou.png new file mode 100644 index 0000000000000000000000000000000000000000..d4b31eace0b84024aa4fedf68013a8948e993113 Binary files /dev/null and b/images/jiagou.png differ diff --git a/pom.xml b/pom.xml index dccd4a91413547ba224af8a14c52e3c4f81b7ec6..0bb01480574facfd73efb57606eba8c24a26aa11 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ oss-parent 7 - com.fhs-opensource + org.dromara https://gitee.com/fhs-opensource/easy_trans 4.0.0 easy-trans @@ -19,16 +19,15 @@ easy-trans-spring-boot-starter easy-trans-mybatis-plus-extend easy-trans-mybatis-flex-extend - + easy-trans-jpa-sb3-extend easy-trans-tk-extend + easy-trans-easy-query-extend easy-trans-beetl-sql-extend easy-trans-untrans-driver easy-trans-dependencies - - easy-trans-jpa-sb3-extend - 3.0.0 + 3.1.1 UTF-8 17 17 @@ -38,18 +37,18 @@ 6.0.13 5.4.12.Final 3.5.5 - + 2.0.42 - com.fhs-opensource + org.dromara easy-trans-anno ${revision} - com.fhs-opensource + org.dromara easy-trans-service ${revision} @@ -75,6 +74,17 @@ mybatis ${fhs.mybatis.version} + + + com.easy-query + sql-api4j + ${fhs.easy-query.version} + + + com.easy-query + sql-core + ${fhs.easy-query.version} + com.fasterxml.jackson.core