moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码-清除老旧pom依赖

Browse Source
This commit is contained in:
khalil
2024-04-19 16:40:27 +08:00
parent bb9be6959c
commit 42a06ebcd9
33 changed files with 114 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
accompany-admin/accompany-admin-service/pom.xml
View File

@@ -28,6 +28,11 @@
<artifactId>accompany-basic-service</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.accompany</groupId>
<artifactId>accompany-core</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.accompany</groupId>
<artifactId>accompany-payment-service</artifactId>
@@ -48,11 +53,6 @@
<artifactId>accompany-business-community-service</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.accompany</groupId>
<artifactId>accompany-sharding-service</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.accompany</groupId>
<artifactId>accompany-business-service</artifactId>

5
accompany-admin/accompany-admin-web/pom.xml
View File

@@ -13,11 +13,6 @@
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>com.accompany</groupId>
<artifactId>accompany-core-starter</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.accompany</groupId>
<artifactId>accompany-admin-service</artifactId>

3
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/AdminApplication.java
View File

@@ -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

4
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/config/SaTokenConfig.java
View File

@@ -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) {

4
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/system/AdminUserController.java
View File

@@ -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);
}

2
accompany-admin/accompany-flow-team-admin-web/pom.xml
View File

@@ -15,7 +15,7 @@
<dependencies>
<dependency>
<groupId>com.accompany</groupId>
<artifactId>accompany-core-starter</artifactId>
<artifactId>accompany-core</artifactId>
<version>${revision}</version>
</dependency>
<dependency>

2
accompany-admin/accompany-flow-team-admin-web/src/main/java/com/accompany/flowteam/admin/FlowTeamAdminApplication.java
View File

@@ -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

2
accompany-admin/accompany-flow-team-admin-web/src/main/java/com/accompany/flowteam/admin/config/SaTokenConfig.java
View File

@@ -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) {

34
accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/service/account/ErBanNoService.java
View File

@@ -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);
}
}

95
accompany-base/accompany-common/src/main/java/com/accompany/common/utils/RegexUtil.java
View File

@@ -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<String> levitPatterns= Lists.newArrayList();
private static List<Pattern> 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("^(<a>\\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("^(<a>\\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<String> 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<String> patternStrings) throws Exception{
for (Iterator<String> lt = patternStrings.listIterator(); lt.hasNext();) {
if (contains(input, (String) lt.next())) {
public static boolean contains(String input, List<Pattern> patterns) throws Exception{
for (Iterator<Pattern> 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;
}
}
}

121
accompany-base/accompany-core-starter/pom.xml
View File

@@ -1,121 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.accompany</groupId>
<artifactId>accompany-base</artifactId>
<version>1.0.0</version>
</parent>
<artifactId>accompany-core-starter</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>com.accompany</groupId>
<artifactId>accompany-core</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
<version>${nacos.config.version}</version>
</dependency>
<dependency>
<groupId>org.redisson</groupId>
<artifactId>redisson-spring-data-20</artifactId>
<version>${redisson.version}</version>
</dependency>
<dependency>
<groupId>org.redisson</groupId>
<artifactId>redisson-spring-boot-starter</artifactId>
<version>${redisson.version}</version>
<exclusions>
<exclusion>
<groupId>org.redisson</groupId>
<artifactId>redisson-spring-data-25</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jdbc</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-freemarker</artifactId>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>${mybatisplus.version}</version>
</dependency>
<dependency>
<groupId>cn.hippo4j</groupId>
<artifactId>hippo4j-config-spring-boot-starter</artifactId>
<version>${hippo4j-config-spring-boot-starter.version}</version>
</dependency>
<dependency>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-spring-boot-starter</artifactId>
<version>${rocketmq-spring-boot-starter.version}</version>
</dependency>
</dependencies>
</project>

69
accompany-base/accompany-core/pom.xml
View File

@@ -19,36 +19,52 @@
<version>${revision}</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-alibaba-nacos-config</artifactId>
<version>${nacos.config.version}</version>
</dependency>
<dependency>
<groupId>org.redisson</groupId>
<artifactId>redisson-spring-boot-starter</artifactId>
<version>${redisson.version}</version>
<exclusions>
<exclusion>
<groupId>org.redisson</groupId>
<artifactId>redisson-spring-data-25</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.redisson</groupId>
<artifactId>redisson-spring-data-20</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jdbc</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
<dependency>
@@ -57,12 +73,6 @@
<version>${hutool.version}</version>
</dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-json</artifactId>
<version>${hutool.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-context</artifactId>
@@ -86,6 +96,29 @@
<version>${tencentcloud-cos-sts-sdk-java.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-freemarker</artifactId>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>${mybatisplus.version}</version>
</dependency>
<dependency>
<groupId>cn.hippo4j</groupId>
<artifactId>hippo4j-config-spring-boot-starter</artifactId>
<version>${hippo4j-config-spring-boot-starter.version}</version>
</dependency>
<dependency>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-spring-boot-starter</artifactId>
<version>${rocketmq-spring-boot-starter.version}</version>
</dependency>
</dependencies>

0
accompany-base/accompany-core-starter/src/main/java/com/accompany/core/autoconfigure/RedisAutoConfiguration.java → accompany-base/accompany-core/src/main/java/com/accompany/core/autoconfigure/RedisAutoConfiguration.java
View File

0
accompany-base/accompany-core-starter/src/main/java/com/accompany/core/autoconfigure/SwaggerAutoConfiguration.java → accompany-base/accompany-core/src/main/java/com/accompany/core/autoconfigure/SwaggerAutoConfiguration.java
View File

0
accompany-base/accompany-core-starter/src/main/java/com/accompany/core/config/MybatisPlusConfig.java → accompany-base/accompany-core/src/main/java/com/accompany/core/config/MybatisPlusConfig.java
View File

2
accompany-base/accompany-core/src/main/java/com/accompany/core/util/JsonUtil.java
View File

@@ -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;
}

0
accompany-base/accompany-core-starter/src/main/resources/META-INF/spring.factories → accompany-base/accompany-core/src/main/resources/META-INF/spring.factories
View File

0
accompany-base/accompany-core-starter/src/main/resources/banner.txt → accompany-base/accompany-core/src/main/resources/banner.txt
View File

1
accompany-base/pom.xml
View File

@@ -16,7 +16,6 @@
<module>accompany-basic</module>
<module>accompany-common</module>
<module>accompany-core</module>
<module>accompany-core-starter</module>
<module>accompany-payment</module>
<module>accompany-sharding</module>
<module>accompany-sms</module>

2
accompany-business/accompany-business-festival-activity/fastival-activity-mq/pom.xml
View File

@@ -14,7 +14,7 @@
<dependencies>
<dependency>
<groupId>com.accompany</groupId>
<artifactId>accompany-core-starter</artifactId>
<artifactId>accompany-core</artifactId>
<version>${revision}</version>
</dependency>
<dependency>

10
accompany-business/accompany-business-service/src/main/java/com/accompany/business/dfautil/SensitiveUtil.java
View File

@@ -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<String> 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<String> getFindedAllSensitive(Object bean, boolean isDensityMatch, boolean isGreedMatch){
return getFindedAllSensitive(JSONUtil.toJsonStr(bean), isDensityMatch, isGreedMatch);
return getFindedAllSensitive(JSON.toJSONString(bean), isDensityMatch, isGreedMatch);
}
}

4
accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/msg/UserChatMsgListener.java
View File

@@ -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<UserChatMsgEvent
if (attach.startsWith(StrUtil.DELIM_START) && attach.endsWith(StrUtil.DELIM_END)) {
if (chatMsg.getAttachObj() == null) {
try {
chatMsg.setAttachObj(JSONUtil.toBean(chatMsg.getAttach(), IMChatMsgDTO.Attach.class));
chatMsg.setAttachObj(JSON.parseObject(chatMsg.getAttach(), IMChatMsgDTO.Attach.class));
} catch (Exception ignored) {
}

2
accompany-business/accompany-business-web/pom.xml
View File

@@ -15,7 +15,7 @@
<dependencies>
<dependency>
<groupId>com.accompany</groupId>
<artifactId>accompany-core-starter</artifactId>
<artifactId>accompany-core</artifactId>
<version>${revision}</version>
</dependency>
<dependency>

2
accompany-business/accompany-business-web/src/main/java/com/accompany/business/BusinessApplication.java
View File

@@ -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 {

4
accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/apppay/MyCardController.java
View File

@@ -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<String, Object> 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);

95
accompany-dependencies/pom.xml
View File

@@ -28,11 +28,9 @@
<servlet-api.version>3.1.0</servlet-api.version>
<http-client.version>4.5</http-client.version>
<guava.version>31.1-jre</guava.version>
<fastjson.version>1.2.83</fastjson.version>
<fastjson.version>2.0.49</fastjson.version>
<junit.version>4.12</junit.version>
<apache.commons.version>3.12.0</apache.commons.version>
<commons-pool2.version>2.11.1</commons-pool2.version>
<oro.version>2.0.8</oro.version>
<spring-cloud.version>Hoxton.SR12</spring-cloud.version>
<qiniu.version>7.14.0</qiniu.version>
<nacos.config.version>0.2.2.RELEASE</nacos.config.version>
@@ -66,13 +64,10 @@
<commons-fileupload.version>1.3</commons-fileupload.version>
<jxls-core.version>1.0.5</jxls-core.version>
<elasticsearch.version>7.10.0</elasticsearch.version>
<transport.version>5.5.3</transport.version>
<x-pack-transport.version>5.5.3</x-pack-transport.version>
<orika-core.version>1.5.4</orika-core.version>
<spring-security-oauth2-autoconfigure.version>2.0.1.RELEASE</spring-security-oauth2-autoconfigure.version>
<aliyun-java-sdk-cloudauth.version>1.2.0</aliyun-java-sdk-cloudauth.version>
<jackson-datatype-joda.version>2.1.1</jackson-datatype-joda.version>
<joda-time.version>2.10.5</joda-time.version>
<mybatisplus.version>3.1.2</mybatisplus.version>
<sud-mgp-auth-java.version>1.0.4</sud-mgp-auth-java.version>
<redisson.version>3.16.8</redisson.version>
@@ -81,7 +76,7 @@
<ip2region.version>2.7.0</ip2region.version>
<opencc4j.version>1.7.2</opencc4j.version>
<rocketmq-spring-boot-starter.version>2.2.3</rocketmq-spring-boot-starter.version>
<hutool.version>4.6.6</hutool.version>
<hutool.version>5.8.27</hutool.version>
<hippo4j-config-spring-boot-starter.version>1.5.0</hippo4j-config-spring-boot-starter.version>
<alipay-sdk-java.version>3.7.110.ALL</alipay-sdk-java.version>
<google-api-services-androidpublisher.version>v3-rev24-1.24.1</google-api-services-androidpublisher.version>
@@ -196,12 +191,6 @@
<version>${apache.commons.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
<version>${commons-pool2.version}</version>
</dependency>
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>aliyun-java-sdk-sts</artifactId>
@@ -280,12 +269,6 @@
<version>${fastjson.version}</version>
</dependency>
<dependency>
<groupId>oro</groupId>
<artifactId>oro</artifactId>
<version>${oro.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
@@ -468,30 +451,12 @@
<version>${aliyun-java-sdk-cloudauth.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId>
<version>${jackson-datatype-joda.version}</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>${joda-time.version}</version>
</dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-core</artifactId>
<version>${hutool.version}</version>
</dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-json</artifactId>
<version>${hutool.version}</version>
</dependency>
<dependency>
<groupId>com.googlecode.libphonenumber</groupId>
<artifactId>libphonenumber</artifactId>
@@ -532,11 +497,6 @@
<artifactId>fastjson</artifactId>
</dependency>
<dependency>
<groupId>oro</groupId>
<artifactId>oro</artifactId>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
@@ -654,16 +614,6 @@
</dependency>
<!-- WEB end -->
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
@@ -696,21 +646,6 @@
<artifactId>aliyun-java-sdk-cloudauth</artifactId>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml-schemas</artifactId>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
</dependency>
<dependency>
<groupId>net.sf.jxls</groupId>
<artifactId>jxls-core</artifactId>
@@ -742,11 +677,6 @@
<artifactId>aliyun-sdk-mns</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -807,16 +737,6 @@
<artifactId>springfox-bean-validators</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</dependency>
<dependency>
<groupId>tech.sud.mgp.auth</groupId>
<artifactId>sud-mgp-auth-java</artifactId>
@@ -846,11 +766,6 @@
<version>${opencc4j.version}</version>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus</artifactId>
@@ -862,12 +777,6 @@
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>${bcprov-jdk15on.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>

7
accompany-mq/accompany-mq-service/src/main/java/com/accompany/mq/listener/AbstractMessageListener.java
View File

@@ -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<T extends BaseMqMessage> 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;
}

6
accompany-mq/accompany-mq-service/src/main/java/com/accompany/mq/producer/MQMessageProducer.java
View File

@@ -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

2
accompany-mq/accompany-mq-web/pom.xml
View File

@@ -14,7 +14,7 @@
<dependencies>
<dependency>
<groupId>com.accompany</groupId>
<artifactId>accompany-core-starter</artifactId>
<artifactId>accompany-core</artifactId>
<version>${revision}</version>
</dependency>
<dependency>

2
accompany-oauth2/accompany-oauth2-web/pom.xml
View File

@@ -15,7 +15,7 @@
<dependencies>
<dependency>
<groupId>com.accompany</groupId>
<artifactId>accompany-core-starter</artifactId>
<artifactId>accompany-core</artifactId>
<version>${revision}</version>
</dependency>
<dependency>

2
accompany-oauth2/accompany-oauth2-web/src/main/java/com/accompany/oauth2/OAuth2Application.java
View File

@@ -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 {

2
accompany-scheduler/accompany-scheduler-web/pom.xml
View File

@@ -15,7 +15,7 @@
<dependencies>
<dependency>
<groupId>com.accompany</groupId>
<artifactId>accompany-core-starter</artifactId>
<artifactId>accompany-core</artifactId>
<version>${revision}</version>
</dependency>
<dependency>

2
accompany-scheduler/accompany-scheduler-web/src/main/java/com/accompany/scheduler/JobApplication.java
View File

@@ -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 {