diff --git a/back/public/config/basicConfig.js b/back/public/config/basicConfig.js
index e1298e06..8f85d563 100644
--- a/back/public/config/basicConfig.js
+++ b/back/public/config/basicConfig.js
@@ -2,7 +2,7 @@
* @Author: hisense.wuhongjian
* @Date: 2022-08-25 14:37:49
* @LastEditors: hisense.wuhongjian
- * @LastEditTime: 2022-10-31 14:22:11
+ * @LastEditTime: 2022-11-01 09:22:02
* @Description: 告诉大家这是什么
*/
var _global = {}
@@ -17,34 +17,34 @@ var CONFIGITEM = {
// 青岛市大数据局
qingdao: {
previewUrl: 'http://15.72.183.90:7008/',
- apiURL: 'http://15.72.183.90:8000/renren-admin',
- websocketURL: 'ws://15.72.183.90:8000/renren-admin/websocket'
+ apiURL: 'http://15.72.183.90:8000/ucs-admin',
+ websocketURL: 'ws://15.72.183.90:8000/ucs-admin/websocket'
},
// 西海岸大数据局
xihaian: {
previewUrl: 'http://10.134.135.9:9796/',
- // apiURL: 'http://10.134.135.9:8888/renren-admin',
- // apiURL: 'http://10.16.5.35:8888/renren-admin', // 李志成-研发
- apiURL: 'http://192.168.124.236:8888/renren-admin',
- // apiURL: 'http://192.168.124.254:8888/renren-admin', // 李志成-远雄
- websocketURL: 'ws://10.134.135.9:8888/renren-admin/websocket'
+ // apiURL: 'http://10.134.135.9:8888/ucs-admin',
+ // apiURL: 'http://10.16.5.35:8888/ucs-admin', // 李志成-研发
+ apiURL: 'http://192.168.124.236:8888/ucs-admin',
+ // apiURL: 'http://192.168.124.254:8888/ucs-admin', // 李志成-远雄
+ websocketURL: 'ws://10.134.135.9:8888/ucs-admin/websocket'
},
// 测试
test: {
previewUrl: 'http://192.168.124.243:9796/',
- apiURL: 'http://192.168.124.243:8888/renren-admin',
- websocketURL: 'ws://192.168.124.243:8888/renren-admin/websocket'
+ apiURL: 'http://192.168.124.243:8888/ucs-admin',
+ websocketURL: 'ws://192.168.124.243:8888/ucs-admin/websocket'
},
// 内网穿透
frp: {
previewUrl: 'http://124.222.94.39:9796/',
- apiURL: 'http://124.222.94.39:8888/renren-admin',
- websocketURL: 'ws://124.222.94.39:8888/renren-admin/websocket'
+ apiURL: 'http://124.222.94.39:8888/ucs-admin',
+ websocketURL: 'ws://124.222.94.39:8888/ucs-admin/websocket'
},
dev: {
previewUrl: 'http://localhost:8080/',
- apiURL: 'http://192.168.124.243:8888/renren-admin',
- websocketURL: 'ws://192.168.243.243:8888/renren-admin/websocket'
+ apiURL: 'http://192.168.124.243:8888/ucs-admin',
+ websocketURL: 'ws://192.168.243.243:8888/ucs-admin/websocket'
}
}
}
diff --git a/back/src/utils/request.js b/back/src/utils/request.js
index 5e057959..14820e3c 100644
--- a/back/src/utils/request.js
+++ b/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
})
diff --git a/back/src/views/modules/sys/log-data-modification-log.vue b/back/src/views/modules/sys/log-data-modification-log.vue
index a482cea2..b9cb1e34 100644
--- a/back/src/views/modules/sys/log-data-modification-log.vue
+++ b/back/src/views/modules/sys/log-data-modification-log.vue
@@ -52,15 +52,15 @@
>
diff --git a/front/src/api/file.js b/front/src/api/file.js
index b4f0d1ce..4640320c 100644
--- a/front/src/api/file.js
+++ b/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
)
diff --git a/front/src/config/default/setting.config.js b/front/src/config/default/setting.config.js
index 204825b6..6e1d2218 100644
--- a/front/src/config/default/setting.config.js
+++ b/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'
diff --git a/front/vue.config.js b/front/vue.config.js
index efe1ac52..f63c3cc4 100644
--- a/front/vue.config.js
+++ b/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/',
// // },
// },
// },