From 341a4359fa486445287fbd39cfbe1854e4bbb368 Mon Sep 17 00:00:00 2001
From: pycook <pycook@126.com>
Date: Fri, 8 Nov 2019 14:37:53 +0800
Subject: [PATCH] fix unicode encode error

---
 api/Dockerfile               | 2 +-
 api/lib/cmdb/const.py        | 4 ++--
 api/lib/perm/acl/__init__.py | 0
 api/models/__init__.py       | 1 -
 docker-compose.yml           | 3 +--
 5 files changed, 4 insertions(+), 6 deletions(-)
 create mode 100644 api/lib/perm/acl/__init__.py

diff --git a/api/Dockerfile b/api/Dockerfile
index 09597fd..7b26ed7 100644
--- a/api/Dockerfile
+++ b/api/Dockerfile
@@ -10,7 +10,7 @@ COPY . /data/apps/cmdb
 
 WORKDIR /data/apps/cmdb
 
-RUN yum install -y epel-release \
+RUN yum install -y epel-release && yum clean all\
 	&&  yum install -y python-pip \
     && pip install  --no-cache-dir -r docs/requirements.txt 
 
diff --git a/api/lib/cmdb/const.py b/api/lib/cmdb/const.py
index a55d665..ffeabae 100644
--- a/api/lib/cmdb/const.py
+++ b/api/lib/cmdb/const.py
@@ -45,8 +45,8 @@ type_map = {
     'serialize': {
         Attribute.INT: int,
         Attribute.FLOAT: float,
-        Attribute.TEXT: str,
-        Attribute.TIME: str,
+        Attribute.TEXT: lambda x: x if isinstance(x, six.text_type) else str(x),
+        Attribute.TIME: lambda x: x if isinstance(x, six.text_type) else str(x),
         Attribute.DATE: lambda x: x.strftime("%Y-%m-%d"),
         Attribute.DATETIME: lambda x: x.strftime("%Y-%m-%d %H:%M:%S"),
     },
diff --git a/api/lib/perm/acl/__init__.py b/api/lib/perm/acl/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/api/models/__init__.py b/api/models/__init__.py
index c10c68e..fabbe66 100644
--- a/api/models/__init__.py
+++ b/api/models/__init__.py
@@ -3,4 +3,3 @@
 
 from .account import User
 from .cmdb import *
-from .acl import *
diff --git a/docker-compose.yml b/docker-compose.yml
index 96ed870..a3817be 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -33,7 +33,6 @@ services:
         sed -i 's#{user}:{password}@127.0.0.1:3306/{db}#cmdb:123456@mysql:3306/cmdb#g' api/settings.py
         sed -i 's/127.0.0.1/redis/g' api/settings.py
         gunicorn --workers=3 autoapp:app -b 0.0.0.0:5000 -D
-        sleep 5
         celery worker -A celery_worker.celery -E -Q cmdb_async --concurrency=1
     depends_on:
       - cmdb-db 
@@ -87,7 +86,7 @@ services:
       - -c
       - |
         envsubst '$$CMDB_API_HOST  $$CMDB_UI_HOST $$NGINX_PORT' < /etc/nginx/conf.d/nginx.cmdb.conf.example > /etc/nginx/conf.d/cmdb.conf
-        rm /etc/nginx/conf.d/default.conf
+        rm -f /etc/nginx/conf.d/default.conf
         nginx -g  'daemon off;'
         curl http://localhost/api/v0.1/ci/flush
     networks: