diff --git a/epmet-admin/epmet-admin-server/pom.xml b/epmet-admin/epmet-admin-server/pom.xml
index 511fbf1c76..fe4e0c2c1f 100644
--- a/epmet-admin/epmet-admin-server/pom.xml
+++ b/epmet-admin/epmet-admin-server/pom.xml
@@ -48,6 +48,12 @@
com.alibaba.cloud
spring-cloud-starter-alibaba-nacos-config
+
+
+ io.github.openfeign
+ feign-httpclient
+ 10.3.0
+
diff --git a/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml b/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml
index 912cc56d91..dcc9f1d8ed 100644
--- a/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml
+++ b/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml
@@ -101,8 +101,7 @@ feign:
loggerLevel: BASIC
httpclient:
enabled: true
- max-connections: 200
- max-connections-per-route: 50
+
hystrix:
command:
diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml
index e13ba806a2..6bf8e934f8 100644
--- a/epmet-auth/pom.xml
+++ b/epmet-auth/pom.xml
@@ -80,6 +80,13 @@
2.0.0
compile
+
+
+ io.github.openfeign
+ feign-httpclient
+ 10.3.0
+
+
diff --git a/epmet-auth/src/main/java/com/epmet/feign/EpmetUserFeignClient.java b/epmet-auth/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
index b7437c22cb..0610da1880 100644
--- a/epmet-auth/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
+++ b/epmet-auth/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
@@ -10,7 +10,6 @@ import com.epmet.feign.fallback.EpmetUserFeignClientFallback;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
/**
* @Description
@@ -28,7 +27,7 @@ public interface EpmetUserFeignClient {
* @author yinzuomei
* @date 2020/3/16 14:48
*/
- @PostMapping(value = "/epmetuser/customeruser/selecLoginUserInfo", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @PostMapping(value = "epmetuser/customeruser/selecWxLoginUserInfo", consumes = MediaType.APPLICATION_JSON_VALUE)
Result selecWxLoginUserInfo(WxLoginUserInfoFormDTO loginUserInfoFormDTO);
/**
@@ -39,7 +38,7 @@ public interface EpmetUserFeignClient {
* @author yinzuomei
* @date 2020/3/16 14:48
*/
- @PostMapping(value = "/epmetuser/customeruser/saveCustomerUser", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @PostMapping(value = "epmetuser/customeruser/saveCustomerUser", consumes = MediaType.APPLICATION_JSON_VALUE)
Result saveCustomerUser(CustomerUserDTO customerUserDTO);
/**
@@ -49,6 +48,6 @@ public interface EpmetUserFeignClient {
* @Description 根据手机号查询用户信息
* @Date 2020/3/16 16:14
**/
- @PostMapping(value = "/epmetuser/customeruser/selectLoginUserInfoByPassword", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @PostMapping(value = "epmetuser/customeruser/selectLoginUserInfoByPassword", consumes = MediaType.APPLICATION_JSON_VALUE)
Result selectLoginUserInfoByPassword(PasswordLoginUserInfoFormDTO passwordLoginUserInfoFormDTO);
}
diff --git a/epmet-auth/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallback.java b/epmet-auth/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallback.java
index 214fbbff10..bf3b41d5cf 100644
--- a/epmet-auth/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallback.java
+++ b/epmet-auth/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallback.java
@@ -19,7 +19,7 @@ import org.springframework.stereotype.Component;
public class EpmetUserFeignClientFallback implements EpmetUserFeignClient {
@Override
- public Result selecWxLoginUserInfo(WxLoginUserInfoFormDTO loginUserInfoFormDTO) {
+ public Result selecWxLoginUserInfo(WxLoginUserInfoFormDTO loginUserInfoFormDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "selecWxLoginUserInfo", loginUserInfoFormDTO);
}
diff --git a/epmet-auth/src/main/java/com/epmet/redis/CaptchaRedis.java b/epmet-auth/src/main/java/com/epmet/redis/CaptchaRedis.java
index 2eea36e2a5..39b007c78d 100644
--- a/epmet-auth/src/main/java/com/epmet/redis/CaptchaRedis.java
+++ b/epmet-auth/src/main/java/com/epmet/redis/CaptchaRedis.java
@@ -42,9 +42,9 @@ public class CaptchaRedis {
String captcha = (String)redisUtils.get(key);
logger.info("获取验证码key=["+key+"]captcha=["+captcha+"]");
//删除验证码
- if(captcha != null){
+ /* if(captcha != null){
redisUtils.delete(key);
- }
+ }*/
return captcha;
}
diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java
index 4c9e886410..5ac8cf8650 100644
--- a/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java
+++ b/epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java
@@ -127,7 +127,7 @@ public class LoginServiceImpl implements LoginService {
WxLoginUserInfoFormDTO wxLoginUserInfoFormDTO=new WxLoginUserInfoFormDTO();
wxLoginUserInfoFormDTO.setApp(formDTO.getApp());
wxLoginUserInfoFormDTO.setOpenId(wxMaJscode2SessionResult.getOpenid());
- Result userResult=epmetUserFeignClient.selecWxLoginUserInfo(wxLoginUserInfoFormDTO);
+ Result userResult=epmetUserFeignClient.selecWxLoginUserInfo(wxLoginUserInfoFormDTO);
String userId="";
if(!userResult.success()){
throw new RenException("获取用户信息失败"+userResult.getMsg());
@@ -136,22 +136,14 @@ public class LoginServiceImpl implements LoginService {
if (StringUtils.isBlank(userId)&&LoginConstant.APP_GOV.equals(formDTO.getApp())) {
//查询customer_staff待完善
} else if (StringUtils.isBlank(userId)&&LoginConstant.APP_OPER.equals(formDTO.getApp())) {
- //查询oper_staff待完善
+ //查询oper_user待完善
} else if (StringUtils.isBlank(userId)&&LoginConstant.APP_RESI.equals(formDTO.getApp())) {
//查询customer_user
WxMaUserInfo wxMaUserInfo = wxMaServiceUtils.resiWxMaService().getUserService()
.getUserInfo(wxMaJscode2SessionResult.getSessionKey(),
formDTO.getEncryptedData(),
formDTO.getIv());
- CustomerUserDTO customerUserDTO = new CustomerUserDTO();
- customerUserDTO.setCity(wxMaUserInfo.getCity());
- customerUserDTO.setWxOpenId(wxMaUserInfo.getOpenId());
- customerUserDTO.setNickname(wxMaUserInfo.getNickName());
- customerUserDTO.setCountry(wxMaUserInfo.getCountry());
- customerUserDTO.setHeadImgUrl(wxMaUserInfo.getAvatarUrl());
- customerUserDTO.setCountry(wxMaUserInfo.getCountry());
- customerUserDTO.setProvince(wxMaUserInfo.getProvince());
- customerUserDTO.setSex(Integer.valueOf(wxMaUserInfo.getGender()));
+ CustomerUserDTO customerUserDTO=this.packageCustomerUserDTO(wxMaUserInfo);
Result saveCustomerUserResult=epmetUserFeignClient.saveCustomerUser(customerUserDTO);
if(!saveCustomerUserResult.success()){
throw new RenException("创建用户失败"+userResult.getMsg());
@@ -161,6 +153,26 @@ public class LoginServiceImpl implements LoginService {
return userId;
}
+ /**
+ * @param wxMaUserInfo
+ * @return com.epmet.dto.CustomerUserDTO
+ * @Author yinzuomei
+ * @Description 微信信息封装为customer_user记录
+ * @Date 2020/3/17 18:22
+ **/
+ private CustomerUserDTO packageCustomerUserDTO(WxMaUserInfo wxMaUserInfo) {
+ CustomerUserDTO customerUserDTO = new CustomerUserDTO();
+ customerUserDTO.setCity(wxMaUserInfo.getCity());
+ customerUserDTO.setWxOpenId(wxMaUserInfo.getOpenId());
+ customerUserDTO.setNickname(wxMaUserInfo.getNickName());
+ customerUserDTO.setCountry(wxMaUserInfo.getCountry());
+ customerUserDTO.setHeadImgUrl(wxMaUserInfo.getAvatarUrl());
+ customerUserDTO.setCountry(wxMaUserInfo.getCountry());
+ customerUserDTO.setProvince(wxMaUserInfo.getProvince());
+ customerUserDTO.setSex(Integer.valueOf(wxMaUserInfo.getGender()));
+ return customerUserDTO;
+ }
+
/**
* 封装用户token值
*
@@ -180,7 +192,7 @@ public class LoginServiceImpl implements LoginService {
map.put("client", formDTO.getClient());
map.put("userId", userId);
String token = jwtTokenUtils.createToken(map);
- logger.info("日志输出token="+token);
+ logger.info("app:"+formDTO.getApp()+"client:"+formDTO.getClient()+"userId:"+userId+"生成token["+token+"]");
int expire = jwtTokenProperties.getExpire();
TokenDto tokenDto = new TokenDto();
tokenDto.setApp(formDTO.getApp());
@@ -189,7 +201,7 @@ public class LoginServiceImpl implements LoginService {
tokenDto.setOpenId(wxMaJscode2SessionResult.getOpenid());
tokenDto.setSessionKey(wxMaJscode2SessionResult.getSessionKey());
tokenDto.setUnionId(wxMaJscode2SessionResult.getUnionid());
- cpUserDetailRedis.set(tokenDto, expire);
+ cpUserDetailRedis.set(token,tokenDto, expire);
return token;
}
@@ -220,10 +232,10 @@ public class LoginServiceImpl implements LoginService {
}
//2、密码是否正确
//密码错误
- if(!PasswordUtils.matches(userInfoResult.getData().getPassword(), formDTO.getPassword())){
+ if(!PasswordUtils.matches(userInfoResult.getData().getPassWord(), formDTO.getPassword())){
throw new RenException(ErrorCode.ACCOUNT_PASSWORD_ERROR);
}
- if(!userInfoResult.getData().getPassword().equals(formDTO.getPassword())){
+ if(!userInfoResult.getData().getPassWord().equals(formDTO.getPassword())){
throw new RenException(ErrorCode.ACCOUNT_PASSWORD_ERROR);
}
//3、生成token返回，且将TokenDto存到redis
@@ -249,13 +261,13 @@ public class LoginServiceImpl implements LoginService {
map.put("client", formDTO.getClient());
map.put("userId", userId);
String token = jwtTokenUtils.createToken(map);
- logger.info("日志输出token="+token);
+ logger.info("app:"+formDTO.getApp()+"client:"+formDTO.getClient()+"userId:"+userId+"生成token["+token+"]");
int expire = jwtTokenProperties.getExpire();
TokenDto tokenDto = new TokenDto();
tokenDto.setApp(formDTO.getApp());
tokenDto.setClient(formDTO.getClient());
tokenDto.setUserId(userId);
- cpUserDetailRedis.set(tokenDto, expire);
+ cpUserDetailRedis.set(token,tokenDto, expire);
return token;
}
}
diff --git a/epmet-auth/src/main/resources/bootstrap.yml b/epmet-auth/src/main/resources/bootstrap.yml
index bc6128b95b..7b50c86084 100644
--- a/epmet-auth/src/main/resources/bootstrap.yml
+++ b/epmet-auth/src/main/resources/bootstrap.yml
@@ -72,8 +72,6 @@ feign:
loggerLevel: BASIC
httpclient:
enabled: true
- max-connections: 200
- max-connections-per-route: 50
hystrix:
command:
diff --git a/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/util/CpUserDetailRedis.java b/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/util/CpUserDetailRedis.java
index 4d10b38f66..c3eb2ccc9b 100644
--- a/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/util/CpUserDetailRedis.java
+++ b/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/util/CpUserDetailRedis.java
@@ -30,11 +30,11 @@ public class CpUserDetailRedis {
@Autowired
private RedisUtils redisUtils;
- public void set(TokenDto user, long expire) {
+ public void set(String tokenStr,TokenDto user, long expire) {
if (user == null) {
return;
}
- String key = RedisKeys.getCpUserKey(user.getApp(), user.getClient(), user.getUserId());
+ String key = RedisKeys.getCpUserKey(tokenStr);
//bean to map
Map map = BeanUtil.beanToMap(user, false, true);
redisUtils.hMSet(key, map, expire);
@@ -43,11 +43,11 @@ public class CpUserDetailRedis {
/**
* 获取token信息
*
- * @param userId
+ * @param tokenStr token字符串
* @return
*/
- public TokenDto get(String app, String client, String userId) {
- String key = RedisKeys.getCpUserKey(app, client, userId);
+ public TokenDto get(String tokenStr) {
+ String key = RedisKeys.getCpUserKey(tokenStr);
Map map = redisUtils.hGetAll(key);
if (MapUtil.isEmpty(map)) {
@@ -63,32 +63,32 @@ public class CpUserDetailRedis {
/**
* 删除用户信息
*
- * @param userId
+ * @param tokenStr token字符串
*/
- public void logout(String app, String client, String userId) {
- redisUtils.delete(RedisKeys.getCpUserKey(app, client, userId));
+ public void logout(String tokenStr) {
+ redisUtils.delete(RedisKeys.getCpUserKey(tokenStr));
}
/**
* 设置redis时间
*
- * @param userId
+ * @param tokenStr
* @param expire
* @author rongchao
*/
- public boolean expire(String app, String client, String userId, long expire) {
- return redisUtils.expire(RedisKeys.getCpUserKey(app, client, userId), expire);
+ public boolean expire(String tokenStr, long expire) {
+ return redisUtils.expire(RedisKeys.getCpUserKey(tokenStr), expire);
}
/**
* 查询token剩余时间
*
- * @param userId
+ * @param tokenStr
* @return long
* @author yujintao
* @date 2019/9/9 14:18
*/
- public long getExpire(String app, String client, String userId) {
- return redisUtils.getExpire(RedisKeys.getCpUserKey(app, client, userId));
+ public long getExpire(String tokenStr) {
+ return redisUtils.getExpire(RedisKeys.getCpUserKey(tokenStr));
}
}
diff --git a/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/util/TokenUtil.java b/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/util/TokenUtil.java
index 173e985523..f8b240b42c 100644
--- a/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/util/TokenUtil.java
+++ b/epmet-commons/epmet-common-clienttoken/src/main/java/com/epmet/common/token/util/TokenUtil.java
@@ -24,28 +24,28 @@ public class TokenUtil {
@Autowired
private CpUserDetailRedis redisUtils;
- public TokenDto getTokenInfo(String app,String client,String userId) {
- TokenDto tokenDto = redisUtils.get(app,client,userId);
+ public TokenDto getTokenInfo(String tokenStr) {
+ TokenDto tokenDto = redisUtils.get(tokenStr);
return tokenDto;
}
- public void expireToken(String app,String client,String userId) {
- redisUtils.logout(app,client,userId);
+ public void expireToken(String tokenStr) {
+ redisUtils.logout(tokenStr);
}
- public boolean delayToken(String app,String client,String userId) {
- return redisUtils.expire(app,client,userId, tokenPropertise.getExpire());
+ public boolean delayToken(String tokenStr) {
+ return redisUtils.expire(tokenStr, tokenPropertise.getExpire());
}
/**
* 获取token过期时间
*
- * @param userId
+ * @param tokenStr
* @return long
* @author yujintao
* @date 2019/9/9 14:19
*/
- public long getExpire(String app,String client,String userId) {
- return redisUtils.getExpire(app,client,userId);
+ public long getExpire(String tokenStr) {
+ return redisUtils.getExpire(tokenStr);
}
}
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
index 1517d1220c..3627a06e61 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
@@ -77,12 +77,10 @@ public class RedisKeys {
/**
* 用户token Key
- * epmet:sys:security:user:resi:wxmp:100051424889632
- * epmet:sys:security:user:gov:wxmp:5048212821254821
- * epmet:sys:security:user:oper:web:eeedsfsdfds512551
+ * epmet:sys:security:user:token字符串
*/
- public static String getCpUserKey(String app, String client, String id) {
- return rootPrefix.concat("sys:security:user:").concat(app).concat(":").concat(client).concat(":").concat(id);
+ public static String getCpUserKey(String tokenStr) {
+ return rootPrefix.concat("sys:security:user:").concat(tokenStr);
}
/**
diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml
index ed2fdfea84..422afe3e93 100644
--- a/epmet-gateway/pom.xml
+++ b/epmet-gateway/pom.xml
@@ -98,43 +98,43 @@
- http://localhost:8081
+ http://127.0.0.1:8081
lb://epmet-admin-server
-
+
lb://epmet-monitor-server
-
+
lb://epmet-oss-server
-
+
- http://localhost:8085
+ http://127.0.0.1:8085
- http://localhost:8086
+ http://127.0.0.1:8086
- http://localhost:8084
+ http://127.0.0.1:8084
- http://localhost:8087
+ http://127.0.0.1:8087
lb://epmet-demo-server
-
+
- http://localhost:8089
+ http://127.0.0.1:8089
- http://localhost:8090
+ http://127.0.0.1:8090
- http://localhost:8091
+ http://127.0.0.1:8091
- http://localhost:8092
+ http://127.0.0.1:8092
diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml
index 5e353a3a81..59fef1536a 100644
--- a/epmet-gateway/src/main/resources/bootstrap.yml
+++ b/epmet-gateway/src/main/resources/bootstrap.yml
@@ -197,8 +197,6 @@ feign:
loggerLevel: BASIC
httpclient:
enabled: true
- max-connections: 200
- max-connections-per-route: 50
hystrix:
command:
diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/bootstrap.yml
index cfe4802edf..06496153f4 100644
--- a/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/bootstrap.yml
@@ -80,8 +80,6 @@ feign:
loggerLevel: BASIC
httpclient:
enabled: true
- max-connections: 200
- max-connections-per-route: 50
hystrix:
command:
diff --git a/epmet-module/epmet-demo/epmet-demo-server/pom.xml b/epmet-module/epmet-demo/epmet-demo-server/pom.xml
index d331612129..f3d4c712f7 100644
--- a/epmet-module/epmet-demo/epmet-demo-server/pom.xml
+++ b/epmet-module/epmet-demo/epmet-demo-server/pom.xml
@@ -55,6 +55,12 @@
2.0.0
compile
+
+
+ io.github.openfeign
+ feign-httpclient
+ 10.3.0
+
diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/OperCrmFeignClient.java b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/OperCrmFeignClient.java
index a83fc7a5ef..e446a0df2c 100644
--- a/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/OperCrmFeignClient.java
+++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/java/com/epmet/feign/OperCrmFeignClient.java
@@ -48,6 +48,6 @@ public interface OperCrmFeignClient {
* @Description 保存客户信息
* @Date 2020/3/11 23:32
**/
- @PostMapping(value = "/oper/crm/customer/save", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
+ @PostMapping(value = "/oper/crm/customer/save", consumes = MediaType.APPLICATION_JSON_VALUE)
Result saveCustomerInfo(@RequestBody CustomerDTO dto);
}
diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/bootstrap.yml
index 0b86c8a474..6774795607 100644
--- a/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/bootstrap.yml
@@ -78,8 +78,6 @@ feign:
loggerLevel: BASIC
httpclient:
enabled: true
- max-connections: 200
- max-connections-per-route: 50
hystrix:
command:
diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml
index 5f4ecc2f56..a4268477af 100644
--- a/epmet-module/epmet-job/epmet-job-server/pom.xml
+++ b/epmet-module/epmet-job/epmet-job-server/pom.xml
@@ -63,6 +63,12 @@
+
+
+ io.github.openfeign
+ feign-httpclient
+ 10.3.0
+
diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml
index d6ef1a906c..56c78c7015 100644
--- a/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml
@@ -86,8 +86,6 @@ feign:
loggerLevel: BASIC
httpclient:
enabled: true
- max-connections: 200
- max-connections-per-route: 50
hystrix:
command:
diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml
index 8153670de3..00794fff65 100644
--- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml
@@ -86,8 +86,6 @@ feign:
loggerLevel: BASIC
httpclient:
enabled: true
- max-connections: 200
- max-connections-per-route: 50
hystrix:
command:
diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml
index 827b0ac300..e30cc30a50 100644
--- a/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml
@@ -97,8 +97,6 @@ feign:
loggerLevel: BASIC
httpclient:
enabled: true
- max-connections: 200
- max-connections-per-route: 50
hystrix:
command:
diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml
index d750db2d37..dbdded2ad2 100644
--- a/epmet-module/gov-org/gov-org-server/pom.xml
+++ b/epmet-module/gov-org/gov-org-server/pom.xml
@@ -48,6 +48,12 @@
com.alibaba.cloud
spring-cloud-starter-alibaba-nacos-config
+
+
+ io.github.openfeign
+ feign-httpclient
+ 10.3.0
+
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml b/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml
index 49bac0aa3d..b33d976571 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml
@@ -101,8 +101,6 @@ feign:
loggerLevel: BASIC
httpclient:
enabled: true
- max-connections: 200
- max-connections-per-route: 50
hystrix:
command:
diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml
index d2dc07523c..9695bb43b3 100644
--- a/epmet-module/oper-crm/oper-crm-server/pom.xml
+++ b/epmet-module/oper-crm/oper-crm-server/pom.xml
@@ -52,6 +52,12 @@
com.alibaba.cloud
spring-cloud-starter-alibaba-nacos-config
+
+
+ io.github.openfeign
+ feign-httpclient
+ 10.3.0
+
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml b/epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml
index 704b56e8d2..f6fb34e1a9 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml
@@ -86,8 +86,6 @@ feign:
loggerLevel: BASIC
httpclient:
enabled: true
- max-connections: 200
- max-connections-per-route: 50
hystrix:
command:
diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml
index 177f0e4c92..96ef6bb929 100644
--- a/epmet-module/oper-customize/oper-customize-server/pom.xml
+++ b/epmet-module/oper-customize/oper-customize-server/pom.xml
@@ -52,6 +52,12 @@
com.alibaba.cloud
spring-cloud-starter-alibaba-nacos-config
+
+
+ io.github.openfeign
+ feign-httpclient
+ 10.3.0
+
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml
index e3d84640a4..0e097da7ed 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml
@@ -86,8 +86,6 @@ feign:
loggerLevel: BASIC
httpclient:
enabled: true
- max-connections: 200
- max-connections-per-route: 50
hystrix:
command:
diff --git a/epmet-module/resi-guide/resi-guide-server/pom.xml b/epmet-module/resi-guide/resi-guide-server/pom.xml
index f50ad1cf6d..d51420a810 100644
--- a/epmet-module/resi-guide/resi-guide-server/pom.xml
+++ b/epmet-module/resi-guide/resi-guide-server/pom.xml
@@ -52,6 +52,12 @@
com.alibaba.cloud
spring-cloud-starter-alibaba-nacos-config
+
+
+ io.github.openfeign
+ feign-httpclient
+ 10.3.0
+
diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml b/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml
index 7127b7a6c2..6c5a00a25e 100644
--- a/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml
@@ -86,8 +86,6 @@ feign:
loggerLevel: BASIC
httpclient:
enabled: true
- max-connections: 200
- max-connections-per-route: 50
hystrix:
command:
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PasswordLoginUserInfoFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PasswordLoginUserInfoFormDTO.java
index 37c323b12b..7c6919c131 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PasswordLoginUserInfoFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PasswordLoginUserInfoFormDTO.java
@@ -14,7 +14,7 @@ import java.io.Serializable;
public class PasswordLoginUserInfoFormDTO implements Serializable {
private static final long serialVersionUID = -6653010297552029277L;
- @NotBlank(message = "app不能为空")
+ @NotBlank(message = "app1111不能为空")
private String app;
@NotBlank(message = "手机号不能为空")
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PasswordLoginUserInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PasswordLoginUserInfoResultDTO.java
index 9918dfc8b6..d0536967c0 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PasswordLoginUserInfoResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PasswordLoginUserInfoResultDTO.java
@@ -13,5 +13,5 @@ import java.io.Serializable;
public class PasswordLoginUserInfoResultDTO implements Serializable {
private static final long serialVersionUID = -5353521601282463394L;
private String userId;
- private String password;
+ private String passWord;
}
diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml
index 0201ee72f3..efa6207093 100644
--- a/epmet-user/epmet-user-server/pom.xml
+++ b/epmet-user/epmet-user-server/pom.xml
@@ -54,6 +54,16 @@
2.0.0
compile
+
+ io.github.openfeign
+ feign-httpclient
+
+
+
+ io.github.openfeign
+ feign-httpclient
+ 10.3.0
+
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/UserApplication.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/UserApplication.java
index 7d54b4e248..31ded63d9e 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/UserApplication.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/UserApplication.java
@@ -10,6 +10,8 @@ package com.epmet;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
/**
* 管理后台
@@ -18,6 +20,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
* @since 1.0.0
*/
@SpringBootApplication
+@EnableDiscoveryClient
+@EnableFeignClients
public class UserApplication {
public static void main(String[] args) {
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerUserController.java
index 042c2348f2..b7661e6243 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerUserController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerUserController.java
@@ -102,7 +102,7 @@ public class CustomerUserController {
* @Date 2020/3/16 16:15
**/
@PostMapping("selecWxLoginUserInfo")
- public Result selecWxLoginUserInfo(@RequestBody WxLoginUserInfoFormDTO formDTO){
+ public Result selecWxLoginUserInfo(@RequestBody WxLoginUserInfoFormDTO formDTO){
ValidatorUtils.validateEntity(formDTO);
return customerUserService.selecWxLoginUserInfo(formDTO);
}
@@ -132,6 +132,7 @@ public class CustomerUserController {
public Result selectLoginUserInfoByPassword(@RequestBody PasswordLoginUserInfoFormDTO passwordLoginUserInfoFormDTO) {
//效验数据
ValidatorUtils.validateEntity(passwordLoginUserInfoFormDTO);
- return customerUserService.selectLoginUserInfoByPassword(passwordLoginUserInfoFormDTO);
+ Result result= customerUserService.selectLoginUserInfoByPassword(passwordLoginUserInfoFormDTO);
+ return result;
}
}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerUserServiceImpl.java
index 210ea0b664..c25314656e 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerUserServiceImpl.java
@@ -114,7 +114,7 @@ public class CustomerUserServiceImpl extends BaseServiceImpl selecWxLoginUserInfo(WxLoginUserInfoFormDTO formDTO) {
String userId = "";
if (LoginConstant.APP_GOV.equals(formDTO.getApp())) {
//查询customer_staff待完善
@@ -125,7 +125,7 @@ public class CustomerUserServiceImpl extends BaseServiceImpl().ok(userId);
}
/**
diff --git a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml
index f7070de4b7..e080a073a6 100644
--- a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml
+++ b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml
@@ -101,8 +101,6 @@ feign:
loggerLevel: BASIC
httpclient:
enabled: true
- max-connections: 200
- max-connections-per-route: 50
hystrix:
command: