diff --git a/manage-server/Dockerfile b/manage-server/Dockerfile index e8699401..e4630e57 100644 --- a/manage-server/Dockerfile +++ b/manage-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/manage-server/pom.xml b/manage-server/pom.xml index 6fe9792b..af3c7382 100644 --- a/manage-server/pom.xml +++ b/manage-server/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> cn.iocoder.cloud - yudao + dsc-manage ${revision} 4.0.0 diff --git a/manage-server/src/main/resources/application.yml b/manage-server/src/main/resources/application.yml index 3595891b..ce87ead9 100644 --- a/manage-server/src/main/resources/application.yml +++ b/manage-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-manage/pom.xml b/yudao-module-manage/pom.xml index 8bde008c..e23281f9 100644 --- a/yudao-module-manage/pom.xml +++ b/yudao-module-manage/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - yudao + dsc-manage cn.iocoder.cloud ${revision} diff --git a/yudao-module-manage/yudao-module-manage-server/pom.xml b/yudao-module-manage/yudao-module-manage-server/pom.xml index 7d9aa22e..41752e21 100644 --- a/yudao-module-manage/yudao-module-manage-server/pom.xml +++ b/yudao-module-manage/yudao-module-manage-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-manage/yudao-module-manage-server/src/main/java/cn/iocoder/yudao/module/manage/ManageServerApplication.java b/yudao-module-manage/yudao-module-manage-server/src/main/java/cn/iocoder/yudao/module/manage/ManageServerApplication.java index ff5f7a69..1014236b 100644 --- a/yudao-module-manage/yudao-module-manage-server/src/main/java/cn/iocoder/yudao/module/manage/ManageServerApplication.java +++ b/yudao-module-manage/yudao-module-manage-server/src/main/java/cn/iocoder/yudao/module/manage/ManageServerApplication.java @@ -8,7 +8,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; * * @author ZT */ -@SpringBootApplication +//@SpringBootApplication public class ManageServerApplication { public static void main(String[] args) { diff --git a/yudao-module-manage/yudao-module-manage-server/src/main/java/cn/iocoder/yudao/module/manage/controller/admin/manage/ManageController.java b/yudao-module-manage/yudao-module-manage-server/src/main/java/cn/iocoder/yudao/module/manage/controller/admin/manage/ManageController.java index 345fa255..6caf867c 100644 --- a/yudao-module-manage/yudao-module-manage-server/src/main/java/cn/iocoder/yudao/module/manage/controller/admin/manage/ManageController.java +++ b/yudao-module-manage/yudao-module-manage-server/src/main/java/cn/iocoder/yudao/module/manage/controller/admin/manage/ManageController.java @@ -1,12 +1,13 @@ package cn.iocoder.yudao.module.manage.controller.admin.manage; -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; /** diff --git a/yudao-module-manage/yudao-module-manage-server/src/main/java/cn/iocoder/yudao/module/manage/framework/rpc/config/RpcConfiguration.java b/yudao-module-manage/yudao-module-manage-server/src/main/java/cn/iocoder/yudao/module/manage/framework/rpc/config/RpcConfiguration.java new file mode 100644 index 00000000..0902a10a --- /dev/null +++ b/yudao-module-manage/yudao-module-manage-server/src/main/java/cn/iocoder/yudao/module/manage/framework/rpc/config/RpcConfiguration.java @@ -0,0 +1,10 @@ +package cn.iocoder.yudao.module.manage.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 = "manageRpcConfiguration", proxyBeanMethods = false) +@EnableFeignClients(clients = {DeptApi.class}) +public class RpcConfiguration { +} diff --git a/yudao-module-manage/yudao-module-manage-server/src/main/java/cn/iocoder/yudao/module/manage/framework/security/config/SecurityConfiguration.java b/yudao-module-manage/yudao-module-manage-server/src/main/java/cn/iocoder/yudao/module/manage/framework/security/config/SecurityConfiguration.java index 50ccf4b4..797b32fd 100644 --- a/yudao-module-manage/yudao-module-manage-server/src/main/java/cn/iocoder/yudao/module/manage/framework/security/config/SecurityConfiguration.java +++ b/yudao-module-manage/yudao-module-manage-server/src/main/java/cn/iocoder/yudao/module/manage/framework/security/config/SecurityConfiguration.java @@ -9,11 +9,9 @@ import org.springframework.security.config.annotation.web.configurers.AuthorizeH /** - * Manage 模块的 Security 配置 - * - * @author ZT + * Template 模块的 Security 配置 */ -@Configuration(proxyBeanMethods = false) +@Configuration("manageSecurityConfiguration") public class SecurityConfiguration { @Bean