From e8a765e19bfb27e7c264379184b73778bb2e2d48 Mon Sep 17 00:00:00 2001
From: wenjiaran <101538084+WenjiaRan@users.noreply.github.com>
Date: Sun, 2 Jul 2023 11:42:59 +0800
Subject: [PATCH 1/4] Update Dockerfile

---
 Dockerfile | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 37a7f72..0b1e8f9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,17 +1,18 @@
+# 使用python:3.8-slim-buster作为基础镜像
 FROM python:3.8-slim-buster
 
+# 创建app目录来存储我们的代码
 RUN mkdir /app
 
-COPY ./*.txt ./*.py ./*.sh ./*.onnx /app/
-
-
-RUN cd /app \
-    && python3 -m pip install --upgrade pip -i https://pypi.douban.com/simple/\
-    && pip3 install --no-cache-dir -r requirements.txt --extra-index-url https://pypi.douban.com/simple/ \
-    && rm -rf /tmp/* && rm -rf /root/.cache/* \
-    && sed -i 's#http://deb.debian.org#http://mirrors.aliyun.com/#g' /etc/apt/sources.list\
-    && apt-get --allow-releaseinfo-change update && apt install libgl1-mesa-glx libglib2.0-0 -y
-
+# 将工作目录设置为/app，这意味着后续的指令都在/app下执行
 WORKDIR /app
 
+# 将当前目录（即你的项目目录）下的所有文件和文件夹复制到镜像的/app目录下
+COPY . /app
+
+# 安装Python依赖
+RUN pip3 install --no-cache-dir ddddocr flask 
+
+
+# 定义容器启动时要运行的命令
 CMD ["python3", "ocr_server.py", "--port", "9898", "--ocr", "--det"]

From c5b1efeefd5c5d998c7d5b191a2e20ff8f3c7269 Mon Sep 17 00:00:00 2001
From: wenjiaran <101538084+WenjiaRan@users.noreply.github.com>
Date: Sun, 2 Jul 2023 11:43:46 +0800
Subject: [PATCH 2/4] Update requirements.txt

---
 requirements.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index a8661fa..0e4bdb8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,3 @@
-ddddocr>=1.3.1
-flask
\ No newline at end of file
+ddddocr
+flask
+flask-cors

From 70322957e4a0beae8182fe80bd8c8d46772f1a71 Mon Sep 17 00:00:00 2001
From: wenjiaran <101538084+WenjiaRan@users.noreply.github.com>
Date: Sun, 2 Jul 2023 11:46:16 +0800
Subject: [PATCH 3/4] Update Dockerfile

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 0b1e8f9..1511fc9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,7 +11,7 @@ WORKDIR /app
 COPY . /app
 
 # 安装Python依赖
-RUN pip3 install --no-cache-dir ddddocr flask 
+RUN pip3 install --no-cache-dir requirements.txt
 
 
 # 定义容器启动时要运行的命令

From 7ead30c81b3c53e06bf92905ebd5072b7c4fa86a Mon Sep 17 00:00:00 2001
From: wenjiaran <101538084+WenjiaRan@users.noreply.github.com>
Date: Sun, 2 Jul 2023 11:48:19 +0800
Subject: [PATCH 4/4] Update ocr_server.py
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

允许特定网站的跨域
---
 ocr_server.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ocr_server.py b/ocr_server.py
index b3fe8f0..09850f4 100644
--- a/ocr_server.py
+++ b/ocr_server.py
@@ -5,6 +5,10 @@ import json
 
 import ddddocr
 from flask import Flask, request
+from flask_cors import CORS
+
+app = Flask(__name__)
+CORS(app, origins=["http://example.com"])
 
 parser = argparse.ArgumentParser(description="使用ddddocr搭建的最简api服务")
 parser.add_argument("-p", "--port", type=int, default=9898)