Merge pull request #24 from mylxsw/develop

v1.0.7

.dockerignore

@@ -12,4 +12,5 @@ README.md
 LICENSE
 .vscode
 build/*
-docker-build.sh
+docker-build.sh
+config.local.yaml

.gitignore

@@ -1,5 +1,6 @@
 build/
 config.local.yaml
+coins-table.local.yaml
 Makefile.local
 .vscode/
 .idea/

api/auth/client.go

@@ -20,6 +20,10 @@ func (inf ClientInfo) IsIOS() bool {
 
 // IsCNLocalMode 是否启用国产化模式
 func (inf ClientInfo) IsCNLocalMode(conf *config.Config) bool {
+	return inf.isCNLocalMode(conf) && conf.EnableVirtualModel
+}
+
+func (inf ClientInfo) isCNLocalMode(conf *config.Config) bool {
 	if !conf.CNLocalMode {
 		return false
 	}

api/auth/user.go

@@ -22,11 +22,15 @@ type User struct {
 	AppleUID      string    `json:"apple_uid,omitempty"`
 	IsSetPassword bool      `json:"is_set_password,omitempty"`
 	CreatedAt     time.Time `json:"created_at"`
-	WithLab       bool      `json:"-"`
+	withLab       bool      `json:"-"`
 }
 
 func (u User) InternalUser() bool {
-	return u.UserType == repo.UserTypeInternal
+	return u.UserType == repo.UserTypeInternal || u.withLab
+}
+
+func (u User) ExtraPermissionUser() bool {
+	return u.UserType == repo.UserTypeExtraPermission
 }
 
 // UserOptional 用户信息，可选，如果用户未登录，则为 User 为 nil
@@ -52,9 +56,6 @@ func CreateAuthUserFromModel(user *model.Users) *User {
 		IsSetPassword: user.Password != "",
 		CreatedAt:     user.CreatedAt,
 		// 仅限实验室用户
-		WithLab: array.In(user.Id, []int64{
-			1, /* 初始用户 */
-			24,
-		}),
+		withLab: array.In(user.Id, []int64{1}),
 	}
 }

api/controllers/auth.go

@@ -80,7 +80,7 @@ func (ctl *AuthController) Register(router web.Router) {
 
 // minEntropyBits is the minimum entropy bits required for a password to be considered strong enough.
 const minEntropyBits = 40
-const emailRegex = `^([\w\.\_\-]{2,10})@(\w{1,}).([a-z]{2,8})$`
+const emailRegex = `^([\w\.\_\-]{2,30})@(\w{1,}).([a-z]{2,8})$`
 const phoneRegex = `^1[3456789]\d{9}$`
 
 func isEmail(value string) bool {

api/controllers/common/common.go

@@ -6,7 +6,7 @@ import (
 )
 
 const (
-	ErrQuotaNotEnough    = "您的配额已用完，请续费后再试"
+	ErrQuotaNotEnough    = "智慧果不足，请充值后再试"
 	ErrInvalidModel      = "无效的模型"
 	ErrInvalidRequest    = "请求参数错误"
 	ErrInternalError     = "服务器故障，请稍后再试"

api/controllers/creative-island.go

@@ -71,7 +71,7 @@ func (ctl *CreativeIslandController) gallery(ctx context.Context, webCtx web.Con
 
 	userId := user.ID
 	limit := int64(100)
-	if mode == "all" && user.WithLab {
+	if mode == "all" && user.InternalUser() {
 		userId = 0
 		limit = 500
 	}
@@ -435,7 +435,7 @@ func (ctl *CreativeIslandController) completionsDeepAI(ctx context.Context, webC
 		return webCtx.JSONError(common.Text(webCtx, ctl.trans, common.ErrInternalError), http.StatusInternalServerError)
 	}
 
-	quotaConsume := coins.GetDeepAIImageCoins(stylePreset)
+	quotaConsume := int64(coins.GetUnifiedImageGenCoins())
 
 	if evaluate {
 		return webCtx.JSON(web.M{"cost": quotaConsume, "enough": quota.Quota >= quota.Used+quotaConsume})
@@ -567,7 +567,7 @@ func (ctl *CreativeIslandController) completionsStabilityAI(ctx context.Context,
 		return webCtx.JSONError(common.Text(webCtx, ctl.trans, common.ErrInternalError), http.StatusInternalServerError)
 	}
 
-	quotaConsume := coins.GetStabilityAIImageCoins(item.Model, int64(steps), int64(width), int64(height)) * imageCount
+	quotaConsume := int64(coins.GetUnifiedImageGenCoins()) * imageCount
 	if evaluate {
 		return webCtx.JSON(web.M{"cost": quotaConsume, "enough": quota.Quota >= quota.Used+quotaConsume})
 	}
@@ -700,7 +700,7 @@ func (ctl *CreativeIslandController) completionsLeapAI(ctx context.Context, webC
 		return webCtx.JSONError(common.Text(webCtx, ctl.trans, common.ErrInternalError), http.StatusInternalServerError)
 	}
 
-	quotaConsume := coins.GetLeapAIImageCoins(item.Model) * imageCount
+	quotaConsume := int64(coins.GetUnifiedImageGenCoins()) * imageCount
 	if evaluate {
 		return webCtx.JSON(web.M{"cost": quotaConsume, "enough": quota.Quota >= quota.Used+quotaConsume})
 	}

api/controllers/creative.go

@@ -2,6 +2,8 @@ package controllers
 
 import (
 	"context"
+	"github.com/mylxsw/aidea-server/api/auth"
+	"github.com/mylxsw/aidea-server/internal/helper"
 	"net/http"
 	"strconv"
 
@@ -58,7 +60,7 @@ func (ctl *CreativeController) Gallery(ctx context.Context, webCtx web.Context)
 }
 
 // GalleryItem 作品图库详情
-func (ctl *CreativeController) GalleryItem(ctx context.Context, webCtx web.Context) web.Response {
+func (ctl *CreativeController) GalleryItem(ctx context.Context, webCtx web.Context, user *auth.UserOptional, client *auth.ClientInfo) web.Response {
 	id, err := strconv.Atoi(webCtx.PathVar("id"))
 	if err != nil {
 		return webCtx.JSONError(common.Text(webCtx, ctl.translater, common.ErrInvalidRequest), http.StatusBadRequest)
@@ -69,5 +71,12 @@ func (ctl *CreativeController) GalleryItem(ctx context.Context, webCtx web.Conte
 		return webCtx.JSONError(common.Text(webCtx, ctl.translater, common.ErrInternalError), http.StatusInternalServerError)
 	}
 
+	if helper.VersionNewer(client.Version, "1.0.6") {
+		return webCtx.JSON(web.M{
+			"data":             item,
+			"is_internal_user": user.User != nil && user.User.InternalUser(),
+		})
+	}
+
 	return webCtx.JSON(item)
 }