feat:qiniu upload resolve #129

Author: sunlin92

README.md

@@ -198,4 +198,5 @@ flask run
 ## 后续开发计划
 
 - [X] 重构插件机制
-- [ ] 七牛上传插件
+- [X] 新增七牛上传插件
+- [ ] 扩展行为日志

app/cli/plugin/generator.py

@@ -27,9 +27,9 @@ def test():
 """
 
 info = """
-__name__ = '{0}'
-__version__ = '0.1.0'
-__author__ = 'Team Lin'
+__name__ = "{0}"
+__version__ = "0.1.0"
+__author__ = "Team Lin"
 """
 
 readme = """# {0}"""

app/cli/plugin/init.py

@@ -198,6 +198,7 @@ def __cal_setting(new_setting, old_setting):
 
         return final_setting
 
+
 def init():
     plugin_name = input("请输入要初始化的插件名，如果多个插件请使用空格分隔插件名，输入*表示初始化所有插件:\n")
     PluginInit(plugin_name)

app/config/__init__.py

@@ -56,4 +56,4 @@ class BaseConfig(object):
     PAGE_DEFAULT = 0
 
     # 兼容中文
-    JSON_AS_ASCII = False
+    JSON_AS_ASCII = False

app/plugin/oss/README.md

@@ -1,15 +1 @@
-# oss 插件
-
-## 插件模板自动生成
-
-请在项目的根目录下运行如下命令：
-
-```bash
-flask plugin generate oss
-```
-
-即可快速生成一个名为 oss 的插件
-
-## 添加 requirements.txt
-
-如果你是在插件中使用了一些第三方库，这些库在主应用中是没有的，那么请你将它添加到**requirements.txt**中。
+# oss 插件

app/plugin/oss/app/__init__.py

@@ -1,2 +1 @@
 from .controller import api
-from .model import Image

app/plugin/oss/app/controller.py

@@ -1,14 +1,14 @@
 import os
 
+import oss2
 from flask import jsonify, request
 from lin.config import lin_config
 from lin.db import db
 from lin.exception import Failed, ParameterError, Success
 from lin.redprint import Redprint
+from lin.utils import get_random_str
 
-from .enums import LocalOrCloud
-from .model import Image
-from .oss import upload_image_bytes
+from .model import OSS
 
 api = Redprint("oss")
 
@@ -36,10 +36,10 @@ def upload_to_ali():
         if url:
             res = {"url": url}
             with db.auto_commit():
-                exist = Image.get(url=url)
+                exist = OSS.get(url=url)
                 if not exist:
-                    data = {"from": LocalOrCloud.CLOUD.value, "url": url}
-                    one = Image.create(**data)
+                    data = {"url": url}
+                    one = OSS.create(**data)
                     db.session.flush()
                     res["id"] = one.id
                 else:
@@ -60,10 +60,10 @@ def upload_multiple_to_ali():
             if url:
                 # 每上传成功一次图片需记录到数据库
                 with db.auto_commit():
-                    exist = Image.get(url=url)
+                    exist = OSS.get(url=url)
                     if not exist:
-                        data = {"from": LocalOrCloud.CLOUD.value, "url": url}
-                        res = Image.create(**data)
+                        data = {"url": url}
+                        res = OSS.create(**data)
                         db.session.flush()
                         imgs.append({"key": item, "url": url, "id": res.id})
                     else:
@@ -75,3 +75,20 @@ def allowed_file(filename):
     return "." in filename and filename.rsplit(".", 1)[1] in lin_config.get_config(
         "oss.allowed_extensions", []
     )
+
+
+def upload_image_bytes(name: str, data: bytes):
+    access_key_id = lin_config.get_config("oss.access_key_id")
+    access_key_secret = lin_config.get_config("oss.access_key_secret")
+    auth = oss2.Auth(access_key_id, access_key_secret)
+    bucket = oss2.Bucket(
+        auth,
+        lin_config.get_config("oss.endpoint"),
+        lin_config.get_config("oss.bucket_name"),
+    )
+    suffix = name.split(".")[-1]
+    rand_name = get_random_str(15) + "." + suffix
+    res = bucket.put_object(rand_name, data)
+    if res.resp.status == 200:
+        return res.resp.response.url
+    return None

app/plugin/oss/app/enums.py

@@ -1,10 +1,9 @@
 from lin.interface import BaseCrud
-from sqlalchemy import Column, FetchedValue, Integer, String
+from sqlalchemy import Column, Integer, String
 
 
-class Image(BaseCrud):
-    __tablename__ = "image"
+class OSS(BaseCrud):
+    __tablename__ = "oss"
 
     id = Column(Integer, primary_key=True)
     url = Column(String(255), nullable=False)
-    _from = Column("from", Integer, nullable=False, server_default=FetchedValue())