From 42a06ebcd92d0eb706e75db68ce63bc877c08858 Mon Sep 17 00:00:00 2001 From: khalil Date: Fri, 19 Apr 2024 16:40:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81-=E6=B8=85=E9=99=A4=E8=80=81?= =?UTF-8?q?=E6=97=A7pom=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accompany-admin-service/pom.xml | 10 +- accompany-admin/accompany-admin-web/pom.xml | 5 - .../com/accompany/admin/AdminApplication.java | 3 - .../accompany/admin/config/SaTokenConfig.java | 4 +- .../system/AdminUserController.java | 4 +- .../accompany-flow-team-admin-web/pom.xml | 2 +- .../admin/FlowTeamAdminApplication.java | 2 - .../flowteam/admin/config/SaTokenConfig.java | 2 +- .../core/service/account/ErBanNoService.java | 34 ----- .../com/accompany/common/utils/RegexUtil.java | 95 +++++--------- accompany-base/accompany-core-starter/pom.xml | 121 ------------------ accompany-base/accompany-core/pom.xml | 69 +++++++--- .../autoconfigure/RedisAutoConfiguration.java | 0 .../SwaggerAutoConfiguration.java | 0 .../core/config/MybatisPlusConfig.java | 0 .../com/accompany/core/util/JsonUtil.java | 2 - .../main/resources/META-INF/spring.factories | 0 .../src/main/resources/banner.txt | 0 accompany-base/pom.xml | 1 - .../fastival-activity-mq/pom.xml | 2 +- .../business/dfautil/SensitiveUtil.java | 10 +- .../listener/msg/UserChatMsgListener.java | 4 +- .../accompany-business-web/pom.xml | 2 +- .../business/BusinessApplication.java | 2 - .../controller/apppay/MyCardController.java | 4 +- accompany-dependencies/pom.xml | 95 +------------- .../mq/listener/AbstractMessageListener.java | 7 +- .../mq/producer/MQMessageProducer.java | 6 +- accompany-mq/accompany-mq-web/pom.xml | 2 +- accompany-oauth2/accompany-oauth2-web/pom.xml | 2 +- .../accompany/oauth2/OAuth2Application.java | 2 - .../accompany-scheduler-web/pom.xml | 2 +- .../accompany/scheduler/JobApplication.java | 2 - 33 files changed, 114 insertions(+), 382 deletions(-) delete mode 100644 accompany-base/accompany-core-starter/pom.xml rename accompany-base/{accompany-core-starter => accompany-core}/src/main/java/com/accompany/core/autoconfigure/RedisAutoConfiguration.java (100%) rename accompany-base/{accompany-core-starter => accompany-core}/src/main/java/com/accompany/core/autoconfigure/SwaggerAutoConfiguration.java (100%) rename accompany-base/{accompany-core-starter => accompany-core}/src/main/java/com/accompany/core/config/MybatisPlusConfig.java (100%) rename accompany-base/{accompany-core-starter => accompany-core}/src/main/resources/META-INF/spring.factories (100%) rename accompany-base/{accompany-core-starter => accompany-core}/src/main/resources/banner.txt (100%) diff --git a/accompany-admin/accompany-admin-service/pom.xml b/accompany-admin/accompany-admin-service/pom.xml index 7655ab859..79a4d362a 100644 --- a/accompany-admin/accompany-admin-service/pom.xml +++ b/accompany-admin/accompany-admin-service/pom.xml @@ -28,6 +28,11 @@ accompany-basic-service ${revision} + + com.accompany + accompany-core + ${revision} + com.accompany accompany-payment-service @@ -48,11 +53,6 @@ accompany-business-community-service ${revision} - - com.accompany - accompany-sharding-service - ${revision} - com.accompany accompany-business-service diff --git a/accompany-admin/accompany-admin-web/pom.xml b/accompany-admin/accompany-admin-web/pom.xml index f9b8bad7c..ba048eb56 100644 --- a/accompany-admin/accompany-admin-web/pom.xml +++ b/accompany-admin/accompany-admin-web/pom.xml @@ -13,11 +13,6 @@ jar - - com.accompany - accompany-core-starter - ${revision} - com.accompany accompany-admin-service diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/AdminApplication.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/AdminApplication.java index 67cbd4784..6cb4e2e1b 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/AdminApplication.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/AdminApplication.java @@ -1,13 +1,11 @@ package com.accompany.admin; import cn.hippo4j.core.enable.EnableDynamicThreadPool; -import com.accompany.core.base.SpringContextHolder; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.web.servlet.ServletComponentScan; -import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.ComponentScan; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableScheduling; @@ -21,7 +19,6 @@ import org.springframework.scheduling.annotation.EnableScheduling; @ComponentScan({"com.accompany","com.xuanyin"}) @EnableScheduling @EnableAsync(proxyTargetClass = true) -@EnableFeignClients(basePackages = "com.accompany") @MapperScan({"com.accompany.*.mapper","com.accompany.*.mybatismapper","com.xuanyin.*.mapper"}) @ServletComponentScan(value = {"com.accompany", "com.xuanyin"}) @SpringBootConfiguration diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/config/SaTokenConfig.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/config/SaTokenConfig.java index 955a95c80..c61817f1c 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/config/SaTokenConfig.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/config/SaTokenConfig.java @@ -11,8 +11,6 @@ import org.springframework.data.redis.connection.RedisStandaloneConfiguration; import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; import redis.clients.jedis.JedisPoolConfig; -import java.time.Duration; - /** * @author: liaozetao * @date: 2023/12/8 11:53 @@ -28,7 +26,7 @@ public class SaTokenConfig { JedisPoolConfig poolConfig = new JedisPoolConfig(); poolConfig.setMaxIdle(jedisConfig.getMaxIdle()); poolConfig.setMaxTotal(jedisConfig.getMaxTotal()); - poolConfig.setMaxWait(Duration.ofMillis(jedisConfig.getMaxWait())); + poolConfig.setMaxWaitMillis(jedisConfig.getMaxWait()); JedisConnectionFactory connectionFactory = new JedisConnectionFactory(poolConfig); RedisStandaloneConfiguration standaloneConfiguration = connectionFactory.getStandaloneConfiguration(); if (standaloneConfiguration != null) { diff --git a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/AdminUserController.java b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/AdminUserController.java index 644743ccd..d2b426cfb 100644 --- a/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/AdminUserController.java +++ b/accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/AdminUserController.java @@ -1,6 +1,5 @@ package com.accompany.admin.controller.system; -import cn.hutool.json.JSONUtil; import com.accompany.common.tencent.cos.TencentCosUploadService; import com.alibaba.fastjson.JSONObject; import com.accompany.admin.common.ErrorCode; @@ -17,6 +16,7 @@ import com.accompany.admin.util.ImageType; import com.accompany.admin.vo.AdminMenuVo; import com.accompany.admin.vo.AdminRoleVo; import com.accompany.business.service.api.QinniuService; +import com.alibaba.fastjson2.JSON; import com.github.pagehelper.PageInfo; import com.google.common.collect.Lists; import com.accompany.common.utils.BlankUtil; @@ -95,7 +95,7 @@ public class AdminUserController extends BaseController { adminUser.setStatus(true); result = adminUserService.saveUser(adminUser, isEdit,newPassword); adminLogService.insertLog(getAdminId(), getClass().getCanonicalName(), "saveUser" - , "params===>>adminUser:" + JSONUtil.toJsonStr(adminUser) +",isEdit:"+isEdit); + , "params===>>adminUser:" + JSON.toJSONString(adminUser) +",isEdit:"+isEdit); } catch (Exception e) { logger.warn("saveUser fail,cause by " + e.getMessage(), e); } diff --git a/accompany-admin/accompany-flow-team-admin-web/pom.xml b/accompany-admin/accompany-flow-team-admin-web/pom.xml index 981669648..01fda80c7 100644 --- a/accompany-admin/accompany-flow-team-admin-web/pom.xml +++ b/accompany-admin/accompany-flow-team-admin-web/pom.xml @@ -15,7 +15,7 @@ com.accompany - accompany-core-starter + accompany-core ${revision} diff --git a/accompany-admin/accompany-flow-team-admin-web/src/main/java/com/accompany/flowteam/admin/FlowTeamAdminApplication.java b/accompany-admin/accompany-flow-team-admin-web/src/main/java/com/accompany/flowteam/admin/FlowTeamAdminApplication.java index cc7e44f66..6f0bb63bf 100644 --- a/accompany-admin/accompany-flow-team-admin-web/src/main/java/com/accompany/flowteam/admin/FlowTeamAdminApplication.java +++ b/accompany-admin/accompany-flow-team-admin-web/src/main/java/com/accompany/flowteam/admin/FlowTeamAdminApplication.java @@ -6,7 +6,6 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.web.servlet.ServletComponentScan; -import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.ComponentScan; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableScheduling; @@ -20,7 +19,6 @@ import org.springframework.scheduling.annotation.EnableScheduling; @ComponentScan({"com.accompany","com.xuanyin"}) @EnableScheduling @EnableAsync(proxyTargetClass = true) -@EnableFeignClients(basePackages = "com.accompany") @MapperScan({"com.accompany.*.mapper","com.accompany.*.mybatismapper","com.xuanyin.*.mapper"}) @ServletComponentScan(value = {"com.accompany", "com.xuanyin"}) @SpringBootConfiguration diff --git a/accompany-admin/accompany-flow-team-admin-web/src/main/java/com/accompany/flowteam/admin/config/SaTokenConfig.java b/accompany-admin/accompany-flow-team-admin-web/src/main/java/com/accompany/flowteam/admin/config/SaTokenConfig.java index 4711d7822..17af0fcc7 100644 --- a/accompany-admin/accompany-flow-team-admin-web/src/main/java/com/accompany/flowteam/admin/config/SaTokenConfig.java +++ b/accompany-admin/accompany-flow-team-admin-web/src/main/java/com/accompany/flowteam/admin/config/SaTokenConfig.java @@ -28,7 +28,7 @@ public class SaTokenConfig { JedisPoolConfig poolConfig = new JedisPoolConfig(); poolConfig.setMaxIdle(jedisConfig.getMaxIdle()); poolConfig.setMaxTotal(jedisConfig.getMaxTotal()); - poolConfig.setMaxWait(Duration.ofMillis(jedisConfig.getMaxWait())); + poolConfig.setMaxWaitMillis(jedisConfig.getMaxWait()); JedisConnectionFactory connectionFactory = new JedisConnectionFactory(poolConfig); RedisStandaloneConfiguration standaloneConfiguration = connectionFactory.getStandaloneConfiguration(); if (standaloneConfiguration != null) { diff --git a/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/service/account/ErBanNoService.java b/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/service/account/ErBanNoService.java index a51e2bb75..9c004d40d 100644 --- a/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/service/account/ErBanNoService.java +++ b/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/service/account/ErBanNoService.java @@ -3,8 +3,6 @@ package com.accompany.core.service.account; import com.accompany.common.utils.CommonUtil; import com.accompany.common.utils.RegexUtil; import com.accompany.core.model.Account; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -18,8 +16,6 @@ public class ErBanNoService { @Autowired private AccountService accountService; - private static final Logger logger = LoggerFactory.getLogger(ErBanNoService.class); - //TODO 待改善，多台机器部署时候应该采用雪花算法，防止重复 public Long getErBanNo() throws Exception{ int digit = 7; @@ -76,34 +72,4 @@ public class ErBanNoService { return flag; } - public Long generalId(int digit) throws Exception{ - String generalId = CommonUtil.getRandomNumStr(digit); - boolean flag = false; - do { - flag = RegexUtil.checkPretty(generalId); - if(!flag){ - generalId = CommonUtil.getRandomNumStr(digit); - } - }while(!flag); - return Long.valueOf(generalId); - } - public static void main(String args[]) throws Exception{ - -// 6766696 -// 6665807 - ErBanNoService erBanNoService=new ErBanNoService(); - String str=""; - for(int i=0;i<100000;i++){ - str=str+erBanNoService.generalNotPrettyId(7)+"\n"; - } - - String generalId="6766696"; - boolean isPrettyFilter=false; - boolean dumpNumber=CommonUtil.checkNumber(generalId,3);//不同的数字超过3个 - isPrettyFilter=RegexUtil.checkNotPretty(generalId);//不是靓号 - System.out.println(dumpNumber); - System.out.println(isPrettyFilter); - System.out.println(isPrettyFilter&&dumpNumber); - } - } diff --git a/accompany-base/accompany-common/src/main/java/com/accompany/common/utils/RegexUtil.java b/accompany-base/accompany-common/src/main/java/com/accompany/common/utils/RegexUtil.java index 445f0f43e..24ec54ebc 100644 --- a/accompany-base/accompany-common/src/main/java/com/accompany/common/utils/RegexUtil.java +++ b/accompany-base/accompany-common/src/main/java/com/accompany/common/utils/RegexUtil.java @@ -1,88 +1,62 @@ package com.accompany.common.utils; -import com.google.common.collect.Lists; -import org.apache.oro.text.regex.*; - +import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** * Created by liuguofu on 2017/10/22. */ public class RegexUtil { - private static PatternCompiler compiler = new Perl5Compiler(); - - private static PatternMatcher matcher = new Perl5Matcher(); - - private static Pattern pattern ; - private static List levitPatterns= Lists.newArrayList(); + private static List levitPatterns= new ArrayList<>(); static { // 手机号、生日号、跟公司业务相关的号码 - levitPatterns.add("^(0|13|15|18|168|400|800)[0-9]*$"); - levitPatterns.add("^\\d{2}(0[1-9]|1[0-2])(0[1-9]|[12][0-9]|3[01])$"); - levitPatterns.add("^\\d*(1688|2688|2088|2008|5188|10010|10001|666|888|668|686|688|866|868|886|999|5201314|1314520)\\d*$"); - // 重复号码，镜子号码 - levitPatterns.add("^(\\d)(\\d)(\\d)\\1\\2\\3$"); - levitPatterns.add("^(\\d)(\\d)(\\d)\\3\\2\\1$"); - // AABB - levitPatterns.add("^\\d*(\\d)\\1(\\d)\\2\\d*$"); - // AAABBB - levitPatterns.add("^\\d*(\\d)\\1\\1(\\d)\\2\\2\\d*$"); - // ABABAB - levitPatterns.add("^(\\d)(\\d)\\1\\2\\1\\2\\1\\2$"); - // ABCABC - levitPatterns.add("^(\\d)(\\d)(\\d)\\1\\2\\3$"); - // ABBABB - levitPatterns.add("^(\\d)(\\d)\\2\\1\\2\\2$"); - // AABAAB - levitPatterns.add("^(\\d)\\1(\\d)\\1\\1\\2$"); - - // 4-8 位置重复 - levitPatterns.add("^\\d*(\\d)\\1{2,}\\d*$"); - // 4位以上 位递增或者递减（7890也是递增） - levitPatterns.add("(?:(?:0(?=1)|1(?=2)|2(?=3)|3(?=4)|4(?=5)|5(?=6)|6(?=7)|7(?=8)|8(?=9)|9(?=0)){2,}|(?:0(?=9)|9(?=8)|8(?=7)|7(?=6)|6(?=5)|5(?=4)|4(?=3)|3(?=2)|2(?=1)|1(?=0)){2,})\\d"); - - // 不能以 518 、918 结尾 - levitPatterns.add("^[0-9]*(518|918|520|1314)$"); + levitPatterns.add(Pattern.compile("^(0|13|15|18|168|400|800)[0-9]*$")); + levitPatterns.add(Pattern.compile("^\\d{2}(0[1-9]|1[0-2])(0[1-9]|[12][0-9]|3[01])$")); + levitPatterns.add(Pattern.compile("^\\d*(1688|2688|2088|2008|5188|10010|10001|666|888|668|686|688|866|868|886|999|5201314|1314520)\\d*$")); + // 重复号码，镜子号码(Pattern.compile( + levitPatterns.add(Pattern.compile("^(\\d)(\\d)(\\d)\\1\\2\\3$")); + levitPatterns.add(Pattern.compile("^(\\d)(\\d)(\\d)\\3\\2\\1$")); + // AABB(Pattern.compile( + levitPatterns.add(Pattern.compile("^\\d*(\\d)\\1(\\d)\\2\\d*$")); + // AAABBB(Pattern.compile( + levitPatterns.add(Pattern.compile("^\\d*(\\d)\\1\\1(\\d)\\2\\2\\d*$")); + // ABABAB(Pattern.compile( + levitPatterns.add(Pattern.compile("^(\\d)(\\d)\\1\\2\\1\\2\\1\\2$")); + // ABCABC(Pattern.compile( + levitPatterns.add(Pattern.compile("^(\\d)(\\d)(\\d)\\1\\2\\3$")); + // ABBABB(Pattern.compile( + levitPatterns.add(Pattern.compile("^(\\d)(\\d)\\2\\1\\2\\2$")); + // AABAAB(Pattern.compile( + levitPatterns.add(Pattern.compile("^(\\d)\\1(\\d)\\1\\1\\2$")); + // 4-8 位置重复(Pattern.compile( + levitPatterns.add(Pattern.compile("^\\d*(\\d)\\1{2,}\\d*$")); } /** * 根据正则过滤条件过滤 * * @param input * @return - * @throws MalformedPatternException */ - public static boolean contains(String input, String patternString) throws Exception { - try { - pattern = compiler.compile(patternString); - if (matcher.contains(input, pattern)) { - return true; - } - } catch (MalformedPatternException e) { - return false; - } - return false; - } - - public static boolean notContains(String input, List patternStrings) throws Exception { - return !contains( input, patternStrings); + public static boolean contains(String input, Pattern pattern) throws Exception { + Matcher m = pattern.matcher(input); + return m.matches(); } /** * 根据批量正则过滤条件过滤 * * @param input - * @param patternStrings * @return - * @throws MalformedPatternException */ - public static boolean contains(String input, List patternStrings) throws Exception{ - for (Iterator lt = patternStrings.listIterator(); lt.hasNext();) { - if (contains(input, (String) lt.next())) { + public static boolean contains(String input, List patterns) throws Exception{ + for (Iterator lt = patterns.listIterator(); lt.hasNext();) { + if (contains(input, lt.next())) { return true; } - continue; } return false; } @@ -100,13 +74,4 @@ public class RegexUtil { public static boolean checkNotPretty(String input) throws Exception{ return !contains(input,levitPatterns); } - - static private void init() { - if (levitPatterns == null) { - levitPatterns = Lists.newArrayList(); - } else { - return; - } - - } } diff --git a/accompany-base/accompany-core-starter/pom.xml b/accompany-base/accompany-core-starter/pom.xml deleted file mode 100644 index cb664fab1..000000000 --- a/accompany-base/accompany-core-starter/pom.xml +++ /dev/null @@ -1,121 +0,0 @@ - - - 4.0.0 - - com.accompany - accompany-base - 1.0.0 - - - accompany-core-starter - jar - - - - com.accompany - accompany-core - ${revision} - - - - org.springframework.cloud - spring-cloud-starter-alibaba-nacos-config - ${nacos.config.version} - - - - org.redisson - redisson-spring-data-20 - ${redisson.version} - - - - org.redisson - redisson-spring-boot-starter - ${redisson.version} - - - org.redisson - redisson-spring-data-25 - - - - - - org.springframework.cloud - spring-cloud-starter-openfeign - - - - org.springframework.cloud - spring-cloud-starter-netflix-hystrix - - - - org.springframework.cloud - spring-cloud-starter-netflix-ribbon - - - - org.springframework.boot - spring-boot-starter-actuator - - - - org.springframework.boot - spring-boot-starter-test - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-logging - - - - - - org.springframework.boot - spring-boot-starter-aop - - - - org.springframework.boot - spring-boot-starter-jdbc - - - - org.springframework.boot - spring-boot-starter-data-redis - - - - org.springframework.boot - spring-boot-starter-freemarker - - - - com.baomidou - mybatis-plus-boot-starter - ${mybatisplus.version} - - - - cn.hippo4j - hippo4j-config-spring-boot-starter - ${hippo4j-config-spring-boot-starter.version} - - - - org.apache.rocketmq - rocketmq-spring-boot-starter - ${rocketmq-spring-boot-starter.version} - - - - \ No newline at end of file diff --git a/accompany-base/accompany-core/pom.xml b/accompany-base/accompany-core/pom.xml index 3f449217a..5e33682c5 100644 --- a/accompany-base/accompany-core/pom.xml +++ b/accompany-base/accompany-core/pom.xml @@ -19,36 +19,52 @@ ${revision} - - org.apache.tomcat.embed - tomcat-embed-core - compile - - org.springframework.cloud spring-cloud-alibaba-nacos-config ${nacos.config.version} + + org.redisson + redisson-spring-boot-starter + ${redisson.version} + + + org.redisson + redisson-spring-data-25 + + + + org.redisson redisson-spring-data-20 - org.springframework - spring-web + org.springframework.boot + spring-boot-starter-web - org.springframework - spring-webmvc + org.springframework.boot + spring-boot-starter-test - org.springframework - spring-jdbc + org.springframework.boot + spring-boot-starter-aop + + + + org.springframework.boot + spring-boot-starter-jdbc + + + + org.springframework.boot + spring-boot-starter-data-redis @@ -57,12 +73,6 @@ ${hutool.version} - - cn.hutool - hutool-json - ${hutool.version} - - org.springframework.cloud spring-cloud-context @@ -86,6 +96,29 @@ ${tencentcloud-cos-sts-sdk-java.version} + + org.springframework.boot + spring-boot-starter-freemarker + + + + com.baomidou + mybatis-plus-boot-starter + ${mybatisplus.version} + + + + cn.hippo4j + hippo4j-config-spring-boot-starter + ${hippo4j-config-spring-boot-starter.version} + + + + org.apache.rocketmq + rocketmq-spring-boot-starter + ${rocketmq-spring-boot-starter.version} + + diff --git a/accompany-base/accompany-core-starter/src/main/java/com/accompany/core/autoconfigure/RedisAutoConfiguration.java b/accompany-base/accompany-core/src/main/java/com/accompany/core/autoconfigure/RedisAutoConfiguration.java similarity index 100% rename from accompany-base/accompany-core-starter/src/main/java/com/accompany/core/autoconfigure/RedisAutoConfiguration.java rename to accompany-base/accompany-core/src/main/java/com/accompany/core/autoconfigure/RedisAutoConfiguration.java diff --git a/accompany-base/accompany-core-starter/src/main/java/com/accompany/core/autoconfigure/SwaggerAutoConfiguration.java b/accompany-base/accompany-core/src/main/java/com/accompany/core/autoconfigure/SwaggerAutoConfiguration.java similarity index 100% rename from accompany-base/accompany-core-starter/src/main/java/com/accompany/core/autoconfigure/SwaggerAutoConfiguration.java rename to accompany-base/accompany-core/src/main/java/com/accompany/core/autoconfigure/SwaggerAutoConfiguration.java diff --git a/accompany-base/accompany-core-starter/src/main/java/com/accompany/core/config/MybatisPlusConfig.java b/accompany-base/accompany-core/src/main/java/com/accompany/core/config/MybatisPlusConfig.java similarity index 100% rename from accompany-base/accompany-core-starter/src/main/java/com/accompany/core/config/MybatisPlusConfig.java rename to accompany-base/accompany-core/src/main/java/com/accompany/core/config/MybatisPlusConfig.java diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/core/util/JsonUtil.java b/accompany-base/accompany-core/src/main/java/com/accompany/core/util/JsonUtil.java index 893fd1d38..51cdc4dbd 100644 --- a/accompany-base/accompany-core/src/main/java/com/accompany/core/util/JsonUtil.java +++ b/accompany-base/accompany-core/src/main/java/com/accompany/core/util/JsonUtil.java @@ -4,7 +4,6 @@ import com.accompany.core.exception.ServiceException; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; -import com.fasterxml.jackson.datatype.joda.JodaModule; import lombok.extern.slf4j.Slf4j; import org.apache.logging.log4j.util.Strings; @@ -23,7 +22,6 @@ public class JsonUtil { bean.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); //如果是空对象的时候,不抛异常 bean.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false); - bean.registerModule(new JodaModule()); return bean; } diff --git a/accompany-base/accompany-core-starter/src/main/resources/META-INF/spring.factories b/accompany-base/accompany-core/src/main/resources/META-INF/spring.factories similarity index 100% rename from accompany-base/accompany-core-starter/src/main/resources/META-INF/spring.factories rename to accompany-base/accompany-core/src/main/resources/META-INF/spring.factories diff --git a/accompany-base/accompany-core-starter/src/main/resources/banner.txt b/accompany-base/accompany-core/src/main/resources/banner.txt similarity index 100% rename from accompany-base/accompany-core-starter/src/main/resources/banner.txt rename to accompany-base/accompany-core/src/main/resources/banner.txt diff --git a/accompany-base/pom.xml b/accompany-base/pom.xml index aadf3f1f2..6aa9f464e 100644 --- a/accompany-base/pom.xml +++ b/accompany-base/pom.xml @@ -16,7 +16,6 @@ accompany-basic accompany-common accompany-core - accompany-core-starter accompany-payment accompany-sharding accompany-sms diff --git a/accompany-business/accompany-business-festival-activity/fastival-activity-mq/pom.xml b/accompany-business/accompany-business-festival-activity/fastival-activity-mq/pom.xml index 9739ad843..e4512787b 100644 --- a/accompany-business/accompany-business-festival-activity/fastival-activity-mq/pom.xml +++ b/accompany-business/accompany-business-festival-activity/fastival-activity-mq/pom.xml @@ -14,7 +14,7 @@ com.accompany - accompany-core-starter + accompany-core ${revision} diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/dfautil/SensitiveUtil.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/dfautil/SensitiveUtil.java index 40b199937..b61f30be3 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/dfautil/SensitiveUtil.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/dfautil/SensitiveUtil.java @@ -2,7 +2,7 @@ package com.accompany.business.dfautil; import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.StrUtil; -import cn.hutool.json.JSONUtil; +import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; import java.util.Collection; @@ -109,7 +109,7 @@ public final class SensitiveUtil { * @return 是否包含 */ public static boolean containsSensitive(Object obj){ - return sensitiveTree.isMatch(JSONUtil.toJsonStr(obj)); + return sensitiveTree.isMatch(JSON.toJSONString(obj)); } /** @@ -127,7 +127,7 @@ public final class SensitiveUtil { * @return 敏感词 */ public static String getFindedFirstSensitive(Object obj){ - return sensitiveTree.match(JSONUtil.toJsonStr(obj)); + return sensitiveTree.match(JSON.toJSONString(obj)); } /** @@ -159,7 +159,7 @@ public final class SensitiveUtil { * @return 敏感词 */ public static List getFindedAllSensitive(Object bean){ - return sensitiveTree.matchAll(JSONUtil.toJsonStr(bean)); + return sensitiveTree.matchAll(JSON.toJSONString(bean)); } /** @@ -173,6 +173,6 @@ public final class SensitiveUtil { * @return 敏感词 */ public static List getFindedAllSensitive(Object bean, boolean isDensityMatch, boolean isGreedMatch){ - return getFindedAllSensitive(JSONUtil.toJsonStr(bean), isDensityMatch, isGreedMatch); + return getFindedAllSensitive(JSON.toJSONString(bean), isDensityMatch, isGreedMatch); } } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/msg/UserChatMsgListener.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/msg/UserChatMsgListener.java index 3ad9002f2..6e0e6103b 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/msg/UserChatMsgListener.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/msg/UserChatMsgListener.java @@ -1,10 +1,10 @@ package com.accompany.business.event.listener.msg; import cn.hutool.core.util.StrUtil; -import cn.hutool.json.JSONUtil; import com.accompany.business.dto.netease.IMChatMsgDTO; import com.accompany.business.event.msg.UserChatMsgEvent; import com.accompany.business.service.msg.UserChatMsgRecordService; +import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationListener; @@ -39,7 +39,7 @@ public class UserChatMsgListener implements ApplicationListener com.accompany - accompany-core-starter + accompany-core ${revision} diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/BusinessApplication.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/BusinessApplication.java index a26a98020..cfd97eb51 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/BusinessApplication.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/BusinessApplication.java @@ -8,7 +8,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.ServletComponentScan; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; -import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.EnableAspectJAutoProxy; import org.springframework.scheduling.annotation.EnableAsync; @@ -23,7 +22,6 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; @ServletComponentScan(value = {"com.accompany", "com.xuanyin"}) @EnableAsync(proxyTargetClass = true) @EnableScheduling -@EnableFeignClients(basePackages = "com.accompany") @MapperScan({"com.accompany.*.mybatismapper","com.accompany.*.mapper", "com.xuanyin.*.mapper"}) @SpringBootConfiguration public class BusinessApplication extends SpringBootServletInitializer { diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/apppay/MyCardController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/apppay/MyCardController.java index a87ba7928..f0355fa9b 100644 --- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/apppay/MyCardController.java +++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/apppay/MyCardController.java @@ -1,7 +1,6 @@ package com.accompany.business.controller.apppay; import cn.hutool.core.util.StrUtil; -import cn.hutool.json.JSONUtil; import com.accompany.business.service.mycard.MyCardBizService; import com.accompany.common.result.BusiResult; import com.accompany.common.utils.DateTimeUtil; @@ -10,6 +9,7 @@ import com.accompany.payment.mycard.dto.CallbackDto; import com.accompany.payment.mycard.dto.ReplenishDto; import com.accompany.payment.mycard.resp.QueryOrderResp; import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSON; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; @@ -90,7 +90,7 @@ public class MyCardController { @ApiOperation("业务回调") @PostMapping("/callback") public ModelAndView callback(@RequestParam Map map) { - String json = JSONUtil.toJsonStr(map); + String json = JSON.toJSONString(map); log.info("myCard callback json : {}", json); String result = myCardBizService.callback(JSONObject.parseObject(json, CallbackDto.class)); log.info("myCard callback result : {}", result); diff --git a/accompany-dependencies/pom.xml b/accompany-dependencies/pom.xml index 105d20552..3771807e9 100644 --- a/accompany-dependencies/pom.xml +++ b/accompany-dependencies/pom.xml @@ -28,11 +28,9 @@ 3.1.0 4.5 31.1-jre - 1.2.83 + 2.0.49 4.12 3.12.0 - 2.11.1 - 2.0.8 Hoxton.SR12 7.14.0 0.2.2.RELEASE @@ -66,13 +64,10 @@ 1.3 1.0.5 7.10.0 - 5.5.3 - 5.5.3 1.5.4 2.0.1.RELEASE 1.2.0 2.1.1 - 2.10.5 3.1.2 1.0.4 3.16.8 @@ -81,7 +76,7 @@ 2.7.0 1.7.2 2.2.3 - 4.6.6 + 5.8.27 1.5.0 3.7.110.ALL v3-rev24-1.24.1 @@ -196,12 +191,6 @@ ${apache.commons.version} - - org.apache.commons - commons-pool2 - ${commons-pool2.version} - - com.aliyun aliyun-java-sdk-sts @@ -280,12 +269,6 @@ ${fastjson.version} - - oro - oro - ${oro.version} - - commons-io commons-io @@ -468,30 +451,12 @@ ${aliyun-java-sdk-cloudauth.version} - - com.fasterxml.jackson.datatype - jackson-datatype-joda - ${jackson-datatype-joda.version} - - - - joda-time - joda-time - ${joda-time.version} - - cn.hutool hutool-core ${hutool.version} - - cn.hutool - hutool-json - ${hutool.version} - - com.googlecode.libphonenumber libphonenumber @@ -532,11 +497,6 @@ fastjson - - oro - oro - - commons-collections commons-collections @@ -654,16 +614,6 @@ - - org.codehaus.jackson - jackson-mapper-asl - - - - io.micrometer - micrometer-registry-prometheus - - mysql mysql-connector-java @@ -696,21 +646,6 @@ aliyun-java-sdk-cloudauth - - org.apache.poi - poi-ooxml - - - - org.apache.poi - poi-ooxml-schemas - - - - org.apache.poi - poi - - net.sf.jxls jxls-core @@ -742,11 +677,6 @@ aliyun-sdk-mns - - org.apache.commons - commons-pool2 - - org.slf4j slf4j-api @@ -807,16 +737,6 @@ springfox-bean-validators - - com.fasterxml.jackson.datatype - jackson-datatype-joda - - - - joda-time - joda-time - - tech.sud.mgp.auth sud-mgp-auth-java @@ -846,11 +766,6 @@ ${opencc4j.version} - - org.aspectj - aspectjweaver - - com.baomidou mybatis-plus @@ -862,12 +777,6 @@ commons-lang - - org.bouncycastle - bcprov-jdk15on - ${bcprov-jdk15on.version} - - ch.qos.logback logback-core diff --git a/accompany-mq/accompany-mq-service/src/main/java/com/accompany/mq/listener/AbstractMessageListener.java b/accompany-mq/accompany-mq-service/src/main/java/com/accompany/mq/listener/AbstractMessageListener.java index c135fe9dc..c8a341e57 100644 --- a/accompany-mq/accompany-mq-service/src/main/java/com/accompany/mq/listener/AbstractMessageListener.java +++ b/accompany-mq/accompany-mq-service/src/main/java/com/accompany/mq/listener/AbstractMessageListener.java @@ -1,12 +1,12 @@ package com.accompany.mq.listener; import cn.hutool.core.util.StrUtil; -import cn.hutool.json.JSONUtil; import com.accompany.common.redis.RedisKey; import com.accompany.core.service.common.JedisLockService; import com.accompany.core.service.common.JedisService; import com.accompany.mq.model.BaseMqMessage; -import com.google.gson.internal.$Gson$Types; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.apache.rocketmq.spring.core.RocketMQListener; import org.springframework.beans.factory.annotation.Autowired; @@ -38,7 +38,8 @@ public abstract class AbstractMessageListener implement if (!message.startsWith(StrUtil.DELIM_START) || !message.endsWith(StrUtil.DELIM_END)) { return; } - T mqMessage = JSONUtil.toBean(message, $Gson$Types.canonicalize(((ParameterizedType) this.getClass().getGenericSuperclass()).getActualTypeArguments()[0]), true); + T mqMessage = JSONObject.parseObject(message) + .toJavaObject(((ParameterizedType) this.getClass().getGenericSuperclass()).getActualTypeArguments()[0]); if (mqMessage == null) { return; } diff --git a/accompany-mq/accompany-mq-service/src/main/java/com/accompany/mq/producer/MQMessageProducer.java b/accompany-mq/accompany-mq-service/src/main/java/com/accompany/mq/producer/MQMessageProducer.java index b139d058c..f4a9125d8 100644 --- a/accompany-mq/accompany-mq-service/src/main/java/com/accompany/mq/producer/MQMessageProducer.java +++ b/accompany-mq/accompany-mq-service/src/main/java/com/accompany/mq/producer/MQMessageProducer.java @@ -1,7 +1,7 @@ package com.accompany.mq.producer; -import cn.hutool.json.JSONUtil; import com.accompany.mq.model.BaseMqMessage; +import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; import org.apache.rocketmq.client.producer.SendCallback; import org.apache.rocketmq.client.producer.SendResult; @@ -66,7 +66,7 @@ public class MQMessageProducer { // } // object.setMessId(messId); // object.setMessTime(System.currentTimeMillis()); - String objectJson = JSONUtil.toJsonStr(object); + String objectJson = JSON.toJSONString(object); log.info("queueName : {}, message : {}", queueName, objectJson); rocketMQTemplate.asyncSend(queueName, MessageBuilder.withPayload(objectJson).build(), new SendCallback() { @Override @@ -131,7 +131,7 @@ public class MQMessageProducer { // } // object.setMessId(messId); // object.setMessTime(System.currentTimeMillis()); - String objectJson = JSONUtil.toJsonStr(object); + String objectJson = JSON.toJSONString(object); log.info("queueName : {}, message : {}", queueName, objectJson); rocketMQTemplate.asyncSendOrderly(queueName, MessageBuilder.withPayload(objectJson).build(), hashKey, new SendCallback() { @Override diff --git a/accompany-mq/accompany-mq-web/pom.xml b/accompany-mq/accompany-mq-web/pom.xml index 2122165e7..da9e156a0 100644 --- a/accompany-mq/accompany-mq-web/pom.xml +++ b/accompany-mq/accompany-mq-web/pom.xml @@ -14,7 +14,7 @@ com.accompany - accompany-core-starter + accompany-core ${revision} diff --git a/accompany-oauth2/accompany-oauth2-web/pom.xml b/accompany-oauth2/accompany-oauth2-web/pom.xml index 1208238b9..9301f16da 100644 --- a/accompany-oauth2/accompany-oauth2-web/pom.xml +++ b/accompany-oauth2/accompany-oauth2-web/pom.xml @@ -15,7 +15,7 @@ com.accompany - accompany-core-starter + accompany-core ${revision} diff --git a/accompany-oauth2/accompany-oauth2-web/src/main/java/com/accompany/oauth2/OAuth2Application.java b/accompany-oauth2/accompany-oauth2-web/src/main/java/com/accompany/oauth2/OAuth2Application.java index ab6e651be..96b611fb9 100644 --- a/accompany-oauth2/accompany-oauth2-web/src/main/java/com/accompany/oauth2/OAuth2Application.java +++ b/accompany-oauth2/accompany-oauth2-web/src/main/java/com/accompany/oauth2/OAuth2Application.java @@ -6,7 +6,6 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.web.servlet.ServletComponentScan; -import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.ComponentScan; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableScheduling; @@ -19,7 +18,6 @@ import org.springframework.scheduling.annotation.EnableScheduling; @ServletComponentScan(value = {"com.accompany", "com.xuanyin"}) @EnableScheduling @EnableAsync(proxyTargetClass = true) -@EnableFeignClients(basePackages = "com.accompany") @MapperScan({"com.accompany.*.mapper","com.accompany.*.mybatismapper"}) @SpringBootConfiguration public class OAuth2Application { diff --git a/accompany-scheduler/accompany-scheduler-web/pom.xml b/accompany-scheduler/accompany-scheduler-web/pom.xml index 8c6be8d07..cff0a600e 100644 --- a/accompany-scheduler/accompany-scheduler-web/pom.xml +++ b/accompany-scheduler/accompany-scheduler-web/pom.xml @@ -15,7 +15,7 @@ com.accompany - accompany-core-starter + accompany-core ${revision} diff --git a/accompany-scheduler/accompany-scheduler-web/src/main/java/com/accompany/scheduler/JobApplication.java b/accompany-scheduler/accompany-scheduler-web/src/main/java/com/accompany/scheduler/JobApplication.java index ebff6fe04..5ec83e44f 100644 --- a/accompany-scheduler/accompany-scheduler-web/src/main/java/com/accompany/scheduler/JobApplication.java +++ b/accompany-scheduler/accompany-scheduler-web/src/main/java/com/accompany/scheduler/JobApplication.java @@ -5,7 +5,6 @@ import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.ComponentScan; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableScheduling; @@ -19,7 +18,6 @@ import org.springframework.scheduling.annotation.EnableScheduling; @ComponentScan({"com.accompany","com.xuanyin"}) @EnableScheduling @EnableAsync(proxyTargetClass = true) -@EnableFeignClients(basePackages = "com.accompany") @MapperScan({"com.accompany.*.mapper","com.accompany.*.mybatismapper", "com.xuanyin.*.mapper"}) @SpringBootConfiguration public class JobApplication {