diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml
index 4ef3c1cb7f..339cacdf08 100644
--- a/epmet-auth/pom.xml
+++ b/epmet-auth/pom.xml
@@ -207,6 +207,8 @@
http://101.206.141.219:21006
xSMONWwP
UUCnxLyXiB4eBF4p
+
+ https://epmet-cloud.elinkservice.cn
@@ -260,6 +262,8 @@
http://101.206.141.219:21006
xSMONWwP
UUCnxLyXiB4eBF4p
+
+ https://epmet-cloud.elinkservice.cn
@@ -308,6 +312,8 @@
http://101.206.141.219:21006
xSMONWwP
UUCnxLyXiB4eBF4p
+
+ https://epmet-cloud.elinkservice.cn
@@ -356,6 +362,8 @@
https://jcytc.lzjczl.com:21009
2cy0a9lA
6hU3PQgxLcXr27SE
+
+ https://epmet-cloud.elinkservice.cn
diff --git a/epmet-auth/src/main/java/com/epmet/controller/SsoController.java b/epmet-auth/src/main/java/com/epmet/controller/SsoController.java
index 0626b9b22e..6f19f29e62 100644
--- a/epmet-auth/src/main/java/com/epmet/controller/SsoController.java
+++ b/epmet-auth/src/main/java/com/epmet/controller/SsoController.java
@@ -38,9 +38,9 @@ public class SsoController {
* @date 2021/1/18 下午4:59
*/
@PostMapping("resi/login")
- public Result ssoLogin(@RequestBody SsoLoginFormDTO formDTO) {
+ public Result ssoResiLogin(@RequestBody SsoLoginFormDTO formDTO){
ValidatorUtils.validateEntity(formDTO, SsoLoginFormDTO.SsoLoginForm.class);
- return new Result().ok(ssoService.ssoLogin(formDTO));
+ return new Result().ok(ssoService.ssoResiLogin(formDTO));
}
/**
diff --git a/epmet-auth/src/main/java/com/epmet/service/SsoService.java b/epmet-auth/src/main/java/com/epmet/service/SsoService.java
index 65b3192c73..4cc9c93ba7 100644
--- a/epmet-auth/src/main/java/com/epmet/service/SsoService.java
+++ b/epmet-auth/src/main/java/com/epmet/service/SsoService.java
@@ -19,7 +19,7 @@ public interface SsoService {
* @author zxc
* @date 2021/1/18 下午4:59
*/
- SsoLoginResultDTO ssoLogin(SsoLoginFormDTO formDTO);
+ SsoLoginResultDTO ssoResiLogin(SsoLoginFormDTO formDTO);
/**
* @param formDTO
diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/SsoServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/SsoServiceImpl.java
index bcba96894d..585a197791 100644
--- a/epmet-auth/src/main/java/com/epmet/service/impl/SsoServiceImpl.java
+++ b/epmet-auth/src/main/java/com/epmet/service/impl/SsoServiceImpl.java
@@ -30,6 +30,7 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -74,6 +75,9 @@ public class SsoServiceImpl implements SsoService {
@Autowired
private EpmetUserFeignClient epmetUserFeignClient;
+ @Value("${epmet.third.urlPrefix}")
+ private String epmetThirdUrlPrefix;
+
/**
* @Description 0、入口:得到token
* @Param formDTO
@@ -81,7 +85,7 @@ public class SsoServiceImpl implements SsoService {
* @date 2021/1/18 下午4:59
*/
@Override
- public SsoLoginResultDTO ssoLogin(SsoLoginFormDTO formDTO) {
+ public SsoLoginResultDTO ssoResiLogin(SsoLoginFormDTO formDTO) {
String customerId = getCustomerId(formDTO.getAppId());
//String customerId = "3a4f923665a7a07701bcb311aac9a156";
String userId = "";
@@ -230,7 +234,7 @@ public class SsoServiceImpl implements SsoService {
*/
public String getCustomerId(String appId){
JSONObject jsonObject = new JSONObject();
- String customerMsgUrl = "https://epmet-cloud.elinkservice.cn/api/third/customermp/getcustomermsg/";
+ String customerMsgUrl = epmetThirdUrlPrefix + "/api/third/customermp/getcustomermsg/";
String data = HttpClientManager.getInstance().sendPostByJSON(customerMsgUrl + appId, JSON.toJSONString(jsonObject)).getData();
log.info("调用third服务,根据appId查询客户信息:httpclient->url:" + customerMsgUrl + ",结果->" + data);
JSONObject toResult = JSON.parseObject(data);
@@ -481,10 +485,10 @@ public class SsoServiceImpl implements SsoService {
//2.客户Id换取第三方apiService,根据ticket换取华为Id
Result apiServiceResult = operCrmOpenFeignClient.getApiServiceByCustomerId(new ApiServiceFormDTO(formDTO.getCustomerId()));
if (!apiServiceResult.success()) {
- throw new RenException("【SSO登录】调用OperCrm获取ApiService接口失败:", apiServiceResult.getInternalMsg());
+ throw new RenException("【SSO enterOrg】调用OperCrm获取ApiService接口失败:", apiServiceResult.getInternalMsg());
}
if (apiServiceResult.getData() == null || StringUtils.isBlank(apiServiceResult.getData().getApiServiceName())) {
- throw new RenException("【SSO登录】调用OperCrm获取ApiService,查询到的结果为空:", apiServiceResult.toString());
+ throw new RenException("【SSO enterOrg】调用OperCrm获取ApiService,查询到的结果为空:", apiServiceResult.toString());
}
ThirdPlatUserInfo userInfo;
try {
@@ -495,7 +499,7 @@ public class SsoServiceImpl implements SsoService {
}
if (null == userInfo){
throw new RenException(EpmetErrorCode.THIRD_PLAT_REQUEST_ERROR.getCode(),
- "【SSO登录】调用第三方平台查询用户信息失败,用户信息为空");
+ "【SSO enterOrg】调用第三方平台查询用户信息失败,用户信息为空");
}
//3、记录staff_wechat,并记录用户激活状态,激活时间
diff --git a/epmet-auth/src/main/resources/bootstrap.yml b/epmet-auth/src/main/resources/bootstrap.yml
index cfd22631ac..9955f6da28 100644
--- a/epmet-auth/src/main/resources/bootstrap.yml
+++ b/epmet-auth/src/main/resources/bootstrap.yml
@@ -147,4 +147,9 @@ thirdplat:
domain: https://epmet-ext9.elinkservice.cn/platform
appId: 7a5aec009ba4eba8e254ee64fe3775e1
appKey: 14faef9af508d1c253b720ea5a43f9de
- appSecret: 38e7c2604c8dd33c445705d25eebbfc12a2f7ed8a87111e9e10a40312d3a1595
\ No newline at end of file
+ appSecret: 38e7c2604c8dd33c445705d25eebbfc12a2f7ed8a87111e9e10a40312d3a1595
+
+epmet:
+# third服务的相关配置
+ third:
+ urlPrefix: @epmet.third.urlprefix@
\ No newline at end of file