合并 mes 代码

mes-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

mes-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">
     <parent>
         <groupId>cn.iocoder.cloud</groupId>
-        <artifactId>yudao</artifactId>
+        <artifactId>dsc-mes</artifactId>
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -27,7 +27,7 @@
         </dependency>
         <dependency>
             <groupId>cn.iocoder.cloud</groupId>
-            <artifactId>yudao-module-indicator</artifactId>
+            <artifactId>yudao-module-indicator-server</artifactId>
             <version>${revision}</version>
         </dependency>
         <dependency>

mes-server/src/main/java/cn/iocoder/yudao/mes/MesServerApplication.java

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.mes;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 
 /**
  * Mes 服务器的启动类
@@ -9,6 +10,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
  * @author ZT
  */
 @SuppressWarnings("SpringComponentScan") // 忽略 IDEA 无法识别 ${yudao.info.base-package}
+@EnableFeignClients(basePackages = {"${yudao.info.base-package}.mes", "${yudao.info.base-package}.module"})
 @SpringBootApplication(scanBasePackages = {"${yudao.info.base-package}.mes", "${yudao.info.base-package}.module"},
         excludeName = {})
 public class MesServerApplication {

mes-server/src/main/java/cn/iocoder/yudao/mes/controller/mes/MesController.java

@@ -1,12 +1,13 @@
 package cn.iocoder.yudao.mes.controller.mes;
 
-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;
 
 /**

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