合并 Base

yudao-module-base/yudao-module-base-server/pom.xml

@@ -131,21 +131,21 @@
     <build>
         <!-- 设置构建的 jar 包名 -->
         <finalName>${project.artifactId}</finalName>
-        <plugins>
-            <!-- 打包 -->
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring.boot.version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal> <!-- 将引入的 jar 打入其中 -->
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
+        <!--        <plugins>-->
+        <!--            &lt;!&ndash; 打包 &ndash;&gt;-->
+        <!--            <plugin>-->
+        <!--                <groupId>org.springframework.boot</groupId>-->
+        <!--                <artifactId>spring-boot-maven-plugin</artifactId>-->
+        <!--                <version>${spring.boot.version}</version>-->
+        <!--                <executions>-->
+        <!--                    <execution>-->
+        <!--                        <goals>-->
+        <!--                            <goal>repackage</goal> &lt;!&ndash; 将引入的 jar 打入其中 &ndash;&gt;-->
+        <!--                        </goals>-->
+        <!--                    </execution>-->
+        <!--                </executions>-->
+        <!--            </plugin>-->
+        <!--        </plugins>-->
     </build>
 
 </project>

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) {

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")

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 {
+}

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