From 3d6a4dc8bf13fd6ff5d4d13d97463683cc40cb10 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 19 七月 2023 12:27:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/vue.config.js | 4 ++--
Source/UBCS/service-start.sh | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index 0991057..ad43a75 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -26,10 +26,10 @@
proxy: {
'/api': {
//鏈湴鏈嶅姟鎺ュ彛鍦板潃
- // target: 'http://localhost:37000',
+ target: 'http://localhost:37000',
// target: 'http://192.168.1.51:37000',
// target: 'http://192.168.1.46:37000',
- target: 'http://dev.vci-tech.com:37000',
+ // target: 'http://dev.vci-tech.com:37000',
// target: 'http://192.168.1.51:37000/',
// target: 'http://192.168.1.104:37000',
// target: 'http://192.168.1.63:37000',
diff --git a/Source/UBCS/service-start.sh b/Source/UBCS/service-start.sh
index 14e2797..27a55c6 100644
--- a/Source/UBCS/service-start.sh
+++ b/Source/UBCS/service-start.sh
@@ -26,8 +26,8 @@
docker run -d -p 36004:36004 --name ubcs-flow vci-ubcs/ubcs-flow:latest
#鍚姩develop鏈嶅姟
-# docker build -f ./ubcs-ops/ubcs-develop/Dockerfile -t vci-ubcs/ubcs-develop .
-# docker run -d -p 36003:36003 --name ubcs-develop vci-ubcs/ubcs-develop:latest
+ docker build -f ./ubcs-ops/ubcs-develop/Dockerfile -t vci-ubcs/ubcs-develop .
+ docker run -d -p 36003:36003 --name ubcs-develop vci-ubcs/ubcs-develop:latest
#鍚姩jobAdmin鏈嶅姟
# docker build -f ./ubcs-ops/ubcs-xxljob-admin/Dockerfile -t vci-ubcs/ubcs-jobadmin .
--
Gitblit v1.9.3