diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml
index 613d5411c5..4ef3c1cb7f 100644
--- a/epmet-auth/pom.xml
+++ b/epmet-auth/pom.xml
@@ -200,9 +200,13 @@
- http://101.206.141.251:21006
- soXDEoM1
- V7ea0KnlYt7eSyzc
+ http://101.206.141.251:21006
+ soXDEoM1
+ V7ea0KnlYt7eSyzc
+
+ http://101.206.141.219:21006
+ xSMONWwP
+ UUCnxLyXiB4eBF4p
@@ -249,9 +253,13 @@
- http://101.206.141.251:21006
- soXDEoM1
- V7ea0KnlYt7eSyzc
+ http://101.206.141.251:21006
+ soXDEoM1
+ V7ea0KnlYt7eSyzc
+
+ http://101.206.141.219:21006
+ xSMONWwP
+ UUCnxLyXiB4eBF4p
@@ -293,9 +301,13 @@
- http://101.206.141.251:21006
- soXDEoM1
- V7ea0KnlYt7eSyzc
+ http://101.206.141.251:21006
+ soXDEoM1
+ V7ea0KnlYt7eSyzc
+
+ http://101.206.141.219:21006
+ xSMONWwP
+ UUCnxLyXiB4eBF4p
@@ -341,9 +353,9 @@
- https://jcytc.lzjczl.com:21009
- 2cy0a9lA
- 6hU3PQgxLcXr27SE
+ https://jcytc.lzjczl.com:21009
+ 2cy0a9lA
+ 6hU3PQgxLcXr27SE
diff --git a/epmet-auth/src/main/resources/bootstrap.yml b/epmet-auth/src/main/resources/bootstrap.yml
index 412dba2dc3..cfd22631ac 100644
--- a/epmet-auth/src/main/resources/bootstrap.yml
+++ b/epmet-auth/src/main/resources/bootstrap.yml
@@ -135,12 +135,16 @@ shutdown:
# 调用第三方平台相关参数
thirdplat:
- jcet:
- domain: @thirdplat.jcet.domain@
- appkey: @thirdplat.jcet.appkey@
- appsecret: @thirdplat.jcet.appsecret@
+ jcetCend:
+ domain: @thirdplat.jcet.c.domain@
+ appkey: @thirdplat.jcet.c.appkey@
+ appsecret: @thirdplat.jcet.c.appsecret@
+ jcetGend:
+ domain: @thirdplat.jcet.g.domain@
+ appkey: @thirdplat.jcet.g.appkey@
+ appsecret: @thirdplat.jcet.g.appsecret@
pyld:
domain: https://epmet-ext9.elinkservice.cn/platform
appId: 7a5aec009ba4eba8e254ee64fe3775e1
appKey: 14faef9af508d1c253b720ea5a43f9de
- appSecret: 38e7c2604c8dd33c445705d25eebbfc12a2f7ed8a87111e9e10a40312d3a1595
+ appSecret: 38e7c2604c8dd33c445705d25eebbfc12a2f7ed8a87111e9e10a40312d3a1595
\ No newline at end of file
diff --git a/epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/DemoApp.java b/epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/DemoApp.java
index 43b27e385b..1b874efc82 100644
--- a/epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/DemoApp.java
+++ b/epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/DemoApp.java
@@ -20,7 +20,7 @@ public class DemoApp {
//ssoToken.setSsoToken("wxz");
SsoTicketFormDTO ssoTicket = new SsoTicketFormDTO();
- ssoTicket.setSsoTicket("wxz");
+ ssoTicket.setSsoTicket("ssoTicket-jGOAW66udmRtUWBKgs3q7k1w7prGxd5I");
int bodyLength = JSON.toJSONString(ssoTicket).getBytes("utf-8").length;
diff --git a/epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/apiservice/jcet/JcetApiService.java b/epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/apiservice/jcet/JcetApiService.java
index 7dd811425d..8f8e59cd11 100644
--- a/epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/apiservice/jcet/JcetApiService.java
+++ b/epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/apiservice/jcet/JcetApiService.java
@@ -25,11 +25,13 @@ public class JcetApiService extends AbstractApiService {
Logger logger = LoggerFactory.getLogger(getClass());
- private JcetThirdplatProps jcetThirdplatProps;
+ private JcetThirdplatProps jcetThirdplatCendProps;
+ private JcetThirdplatProps jcetThirdplatGendProps;
public JcetApiService(ThirdplatProps props) {
this.thirdplatProps = props;
- jcetThirdplatProps = props.getJcet();
+ jcetThirdplatCendProps = props.getJcetCend();
+ jcetThirdplatGendProps = props.getJcetGend();
}
/**
@@ -47,12 +49,12 @@ public class JcetApiService extends AbstractApiService {
SsoTicketFormDTO ssoTicket = new SsoTicketFormDTO();
ssoTicket.setSsoTicket(ticket);
- String domain = jcetThirdplatProps.getDomain();
+ String domain = jcetThirdplatCendProps.getDomain();
Result result = HttpClientManager.getInstance().sendPost(
domain.concat(JcetConstants.URL_GET_USER_BY_TICKET),
domain.startsWith("https://"),
JSON.toJSONString(ssoTicket),
- getHeaders(ssoTicket));
+ getHeaders(ssoTicket, jcetThirdplatCendProps.getAppkey(), jcetThirdplatCendProps.getAppsecret()));
try {
logger.info("【请求酒城e通第三方平台】getUserInfoByTicket()接口返回:{}", result.getData());
@@ -102,15 +104,15 @@ public class JcetApiService extends AbstractApiService {
* @return
* @throws UnsupportedEncodingException
*/
- private Map getHeaders(Object contentObject) throws UnsupportedEncodingException {
+ private Map getHeaders(Object contentObject, String appKey, String appSecret) throws UnsupportedEncodingException {
int bodyLength = JSON.toJSONString(contentObject).getBytes(StandardCharsets.UTF_8).length;
Map headers = new HashMap();
long timestamp = System.currentTimeMillis();
headers.put(JcetConstants.PLAT_HEADER_OPEN_TIMESTAMP, String.valueOf(timestamp));
- headers.put(JcetConstants.PLAT_HEADER_OPEN_APP_ID, jcetThirdplatProps.getAppkey());
- String encryptContent = jcetThirdplatProps.getAppkey() + timestamp + bodyLength;
- headers.put(JcetConstants.PLAT_HEADER_OPEN_SIGN, SignUtils.generate(encryptContent, jcetThirdplatProps.getAppsecret()));
+ headers.put(JcetConstants.PLAT_HEADER_OPEN_APP_ID, appKey);
+ String encryptContent = appKey + timestamp + bodyLength;
+ headers.put(JcetConstants.PLAT_HEADER_OPEN_SIGN, SignUtils.generate(encryptContent, appSecret));
return headers;
}
diff --git a/epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/properties/ThirdplatProps.java b/epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/properties/ThirdplatProps.java
index 4c9b46b9e0..441d1f0839 100644
--- a/epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/properties/ThirdplatProps.java
+++ b/epmet-commons/epmet-commons-thirdplat/src/main/java/com/epmet/commons/thirdplat/properties/ThirdplatProps.java
@@ -6,10 +6,13 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
@Data
@ConfigurationProperties(prefix = "thirdplat")
public class ThirdplatProps {
- /**
- * 泸州 酒城e通
- */
- private JcetThirdplatProps jcet;
+
+ // C端
+ private JcetThirdplatProps jcetCend;
+
+ // G端
+ private JcetThirdplatProps jcetGend;
+
/**
* 平阴联动指挥平台
*/