diff --git a/.gitignore b/.gitignore index 485dee6..1a06d5a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .idea +*.db diff --git a/admin/apps/user/domain/entity/user.go b/admin/apps/user/domain/entity/user.go index ee34e22..0543c46 100644 --- a/admin/apps/user/domain/entity/user.go +++ b/admin/apps/user/domain/entity/user.go @@ -11,6 +11,13 @@ type User struct { } func FromUserPo(po *model.User, cPo *model.Character) *User { + newReviewCList := make([]string, 0) + for _, c := range cPo.WriteOpCheckCharacters { + if c != "" { + newReviewCList = append(newReviewCList, c) + } + } + cPo.WriteOpCheckCharacters = newReviewCList return &User{Po: po, Character: cPo} } diff --git a/admin/apps/user/domain/repo/user.go b/admin/apps/user/domain/repo/user.go index 3f3bfa5..42f2ecc 100644 --- a/admin/apps/user/domain/repo/user.go +++ b/admin/apps/user/domain/repo/user.go @@ -78,6 +78,14 @@ func (impl *userRepoImpl) GetById(userId int) (*entity.User, bool, error) { return nil, false, errcode.New(errcode.DBError, "get character by id:%v error:%v", po.CharacterName, err) } + newReviewCList := make([]string, 0) + for _, c := range chPo.WriteOpCheckCharacters { + if c != "" { + newReviewCList = append(newReviewCList, c) + } + } + chPo.WriteOpCheckCharacters = newReviewCList + return entity.FromUserPo(po, chPo), true, nil } diff --git a/admin/apps/user/domain/user.go b/admin/apps/user/domain/user.go index f862cd6..c459245 100644 --- a/admin/apps/user/domain/user.go +++ b/admin/apps/user/domain/user.go @@ -76,5 +76,6 @@ func (svc *CommonResourceService) UserHasPermitReviewCharacters(userId int) (*en if !find { return nil, nil, false, errcode.New(errcode.ParamsInvalid, "not found user %v db data", userId) } + return user, user.Character.WriteOpCheckCharacters, len(user.Character.WriteOpCheckCharacters) > 0, nil } diff --git a/admin/cmd/all_in_one/admin b/admin/cmd/all_in_one/admin index 4850369..dcf428a 100755 Binary files a/admin/cmd/all_in_one/admin and b/admin/cmd/all_in_one/admin differ diff --git a/admin/cmd/all_in_one/build.sh b/admin/cmd/all_in_one/build.sh index 6676c27..046c6c9 100755 --- a/admin/cmd/all_in_one/build.sh +++ b/admin/cmd/all_in_one/build.sh @@ -2,7 +2,7 @@ app="admin" img_prefix="harbor.gamegold.net.cn/mid-platform" -img_tag="2.0.1" +img_tag="2.0.2" go build -tags netgo -ldflags "-s -w" -trimpath -buildvcs=false -o $app echo "准备构建:$app" diff --git a/admin/internal/db/db.go b/admin/internal/db/db.go index 643c57d..b08e1b5 100644 --- a/admin/internal/db/db.go +++ b/admin/internal/db/db.go @@ -28,6 +28,9 @@ func RegisterTableModels(models ...any) { func NewDB(dbType, dbAddr, dbName, dbUser, dbPass string) (db *gorm.DB, err error) { dsn := fmt.Sprintf("%v:%v@tcp(%v)/%v?charset=utf8mb4&parseTime=True&loc=Local", dbUser, dbPass, dbAddr, dbName) dsnWithoutDB := fmt.Sprintf("%v:%v@tcp(%v)/?charset=utf8mb4&parseTime=True&loc=Local", dbUser, dbPass, dbAddr) + + xlog.Debugf("new db %v with dsn:%v", dbType, dsn) + db, err = createDBAndGuaranteeMigrate(dbType, dsnWithoutDB, dsn, globalTables) if err != nil { return nil, err