Merge remote-tracking branch 'origin/ui' into ui

api/handler/admin/chat_model_handler.go

@@ -48,7 +48,7 @@ func (h *ChatModelHandler) Save(c *gin.Context) {
 		Enabled:  data.Enabled,
 		SortNum:  data.SortNum,
 		Open:     data.Open,
-		Weight:   data.Weight}
+		Power:    data.Weight}
 	item.Id = data.Id
 	if item.Id > 0 {
 		item.CreatedAt = time.Unix(data.CreatedAt, 0)

api/handler/admin/product_handler.go

@@ -32,8 +32,7 @@ func (h *ProductHandler) Save(c *gin.Context) {
 		Discount  float64 `json:"discount"`
 		Enabled   bool    `json:"enabled"`
 		Days      int     `json:"days"`
-		Calls     int     `json:"calls"`
-		ImgCalls  int     `json:"img_calls"`
+		Power     int     `json:"power"`
 		CreatedAt int64   `json:"created_at"`
 	}
 	if err := c.ShouldBindJSON(&data); err != nil {
@@ -46,8 +45,7 @@ func (h *ProductHandler) Save(c *gin.Context) {
 		Price:    data.Price,
 		Discount: data.Discount,
 		Days:     data.Days,
-		Calls:    data.Calls,
-		ImgCalls: data.ImgCalls,
+		Power:    data.Power,
 		Enabled:  data.Enabled}
 	item.Id = data.Id
 	if item.Id > 0 {

api/handler/admin/user_handler.go

@@ -66,8 +66,6 @@ func (h *UserHandler) Save(c *gin.Context) {
 		Id          uint     `json:"id"`
 		Password    string   `json:"password"`
 		Username    string   `json:"username"`
-		Calls       int      `json:"calls"`
-		ImgCalls    int      `json:"img_calls"`
 		ChatRoles   []string `json:"chat_roles"`
 		ChatModels  []string `json:"chat_models"`
 		ExpiredTime string   `json:"expired_time"`
@@ -86,8 +84,6 @@ func (h *UserHandler) Save(c *gin.Context) {
 		// 此处需要用 map 更新，用结构体无法更新 0 值
 		res = h.db.Model(&user).Updates(map[string]interface{}{
 			"username":         data.Username,
-			"calls":            data.Calls,
-			"img_calls":        data.ImgCalls,
 			"status":           data.Status,
 			"vip":              data.Vip,
 			"chat_roles_json":  utils.JsonEncode(data.ChatRoles),
@@ -113,8 +109,6 @@ func (h *UserHandler) Save(c *gin.Context) {
 					types.ChatGLM: "",
 				},
 			}),
-			Calls:    data.Calls,
-			ImgCalls: data.ImgCalls,
 		}
 		res = h.db.Create(&u)
 		_ = utils.CopyObject(u, &userVo)