From 9e5d401a85c55aeb10b86ebfb517f332ccc1c5a0 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Wed, 29 Nov 2023 12:07:54 +0800
Subject: [PATCH] remove plugin_color

---
 app/api/endpoints/system.py | 17 +++++++++++++++--
 app/core/plugin.py          |  6 ------
 app/schemas/plugin.py       |  2 --
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/app/api/endpoints/system.py b/app/api/endpoints/system.py
index c5dedacb..76c65db5 100644
--- a/app/api/endpoints/system.py
+++ b/app/api/endpoints/system.py
@@ -1,10 +1,10 @@
 import json
 import time
 from datetime import datetime
-from typing import Union
+from typing import Union, Any
 
 import tailer
-from fastapi import APIRouter, HTTPException, Depends
+from fastapi import APIRouter, HTTPException, Depends, Response
 from fastapi.responses import StreamingResponse
 
 from app import schemas
@@ -24,6 +24,19 @@ from version import APP_VERSION
 router = APIRouter()
 
 
+@router.get("/img/{imgurl:path}", summary="图片代理")
+def get_img(imgurl: str) -> Any:
+    """
+    通过图片代理（使用代理服务器）
+    """
+    if not imgurl:
+        return None
+    response = RequestUtils(ua=settings.USER_AGENT, proxies=settings.PROXY).get_res(url=imgurl)
+    if response:
+        return Response(content=response.content, media_type="image/jpeg")
+    return None
+
+
 @router.get("/env", summary="查询系统环境变量", response_model=schemas.Response)
 def get_env_setting(_: schemas.TokenPayload = Depends(verify_token)):
     """
diff --git a/app/core/plugin.py b/app/core/plugin.py
index f29171ca..18476122 100644
--- a/app/core/plugin.py
+++ b/app/core/plugin.py
@@ -296,9 +296,6 @@ class PluginManager(metaclass=Singleton):
                 # 图标
                 if plugin.get("icon"):
                     conf.update({"plugin_icon": plugin.get("icon")})
-                # 主题色
-                if plugin.get("color"):
-                    conf.update({"plugin_color": plugin.get("color")})
                 # 作者
                 if plugin.get("author"):
                     conf.update({"plugin_author": plugin.get("author")})
@@ -366,9 +363,6 @@ class PluginManager(metaclass=Singleton):
             # 图标
             if hasattr(plugin, "plugin_icon"):
                 conf.update({"plugin_icon": plugin.plugin_icon})
-            # 主题色
-            if hasattr(plugin, "plugin_color"):
-                conf.update({"plugin_color": plugin.plugin_color})
             # 作者
             if hasattr(plugin, "plugin_author"):
                 conf.update({"plugin_author": plugin.plugin_author})
diff --git a/app/schemas/plugin.py b/app/schemas/plugin.py
index 88d3e047..abe71a03 100644
--- a/app/schemas/plugin.py
+++ b/app/schemas/plugin.py
@@ -14,8 +14,6 @@ class Plugin(BaseModel):
     plugin_desc: Optional[str] = None
     # 插件图标
     plugin_icon: Optional[str] = None
-    # 主题色
-    plugin_color: Optional[str] = None
     # 插件版本
     plugin_version: Optional[str] = None
     # 插件作者