fix mail review
This commit is contained in:
parent
f5bf3b9c77
commit
d6346080aa
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
|||||||
.idea
|
.idea
|
||||||
|
*.db
|
||||||
|
@ -11,6 +11,13 @@ type User struct {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func FromUserPo(po *model.User, cPo *model.Character) *User {
|
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}
|
return &User{Po: po, Character: cPo}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -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)
|
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
|
return entity.FromUserPo(po, chPo), true, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -76,5 +76,6 @@ func (svc *CommonResourceService) UserHasPermitReviewCharacters(userId int) (*en
|
|||||||
if !find {
|
if !find {
|
||||||
return nil, nil, false, errcode.New(errcode.ParamsInvalid, "not found user %v db data", userId)
|
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
|
return user, user.Character.WriteOpCheckCharacters, len(user.Character.WriteOpCheckCharacters) > 0, nil
|
||||||
}
|
}
|
||||||
|
Binary file not shown.
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
app="admin"
|
app="admin"
|
||||||
img_prefix="harbor.gamegold.net.cn/mid-platform"
|
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
|
go build -tags netgo -ldflags "-s -w" -trimpath -buildvcs=false -o $app
|
||||||
echo "准备构建:$app"
|
echo "准备构建:$app"
|
||||||
|
@ -28,6 +28,9 @@ func RegisterTableModels(models ...any) {
|
|||||||
func NewDB(dbType, dbAddr, dbName, dbUser, dbPass string) (db *gorm.DB, err error) {
|
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)
|
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)
|
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)
|
db, err = createDBAndGuaranteeMigrate(dbType, dsnWithoutDB, dsn, globalTables)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
Loading…
x
Reference in New Issue
Block a user