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 实现 - 工作池初始化 - 批量工作流服务实现 - 转发扩展配置 - 用户服务扩展
76 lines
2.3 KiB
Python
76 lines
2.3 KiB
Python
from flask_login import current_user
|
|
from flask_restx import Resource, marshal_with
|
|
from werkzeug.exceptions import Forbidden
|
|
|
|
from controllers.console import api
|
|
from controllers.console.app.wraps import get_app_model
|
|
from controllers.console.wraps import (
|
|
account_initialization_required,
|
|
setup_required,
|
|
)
|
|
from fields.app_fields_extend import (
|
|
recommended_app_list_fields,
|
|
)
|
|
from libs.login import login_required
|
|
from services.account_service_extend import TenantExtendService
|
|
from services.recommended_app_service_extend import RecommendedAppService
|
|
|
|
|
|
# ---------------- start sync app to
|
|
class InstalledSyncAppApi(Resource):
|
|
@setup_required
|
|
@login_required
|
|
@account_initialization_required
|
|
@marshal_with(recommended_app_list_fields)
|
|
def get(self):
|
|
"""Installed app"""
|
|
|
|
app_service = RecommendedAppService()
|
|
|
|
return app_service.installed_app_list(current_user.current_tenant_id)
|
|
|
|
|
|
class AppSyncApi(Resource):
|
|
@setup_required
|
|
@login_required
|
|
@account_initialization_required
|
|
@get_app_model
|
|
def put(self, app_model):
|
|
"""Sync app"""
|
|
|
|
# The role of the current user in the ta table must be admin or owner
|
|
tenant_extend_service = TenantExtendService
|
|
super_admin_id = tenant_extend_service.get_super_admin_id().id
|
|
if super_admin_id != current_user.id:
|
|
raise Forbidden()
|
|
|
|
app_service = RecommendedAppService()
|
|
|
|
appId = app_service.sync_recommended_app(app_model.id)
|
|
|
|
return appId, 200
|
|
|
|
@setup_required
|
|
@login_required
|
|
@account_initialization_required
|
|
@get_app_model
|
|
def delete(self, app_model):
|
|
"""Delete sync app"""
|
|
# The role of the current user in the ta table must be admin or owner
|
|
tenant_extend_service = TenantExtendService
|
|
super_admin_id = tenant_extend_service.get_super_admin_id().id
|
|
if super_admin_id != current_user.id:
|
|
raise Forbidden()
|
|
|
|
app_service = RecommendedAppService()
|
|
|
|
app_service.delete_sync_recommended_app(app_model.id)
|
|
|
|
return "", 200
|
|
|
|
|
|
# ----------------start sync app------------------------
|
|
api.add_resource(AppSyncApi, "/apps/<uuid:app_id>/sync")
|
|
api.add_resource(InstalledSyncAppApi, "/installed/apps")
|
|
# ---------------- stop sync app ------------------------
|