From db33dbaa8b9f20abd63269d1118e2078142900eb Mon Sep 17 00:00:00 2001 From: yaoyn Date: Mon, 28 Apr 2025 17:25:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0demo-api=E7=A4=BA=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- demo/demo-api/pom.xml | 105 ++++++++++++++++++ .../client/IDemoApplianceClient.java | 22 ++++ .../prdManage/dto/AddDemoApplianceDto.java | 0 .../prdManage/dto/DemoAppliancePageDto.java | 0 .../prdManage/dto/UpdateDemoApplianceDto.java | 0 .../prdManage/vo/DemoAppliancePageVo.java | 0 .../module/prdManage/vo/DemoApplianceVo.java | 0 .../dto/AddDemoCustomerDto.java | 0 .../dto/DemoCustomerPageDto.java | 0 .../dto/UpdateDemoCustomerDto.java | 0 .../relationManage/vo/DemoCustomerPageVo.java | 0 .../relationManage/vo/DemoCustomerVo.java | 0 {demo-service => demo/demo-service}/pom.xml | 8 +- .../java/com/xjrsoft/ITCDemoApplication.java | 0 .../common/schedule/DemoSysncTask.java | 0 .../common/util/SpringContextUtil.java | 0 .../controller/DemoApplianceController.java | 0 .../prdManage/entity/DemoAppliance.java | 0 .../prdManage/mapper/DemoApplianceMapper.java | 0 .../service/IDemoApplianceService.java | 0 .../impl/DemoApplianceServiceImpl.java | 0 .../DemoCustomerManageController.java | 0 .../relationManage/entity/DemoCustomer.java | 0 .../mapper/DemoCustomerMapper.java | 0 .../service/IDemoCustomerManageService.java | 0 .../impl/DemoCustomerManageServiceImpl.java | 0 .../src/main/resources/application.yml | 0 .../src/main/resources/banner.txt | 0 .../src/main/resources/bootstrap.yml | 0 demo/pom.xml | 29 +++++ pom.xml | 2 +- 31 files changed, 164 insertions(+), 2 deletions(-) create mode 100644 demo/demo-api/pom.xml create mode 100644 demo/demo-api/src/main/java/com/xjrsoft/module/prdManage/client/IDemoApplianceClient.java rename {demo-service => demo/demo-api}/src/main/java/com/xjrsoft/module/prdManage/dto/AddDemoApplianceDto.java (100%) rename {demo-service => demo/demo-api}/src/main/java/com/xjrsoft/module/prdManage/dto/DemoAppliancePageDto.java (100%) rename {demo-service => demo/demo-api}/src/main/java/com/xjrsoft/module/prdManage/dto/UpdateDemoApplianceDto.java (100%) rename {demo-service => demo/demo-api}/src/main/java/com/xjrsoft/module/prdManage/vo/DemoAppliancePageVo.java (100%) rename {demo-service => demo/demo-api}/src/main/java/com/xjrsoft/module/prdManage/vo/DemoApplianceVo.java (100%) rename {demo-service => demo/demo-api}/src/main/java/com/xjrsoft/module/relationManage/dto/AddDemoCustomerDto.java (100%) rename {demo-service => demo/demo-api}/src/main/java/com/xjrsoft/module/relationManage/dto/DemoCustomerPageDto.java (100%) rename {demo-service => demo/demo-api}/src/main/java/com/xjrsoft/module/relationManage/dto/UpdateDemoCustomerDto.java (100%) rename {demo-service => demo/demo-api}/src/main/java/com/xjrsoft/module/relationManage/vo/DemoCustomerPageVo.java (100%) rename {demo-service => demo/demo-api}/src/main/java/com/xjrsoft/module/relationManage/vo/DemoCustomerVo.java (100%) rename {demo-service => demo/demo-service}/pom.xml (97%) rename {demo-service => demo/demo-service}/src/main/java/com/xjrsoft/ITCDemoApplication.java (100%) rename {demo-service => demo/demo-service}/src/main/java/com/xjrsoft/common/schedule/DemoSysncTask.java (100%) rename {demo-service => demo/demo-service}/src/main/java/com/xjrsoft/common/util/SpringContextUtil.java (100%) rename {demo-service => demo/demo-service}/src/main/java/com/xjrsoft/module/prdManage/controller/DemoApplianceController.java (100%) rename {demo-service => demo/demo-service}/src/main/java/com/xjrsoft/module/prdManage/entity/DemoAppliance.java (100%) rename {demo-service => demo/demo-service}/src/main/java/com/xjrsoft/module/prdManage/mapper/DemoApplianceMapper.java (100%) rename {demo-service => demo/demo-service}/src/main/java/com/xjrsoft/module/prdManage/service/IDemoApplianceService.java (100%) rename {demo-service => demo/demo-service}/src/main/java/com/xjrsoft/module/prdManage/service/impl/DemoApplianceServiceImpl.java (100%) rename {demo-service => demo/demo-service}/src/main/java/com/xjrsoft/module/relationManage/controller/DemoCustomerManageController.java (100%) rename {demo-service => demo/demo-service}/src/main/java/com/xjrsoft/module/relationManage/entity/DemoCustomer.java (100%) rename {demo-service => demo/demo-service}/src/main/java/com/xjrsoft/module/relationManage/mapper/DemoCustomerMapper.java (100%) rename {demo-service => demo/demo-service}/src/main/java/com/xjrsoft/module/relationManage/service/IDemoCustomerManageService.java (100%) rename {demo-service => demo/demo-service}/src/main/java/com/xjrsoft/module/relationManage/service/impl/DemoCustomerManageServiceImpl.java (100%) rename {demo-service => demo/demo-service}/src/main/resources/application.yml (100%) rename {demo-service => demo/demo-service}/src/main/resources/banner.txt (100%) rename {demo-service => demo/demo-service}/src/main/resources/bootstrap.yml (100%) create mode 100644 demo/pom.xml diff --git a/demo/demo-api/pom.xml b/demo/demo-api/pom.xml new file mode 100644 index 0000000..660e1d6 --- /dev/null +++ b/demo/demo-api/pom.xml @@ -0,0 +1,105 @@ + + + 4.0.0 + + + com.geg + demo + ${revision} + + + demo-api + demo-api + demo-api + + + ${java.version} + ${java.version} + + + + + com.geg + itc-ms-common-api + ${framework.version} + + + + org.springframework.cloud + spring-cloud-starter-openfeign + + + + com.alibaba + easyexcel + + + + org.ssssssss + magic-api-spring-boot-starter + + + + com.alibaba + fastjson + + + + me.zhyd.oauth + JustAuth + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + org.apache.maven.plugins + maven-compiler-plugin + + ${java.version} + ${java.version} + + + + + + src/main/java + + **/*.xml + + + + src/main/java + + **/*.yml + **/*.properties + **/*.xml + + false + + + src/main/resources + + **/*.yml + **/*.properties + **/*.xml + **/*.vm + **/*.ftl + **/*.jpg + **/*.png + **/*.xls + **/*.xlsx + + false + + + + \ No newline at end of file diff --git a/demo/demo-api/src/main/java/com/xjrsoft/module/prdManage/client/IDemoApplianceClient.java b/demo/demo-api/src/main/java/com/xjrsoft/module/prdManage/client/IDemoApplianceClient.java new file mode 100644 index 0000000..e6df9c1 --- /dev/null +++ b/demo/demo-api/src/main/java/com/xjrsoft/module/prdManage/client/IDemoApplianceClient.java @@ -0,0 +1,22 @@ +package com.xjrsoft.module.prdManage.client; + +import com.xjrsoft.common.constant.GlobalConstant; +import com.xjrsoft.module.prdManage.dto.DemoAppliancePageDto; +import com.xjrsoft.module.prdManage.vo.DemoApplianceVo; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +import java.util.List; + +/** + * @author: yjw + * @since: 2025/3/4 + */ +@FeignClient(value = "demo-service", + path = GlobalConstant.CLIENT_API_PRE + "prdManage/demoAppliance") +public interface IDemoApplianceClient { + + @PostMapping("/getListByQuery") + List getListByQuery(@RequestBody DemoAppliancePageDto dto); +} diff --git a/demo-service/src/main/java/com/xjrsoft/module/prdManage/dto/AddDemoApplianceDto.java b/demo/demo-api/src/main/java/com/xjrsoft/module/prdManage/dto/AddDemoApplianceDto.java similarity index 100% rename from demo-service/src/main/java/com/xjrsoft/module/prdManage/dto/AddDemoApplianceDto.java rename to demo/demo-api/src/main/java/com/xjrsoft/module/prdManage/dto/AddDemoApplianceDto.java diff --git a/demo-service/src/main/java/com/xjrsoft/module/prdManage/dto/DemoAppliancePageDto.java b/demo/demo-api/src/main/java/com/xjrsoft/module/prdManage/dto/DemoAppliancePageDto.java similarity index 100% rename from demo-service/src/main/java/com/xjrsoft/module/prdManage/dto/DemoAppliancePageDto.java rename to demo/demo-api/src/main/java/com/xjrsoft/module/prdManage/dto/DemoAppliancePageDto.java diff --git a/demo-service/src/main/java/com/xjrsoft/module/prdManage/dto/UpdateDemoApplianceDto.java b/demo/demo-api/src/main/java/com/xjrsoft/module/prdManage/dto/UpdateDemoApplianceDto.java similarity index 100% rename from demo-service/src/main/java/com/xjrsoft/module/prdManage/dto/UpdateDemoApplianceDto.java rename to demo/demo-api/src/main/java/com/xjrsoft/module/prdManage/dto/UpdateDemoApplianceDto.java diff --git a/demo-service/src/main/java/com/xjrsoft/module/prdManage/vo/DemoAppliancePageVo.java b/demo/demo-api/src/main/java/com/xjrsoft/module/prdManage/vo/DemoAppliancePageVo.java similarity index 100% rename from demo-service/src/main/java/com/xjrsoft/module/prdManage/vo/DemoAppliancePageVo.java rename to demo/demo-api/src/main/java/com/xjrsoft/module/prdManage/vo/DemoAppliancePageVo.java diff --git a/demo-service/src/main/java/com/xjrsoft/module/prdManage/vo/DemoApplianceVo.java b/demo/demo-api/src/main/java/com/xjrsoft/module/prdManage/vo/DemoApplianceVo.java similarity index 100% rename from demo-service/src/main/java/com/xjrsoft/module/prdManage/vo/DemoApplianceVo.java rename to demo/demo-api/src/main/java/com/xjrsoft/module/prdManage/vo/DemoApplianceVo.java diff --git a/demo-service/src/main/java/com/xjrsoft/module/relationManage/dto/AddDemoCustomerDto.java b/demo/demo-api/src/main/java/com/xjrsoft/module/relationManage/dto/AddDemoCustomerDto.java similarity index 100% rename from demo-service/src/main/java/com/xjrsoft/module/relationManage/dto/AddDemoCustomerDto.java rename to demo/demo-api/src/main/java/com/xjrsoft/module/relationManage/dto/AddDemoCustomerDto.java diff --git a/demo-service/src/main/java/com/xjrsoft/module/relationManage/dto/DemoCustomerPageDto.java b/demo/demo-api/src/main/java/com/xjrsoft/module/relationManage/dto/DemoCustomerPageDto.java similarity index 100% rename from demo-service/src/main/java/com/xjrsoft/module/relationManage/dto/DemoCustomerPageDto.java rename to demo/demo-api/src/main/java/com/xjrsoft/module/relationManage/dto/DemoCustomerPageDto.java diff --git a/demo-service/src/main/java/com/xjrsoft/module/relationManage/dto/UpdateDemoCustomerDto.java b/demo/demo-api/src/main/java/com/xjrsoft/module/relationManage/dto/UpdateDemoCustomerDto.java similarity index 100% rename from demo-service/src/main/java/com/xjrsoft/module/relationManage/dto/UpdateDemoCustomerDto.java rename to demo/demo-api/src/main/java/com/xjrsoft/module/relationManage/dto/UpdateDemoCustomerDto.java diff --git a/demo-service/src/main/java/com/xjrsoft/module/relationManage/vo/DemoCustomerPageVo.java b/demo/demo-api/src/main/java/com/xjrsoft/module/relationManage/vo/DemoCustomerPageVo.java similarity index 100% rename from demo-service/src/main/java/com/xjrsoft/module/relationManage/vo/DemoCustomerPageVo.java rename to demo/demo-api/src/main/java/com/xjrsoft/module/relationManage/vo/DemoCustomerPageVo.java diff --git a/demo-service/src/main/java/com/xjrsoft/module/relationManage/vo/DemoCustomerVo.java b/demo/demo-api/src/main/java/com/xjrsoft/module/relationManage/vo/DemoCustomerVo.java similarity index 100% rename from demo-service/src/main/java/com/xjrsoft/module/relationManage/vo/DemoCustomerVo.java rename to demo/demo-api/src/main/java/com/xjrsoft/module/relationManage/vo/DemoCustomerVo.java diff --git a/demo-service/pom.xml b/demo/demo-service/pom.xml similarity index 97% rename from demo-service/pom.xml rename to demo/demo-service/pom.xml index b644fae..4ee3cfc 100644 --- a/demo-service/pom.xml +++ b/demo/demo-service/pom.xml @@ -6,7 +6,7 @@ com.geg - ms-demo + demo ${revision} @@ -27,6 +27,12 @@ ${framework.version} + + com.geg + demo-api + ${revision} + + org.springframework.cloud diff --git a/demo-service/src/main/java/com/xjrsoft/ITCDemoApplication.java b/demo/demo-service/src/main/java/com/xjrsoft/ITCDemoApplication.java similarity index 100% rename from demo-service/src/main/java/com/xjrsoft/ITCDemoApplication.java rename to demo/demo-service/src/main/java/com/xjrsoft/ITCDemoApplication.java diff --git a/demo-service/src/main/java/com/xjrsoft/common/schedule/DemoSysncTask.java b/demo/demo-service/src/main/java/com/xjrsoft/common/schedule/DemoSysncTask.java similarity index 100% rename from demo-service/src/main/java/com/xjrsoft/common/schedule/DemoSysncTask.java rename to demo/demo-service/src/main/java/com/xjrsoft/common/schedule/DemoSysncTask.java diff --git a/demo-service/src/main/java/com/xjrsoft/common/util/SpringContextUtil.java b/demo/demo-service/src/main/java/com/xjrsoft/common/util/SpringContextUtil.java similarity index 100% rename from demo-service/src/main/java/com/xjrsoft/common/util/SpringContextUtil.java rename to demo/demo-service/src/main/java/com/xjrsoft/common/util/SpringContextUtil.java diff --git a/demo-service/src/main/java/com/xjrsoft/module/prdManage/controller/DemoApplianceController.java b/demo/demo-service/src/main/java/com/xjrsoft/module/prdManage/controller/DemoApplianceController.java similarity index 100% rename from demo-service/src/main/java/com/xjrsoft/module/prdManage/controller/DemoApplianceController.java rename to demo/demo-service/src/main/java/com/xjrsoft/module/prdManage/controller/DemoApplianceController.java diff --git a/demo-service/src/main/java/com/xjrsoft/module/prdManage/entity/DemoAppliance.java b/demo/demo-service/src/main/java/com/xjrsoft/module/prdManage/entity/DemoAppliance.java similarity index 100% rename from demo-service/src/main/java/com/xjrsoft/module/prdManage/entity/DemoAppliance.java rename to demo/demo-service/src/main/java/com/xjrsoft/module/prdManage/entity/DemoAppliance.java diff --git a/demo-service/src/main/java/com/xjrsoft/module/prdManage/mapper/DemoApplianceMapper.java b/demo/demo-service/src/main/java/com/xjrsoft/module/prdManage/mapper/DemoApplianceMapper.java similarity index 100% rename from demo-service/src/main/java/com/xjrsoft/module/prdManage/mapper/DemoApplianceMapper.java rename to demo/demo-service/src/main/java/com/xjrsoft/module/prdManage/mapper/DemoApplianceMapper.java diff --git a/demo-service/src/main/java/com/xjrsoft/module/prdManage/service/IDemoApplianceService.java b/demo/demo-service/src/main/java/com/xjrsoft/module/prdManage/service/IDemoApplianceService.java similarity index 100% rename from demo-service/src/main/java/com/xjrsoft/module/prdManage/service/IDemoApplianceService.java rename to demo/demo-service/src/main/java/com/xjrsoft/module/prdManage/service/IDemoApplianceService.java diff --git a/demo-service/src/main/java/com/xjrsoft/module/prdManage/service/impl/DemoApplianceServiceImpl.java b/demo/demo-service/src/main/java/com/xjrsoft/module/prdManage/service/impl/DemoApplianceServiceImpl.java similarity index 100% rename from demo-service/src/main/java/com/xjrsoft/module/prdManage/service/impl/DemoApplianceServiceImpl.java rename to demo/demo-service/src/main/java/com/xjrsoft/module/prdManage/service/impl/DemoApplianceServiceImpl.java diff --git a/demo-service/src/main/java/com/xjrsoft/module/relationManage/controller/DemoCustomerManageController.java b/demo/demo-service/src/main/java/com/xjrsoft/module/relationManage/controller/DemoCustomerManageController.java similarity index 100% rename from demo-service/src/main/java/com/xjrsoft/module/relationManage/controller/DemoCustomerManageController.java rename to demo/demo-service/src/main/java/com/xjrsoft/module/relationManage/controller/DemoCustomerManageController.java diff --git a/demo-service/src/main/java/com/xjrsoft/module/relationManage/entity/DemoCustomer.java b/demo/demo-service/src/main/java/com/xjrsoft/module/relationManage/entity/DemoCustomer.java similarity index 100% rename from demo-service/src/main/java/com/xjrsoft/module/relationManage/entity/DemoCustomer.java rename to demo/demo-service/src/main/java/com/xjrsoft/module/relationManage/entity/DemoCustomer.java diff --git a/demo-service/src/main/java/com/xjrsoft/module/relationManage/mapper/DemoCustomerMapper.java b/demo/demo-service/src/main/java/com/xjrsoft/module/relationManage/mapper/DemoCustomerMapper.java similarity index 100% rename from demo-service/src/main/java/com/xjrsoft/module/relationManage/mapper/DemoCustomerMapper.java rename to demo/demo-service/src/main/java/com/xjrsoft/module/relationManage/mapper/DemoCustomerMapper.java diff --git a/demo-service/src/main/java/com/xjrsoft/module/relationManage/service/IDemoCustomerManageService.java b/demo/demo-service/src/main/java/com/xjrsoft/module/relationManage/service/IDemoCustomerManageService.java similarity index 100% rename from demo-service/src/main/java/com/xjrsoft/module/relationManage/service/IDemoCustomerManageService.java rename to demo/demo-service/src/main/java/com/xjrsoft/module/relationManage/service/IDemoCustomerManageService.java diff --git a/demo-service/src/main/java/com/xjrsoft/module/relationManage/service/impl/DemoCustomerManageServiceImpl.java b/demo/demo-service/src/main/java/com/xjrsoft/module/relationManage/service/impl/DemoCustomerManageServiceImpl.java similarity index 100% rename from demo-service/src/main/java/com/xjrsoft/module/relationManage/service/impl/DemoCustomerManageServiceImpl.java rename to demo/demo-service/src/main/java/com/xjrsoft/module/relationManage/service/impl/DemoCustomerManageServiceImpl.java diff --git a/demo-service/src/main/resources/application.yml b/demo/demo-service/src/main/resources/application.yml similarity index 100% rename from demo-service/src/main/resources/application.yml rename to demo/demo-service/src/main/resources/application.yml diff --git a/demo-service/src/main/resources/banner.txt b/demo/demo-service/src/main/resources/banner.txt similarity index 100% rename from demo-service/src/main/resources/banner.txt rename to demo/demo-service/src/main/resources/banner.txt diff --git a/demo-service/src/main/resources/bootstrap.yml b/demo/demo-service/src/main/resources/bootstrap.yml similarity index 100% rename from demo-service/src/main/resources/bootstrap.yml rename to demo/demo-service/src/main/resources/bootstrap.yml diff --git a/demo/pom.xml b/demo/pom.xml new file mode 100644 index 0000000..b9f0574 --- /dev/null +++ b/demo/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + + com.geg + ms-demo + ${revision} + + + demo + demo + demo + pom + + + demo-api + demo-service + + + + ${java.version} + ${java.version} + UTF-8 + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index ccecdf1..c13c435 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ facade-service - demo-service + demo