From fca6d319dd5e59f2612e9b0d6ddcd1c7d22aa073 Mon Sep 17 00:00:00 2001 From: zhangkaihuai Date: Sun, 13 Oct 2024 05:33:50 +0000 Subject: [PATCH 01/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20docker.sh?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker.sh b/docker.sh index 1b0153e..bd79349 100644 --- a/docker.sh +++ b/docker.sh @@ -12,5 +12,5 @@ docker rmi smartopsweb:latest echo '----build image start----' docker build -t smartopsweb:latest . echo '----build image success----' -docker run --name smartopsweb --link smartopsserver --restart=always -d -p 28081:80 smartopsweb:latest +docker run --name smartopsweb --link smartopsserver --restart=always -d -p 80:80 smartopsweb:latest From 82a5cebf3b4771be077ffe5d5e0d02df227290c9 Mon Sep 17 00:00:00 2001 From: zhangkaihuai Date: Tue, 22 Oct 2024 11:34:22 +0000 Subject: [PATCH 02/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20docker.sh?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker.sh b/docker.sh index bd79349..c6b5d47 100644 --- a/docker.sh +++ b/docker.sh @@ -12,5 +12,5 @@ docker rmi smartopsweb:latest echo '----build image start----' docker build -t smartopsweb:latest . echo '----build image success----' -docker run --name smartopsweb --link smartopsserver --restart=always -d -p 80:80 smartopsweb:latest +docker run --name smartopsweb --link smartopsserver --restart=always -d -p 20002:80 smartopsweb:latest From 666fd543b906ef18e719aa5d9cfff72f8df3ed17 Mon Sep 17 00:00:00 2001 From: zhangkaihuai Date: Tue, 22 Oct 2024 11:37:19 +0000 Subject: [PATCH 03/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20docker.sh?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker.sh b/docker.sh index c6b5d47..1b0153e 100644 --- a/docker.sh +++ b/docker.sh @@ -12,5 +12,5 @@ docker rmi smartopsweb:latest echo '----build image start----' docker build -t smartopsweb:latest . echo '----build image success----' -docker run --name smartopsweb --link smartopsserver --restart=always -d -p 20002:80 smartopsweb:latest +docker run --name smartopsweb --link smartopsserver --restart=always -d -p 28081:80 smartopsweb:latest From f17f19466cfe5ad125b3ef473752798c15f38d44 Mon Sep 17 00:00:00 2001 From: zhangkaihuai Date: Tue, 22 Oct 2024 11:44:18 +0000 Subject: [PATCH 04/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20docker.sh?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker.sh b/docker.sh index 1b0153e..bc37826 100644 --- a/docker.sh +++ b/docker.sh @@ -12,5 +12,5 @@ docker rmi smartopsweb:latest echo '----build image start----' docker build -t smartopsweb:latest . echo '----build image success----' -docker run --name smartopsweb --link smartopsserver --restart=always -d -p 28081:80 smartopsweb:latest +docker run --name smartopsweb --link smartopsserver --restart=always -d -p 8080:80 smartopsweb:latest From 194768a232b195bd3d5e5985d36358b517b47ebc Mon Sep 17 00:00:00 2001 From: zhangkaihuai Date: Sat, 16 Nov 2024 03:08:41 +0000 Subject: [PATCH 05/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20src/components/liveC?= =?UTF-8?q?all/index.vue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/liveCall/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/liveCall/index.vue b/src/components/liveCall/index.vue index 79a18b1..cd66225 100644 --- a/src/components/liveCall/index.vue +++ b/src/components/liveCall/index.vue @@ -91,8 +91,8 @@ const handleShowDeadLine=(recordObj,data)=>{ } const initWebSocket = () => { try { - // const wsUrl=setWsUrl(`/ws/text/${token}`) - const wsUrl = `ws://frp.feashow.cn:31800/ws/text/${token}` + const wsUrl=setWsUrl(`/ws/text/${token}`) + //const wsUrl = `ws://frp.feashow.cn:31800/ws/text/${token}` // const wsUrl = `ws://112.19.165.99:20002/api/ws/text/${token}` socket = new WebSocket(wsUrl) // 2. ws.send()给服务器发送信息 From 9b79836cb44509c05bcf733507e1f98aa5f810e9 Mon Sep 17 00:00:00 2001 From: zhangkaihuai Date: Sat, 16 Nov 2024 03:12:21 +0000 Subject: [PATCH 06/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20src/components/liveC?= =?UTF-8?q?all/index.vue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/liveCall/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/liveCall/index.vue b/src/components/liveCall/index.vue index cd66225..0227183 100644 --- a/src/components/liveCall/index.vue +++ b/src/components/liveCall/index.vue @@ -91,9 +91,9 @@ const handleShowDeadLine=(recordObj,data)=>{ } const initWebSocket = () => { try { - const wsUrl=setWsUrl(`/ws/text/${token}`) - //const wsUrl = `ws://frp.feashow.cn:31800/ws/text/${token}` - // const wsUrl = `ws://112.19.165.99:20002/api/ws/text/${token}` + // const wsUrl=setWsUrl(`/ws/text/${token}`) + // const wsUrl = `ws://frp.feashow.cn:31800/ws/text/${token}` + const wsUrl = `ws://112.19.165.99:20002/api/ws/text/${token}` socket = new WebSocket(wsUrl) // 2. ws.send()给服务器发送信息 //连接发生错误的回调方法 From 89d24216e5f765e803c58f876fe2c2a55c6de0fe Mon Sep 17 00:00:00 2001 From: zhangkaihuai Date: Sat, 16 Nov 2024 03:24:35 +0000 Subject: [PATCH 07/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20src/components/liveC?= =?UTF-8?q?all/index.vue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/liveCall/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/liveCall/index.vue b/src/components/liveCall/index.vue index 0227183..1a67bc4 100644 --- a/src/components/liveCall/index.vue +++ b/src/components/liveCall/index.vue @@ -93,7 +93,8 @@ const initWebSocket = () => { try { // const wsUrl=setWsUrl(`/ws/text/${token}`) // const wsUrl = `ws://frp.feashow.cn:31800/ws/text/${token}` - const wsUrl = `ws://112.19.165.99:20002/api/ws/text/${token}` + // const wsUrl = `ws://112.19.165.99:20002/api/ws/text/${token}` + const wsUrl = `ws://192.168.1.71:88/api/ws/text/${token}` socket = new WebSocket(wsUrl) // 2. ws.send()给服务器发送信息 //连接发生错误的回调方法 From 391d477f8216058762a573e51733048284b8ca23 Mon Sep 17 00:00:00 2001 From: zhangkaihuai Date: Sat, 16 Nov 2024 05:03:31 +0000 Subject: [PATCH 08/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20src/components/liveC?= =?UTF-8?q?all/index.vue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/liveCall/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/liveCall/index.vue b/src/components/liveCall/index.vue index 1a67bc4..c857892 100644 --- a/src/components/liveCall/index.vue +++ b/src/components/liveCall/index.vue @@ -94,7 +94,7 @@ const initWebSocket = () => { // const wsUrl=setWsUrl(`/ws/text/${token}`) // const wsUrl = `ws://frp.feashow.cn:31800/ws/text/${token}` // const wsUrl = `ws://112.19.165.99:20002/api/ws/text/${token}` - const wsUrl = `ws://192.168.1.71:88/api/ws/text/${token}` + const wsUrl = `ws://192.168.1.71:88/ws/text/${token}` socket = new WebSocket(wsUrl) // 2. ws.send()给服务器发送信息 //连接发生错误的回调方法 From e7f3f1829464ff5a0c256d82ea6acace8222630b Mon Sep 17 00:00:00 2001 From: clay <20932067@zju.edu.cn> Date: Fri, 22 Nov 2024 02:43:32 +0000 Subject: [PATCH 09/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20docker.sh?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/docker.sh b/docker.sh index bc37826..df8cea9 100644 --- a/docker.sh +++ b/docker.sh @@ -1,11 +1,4 @@ #!/bin/sh -# 定义应用组名 -group_name='clay' -# 定义应用名称 -app_name=$DRONE_REPO_NAME -# 定义应用版本 -app_version=$DRONE_COMMIT -echo ${app_version} # 打包编译docker镜像 docker rm -f smartopsweb docker rmi smartopsweb:latest From 30d95437297817d0250161162ff9cd9e46838766 Mon Sep 17 00:00:00 2001 From: zhangkaihuai Date: Tue, 14 Jan 2025 11:41:09 +0000 Subject: [PATCH 10/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20src/views/phone-traf?= =?UTF-8?q?fic-management/address-book-management/index.vue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../address-book-management/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/phone-traffic-management/address-book-management/index.vue b/src/views/phone-traffic-management/address-book-management/index.vue index f378510..dc0c215 100644 --- a/src/views/phone-traffic-management/address-book-management/index.vue +++ b/src/views/phone-traffic-management/address-book-management/index.vue @@ -61,8 +61,8 @@ const formRules = reactive({ {required: true, message: "请输入拨打单位", trigger: ["change", "blur"]} ], phone: [ - {required: true, message: "请输入手机号码", trigger: ["change", "blur"]}, - {validator: checkPhone, trigger: ["change", "blur"]}, + {required: true, message: "请输入手机号码", trigger: ["change", "blur"]} + //{validator: checkPhone, trigger: ["change", "blur"]}, ] }); const formSchema = computed(() => {