合并 Base

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

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

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 的地址