From fe63708456ea0c25d6f2b0f97ada18ad66ac0a22 Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Wed, 8 Jul 2020 10:19:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=AC=AC=E4=B8=89=E6=96=B9?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/constant/ServiceConstant.java | 2 +- epmet-gateway/pom.xml | 8 ++-- .../src/main/resources/bootstrap.yml | 8 ++-- .../epmet-third-client}/pom.xml | 12 +---- .../form/ComponentVerifyTicketFormDTO.java | 0 .../dto/form/ThirdPlatformEventFormDTO.java | 0 .../form/WeChatPlatformAuthCodeFormDTO.java | 0 .../java/com/epmet/dto/result/ResultBean.java | 0 .../epmet/feign/EpmetThirdFeignClient.java} | 6 +-- .../EpmetThirdFeignClientFallback.java} | 4 +- .../epmet-third-server}/.gitignore | 0 .../deploy/docker-compose-dev.yml | 8 ++-- .../deploy/docker-compose-test.yml | 8 ++-- .../epmet-third-server}/pom.xml | 8 ++-- .../com/epmet/EpmetThirdApplication.java} | 4 +- .../com/epmet/aspect/RequestLogAspect.java | 0 .../com/epmet/config/ModuleConfigImpl.java | 2 +- .../com/epmet/constant/ModuleConstant.java | 8 ++++ .../epmet/constant/ThirdPlatformConstant.java | 8 ++-- .../ComponentVerifyTicketController.java | 46 ++++++++++++++++--- .../com/epmet/exception/AesException.java | 0 .../main/java/com/epmet/redis/RedisThird.java | 21 ++++++++- .../service/ComponentVerifyTicketService.java | 19 +++++--- .../ComponentVerifyTicketServiceImpl.java | 33 ++++++++++--- .../java/com/epmet/util/OkHttpHelper.java | 0 .../java/com/epmet/util/PKCS7EncoderUtil.java | 0 .../java/com/epmet/util/WXBizMsgCrypt.java | 0 .../java/com/epmet/util/WXXmlToMapUtil.java | 0 .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/logback-spring.xml | 0 .../pom.xml | 6 +-- epmet-module/pom.xml | 2 +- 32 files changed, 147 insertions(+), 70 deletions(-) rename epmet-module/{epmet-third-platform/epmet-third-platform-client => epmet-third/epmet-third-client}/pom.xml (64%) rename epmet-module/{epmet-third-platform/epmet-third-platform-client => epmet-third/epmet-third-client}/src/main/java/com/epmet/dto/form/ComponentVerifyTicketFormDTO.java (100%) rename epmet-module/{epmet-third-platform/epmet-third-platform-client => epmet-third/epmet-third-client}/src/main/java/com/epmet/dto/form/ThirdPlatformEventFormDTO.java (100%) rename epmet-module/{epmet-third-platform/epmet-third-platform-client => epmet-third/epmet-third-client}/src/main/java/com/epmet/dto/form/WeChatPlatformAuthCodeFormDTO.java (100%) rename epmet-module/{epmet-third-platform/epmet-third-platform-client => epmet-third/epmet-third-client}/src/main/java/com/epmet/dto/result/ResultBean.java (100%) rename epmet-module/{epmet-third-platform/epmet-third-platform-client/src/main/java/com/epmet/feign/EpmetThirdPlatformFeignClient.java => epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdFeignClient.java} (53%) rename epmet-module/{epmet-third-platform/epmet-third-platform-client/src/main/java/com/epmet/feign/fallback/EpmetThirdPlatformFeignClientFallback.java => epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdFeignClientFallback.java} (50%) rename epmet-module/{epmet-third-platform/epmet-third-platform-server => epmet-third/epmet-third-server}/.gitignore (100%) rename epmet-module/{epmet-third-platform/epmet-third-platform-server => epmet-third/epmet-third-server}/deploy/docker-compose-dev.yml (57%) rename epmet-module/{epmet-third-platform/epmet-third-platform-server => epmet-third/epmet-third-server}/deploy/docker-compose-test.yml (67%) rename epmet-module/{epmet-third-platform/epmet-third-platform-server => epmet-third/epmet-third-server}/pom.xml (97%) rename epmet-module/{epmet-third-platform/epmet-third-platform-server/src/main/java/com/epmet/EpmetThirdPlatformApplication.java => epmet-third/epmet-third-server/src/main/java/com/epmet/EpmetThirdApplication.java} (76%) rename epmet-module/{epmet-third-platform/epmet-third-platform-server => epmet-third/epmet-third-server}/src/main/java/com/epmet/aspect/RequestLogAspect.java (100%) rename epmet-module/{epmet-third-platform/epmet-third-platform-server => epmet-third/epmet-third-server}/src/main/java/com/epmet/config/ModuleConfigImpl.java (92%) rename epmet-module/{epmet-third-platform/epmet-third-platform-server => epmet-third/epmet-third-server}/src/main/java/com/epmet/constant/ModuleConstant.java (86%) rename epmet-module/{epmet-third-platform/epmet-third-platform-client => epmet-third/epmet-third-server}/src/main/java/com/epmet/constant/ThirdPlatformConstant.java (54%) rename epmet-module/{epmet-third-platform/epmet-third-platform-server => epmet-third/epmet-third-server}/src/main/java/com/epmet/controller/ComponentVerifyTicketController.java (53%) rename epmet-module/{epmet-third-platform/epmet-third-platform-server => epmet-third/epmet-third-server}/src/main/java/com/epmet/exception/AesException.java (100%) rename epmet-module/{epmet-third-platform/epmet-third-platform-server => epmet-third/epmet-third-server}/src/main/java/com/epmet/redis/RedisThird.java (69%) rename epmet-module/{epmet-third-platform/epmet-third-platform-server => epmet-third/epmet-third-server}/src/main/java/com/epmet/service/ComponentVerifyTicketService.java (69%) rename epmet-module/{epmet-third-platform/epmet-third-platform-server => epmet-third/epmet-third-server}/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java (82%) rename epmet-module/{epmet-third-platform/epmet-third-platform-server => epmet-third/epmet-third-server}/src/main/java/com/epmet/util/OkHttpHelper.java (100%) rename epmet-module/{epmet-third-platform/epmet-third-platform-server => epmet-third/epmet-third-server}/src/main/java/com/epmet/util/PKCS7EncoderUtil.java (100%) rename epmet-module/{epmet-third-platform/epmet-third-platform-server => epmet-third/epmet-third-server}/src/main/java/com/epmet/util/WXBizMsgCrypt.java (100%) rename epmet-module/{epmet-third-platform/epmet-third-platform-server => epmet-third/epmet-third-server}/src/main/java/com/epmet/util/WXXmlToMapUtil.java (100%) rename epmet-module/{epmet-third-platform/epmet-third-platform-server => epmet-third/epmet-third-server}/src/main/resources/bootstrap.yml (95%) rename epmet-module/{epmet-third-platform/epmet-third-platform-server => epmet-third/epmet-third-server}/src/main/resources/logback-spring.xml (100%) rename epmet-module/{epmet-third-platform => epmet-third}/pom.xml (75%) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java index 6857591ab3..58f699d87a 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java @@ -122,5 +122,5 @@ public interface ServiceConstant { /** * 微信第三方平台 */ - String EPMET_THIRD_PLATFORM_SERVER = "epmet-third-platform-server"; + String EPMET_THIRD_SERVER = "epmet-third-server"; } diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index 0d52af65a3..6f5f2e57aa 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -186,8 +186,8 @@ lb://epmet-openapi-scan - - http://localhost:8110 + lb://epmet-third-platform-server + @@ -271,6 +271,8 @@ lb://data-statistical-server lb://epmet-openapi-scan + + lb://epmet-third-server @@ -351,7 +353,7 @@ lb://epmet-openapi-scan - lb://epmet-third-platform-server + lb://epmet-third-server diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml index b7c816c002..a926c88fb3 100644 --- a/epmet-gateway/src/main/resources/bootstrap.yml +++ b/epmet-gateway/src/main/resources/bootstrap.yml @@ -287,11 +287,11 @@ spring: - StripPrefix=1 - CpAuth=true #微信第三方平台 - - id: epmet-third-platform-server - uri: @gateway.routes.epmet-third-platform-server.uri@ + - id: epmet-third-server + uri: @gateway.routes.epmet-third-server.uri@ order: 31 predicates: - - Path=${server.servlet.context-path}/epmet/third/platform/** + - Path=${server.servlet.context-path}/third/** filters: - StripPrefix=1 - CpAuth=true @@ -409,7 +409,7 @@ epmet: - /gov/issue/** - /gov/project/** - /resi/home/** - - /epmet/third/platform/** + - /third/** swaggerUrls: jwt: diff --git a/epmet-module/epmet-third-platform/epmet-third-platform-client/pom.xml b/epmet-module/epmet-third/epmet-third-client/pom.xml similarity index 64% rename from epmet-module/epmet-third-platform/epmet-third-platform-client/pom.xml rename to epmet-module/epmet-third/epmet-third-client/pom.xml index f17f962919..f9e61c9c99 100644 --- a/epmet-module/epmet-third-platform/epmet-third-platform-client/pom.xml +++ b/epmet-module/epmet-third/epmet-third-client/pom.xml @@ -5,13 +5,13 @@ 4.0.0 - epmet-third-platform + epmet-third com.epmet 2.0.0 - epmet-third-platform-client + epmet-third-client jar @@ -20,14 +20,6 @@ epmet-commons-tools 2.0.0 - - io.springfox - springfox-swagger2 - - - io.springfox - springfox-swagger-ui - diff --git a/epmet-module/epmet-third-platform/epmet-third-platform-client/src/main/java/com/epmet/dto/form/ComponentVerifyTicketFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ComponentVerifyTicketFormDTO.java similarity index 100% rename from epmet-module/epmet-third-platform/epmet-third-platform-client/src/main/java/com/epmet/dto/form/ComponentVerifyTicketFormDTO.java rename to epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ComponentVerifyTicketFormDTO.java diff --git a/epmet-module/epmet-third-platform/epmet-third-platform-client/src/main/java/com/epmet/dto/form/ThirdPlatformEventFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ThirdPlatformEventFormDTO.java similarity index 100% rename from epmet-module/epmet-third-platform/epmet-third-platform-client/src/main/java/com/epmet/dto/form/ThirdPlatformEventFormDTO.java rename to epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/ThirdPlatformEventFormDTO.java diff --git a/epmet-module/epmet-third-platform/epmet-third-platform-client/src/main/java/com/epmet/dto/form/WeChatPlatformAuthCodeFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/WeChatPlatformAuthCodeFormDTO.java similarity index 100% rename from epmet-module/epmet-third-platform/epmet-third-platform-client/src/main/java/com/epmet/dto/form/WeChatPlatformAuthCodeFormDTO.java rename to epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/WeChatPlatformAuthCodeFormDTO.java diff --git a/epmet-module/epmet-third-platform/epmet-third-platform-client/src/main/java/com/epmet/dto/result/ResultBean.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/ResultBean.java similarity index 100% rename from epmet-module/epmet-third-platform/epmet-third-platform-client/src/main/java/com/epmet/dto/result/ResultBean.java rename to epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/ResultBean.java diff --git a/epmet-module/epmet-third-platform/epmet-third-platform-client/src/main/java/com/epmet/feign/EpmetThirdPlatformFeignClient.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdFeignClient.java similarity index 53% rename from epmet-module/epmet-third-platform/epmet-third-platform-client/src/main/java/com/epmet/feign/EpmetThirdPlatformFeignClient.java rename to epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdFeignClient.java index f325488ebf..db762abafa 100644 --- a/epmet-module/epmet-third-platform/epmet-third-platform-client/src/main/java/com/epmet/feign/EpmetThirdPlatformFeignClient.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/EpmetThirdFeignClient.java @@ -1,7 +1,7 @@ package com.epmet.feign; import com.epmet.commons.tools.constant.ServiceConstant; -import com.epmet.feign.fallback.EpmetThirdPlatformFeignClientFallback; +import com.epmet.feign.fallback.EpmetThirdFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; /** @@ -10,7 +10,7 @@ import org.springframework.cloud.openfeign.FeignClient; * @Author zxc * @CreateTime 2020/7/5 14:45 */ -@FeignClient(name = ServiceConstant.EPMET_THIRD_PLATFORM_SERVER, fallback = EpmetThirdPlatformFeignClientFallback.class) +@FeignClient(name = ServiceConstant.EPMET_THIRD_SERVER, fallback = EpmetThirdFeignClientFallback.class) -public interface EpmetThirdPlatformFeignClient { +public interface EpmetThirdFeignClient { } diff --git a/epmet-module/epmet-third-platform/epmet-third-platform-client/src/main/java/com/epmet/feign/fallback/EpmetThirdPlatformFeignClientFallback.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdFeignClientFallback.java similarity index 50% rename from epmet-module/epmet-third-platform/epmet-third-platform-client/src/main/java/com/epmet/feign/fallback/EpmetThirdPlatformFeignClientFallback.java rename to epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdFeignClientFallback.java index c8826df8d6..7e58be23e7 100644 --- a/epmet-module/epmet-third-platform/epmet-third-platform-client/src/main/java/com/epmet/feign/fallback/EpmetThirdPlatformFeignClientFallback.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/fallback/EpmetThirdFeignClientFallback.java @@ -1,6 +1,6 @@ package com.epmet.feign.fallback; -import com.epmet.feign.EpmetThirdPlatformFeignClient; +import com.epmet.feign.EpmetThirdFeignClient; import org.springframework.stereotype.Component; /** @@ -8,5 +8,5 @@ import org.springframework.stereotype.Component; * @CreateTime 2020/7/5 14:46 */ @Component -public class EpmetThirdPlatformFeignClientFallback implements EpmetThirdPlatformFeignClient { +public class EpmetThirdFeignClientFallback implements EpmetThirdFeignClient { } diff --git a/epmet-module/epmet-third-platform/epmet-third-platform-server/.gitignore b/epmet-module/epmet-third/epmet-third-server/.gitignore similarity index 100% rename from epmet-module/epmet-third-platform/epmet-third-platform-server/.gitignore rename to epmet-module/epmet-third/epmet-third-server/.gitignore diff --git a/epmet-module/epmet-third-platform/epmet-third-platform-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml similarity index 57% rename from epmet-module/epmet-third-platform/epmet-third-platform-server/deploy/docker-compose-dev.yml rename to epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml index 61a96bd804..3d0b9404ef 100644 --- a/epmet-module/epmet-third-platform/epmet-third-platform-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml @@ -1,10 +1,10 @@ version: "3.7" services: - epmet-third-platform-server: - container_name: epmet-third-platform-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-platform-server:0.0.1 + epmet-third-server: + container_name: epmet-third-server-dev + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.1 ports: - - "8109:8109" + - "8110:8110" network_mode: host # 使用现有网络 volumes: - "/opt/epmet-cloud-logs/dev:/logs" diff --git a/epmet-module/epmet-third-platform/epmet-third-platform-server/deploy/docker-compose-test.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml similarity index 67% rename from epmet-module/epmet-third-platform/epmet-third-platform-server/deploy/docker-compose-test.yml rename to epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml index e3190c180c..6c17cf45fc 100644 --- a/epmet-module/epmet-third-platform/epmet-third-platform-server/deploy/docker-compose-test.yml +++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml @@ -1,10 +1,10 @@ version: "3.7" services: - epmet-third-platform-server: - container_name: epmet-third-platform-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-third-platform-server:0.0.1 + epmet-third-server: + container_name: epmet-third-server-test + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-third-server:0.0.1 ports: - - "8109:8109" + - "8110:8110" network_mode: host # 使用现有网络 volumes: - "/opt/epmet-cloud-logs/test:/logs" diff --git a/epmet-module/epmet-third-platform/epmet-third-platform-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml similarity index 97% rename from epmet-module/epmet-third-platform/epmet-third-platform-server/pom.xml rename to epmet-module/epmet-third/epmet-third-server/pom.xml index 35bf9c1864..b74743ebc9 100644 --- a/epmet-module/epmet-third-platform/epmet-third-platform-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -6,11 +6,11 @@ com.epmet - epmet-third-platform + epmet-third 2.0.0 - epmet-third-platform-server + epmet-third-server jar @@ -23,7 +23,7 @@ com.epmet - epmet-third-platform-client + epmet-third-client 2.0.0 @@ -97,7 +97,7 @@ com.squareup.okhttp3 okhttp - 4.3.1 + 4.0.0 diff --git a/epmet-module/epmet-third-platform/epmet-third-platform-server/src/main/java/com/epmet/EpmetThirdPlatformApplication.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/EpmetThirdApplication.java similarity index 76% rename from epmet-module/epmet-third-platform/epmet-third-platform-server/src/main/java/com/epmet/EpmetThirdPlatformApplication.java rename to epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/EpmetThirdApplication.java index 5989404eff..2aba843b3f 100644 --- a/epmet-module/epmet-third-platform/epmet-third-platform-server/src/main/java/com/epmet/EpmetThirdPlatformApplication.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/EpmetThirdApplication.java @@ -8,10 +8,10 @@ import org.springframework.cloud.openfeign.EnableFeignClients; @SpringBootApplication @EnableDiscoveryClient @EnableFeignClients -public class EpmetThirdPlatformApplication { +public class EpmetThirdApplication { public static void main(String[] args) { - SpringApplication.run(EpmetThirdPlatformApplication.class, args); + SpringApplication.run(EpmetThirdApplication.class, args); } } diff --git a/epmet-module/epmet-third-platform/epmet-third-platform-server/src/main/java/com/epmet/aspect/RequestLogAspect.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/aspect/RequestLogAspect.java similarity index 100% rename from epmet-module/epmet-third-platform/epmet-third-platform-server/src/main/java/com/epmet/aspect/RequestLogAspect.java rename to epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/aspect/RequestLogAspect.java diff --git a/epmet-module/epmet-third-platform/epmet-third-platform-server/src/main/java/com/epmet/config/ModuleConfigImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/config/ModuleConfigImpl.java similarity index 92% rename from epmet-module/epmet-third-platform/epmet-third-platform-server/src/main/java/com/epmet/config/ModuleConfigImpl.java rename to epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/config/ModuleConfigImpl.java index 2ea4a0b4c8..fc8136796e 100644 --- a/epmet-module/epmet-third-platform/epmet-third-platform-server/src/main/java/com/epmet/config/ModuleConfigImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/config/ModuleConfigImpl.java @@ -21,6 +21,6 @@ import org.springframework.stereotype.Service; public class ModuleConfigImpl implements ModuleConfig { @Override public String getName() { - return "epmetthirdplatform"; + return "epmetthird"; } } diff --git a/epmet-module/epmet-third-platform/epmet-third-platform-server/src/main/java/com/epmet/constant/ModuleConstant.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ModuleConstant.java similarity index 86% rename from epmet-module/epmet-third-platform/epmet-third-platform-server/src/main/java/com/epmet/constant/ModuleConstant.java rename to epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ModuleConstant.java index 8758c9a05a..4c744b6c5b 100644 --- a/epmet-module/epmet-third-platform/epmet-third-platform-server/src/main/java/com/epmet/constant/ModuleConstant.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ModuleConstant.java @@ -22,6 +22,12 @@ public interface ModuleConstant { String AUTHORIZATION_CODE = "authorization_code"; + String AUTHORIZER_APPID = "authorizer_appid"; + + String AUTHORIZATION_INFO = "authorization_info"; + + String AUTHORIZER_REFRESH_TOKEN = "authorizer_refresh_token"; + String AUTH_TICKET = "====================授权票据【ComponentVerifyTicket】：【%s】===================="; String ERROR_TICKET = "微信开放平台，第三方平台获取【验证票据】失败"; @@ -46,6 +52,8 @@ public interface ModuleConstant { String ACCESS_TOKEN_REDIS_KEY = "epmet:wechartthird:preauthcode"; + String AUTHORIZER_REFRESH_TOKEN_REDIS_KEY = "epmet:wechartthird:authorizerrefreshtoken"; + } diff --git a/epmet-module/epmet-third-platform/epmet-third-platform-client/src/main/java/com/epmet/constant/ThirdPlatformConstant.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ThirdPlatformConstant.java similarity index 54% rename from epmet-module/epmet-third-platform/epmet-third-platform-client/src/main/java/com/epmet/constant/ThirdPlatformConstant.java rename to epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ThirdPlatformConstant.java index e047538a40..9976e22d35 100644 --- a/epmet-module/epmet-third-platform/epmet-third-platform-client/src/main/java/com/epmet/constant/ThirdPlatformConstant.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ThirdPlatformConstant.java @@ -29,17 +29,17 @@ public interface ThirdPlatformConstant { /** * */ - String API_COMPONENT_TOKEN_URl = "**************"; + String API_COMPONENT_TOKEN_URl = "https://api.weixin.qq.com/cgi-bin/component/api_create_preauthcode?component_access_token=COMPONENT_ACCESS_TOKEN"; /** * */ - String API_CREATE_PREAUTHCODE_URL = "***************"; + String API_CREATE_PREAUTHCODE_URL = "https://api.weixin.qq.com/cgi-bin/component/api_create_preauthcode?component_access_token=COMPONENT_ACCESS_TOKEN"; /** - * + * 使用授权码获取授权信息请求地址 */ - String API_QUERY_AUTH_URL = "**********"; + String API_QUERY_AUTH_URL = "https://api.weixin.qq.com/cgi-bin/component/api_query_auth?component_access_token=COMPONENT_ACCESS_TOKEN"; diff --git a/epmet-module/epmet-third-platform/epmet-third-platform-server/src/main/java/com/epmet/controller/ComponentVerifyTicketController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ComponentVerifyTicketController.java similarity index 53% rename from epmet-module/epmet-third-platform/epmet-third-platform-server/src/main/java/com/epmet/controller/ComponentVerifyTicketController.java rename to epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ComponentVerifyTicketController.java index a6c7300c68..10b6b587c7 100644 --- a/epmet-module/epmet-third-platform/epmet-third-platform-server/src/main/java/com/epmet/controller/ComponentVerifyTicketController.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/ComponentVerifyTicketController.java @@ -1,24 +1,32 @@ package com.epmet.controller; import com.epmet.commons.tools.utils.Result; -import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.dto.form.WeChatPlatformAuthCodeFormDTO; import com.epmet.service.ComponentVerifyTicketService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; + /** * @Author zxc * @CreateTime 2020/7/6 9:07 */ @Slf4j -@RestController("third") +@RestController("wechatthird") public class ComponentVerifyTicketController { @Autowired private ComponentVerifyTicketService componentVerifyTicketService; + /** + * @Description 获取验证票据 + * @param timestamp + * @param nonce + * @param msgSignature + * @param postData + * @author zxc + */ @PostMapping(value = "/ticket") public Result weChatPlatformEvent(@RequestParam("timestamp") String timestamp, @RequestParam("nonce") String nonce, @@ -28,12 +36,22 @@ public class ComponentVerifyTicketController { return new Result(); } + /** + * @Description 获取预授权码 + * @param + * @author zxc + */ @PostMapping("ticketjob") public Result ticketJob() { componentVerifyTicketService.ticketJob(); return new Result(); } + /** + * @Description 获取预授权码 + * @param + * @author zxc + */ @PostMapping("preauthcode") public Result preAuthCode(){ componentVerifyTicketService.preAuthCode(); @@ -42,13 +60,27 @@ public class ComponentVerifyTicketController { /** * @Description - * @param formDTO + * @param response + * @param authCode + * @param expiresIn * @author zxc */ @PostMapping(value = "/authcode") - public Result weChatPlatformAuthCode(@RequestBody WeChatPlatformAuthCodeFormDTO formDTO) { - ValidatorUtils.validateEntity(formDTO); - componentVerifyTicketService.weChatPlatformAuthCode(formDTO); + public Result weChatPlatformAuthCode(HttpServletResponse response, + @RequestParam("auth_code") String authCode, + @RequestParam("expires_in") String expiresIn) { + componentVerifyTicketService.weChatPlatformAuthCode(response,authCode,expiresIn); + return new Result(); + } + + /** + * @Description 获取/刷新接口调用令牌 + * @param authorizerAppId 授权方AppId + * @author zxc + */ + @PostMapping("refreshtoken") + public Result refreshToken(@RequestParam("authorizer_appid") String authorizerAppId){ + componentVerifyTicketService.refreshToken(authorizerAppId); return new Result(); } diff --git a/epmet-module/epmet-third-platform/epmet-third-platform-server/src/main/java/com/epmet/exception/AesException.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/exception/AesException.java similarity index 100% rename from epmet-module/epmet-third-platform/epmet-third-platform-server/src/main/java/com/epmet/exception/AesException.java rename to epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/exception/AesException.java diff --git a/epmet-module/epmet-third-platform/epmet-third-platform-server/src/main/java/com/epmet/redis/RedisThird.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/redis/RedisThird.java similarity index 69% rename from epmet-module/epmet-third-platform/epmet-third-platform-server/src/main/java/com/epmet/redis/RedisThird.java rename to epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/redis/RedisThird.java index 678d86f1d0..576e6a1794 100644 --- a/epmet-module/epmet-third-platform/epmet-third-platform-server/src/main/java/com/epmet/redis/RedisThird.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/redis/RedisThird.java @@ -1,6 +1,5 @@ package com.epmet.redis; -import com.epmet.commons.tools.redis.RedisUtils; import com.epmet.constant.ModuleConstant; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -65,4 +64,24 @@ public class RedisThird { redisTemplate.opsForValue().set(ModuleConstant.PRE_AUTH_CODE_REDIS_KEY+ModuleConstant.PRE_AUTH_CODE, authCode, 60 * 10, TimeUnit.SECONDS); } + /** + * @Description 缓存 刷新令牌 + * （在授权的公众号具备API权限时，才有此返回值），刷新令牌主要用于第三方平台获取和刷新已授权用户的 authorizer_access_token。 + * 一旦丢失，只能让用户重新授权，才能再次拿到新的刷新令牌。用户重新授权后，之前的刷新令牌会失效 + * @param authorizerRefreshToken + * @author zxc + */ + public void setAuthorizerRefreshToken(String authorizerRefreshToken){ + redisTemplate.opsForValue().set(ModuleConstant.AUTHORIZER_REFRESH_TOKEN_REDIS_KEY+authorizerRefreshToken,authorizerRefreshToken); + } + + /** + * @Description 获取刷新 + * @param key + * @author zxc + */ + public String getAuthorizerRefreshToken(String key){ + return redisTemplate.opsForValue().get(ModuleConstant.AUTHORIZER_REFRESH_TOKEN_REDIS_KEY+key).toString(); + } + } diff --git a/epmet-module/epmet-third-platform/epmet-third-platform-server/src/main/java/com/epmet/service/ComponentVerifyTicketService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ComponentVerifyTicketService.java similarity index 69% rename from epmet-module/epmet-third-platform/epmet-third-platform-server/src/main/java/com/epmet/service/ComponentVerifyTicketService.java rename to epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ComponentVerifyTicketService.java index 3caf0c3703..cd7e167667 100644 --- a/epmet-module/epmet-third-platform/epmet-third-platform-server/src/main/java/com/epmet/service/ComponentVerifyTicketService.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/ComponentVerifyTicketService.java @@ -1,10 +1,6 @@ package com.epmet.service; -import com.epmet.commons.tools.security.dto.TokenDto; -import com.epmet.dto.form.ThirdPlatformEventFormDTO; -import com.epmet.dto.form.WeChatPlatformAuthCodeFormDTO; -import com.epmet.dto.result.ResultBean; -import org.springframework.web.bind.annotation.RequestBody; +import javax.servlet.http.HttpServletResponse; /** * @Author zxc @@ -38,9 +34,18 @@ public interface ComponentVerifyTicketService { /** * @Description - * @param formDTO + * @param response + * @param authCode + * @param expiresIn * @author zxc */ - void weChatPlatformAuthCode(WeChatPlatformAuthCodeFormDTO formDTO); + void weChatPlatformAuthCode(HttpServletResponse response,String authCode,String expiresIn); + + /** + * @Description 获取/刷新接口调用令牌 + * @param + * @author zxc + */ + void refreshToken(String authorizerAppId); } diff --git a/epmet-module/epmet-third-platform/epmet-third-platform-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java similarity index 82% rename from epmet-module/epmet-third-platform/epmet-third-platform-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java rename to epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java index 7637c4af1c..c226125580 100644 --- a/epmet-module/epmet-third-platform/epmet-third-platform-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java @@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.epmet.constant.ModuleConstant; import com.epmet.constant.ThirdPlatformConstant; -import com.epmet.dto.form.WeChatPlatformAuthCodeFormDTO; import com.epmet.exception.AesException; import com.epmet.redis.RedisThird; import com.epmet.service.ComponentVerifyTicketService; @@ -17,6 +16,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.HashMap; import java.util.Map; @@ -50,7 +50,7 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe String xml = pc.decryptMsg(msgSignature, timeStamp, nonce, postData); // 将xml转为map Map result = WXXmlToMapUtil.xmlToMap(xml); - String componentVerifyTicket = MapUtils.getString(result,ModuleConstant.TICKET_KEY); + String componentVerifyTicket = MapUtils.getString(result, ModuleConstant.TICKET_KEY); if (StringUtils.isNotEmpty(componentVerifyTicket)) { // 存储平台授权票据,保存ticket redisThird.setComponentVerifyTicket(componentVerifyTicket); @@ -79,7 +79,6 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe jsonObject.put(ModuleConstant.COMPONENT_APPID, PLATFORM_APP_ID); jsonObject.put(ModuleConstant.COMPONENT_APPSECRET, PLATFORM_APP_SECRET); jsonObject.put(ModuleConstant.TICKET_UNDERLINE_KEY, componentVerifyTicket); - // todo OkHttpHelper 无法引入 String post = okHttpHelper.post(API_COMPONENT_TOKEN_URl, JSON.toJSONString(jsonObject)); HashMap hashMap = JSON.parseObject(post, HashMap.class); String componentAccessToken = hashMap.get(ModuleConstant.COMPONENT_ACCESS_TOKEN); @@ -122,21 +121,41 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe } @Override - public void weChatPlatformAuthCode(WeChatPlatformAuthCodeFormDTO formDTO) { - String authCode = formDTO.getAuthCode(); - Integer expiresIn = formDTO.getExpiresIn(); + public void weChatPlatformAuthCode(HttpServletResponse response, String authCode, String expiresIn) { // 获取令牌【component_access_token】 String accessToken = redisThird.getComponentAccessToken(ModuleConstant.COMPONENT_ACCESS_TOKEN); // 使用授权码获取授权信息 JSONObject jsonObject = new JSONObject(); jsonObject.put(ModuleConstant.COMPONENT_APPID, PLATFORM_APP_ID); jsonObject.put(ModuleConstant.AUTHORIZATION_CODE, authCode); + String post; try { - String post = okHttpHelper.post(API_QUERY_AUTH_URL + accessToken, JSON.toJSONString(jsonObject)); + post = okHttpHelper.post(API_QUERY_AUTH_URL + accessToken, JSON.toJSONString(jsonObject)); + HashMap hashMap = JSON.parseObject(post, HashMap.class); + Map map = hashMap.get(ModuleConstant.AUTHORIZATION_INFO); + String authorizerRefreshToken = map.get(ModuleConstant.AUTHORIZER_REFRESH_TOKEN).toString(); + redisThird.setAuthorizerRefreshToken(authorizerRefreshToken); } catch (IOException e) { e.printStackTrace(); } + // 重定向地址 // response.sendRedirect("/wechat/authcode"); } + + /** + * @Description 获取/刷新接口调用令牌 + * @param + * @author zxc + */ + @Override + public void refreshToken(String authorizerAppId) { + JSONObject jsonObject = new JSONObject(); + //todo 授权方appid从哪来,每个用户的刷新token + //授权方AppId +// jsonObject.put(ModuleConstant.AUTHORIZER_APPID,authorizerAppId); + //第三方平台AppId + jsonObject.put(ModuleConstant.COMPONENT_APPID,PLATFORM_APP_ID); + jsonObject.put("",redisThird.getAuthorizerRefreshToken("")); + } } diff --git a/epmet-module/epmet-third-platform/epmet-third-platform-server/src/main/java/com/epmet/util/OkHttpHelper.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/util/OkHttpHelper.java similarity index 100% rename from epmet-module/epmet-third-platform/epmet-third-platform-server/src/main/java/com/epmet/util/OkHttpHelper.java rename to epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/util/OkHttpHelper.java diff --git a/epmet-module/epmet-third-platform/epmet-third-platform-server/src/main/java/com/epmet/util/PKCS7EncoderUtil.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/util/PKCS7EncoderUtil.java similarity index 100% rename from epmet-module/epmet-third-platform/epmet-third-platform-server/src/main/java/com/epmet/util/PKCS7EncoderUtil.java rename to epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/util/PKCS7EncoderUtil.java diff --git a/epmet-module/epmet-third-platform/epmet-third-platform-server/src/main/java/com/epmet/util/WXBizMsgCrypt.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/util/WXBizMsgCrypt.java similarity index 100% rename from epmet-module/epmet-third-platform/epmet-third-platform-server/src/main/java/com/epmet/util/WXBizMsgCrypt.java rename to epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/util/WXBizMsgCrypt.java diff --git a/epmet-module/epmet-third-platform/epmet-third-platform-server/src/main/java/com/epmet/util/WXXmlToMapUtil.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/util/WXXmlToMapUtil.java similarity index 100% rename from epmet-module/epmet-third-platform/epmet-third-platform-server/src/main/java/com/epmet/util/WXXmlToMapUtil.java rename to epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/util/WXXmlToMapUtil.java diff --git a/epmet-module/epmet-third-platform/epmet-third-platform-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml similarity index 95% rename from epmet-module/epmet-third-platform/epmet-third-platform-server/src/main/resources/bootstrap.yml rename to epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml index 5e2f47ba4a..7867f1f3da 100644 --- a/epmet-module/epmet-third-platform/epmet-third-platform-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml @@ -1,13 +1,13 @@ server: port: @server.port@ servlet: - context-path: /epmet/third/platform + context-path: /third spring: main: allow-bean-definition-overriding: true application: - name: epmet-third-platform-server + name: epmet-third-server # dev|test|prod profiles: active: dev diff --git a/epmet-module/epmet-third-platform/epmet-third-platform-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/logback-spring.xml similarity index 100% rename from epmet-module/epmet-third-platform/epmet-third-platform-server/src/main/resources/logback-spring.xml rename to epmet-module/epmet-third/epmet-third-server/src/main/resources/logback-spring.xml diff --git a/epmet-module/epmet-third-platform/pom.xml b/epmet-module/epmet-third/pom.xml similarity index 75% rename from epmet-module/epmet-third-platform/pom.xml rename to epmet-module/epmet-third/pom.xml index 5a5fcef140..883b02ddb7 100644 --- a/epmet-module/epmet-third-platform/pom.xml +++ b/epmet-module/epmet-third/pom.xml @@ -9,12 +9,12 @@ 4.0.0 - epmet-third-platform + epmet-third pom - epmet-third-platform-client - epmet-third-platform-server + epmet-third-client + epmet-third-server diff --git a/epmet-module/pom.xml b/epmet-module/pom.xml index 854ba00003..dfa242462a 100644 --- a/epmet-module/pom.xml +++ b/epmet-module/pom.xml @@ -39,7 +39,7 @@ resi-voice data-statistical data-report - epmet-third-platform + epmet-third