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

代码-去掉aliyum rocketmq依赖

Browse Source
This commit is contained in:
khalil
2024-04-24 16:11:44 +08:00
parent 3c3a55dead
commit b8b5104433
12 changed files with 25 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/linearly/LinearlyPoolDataAdminService.java
View File

@@ -25,7 +25,7 @@ import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.google.common.collect.Lists;
import org.apache.commons.lang3.time.FastDateFormat;
import org.apache.cxf.common.util.CollectionUtils;
import org.springframework.util.CollectionUtils;
import javax.validation.constraints.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

2
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/prize/PrizePoolItemAdminService.java
View File

@@ -15,7 +15,7 @@ import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import org.apache.cxf.common.util.CollectionUtils;
import org.springframework.util.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;

2
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/prize/UserBoxPrizeRecordAdminService.java
View File

@@ -18,7 +18,7 @@ import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.google.common.collect.Lists;
import org.apache.commons.lang3.time.FastDateFormat;
import org.apache.cxf.common.util.CollectionUtils;
import org.springframework.util.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

2
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/withdraw/WithdrawBlockAdminService.java
View File

@@ -12,7 +12,7 @@ import com.accompany.core.exception.AdminServiceException;
import com.accompany.core.model.Users;
import com.alipay.api.internal.util.StringUtils;
import com.github.pagehelper.PageHelper;
import org.apache.cxf.common.util.CollectionUtils;
import org.springframework.util.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

10
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/util/DateTimeUtil.java
View File

@@ -1,7 +1,7 @@
package com.accompany.admin.util;
import com.accompany.common.utils.BlankUtil;
import org.apache.log4j.Logger;
import lombok.extern.slf4j.Slf4j;
import java.sql.Timestamp;
import java.text.ParseException;
@@ -13,9 +13,9 @@ import java.util.Date;
* @author laochunyu 2015-7-31
* @description 时间日期的工具类
*/
@Slf4j
public class DateTimeUtil {
private static final Logger logger = Logger.getLogger(DateTimeUtil.class);
public static final String DEFAULT_PATTERN = "yyyy-MM-dd HH:mm:ss";
/**
@@ -93,7 +93,7 @@ public class DateTimeUtil {
SimpleDateFormat sdf = new SimpleDateFormat(format);
return sdf.parse(dateStr);
}catch (Exception e) {
logger.warn("convertDate fail, date is "+ dateStr, e);
log.warn("convertDate fail, date is "+ dateStr, e);
}
}
return null;
@@ -112,7 +112,7 @@ public class DateTimeUtil {
SimpleDateFormat sdf = new SimpleDateFormat(otherFormat);
return sdf.format(date);
}catch (Exception e) {
logger.warn("convertDate fail, date is "+ dateStr, e);
log.warn("convertDate fail, date is "+ dateStr, e);
}
return null;
}

1
accompany-business/accompany-business-festival-activity/festival-activity-dao/src/main/java/com/accompany/business/annual/AnnualTaskDao.java
View File

@@ -6,7 +6,6 @@ import com.accompany.common.constant.AppEnum;
import com.accompany.common.status.BusiStatus;
import com.accompany.core.exception.ServiceException;
import lombok.extern.slf4j.Slf4j;
import org.apache.cxf.Bus;
import org.redisson.api.RLock;
import org.redisson.api.RMap;
import org.redisson.api.RedissonClient;

2
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activities/ActivitiesDrawService.java
View File

@@ -35,10 +35,10 @@ import com.google.common.collect.Maps;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import lombok.extern.slf4j.Slf4j;
import org.apache.cxf.common.util.CollectionUtils;
import org.joda.time.DateTime;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.*;

2
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/ActivityPackService.java
View File

@@ -30,7 +30,6 @@ import com.google.common.io.CharStreams;
import com.google.gson.Gson;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.cxf.common.util.CollectionUtils;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
@@ -38,6 +37,7 @@ import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils;
import java.io.InputStreamReader;
import java.io.Reader;

6
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/OperationActService.java
View File

@@ -8,7 +8,7 @@ import com.accompany.core.service.common.JedisService;
import com.accompany.common.constant.Constant;
import com.accompany.common.redis.RedisKey;
import com.accompany.common.utils.BlankUtil;
import org.apache.cxf.common.util.CollectionUtils;
import org.springframework.util.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -24,7 +24,7 @@ public class OperationActService extends BaseService {
@Autowired
private OperationActMapper operationActMapper;
public OperationAct queryOpertionAct(Integer id) throws Exception{
public OperationAct queryOpertionAct(Integer id) {
String str = jedisService.hget(RedisKey.oper_act.getKey(),id.toString());
if(BlankUtil.isBlank(str)){
return null;
@@ -33,7 +33,7 @@ public class OperationActService extends BaseService {
return operationAct;
}
public void refreshOperationAct() throws Exception{
public void refreshOperationAct() {
OperationActExample example = new OperationActExample();
OperationActExample.Criteria criteria = example.createCriteria();
criteria.andStatusEqualTo(Constant.status.valid);

3
accompany-business/accompany-business-service/src/main/java/com/accompany/business/util/Base64Utils.java
View File

@@ -3,7 +3,6 @@
* copyright (c) by DuoWan 2011
*/
package com.accompany.business.util;
import org.apache.cxf.common.util.Base64Utility;
import org.bouncycastle.util.encoders.Base64;
public class Base64Utils {
@@ -36,7 +35,7 @@ public class Base64Utils {
* @throws Exception
*/
public static String encode(byte[] bytes){
return Base64Utility.encode(bytes);
return new String(Base64.encode(bytes));
}

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

@@ -20,7 +20,7 @@ public class WebMessageConverterConfig extends WebMvcConfigurationSupport {
MappingJackson2HttpMessageConverter jsonConverter = new MappingJackson2HttpMessageConverter();
ObjectMapper objectMapper = new ObjectMapper()
.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
.setSerializationInclusion(JsonInclude.Include.NON_EMPTY);
.setSerializationInclusion(JsonInclude.Include.NON_NULL);
jsonConverter.setObjectMapper(objectMapper);
return jsonConverter;

52
accompany-dependencies/pom.xml
View File

@@ -21,6 +21,7 @@
<package.output.directory>${basedir}/target</package.output.directory>
<!-- 依赖 -->
<spring-cloud.version>2021.0.5</spring-cloud.version>
<spring-cloud-alibaba.version>2021.0.5.0</spring-cloud-alibaba.version>
<spring-cloud-starter-bootstrap.version>3.1.8</spring-cloud-starter-bootstrap.version>
<jedis.version>3.9.0</jedis.version>
<httpclient.version>3.1</httpclient.version>
@@ -42,7 +43,6 @@
<protobuf-java.version>3.15.5</protobuf-java.version>
<commons-collections.version>3.2.2</commons-collections.version>
<commons-io.version>2.11.0</commons-io.version>
<cxf-api.version>2.7.18</cxf-api.version>
<commons-math.version>2.0</commons-math.version>
<dozer.version>5.5.1</dozer.version>
<jchardet.version>1.0</jchardet.version>
@@ -52,12 +52,10 @@
<sdk-core-java.version>1.0.2</sdk-core-java.version>
<jjwt.version>0.9.1</jjwt.version>
<java-jwt.version>3.10.3</java-jwt.version>
<ons-client.version>1.2.1</ons-client.version>
<sitemesh.version>2.4.2</sitemesh.version>
<pagehelper.version>5.1.8</pagehelper.version>
<validation-api.version>2.0.1.Final</validation-api.version>
<aliyun-java-sdk-dysmsapi.version>1.1.0</aliyun-java-sdk-dysmsapi.version>
<aliyun-sdk-mns.version>1.1.8</aliyun-sdk-mns.version>
<commons-fileupload.version>1.3</commons-fileupload.version>
<elasticsearch.version>7.10.0</elasticsearch.version>
<orika-core.version>1.5.4</orika-core.version>
@@ -101,6 +99,14 @@
<scope>import</scope>
</dependency>
<!--<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-alibaba-dependencies</artifactId>
<version>${spring-cloud-alibaba.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>-->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-bootstrap</artifactId>
@@ -263,12 +269,6 @@
<version>${commons-io.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-api</artifactId>
<version>${cxf-api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math</artifactId>
@@ -342,24 +342,12 @@
<version>${java-jwt.version}</version>
</dependency>
<dependency>
<groupId>com.aliyun.openservices</groupId>
<artifactId>ons-client</artifactId>
<version>${ons-client.version}</version>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>${commons-fileupload.version}</version>
</dependency>
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
<version>${jsoup.version}</version>
</dependency>
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
@@ -373,12 +361,6 @@
<version>${aliyun-java-sdk-dysmsapi.version}</version>
</dependency>
<dependency>
<groupId>com.aliyun.mns</groupId>
<artifactId>aliyun-sdk-mns</artifactId>
<version>${aliyun-sdk-mns.version}</version>
</dependency>
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper</artifactId>
@@ -491,11 +473,6 @@
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math</artifactId>
@@ -560,12 +537,6 @@
<artifactId>java-jwt</artifactId>
</dependency>
<!--阿里云消息队列-->
<dependency>
<groupId>com.aliyun.openservices</groupId>
<artifactId>ons-client</artifactId>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
@@ -626,11 +597,6 @@
<artifactId>aliyun-java-sdk-dysmsapi</artifactId>
</dependency>
<dependency>
<groupId>com.aliyun.mns</groupId>
<artifactId>aliyun-sdk-mns</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>