From 757a0fe31b457635fb83afe43ae525e2c4af9607 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=AF=E8=88=AA=E8=80=81=E9=BD=90?= <280645618@qq.com> Date: Sun, 28 Dec 2025 16:23:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B9=E7=9B=AE=E7=BB=93?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../libs/open-sdk-1.10.9.3.jar | Bin api/{open-api => oms-api}/pom.xml | 4 ++-- .../src/main/java/cn/qihangerp/oms/OmsApi.java} | 6 +++--- .../cn/qihangerp/oms}/config/MybatisPlusConfig.java | 2 +- .../java/cn/qihangerp/oms}/kwai/PullRequest.java | 0 .../oms}/kwai/controller/KwaiOAuthController.java | 0 .../kwai/controller/KwaiOrderApiController.java | 0 .../oms}/kwai/controller/KwaiOrderController.java | 2 +- .../cn/qihangerp/oms}/kwai/domain/KwaiOrder.java | 0 .../qihangerp/oms}/kwai/domain/KwaiOrdersItem.java | 0 .../qihangerp/oms}/kwai/mapper/KwaiOrderMapper.java | 0 .../oms}/kwai/mapper/KwaiOrdersItemMapper.java | 0 .../oms}/kwai/service/KwaiOrderService.java | 0 .../oms}/kwai/service/KwaiOrdersItemService.java | 0 .../kwai/service/impl/KwaiOrderServiceImpl.java | 0 .../service/impl/KwaiOrdersItemServiceImpl.java | 0 .../oms}/service/SysConfigServiceImpl.java | 2 +- .../qihangerp/oms}/service/SysUserServiceImpl.java | 2 +- .../src/main/resources/application.yml | 0 .../src/main/resources/logback.xml | 0 api/pom.xml | 6 +++++- api/sys-api/pom.xml | 1 - 22 files changed, 14 insertions(+), 11 deletions(-) rename api/{open-api => oms-api}/libs/open-sdk-1.10.9.3.jar (100%) rename api/{open-api => oms-api}/pom.xml (99%) rename api/{open-api/src/main/java/cn/qihangerp/open/OpenApi.java => oms-api/src/main/java/cn/qihangerp/oms/OmsApi.java} (83%) rename api/{open-api/src/main/java/cn/qihangerp/open => oms-api/src/main/java/cn/qihangerp/oms}/config/MybatisPlusConfig.java (96%) rename api/{open-api/src/main/java/cn/qihangerp/open => oms-api/src/main/java/cn/qihangerp/oms}/kwai/PullRequest.java (100%) rename api/{open-api/src/main/java/cn/qihangerp/open => oms-api/src/main/java/cn/qihangerp/oms}/kwai/controller/KwaiOAuthController.java (100%) rename api/{open-api/src/main/java/cn/qihangerp/open => oms-api/src/main/java/cn/qihangerp/oms}/kwai/controller/KwaiOrderApiController.java (100%) rename api/{open-api/src/main/java/cn/qihangerp/open => oms-api/src/main/java/cn/qihangerp/oms}/kwai/controller/KwaiOrderController.java (98%) rename api/{open-api/src/main/java/cn/qihangerp/open => oms-api/src/main/java/cn/qihangerp/oms}/kwai/domain/KwaiOrder.java (100%) rename api/{open-api/src/main/java/cn/qihangerp/open => oms-api/src/main/java/cn/qihangerp/oms}/kwai/domain/KwaiOrdersItem.java (100%) rename api/{open-api/src/main/java/cn/qihangerp/open => oms-api/src/main/java/cn/qihangerp/oms}/kwai/mapper/KwaiOrderMapper.java (100%) rename api/{open-api/src/main/java/cn/qihangerp/open => oms-api/src/main/java/cn/qihangerp/oms}/kwai/mapper/KwaiOrdersItemMapper.java (100%) rename api/{open-api/src/main/java/cn/qihangerp/open => oms-api/src/main/java/cn/qihangerp/oms}/kwai/service/KwaiOrderService.java (100%) rename api/{open-api/src/main/java/cn/qihangerp/open => oms-api/src/main/java/cn/qihangerp/oms}/kwai/service/KwaiOrdersItemService.java (100%) rename api/{open-api/src/main/java/cn/qihangerp/open => oms-api/src/main/java/cn/qihangerp/oms}/kwai/service/impl/KwaiOrderServiceImpl.java (100%) rename api/{open-api/src/main/java/cn/qihangerp/open => oms-api/src/main/java/cn/qihangerp/oms}/kwai/service/impl/KwaiOrdersItemServiceImpl.java (100%) rename api/{open-api/src/main/java/cn/qihangerp/open => oms-api/src/main/java/cn/qihangerp/oms}/service/SysConfigServiceImpl.java (97%) rename api/{open-api/src/main/java/cn/qihangerp/open => oms-api/src/main/java/cn/qihangerp/oms}/service/SysUserServiceImpl.java (98%) rename api/{open-api => oms-api}/src/main/resources/application.yml (100%) rename api/{open-api => oms-api}/src/main/resources/logback.xml (100%) diff --git a/api/open-api/libs/open-sdk-1.10.9.3.jar b/api/oms-api/libs/open-sdk-1.10.9.3.jar similarity index 100% rename from api/open-api/libs/open-sdk-1.10.9.3.jar rename to api/oms-api/libs/open-sdk-1.10.9.3.jar diff --git a/api/open-api/pom.xml b/api/oms-api/pom.xml similarity index 99% rename from api/open-api/pom.xml rename to api/oms-api/pom.xml index 649ea07f..8dcac7b2 100644 --- a/api/open-api/pom.xml +++ b/api/oms-api/pom.xml @@ -13,10 +13,10 @@ 2.12.0 - open-api + oms-api jar - open-api + oms-api http://maven.apache.org diff --git a/api/open-api/src/main/java/cn/qihangerp/open/OpenApi.java b/api/oms-api/src/main/java/cn/qihangerp/oms/OmsApi.java similarity index 83% rename from api/open-api/src/main/java/cn/qihangerp/open/OpenApi.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/OmsApi.java index 97b693b5..4710ddd0 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/OpenApi.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/OmsApi.java @@ -1,4 +1,4 @@ -package cn.qihangerp.open; +package cn.qihangerp.oms; //import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; @@ -11,11 +11,11 @@ import org.springframework.context.annotation.ComponentScan; //@MapperScan("com.qihang.oms.mapper") @ComponentScan(basePackages={"cn.qihangerp.open","cn.qihangerp"}) @SpringBootApplication -public class OpenApi { +public class OmsApi { public static void main( String[] args ) { System.out.println( "Hello open-api!" ); - SpringApplication.run(OpenApi.class, args); + SpringApplication.run(OmsApi.class, args); } } diff --git a/api/open-api/src/main/java/cn/qihangerp/open/config/MybatisPlusConfig.java b/api/oms-api/src/main/java/cn/qihangerp/oms/config/MybatisPlusConfig.java similarity index 96% rename from api/open-api/src/main/java/cn/qihangerp/open/config/MybatisPlusConfig.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/config/MybatisPlusConfig.java index 1908756e..31ae2e04 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/config/MybatisPlusConfig.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/config/MybatisPlusConfig.java @@ -1,4 +1,4 @@ -package cn.qihangerp.open.config; +package cn.qihangerp.oms.config; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; diff --git a/api/open-api/src/main/java/cn/qihangerp/open/kwai/PullRequest.java b/api/oms-api/src/main/java/cn/qihangerp/oms/kwai/PullRequest.java similarity index 100% rename from api/open-api/src/main/java/cn/qihangerp/open/kwai/PullRequest.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/kwai/PullRequest.java diff --git a/api/open-api/src/main/java/cn/qihangerp/open/kwai/controller/KwaiOAuthController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/kwai/controller/KwaiOAuthController.java similarity index 100% rename from api/open-api/src/main/java/cn/qihangerp/open/kwai/controller/KwaiOAuthController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/kwai/controller/KwaiOAuthController.java diff --git a/api/open-api/src/main/java/cn/qihangerp/open/kwai/controller/KwaiOrderApiController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/kwai/controller/KwaiOrderApiController.java similarity index 100% rename from api/open-api/src/main/java/cn/qihangerp/open/kwai/controller/KwaiOrderApiController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/kwai/controller/KwaiOrderApiController.java diff --git a/api/open-api/src/main/java/cn/qihangerp/open/kwai/controller/KwaiOrderController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/kwai/controller/KwaiOrderController.java similarity index 98% rename from api/open-api/src/main/java/cn/qihangerp/open/kwai/controller/KwaiOrderController.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/kwai/controller/KwaiOrderController.java index ef15e5af..e40684d0 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/kwai/controller/KwaiOrderController.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/kwai/controller/KwaiOrderController.java @@ -1,4 +1,4 @@ -package cn.qihangerp.open.kwai.controller;//package com.qihang.kwai.controller; +package cn.qihangerp.oms.kwai.controller;//package com.qihang.kwai.controller; // //import com.qihang.kwai.service.KwaiOrderService; //import com.qihang.kwai.service.SysShopService; diff --git a/api/open-api/src/main/java/cn/qihangerp/open/kwai/domain/KwaiOrder.java b/api/oms-api/src/main/java/cn/qihangerp/oms/kwai/domain/KwaiOrder.java similarity index 100% rename from api/open-api/src/main/java/cn/qihangerp/open/kwai/domain/KwaiOrder.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/kwai/domain/KwaiOrder.java diff --git a/api/open-api/src/main/java/cn/qihangerp/open/kwai/domain/KwaiOrdersItem.java b/api/oms-api/src/main/java/cn/qihangerp/oms/kwai/domain/KwaiOrdersItem.java similarity index 100% rename from api/open-api/src/main/java/cn/qihangerp/open/kwai/domain/KwaiOrdersItem.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/kwai/domain/KwaiOrdersItem.java diff --git a/api/open-api/src/main/java/cn/qihangerp/open/kwai/mapper/KwaiOrderMapper.java b/api/oms-api/src/main/java/cn/qihangerp/oms/kwai/mapper/KwaiOrderMapper.java similarity index 100% rename from api/open-api/src/main/java/cn/qihangerp/open/kwai/mapper/KwaiOrderMapper.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/kwai/mapper/KwaiOrderMapper.java diff --git a/api/open-api/src/main/java/cn/qihangerp/open/kwai/mapper/KwaiOrdersItemMapper.java b/api/oms-api/src/main/java/cn/qihangerp/oms/kwai/mapper/KwaiOrdersItemMapper.java similarity index 100% rename from api/open-api/src/main/java/cn/qihangerp/open/kwai/mapper/KwaiOrdersItemMapper.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/kwai/mapper/KwaiOrdersItemMapper.java diff --git a/api/open-api/src/main/java/cn/qihangerp/open/kwai/service/KwaiOrderService.java b/api/oms-api/src/main/java/cn/qihangerp/oms/kwai/service/KwaiOrderService.java similarity index 100% rename from api/open-api/src/main/java/cn/qihangerp/open/kwai/service/KwaiOrderService.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/kwai/service/KwaiOrderService.java diff --git a/api/open-api/src/main/java/cn/qihangerp/open/kwai/service/KwaiOrdersItemService.java b/api/oms-api/src/main/java/cn/qihangerp/oms/kwai/service/KwaiOrdersItemService.java similarity index 100% rename from api/open-api/src/main/java/cn/qihangerp/open/kwai/service/KwaiOrdersItemService.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/kwai/service/KwaiOrdersItemService.java diff --git a/api/open-api/src/main/java/cn/qihangerp/open/kwai/service/impl/KwaiOrderServiceImpl.java b/api/oms-api/src/main/java/cn/qihangerp/oms/kwai/service/impl/KwaiOrderServiceImpl.java similarity index 100% rename from api/open-api/src/main/java/cn/qihangerp/open/kwai/service/impl/KwaiOrderServiceImpl.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/kwai/service/impl/KwaiOrderServiceImpl.java diff --git a/api/open-api/src/main/java/cn/qihangerp/open/kwai/service/impl/KwaiOrdersItemServiceImpl.java b/api/oms-api/src/main/java/cn/qihangerp/oms/kwai/service/impl/KwaiOrdersItemServiceImpl.java similarity index 100% rename from api/open-api/src/main/java/cn/qihangerp/open/kwai/service/impl/KwaiOrdersItemServiceImpl.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/kwai/service/impl/KwaiOrdersItemServiceImpl.java diff --git a/api/open-api/src/main/java/cn/qihangerp/open/service/SysConfigServiceImpl.java b/api/oms-api/src/main/java/cn/qihangerp/oms/service/SysConfigServiceImpl.java similarity index 97% rename from api/open-api/src/main/java/cn/qihangerp/open/service/SysConfigServiceImpl.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/service/SysConfigServiceImpl.java index a4694037..7be654ae 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/service/SysConfigServiceImpl.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/service/SysConfigServiceImpl.java @@ -1,4 +1,4 @@ -package cn.qihangerp.open.service; +package cn.qihangerp.oms.service; import cn.qihangerp.model.entity.SysConfig; import cn.qihangerp.service.SysConfigService; diff --git a/api/open-api/src/main/java/cn/qihangerp/open/service/SysUserServiceImpl.java b/api/oms-api/src/main/java/cn/qihangerp/oms/service/SysUserServiceImpl.java similarity index 98% rename from api/open-api/src/main/java/cn/qihangerp/open/service/SysUserServiceImpl.java rename to api/oms-api/src/main/java/cn/qihangerp/oms/service/SysUserServiceImpl.java index 8d96a10e..649c15a5 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/service/SysUserServiceImpl.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/service/SysUserServiceImpl.java @@ -1,4 +1,4 @@ -package cn.qihangerp.open.service; +package cn.qihangerp.oms.service; import cn.qihangerp.model.entity.SysUser; import cn.qihangerp.service.ISysUserService; diff --git a/api/open-api/src/main/resources/application.yml b/api/oms-api/src/main/resources/application.yml similarity index 100% rename from api/open-api/src/main/resources/application.yml rename to api/oms-api/src/main/resources/application.yml diff --git a/api/open-api/src/main/resources/logback.xml b/api/oms-api/src/main/resources/logback.xml similarity index 100% rename from api/open-api/src/main/resources/logback.xml rename to api/oms-api/src/main/resources/logback.xml diff --git a/api/pom.xml b/api/pom.xml index fb1b0210..8ba34197 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -23,7 +23,7 @@ gateway erp-api sys-api - open-api + oms-api UTF-8 @@ -36,6 +36,10 @@ org.springframework.boot spring-boot-starter + + org.springframework.boot + spring-boot-starter-web + org.apache.commons commons-lang3 diff --git a/api/sys-api/pom.xml b/api/sys-api/pom.xml index ee44b982..30a027d9 100644 --- a/api/sys-api/pom.xml +++ b/api/sys-api/pom.xml @@ -29,7 +29,6 @@ -