Merge branch 'hi-ucs-pre' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-pre

back/public/config/basicConfig.js

@@ -1,8 +1,8 @@
 /*
  * @Author: hisense.wuhongjian
  * @Date: 2022-08-25 14:37:49
- * @LastEditors: Light
- * @LastEditTime: 2022-11-01 09:20:12
+ * @LastEditors: hisense.wuhongjian
+ * @LastEditTime: 2022-11-01 15:37:21
  * @Description: 告诉大家这是什么
  */
 var _global = {}
@@ -43,8 +43,8 @@ var CONFIGITEM = {
     },
     dev: {
       previewUrl: 'http://localhost:8080/',
-      apiURL: 'http://192.168.124.243:8888/ucs-admin',
-      websocketURL: 'ws://192.168.124.243:8888/ucs-admin/websocket'
+      apiURL: 'http://192.168.124.236:8888/ucs-admin',
+      websocketURL: 'ws://192.168.243.236:8888/ucs-admin/websocket'
     }
   }
 }

back/src/utils/request.js

@@ -14,7 +14,7 @@ import isPlainObject from 'lodash/isPlainObject'
 
 const http = axios.create({
   baseURL: window.SITE_CONFIG.apiURL,
-  // baseURL: 'http://15.2.21.238:8888/renren-admin/',
+  // baseURL: 'http://15.2.21.238:8888/ucs-admin/',
   timeout: 1000 * 180,
   withCredentials: true
 })

back/src/views/modules/sys/log-data-modification-log.vue

@@ -52,15 +52,15 @@
           >
             <el-option
               label="增加"
-              value="/renren-admin/resource%/insert"
+              value="/ucs-admin/resource%/insert"
             ></el-option>
             <el-option
               label="更新"
-              value="/renren-admin/resource%/update"
+              value="/ucs-admin/resource%/update"
             ></el-option>
             <el-option
               label="删除"
-              value="/renren-admin/resource%/delete"
+              value="/ucs-admin/resource%/delete"
             ></el-option>
           </el-select>
         </el-form-item>

front/src/api/file.js

@@ -128,7 +128,7 @@ export function initiateMeet(data) {
   //   data: data,
   // })
   return axios.post(
-    'http://10.134.135.92:8888/renren-admin/enke/initiateMeet',
+    'http://10.134.135.92:8888/ucs-admin/enke/initiateMeet',
     data,
     config2
   )

front/src/config/default/setting.config.js

@@ -23,9 +23,9 @@ const setting = {
   // baseURL: 'mock-server',
   // 请求接口
   // 丁港
-  baseURL: 'http://15.72.183.90:8000/renren-admin',
-  // : 'http://15.2.21.238:8888/renren-admin/',
-  // 'http://15.72.183.90:8000/renren-admin',
+  baseURL: 'http://15.72.183.90:8000/ucs-admin',
+  // : 'http://15.2.21.238:8888/ucs-admin/',
+  // 'http://15.72.183.90:8000/ucs-admin',
   // 黄工
   // baseURL:
   //   process.env.NODE_ENV === 'development'

front/vue.config.js

@@ -74,12 +74,12 @@ module.exports = {
     // // },
     // // 注释掉的地方是前端配置代理访问后端的示例
     // proxy: {
-    //   '/renren-admin': {
+    //   '/ucs-admin': {
     //     target: `http://15.2.21.238:8888`,
     //     // ws: true,
     //     changeOrigin: true,
     //     // pathRewrite: {
-    //     //   '^/': '/renren-admin/',
+    //     //   '^/': '/ucs-admin/',
     //     // },
     //   },
     // },