From df4441322e9801c102299451da41d7c40b4502e9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 24 六月 2021 18:53:13 +0800
Subject: [PATCH] zookeeper地址修改，Maven采用私服
---
service-daylucky/src/main/java/com/ks/daylucky/service/impl/remote/AppConfigServiceImpl.java | 4
facade-lucky/pom.xml | 2
service-daylucky/src/main/java/com/ks/daylucky/aspect/LuckyParamsCheckAspect.java | 4
pom.xml | 42 ++++++++++++++
service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/UserController.java | 3 +
service-lucky/src/main/resources/application.yml | 2
service-daylucky/src/main/java/com/ks/daylucky/service/impl/remote/ActivityTagServiceImpl.java | 6 +-
service-daylucky/src/main/java/com/ks/daylucky/service/UserInfoService.java | 6 +-
service-app/src/main/java/com/ks/app/aspect/AppParamsCheckAspect.java | 4
service-daylucky/src/main/java/com/ks/daylucky/service/ActivityScanRecordService.java | 6 +-
service-daylucky/src/test/java/com/ks/daylucky/UserTest.java | 2
service-daylucky/src/main/java/com/ks/daylucky/service/ActivityTagService.java | 8 +-
service-app/src/main/resources/application.yml | 2
service-daylucky/src/main/java/com/ks/daylucky/service/AppConfigService.java | 6 +-
service-daylucky/src/main/java/com/ks/daylucky/service/impl/remote/UserInfoServiceImpl.java | 4
service-daylucky/src/main/java/com/ks/daylucky/service/impl/remote/AnnouncementServiceImpl.java | 4
service-app/src/test/java/com/ks/app/AppTest.java | 2
service-daylucky/src/main/java/com/ks/daylucky/service/AnnouncementService.java | 6 +-
service-daylucky/src/main/resources/application-pro.yml | 2
facade-app/pom.xml | 6 ++
service-lucky/src/main/java/com/ks/lucky/aspect/LuckyParamsCheckAspect.java | 4
service-daylucky/src/test/java/com/ks/daylucky/VisualUserTest.java | 4
service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityController.java | 3
service-daylucky/src/main/java/com/ks/daylucky/service/impl/remote/ActivityScanRecordServiceImpl.java | 4
generater/pom.xml | 2
25 files changed, 95 insertions(+), 43 deletions(-)
diff --git a/facade-app/pom.xml b/facade-app/pom.xml
index dbcad2f..a0903d5 100644
--- a/facade-app/pom.xml
+++ b/facade-app/pom.xml
@@ -19,6 +19,12 @@
<artifactId>lib-common</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>com.yeshi</groupId>
+ <artifactId>utils</artifactId>
+ <version>0.0.2-SNAPSHOT</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
diff --git a/facade-lucky/pom.xml b/facade-lucky/pom.xml
index 23a1ab0..f4e3881 100644
--- a/facade-lucky/pom.xml
+++ b/facade-lucky/pom.xml
@@ -23,7 +23,7 @@
<dependency>
<groupId>com.yeshi</groupId>
<artifactId>utils</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.5</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
diff --git a/generater/pom.xml b/generater/pom.xml
index 9ea2e34..095be42 100644
--- a/generater/pom.xml
+++ b/generater/pom.xml
@@ -31,7 +31,7 @@
<dependency>
<groupId>com.yeshi</groupId>
<artifactId>utils</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.5</version>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index b032df6..982eb63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -168,9 +168,51 @@
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
+ <dependency>
+ <groupId>redis.clients</groupId>
+ <artifactId>jedis</artifactId>
+ <version>3.1.0</version>
+ <type>jar</type>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.qcloud</groupId>
+ <artifactId>cmq-http-client</artifactId>
+ <version>1.0.7</version>
+ </dependency>
+
+ <!-- 鏀粯瀹濈浉鍏� -->
+ <dependency>
+ <groupId>com.alipay.sdk</groupId>
+ <artifactId>alipay-sdk-java</artifactId>
+ <version>4.9.71.ALL</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.json-lib</groupId>
+ <artifactId>json-lib</artifactId>
+ <version>2.4</version>
+ <classifier>jdk15</classifier>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jsoup</groupId>
+ <artifactId>jsoup</artifactId>
+ <version>1.9.2</version>
+ </dependency>
+
</dependencies>
+ <repositories>
+ <repository>
+ <id>nexus</id>
+ <name>nexus</name>
+ <url>http://193.112.35.168:8081/nexus/content/groups/public/</url>
+ </repository>
+ </repositories>
+
<build>
<finalName>DayLucky</finalName>
<plugins>
diff --git a/service-app/src/main/java/com/ks/app/aspect/AppParamsCheckAspect.java b/service-app/src/main/java/com/ks/app/aspect/AppParamsCheckAspect.java
index 6ade684..99c14ca 100644
--- a/service-app/src/main/java/com/ks/app/aspect/AppParamsCheckAspect.java
+++ b/service-app/src/main/java/com/ks/app/aspect/AppParamsCheckAspect.java
@@ -1,6 +1,5 @@
package com.ks.app.aspect;
-import com.beust.jcommander.internal.Lists;
import com.google.gson.Gson;
import com.ks.lib.common.exception.ParamsException;
import org.aspectj.lang.JoinPoint;
@@ -13,6 +12,7 @@
import javax.validation.ConstraintViolation;
import javax.validation.Validation;
import javax.validation.Validator;
+import java.util.ArrayList;
import java.util.List;
import java.util.Set;
@@ -39,7 +39,7 @@
MethodSignature signature = (MethodSignature) joinPoint.getSignature();
// 鎵ц鏂规硶鍙傛暟鐨勬牎楠�
Set<ConstraintViolation<Object>> constraintViolations = validator.forExecutables().validateParameters(joinPoint.getThis(), signature.getMethod(), args);
- List<String> messages = Lists.newArrayList();
+ List<String> messages = new ArrayList<>();
for (ConstraintViolation<Object> error : constraintViolations) {
messages.add(error.getMessage());
}
diff --git a/service-app/src/main/resources/application.yml b/service-app/src/main/resources/application.yml
index 3e9ac02..3075293 100644
--- a/service-app/src/main/resources/application.yml
+++ b/service-app/src/main/resources/application.yml
@@ -65,7 +65,7 @@
name: app-provider
registry:
protocol: zookeeper
- address: zookeeper://134.175.68.214:2181 # 134.175.68.214 134.175.68.214:2181
+ address: zookeeper://172.16.16.46:2181 # 134.175.68.214 134.175.68.214:2181
client: curator
protocol:
name: dubbo
diff --git a/service-app/src/test/java/com/ks/app/AppTest.java b/service-app/src/test/java/com/ks/app/AppTest.java
index 9ea5534..02769e7 100644
--- a/service-app/src/test/java/com/ks/app/AppTest.java
+++ b/service-app/src/test/java/com/ks/app/AppTest.java
@@ -1,11 +1,11 @@
package com.ks.app;
+import com.alipay.api.internal.util.file.IOUtils;
import com.ks.app.entity.AppAlipayInfoWithBLOBs;
import com.ks.app.entity.AppInfo;
import com.ks.app.exception.AppException;
import com.ks.app.service.AppAlipayInfoManager;
import com.ks.app.service.AppInfoManager;
-import org.apache.commons.io.IOUtils;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.yeshi.utils.StringUtil;
diff --git a/service-daylucky/src/main/java/com/ks/daylucky/aspect/LuckyParamsCheckAspect.java b/service-daylucky/src/main/java/com/ks/daylucky/aspect/LuckyParamsCheckAspect.java
index 559db8d..f79f084 100644
--- a/service-daylucky/src/main/java/com/ks/daylucky/aspect/LuckyParamsCheckAspect.java
+++ b/service-daylucky/src/main/java/com/ks/daylucky/aspect/LuckyParamsCheckAspect.java
@@ -1,6 +1,5 @@
package com.ks.daylucky.aspect;
-import com.beust.jcommander.internal.Lists;
import com.google.gson.Gson;
import com.ks.lib.common.exception.ParamsException;
import org.aspectj.lang.JoinPoint;
@@ -13,6 +12,7 @@
import javax.validation.ConstraintViolation;
import javax.validation.Validation;
import javax.validation.Validator;
+import java.util.ArrayList;
import java.util.List;
import java.util.Set;
@@ -39,7 +39,7 @@
MethodSignature signature = (MethodSignature) joinPoint.getSignature();
// 鎵ц鏂规硶鍙傛暟鐨勬牎楠�
Set<ConstraintViolation<Object>> constraintViolations = validator.forExecutables().validateParameters(joinPoint.getThis(), signature.getMethod(), args);
- List<String> messages = Lists.newArrayList();
+ List<String> messages = new ArrayList<>();
for (ConstraintViolation<Object> error : constraintViolations) {
messages.add(error.getMessage());
}
diff --git a/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityController.java b/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityController.java
index 59f0ff3..2583d52 100644
--- a/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityController.java
+++ b/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/ActivityController.java
@@ -15,6 +15,7 @@
import com.ks.daylucky.util.activity.ActivityUtil;
import com.ks.daylucky.util.factory.vo.ActivityDetailVOFactory;
import com.ks.daylucky.util.factory.vo.ActivityListItemInfoVOFactory;
+import com.ks.lib.common.exception.ParamsException;
import com.ks.lucky.pojo.DO.LuckyActivity;
import com.ks.lucky.remote.service.LuckyActivityJoinAssistService;
import com.ks.lucky.remote.service.LuckyActivityService;
@@ -69,7 +70,7 @@
*/
@ResponseBody
@RequestMapping("getActivityDetail")
- public String getActivityDetail(AcceptData acceptData, Long activityId) {
+ public String getActivityDetail(AcceptData acceptData, Long activityId) throws ParamsException {
ActivityDetailInfoDTO dto = activityService.getActivityDetail(activityId, acceptData.getApp().getId(), acceptData.getUid(), true, 8, false);
if (dto == null) {
return JsonUtil.loadFalseResult("娲诲姩涓嶅瓨鍦�");
diff --git a/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/UserController.java b/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/UserController.java
index 50a590d..d03c3d7 100644
--- a/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/UserController.java
+++ b/service-daylucky/src/main/java/com/ks/daylucky/controller/api/client/UserController.java
@@ -27,6 +27,7 @@
import com.ks.daylucky.util.UserInfoUtil;
import com.ks.daylucky.util.annotation.RequestSerializable;
import com.ks.daylucky.util.factory.vo.UserMsgVOFactory;
+import com.ks.lib.common.exception.ParamsException;
import net.sf.json.JSONObject;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -96,6 +97,8 @@
user.setId(uid);
} catch (UserInfoException e) {
return JsonUtil.loadFalseResult("token鑾峰彇澶辫触");
+ } catch (ParamsException e) {
+ return JsonUtil.loadFalseResult("token鑾峰彇澶辫触");
}
}
diff --git a/service-daylucky/src/main/java/com/ks/daylucky/service/ActivityScanRecordService.java b/service-daylucky/src/main/java/com/ks/daylucky/service/ActivityScanRecordService.java
index 0b2360b..1e87b3d 100644
--- a/service-daylucky/src/main/java/com/ks/daylucky/service/ActivityScanRecordService.java
+++ b/service-daylucky/src/main/java/com/ks/daylucky/service/ActivityScanRecordService.java
@@ -1,7 +1,7 @@
package com.ks.daylucky.service;
-import com.beust.jcommander.ParameterException;
import com.ks.daylucky.pojo.DO.ActivityScanRecord;
+import com.ks.lib.common.exception.ParamsException;
import javax.validation.Valid;
import java.util.List;
@@ -15,9 +15,9 @@
* 娣诲姞璁板綍
*
* @param record
- * @throws ParameterException
+ * @throws ParamsException
*/
- public void addRecord(@Valid ActivityScanRecord record) throws ParameterException;
+ public void addRecord(@Valid ActivityScanRecord record) throws ParamsException;
/**
diff --git a/service-daylucky/src/main/java/com/ks/daylucky/service/ActivityTagService.java b/service-daylucky/src/main/java/com/ks/daylucky/service/ActivityTagService.java
index f05a20e..3632d08 100644
--- a/service-daylucky/src/main/java/com/ks/daylucky/service/ActivityTagService.java
+++ b/service-daylucky/src/main/java/com/ks/daylucky/service/ActivityTagService.java
@@ -1,7 +1,7 @@
package com.ks.daylucky.service;
-import com.beust.jcommander.ParameterException;
import com.ks.daylucky.pojo.DO.ActivityTag;
+import com.ks.lib.common.exception.ParamsException;
import javax.validation.Valid;
import java.util.List;
@@ -15,9 +15,9 @@
* 娣诲姞娲诲姩鏍囩
*
* @param tag
- * @throws ParameterException
+ * @throws ParamsException
*/
- public void addActivityTag(@Valid ActivityTag tag) throws ParameterException;
+ public void addActivityTag(@Valid ActivityTag tag) throws ParamsException;
/**
@@ -26,7 +26,7 @@
* @param activityId
* @param tags
*/
- public void setTags(Long activityId, List<ActivityTag> tags);
+ public void setTags(Long activityId, List<ActivityTag> tags) throws ParamsException;
/**
diff --git a/service-daylucky/src/main/java/com/ks/daylucky/service/AnnouncementService.java b/service-daylucky/src/main/java/com/ks/daylucky/service/AnnouncementService.java
index 62f75db..e95c76e 100644
--- a/service-daylucky/src/main/java/com/ks/daylucky/service/AnnouncementService.java
+++ b/service-daylucky/src/main/java/com/ks/daylucky/service/AnnouncementService.java
@@ -1,9 +1,9 @@
package com.ks.daylucky.service;
-import com.beust.jcommander.ParameterException;
import com.ks.daylucky.exception.AnnouncementException;
import com.ks.daylucky.pojo.DO.Announcement;
import com.ks.daylucky.query.AnnouncementQuery;
+import com.ks.lib.common.exception.ParamsException;
import javax.validation.Valid;
import java.util.List;
@@ -18,10 +18,10 @@
* 娣诲姞鍏憡
*
* @param announcement
- * @throws ParameterException
+ * @throws ParamsException
* @throws AnnouncementException
*/
- public void addAnnouncement(@Valid Announcement announcement) throws ParameterException, AnnouncementException;
+ public void addAnnouncement(@Valid Announcement announcement) throws ParamsException, AnnouncementException;
/**
diff --git a/service-daylucky/src/main/java/com/ks/daylucky/service/AppConfigService.java b/service-daylucky/src/main/java/com/ks/daylucky/service/AppConfigService.java
index 3ec4f64..236b4e9 100644
--- a/service-daylucky/src/main/java/com/ks/daylucky/service/AppConfigService.java
+++ b/service-daylucky/src/main/java/com/ks/daylucky/service/AppConfigService.java
@@ -1,10 +1,10 @@
package com.ks.daylucky.service;
-import com.beust.jcommander.ParameterException;
import com.ks.daylucky.exception.AppConfigException;
import com.ks.daylucky.pojo.DO.AppConfig;
import com.ks.daylucky.pojo.DTO.ConfigKeyEnum;
import com.ks.daylucky.query.AppConfigQuery;
+import com.ks.lib.common.exception.ParamsException;
import javax.validation.Valid;
import java.util.List;
@@ -19,10 +19,10 @@
* 娣诲姞搴旂敤閰嶇疆淇℃伅
*
* @param config
- * @throws ParameterException
+ * @throws ParamsException
* @throws AppConfigException
*/
- public void addAppConfig(@Valid AppConfig config) throws ParameterException, AppConfigException;
+ public void addAppConfig(@Valid AppConfig config) throws ParamsException, AppConfigException;
/**
diff --git a/service-daylucky/src/main/java/com/ks/daylucky/service/UserInfoService.java b/service-daylucky/src/main/java/com/ks/daylucky/service/UserInfoService.java
index 4fcae68..e30b28e 100644
--- a/service-daylucky/src/main/java/com/ks/daylucky/service/UserInfoService.java
+++ b/service-daylucky/src/main/java/com/ks/daylucky/service/UserInfoService.java
@@ -1,10 +1,10 @@
package com.ks.daylucky.service;
-import com.beust.jcommander.ParameterException;
import com.ks.daylucky.exception.UserInfoException;
import com.ks.daylucky.pojo.DO.UserInfo;
import com.ks.daylucky.pojo.VO.SimpleUser;
import com.ks.daylucky.query.UserInfoQuery;
+import com.ks.lib.common.exception.ParamsException;
import com.ks.lucky.pojo.DO.BaseUser;
import javax.validation.Valid;
@@ -27,10 +27,10 @@
* 娣诲姞鐢ㄦ埛
*
* @param userInfo
- * @throws ParameterException
+ * @throws ParamsException
* @throws UserInfoException
*/
- public Long addUserInfo(@Valid UserInfo userInfo) throws ParameterException, UserInfoException;
+ public Long addUserInfo(@Valid UserInfo userInfo) throws ParamsException, UserInfoException;
public Map<Long, UserInfo> listUserInfoAsMap(BaseUser... users);
diff --git a/service-daylucky/src/main/java/com/ks/daylucky/service/impl/remote/ActivityScanRecordServiceImpl.java b/service-daylucky/src/main/java/com/ks/daylucky/service/impl/remote/ActivityScanRecordServiceImpl.java
index 78f2517..e56c1ed 100644
--- a/service-daylucky/src/main/java/com/ks/daylucky/service/impl/remote/ActivityScanRecordServiceImpl.java
+++ b/service-daylucky/src/main/java/com/ks/daylucky/service/impl/remote/ActivityScanRecordServiceImpl.java
@@ -1,10 +1,10 @@
package com.ks.daylucky.service.impl.remote;
-import com.beust.jcommander.ParameterException;
import com.ks.daylucky.mapper.ActivityScanRecordMapper;
import com.ks.daylucky.pojo.DO.ActivityScanRecord;
import com.ks.daylucky.query.ActivityScanQuery;
import com.ks.daylucky.service.ActivityScanRecordService;
+import com.ks.lib.common.exception.ParamsException;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import org.yeshi.utils.TimeUtil;
@@ -23,7 +23,7 @@
@Validated
@Override
- public void addRecord(@Valid ActivityScanRecord record) throws ParameterException {
+ public void addRecord(@Valid ActivityScanRecord record) throws ParamsException {
ActivityScanQuery query = new ActivityScanQuery();
query.uid = record.getUid();
query.activityId = record.getActivityId();
diff --git a/service-daylucky/src/main/java/com/ks/daylucky/service/impl/remote/ActivityTagServiceImpl.java b/service-daylucky/src/main/java/com/ks/daylucky/service/impl/remote/ActivityTagServiceImpl.java
index 68a18d8..5230df2 100644
--- a/service-daylucky/src/main/java/com/ks/daylucky/service/impl/remote/ActivityTagServiceImpl.java
+++ b/service-daylucky/src/main/java/com/ks/daylucky/service/impl/remote/ActivityTagServiceImpl.java
@@ -1,9 +1,9 @@
package com.ks.daylucky.service.impl.remote;
-import com.beust.jcommander.ParameterException;
import com.ks.daylucky.mapper.ActivityTagMapper;
import com.ks.daylucky.pojo.DO.ActivityTag;
import com.ks.daylucky.service.ActivityTagService;
+import com.ks.lib.common.exception.ParamsException;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
@@ -24,7 +24,7 @@
@Validated
@Override
- public void addActivityTag(@Valid ActivityTag tag) throws ParameterException {
+ public void addActivityTag(@Valid ActivityTag tag) throws ParamsException {
if (tag.getWeight() == null) {
tag.setWeight(1);
}
@@ -34,7 +34,7 @@
@Transactional(rollbackFor = Exception.class)
@Override
- public void setTags(Long activityId, List<ActivityTag> tags) {
+ public void setTags(Long activityId, List<ActivityTag> tags) throws ParamsException {
if (tags == null) {
return;
}
diff --git a/service-daylucky/src/main/java/com/ks/daylucky/service/impl/remote/AnnouncementServiceImpl.java b/service-daylucky/src/main/java/com/ks/daylucky/service/impl/remote/AnnouncementServiceImpl.java
index c652dca..4ea5a1e 100644
--- a/service-daylucky/src/main/java/com/ks/daylucky/service/impl/remote/AnnouncementServiceImpl.java
+++ b/service-daylucky/src/main/java/com/ks/daylucky/service/impl/remote/AnnouncementServiceImpl.java
@@ -1,11 +1,11 @@
package com.ks.daylucky.service.impl.remote;
-import com.beust.jcommander.ParameterException;
import com.ks.daylucky.exception.AnnouncementException;
import com.ks.daylucky.mapper.AnnouncementMapper;
import com.ks.daylucky.pojo.DO.Announcement;
import com.ks.daylucky.query.AnnouncementQuery;
import com.ks.daylucky.service.AnnouncementService;
+import com.ks.lib.common.exception.ParamsException;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
@@ -23,7 +23,7 @@
@Validated
@Override
- public void addAnnouncement(@Valid Announcement announcement) throws ParameterException, AnnouncementException {
+ public void addAnnouncement(@Valid Announcement announcement) throws ParamsException, AnnouncementException {
AnnouncementQuery query = new AnnouncementQuery();
query.appId = announcement.getAppId();
query.type = announcement.getType();
diff --git a/service-daylucky/src/main/java/com/ks/daylucky/service/impl/remote/AppConfigServiceImpl.java b/service-daylucky/src/main/java/com/ks/daylucky/service/impl/remote/AppConfigServiceImpl.java
index 9a7f937..df488d4 100644
--- a/service-daylucky/src/main/java/com/ks/daylucky/service/impl/remote/AppConfigServiceImpl.java
+++ b/service-daylucky/src/main/java/com/ks/daylucky/service/impl/remote/AppConfigServiceImpl.java
@@ -1,12 +1,12 @@
package com.ks.daylucky.service.impl.remote;
-import com.beust.jcommander.ParameterException;
import com.ks.daylucky.exception.AppConfigException;
import com.ks.daylucky.mapper.AppConfigMapper;
import com.ks.daylucky.pojo.DO.AppConfig;
import com.ks.daylucky.pojo.DTO.ConfigKeyEnum;
import com.ks.daylucky.query.AppConfigQuery;
import com.ks.daylucky.service.AppConfigService;
+import com.ks.lib.common.exception.ParamsException;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
@@ -23,7 +23,7 @@
@Validated
@Override
- public void addAppConfig(@Valid AppConfig config) throws ParameterException, AppConfigException {
+ public void addAppConfig(@Valid AppConfig config) throws ParamsException, AppConfigException {
AppConfigQuery query = new AppConfigQuery();
query.appId = config.getAppId();
query.key = config.getKey();
diff --git a/service-daylucky/src/main/java/com/ks/daylucky/service/impl/remote/UserInfoServiceImpl.java b/service-daylucky/src/main/java/com/ks/daylucky/service/impl/remote/UserInfoServiceImpl.java
index 2b6c3b6..0cf6124 100644
--- a/service-daylucky/src/main/java/com/ks/daylucky/service/impl/remote/UserInfoServiceImpl.java
+++ b/service-daylucky/src/main/java/com/ks/daylucky/service/impl/remote/UserInfoServiceImpl.java
@@ -1,6 +1,5 @@
package com.ks.daylucky.service.impl.remote;
-import com.beust.jcommander.ParameterException;
import com.ks.daylucky.exception.UserInfoException;
import com.ks.daylucky.mapper.UserInfoExtraMapper;
import com.ks.daylucky.mapper.UserInfoMapper;
@@ -10,6 +9,7 @@
import com.ks.daylucky.query.UserInfoQuery;
import com.ks.daylucky.service.UserInfoExtraService;
import com.ks.daylucky.service.UserInfoService;
+import com.ks.lib.common.exception.ParamsException;
import com.ks.lucky.pojo.DO.BaseUser;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
@@ -45,7 +45,7 @@
@Validated
@Override
- public Long addUserInfo(@Valid UserInfo userInfo) throws ParameterException, UserInfoException {
+ public Long addUserInfo(@Valid UserInfo userInfo) throws ParamsException, UserInfoException {
UserInfo old = getUserInfo(userInfo.getAppId(), userInfo.getIdentifyCode());
if (old != null) {
throw new UserInfoException(UserInfoException.CODE_EXIST, "鐢ㄦ埛宸插瓨鍦�");
diff --git a/service-daylucky/src/main/resources/application-pro.yml b/service-daylucky/src/main/resources/application-pro.yml
index 38d567a..b7e75b8 100644
--- a/service-daylucky/src/main/resources/application-pro.yml
+++ b/service-daylucky/src/main/resources/application-pro.yml
@@ -72,7 +72,7 @@
logger: slf4j
registry:
protocol: zookeeper
- address: zookeeper://134.175.68.214:2181 # 134.175.68.214 134.175.68.214:2181
+ address: zookeeper://172.16.16.46:2181 # 134.175.68.214 134.175.68.214:2181
client: curator
consumer:
check: false
diff --git a/service-daylucky/src/test/java/com/ks/daylucky/UserTest.java b/service-daylucky/src/test/java/com/ks/daylucky/UserTest.java
index 3abf647..e070e25 100644
--- a/service-daylucky/src/test/java/com/ks/daylucky/UserTest.java
+++ b/service-daylucky/src/test/java/com/ks/daylucky/UserTest.java
@@ -34,7 +34,7 @@
userInfo.setState(UserInfo.STATE_LOGINED);
try {
userInfoService.addUserInfo(userInfo);
- } catch (UserInfoException e) {
+ } catch (Exception e) {
e.printStackTrace();
}
diff --git a/service-daylucky/src/test/java/com/ks/daylucky/VisualUserTest.java b/service-daylucky/src/test/java/com/ks/daylucky/VisualUserTest.java
index fd4b8f0..a80c155 100644
--- a/service-daylucky/src/test/java/com/ks/daylucky/VisualUserTest.java
+++ b/service-daylucky/src/test/java/com/ks/daylucky/VisualUserTest.java
@@ -1,9 +1,9 @@
package com.ks.daylucky;
+import com.alipay.api.internal.util.file.IOUtils;
import com.ks.daylucky.exception.UserInfoException;
import com.ks.daylucky.pojo.DO.UserInfo;
import com.ks.daylucky.service.UserInfoService;
-import org.apache.commons.io.IOUtils;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
@@ -316,7 +316,7 @@
userInfo.setState(UserInfo.STATE_LOGINED);
try {
userInfoService.addUserInfo(userInfo);
- } catch (UserInfoException e) {
+ } catch (Exception e) {
e.printStackTrace();
}
p++;
diff --git a/service-lucky/src/main/java/com/ks/lucky/aspect/LuckyParamsCheckAspect.java b/service-lucky/src/main/java/com/ks/lucky/aspect/LuckyParamsCheckAspect.java
index 6afbb3e..acb3a20 100644
--- a/service-lucky/src/main/java/com/ks/lucky/aspect/LuckyParamsCheckAspect.java
+++ b/service-lucky/src/main/java/com/ks/lucky/aspect/LuckyParamsCheckAspect.java
@@ -1,6 +1,5 @@
package com.ks.lucky.aspect;
-import com.beust.jcommander.internal.Lists;
import com.google.gson.Gson;
import com.ks.lib.common.exception.ParamsException;
import org.aspectj.lang.JoinPoint;
@@ -15,6 +14,7 @@
import javax.validation.ConstraintViolation;
import javax.validation.Validation;
import javax.validation.Validator;
+import java.util.ArrayList;
import java.util.List;
import java.util.Set;
@@ -43,7 +43,7 @@
MethodSignature signature = (MethodSignature) joinPoint.getSignature();
// 鎵ц鏂规硶鍙傛暟鐨勬牎楠�
Set<ConstraintViolation<Object>> constraintViolations = validator.forExecutables().validateParameters(joinPoint.getThis(), signature.getMethod(), args);
- List<String> messages = Lists.newArrayList();
+ List<String> messages = new ArrayList<>();
for (ConstraintViolation<Object> error : constraintViolations) {
messages.add(error.getMessage());
}
diff --git a/service-lucky/src/main/resources/application.yml b/service-lucky/src/main/resources/application.yml
index d38eedb..5a6738e 100644
--- a/service-lucky/src/main/resources/application.yml
+++ b/service-lucky/src/main/resources/application.yml
@@ -71,7 +71,7 @@
name: lucky-provider
registry:
protocol: zookeeper
- address: zookeeper://134.175.68.214:2181 # 134.175.68.214 134.175.68.214:2181
+ address: zookeeper://172.16.16.46:2181 # 134.175.68.214 134.175.68.214:2181
client: curator
protocol:
name: dubbo
--
Gitblit v1.8.0