diff --git a/README.md b/README.md index 95c34413..60af4878 100644 --- a/README.md +++ b/README.md @@ -119,7 +119,7 @@ graph TD + `security`:公共权限验证模块 -#### 2.2 api +#### 2.2 gateway 网关项目,负责微服务接口转发,前端统一通过网关调用其他微服务接口; 采用`gateway`进行api分发,引入Sentinel进行流量治理。 diff --git a/api/pom.xml b/gateway/pom.xml similarity index 99% rename from api/pom.xml rename to gateway/pom.xml index d1b56edc..f3fe2e62 100644 --- a/api/pom.xml +++ b/gateway/pom.xml @@ -7,7 +7,7 @@ 3.0.2 - api + gateway jar 2.0.0 api diff --git a/api/src/main/java/com/qihang/api/Api.java b/gateway/src/main/java/com/qihang/api/Gateway.java similarity index 80% rename from api/src/main/java/com/qihang/api/Api.java rename to gateway/src/main/java/com/qihang/api/Gateway.java index 23658ad7..aca8e09a 100644 --- a/api/src/main/java/com/qihang/api/Api.java +++ b/gateway/src/main/java/com/qihang/api/Gateway.java @@ -3,7 +3,6 @@ package com.qihang.api; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.context.annotation.Bean; /** * Hello world! @@ -11,12 +10,12 @@ import org.springframework.context.annotation.Bean; */ @EnableDiscoveryClient @SpringBootApplication -public class Api +public class Gateway { public static void main( String[] args ) { System.out.println( "Hello api! " ); - SpringApplication.run(Api.class, args); + SpringApplication.run(Gateway.class, args); } // @Bean diff --git a/api/src/main/java/com/qihang/api/TokenFilter.java b/gateway/src/main/java/com/qihang/api/TokenFilter.java similarity index 100% rename from api/src/main/java/com/qihang/api/TokenFilter.java rename to gateway/src/main/java/com/qihang/api/TokenFilter.java diff --git a/api/src/main/resources/application.yaml b/gateway/src/main/resources/application.yaml similarity index 68% rename from api/src/main/resources/application.yaml rename to gateway/src/main/resources/application.yaml index 6fabf4eb..3bbc16f0 100644 --- a/api/src/main/resources/application.yaml +++ b/gateway/src/main/resources/application.yaml @@ -2,7 +2,7 @@ server: port: 8080 spring: application: - name: api-service + name: gateway # security: # user: # name: admin @@ -37,42 +37,13 @@ spring: filters: - StripPrefix=2 - - id: tao_api_route - uri: lb://tao-api - predicates: - - Path=/api/tao-api/** - filters: - - StripPrefix=2 - - id: jd_api_route - uri: lb://jd-api - predicates: - - Path=/api/jd-api/** - filters: - - StripPrefix=2 - id: sys_api_route uri: lb://sys-api predicates: - Path=/api/sys-api/** filters: - StripPrefix=2 - - id: dou_api_route - uri: lb://dou-api - predicates: - - Path=/api/dou-api/** - filters: - - StripPrefix=2 - - id: pdd_api_route - uri: lb://pdd-api - predicates: - - Path=/api/pdd-api/** - filters: - - StripPrefix=2 - - id: wei_api_route - uri: lb://wei-api - predicates: - - Path=/api/wei-api/** - filters: - - StripPrefix=2 + # - TokenFilter # default-filters: # - TokenFilter diff --git a/open-api/libs/open-sdk-1.0.jar b/open-api/libs/open-sdk-1.0.jar new file mode 100644 index 00000000..b2fabb7a Binary files /dev/null and b/open-api/libs/open-sdk-1.0.jar differ diff --git a/open-api/pom.xml b/open-api/pom.xml index 08f755bd..ade08062 100644 --- a/open-api/pom.xml +++ b/open-api/pom.xml @@ -134,7 +134,13 @@ system ${project.basedir}/libs/kuaishou-merchant-open-sdk-1.0.10.jar - + + cn.qihangerp.open + open-sdk + 1.0 + system + ${project.basedir}/libs/open-sdk-1.0.jar + org.projectlombok lombok diff --git a/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddOAuthController.java b/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddOAuthController.java index 4a63dfe2..24a17c13 100644 --- a/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddOAuthController.java +++ b/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddOAuthController.java @@ -1,6 +1,9 @@ package cn.qihangerp.open.pdd.controller; +import cn.qihangerp.open.common.ApiResultVo; +import cn.qihangerp.open.pdd.PddTokenApiHelper; import cn.qihangerp.open.pdd.domain.bo.TokenCreateBo; +import cn.qihangerp.open.pdd.model.Token; import cn.qihangerp.open.service.SShopPlatformService; import cn.qihangerp.open.service.SShopService; import com.qihang.common.common.AjaxResult; @@ -46,29 +49,16 @@ public class PddOAuthController { @PostMapping("/getToken") public AjaxResult getToken(@RequestBody TokenCreateBo bo) throws IOException, InterruptedException { log.info("/**********获取拼多多授权token*********/"); -// var shop = shopService.selectShopById(bo.getShopId()); + var shop = shopService.selectShopById(bo.getShopId()); var platform = platformService.getById(EnumShopType.PDD.getIndex()); String appKey = platform.getAppKey(); String appSercet = platform.getAppSecret(); - -// PopAccessTokenClient accessTokenClient = new PopAccessTokenClient(appKey, appSercet); -// -// // 生成AccessToken -// try { -// AccessTokenResponse response = accessTokenClient.generate(bo.getCode()); -// if(response.getErrorResponse()!=null){ -// log.info("/***************获取拼多多授权token错误:"+response.getErrorResponse().getErrorMsg()+"**************/"); -// }else{ -// //保存accessToken -// shopService.updateSessionKey(bo.getShopId(),response.getAccessToken()); -// -// } -// } catch (Exception e) { -// -// e.printStackTrace(); -// -// } - return AjaxResult.success("SUCCESS"); + ApiResultVo token = PddTokenApiHelper.getToken(appKey, appSercet, bo.getCode()); + if(token.getCode()==0){ + shopService.updateSessionKey(shop.getId(),token.getData().getAccess_token()); + return AjaxResult.success("SUCCESS"); + }else + return AjaxResult.error(token.getMsg()); } // /** diff --git a/open-api/src/main/java/cn/qihangerp/open/pdd/domain/bo/TokenCreateBo.java b/open-api/src/main/java/cn/qihangerp/open/pdd/domain/bo/TokenCreateBo.java index 95cdc7a1..aa69df91 100644 --- a/open-api/src/main/java/cn/qihangerp/open/pdd/domain/bo/TokenCreateBo.java +++ b/open-api/src/main/java/cn/qihangerp/open/pdd/domain/bo/TokenCreateBo.java @@ -4,7 +4,7 @@ import lombok.Data; @Data public class TokenCreateBo { - private Integer shopId; + private Long shopId; private Integer platform; private String code; } diff --git a/pom.xml b/pom.xml index 13cc8196..caf6d1ee 100644 --- a/pom.xml +++ b/pom.xml @@ -11,12 +11,9 @@ http://maven.apache.org sys-api - api + gateway core oms-api - open-api2 - - open-api