Merge remote-tracking branch 'origin/dev-czh' into test

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

@@ -37,6 +37,10 @@ spec:
         - containerPort: 8848
         - containerPort: 9848
         - containerPort: 9849
+      initContainers:
+        - name: init-mydb
+          image: busybox:1.31
+          command: [ 'sh', '-c', 'nc -zv mysql.argo.svc 3306' ]
       restartPolicy: Always
 
 ---

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

@@ -1009,15 +1009,19 @@ public class ModelsServiceImpl implements ModelsService {
                             branch.put("metrics", trainMetrics);
 
                             ArrayList<String> metrics_names = new ArrayList<>();
-                            for (String key : trainMetrics.keySet()) {
-                                metrics_names.add(key);
+                            if (trainMetrics != null) {
+                                for (String key : trainMetrics.keySet()) {
+                                    metrics_names.add(key);
+                                }
                             }
                             branch.put("metrics_names", metrics_names);
                         } else {
                             Map<String, Object> evaluateMetrics = (Map<String, Object>) metrics.get(Constant.Type_Evaluate);
                             ArrayList<String> metrics_names = new ArrayList<>();
-                            for (String key : evaluateMetrics.keySet()) {
-                                metrics_names.add(key);
+                            if (evaluateMetrics != null) {
+                                for (String key : evaluateMetrics.keySet()) {
+                                    metrics_names.add(key);
+                                }
                             }
                             branch.put("metrics_names", metrics_names);
                             branch.put("metrics", evaluateMetrics);