20240715_sun

package-lock.json

@@ -0,0 +1,6 @@
+{
+  "name": "okc-vue",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {}
+}

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

@@ -6,6 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
+#                url: jdbc:mysql://localhost:3306/okc-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#                username: root
+#                password: 123456
                 url: jdbc:mysql://121.36.73.159:56612/okc-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: dev
                 password: sckj2022@123
@@ -13,9 +16,9 @@ spring:
             slave:
                 # 从数据源开关/默认关闭
                 enabled: false
-                url: 
-                username: 
-                password: 
+                url:
+                username:
+                password:
             # 初始连接数
             initialSize: 5
             # 最小连接池数量
@@ -35,7 +38,7 @@ spring:
             testWhileIdle: true
             testOnBorrow: false
             testOnReturn: false
-            webStatFilter: 
+            webStatFilter:
                 enabled: true
             statViewServlet:
                 enabled: true
@@ -54,4 +57,4 @@ spring:
                     merge-sql: true
                 wall:
                     config:
-                        multi-statement-allow: true
+                        multi-statement-allow: true

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

@@ -9,8 +9,8 @@ ruoyi:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-#  profile: C:/ruoyi/uploadPath
-  profile: /home/ruoyi/okc/uploadPath
+  profile: E:/okc/uploadPath
+#  profile: /home/ruoyi/okc/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证
@@ -71,6 +71,7 @@ spring:
   # redis 配置
   redis:
     # 地址
+#    host: localhost
     host: 10.16.4.12
     # 端口，默认为6379
     port: 6379

ruoyi-ui/vue.config.js

@@ -36,8 +36,8 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://10.16.4.5:8080`, // 孙坤阳
-        // target: `http://localhost:8080`,
-        target: `http://121.36.73.159:803/prod-api`,
+        target: `http://localhost:8080`,
+        // target: `http://121.36.73.159:803/prod-api`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''