diff --git a/docker.sh b/docker.sh index 8a5db81..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 --restart=always -d -p 28081:80 smartopsweb:latest +docker run --name smartopsweb --link smartopsserver --restart=always -d -p 28081:80 smartopsweb:latest diff --git a/nginx.conf b/nginx.conf index a9e94c9..7b3267f 100644 --- a/nginx.conf +++ b/nginx.conf @@ -29,6 +29,20 @@ http { listen 80; listen [::]:80; + + location /api { + proxy_pass http://smartopsserver:8080; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-Forwarded-Port $server_port; + proxy_set_header Host $host; + rewrite "^/api/(.*)$" /$1 break; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection 'upgrade'; + client_max_body_size 30m; + } + location / { root /home/clay; index index.html index.htm; diff --git a/src/components/liveCall/LiveCallItemHome.vue b/src/components/liveCall/LiveCallItemHome.vue index 58bc90c..b6ee640 100644 --- a/src/components/liveCall/LiveCallItemHome.vue +++ b/src/components/liveCall/LiveCallItemHome.vue @@ -6,32 +6,36 @@ 电话号码:{{ recordObj.phone ||'--'}}
{{ item.speaker==0?item.callIdNumber:'AI助手' }}
-{{ item.speaker==0?item.callIdNumber:'AI助手' }}
+{{ item.speaker==0?item.callIdNumber:'AI助手' }}
-{{ item.speaker==0?item.callIdNumber:'AI助手' }}
+