适配k8s

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;'

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

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;
 }
 

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;
+}

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
     })

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'
     })
 };

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

src/views/layout/Layout.vue

@@ -2,7 +2,7 @@
     <div class="container">
         <div class="header">
             <el-col :span="4" class="header_item">
-                <img class="logo" src="/images/logo/logo.png">
+                <img class="logo" src="images/logo/logo.png">
             </el-col>
             <el-col :span="16" class="header_item">
                 <el-menu class="menu"
@@ -38,7 +38,7 @@
                 <el-dropdown class="avatar_item" @command="handleCommand">
                     <span class="el-dropdown-link">
                         <el-avatar>
-                            <img src="/images/common/avatar.png">
+                            <img src="images/common/avatar.png">
                         </el-avatar>
                     </span>
                     <el-dropdown-menu slot="dropdown">

src/views/login/Login.vue

@@ -2,7 +2,7 @@
     <div class="login-container">
         <div class="login-wrapper-left animated bounceInDown">
             <div class="login-left">
-                <img class="img" src="/images/logo/logo-white.png">
+                <img class="img" src="images/logo/logo-white.png">
             </div>
         </div>
         <particles/>

src/views/point/PointValue.vue

@@ -88,8 +88,8 @@
                             prop: 'value',
                             span: 12
                         }, {
-                            label: '自定义',
-                            prop: 'customValue',
+                            label: '计算值',
+                            prop: 'calculateValue',
                             span: 12
                         }, {
                             label: '采集日期',