fixed bug for reset password

api/handler/admin/api_key_handler.go

@@ -74,7 +74,6 @@ func (h *ApiKeyHandler) Save(c *gin.Context) {
 func (h *ApiKeyHandler) List(c *gin.Context) {
 	status := h.GetBool(c, "status")
 	t := h.GetTrim(c, "type")
-	platform := h.GetTrim(c, "platform")
 
 	session := h.DB.Session(&gorm.Session{})
 	if status {
@@ -83,9 +82,6 @@ func (h *ApiKeyHandler) List(c *gin.Context) {
 	if t != "" {
 		session = session.Where("type", t)
 	}
-	if platform != "" {
-		session = session.Where("platform", platform)
-	}
 
 	var items []model.ApiKey
 	var keys = make([]vo.ApiKey, 0)

api/handler/admin/chat_app_type_handler.go

@@ -25,6 +25,7 @@ func (h *ChatAppTypeHandler) Save(c *gin.Context) {
 	var data struct {
 		Id      uint   `json:"id"`
 		Name    string `json:"name"`
+		Enable  bool   `json:"enable"`
 		Icon    string `json:"icon"`
 		SortNum int    `json:"sort_num"`
 	}
@@ -36,12 +37,13 @@ func (h *ChatAppTypeHandler) Save(c *gin.Context) {
 	if data.Id == 0 { // for add
 		err := h.DB.Where("name", data.Name).First(&model.AppType{}).Error
 		if err == nil {
-			resp.ERROR(c, "App类型已存在")
+			resp.ERROR(c, "当前分类已经存在")
 			return
 		}
 		err = h.DB.Create(&model.AppType{
 			Name:    data.Name,
 			Icon:    data.Icon,
+			Enabled: data.Enable,
 			SortNum: data.SortNum,
 		}).Error
 		if err != nil {
@@ -49,9 +51,10 @@ func (h *ChatAppTypeHandler) Save(c *gin.Context) {
 			return
 		}
 	} else { // for update
-		err := h.DB.Where("id", data.Id).Updates(map[string]interface{}{
-			"name": data.Name,
-			"icon": data.Icon,
+		err := h.DB.Model(&model.AppType{}).Where("id", data.Id).Updates(map[string]interface{}{
+			"name":    data.Name,
+			"icon":    data.Icon,
+			"enabled": data.Enable,
 		}).Error
 		if err != nil {
 			resp.ERROR(c, err.Error())
@@ -65,7 +68,7 @@ func (h *ChatAppTypeHandler) Save(c *gin.Context) {
 func (h *ChatAppTypeHandler) List(c *gin.Context) {
 	var items []model.AppType
 	var appTypes = make([]vo.AppType, 0)
-	err := h.DB.Order("created_at DESC").Find(&items).Error
+	err := h.DB.Order("sort_num ASC").Find(&items).Error
 	if err != nil {
 		resp.ERROR(c, err.Error())
 		return

api/handler/chat_app_type_handler.go

@@ -0,0 +1,43 @@
+package handler
+
+import (
+	"geekai/core"
+	"geekai/store/model"
+	"geekai/store/vo"
+	"geekai/utils"
+	"geekai/utils/resp"
+	"github.com/gin-gonic/gin"
+	"gorm.io/gorm"
+)
+
+type ChatAppTypeHandler struct {
+	BaseHandler
+}
+
+func NewChatAppTypeHandler(app *core.AppServer, db *gorm.DB) *ChatAppTypeHandler {
+	return &ChatAppTypeHandler{BaseHandler: BaseHandler{App: app, DB: db}}
+}
+
+// List 获取App类型列表
+func (h *ChatAppTypeHandler) List(c *gin.Context) {
+	var items []model.AppType
+	var appTypes = make([]vo.AppType, 0)
+	err := h.DB.Order("sort_num ASC").Find(&items).Error
+	if err != nil {
+		resp.ERROR(c, err.Error())
+		return
+	}
+
+	for _, v := range items {
+		var appType vo.AppType
+		err = utils.CopyObject(v, &appType)
+		if err != nil {
+			continue
+		}
+		appType.Id = v.Id
+		appType.CreatedAt = v.CreatedAt.Unix()
+		appTypes = append(appTypes, appType)
+	}
+
+	resp.SUCCESS(c, appTypes)
+}

api/handler/chat_role_handler.go

@@ -29,10 +29,37 @@ func NewChatRoleHandler(app *core.AppServer, db *gorm.DB) *ChatRoleHandler {
 
 // List 获取用户聊天应用列表
 func (h *ChatRoleHandler) List(c *gin.Context) {
+	tid := h.GetInt(c, "tid", 0)
+	var roles []model.ChatRole
+	session := h.DB.Where("enable", true)
+	if tid > 0 {
+		session = session.Where("tid", tid)
+	}
+	err := session.Order("sort_num ASC").Find(&roles).Error
+	if err != nil {
+		resp.ERROR(c, err.Error())
+		return
+	}
+
+	var roleVos = make([]vo.ChatRole, 0)
+	for _, r := range roles {
+		var v vo.ChatRole
+		err := utils.CopyObject(r, &v)
+		if err == nil {
+			v.Id = r.Id
+			roleVos = append(roleVos, v)
+		}
+	}
+	resp.SUCCESS(c, roleVos)
+}
+
+// ListByUser 获取用户添加的角色列表
+func (h *ChatRoleHandler) ListByUser(c *gin.Context) {
 	id := h.GetInt(c, "id", 0)
 	userId := h.GetLoginUserId(c)
 	var roles []model.ChatRole
-	query := h.DB.Where("enable", true)
+	session := h.DB.Where("enable", true)
+	// 如果用户没登录，则获取所有角色
 	if userId > 0 {
 		var user model.User
 		h.DB.First(&user, userId)
@@ -42,12 +69,13 @@ func (h *ChatRoleHandler) List(c *gin.Context) {
 			resp.ERROR(c, "角色解析失败！")
 			return
 		}
-		query = query.Where("marker IN ?", roleKeys)
+		session = session.Where("marker IN ?", roleKeys)
 	}
+
 	if id > 0 {
-		query = query.Or("id", id)
+		session = session.Or("id", id)
 	}
-	res := h.DB.Where("enable", true).Order("sort_num ASC").Find(&roles)
+	res := session.Order("sort_num ASC").Find(&roles)
 	if res.Error != nil {
 		resp.ERROR(c, res.Error.Error())
 		return

api/handler/user_handler.go

@@ -601,7 +601,7 @@ func (h *UserHandler) ResetPass(c *gin.Context) {
 		session = session.Where("email", data.Email)
 		key = CodeStorePrefix + data.Email
 	} else if data.Type == "mobile" {
-		session = session.Where("mobile", data.Email)
+		session = session.Where("mobile", data.Mobile)
 		key = CodeStorePrefix + data.Mobile
 	} else {
 		resp.ERROR(c, "验证类别错误")