[pull] master from CoderWanFeng:master

Dockerfile

@@ -0,0 +1,20 @@
+FROM dockerhub.cloud/library/python:3.7
+
+# 配置环境变量
+ENV PYTHONUNBUFFERED 1
+#ARG PIP_MIRROR
+
+# 安装依赖环境
+RUN mkdir /app
+COPY requirements.txt /app
+# RUN pip install -r /app/requirements.txt -i "${PIP_MIRROR}"
+RUN pip install -r /app/requirements.txt -i https://mirrors.aliyun.com/pypi/simple/
+# 拷贝项目代码
+COPY . /app
+WORKDIR /app/thrillerbark
+
+RUN chmod +x start.sh
+
+EXPOSE 8000
+
+ENTRYPOINT ["sh", "./start.sh"]

office/api/image.py

@@ -36,8 +36,8 @@ def img2Cartoon(path, client_api='OVALewIvPyLmiNITnceIhrYf', client_secret='rpBQ
 
 
 # @except_dec()
-def down4img(url, output_name='down4img', type='jpg'):
-    poimage.down4img(url, output_name, type)
+def down4img(url, output_path='.', output_name='down4img', type='jpg'):
+    poimage.down4img(url, output_path, output_name, type)
     # mainImage.down4img(url, output_name, type)