Merge branch 'master' of https://github.com/pycook/cmdb

Pipfile

@@ -19,7 +19,7 @@ redis = "==3.2.1"
 Flask-Migrate = "==2.5.2"
 # Deployment
 gevent = "==1.4.0"
-gunicorn = ">=19.1.1"
+gunicorn = "==19.5.0"
 supervisor = "==4.0.3"
 # Auth
 Flask-Login = "==0.4.1"

README.md

@@ -56,9 +56,11 @@ cp api/settings.py.example api/settings.py
   - 浏览器打开:  [http://127.0.0.1:8000](http://127.0.0.1:8000)
     - 如果是非本机访问, 要修改**ui/.env**里**VUE_APP_API_BASE_URL**里的IP地址为后端服务的ip地址
 
-docker运行
+docker 一键构建和运行
 ----
-进入主目录
+- 进入主目录（首次镜像的构建需要**10分钟**左右，视网络情况而定）
 ```
     docker-compose up -d
 ```
+
+- 浏览器打开: [http://localhost:8000](http://localhost:8000)

api/Dockerfile

@@ -15,4 +15,3 @@ RUN yum install -y epel-release && yum clean all\
     && pip install  --no-cache-dir -r docs/requirements.txt 
 
 CMD ["bash", "-c", "cp api/settings.py.example api/settings.py && sed -i 's#{user}:{password}@127.0.0.1:3306/{db}#:@127.0.0.1:3306/cmdb#g' api/settings.py && flask run"]
-

api/lib/cmdb/const.py

@@ -1,5 +1,8 @@
 # -*- coding:utf-8 -*- 
 
+
+from __future__ import unicode_literals
+
 import datetime
 
 import six
@@ -37,8 +40,8 @@ type_map = {
     'deserialize': {
         Attribute.INT: string2int,
         Attribute.FLOAT: float,
-        Attribute.TEXT: escape,
-        Attribute.TIME: escape,
+        Attribute.TEXT: lambda x: escape(x).encode('utf-8').decode('utf-8'),
+        Attribute.TIME: lambda x: escape(x).encode('utf-8').decode('utf-8'),
         Attribute.DATETIME: str2datetime,
         Attribute.DATE: str2datetime,
     },

api/lib/cmdb/value.py

@@ -1,6 +1,8 @@
 # -*- coding:utf-8 -*- 
 
 
+from __future__ import unicode_literals
+
 import markupsafe
 from flask import abort
 

docker-compose.yml

@@ -1,24 +1,6 @@
 version: '3.4'
 
 services:
-  cmdb-ui:
-    build:
-      context: ./ui
-      dockerfile: Dockerfile
-    image: cmdb-ui:0.1
-    container_name: cmdb-ui
-    command: ["sh", "-c", "sed -i 's#http://127.0.0.1:5000##g' .env && yarn run serve"]
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:5000"]
-      interval: 5s
-      timeout: 5s
-      retries: 100
-      start_period: 10s
-    depends_on:
-      - cmdb-api
-    networks:
-      - new
-
   cmdb-api:
     build: 
       context: . 
@@ -67,17 +49,16 @@ services:
         aliases:
           - redis
 
-  cmdb-proxy:
-    image: nginx:latest
-    container_name: cmdb-proxy
+  cmdb-ui:
+    build:
+      context: ./ui
+      dockerfile: Dockerfile
+    image: cmdb-ui:0.1
+    container_name: cmdb-ui
     depends_on: 
       - cmdb-api
-      - cmdb-ui
-    volumes:
-      - "$PWD/conf.d:/etc/nginx/conf.d"
     environment:
       CMDB_API_HOST: cmdb-api:5000
-      CMDB_UI_HOST: cmdb-ui:8000
       NGINX_PORT: 80
     volumes:
       - ./docs/nginx.cmdb.conf.example:/etc/nginx/conf.d/nginx.cmdb.conf.example
@@ -85,14 +66,14 @@ services:
       - /bin/bash
       - -c
       - |
-        envsubst '$$CMDB_API_HOST  $$CMDB_UI_HOST $$NGINX_PORT' < /etc/nginx/conf.d/nginx.cmdb.conf.example > /etc/nginx/conf.d/cmdb.conf
+        envsubst '$$CMDB_API_HOST  $$NGINX_PORT' < /etc/nginx/conf.d/nginx.cmdb.conf.example > /etc/nginx/conf.d/cmdb.conf
         rm -f /etc/nginx/conf.d/default.conf
+        curl http://cmdb-api:5000/api/v0.1/ci/flush
         nginx -g  'daemon off;'
-        curl http://localhost/api/v0.1/ci/flush
     networks:
       - new
     ports:
-      - "80:80"
+      - "8000:80"
 
 volumes:
   db-data:

docs/nginx.cmdb.conf.example

@@ -25,9 +25,12 @@ server {
         application/xml
         application/rss+xml
         image/svg+xml;
+
+    root  /etc/nginx/html;
     location / {
-      	proxy_pass http://${CMDB_UI_HOST};
-        proxy_set_header Host $host;
+      root   /etc/nginx/html;
+      index  index.html;
+      try_files $uri $uri/ /index.html;
     }
     location /api {
         proxy_pass http://${CMDB_API_HOST};
@@ -41,4 +44,11 @@ server {
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection "upgrade";
     }
+    location ~* \.(css|js)$ {
+        access_log off;
+        add_header Pragma public;
+        add_header Cache-Control "public, max-age=7776000";
+        #add_header Cache-Control "public,no-cache, max-age=0";
+        add_header X-Asset "yes";
+    }
 }

docs/requirements.txt

@@ -14,7 +14,7 @@ redis ==3.2.1
 Flask-Migrate == 2.5.2
 # Deployment
 gevent ==1.4.0
-gunicorn>=19.1.1
+gunicorn == 19.5.0
 supervisor ==4.0.3
 # Auth
 Flask-Login ==0.4.1

ui/Dockerfile

@@ -1,13 +1,18 @@
-FROM alpine:3.9
+FROM node:alpine as builder
 
 LABEL description="cmdb-ui"
 
-RUN mkdir -p /data/apps/cmdb-ui/logs
-
 COPY . /data/apps/cmdb-ui 
 
 WORKDIR /data/apps/cmdb-ui
 
-RUN apk add yarn && yarn install 
+RUN sed -i 's#http://127.0.0.1:5000##g' .env && yarn install  && yarn build
 
-CMD ["sh", "-c", "yarn run serve"]
+
+FROM nginx:latest
+
+RUN apt-get update && apt-get install -y curl && apt-get clean
+
+RUN mkdir /etc/nginx/html
+
+COPY --from=builder /data/apps/cmdb-ui/dist /etc/nginx/html/

ui/src/api/login.js

@@ -51,7 +51,6 @@ export function logout() {
       }
     })
   }
-
 }
 
 /**

ui/src/config/router.config.js

@@ -1,7 +1,7 @@
 // eslint-disable-next-line
 import store from '@/store'
 
-import { UserLayout, BasicLayout, RouteView, PageView } from '@/layouts'
+import { UserLayout, BasicLayout, RouteView } from '@/layouts'
 import { getPreference } from '@/api/cmdb/preference'
 
 const cmdbRouter = [

ui/src/permission.js

@@ -7,7 +7,7 @@ import 'nprogress/nprogress.css' // progress bar style
 import notification from 'ant-design-vue/es/notification'
 import { setDocumentTitle, domTitle } from '@/utils/domUtil'
 import config from '@/config/defaultSettings'
-import { ACCESS_TOKEN } from './store/mutation-types';
+import { ACCESS_TOKEN } from './store/mutation-types'
 
 NProgress.configure({ showSpinner: false }) // NProgress Configuration
 
@@ -44,15 +44,13 @@ router.beforeEach((to, from, next) => {
           store.dispatch('Logout')
         }, 3000)
       })
-
   } else if (to.path === '/user/login' && !config.useSSO && store.getters.roles.length !== 0) {
     next({ path: '/' })
     NProgress.done()
-  } else if (!config.useSSO && !Vue.ls.get(ACCESS_TOKEN) && to.path !== "/user/login") {
+  } else if (!config.useSSO && !Vue.ls.get(ACCESS_TOKEN) && to.path !== '/user/login') {
     next({ path: '/user/login', query: { redirect: to.fullPath } })
     NProgress.done()
-  }
-  else {
+  } else {
     next()
   }
 })

ui/src/views/cmdb/ci/index.vue

@@ -322,9 +322,9 @@ export default {
       this.loadTip = '正在下载 ...'
       const promises = this.selectedRowKeys.map(ciId => {
         return searchCI(`q=_id:${ciId}`).then(res => {
-          let ciMap = {}
+          const ciMap = {}
           Object.keys(res.result[0]).forEach(k => {
-            if (!["ci_type", "_id", "ci_type_alias", "_type"].includes(k)) {
+            if (!['ci_type', '_id', 'ci_type_alias', '_type'].includes(k)) {
               ciMap[k] = res.result[0][k]
             }
           })

ui/src/views/cmdb/ci/modules/CreateInstanceForm.vue

@@ -130,7 +130,7 @@ export default {
       this.form.validateFields((err, values) => {
         Object.keys(values).forEach(k => {
           if (typeof values[k] === 'object') {
-            values[k] = values[k].format("YYYY-MM-DD HH:mm:ss")
+            values[k] = values[k].format('YYYY-MM-DD HH:mm:ss')
           }
         })
         if (!err) {