Merge branch 'master' of http://112.124.40.88:5510/root/NanJingLamanRadarProject

04.系统编码/Backend/src/main/resources/application.yml

@@ -3,12 +3,12 @@ server:
 #  port: 8082
 spring:
   datasource:
-    url: jdbc:mysql://112.124.40.88:33306/user_information?useUnicode=true&characteEncoding=utf-8
-    username: root
-    password: 3cqscbr@only1
-#    url: jdbc:mysql://10.124.102.10:3306/user_information?useUnicode=true&characteEncoding=utf-8
+#    url: jdbc:mysql://112.124.40.88:33306/user_information?useUnicode=true&characteEncoding=utf-8
 #    username: root
-#    password: Njsqxj_sthj@2021
+#    password: 3cqscbr@only1
+    url: jdbc:mysql://10.124.102.10:3306/user_information?useUnicode=true&characteEncoding=utf-8
+    username: root
+    password: Njsqxj_sthj@2021
 #    url: jdbc:mysql://192.168.6.6:3306/njsthj?useUnicode=true&characteEncoding=utf-8
 #    username: njsthj
 #    password: Njsqxj_sthj@2021
@@ -17,9 +17,9 @@ custom:
   image:
     url: ${custom.parent-url}:${server.port}/product
     gifPath: ${custom.image.path}/gif
-    path: D:/Deployments/LamanRadar/product
-  parent-url: http://112.124.40.88
-#    path: /home/project/NJEnvironmentPlatform/html/product
-#  parent-url: http://10.124.102.10
+#    path: D:/Deployments/LamanRadar/product
+#  parent-url: http://112.124.40.88
+    path: /home/project/NJEnvironmentPlatform/html/product
+  parent-url: http://10.124.102.10
 #    path: /home/develop/product
 #  parent-url: http://rdp.nagr.com.cn

04.系统编码/Frontend/src/uilts/axios.ts

@@ -5,9 +5,10 @@ import { ElLoading } from 'element-plus'
 
 let loading = null;
 const service = axios.create({
-    // baseURL:"http://112.124.40.88:8002",
+    baseURL:"http://112.124.40.88:8999",
     // baseURL:'http://rdp.nagr.com.cn:18080',
-    baseURL:"http://localhost:8002",
+    // baseURL:"http://localhost:8002",
+    // baseURL: '',
 
     // baseURL: 'http://localhost:8002',
     timeout: 500000