Merge remote-tracking branch 'origin/dev'

# Conflicts:
#	ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java

k8s/build.sh

@@ -92,7 +92,7 @@ compile_java() {
     # 编译java
   docker run -v ${baseDir}:${baseDir} -v /home/maven:/home/maven \
     -e http_proxy=http://172.20.32.253:3128 -e https_proxy=http://172.20.32.253:3128 \
-    172.20.32.187/ci4s/build:v1 ${baseDir}/k8s/build-java.sh $param
+    172.20.32.187/ci4s/build:v3 ${baseDir}/k8s/build-java.sh $param
   if [ $? -ne 0 ]; then
       echo "编译失败，请检查代码！"
       exit 1

k8s/deploy.sh

@@ -115,7 +115,7 @@ deploy_service() {
 
 deploy_nacos() {
      local yaml_file=$1
-     scp ${baseDir}/k8s/${yaml_file} root@$remote_ip:${remote_deploy_dir}/${yaml_file}
+     scp ${baseDir}/k8s/template-yaml/${yaml_file} root@$remote_ip:${remote_deploy_dir}/${yaml_file}
      deploy_service ${yaml_file}
 }
 

k8s/template-yaml/k8s-3nacos.yaml

@@ -17,14 +17,14 @@ spec:
     spec:
       containers:
       - name: nacos-ci4s
-        image: ${k8s-3nacos-image}
+        image: nacos/nacos-server:v2.2.0
         env:
         - name: SPRING_DATASOURCE_PLATFORM
           value: mysql
         - name: MODE
           value: standalone
         - name: MYSQL_SERVICE_HOST
-          value: mysql2.argo.svc
+          value: mysql.argo.svc
         - name: MYSQL_SERVICE_PORT
           value: "3306"
         - name: MYSQL_SERVICE_DB_NAME

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java

@@ -1214,4 +1214,5 @@ public class ModelsServiceImpl implements ModelsService {
         }
         modelMetaVo.setMetrics(result);
     }
+
 }