From dd5e82305acaff088d5c1635e97c6359fda503ed Mon Sep 17 00:00:00 2001 From: ljl Date: Thu, 16 Nov 2023 16:53:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/dsapi/response/GetAuthInfoResponseDTO.java | 4 ++++ ms-biz/src/main/java/com/ms/biz/util/DDApi.java | 14 +++++++------- ms-dal/src/main/resources/application.properties | 8 ++++---- .../src/main/java/com/ms/web/controller/Test.java | 2 +- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/ms-api/src/main/java/com/ms/api/dto/dsapi/response/GetAuthInfoResponseDTO.java b/ms-api/src/main/java/com/ms/api/dto/dsapi/response/GetAuthInfoResponseDTO.java index b0d8a56..1dcb166 100644 --- a/ms-api/src/main/java/com/ms/api/dto/dsapi/response/GetAuthInfoResponseDTO.java +++ b/ms-api/src/main/java/com/ms/api/dto/dsapi/response/GetAuthInfoResponseDTO.java @@ -6,4 +6,8 @@ import lombok.Data; public class GetAuthInfoResponseDTO extends CommonResponseDTO { private String authCode; private String memberName; + private String version; + private String authStatus; + private String authStatusText; + private String memberAuthUrl; } diff --git a/ms-biz/src/main/java/com/ms/biz/util/DDApi.java b/ms-biz/src/main/java/com/ms/biz/util/DDApi.java index 9b41939..77cd743 100644 --- a/ms-biz/src/main/java/com/ms/biz/util/DDApi.java +++ b/ms-biz/src/main/java/com/ms/biz/util/DDApi.java @@ -142,14 +142,14 @@ public class DDApi { } private static T execute(DoudianOpRequest request) { - GlobalConfig.getGlobalConfig().addHttpRequestHeader("X-USE-BOE", "1"); - GlobalConfig.getGlobalConfig().addHttpRequestHeader("Origin-From", "djt_prod"); - GlobalConfig.getGlobalConfig().addHttpRequestHeader("X-TT-ENV", "boe_supply_center"); +// GlobalConfig.getGlobalConfig().addHttpRequestHeader("X-USE-BOE", "1"); +// GlobalConfig.getGlobalConfig().addHttpRequestHeader("Origin-From", "djt_prod"); +// GlobalConfig.getGlobalConfig().addHttpRequestHeader("X-TT-ENV", "boe_supply_center"); -// SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); -// GlobalConfig.getGlobalConfig().addHttpRequestHeader("X-USE-PPE", "1"); -// GlobalConfig.getGlobalConfig().addHttpRequestHeader("Origin-From", "djt_ppe_" + format.format(new Date())); -// GlobalConfig.getGlobalConfig().addHttpRequestHeader("X-TT-ENV", "ppe_supply_center"); + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); + GlobalConfig.getGlobalConfig().addHttpRequestHeader("X-USE-PPE", "1"); + GlobalConfig.getGlobalConfig().addHttpRequestHeader("Origin-From", "djt_ppe_" + format.format(new Date())); + GlobalConfig.getGlobalConfig().addHttpRequestHeader("X-TT-ENV", "ppe_supply_center"); log.info("DdParam:{}", JSONObject.toJSONString(request.getParam())); log.info("DdRequest:{}", JSONObject.toJSONString(request)); diff --git a/ms-dal/src/main/resources/application.properties b/ms-dal/src/main/resources/application.properties index 4604c98..c4b6be6 100644 --- a/ms-dal/src/main/resources/application.properties +++ b/ms-dal/src/main/resources/application.properties @@ -22,12 +22,12 @@ mybatis.mapper-locations=classpath*:mapper/*.xml mybatis.configuration.log-impl=org.apache.ibatis.logging.slf4j.Slf4jImpl mybatis.configuration.map-underscore-to-camel-case=true -#cloud.app.key=7290512081592305208 -#cloud.app.secret=d21bf43e-c671-4fa5-b35a-762a9c775129 +cloud.app.key=7290512081592305208 +cloud.app.secret=d21bf43e-c671-4fa5-b35a-762a9c775129 # boe -cloud.app.key=7296606199200499244 -cloud.app.secret=0063975e-7755-4d51-8255-ad163604456f +#cloud.app.key=7296606199200499244 +#cloud.app.secret=0063975e-7755-4d51-8255-ad163604456f #spring.redis.host=r-2zext1mz5bw1hsochrpd.redis.rds.aliyuncs.com #spring.redis.port=6379 diff --git a/ms-web/src/main/java/com/ms/web/controller/Test.java b/ms-web/src/main/java/com/ms/web/controller/Test.java index 83ad8f6..540ef90 100644 --- a/ms-web/src/main/java/com/ms/web/controller/Test.java +++ b/ms-web/src/main/java/com/ms/web/controller/Test.java @@ -191,7 +191,7 @@ public class Test { @RequestMapping("/getAuthInfo") public String getAuthInfo() { // 30459766L - GetAuthInfoResponseDTO responseDTO = dsApiService.getAuthInfo(1111502210L); + GetAuthInfoResponseDTO responseDTO = dsApiService.getAuthInfo(16700961L); System.out.println(responseDTO); return ""; }