ver1.2.0 完善功能;新增 docker 方式部署;尝试加入 celery 4.3.0 实现异步任务

leffss · Aug 2, 2019 · 9424c2f · 9424c2f
1 parent 6fde80d
commit 9424c2f
Show file tree

Hide file tree

Showing 66 changed files with 2,298 additions and 363 deletions.
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,8 @@
+FROM python:3.7
+ADD . /devops
+WORKDIR /devops
+RUN cd /devops && pip install -i https://mirrors.aliyun.com/pypi/simple/ -r requirements.txt
+RUN cd /devops && echo_supervisord_conf > /etc/supervisord.conf && cat deamon.ini >> /etc/supervisord.conf && \
+	sed -i 's/nodaemon=false/nodaemon=true/g' /etc/supervisord.conf
+EXPOSE 8000
+ENTRYPOINT ["supervisord", "-c", "/etc/supervisord.conf"]
diff --git a/README.md b/README.md
@@ -3,6 +3,7 @@
 
 
 # 安装
+原始方式
 ```
 # 安装相关库
 pip install -r requirements.txt
@@ -11,6 +12,11 @@ pip install -r requirements.txt
 python3 manage.py runserver
 ```
 
+docker方式(centos7)
+```
+sh start_docker.sh
+```
+
 访问首页：http://127.0.0.1:8000
 账号： admin     密码：123456
 
@@ -29,15 +35,15 @@ python3 manage.py runserver
 
 # TODO LISTS
 - [x] 用户登陆
-- [ ] 查看用户信息
-- [ ] 修改用户信息
+- [x] 查看用户信息
+- [x] 修改用户信息
 - [x] 修改用户密码
 - [ ] 重置用户密码
 - [x] 查看用户
 - [x] 查看用户组
 - [ ] 添加用户
 - [ ] 添加用户组
-- [ ] 修改用户
+- [x] 修改用户
 - [ ] 修改用户组
 - [ ] 删除用户
 - [ ] 删除用户组

diff --git a/db.sqlite3 b/db.sqlite3