feignbug修改，token规则修改

epmet-admin/epmet-admin-server/pom.xml

@@ -48,6 +48,12 @@
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
         </dependency>
+        <!-- 替换Feign原生httpclient -->
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-httpclient</artifactId>
+            <version>10.3.0</version>
+        </dependency>
     </dependencies>
 
     <build>

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:

epmet-auth/pom.xml

@@ -80,6 +80,13 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <!-- 替换Feign原生httpclient -->
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-httpclient</artifactId>
+            <version>10.3.0</version>
+        </dependency>
+
     </dependencies>
 
     <build>

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<PasswordLoginUserInfoResultDTO> selectLoginUserInfoByPassword(PasswordLoginUserInfoFormDTO passwordLoginUserInfoFormDTO);
 }

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<String> selecWxLoginUserInfo(WxLoginUserInfoFormDTO loginUserInfoFormDTO) {
 		return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "selecWxLoginUserInfo", loginUserInfoFormDTO);
 	}
 

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

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<String> userResult=epmetUserFeignClient.selecWxLoginUserInfo(wxLoginUserInfoFormDTO);
 		String userId="";
 		if(!userResult.success()){
 			throw new RenException("获取用户信息失败"+userResult.getMsg());
@@ -136,13 +136,31 @@ 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=this.packageCustomerUserDTO(wxMaUserInfo);
+			Result<String> saveCustomerUserResult=epmetUserFeignClient.saveCustomerUser(customerUserDTO);
+			if(!saveCustomerUserResult.success()){
+				throw new RenException("创建用户失败"+userResult.getMsg());
+			}
+			userId = saveCustomerUserResult.getData();
+		}
+		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());
@@ -152,13 +170,7 @@ public class LoginServiceImpl implements LoginService {
 		customerUserDTO.setCountry(wxMaUserInfo.getCountry());
 		customerUserDTO.setProvince(wxMaUserInfo.getProvince());
 		customerUserDTO.setSex(Integer.valueOf(wxMaUserInfo.getGender()));
-			Result<String> saveCustomerUserResult=epmetUserFeignClient.saveCustomerUser(customerUserDTO);
+		return customerUserDTO;
-			if(!saveCustomerUserResult.success()){
-				throw new RenException("创建用户失败"+userResult.getMsg());
-			}
-			userId = saveCustomerUserResult.getData();
-		}
-		return userId;
 	}
 
 	/**
@@ -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;
 	}
 }

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:

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<String, Object> 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) {
+	public TokenDto get(String tokenStr) {
-		String key = RedisKeys.getCpUserKey(app, client, userId);
+		String key = RedisKeys.getCpUserKey(tokenStr);
 
 		Map<String, Object> 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) {
+	public void logout(String tokenStr) {
-		redisUtils.delete(RedisKeys.getCpUserKey(app, client, userId));
+		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) {
+	public boolean expire(String tokenStr, long expire) {
-		return redisUtils.expire(RedisKeys.getCpUserKey(app, client, userId), 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) {
+	public long getExpire(String tokenStr) {
-		return redisUtils.getExpire(RedisKeys.getCpUserKey(app, client, userId));
+		return redisUtils.getExpire(RedisKeys.getCpUserKey(tokenStr));
 	}
 }

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) {
+    public TokenDto getTokenInfo(String tokenStr) {
-        TokenDto tokenDto = redisUtils.get(app,client,userId);
+        TokenDto tokenDto = redisUtils.get(tokenStr);
         return tokenDto;
     }
 
-    public void expireToken(String app,String client,String userId) {
+    public void expireToken(String tokenStr) {
-        redisUtils.logout(app,client,userId);
+        redisUtils.logout(tokenStr);
     }
 
-    public boolean delayToken(String app,String client,String userId) {
+    public boolean delayToken(String tokenStr) {
-        return redisUtils.expire(app,client,userId, tokenPropertise.getExpire());
+        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) {
+    public long getExpire(String tokenStr) {
-        return redisUtils.getExpire(app,client,userId);
+        return redisUtils.getExpire(tokenStr);
     }
 }

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:token字符串
-	 * epmet:sys:security:user:gov:wxmp:5048212821254821
-	 * epmet:sys:security:user:oper:web:eeedsfsdfds512551
 	 */
-	public static String getCpUserKey(String app, String client, String id) {
+	public static String getCpUserKey(String tokenStr) {
-		return rootPrefix.concat("sys:security:user:").concat(app).concat(":").concat(client).concat(":").concat(id);
+		return rootPrefix.concat("sys:security:user:").concat(tokenStr);
 	}
 
 	/**

epmet-gateway/pom.xml

@@ -98,43 +98,43 @@
                 <!-- gateway routes -->
                 <!--  1、认证服务  -->
 <!--                <gateway.routes.epmet-auth-server.uri>lb://epmet-auth-server</gateway.routes.epmet-auth-server.uri>-->
-                <gateway.routes.epmet-auth-server.uri>http://localhost:8081</gateway.routes.epmet-auth-server.uri>
+                <gateway.routes.epmet-auth-server.uri>http://127.0.0.1:8081</gateway.routes.epmet-auth-server.uri>
                 <!--  2、Admin服务  -->
                 <gateway.routes.epmet-admin-server.uri>lb://epmet-admin-server</gateway.routes.epmet-admin-server.uri>
-<!--                <gateway.routes.epmet-admin-server.uri>http://localhost:8082</gateway.routes.epmet-admin-server.uri>-->
+<!--                <gateway.routes.epmet-admin-server.uri>http://127.0.0.1:8082</gateway.routes.epmet-admin-server.uri>-->
                 <!--  3、监控服务  -->
                 <gateway.routes.epmet-monitor-server.uri>lb://epmet-monitor-server</gateway.routes.epmet-monitor-server.uri>
-<!--                <gateway.routes.epmet-monitor-server.uri>http://localhost:8100</gateway.routes.epmet-monitor-server.uri>-->
+<!--                <gateway.routes.epmet-monitor-server.uri>http://127.0.0.1:8100</gateway.routes.epmet-monitor-server.uri>-->
                 <!--  4、OSS服务 -->
                 <gateway.routes.epmet-oss-server.uri>lb://epmet-oss-server</gateway.routes.epmet-oss-server.uri>
-<!--                <gateway.routes.epmet-oss-server.uri>http://localhost:8083</gateway.routes.epmet-oss-server.uri>-->
+<!--                <gateway.routes.epmet-oss-server.uri>http://127.0.0.1:8083</gateway.routes.epmet-oss-server.uri>-->
                 <!--  5、消息服务  -->
 <!--                <gateway.routes.epmet-message-server.uri>lb://epmet-message-server</gateway.routes.epmet-message-server.uri>-->
-                <gateway.routes.epmet-message-server.uri>http://localhost:8085</gateway.routes.epmet-message-server.uri>
+                <gateway.routes.epmet-message-server.uri>http://127.0.0.1:8085</gateway.routes.epmet-message-server.uri>
                 <!--   6、工作流服务 -->
 <!--                <gateway.routes.epmet-activiti-server.uri>lb://epmet-activiti-server</gateway.routes.epmet-activiti-server.uri>-->
-                <gateway.routes.epmet-activiti-server.uri>http://localhost:8086</gateway.routes.epmet-activiti-server.uri>
+                <gateway.routes.epmet-activiti-server.uri>http://127.0.0.1:8086</gateway.routes.epmet-activiti-server.uri>
                 <!--  7、定时任务服务  -->
 <!--                <gateway.routes.epmet-job-server.uri>lb://epmet-job-server</gateway.routes.epmet-job-server.uri>-->
-                <gateway.routes.epmet-job-server.uri>http://localhost:8084</gateway.routes.epmet-job-server.uri>
+                <gateway.routes.epmet-job-server.uri>http://127.0.0.1:8084</gateway.routes.epmet-job-server.uri>
                 <!--  8、用户模块              -->
                 <!--                <gateway.routes.epmet-user-server.uri>lb://epmet-user-server</gateway.routes.epmet-user-server.uri>-->
-                <gateway.routes.epmet-user-server.uri>http://localhost:8087</gateway.routes.epmet-user-server.uri>
+                <gateway.routes.epmet-user-server.uri>http://127.0.0.1:8087</gateway.routes.epmet-user-server.uri>
                 <!--  9、新模块结构demo  -->
                 <gateway.routes.epmet-demo-server.uri>lb://epmet-demo-server</gateway.routes.epmet-demo-server.uri>
-<!--                <gateway.routes.epmet-demo-server.uri>http://localhost:8088</gateway.routes.epmet-demo-server.uri>-->
+<!--                <gateway.routes.epmet-demo-server.uri>http://127.0.0.1:8088</gateway.routes.epmet-demo-server.uri>-->
                 <!--   10、运营端客户定制化服务             -->
 <!--                <gateway.routes.epmet-oper-customize-server.uri>lb://oper-customize-server</gateway.routes.epmet-oper-customize-server.uri>-->
-                <gateway.routes.oper-customize-server.uri>http://localhost:8089</gateway.routes.oper-customize-server.uri>
+                <gateway.routes.oper-customize-server.uri>http://127.0.0.1:8089</gateway.routes.oper-customize-server.uri>
                 <!--   11、运营端客户定制化服务             -->
 <!--                <gateway.routes.oper-crm-server.uri>lb://oper-crm-server</gateway.routes.oper-crm-server.uri>-->
-                <gateway.routes.oper-crm-server.uri>http://localhost:8090</gateway.routes.oper-crm-server.uri>
+                <gateway.routes.oper-crm-server.uri>http://127.0.0.1:8090</gateway.routes.oper-crm-server.uri>
                 <!--   12、居民端陌生人导览             -->
 <!--                <gateway.routes.resi-guide-server.uri>lb://oper-crm-server</gateway.routes.resi-guide-server.uri>-->
-                <gateway.routes.resi-guide-server.uri>http://localhost:8091</gateway.routes.resi-guide-server.uri>
+                <gateway.routes.resi-guide-server.uri>http://127.0.0.1:8091</gateway.routes.resi-guide-server.uri>
                 <!--   13、gov-org 数据网格库 原epmet-business   -->
 <!--                <gateway.routes.gov-org-server.uri>lb://gov-org-server</gateway.routes.gov-org-server.uri>-->
-                <gateway.routes.gov-org-server.uri>http://localhost:8092</gateway.routes.gov-org-server.uri>
+                <gateway.routes.gov-org-server.uri>http://127.0.0.1:8092</gateway.routes.gov-org-server.uri>
             </properties>
         </profile>
 

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:

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:

epmet-module/epmet-demo/epmet-demo-server/pom.xml

@@ -55,6 +55,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <!-- 替换Feign原生httpclient -->
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-httpclient</artifactId>
+            <version>10.3.0</version>
+        </dependency>
     </dependencies>
 
     <build>

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

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:

epmet-module/epmet-job/epmet-job-server/pom.xml

@@ -63,6 +63,12 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <!-- 替换Feign原生httpclient -->
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-httpclient</artifactId>
+            <version>10.3.0</version>
+        </dependency>
     </dependencies>
 
     <build>

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:

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:

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:

epmet-module/gov-org/gov-org-server/pom.xml

@@ -48,6 +48,12 @@
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
         </dependency>
+        <!-- 替换Feign原生httpclient -->
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-httpclient</artifactId>
+            <version>10.3.0</version>
+        </dependency>
     </dependencies>
 
     <build>

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:

epmet-module/oper-crm/oper-crm-server/pom.xml

@@ -52,6 +52,12 @@
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
         </dependency>
+        <!-- 替换Feign原生httpclient -->
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-httpclient</artifactId>
+            <version>10.3.0</version>
+        </dependency>
     </dependencies>
 
     <build>

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:

epmet-module/oper-customize/oper-customize-server/pom.xml

@@ -52,6 +52,12 @@
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
         </dependency>
+        <!-- 替换Feign原生httpclient -->
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-httpclient</artifactId>
+            <version>10.3.0</version>
+        </dependency>
     </dependencies>
 
     <build>

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:

epmet-module/resi-guide/resi-guide-server/pom.xml

@@ -52,6 +52,12 @@
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
         </dependency>
+        <!-- 替换Feign原生httpclient -->
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-httpclient</artifactId>
+            <version>10.3.0</version>
+        </dependency>
     </dependencies>
 
     <build>

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:

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 = "手机号不能为空")

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

epmet-user/epmet-user-server/pom.xml

@@ -54,6 +54,16 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-httpclient</artifactId>
+        </dependency>
+        <!-- 替换Feign原生httpclient -->
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-httpclient</artifactId>
+            <version>10.3.0</version>
+        </dependency>
     </dependencies>
 
     <build>

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

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<String> selecWxLoginUserInfo(@RequestBody WxLoginUserInfoFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO);
         return customerUserService.selecWxLoginUserInfo(formDTO);
     }
@@ -132,6 +132,7 @@ public class CustomerUserController {
     public Result<PasswordLoginUserInfoResultDTO> selectLoginUserInfoByPassword(@RequestBody PasswordLoginUserInfoFormDTO passwordLoginUserInfoFormDTO) {
         //效验数据
         ValidatorUtils.validateEntity(passwordLoginUserInfoFormDTO);
-        return customerUserService.selectLoginUserInfoByPassword(passwordLoginUserInfoFormDTO);
+        Result<PasswordLoginUserInfoResultDTO> result= customerUserService.selectLoginUserInfoByPassword(passwordLoginUserInfoFormDTO);
+        return result;
     }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerUserServiceImpl.java

@@ -114,7 +114,7 @@ public class CustomerUserServiceImpl extends BaseServiceImpl<CustomerUserDao, Cu
 	 * @date 2020-03-16
 	 */
 	@Override
-	public Result selecWxLoginUserInfo(WxLoginUserInfoFormDTO formDTO) {
+	public Result<String> selecWxLoginUserInfo(WxLoginUserInfoFormDTO formDTO) {
 		String userId = "";
 		if (LoginConstant.APP_GOV.equals(formDTO.getApp())) {
 			//查询customer_staff待完善
@@ -125,7 +125,7 @@ public class CustomerUserServiceImpl extends BaseServiceImpl<CustomerUserDao, Cu
 		} else if (LoginConstant.APP_RESI.equals(formDTO.getApp())) {
 			userId = baseDao.selectCustomerIdByOpenId(formDTO.getOpenId());
 		}
-		return new Result().ok(userId);
+		return new Result<String>().ok(userId);
 	}
 
 	/**

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: