Merge branch 'master' of http://39.98.38.2:13000/dumingliang/sh-model-platform

ruoyi-admin/src/main/resources/application-dev.yml

@@ -1,3 +1,10 @@
+ruoyi:
+  # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
+  profile: /soft/sh-models/uploadPath
+sys:
+  gateway:
+    url: http://localhost:8081
+
 # 数据源配置
 spring:
   datasource:

ruoyi-admin/src/main/resources/application-dm.yml

@@ -1,3 +1,9 @@
+ruoyi:
+  # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
+  profile: D:/soft/sh-models/uploadPath
+sys:
+  gateway:
+    url: http://localhost:8081
 # 数据源配置
 spring:
   datasource:

ruoyi-admin/src/main/resources/application-druid.yml

@@ -1,3 +1,9 @@
+ruoyi:
+  # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
+  profile: D:/soft/sh-models/uploadPath
+sys:
+  gateway:
+    url: http://localhost:8081
 # 数据源配置
 spring:
   datasource:

ruoyi-admin/src/main/resources/application-test.yml

@@ -1,3 +1,9 @@
+ruoyi:
+  # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
+  profile: D:/soft/sh-models/uploadPath
+sys:
+  gateway:
+    url: http://localhost:8081
 # 数据源配置
 spring:
   datasource:

ruoyi-admin/src/main/resources/application.yml

@@ -6,8 +6,6 @@ ruoyi:
   version: 3.8.8
   # 版权年份
   copyrightYear: 2024
-  # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profile: D:/tmp/sh-models/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数字计算 char 字符验证
@@ -133,20 +131,6 @@ xss:
   # 匹配链接
   urlPatterns: /system/*,/monitor/*,/tool/*
 
-sys:
-  gateway:
-    url: http://localhost:8081
-  report:
-    upload:
-      path: D:/tmp/report/
-  chart:
-    upload:
-      path: D:/tmp/chart/
-  map:
-    upload:
-      path: D:/tmp/map/
-
-
 # 调度器相关配置dpp
 ds:
   # 调度器api前缀
@@ -179,13 +163,6 @@ id.workerId: 1
 #数据中心ID(0~31)
 id.datacenterId: 1
 
-golden:
-  plugin:
-    mode: deployment
-    enabled: true
-    work-dir: D:/Workspaces/sh-model-platform/plugins
-    path: D:/Workspaces/sh-model-platform/plugins
-
 #sm4密钥
 sm4:
   secret-key: "8E4A7C2F9B1D5E3A6C8F0B2D4E6A8C05" # 32位十六进制字符串，对应16字节密钥

ruoyi-ui/src/views/codeModel(developer).vue

@@ -154,7 +154,6 @@ const formZu = ref({
   itemName:'',
   itemTp:'',
   itemEn:'',
-  itemTp:'',
   itemDataTp:'',
   itemDefaultVal:'',
   itemUnit:'',

ruoyi-ui/vite.config.js

@@ -35,11 +35,11 @@ export default defineConfig(({mode, command}) => {
             host: '0.0.0.0',
             open: true,
             proxy: {
-                '/profile/upload': {
-                    target: env.VITE_DEV_PATH,
-                    changeOrigin: true,
-                    rewrite: (p) => p.replace(/^\/profile\/upload/, '/profile/upload')
-                },
+                // '/profile/upload': {
+                //     target: env.VITE_DEV_PATH,
+                //     changeOrigin: true,
+                //     rewrite: (p) => p.replace(/^\/profile\/upload/, '/profile/upload')
+                // },
                 // https://cn.vitejs.dev/config/#server-proxy
                 '/sh-api': {
                     target: env.VITE_DEV_PATH,