diff --git a/README.md b/README.md index 1933f2e6..782e4a63 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,9 @@ #### 1.3、存储及中间件 + MySQL8 -+ Redis：7.x（缓存：在线用户、字典、系统配置） ++ Redis：7.x + + 缓存：在线用户 + + 消息队列 + Nacos：2.2.0（配置中心、注册中心） + Sentinel（分布式流量治理组件） @@ -81,23 +83,30 @@ 采用`gateway`进行api分发，引入Sentinel进行流量治理。 #### 2.3 sys-api -oms项目系统微服务，主要功能包括： +项目系统微服务，主要功能包括： + 用户 -+ 授权 + 菜单 -+ 公共配置 -#### 2.4 tao-api +#### 2.4 oms-api +oms主功能微服务，主要功能包括： + ++ 队列消息处理（订单消息、退款消息） ++ 订单接口 ++ 退款接口 ++ 店铺接口 + + +#### 2.5 tao-api 淘宝开放平台接口api -#### 2.5 jd-api +#### 2.6 jd-api 京东开放平台接口api -#### 2.6 dou-api +#### 2.7 dou-api 抖店开放平台接口api -#### 2.7 pdd-api +#### 2.8 pdd-api 拼多多开放平台接口api ### 3、运行说明 @@ -109,8 +118,8 @@ oms项目系统微服务，主要功能包括： 4. 启动Nacos2.2.0 #### 3.2、启动服务(项目) -1. 启动业务微服务（tao-api、jd-api等平台接口api微服务） -2. 启动sys-api(系统api) +1. 启动业务微服务（tao-api、jd-api、dou-api、pdd-api等平台接口api微服务） +2. 启动sys-api、oms-api微服务 3. 启动微服务网关（api） #### 3.3、运行前端 diff --git a/api/src/main/resources/application.yaml b/api/src/main/resources/application.yaml index ad72327a..85671400 100644 --- a/api/src/main/resources/application.yaml +++ b/api/src/main/resources/application.yaml @@ -23,6 +23,12 @@ spring: locator: enabled: true routes: + - id: oms_api_route + uri: lb://oms-api + predicates: + - Path=/api/oms-api/** + filters: + - StripPrefix=2 - id: tao_api_route uri: lb://tao-api predicates: @@ -41,6 +47,12 @@ spring: - Path=/api/sys-api/** filters: - StripPrefix=2 + - id: dou_api_route + uri: lb://dou-api + predicates: + - Path=/api/dou-api/** + filters: + - StripPrefix=2 # - TokenFilter # default-filters: # - TokenFilter diff --git a/dou-api/libs/doudian-sdk-java-1.1.0-20240217120650.jar b/dou-api/libs/doudian-sdk-java-1.1.0-20240217120650.jar new file mode 100644 index 00000000..ce1f56ba Binary files /dev/null and b/dou-api/libs/doudian-sdk-java-1.1.0-20240217120650.jar differ diff --git a/dou-api/pom.xml b/dou-api/pom.xml index 4f75f7e7..a5b141dc 100644 --- a/dou-api/pom.xml +++ b/dou-api/pom.xml @@ -1,13 +1,22 @@ - + 4.0.0 + + + + + + - com.qihang - qihang-oms - 1.0-SNAPSHOT + org.springframework.boot + spring-boot-starter-parent + 3.0.2 + - com.qihang.jd + com.qihang.dou dou-api jar @@ -15,15 +24,88 @@ http://maven.apache.org + 17 UTF-8 + UTF-8 + 3.0.2 + 2022.0.0.0 + 0.11.5 - junit - junit - 3.8.1 - test + org.springframework.boot + spring-boot-starter + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-tomcat + + + + + org.springframework.boot + spring-boot-starter-undertow + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + com.qihang + security + 1.0-SNAPSHOT + + + mysql + mysql-connector-java + 8.0.33 + + + com.baomidou + mybatis-plus-spring-boot3-starter + 3.5.5 + + + doudian + doudian-sdk-java + 1.1.0-20240217120650 + system + ${project.basedir}/libs/doudian-sdk-java-1.1.0-20240217120650.jar + + + org.projectlombok + lombok + 1.18.30 + provided - + + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + + + com.alibaba.cloud + spring-cloud-alibaba-dependencies + ${spring-cloud-alibaba.version} + pom + import + + + + + \ No newline at end of file diff --git a/dou-api/src/main/java/com/qihang/dou/DouApp.java b/dou-api/src/main/java/com/qihang/dou/DouApp.java index 76009412..802925ad 100644 --- a/dou-api/src/main/java/com/qihang/dou/DouApp.java +++ b/dou-api/src/main/java/com/qihang/dou/DouApp.java @@ -1,18 +1,17 @@ -package com.qihang.oms; +package com.qihang.dou; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -//import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.context.annotation.ComponentScan; //@EnableDiscoveryClient @ComponentScan(basePackages={"com.qihang"}) @SpringBootApplication -public class OmsApp { +public class DouApp { public static void main( String[] args ) { - System.out.println( "Hello oms-api!" ); - SpringApplication.run(OmsApp.class, args); + System.out.println( "Hello dou-api!" ); + SpringApplication.run(DouApp.class, args); } } diff --git a/dou-api/src/main/java/com/qihang/dou/controller/HomeController.java b/dou-api/src/main/java/com/qihang/dou/controller/HomeController.java index 84b574e5..edba4143 100644 --- a/dou-api/src/main/java/com/qihang/dou/controller/HomeController.java +++ b/dou-api/src/main/java/com/qihang/dou/controller/HomeController.java @@ -1,5 +1,14 @@ -package com.qihang.oms.controller; +package com.qihang.dou.controller; +import com.doudian.open.api.order_searchList.OrderSearchListRequest; +import com.doudian.open.api.order_searchList.OrderSearchListResponse; +import com.doudian.open.api.order_searchList.param.OrderSearchListParam; +import com.doudian.open.api.token_create.TokenCreateRequest; +import com.doudian.open.api.token_create.TokenCreateResponse; +import com.doudian.open.api.token_create.param.TokenCreateParam; +import com.doudian.open.core.AccessToken; +import com.doudian.open.core.AccessTokenBuilder; +import com.doudian.open.core.GlobalConfig; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; @@ -9,6 +18,38 @@ import org.springframework.web.bind.annotation.RestController; public class HomeController { @GetMapping("/") public String home(){ - return "{'code':0,'msg':'oms-api请通过api访问'}"; + //设置appKey和appSecret，全局设置一次 + String appkey = "7005157746437834253"; + String appSecret = "8104c8b8-9085-4a80-9248-629759b4f1a3"; +// appkey = "7344938657423296019"; +// appSecret = "4e704882-832a-42e5-845f-6af991ce0ce2"; + GlobalConfig.initAppKey(appkey); + GlobalConfig.initAppSecret(appSecret); + //获取access_token方法 + AccessToken accessToken = AccessTokenBuilder.build(4463798L); //入参为shopId + + + + OrderSearchListRequest request = new OrderSearchListRequest(); + OrderSearchListParam param = request.getParam(); + param.setProduct("3473196049974326153"); + param.setBType(2L); + param.setAfterSaleStatusDesc("refund_success"); + param.setTrackingNo("435435"); + param.setPresellType(1L); + param.setOrderType(1L); + param.setCreateTimeStart(1617355413L); + param.setCreateTimeEnd(1617355413L); + param.setAbnormalOrder(1L); + param.setTradeType(1L); + param.setUpdateTimeStart(1617355413L); + param.setUpdateTimeEnd(1617355413L); + param.setSize(20L); + param.setPage(0L); + param.setOrderBy("create_time"); + param.setOrderAsc(false); + param.setFulfilStatus("no_accept"); + OrderSearchListResponse response = request.execute(accessToken); + return "{'code':0,'msg':'dou-api请通过api访问'}"; } } diff --git a/dou-api/src/main/java/com/qihang/dou/mapper/SysUserMapper.java b/dou-api/src/main/java/com/qihang/dou/mapper/SysUserMapper.java index b2f217df..c583952a 100644 --- a/dou-api/src/main/java/com/qihang/dou/mapper/SysUserMapper.java +++ b/dou-api/src/main/java/com/qihang/dou/mapper/SysUserMapper.java @@ -1,4 +1,4 @@ -package com.qihang.oms.mapper; +package com.qihang.dou.mapper; import com.qihang.security.entity.SysUser; import org.apache.ibatis.annotations.Mapper; diff --git a/dou-api/src/main/java/com/qihang/dou/service/impl/SysUserServiceImpl.java b/dou-api/src/main/java/com/qihang/dou/service/impl/SysUserServiceImpl.java index cd4f787e..240dd152 100644 --- a/dou-api/src/main/java/com/qihang/dou/service/impl/SysUserServiceImpl.java +++ b/dou-api/src/main/java/com/qihang/dou/service/impl/SysUserServiceImpl.java @@ -1,9 +1,9 @@ -package com.qihang.oms.service.impl; +package com.qihang.dou.service.impl; import com.qihang.common.common.ServiceException; import com.qihang.common.constant.UserConstants; import com.qihang.common.utils.StringUtils; -import com.qihang.oms.mapper.SysUserMapper; +import com.qihang.dou.mapper.SysUserMapper; import com.qihang.security.entity.SysUser; import com.qihang.security.service.ISysUserService; import org.slf4j.Logger; diff --git a/dou-api/src/main/resources/application.yml b/dou-api/src/main/resources/application.yml index 93bbea98..642e49b6 100644 --- a/dou-api/src/main/resources/application.yml +++ b/dou-api/src/main/resources/application.yml @@ -8,14 +8,14 @@ spring: import: - nacos:qihang-oms.yaml?refresh=true application: - name: oms-api + name: dou-api server: - port: 8081 + port: 8085 mybatis-plus: mapper-locations: classpath*:mapper/**/*Mapper.xml - type-aliases-package: com.qihang.oms.domain;com.qihang.security.entity; + type-aliases-package: com.qihang.dou.domain;com.qihang.security.entity; configuration: log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 开启sql日志 \ No newline at end of file diff --git a/dou-api/src/main/resources/mapper/SysUserMapper.xml b/dou-api/src/main/resources/mapper/SysUserMapper.xml index 2b6c181f..2545372c 100644 --- a/dou-api/src/main/resources/mapper/SysUserMapper.xml +++ b/dou-api/src/main/resources/mapper/SysUserMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/jd-api/src/main/resources/application.yaml b/jd-api/src/main/resources/application.yaml index 4ff1735c..e07d4095 100644 --- a/jd-api/src/main/resources/application.yaml +++ b/jd-api/src/main/resources/application.yaml @@ -22,7 +22,7 @@ security: - pattern: /api/** # 定义需要授权的URL模式 server: - port: 8083 + port: 8084 mybatis-plus: diff --git a/oms-api/pom.xml b/oms-api/pom.xml index e5f9319d..cfe49587 100644 --- a/oms-api/pom.xml +++ b/oms-api/pom.xml @@ -1,13 +1,19 @@ 4.0.0 + + + + + - com.qihang - qihang-oms - 1.0-SNAPSHOT + org.springframework.boot + spring-boot-starter-parent + 3.0.2 + - com.qihang.jd + com.qihang.oms oms-api jar @@ -15,15 +21,80 @@ http://maven.apache.org + 17 UTF-8 + UTF-8 + 3.0.2 + 2022.0.0.0 + 0.11.5 - junit - junit - 3.8.1 - test + org.springframework.boot + spring-boot-starter + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-tomcat + + + + + org.springframework.boot + spring-boot-starter-undertow + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + com.qihang + security + 1.0-SNAPSHOT + + + mysql + mysql-connector-java + 8.0.33 + + + com.baomidou + mybatis-plus-spring-boot3-starter + 3.5.5 + + + org.projectlombok + lombok + 1.18.30 + provided + + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + + + com.alibaba.cloud + spring-cloud-alibaba-dependencies + ${spring-cloud-alibaba.version} + pom + import + + + diff --git a/oms-api/src/main/java/com/qihang/oms/OmsApp.java b/oms-api/src/main/java/com/qihang/oms/OmsApp.java index 891377a4..76009412 100644 --- a/oms-api/src/main/java/com/qihang/oms/OmsApp.java +++ b/oms-api/src/main/java/com/qihang/oms/OmsApp.java @@ -1,2 +1,18 @@ -package com.qihang.oms;public class OmsApp { +package com.qihang.oms; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +//import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.context.annotation.ComponentScan; + +//@EnableDiscoveryClient +@ComponentScan(basePackages={"com.qihang"}) +@SpringBootApplication +public class OmsApp { + public static void main( String[] args ) + { + System.out.println( "Hello oms-api!" ); + SpringApplication.run(OmsApp.class, args); + } + } diff --git a/oms-api/src/main/java/com/qihang/oms/controller/HomeController.java b/oms-api/src/main/java/com/qihang/oms/controller/HomeController.java index 05dfa966..84b574e5 100644 --- a/oms-api/src/main/java/com/qihang/oms/controller/HomeController.java +++ b/oms-api/src/main/java/com/qihang/oms/controller/HomeController.java @@ -1,2 +1,14 @@ -package com.qihang.oms.controller;public class HomeController { +package com.qihang.oms.controller; + +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +@AllArgsConstructor +@RestController +public class HomeController { + @GetMapping("/") + public String home(){ + return "{'code':0,'msg':'oms-api请通过api访问'}"; + } } diff --git a/oms-api/src/main/java/com/qihang/oms/mapper/SysUserMapper.java b/oms-api/src/main/java/com/qihang/oms/mapper/SysUserMapper.java index cd43d889..b2f217df 100644 --- a/oms-api/src/main/java/com/qihang/oms/mapper/SysUserMapper.java +++ b/oms-api/src/main/java/com/qihang/oms/mapper/SysUserMapper.java @@ -1,4 +1,4 @@ -package com.qihang.jd.mapper; +package com.qihang.oms.mapper; import com.qihang.security.entity.SysUser; import org.apache.ibatis.annotations.Mapper; diff --git a/oms-api/src/main/java/com/qihang/oms/service/impl/SysUserServiceImpl.java b/oms-api/src/main/java/com/qihang/oms/service/impl/SysUserServiceImpl.java index aa2b8a5b..cd4f787e 100644 --- a/oms-api/src/main/java/com/qihang/oms/service/impl/SysUserServiceImpl.java +++ b/oms-api/src/main/java/com/qihang/oms/service/impl/SysUserServiceImpl.java @@ -1,11 +1,11 @@ -package com.qihang.jd.service.impl; +package com.qihang.oms.service.impl; import com.qihang.common.common.ServiceException; import com.qihang.common.constant.UserConstants; import com.qihang.common.utils.StringUtils; +import com.qihang.oms.mapper.SysUserMapper; import com.qihang.security.entity.SysUser; import com.qihang.security.service.ISysUserService; -import com.qihang.jd.mapper.SysUserMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/oms-api/src/main/resources/application.yml b/oms-api/src/main/resources/application.yml index e69de29b..93bbea98 100644 --- a/oms-api/src/main/resources/application.yml +++ b/oms-api/src/main/resources/application.yml @@ -0,0 +1,21 @@ +spring: + cloud: + nacos: + serverAddr: 127.0.0.1:8848 + discovery: + server-addr: 127.0.0.1:8848 + config: + import: + - nacos:qihang-oms.yaml?refresh=true + application: + name: oms-api + +server: + port: 8081 + + +mybatis-plus: + mapper-locations: classpath*:mapper/**/*Mapper.xml + type-aliases-package: com.qihang.oms.domain;com.qihang.security.entity; + configuration: + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # 开启sql日志 \ No newline at end of file diff --git a/pom.xml b/pom.xml index a8e6646f..493a4cae 100644 --- a/pom.xml +++ b/pom.xml @@ -16,6 +16,9 @@ core jd-api + oms-api + pdd-api + dou-api diff --git a/tao-api/src/main/resources/application.yaml b/tao-api/src/main/resources/application.yaml index 79020f7c..7679a9bf 100644 --- a/tao-api/src/main/resources/application.yaml +++ b/tao-api/src/main/resources/application.yaml @@ -22,7 +22,7 @@ security: - pattern: /api/** # 定义需要授权的URL模式 server: - port: 8081 + port: 8083 mybatis-plus: