mirror of
https://github.com/YFGaia/dify-plus.git
synced 2026-06-04 10:14:00 +08:00
npc0-hue
17832f2424
本次提交整合了多个功能改进和问题修复： 主要功能： - 批量工作流处理功能完善，支持 Excel 上传和进度跟踪 - 管理中心反向代理和转发配置优化 - 用户同步添加互斥锁，防止并发问题 - 计费系统和额度显示优化 - AI 绘图功能扩展 前端改进： - 文本生成应用显示修复 - 批量任务进度展示优化 - 按钮样式和 CSS 优化，禁止换行 - 多语言支持完善（新增印尼语等） - 构建镜像逻辑优化 - 批量处理进度管理器实现 后端改进： - Docker Compose 配置升级 - 队列任务和 Worker Pool 优化 - Admin API 初始化和验证逻辑改进 - 数据库迁移和初始化完善 - 静态变量处理优化 - URL 签名助手实现 - Celery 扩展优化 - 代码和导入包问题修复（idea 自动调整代码位置） 技术改进： - 兼容性修复 (flask-restx, jschardet) - 钉钉 Web API 版本更新 - 代码格式化和导入包问题修复 - 日志处理优化 - 工作流循环管理优化 Docker 相关： - Nginx 配置更新 - 容器启动脚本优化 - 镜像构建流程改进 - docker-compose.dify-plus.yaml 大幅更新 管理后台： - 工作流批量处理 API 实现 - 工作池初始化 - 批量工作流服务实现 - 转发扩展配置 - 用户服务扩展
86 lines
2.7 KiB
Python
86 lines
2.7 KiB
Python
import json
|
|
import threading
|
|
import time
|
|
|
|
from extensions.ext_database import db
|
|
from models.ai_draw_extnd import ForwardingExtend
|
|
|
|
# Create a shared dictionary
|
|
FORWARDING = {}
|
|
# Create a lock object
|
|
dict_lock = threading.Lock()
|
|
|
|
|
|
def thread_forwarding_write(key, value: ForwardingExtend):
|
|
global dict_lock, FORWARDING
|
|
with dict_lock:
|
|
FORWARDING[key] = [
|
|
json.dumps(
|
|
{
|
|
"id": value.id,
|
|
"path": value.path,
|
|
"header": value.header,
|
|
"address": value.address,
|
|
"description": value.description,
|
|
}
|
|
),
|
|
int(time.time()),
|
|
]
|
|
|
|
|
|
def thread_forwarding_read(key) -> ForwardingExtend | None:
|
|
global FORWARDING
|
|
# prevent error: is not bound to a Session; attribute refresh operation cannot proceed
|
|
info = FORWARDING.get(key)
|
|
if info is not None and info[1] < int(time.time()) + 600:
|
|
if info[0] is not None:
|
|
try:
|
|
forwarding_dict_back = json.loads(info[0])
|
|
return ForwardingExtend(
|
|
id=forwarding_dict_back["id"],
|
|
path=forwarding_dict_back["path"],
|
|
header=forwarding_dict_back["header"],
|
|
address=forwarding_dict_back["address"],
|
|
description=forwarding_dict_back["description"],
|
|
)
|
|
except Exception as e:
|
|
pass
|
|
else:
|
|
return None
|
|
forwarding: ForwardingExtend = db.session.query(ForwardingExtend).filter(ForwardingExtend.path == key).first()
|
|
# save
|
|
if forwarding is not None:
|
|
thread_forwarding_write(key, forwarding)
|
|
else:
|
|
FORWARDING[key] = [None, int(time.time())]
|
|
return forwarding
|
|
|
|
|
|
class AiDrawForwarding:
|
|
@classmethod
|
|
def get_forwarding(cls, path: str) -> ForwardingExtend:
|
|
"""
|
|
AI draws forwarding, obtains forwarding domain name
|
|
:param path: str
|
|
"""
|
|
info = thread_forwarding_read(path)
|
|
if info is not None:
|
|
return info
|
|
info: ForwardingExtend = db.session.query(ForwardingExtend).filter(ForwardingExtend.path == path).first()
|
|
# save
|
|
thread_forwarding_write(path, info)
|
|
return info
|
|
|
|
@classmethod
|
|
def get_all_forwarding(cls):
|
|
address = {}
|
|
for i in db.session.query(ForwardingExtend).all():
|
|
# 1. 替换 https:// http:// :8000
|
|
url = i.address.replace('https://', '', 1).replace('http://', '', 1).replace(':8000', '', 1)
|
|
# 2. 移除末尾的/（如果有）
|
|
url = url.rstrip('/')
|
|
address[url] = i.path
|
|
return address
|
|
|
|
|