diff --git a/base-server/Dockerfile b/base-server/Dockerfile index b8d33a5c..0d8509ca 100644 --- a/base-server/Dockerfile +++ b/base-server/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:17-jre-slim +FROM 172.16.46.66:10043/base-service/eclipse-temurin:21-jre # 设置应用目录 WORKDIR /app diff --git a/base-server/src/main/java/cn/iocoder/yudao/base/controller/base/BaseController.java b/base-server/src/main/java/cn/iocoder/yudao/base/controller/base/BaseDemoController.java similarity index 95% rename from base-server/src/main/java/cn/iocoder/yudao/base/controller/base/BaseController.java rename to base-server/src/main/java/cn/iocoder/yudao/base/controller/base/BaseDemoController.java index 44b12a8a..fd6d0b61 100644 --- a/base-server/src/main/java/cn/iocoder/yudao/base/controller/base/BaseController.java +++ b/base-server/src/main/java/cn/iocoder/yudao/base/controller/base/BaseDemoController.java @@ -1,12 +1,13 @@ package cn.iocoder.yudao.base.controller.base; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; + import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; /** @@ -17,7 +18,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; @Tag(name = "base") @RestController @RequestMapping("/base") -public class BaseController { +public class BaseDemoController { @GetMapping("/hello") @Operation(summary = "Hello base") diff --git a/base-server/src/main/resources/application.yml b/base-server/src/main/resources/application.yml index a0b16978..fc86e6fe 100644 --- a/base-server/src/main/resources/application.yml +++ b/base-server/src/main/resources/application.yml @@ -104,7 +104,7 @@ xxl: yudao: info: version: 1.0.0 - base-package: cn.iocoder.yudao.module + base-package: cn.iocoder.yudao web: admin-ui: url: http://dashboard.yudao.iocoder.cn # Admin 管理后台 UI 的地址 diff --git a/yudao-module-base/yudao-module-base-server/pom.xml b/yudao-module-base/yudao-module-base-server/pom.xml index 13a5b747..387db2f8 100644 --- a/yudao-module-base/yudao-module-base-server/pom.xml +++ b/yudao-module-base/yudao-module-base-server/pom.xml @@ -131,21 +131,21 @@ ${project.artifactId} - - - - org.springframework.boot - spring-boot-maven-plugin - ${spring.boot.version} - - - - repackage - - - - - + + + + + + + + + + + + + + + diff --git a/yudao-module-base/yudao-module-base-server/src/main/java/cn/iocoder/yudao/module/base/BaseServerApplication.java b/yudao-module-base/yudao-module-base-server/src/main/java/cn/iocoder/yudao/module/base/BaseServerApplication.java index b8f5f38a..ae3a3835 100644 --- a/yudao-module-base/yudao-module-base-server/src/main/java/cn/iocoder/yudao/module/base/BaseServerApplication.java +++ b/yudao-module-base/yudao-module-base-server/src/main/java/cn/iocoder/yudao/module/base/BaseServerApplication.java @@ -1,14 +1,13 @@ package cn.iocoder.yudao.module.base; import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; /** * Base 模块的启动类 * * @author ZT */ -@SpringBootApplication +//@SpringBootApplication public class BaseServerApplication { public static void main(String[] args) { diff --git a/yudao-module-base/yudao-module-base-server/src/main/java/cn/iocoder/yudao/module/base/controller/admin/base/BaseController.java b/yudao-module-base/yudao-module-base-server/src/main/java/cn/iocoder/yudao/module/base/controller/admin/base/BaseTestController.java similarity index 95% rename from yudao-module-base/yudao-module-base-server/src/main/java/cn/iocoder/yudao/module/base/controller/admin/base/BaseController.java rename to yudao-module-base/yudao-module-base-server/src/main/java/cn/iocoder/yudao/module/base/controller/admin/base/BaseTestController.java index 0044542e..3de680cb 100644 --- a/yudao-module-base/yudao-module-base-server/src/main/java/cn/iocoder/yudao/module/base/controller/admin/base/BaseController.java +++ b/yudao-module-base/yudao-module-base-server/src/main/java/cn/iocoder/yudao/module/base/controller/admin/base/BaseTestController.java @@ -17,7 +17,7 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; @Tag(name = "管理后台 - Base") @RestController @RequestMapping("/admin/base/base") -public class BaseController { +public class BaseTestController { @GetMapping("/hello") @Operation(summary = "Hello Base") diff --git a/yudao-module-base/yudao-module-base-server/src/main/java/cn/iocoder/yudao/module/base/framework/rpc/config/RpcConfiguration.java b/yudao-module-base/yudao-module-base-server/src/main/java/cn/iocoder/yudao/module/base/framework/rpc/config/RpcConfiguration.java new file mode 100644 index 00000000..0688caca --- /dev/null +++ b/yudao-module-base/yudao-module-base-server/src/main/java/cn/iocoder/yudao/module/base/framework/rpc/config/RpcConfiguration.java @@ -0,0 +1,10 @@ +package cn.iocoder.yudao.module.base.framework.rpc.config; + +import cn.iocoder.yudao.module.system.api.dept.DeptApi; +import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.context.annotation.Configuration; + +@Configuration(value = "baseRpcConfiguration", proxyBeanMethods = false) +@EnableFeignClients(clients = {DeptApi.class}) +public class RpcConfiguration { +} diff --git a/yudao-module-base/yudao-module-base-server/src/main/java/cn/iocoder/yudao/module/base/framework/security/config/SecurityConfiguration.java b/yudao-module-base/yudao-module-base-server/src/main/java/cn/iocoder/yudao/module/base/framework/security/config/SecurityConfiguration.java index dcc26e50..9ec10ddc 100644 --- a/yudao-module-base/yudao-module-base-server/src/main/java/cn/iocoder/yudao/module/base/framework/security/config/SecurityConfiguration.java +++ b/yudao-module-base/yudao-module-base-server/src/main/java/cn/iocoder/yudao/module/base/framework/security/config/SecurityConfiguration.java @@ -9,11 +9,9 @@ import org.springframework.security.config.annotation.web.configurers.AuthorizeH /** - * Base 模块的 Security 配置 - * - * @author ZT + * Template 模块的 Security 配置 */ -@Configuration(proxyBeanMethods = false) +@Configuration("baseSecurityConfiguration") public class SecurityConfiguration { @Bean diff --git a/yudao-module-contract-order/yudao-module-contract-order-server/pom.xml b/yudao-module-contract-order/yudao-module-contract-order-server/pom.xml index 1cc56100..c17f2aeb 100644 --- a/yudao-module-contract-order/yudao-module-contract-order-server/pom.xml +++ b/yudao-module-contract-order/yudao-module-contract-order-server/pom.xml @@ -131,21 +131,21 @@ ${project.artifactId} - - - - org.springframework.boot - spring-boot-maven-plugin - ${spring.boot.version} - - - - repackage - - - - - + + + + + + + + + + + + + + + diff --git a/yudao-module-contract-order/yudao-module-contract-order-server/src/main/java/cn/iocoder/yudao/module/contractorder/ContractOrderServerApplication.java b/yudao-module-contract-order/yudao-module-contract-order-server/src/main/java/cn/iocoder/yudao/module/contractorder/ContractOrderServerApplication.java index d03ccbac..cffa1597 100644 --- a/yudao-module-contract-order/yudao-module-contract-order-server/src/main/java/cn/iocoder/yudao/module/contractorder/ContractOrderServerApplication.java +++ b/yudao-module-contract-order/yudao-module-contract-order-server/src/main/java/cn/iocoder/yudao/module/contractorder/ContractOrderServerApplication.java @@ -1,14 +1,13 @@ package cn.iocoder.yudao.module.contractorder; import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; /** * ContractOrder 模块的启动类 * * @author ZT */ -@SpringBootApplication +//@SpringBootApplication public class ContractOrderServerApplication { public static void main(String[] args) { diff --git a/yudao-module-contract-order/yudao-module-contract-order-server/src/main/java/cn/iocoder/yudao/module/contractorder/framework/security/config/SecurityConfiguration.java b/yudao-module-contract-order/yudao-module-contract-order-server/src/main/java/cn/iocoder/yudao/module/contractorder/framework/security/config/SecurityConfiguration.java index 98ded0bf..570e1fdd 100644 --- a/yudao-module-contract-order/yudao-module-contract-order-server/src/main/java/cn/iocoder/yudao/module/contractorder/framework/security/config/SecurityConfiguration.java +++ b/yudao-module-contract-order/yudao-module-contract-order-server/src/main/java/cn/iocoder/yudao/module/contractorder/framework/security/config/SecurityConfiguration.java @@ -13,7 +13,7 @@ import org.springframework.security.config.annotation.web.configurers.AuthorizeH * * @author ZT */ -@Configuration(proxyBeanMethods = false) +@Configuration("contractOrderSecurityConfiguration") public class SecurityConfiguration { @Bean diff --git a/yudao-module-erp/pom.xml b/yudao-module-erp/pom.xml new file mode 100644 index 00000000..15c9b747 --- /dev/null +++ b/yudao-module-erp/pom.xml @@ -0,0 +1,24 @@ + + + + dsc-base + cn.iocoder.cloud + ${revision} + + + yudao-module-erp-api + yudao-module-erp-server + + 4.0.0 + + yudao-module-erp + pom + + ${project.artifactId} + + ERP 模块。 + + + \ No newline at end of file diff --git a/yudao-module-erp/yudao-module-erp-api/pom.xml b/yudao-module-erp/yudao-module-erp-api/pom.xml new file mode 100644 index 00000000..e2004e29 --- /dev/null +++ b/yudao-module-erp/yudao-module-erp-api/pom.xml @@ -0,0 +1,46 @@ + + + + yudao-module-erp + cn.iocoder.cloud + ${revision} + + 4.0.0 + yudao-module-erp-api + jar + + ${project.artifactId} + + 暴露给其它模块调用 + + + + + cn.iocoder.cloud + yudao-common + + + + org.springdoc + springdoc-openapi-starter-webmvc-api + provided + + + + + org.springframework.boot + spring-boot-starter-validation + true + + + + + org.springframework.cloud + spring-cloud-starter-openfeign + true + + + + \ No newline at end of file diff --git a/yudao-module-erp/yudao-module-erp-server/pom.xml b/yudao-module-erp/yudao-module-erp-server/pom.xml new file mode 100644 index 00000000..847be039 --- /dev/null +++ b/yudao-module-erp/yudao-module-erp-server/pom.xml @@ -0,0 +1,151 @@ + + + + yudao-module-erp + cn.iocoder.cloud + ${revision} + + 4.0.0 + jar + + yudao-module-erp-server + + ${project.artifactId} + + ERP 模块。 + + + + + + cn.iocoder.cloud + yudao-spring-boot-starter-env + + + + + cn.iocoder.cloud + yudao-module-system-api + ${revision} + + + cn.iocoder.cloud + yudao-module-infra-api + ${revision} + + + + cn.iocoder.cloud + yudao-module-erp-api + ${revision} + + + + + cn.iocoder.cloud + yudao-spring-boot-starter-biz-data-permission + + + cn.iocoder.cloud + yudao-spring-boot-starter-biz-tenant + + + + + cn.iocoder.cloud + yudao-spring-boot-starter-web + + + + cn.iocoder.cloud + yudao-spring-boot-starter-security + + + + + cn.iocoder.cloud + yudao-spring-boot-starter-mybatis + + + + cn.iocoder.cloud + yudao-spring-boot-starter-redis + + + + + cn.iocoder.cloud + yudao-spring-boot-starter-rpc + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + cn.iocoder.cloud + yudao-spring-boot-starter-job + + + + + cn.iocoder.cloud + yudao-spring-boot-starter-mq + + + + + cn.iocoder.cloud + yudao-spring-boot-starter-test + + + + + cn.iocoder.cloud + yudao-spring-boot-starter-excel + + + + + cn.iocoder.cloud + yudao-spring-boot-starter-monitor + + + cn.iocoder.cloud + yudao-spring-boot-starter-biz-business + ${revision} + + + + + + ${project.artifactId} + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/erp/ErpController.java b/yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/erp/ErpController.java new file mode 100644 index 00000000..ae7d537c --- /dev/null +++ b/yudao-module-erp/yudao-module-erp-server/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/erp/ErpController.java @@ -0,0 +1,35 @@ +package cn.iocoder.yudao.module.erp.controller.admin.erp; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import cn.iocoder.yudao.framework.common.pojo.CommonResult; + +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; + +/** + * ERP 控制器 + * + * @author ERP Module + */ +@Tag(name = "管理后台 - ERP") +@RestController +@RequestMapping("/admin/erp/erp") +public class ErpController { + + @GetMapping("/hello") + @Operation(summary = "Hello ERP") + public CommonResult hello() { + return success("Hello, ERP!"); + } + + @GetMapping("/info") + @Operation(summary = "ERP 模块信息") + public CommonResult info() { + return success("ERP 模块已成功创建并运行"); + } + +} \ No newline at end of file