Browse Source

服务升级

dev_shibei_match
sunyuchao 5 years ago
parent
commit
03ab0c8cca
  1. 2
      epmet-auth/deploy/docker-compose-dev.yml
  2. 2
      epmet-auth/pom.xml
  3. 4
      epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java

2
epmet-auth/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
epmet-auth-server: epmet-auth-server:
container_name: epmet-auth-server-dev container_name: epmet-auth-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.62 image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.63
ports: ports:
- "8081:8081" - "8081:8081"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-auth/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>0.3.62</version> <version>0.3.63</version>
<parent> <parent>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>
<artifactId>epmet-cloud</artifactId> <artifactId>epmet-cloud</artifactId>

4
epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java

@ -507,6 +507,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
public PaCustomerDTO getCustomerInfo(String appId){ public PaCustomerDTO getCustomerInfo(String appId){
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
String data = HttpClientManager.getInstance().sendPostByJSON(AuthHttpUrlConstant.CUSTOMER_MSG_URL + appId, JSON.toJSONString(jsonObject)).getData(); String data = HttpClientManager.getInstance().sendPostByJSON(AuthHttpUrlConstant.CUSTOMER_MSG_URL + appId, JSON.toJSONString(jsonObject)).getData();
logger.info("httpclient->url:"+AuthHttpUrlConstant.CUSTOMER_MSG_URL+",结果->"+data);
JSONObject toResult = JSON.parseObject(data); JSONObject toResult = JSON.parseObject(data);
Result mapToResult = ConvertUtils.mapToEntity(toResult, Result.class); Result mapToResult = ConvertUtils.mapToEntity(toResult, Result.class);
if (!mapToResult.success()) { if (!mapToResult.success()) {
@ -517,6 +518,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
JSONObject json = JSON.parseObject(PublicCustomerResultDTO.toString()); JSONObject json = JSON.parseObject(PublicCustomerResultDTO.toString());
PublicCustomerResultDTO publicCustomerResultDTO = ConvertUtils.mapToEntity(json, PublicCustomerResultDTO.class); PublicCustomerResultDTO publicCustomerResultDTO = ConvertUtils.mapToEntity(json, PublicCustomerResultDTO.class);
PaCustomerDTO customer = publicCustomerResultDTO.getCustomer(); PaCustomerDTO customer = publicCustomerResultDTO.getCustomer();
logger.info("小程序登陆third服务获取客户用户信息PaCustomerDTO->"+customer);
return customer; return customer;
} }
@ -527,6 +529,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
*/ */
public UserWechatDTO getUserWeChat(WxLoginFormDTO resiLoginFormDTO){ public UserWechatDTO getUserWeChat(WxLoginFormDTO resiLoginFormDTO){
String data = HttpClientManager.getInstance().sendPostByJSON(AuthHttpUrlConstant.RESI_AND_WORK_LOGIN_URL, JSON.toJSONString(resiLoginFormDTO)).getData(); String data = HttpClientManager.getInstance().sendPostByJSON(AuthHttpUrlConstant.RESI_AND_WORK_LOGIN_URL, JSON.toJSONString(resiLoginFormDTO)).getData();
logger.info("httpclient->url:"+AuthHttpUrlConstant.RESI_AND_WORK_LOGIN_URL+",结果->"+data);
JSONObject toResult = JSON.parseObject(data); JSONObject toResult = JSON.parseObject(data);
Result mapToResult = ConvertUtils.mapToEntity(toResult, Result.class); Result mapToResult = ConvertUtils.mapToEntity(toResult, Result.class);
if (!mapToResult.success()) { if (!mapToResult.success()) {
@ -536,6 +539,7 @@ public class ThirdLoginServiceImpl implements ThirdLoginService {
Object UserWeChatDTO = mapToResult.getData(); Object UserWeChatDTO = mapToResult.getData();
JSONObject json = JSON.parseObject(UserWeChatDTO.toString()); JSONObject json = JSON.parseObject(UserWeChatDTO.toString());
UserWechatDTO userWechatDTO = ConvertUtils.mapToEntity(json, UserWechatDTO.class); UserWechatDTO userWechatDTO = ConvertUtils.mapToEntity(json, UserWechatDTO.class);
logger.info("小程序登陆third服务获取微信用户信息userWechatDTO->"+userWechatDTO);
return userWechatDTO; return userWechatDTO;
} }

Loading…
Cancel
Save