diff --git a/README.md b/README.md index a7c39370..5160e0bf 100644 --- a/README.md +++ b/README.md @@ -194,8 +194,8 @@ graph TD + 用户 + 菜单 -+ `oms-api` -oms主功能微服务,主要功能包括: ++ `erp-api` +erp主功能微服务,主要功能包括: + 队列消息处理(订单消息、退款消息) + 订单接口 diff --git a/api/oms-api/.gitignore b/api/erp-api/.gitignore similarity index 100% rename from api/oms-api/.gitignore rename to api/erp-api/.gitignore diff --git a/api/oms-api/pom.xml b/api/erp-api/pom.xml similarity index 80% rename from api/oms-api/pom.xml rename to api/erp-api/pom.xml index bdf591c7..59fd5c17 100644 --- a/api/oms-api/pom.xml +++ b/api/erp-api/pom.xml @@ -1,18 +1,22 @@ 4.0.0 + + + + + + - org.springframework.boot - spring-boot-starter-parent - 3.0.2 - + cn.qihangerp.api + api + 2.12.0 - com.qihang.oms - oms-api + erp-api jar - oms-api + erp-api http://maven.apache.org @@ -25,24 +29,24 @@ - - 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 - + + + + + + + + + + + + + + + + + + org.springframework.cloud spring-cloud-starter diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/OmsApi.java b/api/erp-api/src/main/java/cn/qihangerp/erp/ErpApi.java similarity index 78% rename from api/oms-api/src/main/java/cn/qihangerp/oms/OmsApi.java rename to api/erp-api/src/main/java/cn/qihangerp/erp/ErpApi.java index 1829e736..cd39f9c3 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/OmsApi.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/ErpApi.java @@ -1,6 +1,5 @@ -package cn.qihangerp.oms; +package cn.qihangerp.erp; -import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; //import org.springframework.cloud.client.discovery.EnableDiscoveryClient; @@ -13,15 +12,15 @@ import org.springframework.web.client.RestTemplate; //@EnableDiscoveryClient //@MapperScan("cn.qihangerp.oms.mapper") -@EnableFeignClients(basePackages = "cn.qihangerp.oms") +@EnableFeignClients(basePackages = "cn.qihangerp.erp") @EnableDiscoveryClient @ComponentScan(basePackages={"cn.qihangerp"}) @SpringBootApplication -public class OmsApi { +public class ErpApi { public static void main( String[] args ) { - System.out.println( "Hello oms-api!" ); - SpringApplication.run(OmsApi.class, args); + System.out.println( "Hello erp-api!" ); + SpringApplication.run(ErpApi.class, args); } @Bean @LoadBalanced diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/config/MybatisPlusConfig.java b/api/erp-api/src/main/java/cn/qihangerp/erp/config/MybatisPlusConfig.java similarity index 96% rename from api/oms-api/src/main/java/cn/qihangerp/oms/config/MybatisPlusConfig.java rename to api/erp-api/src/main/java/cn/qihangerp/erp/config/MybatisPlusConfig.java index 3f765fc0..027fd9c7 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/config/MybatisPlusConfig.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/config/MybatisPlusConfig.java @@ -1,4 +1,4 @@ -package cn.qihangerp.oms.config; +package cn.qihangerp.erp.config; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/HomeController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/HomeController.java similarity index 94% rename from api/oms-api/src/main/java/cn/qihangerp/oms/controller/HomeController.java rename to api/erp-api/src/main/java/cn/qihangerp/erp/controller/HomeController.java index 521ef4ca..ed3183bd 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/HomeController.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/HomeController.java @@ -1,7 +1,6 @@ -package cn.qihangerp.oms.controller; +package cn.qihangerp.erp.controller; -import jakarta.annotation.Resource; import lombok.AllArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/LogisticsController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/LogisticsController.java similarity index 97% rename from api/oms-api/src/main/java/cn/qihangerp/oms/controller/LogisticsController.java rename to api/erp-api/src/main/java/cn/qihangerp/erp/controller/LogisticsController.java index 6d0acce6..5d244bb1 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/LogisticsController.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/LogisticsController.java @@ -1,11 +1,10 @@ -package cn.qihangerp.oms.controller; +package cn.qihangerp.erp.controller; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.TableDataInfo; import cn.qihangerp.model.entity.OLogisticsCompany; -import cn.qihangerp.model.entity.OShop; import cn.qihangerp.module.service.OLogisticsCompanyService; import cn.qihangerp.module.service.OShopPlatformService; import cn.qihangerp.module.service.OShopService; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/OOrderController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/OOrderController.java similarity index 100% rename from api/oms-api/src/main/java/cn/qihangerp/oms/controller/OOrderController.java rename to api/erp-api/src/main/java/cn/qihangerp/erp/controller/OOrderController.java diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/PurchaseOrderController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/PurchaseOrderController.java similarity index 98% rename from api/oms-api/src/main/java/cn/qihangerp/oms/controller/PurchaseOrderController.java rename to api/erp-api/src/main/java/cn/qihangerp/erp/controller/PurchaseOrderController.java index cd69eb6f..ee720568 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/PurchaseOrderController.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/PurchaseOrderController.java @@ -1,4 +1,4 @@ -package cn.qihangerp.oms.controller; +package cn.qihangerp.erp.controller; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.PageQuery; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ReportController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/ReportController.java similarity index 98% rename from api/oms-api/src/main/java/cn/qihangerp/oms/controller/ReportController.java rename to api/erp-api/src/main/java/cn/qihangerp/erp/controller/ReportController.java index eba35be2..d64fc010 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ReportController.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/ReportController.java @@ -1,4 +1,4 @@ -package cn.qihangerp.oms.controller; +package cn.qihangerp.erp.controller; import cn.qihangerp.common.AjaxResult; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/ShopController.java similarity index 98% rename from api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopController.java rename to api/erp-api/src/main/java/cn/qihangerp/erp/controller/ShopController.java index c770aa09..96cf4391 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopController.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/ShopController.java @@ -1,11 +1,11 @@ -package cn.qihangerp.oms.controller; +package cn.qihangerp.erp.controller; import cn.qihangerp.model.entity.OShop; import cn.qihangerp.model.entity.OShopPlatform; import cn.qihangerp.module.service.OLogisticsCompanyService; import cn.qihangerp.module.service.OShopPlatformService; import cn.qihangerp.module.service.OShopService; -import cn.qihangerp.oms.request.ShopBo; +import cn.qihangerp.erp.request.ShopBo; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.TableDataInfo; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopPullLogsController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/ShopPullLogsController.java similarity index 95% rename from api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopPullLogsController.java rename to api/erp-api/src/main/java/cn/qihangerp/erp/controller/ShopPullLogsController.java index 5b48bd95..7244e88a 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopPullLogsController.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/ShopPullLogsController.java @@ -1,4 +1,4 @@ -package cn.qihangerp.oms.controller; +package cn.qihangerp.erp.controller; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.TableDataInfo; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopWayBillController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/ShopWayBillController.java similarity index 97% rename from api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopWayBillController.java rename to api/erp-api/src/main/java/cn/qihangerp/erp/controller/ShopWayBillController.java index 4ee3e7ee..f695fd01 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/ShopWayBillController.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/ShopWayBillController.java @@ -1,4 +1,4 @@ -package cn.qihangerp.oms.controller; +package cn.qihangerp.erp.controller; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.security.common.BaseController; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/StockInController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/StockInController.java similarity index 97% rename from api/oms-api/src/main/java/cn/qihangerp/oms/controller/StockInController.java rename to api/erp-api/src/main/java/cn/qihangerp/erp/controller/StockInController.java index 16f55011..cdf603c5 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/StockInController.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/StockInController.java @@ -1,4 +1,4 @@ -package cn.qihangerp.oms.controller; +package cn.qihangerp.erp.controller; import cn.qihangerp.common.AjaxResult; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/StockOutController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/StockOutController.java similarity index 98% rename from api/oms-api/src/main/java/cn/qihangerp/oms/controller/StockOutController.java rename to api/erp-api/src/main/java/cn/qihangerp/erp/controller/StockOutController.java index b8b34eac..42e35ebc 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/StockOutController.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/StockOutController.java @@ -1,4 +1,4 @@ -package cn.qihangerp.oms.controller; +package cn.qihangerp.erp.controller; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.PageQuery; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/WarehouseController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/WarehouseController.java similarity index 99% rename from api/oms-api/src/main/java/cn/qihangerp/oms/controller/WarehouseController.java rename to api/erp-api/src/main/java/cn/qihangerp/erp/controller/WarehouseController.java index a8cfe78c..3bb10072 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/controller/WarehouseController.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/WarehouseController.java @@ -1,4 +1,4 @@ -package cn.qihangerp.oms.controller; +package cn.qihangerp.erp.controller; import cn.qihangerp.common.AjaxResult; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/feign/EchoService.java b/api/erp-api/src/main/java/cn/qihangerp/erp/feign/EchoService.java similarity index 100% rename from api/oms-api/src/main/java/cn/qihangerp/oms/feign/EchoService.java rename to api/erp-api/src/main/java/cn/qihangerp/erp/feign/EchoService.java diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/feign/OpenApiService.java b/api/erp-api/src/main/java/cn/qihangerp/erp/feign/OpenApiService.java similarity index 94% rename from api/oms-api/src/main/java/cn/qihangerp/oms/feign/OpenApiService.java rename to api/erp-api/src/main/java/cn/qihangerp/erp/feign/OpenApiService.java index 85b30c5b..5e0dbcb0 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/feign/OpenApiService.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/feign/OpenApiService.java @@ -1,10 +1,8 @@ -package cn.qihangerp.oms.feign; +package cn.qihangerp.erp.feign; import com.alibaba.fastjson2.JSONObject; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestParam; @FeignClient(name = "open-api") diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/mq/ApiMessageReceiver.java b/api/erp-api/src/main/java/cn/qihangerp/erp/mq/ApiMessageReceiver.java similarity index 96% rename from api/oms-api/src/main/java/cn/qihangerp/oms/mq/ApiMessageReceiver.java rename to api/erp-api/src/main/java/cn/qihangerp/erp/mq/ApiMessageReceiver.java index aa56c0df..4b6f5556 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/mq/ApiMessageReceiver.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/mq/ApiMessageReceiver.java @@ -1,10 +1,8 @@ -package cn.qihangerp.oms.mq; +package cn.qihangerp.erp.mq; import cn.qihangerp.module.service.ApiMessageService; import com.alibaba.fastjson2.JSON; -import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.common.mq.MqMessage; -import cn.qihangerp.common.mq.MqType; import cn.qihangerp.common.utils.SpringUtils; import lombok.AllArgsConstructor; import org.slf4j.Logger; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/mq/ApiMessageService.java b/api/erp-api/src/main/java/cn/qihangerp/erp/mq/ApiMessageService.java similarity index 95% rename from api/oms-api/src/main/java/cn/qihangerp/oms/mq/ApiMessageService.java rename to api/erp-api/src/main/java/cn/qihangerp/erp/mq/ApiMessageService.java index 716345a8..f330ddee 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/mq/ApiMessageService.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/mq/ApiMessageService.java @@ -1,4 +1,4 @@ -package cn.qihangerp.oms.mq; +package cn.qihangerp.erp.mq; import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.mq.MqMessage; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/mq/ApiMessageServiceImpl.java b/api/erp-api/src/main/java/cn/qihangerp/erp/mq/ApiMessageServiceImpl.java similarity index 99% rename from api/oms-api/src/main/java/cn/qihangerp/oms/mq/ApiMessageServiceImpl.java rename to api/erp-api/src/main/java/cn/qihangerp/erp/mq/ApiMessageServiceImpl.java index 3bc17654..eaef4711 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/mq/ApiMessageServiceImpl.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/mq/ApiMessageServiceImpl.java @@ -1,4 +1,4 @@ -package cn.qihangerp.oms.mq; +package cn.qihangerp.erp.mq; import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.enums.EnumShopType; @@ -9,7 +9,7 @@ import cn.qihangerp.module.order.service.OOrderService; import cn.qihangerp.module.order.service.ORefundService; import cn.qihangerp.module.order.service.ErpShipmentService; import cn.qihangerp.module.service.ApiMessageService; -import cn.qihangerp.oms.feign.OpenApiService; +import cn.qihangerp.erp.feign.OpenApiService; import com.alibaba.fastjson2.JSONObject; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/mq/KafkaMQConsumer.java b/api/erp-api/src/main/java/cn/qihangerp/erp/mq/KafkaMQConsumer.java similarity index 100% rename from api/oms-api/src/main/java/cn/qihangerp/oms/mq/KafkaMQConsumer.java rename to api/erp-api/src/main/java/cn/qihangerp/erp/mq/KafkaMQConsumer.java diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/mq/MqMessage.java b/api/erp-api/src/main/java/cn/qihangerp/erp/mq/MqMessage.java similarity index 90% rename from api/oms-api/src/main/java/cn/qihangerp/oms/mq/MqMessage.java rename to api/erp-api/src/main/java/cn/qihangerp/erp/mq/MqMessage.java index 2c00e0a6..8e1c0eb0 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/mq/MqMessage.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/mq/MqMessage.java @@ -1,4 +1,4 @@ -package cn.qihangerp.oms.mq;//package com.qihang.sys.api.mq; +package cn.qihangerp.erp.mq;//package com.qihang.sys.api.mq; // //import lombok.Data; // diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/mq/MqUtils.java b/api/erp-api/src/main/java/cn/qihangerp/erp/mq/MqUtils.java similarity index 89% rename from api/oms-api/src/main/java/cn/qihangerp/oms/mq/MqUtils.java rename to api/erp-api/src/main/java/cn/qihangerp/erp/mq/MqUtils.java index da97ef71..3762aeae 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/mq/MqUtils.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/mq/MqUtils.java @@ -1,4 +1,4 @@ -package cn.qihangerp.oms.mq;//package com.qihang.sys.api.mq; +package cn.qihangerp.erp.mq;//package com.qihang.sys.api.mq; // //import lombok.AllArgsConstructor; //import org.springframework.data.redis.core.RedisTemplate; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/mq/SubscriberConfig.java b/api/erp-api/src/main/java/cn/qihangerp/erp/mq/SubscriberConfig.java similarity index 98% rename from api/oms-api/src/main/java/cn/qihangerp/oms/mq/SubscriberConfig.java rename to api/erp-api/src/main/java/cn/qihangerp/erp/mq/SubscriberConfig.java index bba810be..f61b1611 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/mq/SubscriberConfig.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/mq/SubscriberConfig.java @@ -1,4 +1,4 @@ -package cn.qihangerp.oms.mq; +package cn.qihangerp.erp.mq; import lombok.AllArgsConstructor; import org.springframework.boot.autoconfigure.AutoConfigureAfter; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/request/ShopBo.java b/api/erp-api/src/main/java/cn/qihangerp/erp/request/ShopBo.java similarity index 92% rename from api/oms-api/src/main/java/cn/qihangerp/oms/request/ShopBo.java rename to api/erp-api/src/main/java/cn/qihangerp/erp/request/ShopBo.java index 4bb01823..2cb8f1e7 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/request/ShopBo.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/request/ShopBo.java @@ -1,4 +1,4 @@ -package cn.qihangerp.oms.request; +package cn.qihangerp.erp.request; import lombok.Data; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/serviceImpl/SysConfigServiceImpl.java b/api/erp-api/src/main/java/cn/qihangerp/erp/serviceImpl/SysConfigServiceImpl.java similarity index 97% rename from api/oms-api/src/main/java/cn/qihangerp/oms/serviceImpl/SysConfigServiceImpl.java rename to api/erp-api/src/main/java/cn/qihangerp/erp/serviceImpl/SysConfigServiceImpl.java index e9f42bc1..3b6170c1 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/serviceImpl/SysConfigServiceImpl.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/serviceImpl/SysConfigServiceImpl.java @@ -1,4 +1,4 @@ -package cn.qihangerp.oms.serviceImpl; +package cn.qihangerp.erp.serviceImpl; import cn.qihangerp.model.entity.SysConfig; import cn.qihangerp.service.SysConfigService; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/serviceImpl/SysUserServiceImpl.java b/api/erp-api/src/main/java/cn/qihangerp/erp/serviceImpl/SysUserServiceImpl.java similarity index 98% rename from api/oms-api/src/main/java/cn/qihangerp/oms/serviceImpl/SysUserServiceImpl.java rename to api/erp-api/src/main/java/cn/qihangerp/erp/serviceImpl/SysUserServiceImpl.java index 4b35187e..a82d2ee5 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/serviceImpl/SysUserServiceImpl.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/serviceImpl/SysUserServiceImpl.java @@ -1,4 +1,4 @@ -package cn.qihangerp.oms.serviceImpl; +package cn.qihangerp.erp.serviceImpl; import cn.qihangerp.model.entity.SysUser; import cn.qihangerp.service.ISysUserService; diff --git a/api/oms-api/src/main/resources/application.yml b/api/erp-api/src/main/resources/application.yml similarity index 100% rename from api/oms-api/src/main/resources/application.yml rename to api/erp-api/src/main/resources/application.yml diff --git a/api/gateway/pom.xml b/api/gateway/pom.xml index 9eee4e3f..132671ad 100644 --- a/api/gateway/pom.xml +++ b/api/gateway/pom.xml @@ -1,16 +1,20 @@ 4.0.0 + + + + + + - org.springframework.boot - spring-boot-starter-parent - 3.0.2 - + cn.qihangerp.api + api + 2.12.0 - cn.qihangerp + gateway jar - 2.0.0 gateway http://maven.apache.org diff --git a/api/open-api/pom.xml b/api/open-api/pom.xml index 35811aa1..649ea07f 100644 --- a/api/open-api/pom.xml +++ b/api/open-api/pom.xml @@ -1,14 +1,18 @@ 4.0.0 + + + + + + - org.springframework.boot - spring-boot-starter-parent - 3.0.2 - + cn.qihangerp.api + api + 2.12.0 - cn.qihangerp.open open-api jar @@ -25,24 +29,24 @@ - - 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 - + + + + + + + + + + + + + + + + + + org.springframework.boot spring-boot-starter-webflux diff --git a/api/pom.xml b/api/pom.xml index a1869b9b..fb1b0210 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -1,22 +1,27 @@ 4.0.0 + + + + + - cn.qihangerp - qihangerp-cloud - 2.0.6 + org.springframework.boot + spring-boot-starter-parent + 3.0.2 + - cn.qihangerp.api api - 1.0 + 2.12.0 pom api http://maven.apache.org gateway - oms-api + erp-api sys-api open-api @@ -27,6 +32,10 @@ + + org.springframework.boot + spring-boot-starter + org.apache.commons commons-lang3 diff --git a/api/sys-api/pom.xml b/api/sys-api/pom.xml index 1fb21b17..ee44b982 100644 --- a/api/sys-api/pom.xml +++ b/api/sys-api/pom.xml @@ -1,15 +1,19 @@ 4.0.0 + + + + + + - org.springframework.boot - spring-boot-starter-parent - 3.0.2 - + cn.qihangerp.api + api + 2.12.0 cn.qihangerp.api sys-api - 1.0 jar sys-api @@ -26,24 +30,24 @@ - - 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 - + + + + + + + + + + + + + + + + + + org.springframework.boot spring-boot-starter-security diff --git a/microservices/wei-api/libs/open-sdk-1.10.4.jar b/microservices/wei-api/libs/open-sdk-1.10.4.jar deleted file mode 100644 index 336e1078..00000000 Binary files a/microservices/wei-api/libs/open-sdk-1.10.4.jar and /dev/null differ diff --git a/microservices/wei-api/libs/open-sdk-1.10.9.3.jar b/microservices/wei-api/libs/open-sdk-1.10.9.3.jar new file mode 100644 index 00000000..2aab21ca Binary files /dev/null and b/microservices/wei-api/libs/open-sdk-1.10.9.3.jar differ diff --git a/microservices/wei-api/pom.xml b/microservices/wei-api/pom.xml index c93c1401..51b46df8 100644 --- a/microservices/wei-api/pom.xml +++ b/microservices/wei-api/pom.xml @@ -23,7 +23,7 @@ open-sdk 1.0.2 system - ${project.basedir}/libs/open-sdk-1.10.4.jar + ${project.basedir}/libs/open-sdk-1.10.9.3.jar cn.qihangerp.service diff --git a/pom.xml b/pom.xml index 94cd8125..6e565133 100644 --- a/pom.xml +++ b/pom.xml @@ -14,9 +14,6 @@ core serviceImpl microservices - core/model - core/interfaces - diff --git a/serviceImpl/pom.xml b/serviceImpl/pom.xml index 52228894..4502789e 100644 --- a/serviceImpl/pom.xml +++ b/serviceImpl/pom.xml @@ -12,7 +12,7 @@ 2.0.0 pom - module + serviceImpl http://maven.apache.org sys