mirror of
https://github.com/YFGaia/dify-plus.git
synced 2026-06-14 20:41:21 +08:00
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 实现 - 工作池初始化 - 批量工作流服务实现 - 转发扩展配置 - 用户服务扩展
195 lines
5.5 KiB
Go
195 lines
5.5 KiB
Go
package utils
|
|
|
|
import (
|
|
"github.com/flipped-aurora/gin-vue-admin/server/global"
|
|
"github.com/flipped-aurora/gin-vue-admin/server/model/gaia"
|
|
"github.com/flipped-aurora/gin-vue-admin/server/model/system"
|
|
systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request"
|
|
"github.com/gin-gonic/gin"
|
|
"github.com/gofrs/uuid/v5"
|
|
"net"
|
|
"time"
|
|
)
|
|
|
|
func ClearToken(c *gin.Context) {
|
|
// 增加cookie x-token 向来源的web添加
|
|
host, _, err := net.SplitHostPort(c.Request.Host)
|
|
if err != nil {
|
|
host = c.Request.Host
|
|
}
|
|
|
|
if net.ParseIP(host) != nil {
|
|
c.SetCookie("x-token", "", -1, "/", "", false, false)
|
|
} else {
|
|
c.SetCookie("x-token", "", -1, "/", host, false, false)
|
|
}
|
|
}
|
|
|
|
func SetToken(c *gin.Context, token string, maxAge int) {
|
|
// 增加cookie x-token 向来源的web添加
|
|
host, _, err := net.SplitHostPort(c.Request.Host)
|
|
if err != nil {
|
|
host = c.Request.Host
|
|
}
|
|
|
|
if net.ParseIP(host) != nil {
|
|
c.SetCookie("x-token", token, maxAge, "/", "", false, false)
|
|
c.Request.Header.Set("console_token", token) // Extend: add token
|
|
} else {
|
|
c.SetCookie("x-token", token, maxAge, "/", host, false, false)
|
|
c.Request.Header.Set("console_token", token) // Extend: add token
|
|
}
|
|
}
|
|
|
|
func GetToken(c *gin.Context) string {
|
|
// Extend Start: Admin and Gaia JWT
|
|
token, _ := c.Cookie("x-token")
|
|
if len(token) == 0 {
|
|
token = c.Request.Header.Get("Authorization")
|
|
}
|
|
if len(token) > 7 && token[0:7] == "Bearer " {
|
|
token = token[7:]
|
|
}
|
|
if token == "" {
|
|
j := NewJWT()
|
|
token, _ = c.Cookie("x-token")
|
|
claims, err := j.ParseToken(token)
|
|
if err != nil {
|
|
global.GVA_LOG.Error("重新写入cookie token失败,未能成功解析token,请检查请求头是否存在x-token且claims是否为规定结构")
|
|
return token
|
|
}
|
|
SetToken(c, token, int((claims.ExpiresAt.Unix()-time.Now().Unix())/60))
|
|
}
|
|
// Extend Stop: Admin and Gaia JWT
|
|
return token
|
|
}
|
|
|
|
func GetClaims(c *gin.Context) (*systemReq.CustomClaims, error) {
|
|
token := GetToken(c)
|
|
j := NewJWT()
|
|
claims, err := j.ParseToken(token)
|
|
if err != nil {
|
|
global.GVA_LOG.Error("从Gin的Context中获取从jwt解析信息失败, 请检查请求头是否存在x-token且claims是否为规定结构")
|
|
}
|
|
// 判断是否dify的token
|
|
if claims.Username == "" {
|
|
var user system.SysUser
|
|
var account gaia.Account
|
|
if err = global.GVA_DB.Where("uuid=?", claims.UserId).First(&user).Error; err == nil {
|
|
claims.BaseClaims.ID = user.ID
|
|
claims.Username = user.Username
|
|
claims.AuthorityId = user.AuthorityId
|
|
} else if err = global.GVA_DB.Where("id=?", claims.UserId).First(&account).Error; err == nil {
|
|
if err = global.GVA_DB.Where("email=?", account.Email).First(&user).Error; err == nil {
|
|
claims.AuthorityId = user.AuthorityId
|
|
claims.Username = user.Username
|
|
claims.BaseClaims.ID = user.ID
|
|
user.UUID = account.ID
|
|
global.GVA_DB.Save(&user)
|
|
}
|
|
}
|
|
}
|
|
return claims, err
|
|
}
|
|
|
|
// GetUserID 从Gin的Context中获取从jwt解析出来的用户ID
|
|
func GetUserID(c *gin.Context) uint {
|
|
if claims, exists := c.Get("claims"); exists {
|
|
waitUse := claims.(*systemReq.CustomClaims)
|
|
if waitUse.BaseClaims.ID != 0 {
|
|
return waitUse.BaseClaims.ID
|
|
}
|
|
}
|
|
if cl, err := GetClaims(c); err != nil {
|
|
return 0
|
|
} else {
|
|
return cl.BaseClaims.ID
|
|
}
|
|
}
|
|
|
|
// GetUserUuid 从Gin的Context中获取从jwt解析出来的用户UUID
|
|
func GetUserUuid(c *gin.Context) uuid.UUID {
|
|
if claims, exists := c.Get("claims"); !exists {
|
|
if cl, err := GetClaims(c); err != nil {
|
|
return uuid.UUID{}
|
|
} else {
|
|
return cl.UUID
|
|
}
|
|
} else {
|
|
waitUse := claims.(*systemReq.CustomClaims)
|
|
return waitUse.UUID
|
|
}
|
|
}
|
|
|
|
// GetUserAuthorityId 从Gin的Context中获取从jwt解析出来的用户角色id
|
|
func GetUserAuthorityId(c *gin.Context) uint {
|
|
if claims, exists := c.Get("claims"); !exists {
|
|
if cl, err := GetClaims(c); err != nil {
|
|
return 0
|
|
} else {
|
|
return cl.AuthorityId
|
|
}
|
|
} else {
|
|
waitUse := claims.(*systemReq.CustomClaims)
|
|
return waitUse.AuthorityId
|
|
}
|
|
}
|
|
|
|
// GetUserInfo 从Gin的Context中获取从jwt解析出来的用户角色id
|
|
func GetUserInfo(c *gin.Context) *systemReq.CustomClaims {
|
|
if claims, exists := c.Get("claims"); !exists {
|
|
if cl, err := GetClaims(c); err != nil {
|
|
return nil
|
|
} else {
|
|
return cl
|
|
}
|
|
} else {
|
|
waitUse := claims.(*systemReq.CustomClaims)
|
|
return waitUse
|
|
}
|
|
}
|
|
|
|
// GetUserName 从Gin的Context中获取从jwt解析出来的用户名
|
|
func GetUserName(c *gin.Context) string {
|
|
if claims, exists := c.Get("claims"); !exists {
|
|
if cl, err := GetClaims(c); err != nil {
|
|
return ""
|
|
} else {
|
|
return cl.Username
|
|
}
|
|
} else {
|
|
waitUse := claims.(*systemReq.CustomClaims)
|
|
return waitUse.Username
|
|
}
|
|
}
|
|
|
|
func LoginToken(user system.Login) (token string, claims systemReq.CustomClaims, err error) {
|
|
var account gaia.Account
|
|
dr, err := ParseDuration(global.GVA_CONFIG.JWT.BufferTime)
|
|
if err != nil {
|
|
return token, claims, err
|
|
}
|
|
j := &JWT{SigningKey: []byte(global.GVA_CONFIG.JWT.SigningKey)} // 唯一签名
|
|
if err = global.GVA_DB.Where("email=?", user.GetUserEmail()).First(&account).Error; err != nil {
|
|
return token, claims, err
|
|
}
|
|
claims = j.CreateClaims(systemReq.BaseClaims{
|
|
UUID: user.GetUUID(),
|
|
ID: user.GetUserId(),
|
|
NickName: user.GetNickname(),
|
|
Username: user.GetUsername(),
|
|
AuthorityId: user.GetAuthorityId(),
|
|
// Extend Start: add gaia token
|
|
UserId: account.ID.String(),
|
|
Exp: time.Now().Add(dr).Unix(),
|
|
Sub: "Console API Passport",
|
|
Email: account.Email,
|
|
// Extend Start: add gaia token
|
|
})
|
|
token, err = j.CreateToken(claims)
|
|
if err != nil {
|
|
return
|
|
}
|
|
return
|
|
}
|