This commit is contained in:
pycook 2019-11-11 00:25:22 +08:00
parent de22a4e04b
commit 618cd7ff16
3 changed files with 7 additions and 3 deletions

View File

@ -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,
},

View File

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

View File

@ -61,7 +61,6 @@ services:
CMDB_API_HOST: cmdb-api:5000
NGINX_PORT: 80
volumes:
- "$PWD/conf.d:/etc/nginx/conf.d"
- ./docs/nginx.cmdb.conf.example:/etc/nginx/conf.d/nginx.cmdb.conf.example
command:
- /bin/bash