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

# Conflicts:
#	ruoyi-modules/management-platform/src/main/resources/bootstrap.yml

ruoyi-auth/src/main/resources/bootstrap.yml

@@ -19,7 +19,9 @@ spring:
         password: h1n2x3j4y5@
         retry:
           enabled: true
+        namespace: 6caf5d79-c4ce-4e3b-a357-141b74e52a01
       config:
+        namespace: 6caf5d79-c4ce-4e3b-a357-141b74e52a01
         # 配置中心地址
         server-addr: nacos-ci4s.ci4s-test.svc:8848
         # 配置文件格式

ruoyi-gateway/src/main/resources/bootstrap.yml

@@ -19,7 +19,9 @@ spring:
         password: h1n2x3j4y5@
         retry:
           enabled: true
+        namespace: 6caf5d79-c4ce-4e3b-a357-141b74e52a01
       config:
+        namespace: 6caf5d79-c4ce-4e3b-a357-141b74e52a01
         # 配置中心地址
         server-addr: nacos-ci4s.ci4s-test.svc:8848
         # 配置文件格式

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

@@ -100,12 +100,13 @@ public class JupyterServiceImpl implements JupyterService {
         String podName = loginUser.getUsername().toLowerCase() + "-editor-pod" + "-" + id;
         String pvcName = loginUser.getUsername().toLowerCase() + "-editor-pvc";
         //新建编辑器的pvc
-        V1PersistentVolumeClaim pvc = k8sClientUtil.createPvc(namespace, pvcName, storage, storageClassName);
+//        V1PersistentVolumeClaim pvc = k8sClientUtil.createPvc(namespace, pvcName, storage, storageClassName);
 
         //TODO 设置镜像可配置，这里先用默认镜像启动pod
 
         // 调用修改后的 createPod 方法，传入额外的参数
-        Integer podPort = k8sClientUtil.createConfiguredPod(podName, namespace, port, mountPath, pvc, devEnvironment, minioPvcName, datasetPath, modelPath);
+//        Integer podPort = k8sClientUtil.createConfiguredPod(podName, namespace, port, mountPath, pvc, devEnvironment, minioPvcName, datasetPath, modelPath);
+        Integer podPort = k8sClientUtil.createConfiguredPod(podName, namespace, port, mountPath, null, devEnvironment, minioPvcName, datasetPath, modelPath);
         String url = masterIp + ":" + podPort;
         redisService.setCacheObject(podName, masterIp + ":" + podPort);
         devEnvironment.setStatus("Pending");

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/K8sClientUtil.java

@@ -455,9 +455,9 @@ public class K8sClientUtil {
         volumeMounts.add(new V1VolumeMount().name("model").mountPath("/opt/model").readOnly(true));
 
         List<V1Volume> volumes = new ArrayList<>();
-        volumes.add(new V1Volume().name("workspace").hostPath(new V1HostPathVolumeSource().path(hostPath + "/notebooks").type("DirectoryOrCreate")));
-        volumes.add(new V1Volume().name("dataset").hostPath(new V1HostPathVolumeSource().path(hostPath + "/dataset").type("DirectoryOrCreate")));
-        volumes.add(new V1Volume().name("model").hostPath(new V1HostPathVolumeSource().path(hostPath + "/model").type("DirectoryOrCreate")));
+        volumes.add(new V1Volume().name("workspace").hostPath(new V1HostPathVolumeSource().path(hostPath + "/" + podName + "/notebooks").type("DirectoryOrCreate")));
+        volumes.add(new V1Volume().name("dataset").hostPath(new V1HostPathVolumeSource().path(hostPath + "/" + podName + "/dataset").type("DirectoryOrCreate")));
+        volumes.add(new V1Volume().name("model").hostPath(new V1HostPathVolumeSource().path(hostPath + "/" + podName + "/model").type("DirectoryOrCreate")));
 
         // 配置卷和卷挂载
 //        List<V1VolumeMount> volumeMounts = new ArrayList<>();

ruoyi-modules/management-platform/src/main/resources/bootstrap.yml

@@ -16,10 +16,12 @@ spring:
         # 服务注册地址
         server-addr: nacos-ci4s.ci4s-test.svc:8848
         username: nacos
-        password: h1n2x3j4y5@
+        password: nacos
         retry:
           enabled: true
+        namespace: 6caf5d79-c4ce-4e3b-a357-141b74e52a01
       config:
+        namespace: 6caf5d79-c4ce-4e3b-a357-141b74e52a01
         # 配置中心地址
         server-addr: nacos-ci4s.ci4s-test.svc:8848
         # 配置文件格式
@@ -31,121 +33,4 @@ spring:
             refresh: true
           - data-id: management-platform-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
             group: DEFAULT_GROUP
-            refresh: true
-
-  # 文件上传
-  servlet:
-    multipart:
-      # 单个文件大小
-      max-file-size: 20GB
-      # 设置总上传的文件大小
-      max-request-size: 20GB
-  redis:
-    host: 172.20.32.150
-    port: 6379
-    password:
-  # 数据源
-  datasource:
-    # Druid StatViewServlet配置
-    druid:
-      stat-view-servlet:
-        # 默认true 内置监控页面首页/druid/index.html
-        enabled: true
-      initial-size: 20
-      max-active: 60
-      min-idle: 20
-      max-wait: 30000
-    dynamic:
-      primary: master
-      datasource:
-        master:
-          url: jdbc:mysql://172.20.32.150:3306/ry-ci4s?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
-          username: root
-          password: 123456
-          type: com.alibaba.druid.pool.DruidDataSource
-          driverClassName: com.mysql.cj.jdbc.Driver
-# mybatis配置
-mybatis:
-  # 搜索指定包别名
-  typeAliasesPackage: com.ruoyi.management-platform
-  # 配置mapper的扫描，找到所有的mapper.xml映射文件
-  mapperLocations: classpath:mapper/**/*.xml
-  configuration:
-    map-underscore-to-camel-case: true
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-
-# swagger配置
-swagger:
-  title: 系统模块接口文档
-  license: Powered By ruoyi
-  licenseUrl: https://ruoyi.vip
-# argo
-# argo
-argo:
-  url: http://172.20.32.181:31000
-  convert: /api/v1/workflow/convert
-  workflowRun: /api/v1/workflow/run
-  workflowStatus: /api/v1/workflow/getWorkflow
-  workflowTermination: /api/v1/workflow/terminate
-  workflowLog: /api/v1/workflow/getWorkflowLog
-  workflowRealTimeLog: /api/v1/workflow/getRealtimeWorkflowLog
-  workflowCopy: /api/v1/workflow/copy
-  workflowPodLog: /api/v1/workflow/getLogByPod
-  ins:
-    logsLines: 200
-# 流水线配置
-pipeline:
-  control_strategy: '{"max_run_time":{"type":"str","label":"超时中断","item_type":"","value":"2h"},"retry_times":{"type":"str","item_type":"","label":"重试次数","value":"1"}}'
-
-k8s:
-  storageClassName: storage-nfs
-  http: https://172.20.32.181:6443
-  token: eyJhbGciOiJSUzI1NiIsImtpZCI6IjRWcFBPWl9YSFFxQ2tVanRuNHdRT1dnUlJNTnB2bG5TQlVSRjNKdExWNDQifQ.eyJpc3MiOiJrdWJlcm5ldGVzL3NlcnZpY2VhY2NvdW50Iiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9uYW1lc3BhY2UiOiJkZWZhdWx0Iiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9zZWNyZXQubmFtZSI6ImFkbWluLXNlcnZpY2UtYWNjb3VudC10b2tlbi14ZDk5eiIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VydmljZS1hY2NvdW50Lm5hbWUiOiJhZG1pbi1zZXJ2aWNlLWFjY291bnQiLCJrdWJlcm5ldGVzLmlvL3NlcnZpY2VhY2NvdW50L3NlcnZpY2UtYWNjb3VudC51aWQiOiJmMGEzNmYyMS01MjQyLTQ4MTAtYWVmZS0xOTEwOTZlZjc5YmUiLCJzdWIiOiJzeXN0ZW06c2VydmljZWFjY291bnQ6ZGVmYXVsdDphZG1pbi1zZXJ2aWNlLWFjY291bnQifQ.fo-Wf0-5-IRC5fhRh65yfqCJqKfE9MrNFIXL2fd1CqVAHD7JBpWO2IsFiSmz9Bm7VfLmFAp2NB7DjW4ZLjC7ODiGhpSseBP8x4ceFuHL6pRGUsEBvHQBBBuQcGhNOcsxIDHnDqUdUzoLprj223lMZNTQowITuqYFU4GVbethyEuS6G5Wh9KHI3KYHFtG4_AeWBgI5Ppz8pDrhHzSFWTFbzxQ3RPGEwF0V-9wEtdrSYnfETi3rdRWif9W4a0RW8HwD9Gf7UCYcyFOs7e5_3-IvmctS85g87PYIfHXMhu_kOw-_Il4bkwPEK5uiBFDw0M1-s9YP-F9r5sXXvOJlsAr1g
-
-# jupyter配置
-jupyter:
-  image: 172.20.32.187/ci4s/jupyterlab:v1.3
-  port: 8888
-  namespace: argo
-  mountPath: /opt
-  storage: 2Gi
-  masterIp: http://172.20.32.181
-  hostPath: /platform-data
-# tensorBoard配置
-tensorBoard:
-  image: activeeon/tensorboard:latest
-  port: 6006
-  mountPath: /logs/
-  masterIp: http://172.20.32.181
-labelStudio:
-  url: http://172.20.32.185:31209
-  loaclUrl: http://127.0.0.1:8080
-minio:
-  endpoint: http://172.20.32.181:9000
-  dataReleaseBucketName: myjfs
-  secretKey: 12345678
-  # endpoint: http://172.20.32.181:30164
-  accessKey: admin
-  # secretKey: qazxc123456.
-  pvcName: minio-pvc-claim-new
-  # dataReleaseBucketName: platform-data
-harbor:
-  bucketName: tempimagefile
-  repository: testlib
-  harborUrl: 172.20.32.187
-  harborUser: admin
-  harborpassword: Harbor12345
-  deploymentName: docker-push-deployment
-  serviceNS: argo
-dockerpush:
-  image: 172.20.32.187/pipeline-service/docker:ci4stest
-  mountPath: /data
-  proxyUrl: http://172.20.32.253:3128
-
-aim:
-  proxyUrl: http://172.20.32.181:30123
-  url: http://172.20.32.181:30059
-
-git:
-  endpoint: https://gitlink.org.cn
-  localPath: E:/test/
+            refresh: true

ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml

@@ -13,6 +13,7 @@ spring:
   cloud:
     nacos:
       discovery:
+        namespace: 6caf5d79-c4ce-4e3b-a357-141b74e52a01
         # 服务注册地址
         server-addr: nacos-ci4s.ci4s-test.svc:8848
         username: nacos
@@ -20,6 +21,7 @@ spring:
         retry:
           enabled: true
       config:
+        namespace: 6caf5d79-c4ce-4e3b-a357-141b74e52a01
         # 配置中心地址
         server-addr: nacos-ci4s.ci4s-test.svc:8848
         # 配置文件格式

ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml

@@ -13,6 +13,7 @@ spring:
   cloud:
     nacos:
       discovery:
+        namespace: 6caf5d79-c4ce-4e3b-a357-141b74e52a01
         # 服务注册地址
         server-addr: nacos-ci4s.ci4s-test.svc:8848
         username: nacos
@@ -20,6 +21,7 @@ spring:
         retry:
           enabled: true
       config:
+        namespace: 6caf5d79-c4ce-4e3b-a357-141b74e52a01
         # 配置中心地址
         server-addr: nacos-ci4s.ci4s-test.svc:8848
         # 配置文件格式

ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml

@@ -13,6 +13,7 @@ spring:
   cloud:
     nacos:
       discovery:
+        namespace: 6caf5d79-c4ce-4e3b-a357-141b74e52a01
         # 服务注册地址
         server-addr: nacos-ci4s.ci4s-test.svc:8848
         username: nacos
@@ -20,6 +21,7 @@ spring:
         retry:
           enabled: true
       config:
+        namespace: 6caf5d79-c4ce-4e3b-a357-141b74e52a01
         # 配置中心地址
         server-addr: nacos-ci4s.ci4s-test.svc:8848
         # 配置文件格式

ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml

@@ -13,6 +13,7 @@ spring:
   cloud:
     nacos:
       discovery:
+        namespace: 6caf5d79-c4ce-4e3b-a357-141b74e52a01
         # 服务注册地址
         server-addr: nacos-ci4s.ci4s-test.svc:8848
         username: nacos
@@ -20,6 +21,7 @@ spring:
         retry:
           enabled: true
       config:
+        namespace: 6caf5d79-c4ce-4e3b-a357-141b74e52a01
         # 配置中心地址
         server-addr: nacos-ci4s.ci4s-test.svc:8848
         # 配置文件格式

ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml

@@ -13,6 +13,7 @@ spring:
   cloud:
     nacos:
       discovery:
+        namespace: 6caf5d79-c4ce-4e3b-a357-141b74e52a01
         # 服务注册地址
         server-addr: nacos-ci4s.ci4s-test.svc:8848
         username: nacos
@@ -20,6 +21,7 @@ spring:
         retry:
           enabled: true
       config:
+        namespace: 6caf5d79-c4ce-4e3b-a357-141b74e52a01
         # 配置中心地址
         server-addr: nacos-ci4s.ci4s-test.svc:8848
         # 配置文件格式