From 7dbd6d43d6bbec90054c70eeff63eb254f0a7360 Mon Sep 17 00:00:00 2001 From: pnoker Date: Sun, 20 Dec 2020 17:38:34 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8Dk8s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 4 +- dc3/docker-compose.yml | 3 +- dc3/nginx/conf.d/default.conf | 29 +++--------- dc3/nginx/conf.d/location | 21 +++++++++ src/api/data.js | 4 +- src/api/manager.js | 86 +++++++++++++++++----------------- src/api/user.js | 8 ++-- src/views/layout/Layout.vue | 4 +- src/views/login/Login.vue | 2 +- src/views/point/PointValue.vue | 4 +- 10 files changed, 85 insertions(+), 80 deletions(-) create mode 100644 dc3/nginx/conf.d/location diff --git a/Dockerfile b/Dockerfile index b072189..d9b9fc2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,11 +20,11 @@ MAINTAINER pnoker pnokers@icloud.com RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime COPY ./dc3/nginx/ /etc/nginx/ -COPY ./dist/ /usr/share/nginx/html/ +COPY ./dist/ /usr/share/nginx/html/dc3/demo/ COPY ./dc3/dependencies/ssl/ /etc/ssl/ COPY ./dc3/dependencies/conf.crt/ /etc/nginx/conf.crt/ -EXPOSE 443 +EXPOSE 80 443 VOLUME /var/log/nginx CMD /bin/wait-for dc3-auth:8300 dc3-manager:8400 dc3-data:8500 -t 5 -- nginx -g 'daemon off;' diff --git a/dc3/docker-compose.yml b/dc3/docker-compose.yml index 4419208..cab76cc 100644 --- a/dc3/docker-compose.yml +++ b/dc3/docker-compose.yml @@ -5,9 +5,10 @@ services: build: context: ../ dockerfile: ./Dockerfile - image: pnoker/dc3-web:1.0 + image: pnoker/dc3-web:1.0.0 restart: always ports: + - 80:80 - 443:443 container_name: dc3-web hostname: dc3-web diff --git a/dc3/nginx/conf.d/default.conf b/dc3/nginx/conf.d/default.conf index 787d59c..bfe93e1 100644 --- a/dc3/nginx/conf.d/default.conf +++ b/dc3/nginx/conf.d/default.conf @@ -1,12 +1,13 @@ server { listen 80; - server_name dc3.com; - return 301 https://$server_name$request_uri; + + rewrite ^/$ /dc3/demo permanent; + + include /etc/nginx/conf.d/location; } server { listen 443 ssl; - server_name dc3-web; add_header X-Xss-Protection 1; add_header X-Frame-Options DENY; @@ -20,26 +21,8 @@ server { ssl_certificate /etc/nginx/conf.crt/dc3.site/fullchain.pem; ssl_certificate_key /etc/nginx/conf.crt/dc3.site/privkey.pem; - location / { - root /usr/share/nginx/html; - index index.html index.htm; - } - - location ^~/user_api/ { - proxy_pass http://dc3-auth:8300/; - } - - location ^~/manager_api/ { - proxy_pass http://dc3-manager:8400/; - } - - location ^~/data_api/ { - proxy_pass http://dc3-data:8500/; - } + rewrite ^/$ /dc3/demo permanent; - error_page 500 502 503 504 /50x.html; - location = /50x.html { - root /usr/share/nginx/html; - } + include /etc/nginx/conf.d/location; } diff --git a/dc3/nginx/conf.d/location b/dc3/nginx/conf.d/location new file mode 100644 index 0000000..250e8de --- /dev/null +++ b/dc3/nginx/conf.d/location @@ -0,0 +1,21 @@ +location / { + root /usr/share/nginx/html; + index index.html index.htm; +} + +location ^~/dc3/demo/user_api/ { + proxy_pass http://dc3-auth:8300/; +} + +location ^~/dc3/demo/manager_api/ { + proxy_pass http://dc3-manager:8400/; +} + +location ^~/dc3/demo/data_api/ { + proxy_pass http://dc3-data:8500/; +} + +error_page 500 502 503 504 /50x.html; +location = /50x.html { + root /usr/share/nginx/html; +} diff --git a/src/api/data.js b/src/api/data.js index 1831424..204a8f3 100644 --- a/src/api/data.js +++ b/src/api/data.js @@ -2,7 +2,7 @@ import request from '@/config/axios' export const pointValueApi = { list: (pointValue) => request({ - url: '/data_api/data/pointValue/list', + url: 'data_api/data/pointValue/list', method: 'post', data: pointValue }) @@ -10,7 +10,7 @@ export const pointValueApi = { export const deviceEventApi = { list: (event) => request({ - url: '/data_api/data/deviceEvent/list', + url: 'data_api/data/deviceEvent/list', method: 'post', data: event }) diff --git a/src/api/manager.js b/src/api/manager.js index 784e036..2d3dc91 100644 --- a/src/api/manager.js +++ b/src/api/manager.js @@ -2,16 +2,16 @@ import request from '@/config/axios' export const driverApi = { delete: (id) => request({ - url: '/manager_api/manager/driver/delete/' + id, + url: 'manager_api/manager/driver/delete/' + id, method: 'post' }), list: (driver) => request({ - url: '/manager_api/manager/driver/list', + url: 'manager_api/manager/driver/list', method: 'post', data: driver }), status: (driver) => request({ - url: '/manager_api/manager/driver/status', + url: 'manager_api/manager/driver/status', method: 'post', data: driver }) @@ -19,21 +19,21 @@ export const driverApi = { export const driverAttributeApi = { add: (driverAttribute) => request({ - url: '/manager_api/manager/driverAttribute/add', + url: 'manager_api/manager/driverAttribute/add', method: 'post', data: driverAttribute }), delete: (id) => request({ - url: '/manager_api/manager/driverAttribute/delete/' + id, + url: 'manager_api/manager/driverAttribute/delete/' + id, method: 'post' }), update: (driverAttribute) => request({ - url: '/manager_api/manager/driverAttribute/update', + url: 'manager_api/manager/driverAttribute/update', method: 'post', data: driverAttribute }), list: (driverAttribute) => request({ - url: '/manager_api/manager/driverAttribute/list', + url: 'manager_api/manager/driverAttribute/list', method: 'post', data: driverAttribute }) @@ -41,21 +41,21 @@ export const driverAttributeApi = { export const driverInfoApi = { add: (driverInfo) => request({ - url: '/manager_api/manager/driverInfo/add', + url: 'manager_api/manager/driverInfo/add', method: 'post', data: driverInfo }), delete: (id) => request({ - url: '/manager_api/manager/driverInfo/delete/' + id, + url: 'manager_api/manager/driverInfo/delete/' + id, method: 'post' }), update: (driverInfo) => request({ - url: '/manager_api/manager/driverInfo/update', + url: 'manager_api/manager/driverInfo/update', method: 'post', data: driverInfo }), list: (driverInfo) => request({ - url: '/manager_api/manager/driverInfo/list', + url: 'manager_api/manager/driverInfo/list', method: 'post', data: driverInfo }) @@ -63,21 +63,21 @@ export const driverInfoApi = { export const pointAttributeApi = { add: (pointAttribute) => request({ - url: '/manager_api/manager/pointAttribute/add', + url: 'manager_api/manager/pointAttribute/add', method: 'post', data: pointAttribute }), delete: (id) => request({ - url: '/manager_api/manager/pointAttribute/delete/' + id, + url: 'manager_api/manager/pointAttribute/delete/' + id, method: 'post' }), update: (pointAttribute) => request({ - url: '/manager_api/manager/pointAttribute/update', + url: 'manager_api/manager/pointAttribute/update', method: 'post', data: pointAttribute }), list: (pointAttribute) => request({ - url: '/manager_api/manager/pointAttribute/list', + url: 'manager_api/manager/pointAttribute/list', method: 'post', data: pointAttribute }) @@ -85,21 +85,21 @@ export const pointAttributeApi = { export const pointInfoApi = { add: (pointInfo) => request({ - url: '/manager_api/manager/pointInfo/add', + url: 'manager_api/manager/pointInfo/add', method: 'post', data: pointInfo }), delete: (id) => request({ - url: '/manager_api/manager/pointInfo/delete/' + id, + url: 'manager_api/manager/pointInfo/delete/' + id, method: 'post' }), update: (pointInfo) => request({ - url: '/manager_api/manager/pointInfo/update', + url: 'manager_api/manager/pointInfo/update', method: 'post', data: pointInfo }), list: (pointInfo) => request({ - url: '/manager_api/manager/pointInfo/list', + url: 'manager_api/manager/pointInfo/list', method: 'post', data: pointInfo }) @@ -107,21 +107,21 @@ export const pointInfoApi = { export const profileApi = { add: (profile) => request({ - url: '/manager_api/manager/profile/add', + url: 'manager_api/manager/profile/add', method: 'post', data: profile }), delete: (id) => request({ - url: '/manager_api/manager/profile/delete/' + id, + url: 'manager_api/manager/profile/delete/' + id, method: 'post' }), update: (profile) => request({ - url: '/manager_api/manager/profile/update', + url: 'manager_api/manager/profile/update', method: 'post', data: profile }), list: (profile) => request({ - url: '/manager_api/manager/profile/list', + url: 'manager_api/manager/profile/list', method: 'post', data: profile }) @@ -129,21 +129,21 @@ export const profileApi = { export const groupApi = { add: (group) => request({ - url: '/manager_api/manager/group/add', + url: 'manager_api/manager/group/add', method: 'post', data: group }), delete: (id) => request({ - url: '/manager_api/manager/group/delete/' + id, + url: 'manager_api/manager/group/delete/' + id, method: 'post' }), update: (group) => request({ - url: '/manager_api/manager/group/update', + url: 'manager_api/manager/group/update', method: 'post', data: group }), list: (group) => request({ - url: '/manager_api/manager/group/list', + url: 'manager_api/manager/group/list', method: 'post', data: group }) @@ -151,26 +151,26 @@ export const groupApi = { export const deviceApi = { add: (device) => request({ - url: '/manager_api/manager/device/add', + url: 'manager_api/manager/device/add', method: 'post', data: device }), delete: (id) => request({ - url: '/manager_api/manager/device/delete/' + id, + url: 'manager_api/manager/device/delete/' + id, method: 'post' }), update: (device) => request({ - url: '/manager_api/manager/device/update', + url: 'manager_api/manager/device/update', method: 'post', data: device }), list: (device) => request({ - url: '/manager_api/manager/device/list', + url: 'manager_api/manager/device/list', method: 'post', data: device }), status: (device) => request({ - url: '/manager_api/manager/device/status', + url: 'manager_api/manager/device/status', method: 'post', data: device }) @@ -178,21 +178,21 @@ export const deviceApi = { export const pointApi = { add: (point) => request({ - url: '/manager_api/manager/point/add', + url: 'manager_api/manager/point/add', method: 'post', data: point }), delete: (id) => request({ - url: '/manager_api/manager/point/delete/' + id, + url: 'manager_api/manager/point/delete/' + id, method: 'post' }), update: (point) => request({ - url: '/manager_api/manager/point/update', + url: 'manager_api/manager/point/update', method: 'post', data: point }), list: (point) => request({ - url: '/manager_api/manager/point/list', + url: 'manager_api/manager/point/list', method: 'post', data: point }) @@ -200,31 +200,31 @@ export const pointApi = { export const dictionaryApi = { driverDictionary: () => request({ - url: '/manager_api/manager/dictionary/driver', + url: 'manager_api/manager/dictionary/driver', method: 'get' }), profileDictionary: () => request({ - url: '/manager_api/manager/dictionary/profile', + url: 'manager_api/manager/dictionary/profile', method: 'get' }), driverAttributeDictionary: () => request({ - url: '/manager_api/manager/dictionary/driverAttribute', + url: 'manager_api/manager/dictionary/driverAttribute', method: 'get' }), pointAttributeDictionary: () => request({ - url: '/manager_api/manager/dictionary/pointAttribute', + url: 'manager_api/manager/dictionary/pointAttribute', method: 'get' }), groupDictionary: () => request({ - url: '/manager_api/manager/dictionary/group', + url: 'manager_api/manager/dictionary/group', method: 'get' }), deviceDictionary: (parent) => request({ - url: '/manager_api/manager/dictionary/device/' + parent, + url: 'manager_api/manager/dictionary/device/' + parent, method: 'get' }), pointDictionary: (parent) => request({ - url: '/manager_api/manager/dictionary/point/' + parent, + url: 'manager_api/manager/dictionary/point/' + parent, method: 'get' }) }; diff --git a/src/api/user.js b/src/api/user.js index 981ccc7..be345a7 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -1,7 +1,7 @@ import request from '@/config/axios' export const generateSalt = (name) => request({ - url: '/user_api/auth/token/salt', + url: 'user_api/auth/token/salt', method: 'get', params: { username: name @@ -9,13 +9,13 @@ export const generateSalt = (name) => request({ }); export const generateToken = (user) => request({ - url: '/user_api/auth/token/generate', + url: 'user_api/auth/token/generate', method: 'post', data: user }); export const checkTokenValid = (user, token) => request({ - url: '/user_api/auth/token/check', + url: 'user_api/auth/token/check', method: 'get', params: { username: user, @@ -24,7 +24,7 @@ export const checkTokenValid = (user, token) => request({ }); export const cancelToken = (name) => request({ - url: '/user_api/auth/token/cancel', + url: 'user_api/auth/token/cancel', method: 'get', params: { username: name diff --git a/src/views/layout/Layout.vue b/src/views/layout/Layout.vue index fdb34bb..8406a20 100644 --- a/src/views/layout/Layout.vue +++ b/src/views/layout/Layout.vue @@ -2,7 +2,7 @@
- + - + diff --git a/src/views/login/Login.vue b/src/views/login/Login.vue index 3d67aad..ab89fe3 100644 --- a/src/views/login/Login.vue +++ b/src/views/login/Login.vue @@ -2,7 +2,7 @@