Merge branch 'xjjdev' into songchuang

.gitignore

@@ -33,3 +33,4 @@ yarn-error.log*
 
 /cmd/logs/*.log
 /cmd/runtime/log/*.log
+/build/*

DockerBuildTest.bat

@@ -0,0 +1,11 @@
+go env -w GOOS=linux
+cd ./build
+del artistinfo-dev
+cd ..
+go build  -ldflags "-s -w" -o ./build/artistinfo-dev ./cmd/app.go
+docker rmi artistinfo-dev
+docker rmi 121.229.45.214:9006/artistinfo-dev
+docker build . -f .\DockerfileWindowsTest -t artistinfo-dev
+docker tag artistinfo-dev 121.229.45.214:9006/artistinfo-dev
+docker push 121.229.45.214:9006/artistinfo-dev
+pause

DockerfileWindowsTest

@@ -3,31 +3,33 @@ FROM golang:alpine AS builder
 LABEL stage=gobuilder
 #ENV DUBBO_GO_CONFIG_PATH ./conf/dubbogo.yaml
 #ENV MODE_ENV test
+ENV TZ Asia/Shanghai
 ENV CGO_ENABLED 0
 ENV GOPROXY https://goproxy.cn,direct
 #RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
 #RUN apk update --no-cache && apk add --no-cache tzdata
 
 WORKDIR /build
-COPY ./utils  ../utils
+#COPY ./utils  ../utils
-ADD ./fonchain-backup/go.mod .
+#ADD ./fonchain-artist/go.mod .
-ADD ./fonchain-backup/go.sum .
+#ADD ./fonchain-artist/go.sum .
-RUN go mod download
+#RUN go mod download
-COPY ./fonchain-backup .
+#COPY ./fonchain-artist .
+#
+#RUN go build  -ldflags "-s -w" -o /app/artistServer ./cmd/app.go
 
-RUN go build  -ldflags "-s -w" -o /app/backup ./cmd/app.go
+COPY ./build/artistinfo-dev /app/artistinfo-dev
 
 FROM alpine
 RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
 RUN apk update --no-cache
 RUN apk add --no-cache ca-certificates
 RUN apk add --no-cache tzdata
-COPY ./fonchain-backup/conf /app/conf
+COPY ./conf /app/conf
-COPY ./fonchain-backup/conf /conf
+COPY ./conf/test /conf
-
 ENV TZ Asia/Shanghai
-ENV DUBBO_GO_CONFIG_PATH ./conf/dubbogo.yaml
+ENV MODE_ENV test
 WORKDIR /app
-COPY --from=builder /app/backup .
+COPY --from=builder /app/artistinfo-dev .
-EXPOSE 9021
+EXPOSE 20050
-CMD ["/app/backup"]
+CMD ["/app/artistinfo-dev"]

cmd/internal/controller/artistInfo_user.go

@@ -19,6 +19,10 @@ type ArtistInfoUserProvider struct {
 	artistInfoLogic *logic.ArtistInfoUser
 }
 
+func (a *ArtistInfoUserProvider) GetInvitedUserList(ctx context.Context, request *artistInfoUser.GetInvitedUserListRequest) (*artistInfoUser.GetInvitedUserListResponse, error) {
+	return a.artistInfoLogic.GetInvitedUserList(request)
+}
+
 func (a *ArtistInfoUserProvider) FindUsersUserView(ctx context.Context, request *artistInfoUser.FindUsersRequest) (*artistInfoUser.FindUsersUserViewResponse, error) {
 	return a.artistInfoLogic.FindUsersUserView(request)
 }
@@ -29,7 +33,10 @@ func (a *ArtistInfoUserProvider) FindUsers(ctx context.Context, request *artistI
 
 func (a *ArtistInfoUserProvider) RegisterUser(ctx context.Context, req *artistInfoUser.RegisterUserRequest) (rep *artistInfoUser.RegisterUserRespond, err error) {
 	fmt.Println("第一处")
-	// backup := &artistinfoUser.GetUserInfoRespond{}
+	//新增邀请码判断 by JJXu 2023-03-07
+	//if req.UserInviteCode == "" {
+	//	return nil, errors.New("邀请码不能为空")
+	//}
 	if rep, err = a.artistInfoLogic.RegisterUser(req); err != nil {
 		return nil, err
 	}
@@ -202,7 +209,7 @@ func (a *ArtistInfoUserProvider) BindArtistId(ctx context.Context, in *artistInf
 	var updateData = map[string]any{
 		"mgmt_artist_id":  in.ArtistId,
 		"mgmt_artist_uid": in.ArtistUid,
-		"fdd_state":       2,
+		//"fdd_state":       2,
 	}
 	if err := db.DB.Model(model.User{}).Where("mgmt_acc_id = ?", in.UserId).Updates(&updateData).Error; err != nil {
 		return &artistInfoUser.BindArtistIdResp{Error: err.Error()}, err
@@ -221,6 +228,7 @@ func (a *ArtistInfoUserProvider) UpdateUserData(ctx context.Context, in *artistI
 func (a *ArtistInfoUserProvider) PreSaveArtistInfo(ctx context.Context, in *artistInfoUser.PreSaveArtistInfoData) (res *artistInfoUser.CommonNoParams, er error) {
 	return a.artistInfoLogic.PreSaveArtistInfo(in)
 }
+
 func (a *ArtistInfoUserProvider) GetPreSaveArtistInfo(ctx context.Context, in *artistInfoUser.GetPreSaveArtistInfoRequest) (res *artistInfoUser.PreSaveArtistInfoData, err error) {
 	return a.artistInfoLogic.GetPreSaveArtistInfo(in)
 }

cmd/internal/controller/artistinfo_artshow.go

@@ -21,6 +21,11 @@ type ArtistInfoArtshowProvider struct {
 	videoLogic            logic.ArtshowVideoLogic
 	artistIndexLogic      logic.ArtshowArtistIndexLogic
 	artistSupplementLogic logic.ArtshowArtistSupplementLogic
+	artshowLogic          logic.ArtshowLogic
+}
+
+func (a ArtistInfoArtshowProvider) GetArtshowHistroyList(ctx context.Context, request *artistinfoArtshow.GetArtshowHistroyListRequest) (*artistinfoArtshow.GetArtshowHistroyListResponse, error) {
+	return a.artshowLogic.GetArtshowHistroyList(request)
 }
 
 // ----------------- 画展包-画家补充信息

cmd/internal/dao/artistInfo_user.go

@@ -31,6 +31,7 @@ func RegisterUser(req *artistInfoUser.RegisterUserRequest) (rep *artistInfoUser.
 		InviteCode:    req.UserInviteCode,
 		Account:       req.Account,
 	}
+	zap.L().Debug(fmt.Sprintf("RegisterUser--user: %+v", user))
 	if err = db.DB.Create(&user).Error; err != nil {
 		zap.L().Error("register user err", zap.Error(err))
 		err = errors.New(m.ERROR_SELECT)
@@ -92,6 +93,8 @@ func CreateUserInfo(req *artistInfoUser.CreateUserInfoRequest) (rep *artistInfoU
 
 	fmt.Println(14)
 	user.ID = req.Id
+	user.TelNum = req.TelNum
+	user.InviteCode = req.InvitedCode
 	// todo 下面部分信息需要转存至画家服务和账号服务
 	//user.Name = req.RealName
 	//user.PenName = req.PenName
@@ -187,7 +190,11 @@ func GetUser(req *artistInfoUser.GetUserRequest) (rep *artistInfoUser.GetUserRes
 	var user model.User
 	if err = db.DB.Where("tel_num = ?", req.TelNum).First(&user).Error; err != nil {
 		zap.L().Error("get user info err", zap.Error(err))
-		err = errors.New(m.ERROR_SELECT)
+		if err == gorm.ErrRecordNotFound {
+			err = errors.New("没有找到数据")
+		} else {
+			err = errors.New(m.ERROR_SELECT)
+		}
 		return nil, err
 	}
 	// rep.
@@ -279,14 +286,16 @@ func ArtistSupplyList(req *artistInfoUser.ArtistSupplyListRequest) (rep *artistI
 }
 
 func UserLock(req *artistInfoUser.UserLockRequest) (rep *artistInfoUser.UserLockRespond, err error) {
-	var tx = db.DB.Model(model.User{}).Begin()
+	rep = &artistInfoUser.UserLockRespond{}
+	var tx = db.DB.Begin()
+	tx_user := tx.Model(model.User{})
 	switch {
 	case req.Id != 0:
-		tx = tx.Where("id = ?", req.Id)
+		tx_user = tx_user.Where("id = ?", req.Id)
 	case req.AccId != 0:
-		tx = tx.Where("mgmt_acc_id = ?", req.AccId)
+		tx_user = tx_user.Where("mgmt_acc_id = ?", req.AccId)
 	case req.ArtistUid != "":
-		tx = tx.Where("mgmt_artist_uid = ?", req.ArtistUid)
+		tx_user = tx_user.Where("mgmt_artist_uid = ?", req.ArtistUid)
 	default:
 		err = errors.New(m.ERROR_DATA_NOT_EXISTS)
 		zap.L().Error("get user info err", zap.Error(err))
@@ -296,27 +305,37 @@ func UserLock(req *artistInfoUser.UserLockRequest) (rep *artistInfoUser.UserLock
 	if req.IsLock {
 		now = stime.TimeToString(time.Now(), stime.Format_Normal_YMDhms)
 	}
-	if err = tx.Update("is_lock", req.IsLock).Update("latest_lock_time", now).Error; err != nil {
+	var thisUser model.User
-		zap.L().Error("get user info err", zap.Error(err))
+	if err = tx_user.Find(&thisUser).Error; err != nil {
+		return nil, err
+	}
+	if err = tx_user.Update("is_lock", req.IsLock).Error; err != nil {
+		zap.L().Error("get user info err 11", zap.Error(err))
 		err = errors.New(m.ERROR_SELECT)
 		return nil, err
 	}
 	rep.LockTime = now
-
 	if !req.IsLock {
+		fmt.Println("122312312312331")
 		// 解锁时与另外4个模块联动
-		if err = db.DB.Model(model.ArtworkLockRecord{}).Where("artist_uid = ? AND status =2 ", req.ArtistUid).Update("status", 3).Error; err != nil {
+		if err = tx.Model(model.ArtworkLockRecord{}).Where("artist_uid = ? AND status =2 ", thisUser.MgmtArtistUid).Update("status", 3).Error; err != nil {
 			return nil, err
 		}
-		if err = db.DB.Model(model.ArtshowArtistSupplement{}).Where("artist_uid = ? AND status =2 ", req.ArtistUid).Update("status", 3).Error; err != nil {
+		if err = tx.Model(model.ArtshowArtistSupplement{}).Where("artist_uid = ? AND status =2 ", thisUser.MgmtArtistUid).Update("status", 3).Error; err != nil {
 			return nil, err
 		}
-		if err = db.DB.Model(model.ArtshowArtistIndex{}).Where("artist_uid = ? AND status =2 ", req.ArtistUid).Update("status", 3).Error; err != nil {
+		if err = tx.Model(model.ArtshowArtistIndex{}).Where("artist_uid = ? AND status =2 ", thisUser.MgmtArtistUid).Update("status", 3).Error; err != nil {
 			return nil, err
 		}
-		if err = db.DB.Model(model.ArtshowVideoRecord{}).Where("artist_uid = ? AND status =2 ", req.ArtistUid).Update("status", 3).Error; err != nil {
+		if err = tx.Model(model.ArtshowVideoRecord{}).Where("artist_uid = ? AND status =2 ", thisUser.MgmtArtistUid).Update("status", 3).Error; err != nil {
 			return nil, err
 		}
+	} else {
+		fmt.Println("else 更新最新上锁时间")
+		if err = tx.Model(model.User{}).Where("mgmt_artist_uid = ?", thisUser.MgmtArtistUid).Update("latest_lock_time", now).Error; err != nil {
+			return nil, err
+		}
+		fmt.Println("更新结束")
 	}
 	tx.Commit()
 
@@ -329,7 +348,6 @@ func CheckInvitedCode(req *artistInfoUser.CheckInvitedCodeRequest) (rep *artistI
 	var user model.User
 	if err = db.DB.First(&user, "invited_code = ?", req.InvitedCode).Error; err != nil {
 		zap.L().Error("get user info err", zap.Error(err))
-		err = errors.New(m.ERROR_SELECT)
 		return nil, err
 	}
 	// rep.
@@ -350,60 +368,56 @@ func CheckInvitedCode(req *artistInfoUser.CheckInvitedCodeRequest) (rep *artistI
 func UnFinishList(req *artistInfoUser.UnFinishListRequest) (rep *artistInfoUser.UnFinishListRespond, err error) {
 	rep = &artistInfoUser.UnFinishListRespond{}
 	var user model.User
-	if err := db.DB.Where("id = ? ", req.Id).First(&user).Error; err != nil {
+	if err := db.DB.Where("mgmt_acc_id = ? ", req.AccId).First(&user).Error; err != nil {
 		zap.L().Error("get user info err", zap.Error(err))
 		err = errors.New(m.ERROR_SELECT)
 		return nil, err
-
+	}
+	var accountStatusList int64
+	if user.IsRealName == 0 {
+		accountStatusList = 1
+		return
+	}
+	if user.MgmtArtistUid == "" {
+		accountStatusList = 2
+		return
 	}
 
-	// todo
+	//艺术家补充信息完成度统计
-	//var realName model.RealName
+	//var unfinishArtistSupplementCount int64
-	//if err := db.DB.Where("id = ? ", user.RealNameID).First(&realName).Error; err != nil {
+	//if err = db.DB.Model(model.ArtshowArtistSupplement{}).Where("status = 2 AND artist_uid = ? AND audit_status in (3,5)", user.MgmtArtistUid).Count(&unfinishArtistSupplementCount).Error; err != nil {
-	//	zap.L().Error("get user info err", zap.Error(err))
+	//	zap.L().Error("艺术家补充信息统计错误")
-	//	err = errors.New(m.ERROR_SELECT)
 	//	return nil, err
 	//}
-	//var contract model.Contract
+	var viewData = struct {
-	//var contractCount int64
+		UnfinishedArtworkBaseCount       int64 `gorm:"column:unfinished_artwork_base_count;comment:未完成的画作基本信息数量"`
-	//if err := db.DB.Model(&contract).Where("state = ? and (user_id = ? or card_id = ?) and (type =1 or type = 2 or type = 3)", "1", user.ID, realName.IDNum).Count(&contractCount).Error; err != nil {
+		UnfinishedArtworkSupplementCount int64 `gorm:"column:unfinished_artwork_supplement_count;comment:未完成的画作补充信息数量"`
-	//	err = errors.New(m.ERROR_SELECT)
+		UnfinishedArtistSupplementCount  int64 `gorm:"column:unfinished_artist_supplement_count;comment:未完成的画家补充信息数量"`
-	//	return nil, err
+		UnfinishedArtistVideoRecordCount int64 `gorm:"column:unfinished_artist_video_record_count;comment:未完成的画展视频统计"`
-	//}
+		UnfinishedArtistIndexCount       int64 `gorm:"column:unfinished_artist_index_count;comment:未完成的画家指数"`
-	//rep.ContractList = contractCount
+	}{}
-	//var accountStateCount int64
+	//todo 目前缺少合同列表
-	//fmt.Println(realName.IDNum)
+	var sql = fmt.Sprintf(`
-	//if err := db.DB.Model(&contract).Where("state = ? and (user_id = ? or card_id = ?) and type = 4", "1", user.ID, realName.IDNum).Count(&accountStateCount).Error; err != nil {
+SELECT 
-	//	zap.L().Error("get user info err", zap.Error(err))
+	COUNT(1) unfinished_artwork_base_count ,
-	//	err = errors.New(m.ERROR_SELECT)
+	(SELECT COUNT(1) FROM artwork_lock_record WHERE artist_uid = ? AND deleted_at = 0 AND STATUS =2 AND supplement_audit_status IN (3,5) )unfinished_artwork_supplement_count,
-	//	return nil, err
+	(SELECT COUNT(1) FROM artshow_artist_supplement WHERE artist_uid = ? AND  deleted_at = 0 AND STATUS =2 AND audit_status  IN (3,5) ) unfinished_artist_supplement_count,
-	//}
+	(SELECT COUNT(1) FROM artshow_video_record WHERE artist_uid = ? AND deleted_at = 0 AND STATUS =2 AND audit_status  IN (3,5)) unfinished_artist_video_record_count,
-	//rep.AccountStateList = accountStateCount
+	(SELECT COUNT(1) FROM artshow_artist_index WHERE artist_uid = ? AND deleted_at = 0 AND STATUS =2  AND audit_status  IN (3,5)) unfinished_artist_index_count
-	//var supplyInfo model.SupplyInfo
+FROM 
-	//var supplyInfoCount int64
+artwork_lock_record
-	//if err := db.DB.Model(&supplyInfo).Where("types = ? and user_id = ? ", "1", user.ID).Count(&supplyInfoCount).Error; err != nil {
+WHERE artist_uid = ? AND STATUS = 2 AND base_audit_status IN (1,3,5)
-	//	zap.L().Error("get user info err", zap.Error(err))
+`)
-	//	err = errors.New(m.ERROR_SELECT)
+	err = db.DB.Raw(sql, user.MgmtArtistUid, user.MgmtArtistUid, user.MgmtArtistUid, user.MgmtArtistUid, user.MgmtArtistUid).Scan(&viewData).Error
-	//	return nil, err
+	if err != nil {
-	//}
+		return nil, err
-	//rep.SupplyInfoList += supplyInfoCount
+	}
-	//var exhVideo model.ExhVideo
-	//var exhVideoCount int64
-	//if err := db.DB.Model(&exhVideo).Where("types = ? and user_id = ? ", "1", user.ID).Count(&exhVideoCount).Error; err != nil {
-	//	zap.L().Error("get user info err", zap.Error(err))
-	//	err = errors.New(m.ERROR_SELECT)
-	//	return nil, err
-	//}
-	//rep.SupplyInfoList += exhVideoCount
-	//var exhExam model.ExhExam
-	//var exhExamCount int64
-	//if err := db.DB.Model(&exhExam).Where("types = ? and user_id = ? ", "1", user.ID).Count(&exhExamCount).Error; err != nil {
-	//	zap.L().Error("get user info err", zap.Error(err))
-	//	err = errors.New(m.ERROR_SELECT)
-	//	return nil, err
-	//}
-	//rep.SupplyInfoList += exhExamCount
 
+	rep = &artistInfoUser.UnFinishListRespond{
+		ContractList:     0, //todo
+		SupplyInfoList:   viewData.UnfinishedArtworkBaseCount + viewData.UnfinishedArtworkSupplementCount + viewData.UnfinishedArtistIndexCount + viewData.UnfinishedArtistSupplementCount,
+		AccountStateList: accountStatusList,
+	}
 	return rep, nil
 }
 
@@ -496,6 +510,7 @@ func FindUser(req *artistInfoUser.FindUserRequest) (rep *artistInfoUser.UserInfo
 		Account:        data.Account,
 		CertificateNum: data.CertificateNum,
 		CertificateImg: data.CertificateImg,
+		JoinAssoTime:   data.JoinAssoTime,
 		Photo:          data.Photo,
 		HtmlType:       data.Htmltype,
 		EnvType:        data.Envtype,
@@ -517,6 +532,9 @@ func FindUserList(req *artistInfoUser.FindUsersRequest) (rep []*artistInfoUser.U
 	if req.InvitedCode != "" {
 		tx = tx.Where("invited_code = ?", req.InvitedCode)
 	}
+	if req.MgmtAccountId != 0 {
+		tx = tx.Where("mgmt_acc_id = ?", req.MgmtAccountId)
+	}
 	if req.MgmtArtistUid != "" {
 		tx = tx.Where("mgmt_artist_uid = ?", req.MgmtArtistUid)
 	}
@@ -591,6 +609,7 @@ func FindUserList(req *artistInfoUser.FindUsersRequest) (rep []*artistInfoUser.U
 			Account:        v.Account,
 			CertificateNum: v.CertificateNum,
 			CertificateImg: v.CertificateImg,
+			JoinAssoTime:   v.JoinAssoTime,
 			Photo:          v.Photo,
 			HtmlType:       v.Htmltype,
 			EnvType:        v.Envtype,
@@ -694,6 +713,12 @@ func UpdateUserData(req *artistInfoUser.UserInfo) (rep *artistInfoUser.CommonNoP
 	if req.EnvType != "" {
 		preUpdateData.Envtype = req.EnvType
 	}
+	if req.JoinAssoTime != "" {
+		preUpdateData.JoinAssoTime = req.JoinAssoTime
+	}
+	if req.WxAccount != "" {
+		preUpdateData.WxAccount = req.WxAccount
+	}
 	//var updateData = model.User{
 	//	Model: model.Model{
 	//		ID:        req.Id,
@@ -863,3 +888,63 @@ func CheckUserLockByArtistUid(artistUid string) (err error) {
 	}
 	return nil
 }
+func GetInvitedUserList(in *artistInfoUser.GetInvitedUserListRequest) (res *artistInfoUser.GetInvitedUserListResponse, err error) {
+	var inviteUser = model.User{}
+	var tx = db.DB.Model(model.User{})
+	if in.TelNum != "" {
+		tx.Where("tel_num = ?", in.TelNum)
+	} else if in.InviterCode != "" {
+		tx.Where("invited_code = ?", in.InviterCode)
+	} else {
+		return nil, errors.New("手机号或个人邀请码不能为空")
+	}
+	err = tx.First(&inviteUser).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			err = errors.New("找不到用户")
+		}
+		return nil, err
+	}
+
+	res = &artistInfoUser.GetInvitedUserListResponse{
+		Data: []*artistInfoUser.InvitedUser{},
+		Page: &artistInfoUser.UserCommonPageInfo{},
+	}
+	var inviteRelationIds []int64
+	db.DB.Model(model.Invite{}).Where("user_id = ?", inviteUser.ID).Pluck("invited_id", &inviteRelationIds)
+	var invitedList []model.User
+	tx = db.DB.Model(model.User{}).Where("id in ?", inviteRelationIds)
+	if err = tx.Count(&res.Page.Total).Scopes(db.Pagination(in.Page, in.PageSize)).Find(&invitedList).Error; err != nil {
+		return nil, err
+	}
+	for _, v := range invitedList {
+		var (
+			realName string
+			sex      string
+			age      int64
+		)
+		if v.RealNameInfo != nil {
+			realName = v.RealNameInfo.Name
+			sex = string(v.RealNameInfo.Sex)
+			age = int64(v.RealNameInfo.Age)
+		}
+		res.Data = append(res.Data, &artistInfoUser.InvitedUser{
+			UserId:     v.ID,
+			AccId:      v.MgmtAccId,
+			ArtistUid:  v.MgmtArtistUid,
+			TelNum:     v.TelNum,
+			InviteCode: v.InviteCode,
+			Account:    v.Account,
+			Photo:      v.Photo,
+			IsRealName: v.IsRealName,
+			FddState:   v.FddState,
+			RealName:   realName,
+			Sex:        sex,
+			Age:        age,
+			CreatedAt:  stime.TimeToString(v.CreatedAt, stime.Format_Normal_YMDhms),
+			//PenName:    ,
+			//StageName:  "",
+		})
+	}
+	return
+}

cmd/internal/dao/artistinfo_artshow_artistIndex.go

@@ -47,8 +47,7 @@ func (a artistinfoArtshowArtistIndex) CreateData(data *model.ArtshowArtistIndex,
 }
 
 func (a artistinfoArtshowArtistIndex) UpdateData(data *model.ArtshowArtistIndex) error {
-	return db.DB.Updates(&data).Error
+	return db.DB.Where("id = ?", data.ID).Updates(&data).Error
-
 }
 
 func (a artistinfoArtshowArtistIndex) DeletedData(id ...int64) (err error) {
@@ -61,7 +60,7 @@ func (a artistinfoArtshowArtistIndex) DeletedData(id ...int64) (err error) {
 }
 
 func (a artistinfoArtshowArtistIndex) GetData(id int64) (data *model.ArtshowArtistIndex, err error) {
-	err = db.DB.Where("id = ?", id).First(data).Error
+	err = db.DB.Where("id = ?", id).First(&data).Error
 	return
 }
 
@@ -89,6 +88,7 @@ func (a artistinfoArtshowArtistIndex) GetDataList(req *artistinfoArtshow.GetArti
 	err = tx.Count(&total).Scopes(db.Pagination(req.Page, req.PageSize)).Find(&datas).Error
 	return
 }
+
 func (a artistinfoArtshowArtistIndex) Audit(auditStatus model.AuditStatus, mark1, mark2 string, ids ...int64) (err error) {
 	tx := db.DB.Begin()
 	err = tx.Model(model.ArtshowArtistIndex{}).Where("id in ?", ids).Update("audit_status", auditStatus).Error

cmd/internal/dao/artistinfo_artwork.go

@@ -128,13 +128,15 @@ func GetArtworkLockRecords(req *artistInfoArtwork.GetArtworkLockRecordsRequest)
 	case artistInfoArtwork.ArtworkQueryMode_NowPreSaveAndLocked: //当前暂存和已锁定的画作（也就是用户端画作管理中的数据）
 		tx = tx.Where("status =1 OR status =2")
 	case artistInfoArtwork.ArtworkQueryMode_NowAuditFlowOfBase: //当前处于基本信息审批阶段的画作(包括进入其它流程的画作)
-		tx = tx.Where("status = 2") // AND audit_flow_index = 2
+		tx = tx.Where("status = 2 ") // AND audit_flow_index = 2
 	case artistInfoArtwork.ArtworkQueryMode_NowAuditFlowOfSupplementing: //当前处于补充信息审批阶段的画作
 		tx = tx.Where("status =2 AND audit_flow_index = 3")
 	case artistInfoArtwork.ArtworkQueryMode_AllUnlockArtwork: //所有已解锁的画作(历史画作)
-		tx = tx.Where("status = 3 OR status = 2")
+		tx = tx.Where("status = 3").Order("lock_time desc")
 		//case artistInfoArtwork.ArtworkQueryMode_AllHistoryArtwork: //所有历史画作
 		//	tx = tx.Where("status > 1")
+	case artistInfoArtwork.ArtworkQueryMode_AllAuditPassArtwork: //所有审核通过的画作
+		tx = tx.Where("supplement_audit_status = 4").Order("lock_time desc")
 	}
 	if req.AuditStatus != 0 {
 		tx = tx.Where("audit_status = ?", req.AuditStatus)

cmd/internal/logic/artistInfo_user.go

@@ -7,6 +7,8 @@ import (
 	"github.com/fonchain/fonchain-artistinfo/pb/artist"
 	"github.com/fonchain/fonchain-artistinfo/pb/artistInfoUser"
 	"github.com/fonchain/fonchain-artistinfo/pkg/service"
+	"github.com/fonchain/fonchain-artistinfo/pkg/util/stime"
+	"strings"
 )
 
 type IArtistInfo interface {
@@ -107,30 +109,38 @@ func (a *ArtistInfoUser) FindUsersUserView(req *artistInfoUser.FindUsersRequest)
 			artistUidList = append(artistUidList, v.ArtistUid)
 		}
 		returnData = append(returnData, &artistInfoUser.UserView{
-			UserId:            v.UserId,
+			UserId:     v.UserId,
-			AccId:             v.AccId,
+			AccId:      v.AccId,
-			ArtistUid:         v.ArtistUid,
+			ArtistUid:  v.ArtistUid,
-			TelNum:            v.TelNum,
+			TelNum:     v.TelNum,
-			InviteCode:        v.InviteCode,
+			InviteCode: v.InviteCode,
-			Account:           v.Account,
+			Account:    v.Account,
-			Photo:             v.Photo,
+			Photo:      v.Photo,
-			IsRealName:        v.IsRealName,
+			IsRealName: v.IsRealName,
-			FddState:          v.FddState,
+			FddState:   v.FddState,
-			IsRead:            v.IsRead,
+			IsRead:     v.IsRead,
-			IsLock:            v.IsLock,
+			IsLock:     v.IsLock,
-			RealName:          v.RealName,
+			RealName:   v.RealName,
-			IdNum:             v.IdNum,
+			IdNum:      v.IdNum,
-			Sex:               string(v.Sex),
+			Sex:        string(v.Sex),
-			Age:               v.Age,
+			Age:        v.Age,
-			Address:           v.RealAddress,
+			//Address:           v.RealAddress,
 			IdcardBack:        v.IdcardBack,
 			IdcardFront:       v.IdcardFront,
 			InviterInviteCode: v.InviterInviteCode,
 			InviterRealName:   v.InviterRealName,
+			JoinAssoTime:      v.JoinAssoTime,
 			DeletedAt:         v.DeletedAt,
-			UpdatedAt:         v.UpdatedAt.Unix(),
+			UpdatedAt:         stime.TimeToString(v.UpdatedAt, stime.Format_Normal_YMDhms),
-			CreatedAt:         v.CreatedAt.Unix(),
+			CreatedAt:         stime.TimeToString(v.CreatedAt, stime.Format_Normal_YMDhms),
+			CertificateNum:    v.CertificateNum,
+			CertificateImg:    v.CertificateImg,
 			LatestLockTime:    v.LatestLockTime,
+			WxAccount:         v.WxAccount,
+			//BankName:          v.BankName,
+			//BankNum:           v.BankNum,
+			//PenName:           "",
+			//StageName:         "",
 		})
 	}
 	if artistUidList != nil {
@@ -139,6 +149,7 @@ func (a *ArtistInfoUser) FindUsersUserView(req *artistInfoUser.FindUsersRequest)
 			Page:     1,
 			PageSize: int32(len(artistUidList)),
 			Uids:     artistUidList,
+			Gender:   -1,
 		})
 		if err != nil {
 			fmt.Println("错误：GrpcArtistImpl.GetInfoByUuids ", err.Error())
@@ -148,9 +159,11 @@ func (a *ArtistInfoUser) FindUsersUserView(req *artistInfoUser.FindUsersRequest)
 			for i, user := range returnData {
 				if artistValue.Uid == user.ArtistUid {
 					returnData[i].CertificateNum = artistValue.CaaCertNum
-					returnData[i].OpenBank = artistValue.BankNum
+					returnData[i].BankNum = artistValue.BankNum
+					returnData[i].BankName = artistValue.BankName
 					returnData[i].PenName = artistValue.PenName
 					returnData[i].StageName = artistValue.StageName
+					returnData[i].Address = strings.Split(artistValue.Address, "，")
 					break
 				}
 			}
@@ -176,3 +189,7 @@ func (a *ArtistInfoUser) GetPreSaveArtistInfo(in *artistInfoUser.GetPreSaveArtis
 	res, err = dao.GetPreSaveArtistInfo(in)
 	return
 }
+func (a *ArtistInfoUser) GetInvitedUserList(in *artistInfoUser.GetInvitedUserListRequest) (res *artistInfoUser.GetInvitedUserListResponse, err error) {
+	res, err = dao.GetInvitedUserList(in)
+	return
+}

cmd/internal/logic/artistinfo_artshow.go

@@ -0,0 +1,205 @@
+// Package logic -----------------------------
+// @file      : artistinfo_artshow.go
+// @author    : JJXu
+// @contact   : wavingbear@163.com
+// @time      : 2023/3/7 15:55
+// -------------------------------------------
+package logic
+
+import (
+	"context"
+	"fmt"
+	"github.com/fonchain/fonchain-artistinfo/cmd/model"
+	"github.com/fonchain/fonchain-artistinfo/pb/artistinfoArtshow"
+	"github.com/fonchain/fonchain-artistinfo/pb/artwork_query"
+	db "github.com/fonchain/fonchain-artistinfo/pkg/db"
+	"github.com/fonchain/fonchain-artistinfo/pkg/service"
+	"github.com/fonchain/fonchain-artistinfo/pkg/util/stime"
+	"time"
+)
+
+type ArtshowLogic struct{}
+
+func (a ArtshowLogic) GetArtshowHistroyList(request *artistinfoArtshow.GetArtshowHistroyListRequest) (data *artistinfoArtshow.GetArtshowHistroyListResponse, err error) {
+	data = &artistinfoArtshow.GetArtshowHistroyListResponse{}
+
+	//查询数据
+	var (
+		//画家补充信息
+		artistSupplementList = []model.ArtshowArtistSupplement{}
+		//画家指数
+		artistIndexList = []model.ArtshowArtistIndex{}
+		//画展视频资料
+		artshowVideoList = []model.ArtshowVideoRecord{}
+		//画作补充信息基本列表
+		artworBaseList = []model.ArtworkLockRecord{}
+		//画作补充信息列表
+		artworkSupplementList = []*artwork_query.ArtworkPreviewResponse{}
+	)
+	var (
+		//画家补充信息
+		db_artistSupplement = db.DB.Model(&model.ArtshowArtistSupplement{}).Where("status = 3 AND artist_uid = ?", request.ArtistUid).Order("lock_time desc")
+		//画家指数
+		db_artistIndex = db.DB.Model(&model.ArtshowArtistIndex{}).Where("status = 3 AND artist_uid = ?", request.ArtistUid).Order("lock_time desc")
+		//画展视频资料
+		db_artshowVideo = db.DB.Model(&model.ArtshowVideoRecord{}).Where("status = 3 AND artist_uid = ?", request.ArtistUid).Order("lock_time desc")
+		//画作补充信息基本列表
+		db_artworBase = db.DB.Model(&model.ArtworkLockRecord{}).Where("status = 3 AND artist_uid = ?", request.ArtistUid).Order("lock_time desc")
+	)
+	if request.AuditStatus != 0 {
+		db_artistSupplement = db_artistSupplement.Where("audit_status = ?", request.AuditStatus)
+		db_artistIndex = db_artistIndex.Where("audit_status = ?", request.AuditStatus)
+		db_artshowVideo = db_artshowVideo.Where("audit_status = ?", request.AuditStatus)
+		db_artworBase = db_artworBase.Where("supplement_audit_status = ?", request.AuditStatus)
+	}
+
+	err = db_artistSupplement.Find(&artistSupplementList).Error
+	if err != nil {
+		return nil, err
+	}
+	err = db_artistIndex.Find(&artistIndexList).Error
+	if err != nil {
+		return nil, err
+	}
+	err = db_artshowVideo.Find(&artshowVideoList).Error
+	if err != nil {
+		return nil, err
+	}
+	err = db_artworBase.Find(&artworBaseList).Error
+	if err != nil {
+		return nil, err
+	}
+	// 查询画作补充信息
+	artworkUidList := []string{}
+	for _, v := range artworBaseList {
+		artworkUidList = append(artworkUidList, v.ArtworkUid)
+	}
+	artworkSupplementRes, err := service.ArtworkQueryImpl.ArtworkPreviewList(context.Background(), &artwork_query.ArtworkPreviewListRequest{
+		Page:        1,
+		PageSize:    -1,
+		ArtworkUids: artworkUidList,
+	})
+	if err != nil {
+		return nil, err
+	}
+	artworkSupplementList = artworkSupplementRes.Data
+
+	// 使用画家补充信息的锁定时间进行分组，然后补充剩余数据
+	var dataGroups = []*artistinfoArtshow.TimeGroup{}
+	var thisTime = ""
+	var thisIndex = -1
+	for count, v := range artistSupplementList {
+		if thisTime == "" || v.LockTime != thisTime {
+			thisTime = v.LockTime
+			thisIndex++
+		}
+		var isAdd = true
+		if request.PageSize > -1 {
+			if int64(count) >= request.PageSize*(request.Page-1) && int64(count) < request.PageSize*request.Page {
+				isAdd = true
+			} else {
+				isAdd = false
+			}
+		}
+		if isAdd {
+			dataGroups = append(dataGroups, &artistinfoArtshow.TimeGroup{
+				Time:                  thisTime,
+				ArtworkSupplementList: []*artistinfoArtshow.ArtworkSupplementData{},
+				ArtistSupplementList:  []*artistinfoArtshow.ArtistSupplementData{},
+				ArtistIndexList:       []*artistinfoArtshow.ArtistIndexData{},
+				ArtistVideoList:       []*artistinfoArtshow.ArtistVideoData{},
+			})
+
+			dataGroups[thisIndex].ArtistSupplementList = append(dataGroups[thisIndex].ArtistSupplementList, &artistinfoArtshow.ArtistSupplementData{
+				ArtistUid:       v.ArtistUid,
+				Status:          v.Status,
+				LockTime:        v.LockTime,
+				AuditStatus:     int64(v.AuditStatus),
+				AuditMark1:      v.AuditMark1,
+				AuditMark2:      v.AuditMark2,
+				ArtistName:      v.ArtistName,
+				ArtistProfile:   v.ArtistProfile,
+				CountryArtLevel: v.CountryArtLevel,
+				ArtistCertPic:   v.ArtistCertPic,
+				BankNum:         v.BankNum,
+				BankName:        v.BankName,
+				Id:              v.ID,
+				CreatedAt:       stime.TimeToString(v.CreatedAt, stime.Format_Normal_YMDhms),
+				UpdatedAt:       stime.TimeToString(v.CreatedAt, stime.Format_Normal_YMDhms),
+				DeletedAt:       stime.TimeToString(time.Unix(v.CreatedAt.Unix(), 0), stime.Format_Normal_YMDhms),
+			})
+		}
+	}
+
+	for i, group := range dataGroups {
+		//补充画家指数
+		for _, v := range artistIndexList {
+			if v.LockTime == group.Time {
+				dataGroups[i].ArtistIndexList = append(dataGroups[i].ArtistIndexList, &artistinfoArtshow.ArtistIndexData{
+					ArtistUid:   v.ArtistUid,
+					Title:       v.Title,
+					Class:       v.Class,
+					TitleScore:  v.TitleScore,
+					Score:       v.Score,
+					Types:       v.Types,
+					Status:      v.Status,
+					LockTime:    v.LockTime,
+					AuditMark1:  v.AuditMark1,
+					AuditMark2:  v.AuditMark2,
+					AuditStatus: int64(v.AuditStatus),
+					Id:          v.ID,
+					CreatedAt:   stime.TimeToString(v.CreatedAt, stime.Format_Normal_YMDhms),
+					UpdatedAt:   stime.TimeToString(v.CreatedAt, stime.Format_Normal_YMDhms),
+					DeletedAt:   fmt.Sprintf("%d", v.DeletedAt),
+				})
+			}
+		}
+		//补充视频信息
+		for _, v := range artshowVideoList {
+			if v.LockTime == group.Time {
+				dataGroups[i].ArtistVideoList = append(dataGroups[i].ArtistVideoList, &artistinfoArtshow.ArtistVideoData{
+					Id:          v.ID,
+					ArtistUid:   v.ArtistUid,
+					LockTime:    v.LockTime,
+					VideoUrl:    v.VideoUrl,
+					AuditStatus: int64(v.AuditStatus),
+					AuditMark1:  v.AuditMark1,
+					AuditMark2:  v.AuditMark2,
+					ArtistName:  v.ArtistName,
+				})
+			}
+		}
+
+		for _, v := range artworBaseList {
+			if v.LockTime == group.Time {
+				for _, artowrkSupplement := range artworkSupplementList {
+					if v.ArtworkUid == artowrkSupplement.ArtworkUid {
+						dataGroups[i].ArtworkSupplementList = append(dataGroups[i].ArtworkSupplementList, &artistinfoArtshow.ArtworkSupplementData{
+							ArtistUid:      v.ArtistUid,
+							Status:         v.Status,
+							LockTime:       v.LockTime,
+							AuditStatus:    int64(v.SupplementAuditStatus),
+							AuditMark1:     v.SupplementAuditMark,
+							AuditMark2:     v.SupplementAuditMark2,
+							ArtworkName:    artowrkSupplement.ArtworkName,
+							CreatedDate:    artowrkSupplement.CreateDate,
+							CreatedAddress: artowrkSupplement.CreatedAddress,
+							CreatedAt:      stime.TimeToString(v.CreatedAt, stime.Format_Normal_YMDhms),
+							UpdatedAt:      stime.TimeToString(v.CreatedAt, stime.Format_Normal_YMDhms),
+							DeletedAt:      int64(v.DeletedAt),
+							ArtworkUuid:    artowrkSupplement.ArtworkUid,
+							Length:         artowrkSupplement.Length,
+							Width:          artowrkSupplement.Width,
+							Ruler:          artowrkSupplement.Ruler,
+							HdPic:          artowrkSupplement.HdPic,
+							ArtistPhoto:    artowrkSupplement.ArtistPhoto,
+						})
+					}
+				}
+			}
+		}
+	}
+	data.Data = dataGroups
+	fmt.Printf("%+v\n", dataGroups)
+	return
+}

cmd/internal/logic/artistinfo_artshowArtistIndex.go

@@ -13,6 +13,7 @@ import (
 	"github.com/fonchain/fonchain-artistinfo/cmd/model"
 	"github.com/fonchain/fonchain-artistinfo/pb/artistInfoUser"
 	"github.com/fonchain/fonchain-artistinfo/pb/artistinfoArtshow"
+	"github.com/fonchain/fonchain-artistinfo/pkg/util/stime"
 	"google.golang.org/protobuf/types/known/emptypb"
 	"gorm.io/gorm"
 )
@@ -75,8 +76,8 @@ func (a ArtshowArtistIndexLogic) GetArtistIndexDetail(request *artistinfoArtshow
 		AuditMark2:  data.AuditMark2,
 		AuditStatus: int64(data.AuditStatus),
 		Id:          data.ID,
-		CreatedAt:   data.CreatedAt.Unix(),
+		CreatedAt:   stime.TimeToString(data.CreatedAt, stime.Format_Normal_YMDhms),
-		UpdatedAt:   data.UpdatedAt.Unix(),
+		UpdatedAt:   stime.TimeToString(data.UpdatedAt, stime.Format_Normal_YMDhms),
 		DeletedAt:   int64(data.DeletedAt),
 		Editable:    data.Editable(),
 	}
@@ -108,8 +109,8 @@ func (a ArtshowArtistIndexLogic) GetArtistIndexList(request *artistinfoArtshow.G
 			AuditMark2:  v.AuditMark2,
 			AuditStatus: int64(v.AuditStatus),
 			Id:          v.ID,
-			CreatedAt:   v.CreatedAt.Unix(),
+			CreatedAt:   stime.TimeToString(v.CreatedAt, stime.Format_Normal_YMDhms),
-			UpdatedAt:   v.UpdatedAt.Unix(),
+			UpdatedAt:   stime.TimeToString(v.UpdatedAt, stime.Format_Normal_YMDhms),
 			DeletedAt:   int64(v.DeletedAt),
 		})
 	}

cmd/internal/logic/artistinfo_artshowArtistSupplement.go

@@ -13,6 +13,7 @@ import (
 	"github.com/fonchain/fonchain-artistinfo/cmd/model"
 	"github.com/fonchain/fonchain-artistinfo/pb/artistInfoUser"
 	"github.com/fonchain/fonchain-artistinfo/pb/artistinfoArtshow"
+	"github.com/fonchain/fonchain-artistinfo/pkg/util/stime"
 	"google.golang.org/protobuf/types/known/emptypb"
 	"gorm.io/gorm"
 )
@@ -75,8 +76,8 @@ func (a ArtshowArtistSupplementLogic) GetSupplementDetail(request *artistinfoArt
 		BankNum:         data.BankNum,
 		BankName:        data.BankName,
 		Id:              data.ID,
-		CreatedAt:       data.CreatedAt.Unix(),
+		CreatedAt:       stime.TimeToString(data.CreatedAt, stime.Format_Normal_YMDhms),
-		UpdatedAt:       data.UpdatedAt.Unix(),
+		UpdatedAt:       stime.TimeToString(data.UpdatedAt, stime.Format_Normal_YMDhms),
 		DeletedAt:       int64(data.DeletedAt),
 		Editable:        data.Editable(),
 	}
@@ -109,8 +110,8 @@ func (a ArtshowArtistSupplementLogic) GetSupplementList(request *artistinfoArtsh
 			AuditMark2:      v.AuditMark2,
 			AuditStatus:     int64(v.AuditStatus),
 			Id:              v.ID,
-			CreatedAt:       v.CreatedAt.Unix(),
+			CreatedAt:       stime.TimeToString(v.CreatedAt, stime.Format_Normal_YMDhms),
-			UpdatedAt:       v.UpdatedAt.Unix(),
+			UpdatedAt:       stime.TimeToString(v.UpdatedAt, stime.Format_Normal_YMDhms),
 			DeletedAt:       int64(v.DeletedAt),
 		})
 	}

cmd/internal/logic/artistinfo_artwork.go

@@ -9,6 +9,7 @@ package logic
 import (
 	"context"
 	"errors"
+	"fmt"
 	"github.com/fonchain/fonchain-artistinfo/cmd/internal/dao"
 	"github.com/fonchain/fonchain-artistinfo/cmd/model"
 	"github.com/fonchain/fonchain-artistinfo/pb/artistInfoArtwork"
@@ -102,6 +103,7 @@ func (a ArtistInfoArtworkLogic) GetArtworkLockHistoryGroup(request *artistInfoAr
 	for _, v := range unlockArtworkList.Data {
 		artworkUidList = append(artworkUidList, v.ArtworkUid)
 	}
+	fmt.Println("artworkUidList", artworkUidList)
 	//查询画作预览列表
 	previewListRes, err := service.ArtworkQueryImpl.ArtworkPreviewList(context.Background(), &artwork_query.ArtworkPreviewListRequest{
 		Page:        1,
@@ -111,6 +113,7 @@ func (a ArtistInfoArtworkLogic) GetArtworkLockHistoryGroup(request *artistInfoAr
 	if err != nil {
 		return nil, err
 	}
+	fmt.Println("previewListRes count", len(previewListRes.Data))
 	var thisLockTime = ""
 	var groupIndex = -1
 	for _, v := range unlockArtworkList.Data {
@@ -119,6 +122,8 @@ func (a ArtistInfoArtworkLogic) GetArtworkLockHistoryGroup(request *artistInfoAr
 			thisLockTime = v.LockTime
 			newGroup = true
 			groupIndex++
+		} else {
+			continue
 		}
 		if newGroup {
 			res.GroupList = append(res.GroupList, &artistInfoArtwork.ArtworkLockRecord{
@@ -145,13 +150,14 @@ func (a ArtistInfoArtworkLogic) GetArtworkLockHistoryGroup(request *artistInfoAr
 				SupplementAuditStatus: v.SupplementAuditStatus,
 				SupplementAuditMark:   v.SupplementAuditMark,
 				SupplementAuditMark2:  v.SupplementAuditMark2,
-				AuditFlowIndex:        int32(v.AuditFlowIndex),
+				AuditFlowIndex:        v.AuditFlowIndex,
 				CreatedAt:             v.CreatedAt,
 				UpdatedAt:             v.UpdatedAt,
 				DeletedAt:             v.DeletedAt,
 			})
 		}
 	}
+	fmt.Println("previewListRes count", len(previewListRes.Data))
 	return
 }
 

cmd/model/artshow_artistIndex.go

@@ -12,7 +12,7 @@ type ArtshowArtistIndex struct {
 	ArtistUid   string      `gorm:"column:artist_uid;comment:画家uid" json:"artistUid"`
 	Title       string      `gorm:"column:title;comment:" json:"title"`     //艺术家-展览(exhibition) 、 艺术家-资历（seniority） 、艺术家-专业（specialized） 、艺术家-影响力（Influence）、艺术家-收藏（collect）
 	Class       string      `gorm:"column:class;comment:指数类别" json:"class"` //exhibition 、seniority 、specialized 、Influence 、collect
-	TitleScore  int64       `gorm:"column:title_score;comment:总分" json:"titleScore"`
+	TitleScore  float32     `gorm:"column:title_score;comment:总分" json:"titleScore"`
 	Score       string      `gorm:"column:score;comment:前端定义的分数列表" json:"score"` //
 	Types       string      `gorm:"column:types;comment:" json:"types"`
 	Status      int64       `json:"status" gorm:"column:status;default:2;comment:2=锁定 3=解锁"` //跟随用户的锁定和解锁状态,用于控制数据的展示

cmd/model/tmpArtistInfo.go

@@ -16,6 +16,7 @@ type TempArtistInfo struct {
 	CaaCertNum  string `gorm:"column:caa_cert_num;comment:"`
 	CaaJoinTime string `gorm:"column:caa_join_time;comment:"`
 	JoinShow    int32  `gorm:"column:join_show;comment:"`
+	WxAccount   string `gorm:"column:wx_account;comment:微信账号"`
 }
 
 func (t TempArtistInfo) TableName() string {

cmd/model/user.go

@@ -12,6 +12,7 @@ type User struct {
 	Account        string  `gorm:"column:account;varchar(191);comment:账号"`
 	CertificateNum string  `gorm:"column:certificate_num;type:varchar(16);comment:中美协会证书编号"`
 	CertificateImg string  `gorm:"column:certificate_img;type:varchar(512);comment:中美协会证书url"`
+	JoinAssoTime   string  `json:"joinAssoTime" gorm:"column:join_asso_time;comment:入会时间"`
 	Photo          string  `gorm:"column:photo;type:varchar(255);comment:个人近照"`
 
 	// 实名认证
@@ -27,6 +28,8 @@ type User struct {
 	IsRead         int64  `gorm:"column:is_read;not null;comment:条款阅读状态"`
 	IsLock         bool   `gorm:"column:is_lock;not null;comment:画家锁定状态"`
 	LatestLockTime string `json:"latestLockTime" gorm:"column:latest_lock_time;comment:最新锁定时间"`
+	//ConAddress     string `json:"conAddress" gorm:"column:con_address;comment:"`
+	WxAccount string `json:"wxAccount" gorm:"column:wx_account;comment:"`
 	//前端参数，提交实名认证后生成
 	Htmltype string `gorm:"html_type" json:"htmltype"`
 	Envtype  string `gorm:"env_type" json:"envtype"`
@@ -45,10 +48,8 @@ type User struct {
 	//OpenId         string `gorm:"type:varchar(2048) not null"`
 	//Age            int32  `gorm:"not null"`
 	//Introduct      string `gorm:"type:varchar(2048) not null"`
-	//ConAddress     string `gorm:"type:varchar(2048) not null"`
 	//Photo          string `gorm:"type:varchar(2048) not null"`
 	//Video          string `gorm:"type:varchar(256) not null"`
-	//WxAccount      string `gorm:"type:varchar(256) not null"`
 }
 
 func (u User) TableName() string {

cmd/model/user_view.go

@@ -31,11 +31,17 @@ type UserView struct {
 	RealAddress       string    `json:"address" gorm:"column:real_address;comment:真实地址"`
 	IdcardBack        string    `json:"idcardBack" gorm:"column:idcard_back;comment:身份证背面"`
 	IdcardFront       string    `json:"idcard_front" gorm:"column:idcard_front;comment:身份证反面"`
+	JoinAssoTime      string    `json:"joinAssoTime" gorm:"column:join_asso_time;comment:入会时间"`
 	InviterInviteCode string    `json:"inviterInviteCode" gorm:"column:inviter_invite_code;comment:邀请人的邀请码"`
 	InviterRealName   string    `json:"inviterRealName" gorm:"column:inviter_name;comment:邀请人的真实姓名"`
 	CreatedAt         time.Time `json:"createdAt" gorm:"column:created_at;comment:"`
 	UpdatedAt         time.Time `json:"updatedAt" gorm:"column:updated_at;comment:"`
 	DeletedAt         int64     `json:"deletedAt" gorm:"column:deleted_at;comment:"`
+	CertificateNum    string    `json:"certificateNum" gorm:"column:certificate_num;comment:"`
+	CertificateImg    string    `json:"certificateImg" gorm:"column:certificate_img;comment:"`
+	BankName          string    `json:"bank_name" gorm:"column:bank_name;comment:"`
+	BankNum           string    `json:"bank_num" gorm:"column:bank_num;comment:"`
+	WxAccount         string    `json:"wx_account" gorm:"column:wx_account;comment:企业微信账号"`
 }
 
 func (u UserView) TableName() string {
@@ -68,7 +74,12 @@ SELECT
  su.deleted_at,
  inviter.invited_code inviter_invite_code,
  inviter_rn.name inviter_name,
- su.latest_lock_time
+ su.latest_lock_time,
+ su.join_asso_time,
+ su.certificate_num,
+ su.certificate_img,
+ su.wx_account
+
 FROM sys_user su
 LEFT JOIN real_name rn ON rn.id  = su.real_name_id 
 -- 邀请者信息

conf/conf.ini

@@ -10,7 +10,6 @@ DbPassWord = 123456
 DbName = artistmgmttest
 
 [redis]
-
 RedisDB = 2
 RedisAddr = 127.0.0.1:6379
 #RedisPW = "nDCTrfTtBu3Pw"

conf/dev/conf.ini

@@ -7,7 +7,7 @@ DbHost = 127.0.0.1
 DbPort = 3306
 DbUser = dyb
 DbPassWord = rootdyb
-DbArtist = artist
+DbArtist = artistmgmtDev
 
 [redis]
 RedisDB = 2

conf/dev/dubbogo.yaml

@@ -15,18 +15,57 @@ dubbo:
       port: 20050
   provider:
     services:
-      ArtistInfoProvider:
+      ArtistInfoUserProvider:
+        interface: com.fontree.microservices.common.ArtistInfoUser
+        retries: 100
+      ArtistInfoArtworkProvider:
+        interface: com.fontree.microservices.common.ArtistInfoArtwork
+        retries: 100
+      ArtistInfoArtshowProvider:
+        interface: com.fontree.microservices.common.ArtistInfoArtshow
+        retries: 100
+        #ContractProvider:
+        #  interface: com.fontree.microservices.common.Contract
+        # retries: 0
+        #ArtWorkProvider:
+        #  interface: com.fontree.microservices.common.ArtWork
+        # retries: 0
+        #SupplyProvider:
+        #  interface: com.fontree.microservices.common.Supply
+        # retries: 0
+  consumer:
+    request-timeout: 120s
+    references:
+      AccountClientImpl:
+        protocol: tri
+        interface: com.fontree.microservices.common.Account
+        filter: cshutdown,sign,fonDomainFilter,fonValidateFilter
+        params:
+          .accessKeyId: "Accountksl"
+          .secretAccessKey: "BSDY-FDF1-Fontree_account"
+      ArtistClientImpl:
+        protocol: tri
+        interface: com.fontree.microservices.common.Artist
+      ArtistInfoClientImpl:
+        protocol: tri
         interface: com.fontree.microservices.common.ArtistInfo
-        retries: 0
+      ContractClientImpl:
-      ContractProvider:
+        timeout: 15s
-        interface: com.fontree.microservices.common.Contract
+        protocol: tri
-        retries: 0
+        interface: com.fontree.microservices.common.contract
-      ArtWorkProvider:
+        filter: cshutdown,sign
-        interface: com.fontree.microservices.common.ArtWork
+        params:
-        retries: 0
+          .accessKeyId: "SYD8-Chain-04"
-      SupplyProvider:
+          .secretAccessKey: "Al-Chain-FDF112"
+      ArtworkClientImpl:
+        protocol: tri
+        interface: com.fontree.microservices.common.Artwork
+      ArtworkQueryClientImpl:
+        protocol: tri
+        interface: com.fontree.microservices.common.ArtworkQuery
+      SupplyClientImpl:
+        protocol: tri
         interface: com.fontree.microservices.common.Supply
-        retries: 0
   logger:
     zap-config:
       level: info # 日志级别

conf/test/conf.ini

@@ -3,15 +3,14 @@ mode = dev #正式prod #测试dev
 
 [mysql]
 Db = mysql
-DbHost = mysql
+DbHost = 172.16.100.99 #214
-DbPort = 3306
+DbPort = 9007
-DbUser = root
+DbUser = artuser
-DbPassWord = 123456
+DbPassWord = "C250PflXIWv2SQm8"
-DbName = artistmgmttest
+DbName = artistmgmtDev
 
 [redis]
-
+RedisDB = 3
-RedisDB = 2
 RedisAddr = 172.16.100.99:9008
 RedisPW = "nDCTrfTtBu3Pw"
 RedisDBNAme =

conf/test/dubbogo.yaml

@@ -8,10 +8,10 @@ dubbo:
     demoZK:
       protocol: zookeeper
       timeout: 120s
-      # address: 127.0.0.1:2181
+#       address: 127.0.0.1:2181
 #      address: 121.229.45.214:9004
 #      address: 114.218.158.24:2181
-      address: zookeeper:2181
+      address: 172.16.100.93:2181
   protocols:
     triple: #triple
       name: tri
@@ -19,18 +19,57 @@ dubbo:
       port: 20050
   provider:
     services:
-      ArtistInfoProvider:
+      ArtistInfoUserProvider:
+        interface: com.fontree.microservices.common.ArtistInfoUser
+        retries: 100
+      ArtistInfoArtworkProvider:
+        interface: com.fontree.microservices.common.ArtistInfoArtwork
+        retries: 100
+      ArtistInfoArtshowProvider:
+        interface: com.fontree.microservices.common.ArtistInfoArtshow
+        retries: 100
+        #ContractProvider:
+        #  interface: com.fontree.microservices.common.Contract
+        # retries: 0
+        #ArtWorkProvider:
+        #  interface: com.fontree.microservices.common.ArtWork
+        # retries: 0
+        #SupplyProvider:
+        #  interface: com.fontree.microservices.common.Supply
+        # retries: 0
+  consumer:
+    request-timeout: 120s
+    references:
+      AccountClientImpl:
+        protocol: tri
+        interface: com.fontree.microservices.common.Account
+        filter: cshutdown,sign,fonDomainFilter,fonValidateFilter
+        params:
+          .accessKeyId: "Accountksl"
+          .secretAccessKey: "BSDY-FDF1-Fontree_account"
+      ArtistClientImpl:
+        protocol: tri
+        interface: com.fontree.microservices.common.Artist
+      ArtistInfoClientImpl:
+        protocol: tri
         interface: com.fontree.microservices.common.ArtistInfo
-        #  retries: 100
+      ContractClientImpl:
-      ContractProvider:
+        timeout: 15s
-        interface: com.fontree.microservices.common.Contract
+        protocol: tri
-        # retries: 0
+        interface: com.fontree.microservices.common.contract
-      ArtWorkProvider:
+        filter: cshutdown,sign
-        interface: com.fontree.microservices.common.ArtWork
+        params:
-        # retries: 0
+          .accessKeyId: "SYD8-Chain-04"
-      SupplyProvider:
+          .secretAccessKey: "Al-Chain-FDF112"
+      ArtworkClientImpl:
+        protocol: tri
+        interface: com.fontree.microservices.common.Artwork
+      ArtworkQueryClientImpl:
+        protocol: tri
+        interface: com.fontree.microservices.common.ArtworkQuery
+      SupplyClientImpl:
+        protocol: tri
         interface: com.fontree.microservices.common.Supply
-        # retries: 0
   logger:
     zap-config:
       level: info # 日志级别

conf/xjjdev/conf.ini

@@ -10,7 +10,6 @@ DbPassWord = 123456
 DbName = artistmgmttest
 
 [redis]
-
 RedisDB = 2
 RedisAddr = 127.0.0.1:6379
 #RedisPW = "nDCTrfTtBu3Pw"

conf/xjjdev/dubbogo.yaml

@@ -19,18 +19,57 @@ dubbo:
       port: 20050
   provider:
     services:
-      ArtistInfoProvider:
+      ArtistInfoUserProvider:
+        interface: com.fontree.microservices.common.ArtistInfoUser
+        retries: 100
+      ArtistInfoArtworkProvider:
+        interface: com.fontree.microservices.common.ArtistInfoArtwork
+        retries: 100
+      ArtistInfoArtshowProvider:
+        interface: com.fontree.microservices.common.ArtistInfoArtshow
+        retries: 100
+      #ContractProvider:
+      #  interface: com.fontree.microservices.common.Contract
+        # retries: 0
+      #ArtWorkProvider:
+      #  interface: com.fontree.microservices.common.ArtWork
+        # retries: 0
+      #SupplyProvider:
+      #  interface: com.fontree.microservices.common.Supply
+        # retries: 0
+  consumer:
+    request-timeout: 120s
+    references:
+      AccountClientImpl:
+        protocol: tri
+        interface: com.fontree.microservices.common.Account
+        filter: cshutdown,sign,fonDomainFilter,fonValidateFilter
+        params:
+          .accessKeyId: "Accountksl"
+          .secretAccessKey: "BSDY-FDF1-Fontree_account"
+      ArtistClientImpl:
+        protocol: tri
+        interface: com.fontree.microservices.common.Artist
+      ArtistInfoClientImpl:
+        protocol: tri
         interface: com.fontree.microservices.common.ArtistInfo
-        #  retries: 100
+      ContractClientImpl:
-      ContractProvider:
+        timeout: 15s
-        interface: com.fontree.microservices.common.Contract
+        protocol: tri
-        # retries: 0
+        interface: com.fontree.microservices.common.contract
-      ArtWorkProvider:
+        filter: cshutdown,sign
-        interface: com.fontree.microservices.common.ArtWork
+        params:
-        # retries: 0
+          .accessKeyId: "SYD8-Chain-04"
-      SupplyProvider:
+          .secretAccessKey: "Al-Chain-FDF112"
+      ArtworkClientImpl:
+        protocol: tri
+        interface: com.fontree.microservices.common.Artwork
+      ArtworkQueryClientImpl:
+        protocol: tri
+        interface: com.fontree.microservices.common.ArtworkQuery
+      SupplyClientImpl:
+        protocol: tri
         interface: com.fontree.microservices.common.Supply
-        # retries: 0
   logger:
     zap-config:
       level: info # 日志级别

makefile

@@ -0,0 +1,37 @@
+.PHONY: all build run gotool help
+
+BINARY="artisrService"
+
+all: gotool build
+
+build:
+	go env -w GOOS=linux
+	go build -ldflags "-s -w" -o ./build/${BINARY} ./cmd/app.go
+
+pushTest:
+	DockerBuildTest.bat
+pushProd:
+	DockerBuildProd.bat
+
+run:
+	@go run ./cmd/app.go
+
+gotool:
+	go fmt ./
+	go vet ./
+
+#protoc:
+	#protoc --go_out=./pb/artist --go-triple_out=./pb/artist --validate_out="lang=go:./pb/artist" ./pb/artist/artist.proto
+#protoc --go_out=./pb/artist --go-grpc_out=./pb/artist --go-triple_out=./pb/artist --validate_out="lang=go:./pb/artist" ./pb/artist/artist.proto
+protoc:
+	protoc --proto_path=. --go_out=./pb  --go-triple_out=./pb --govalidators_out="lang=go:./pb" ./pb/artist.proto
+	protoc --proto_path=. --go_out=./pb  --go-triple_out=./pb --govalidators_out="lang=go:./pb" ./pb/artist_third_party.proto
+all_protoc:
+	protoc --go_out=./pb/artist --go-grpc_out=./pb/artist --go-triple_out=./pb/artist --govalidators_out=./pb/artist ./pb/artist/artist.proto
+
+help:
+	@echo "make - 格式化 Go 代码, 并编译生成二进制文件"
+	@echo "make build - 编译 Go 代码, 生成二进制文件"
+	@echo "make run - 直接运行 Go 代码"
+	@echo "make gotool - 运行 Go 工具 'fmt' and 'vet'"
+	@echo "make protoc - 解析proto文件"

pb/artist/artist.validator.pb.go

@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
-// source: pb/artist/artist.proto
+// source: pb/artist.proto
 
 package artist
 
@@ -7,8 +7,8 @@ import (
 	fmt "fmt"
 	math "math"
 	proto "github.com/golang/protobuf/proto"
-	_ "github.com/mwitkow/go-proto-validators"
 	_ "google.golang.org/protobuf/types/descriptorpb"
+	_ "github.com/mwitkow/go-proto-validators"
 	github_com_mwitkow_go_proto_validators "github.com/mwitkow/go-proto-validators"
 )
 
@@ -435,3 +435,48 @@ func (this *GetCardIdWithImgReq) Validate() error {
 func (this *GetCardIdWithImgResp) Validate() error {
 	return nil
 }
+func (this *ArtistDetailDataReq) Validate() error {
+	return nil
+}
+func (this *ArtistDetailDataResp) Validate() error {
+	for _, item := range this.Data {
+		if item != nil {
+			if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
+				return github_com_mwitkow_go_proto_validators.FieldError("Data", err)
+			}
+		}
+	}
+	return nil
+}
+func (this *ArtistDetailDataResp_Info) Validate() error {
+	if this.ProfileInfo != nil {
+		if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(this.ProfileInfo); err != nil {
+			return github_com_mwitkow_go_proto_validators.FieldError("ProfileInfo", err)
+		}
+	}
+	if this.MediaInfo != nil {
+		if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(this.MediaInfo); err != nil {
+			return github_com_mwitkow_go_proto_validators.FieldError("MediaInfo", err)
+		}
+	}
+	for _, item := range this.HonorInfo {
+		if item != nil {
+			if err := github_com_mwitkow_go_proto_validators.CallValidatorIfExists(item); err != nil {
+				return github_com_mwitkow_go_proto_validators.FieldError("HonorInfo", err)
+			}
+		}
+	}
+	return nil
+}
+func (this *IdcardConvertArtistIdRequest) Validate() error {
+	return nil
+}
+func (this *IdcardConvertArtistIdResponse) Validate() error {
+	return nil
+}
+func (this *CheckCaaCertNumRequest) Validate() error {
+	return nil
+}
+func (this *CheckCaaCertNumResponse) Validate() error {
+	return nil
+}

pb/artist/artist_triple.pb.go

@@ -1,8 +1,8 @@
 // Code generated by protoc-gen-go-triple. DO NOT EDIT.
 // versions:
 // - protoc-gen-go-triple v1.0.8
-// - protoc             v4.22.0--rc2
+// - protoc             v3.21.1
-// source: pb/artist/artist.proto
+// source: pb/artist.proto
 
 package artist
 
@@ -57,6 +57,7 @@ type ArtistClient interface {
 	GetCardIdWithImg(ctx context.Context, in *GetCardIdWithImgReq, opts ...grpc_go.CallOption) (*GetCardIdWithImgResp, common.ErrorWithAttachment)
 	IdcardConvertArtistId(ctx context.Context, in *IdcardConvertArtistIdRequest, opts ...grpc_go.CallOption) (*IdcardConvertArtistIdResponse, common.ErrorWithAttachment)
 	CheckCaaCertNum(ctx context.Context, in *CheckCaaCertNumRequest, opts ...grpc_go.CallOption) (*CheckCaaCertNumResponse, common.ErrorWithAttachment)
+	ArtistDetailData(ctx context.Context, in *ArtistDetailDataReq, opts ...grpc_go.CallOption) (*ArtistDetailDataResp, common.ErrorWithAttachment)
 }
 
 type artistClient struct {
@@ -93,6 +94,7 @@ type ArtistClientImpl struct {
 	GetCardIdWithImg      func(ctx context.Context, in *GetCardIdWithImgReq) (*GetCardIdWithImgResp, error)
 	IdcardConvertArtistId func(ctx context.Context, in *IdcardConvertArtistIdRequest) (*IdcardConvertArtistIdResponse, error)
 	CheckCaaCertNum       func(ctx context.Context, in *CheckCaaCertNumRequest) (*CheckCaaCertNumResponse, error)
+	ArtistDetailData      func(ctx context.Context, in *ArtistDetailDataReq) (*ArtistDetailDataResp, error)
 }
 
 func (c *ArtistClientImpl) GetDubboStub(cc *triple.TripleConn) ArtistClient {
@@ -281,6 +283,12 @@ func (c *artistClient) CheckCaaCertNum(ctx context.Context, in *CheckCaaCertNumR
 	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/CheckCaaCertNum", in, out)
 }
 
+func (c *artistClient) ArtistDetailData(ctx context.Context, in *ArtistDetailDataReq, opts ...grpc_go.CallOption) (*ArtistDetailDataResp, common.ErrorWithAttachment) {
+	out := new(ArtistDetailDataResp)
+	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
+	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/ArtistDetailData", in, out)
+}
+
 // ArtistServer is the server API for Artist service.
 // All implementations must embed UnimplementedArtistServer
 // for forward compatibility
@@ -314,6 +322,7 @@ type ArtistServer interface {
 	GetCardIdWithImg(context.Context, *GetCardIdWithImgReq) (*GetCardIdWithImgResp, error)
 	IdcardConvertArtistId(context.Context, *IdcardConvertArtistIdRequest) (*IdcardConvertArtistIdResponse, error)
 	CheckCaaCertNum(context.Context, *CheckCaaCertNumRequest) (*CheckCaaCertNumResponse, error)
+	ArtistDetailData(context.Context, *ArtistDetailDataReq) (*ArtistDetailDataResp, error)
 	mustEmbedUnimplementedArtistServer()
 }
 
@@ -409,6 +418,9 @@ func (UnimplementedArtistServer) IdcardConvertArtistId(context.Context, *IdcardC
 func (UnimplementedArtistServer) CheckCaaCertNum(context.Context, *CheckCaaCertNumRequest) (*CheckCaaCertNumResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method CheckCaaCertNum not implemented")
 }
+func (UnimplementedArtistServer) ArtistDetailData(context.Context, *ArtistDetailDataReq) (*ArtistDetailDataResp, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method ArtistDetailData not implemented")
+}
 func (s *UnimplementedArtistServer) XXX_SetProxyImpl(impl protocol.Invoker) {
 	s.proxyImpl = impl
 }
@@ -1278,6 +1290,35 @@ func _Artist_CheckCaaCertNum_Handler(srv interface{}, ctx context.Context, dec f
 	return interceptor(ctx, in, info, handler)
 }
 
+func _Artist_ArtistDetailData_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
+	in := new(ArtistDetailDataReq)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	base := srv.(dubbo3.Dubbo3GrpcService)
+	args := []interface{}{}
+	args = append(args, in)
+	md, _ := metadata.FromIncomingContext(ctx)
+	invAttachment := make(map[string]interface{}, len(md))
+	for k, v := range md {
+		invAttachment[k] = v
+	}
+	invo := invocation.NewRPCInvocation("ArtistDetailData", args, invAttachment)
+	if interceptor == nil {
+		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
+		return result, result.Error()
+	}
+	info := &grpc_go.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: ctx.Value("XXX_TRIPLE_GO_INTERFACE_NAME").(string),
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
+		return result, result.Error()
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 // Artist_ServiceDesc is the grpc_go.ServiceDesc for Artist service.
 // It's only intended for direct use with grpc_go.RegisterService,
 // and not to be introspected or modified (even as a copy)
@@ -1401,7 +1442,11 @@ var Artist_ServiceDesc = grpc_go.ServiceDesc{
 			MethodName: "CheckCaaCertNum",
 			Handler:    _Artist_CheckCaaCertNum_Handler,
 		},
+		{
+			MethodName: "ArtistDetailData",
+			Handler:    _Artist_ArtistDetailData_Handler,
+		},
 	},
 	Streams:  []grpc_go.StreamDesc{},
-	Metadata: "pb/artist/artist.proto",
+	Metadata: "pb/artist.proto",
 }

pb/artistInfoArtwork/artistinfoArtwork.pb.go

@@ -36,6 +36,7 @@ const (
 	ArtworkQueryMode_NowAuditFlowOfBase          ArtworkQueryMode = 3 //当前处于基本数据审核流程中的画作
 	ArtworkQueryMode_NowAuditFlowOfSupplementing ArtworkQueryMode = 4 //当前处于数据补充流程中的画作
 	ArtworkQueryMode_AllUnlockArtwork            ArtworkQueryMode = 5 //所有已解锁的画作(历史画作)
+	ArtworkQueryMode_AllAuditPassArtwork         ArtworkQueryMode = 6 //所有审批已通过的画作
 )
 
 // Enum value maps for ArtworkQueryMode.
@@ -47,6 +48,7 @@ var (
 		3: "NowAuditFlowOfBase",
 		4: "NowAuditFlowOfSupplementing",
 		5: "AllUnlockArtwork",
+		6: "AllAuditPassArtwork",
 	}
 	ArtworkQueryMode_value = map[string]int32{
 		"NowPreSaveArtwork":           0,
@@ -55,6 +57,7 @@ var (
 		"NowAuditFlowOfBase":          3,
 		"NowAuditFlowOfSupplementing": 4,
 		"AllUnlockArtwork":            5,
+		"AllAuditPassArtwork":         6,
 	}
 )
 
@@ -1452,7 +1455,7 @@ var file_pb_artistinfoArtwork_proto_rawDesc = []byte{
 	0x74, 0x77, 0x6f, 0x72, 0x6b, 0x45, 0x64, 0x69, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x73,
 	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x64, 0x69, 0x74, 0x61, 0x62, 0x6c,
 	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x65, 0x64, 0x69, 0x74, 0x61, 0x62, 0x6c,
-	0x65, 0x2a, 0xa7, 0x01, 0x0a, 0x10, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x51, 0x75, 0x65,
+	0x65, 0x2a, 0xc0, 0x01, 0x0a, 0x10, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x51, 0x75, 0x65,
 	0x72, 0x79, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x15, 0x0a, 0x11, 0x4e, 0x6f, 0x77, 0x50, 0x72, 0x65,
 	0x53, 0x61, 0x76, 0x65, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x10, 0x00, 0x12, 0x14, 0x0a,
 	0x10, 0x4e, 0x6f, 0x77, 0x4c, 0x6f, 0x63, 0x6b, 0x65, 0x64, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72,
@@ -1462,75 +1465,77 @@ var file_pb_artistinfoArtwork_proto_rawDesc = []byte{
 	0x73, 0x65, 0x10, 0x03, 0x12, 0x1f, 0x0a, 0x1b, 0x4e, 0x6f, 0x77, 0x41, 0x75, 0x64, 0x69, 0x74,
 	0x46, 0x6c, 0x6f, 0x77, 0x4f, 0x66, 0x53, 0x75, 0x70, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74,
 	0x69, 0x6e, 0x67, 0x10, 0x04, 0x12, 0x14, 0x0a, 0x10, 0x41, 0x6c, 0x6c, 0x55, 0x6e, 0x6c, 0x6f,
-	0x63, 0x6b, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x10, 0x05, 0x32, 0x9a, 0x08, 0x0a, 0x11,
+	0x63, 0x6b, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x10, 0x05, 0x12, 0x17, 0x0a, 0x13, 0x41,
-	0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72,
+	0x6c, 0x6c, 0x41, 0x75, 0x64, 0x69, 0x74, 0x50, 0x61, 0x73, 0x73, 0x41, 0x72, 0x74, 0x77, 0x6f,
-	0x6b, 0x12, 0x66, 0x0a, 0x17, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x41, 0x72, 0x74, 0x77, 0x6f,
+	0x72, 0x6b, 0x10, 0x06, 0x32, 0x9a, 0x08, 0x0a, 0x11, 0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x49,
-	0x72, 0x6b, 0x4c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x26, 0x2e, 0x61,
+	0x6e, 0x66, 0x6f, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x12, 0x66, 0x0a, 0x17, 0x43, 0x72,
-	0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65,
+	0x65, 0x61, 0x74, 0x65, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x4c, 0x6f, 0x63, 0x6b, 0x52,
-	0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x4c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x63, 0x6f, 0x72,
+	0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x26, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e,
-	0x64, 0x52, 0x65, 0x71, 0x1a, 0x21, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66,
+	0x66, 0x6f, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b,
-	0x6f, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x4e,
+	0x4c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x71, 0x1a, 0x21, 0x2e,
-	0x6f, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x22, 0x00, 0x12, 0x5e, 0x0a, 0x11, 0x41, 0x72, 0x74,
+	0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f,
-	0x77, 0x6f, 0x72, 0x6b, 0x4c, 0x6f, 0x63, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x24,
+	0x72, 0x6b, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x4e, 0x6f, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73,
-	0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x41, 0x72, 0x74, 0x77,
+	0x22, 0x00, 0x12, 0x5e, 0x0a, 0x11, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x4c, 0x6f, 0x63,
-	0x6f, 0x72, 0x6b, 0x4c, 0x6f, 0x63, 0x6b, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71,
+	0x6b, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x24, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66,
+	0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x4c, 0x6f, 0x63, 0x6b,
-	0x6f, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x4e,
+	0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e,
-	0x6f, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x22, 0x00, 0x12, 0x60, 0x0a, 0x15, 0x47, 0x65, 0x74,
+	0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f,
-	0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x4c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x63, 0x6f, 0x72,
+	0x72, 0x6b, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x4e, 0x6f, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73,
-	0x64, 0x73, 0x12, 0x28, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e,
+	0x22, 0x00, 0x12, 0x60, 0x0a, 0x15, 0x47, 0x65, 0x74, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b,
-	0x47, 0x65, 0x74, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x4c, 0x6f, 0x63, 0x6b, 0x52, 0x65,
+	0x4c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x73, 0x12, 0x28, 0x2e, 0x61, 0x72,
-	0x63, 0x6f, 0x72, 0x64, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x61,
+	0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x72, 0x74, 0x77,
-	0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72,
+	0x6f, 0x72, 0x6b, 0x4c, 0x6f, 0x63, 0x6b, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x73, 0x52, 0x65,
-	0x6b, 0x4c, 0x6f, 0x63, 0x6b, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x00, 0x12, 0x73, 0x0a, 0x1a, 0x47,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e,
-	0x65, 0x74, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x4c, 0x6f, 0x63, 0x6b, 0x48, 0x69, 0x73,
+	0x66, 0x6f, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x4c, 0x6f, 0x63, 0x6b, 0x4c, 0x69,
-	0x74, 0x6f, 0x72, 0x79, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x28, 0x2e, 0x61, 0x72, 0x74, 0x69,
+	0x73, 0x74, 0x22, 0x00, 0x12, 0x73, 0x0a, 0x1a, 0x47, 0x65, 0x74, 0x41, 0x72, 0x74, 0x77, 0x6f,
-	0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72,
+	0x72, 0x6b, 0x4c, 0x6f, 0x63, 0x6b, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x47, 0x72, 0x6f,
-	0x6b, 0x4c, 0x6f, 0x63, 0x6b, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75,
+	0x75, 0x70, 0x12, 0x28, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e,
-	0x65, 0x73, 0x74, 0x1a, 0x29, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f,
+	0x47, 0x65, 0x74, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x4c, 0x6f, 0x63, 0x6b, 0x48, 0x69,
-	0x2e, 0x47, 0x65, 0x74, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x4c, 0x6f, 0x63, 0x6b, 0x48,
+	0x73, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x29, 0x2e, 0x61,
-	0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00,
-	0x12, 0x62, 0x0a, 0x13, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72,
-	0x6b, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x26, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74,
-	0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x41, 0x72, 0x74, 0x77, 0x6f,
-	0x72, 0x6b, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
-	0x21, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x41, 0x72, 0x74,
-	0x77, 0x6f, 0x72, 0x6b, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x4e, 0x6f, 0x50, 0x61, 0x72, 0x61,
-	0x6d, 0x73, 0x22, 0x00, 0x12, 0x5d, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x41, 0x72, 0x74, 0x77, 0x6f,
-	0x72, 0x6b, 0x4c, 0x6f, 0x63, 0x6b, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x12, 0x27, 0x2e, 0x61,
 	0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x72, 0x74,
-	0x77, 0x6f, 0x72, 0x6b, 0x4c, 0x6f, 0x63, 0x6b, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x52, 0x65,
+	0x77, 0x6f, 0x72, 0x6b, 0x4c, 0x6f, 0x63, 0x6b, 0x48, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x52,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x62, 0x0a, 0x13, 0x44, 0x65, 0x6c,
-	0x66, 0x6f, 0x2e, 0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x4c, 0x6f, 0x63, 0x6b, 0x49, 0x6e, 0x66,
+	0x65, 0x74, 0x65, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64,
-	0x6f, 0x22, 0x00, 0x12, 0x6c, 0x0a, 0x18, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x41, 0x72, 0x74,
+	0x12, 0x26, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x44, 0x65,
-	0x77, 0x6f, 0x72, 0x6b, 0x41, 0x75, 0x64, 0x69, 0x74, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12,
+	0x6c, 0x65, 0x74, 0x65, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x52, 0x65, 0x63, 0x6f, 0x72,
-	0x2b, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x55, 0x70, 0x64,
+	0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73,
-	0x61, 0x74, 0x65, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x41, 0x75, 0x64, 0x69, 0x74, 0x53,
+	0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x43, 0x6f, 0x6d,
-	0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x61,
+	0x6d, 0x6f, 0x6e, 0x4e, 0x6f, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x22, 0x00, 0x12, 0x5d, 0x0a,
-	0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72,
+	0x14, 0x47, 0x65, 0x74, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x4c, 0x6f, 0x63, 0x6b, 0x44,
-	0x6b, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x4e, 0x6f, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x22,
+	0x65, 0x74, 0x61, 0x69, 0x6c, 0x12, 0x27, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e,
-	0x00, 0x12, 0x69, 0x0a, 0x1c, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72,
+	0x66, 0x6f, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x4c, 0x6f, 0x63,
-	0x6b, 0x42, 0x61, 0x73, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x45, 0x64, 0x69, 0x74, 0x61, 0x62, 0x6c,
+	0x6b, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a,
-	0x65, 0x12, 0x1d, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x41,
+	0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x41, 0x72, 0x74, 0x69,
-	0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x55, 0x69, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x73, 0x74, 0x4c, 0x6f, 0x63, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x00, 0x12, 0x6c, 0x0a, 0x18,
-	0x1a, 0x28, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x43, 0x68,
+	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x41, 0x75, 0x64,
-	0x65, 0x63, 0x6b, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x45, 0x64, 0x69, 0x74, 0x61, 0x62,
+	0x69, 0x74, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x2b, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73,
-	0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x6f, 0x0a, 0x22,
+	0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x41, 0x72, 0x74, 0x77,
-	0x43, 0x68, 0x65, 0x63, 0x6b, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x53, 0x75, 0x70, 0x70,
+	0x6f, 0x72, 0x6b, 0x41, 0x75, 0x64, 0x69, 0x74, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65,
-	0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x45, 0x64, 0x69, 0x74, 0x61, 0x62,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e,
-	0x6c, 0x65, 0x12, 0x1d, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e,
+	0x66, 0x6f, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
-	0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x55, 0x69, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x4e, 0x6f, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x22, 0x00, 0x12, 0x69, 0x0a, 0x1c, 0x43, 0x68,
-	0x74, 0x1a, 0x28, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x43,
+	0x65, 0x63, 0x6b, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x42, 0x61, 0x73, 0x65, 0x49, 0x6e,
-	0x68, 0x65, 0x63, 0x6b, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x45, 0x64, 0x69, 0x74, 0x61,
+	0x66, 0x6f, 0x45, 0x64, 0x69, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x1d, 0x2e, 0x61, 0x72, 0x74,
-	0x62, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x59, 0x0a,
+	0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x55,
-	0x1d, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b,
+	0x69, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x28, 0x2e, 0x61, 0x72, 0x74, 0x69,
-	0x53, 0x75, 0x70, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1e,
+	0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x41, 0x72, 0x74, 0x77,
-	0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x41, 0x72, 0x74, 0x77,
+	0x6f, 0x72, 0x6b, 0x45, 0x64, 0x69, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6f, 0x72, 0x6b, 0x55, 0x69, 0x64, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16,
+	0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x6f, 0x0a, 0x22, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x41, 0x72,
-	0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66,
+	0x74, 0x77, 0x6f, 0x72, 0x6b, 0x53, 0x75, 0x70, 0x70, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x49,
-	0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x42, 0x16, 0x5a, 0x14, 0x2e, 0x2f, 0x3b, 0x61,
+	0x6e, 0x66, 0x6f, 0x45, 0x64, 0x69, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x1d, 0x2e, 0x61, 0x72,
-	0x72, 0x74, 0x69, 0x73, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b,
+	0x74, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b,
-	0x50, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x55, 0x69, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x28, 0x2e, 0x61, 0x72, 0x74,
+	0x69, 0x73, 0x74, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x41, 0x72, 0x74,
+	0x77, 0x6f, 0x72, 0x6b, 0x45, 0x64, 0x69, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x59, 0x0a, 0x1d, 0x47, 0x65, 0x6e, 0x65, 0x72, 0x61,
+	0x74, 0x65, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x53, 0x75, 0x70, 0x70, 0x6c, 0x65, 0x6d,
+	0x65, 0x6e, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1e, 0x2e, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74,
+	0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x55, 0x69, 0x64, 0x73,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22,
+	0x00, 0x42, 0x16, 0x5a, 0x14, 0x2e, 0x2f, 0x3b, 0x61, 0x72, 0x74, 0x69, 0x73, 0x74, 0x49, 0x6e,
+	0x66, 0x6f, 0x41, 0x72, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x50, 0x01, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x33,
 }
 
 var (

pb/artistInfoUser/artistinfoUser_triple.pb.go

@@ -52,6 +52,7 @@ type ArtistInfoUserClient interface {
 	UpdateUserData(ctx context.Context, in *UserInfo, opts ...grpc_go.CallOption) (*CommonNoParams, common.ErrorWithAttachment)
 	PreSaveArtistInfo(ctx context.Context, in *PreSaveArtistInfoData, opts ...grpc_go.CallOption) (*CommonNoParams, common.ErrorWithAttachment)
 	GetPreSaveArtistInfo(ctx context.Context, in *GetPreSaveArtistInfoRequest, opts ...grpc_go.CallOption) (*PreSaveArtistInfoData, common.ErrorWithAttachment)
+	GetInvitedUserList(ctx context.Context, in *GetInvitedUserListRequest, opts ...grpc_go.CallOption) (*GetInvitedUserListResponse, common.ErrorWithAttachment)
 }
 
 type artistInfoUserClient struct {
@@ -81,6 +82,7 @@ type ArtistInfoUserClientImpl struct {
 	UpdateUserData           func(ctx context.Context, in *UserInfo) (*CommonNoParams, error)
 	PreSaveArtistInfo        func(ctx context.Context, in *PreSaveArtistInfoData) (*CommonNoParams, error)
 	GetPreSaveArtistInfo     func(ctx context.Context, in *GetPreSaveArtistInfoRequest) (*PreSaveArtistInfoData, error)
+	GetInvitedUserList       func(ctx context.Context, in *GetInvitedUserListRequest) (*GetInvitedUserListResponse, error)
 }
 
 func (c *ArtistInfoUserClientImpl) GetDubboStub(cc *triple.TripleConn) ArtistInfoUserClient {
@@ -227,6 +229,12 @@ func (c *artistInfoUserClient) GetPreSaveArtistInfo(ctx context.Context, in *Get
 	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/GetPreSaveArtistInfo", in, out)
 }
 
+func (c *artistInfoUserClient) GetInvitedUserList(ctx context.Context, in *GetInvitedUserListRequest, opts ...grpc_go.CallOption) (*GetInvitedUserListResponse, common.ErrorWithAttachment) {
+	out := new(GetInvitedUserListResponse)
+	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
+	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/GetInvitedUserList", in, out)
+}
+
 // ArtistInfoUserServer is the server API for ArtistInfoUser service.
 // All implementations must embed UnimplementedArtistInfoUserServer
 // for forward compatibility
@@ -255,6 +263,7 @@ type ArtistInfoUserServer interface {
 	UpdateUserData(context.Context, *UserInfo) (*CommonNoParams, error)
 	PreSaveArtistInfo(context.Context, *PreSaveArtistInfoData) (*CommonNoParams, error)
 	GetPreSaveArtistInfo(context.Context, *GetPreSaveArtistInfoRequest) (*PreSaveArtistInfoData, error)
+	GetInvitedUserList(context.Context, *GetInvitedUserListRequest) (*GetInvitedUserListResponse, error)
 	mustEmbedUnimplementedArtistInfoUserServer()
 }
 
@@ -329,6 +338,9 @@ func (UnimplementedArtistInfoUserServer) PreSaveArtistInfo(context.Context, *Pre
 func (UnimplementedArtistInfoUserServer) GetPreSaveArtistInfo(context.Context, *GetPreSaveArtistInfoRequest) (*PreSaveArtistInfoData, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetPreSaveArtistInfo not implemented")
 }
+func (UnimplementedArtistInfoUserServer) GetInvitedUserList(context.Context, *GetInvitedUserListRequest) (*GetInvitedUserListResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetInvitedUserList not implemented")
+}
 func (s *UnimplementedArtistInfoUserServer) XXX_SetProxyImpl(impl protocol.Invoker) {
 	s.proxyImpl = impl
 }
@@ -995,6 +1007,35 @@ func _ArtistInfoUser_GetPreSaveArtistInfo_Handler(srv interface{}, ctx context.C
 	return interceptor(ctx, in, info, handler)
 }
 
+func _ArtistInfoUser_GetInvitedUserList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetInvitedUserListRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	base := srv.(dubbo3.Dubbo3GrpcService)
+	args := []interface{}{}
+	args = append(args, in)
+	md, _ := metadata.FromIncomingContext(ctx)
+	invAttachment := make(map[string]interface{}, len(md))
+	for k, v := range md {
+		invAttachment[k] = v
+	}
+	invo := invocation.NewRPCInvocation("GetInvitedUserList", args, invAttachment)
+	if interceptor == nil {
+		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
+		return result, result.Error()
+	}
+	info := &grpc_go.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: ctx.Value("XXX_TRIPLE_GO_INTERFACE_NAME").(string),
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
+		return result, result.Error()
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 // ArtistInfoUser_ServiceDesc is the grpc_go.ServiceDesc for ArtistInfoUser service.
 // It's only intended for direct use with grpc_go.RegisterService,
 // and not to be introspected or modified (even as a copy)
@@ -1090,6 +1131,10 @@ var ArtistInfoUser_ServiceDesc = grpc_go.ServiceDesc{
 			MethodName: "GetPreSaveArtistInfo",
 			Handler:    _ArtistInfoUser_GetPreSaveArtistInfo_Handler,
 		},
+		{
+			MethodName: "GetInvitedUserList",
+			Handler:    _ArtistInfoUser_GetInvitedUserList_Handler,
+		},
 	},
 	Streams:  []grpc_go.StreamDesc{},
 	Metadata: "pb/artistinfoUser.proto",

pb/artistinfoArtshow.proto

@@ -18,6 +18,7 @@ service ArtistInfoArtshow {
   rpc DeletedArtshowVideo(DeletedArtshowVideoRequest)returns(google.protobuf.Empty){} //删除画展视频
 //  rpc CheckeExists(CheckeExistsRequest)returns(google.protobuf.Empty){} //删除画展视频
 //  rpc GetArtistListOfVideo(ArtistListRequest)returns(){}//获取后台画家指数审批的画家列表
+  rpc GetArtshowHistroyList(GetArtshowHistroyListRequest)returns(GetArtshowHistroyListResponse){}//获取画展补充信息的历史记录(按锁定时间端分组)
   
   //画家指数
   rpc GetArtistIndexDetail(GetArtistIndexDetailRequest)returns(ArtistIndexInfo){} //获取视频详情
@@ -122,7 +123,7 @@ message ArtistIndexInfo{
   string artistUid=1;
   string title=2;
   string class=3;
-  int64 titleScore=4;
+  float titleScore=4;
   string score=5;
   string types=6;
   int64 status=7;
@@ -131,8 +132,8 @@ message ArtistIndexInfo{
   string auditMark2=10;
   int64 auditStatus=11;
   int64  id=12;
-  int64 createdAt=13;
+  string createdAt=13;
-  int64 updatedAt=14;
+  string updatedAt=14;
   int64 deletedAt=15;
   bool editable=16;
 }
@@ -166,7 +167,7 @@ message AuditArtistIndexRequest{
 }
 message UpdateArtistIndexRequest{
  int64  id=12;
- int64  titleScore=4;
+ float  titleScore=4;
  string score=5;
  int64  status=7;
 }
@@ -192,8 +193,8 @@ message ArtistSupplementInfo{
   string BankNum=11;
   string BankName=12;
   int64  id=13;
-  int64 createdAt=14;
+  string createdAt=14;
-  int64 updatedAt=15;
+  string updatedAt=15;
   int64 deletedAt=16;
   bool editable=17;//是否用户可编辑
 }
@@ -237,4 +238,104 @@ message UpdateArtistSupplementRequest{
 message DeletedArtistSupplementRequest{
   int64 Id=1; //单个删除
   repeated  int64  Ids =2; //批量删除
+}
+
+message GetArtshowHistroyListRequest{
+  int64 page =1;
+  int64 pageSize=2;
+  string artistUid=3;
+  int64 auditStatus=4;
+}
+// 历史记录查询
+message artworkSupplementData{
+  string artistUid=1;
+  int64 status=2;
+  string lockTime=3;
+  int64 auditStatus=4;
+  string auditMark1=5;
+  string auditMark2=6;
+  string artworkName=7;
+  string createdDate=8;
+  string createdAddress=9;
+  string createdAt=14;
+  string updatedAt=15;
+  int64  deletedAt=16;
+  string ArtworkUuid=17;
+//  string ArtistName=18;
+  int32 Length=19;
+  int32 Width=20;
+  int32 Ruler=21;
+//  string InscribeDate=22;
+//  string Abstract=23;
+  string HdPic=24;
+  string ArtistPhoto=25;
+//  float PriceRun=26;
+//  string FirstPublish=27;
+//  bool IsFirstPublish=34;
+  // 画作荣誉
+//  string ArtistMarketDetail=28;
+//  string ArtistMarketUrl1=29;
+//  string ArtistMarketUrl2=30;
+//  string ArtistMarketId1=31;
+//  string ArtistMarketId2=32;
+//  string ArtistMarketId3=33;
+}
+
+message artistSupplementData{
+  string artistUid=1;
+  int64  status=2;
+  string lockTime=3;
+  int64  auditStatus=4;
+  string auditMark1=5;
+  string auditMark2=6;
+  string artistName=7;
+  string artistProfile=8;
+  int64  countryArtLevel=9;
+  string artistCertPic=10;
+  string bankNum=11;
+  string bankName=12;
+  int64  id=13;
+  string createdAt=14;
+  string updatedAt=15;
+  string deletedAt=16;
+
+}
+message artistIndexData{
+  string artistUid=1;
+  string title=2;
+  string class=3;
+  float titleScore=4;
+  string score=5;
+  string types=6;
+  int64 status=7;
+  string lockTime=8;
+  string auditMark1=9;
+  string auditMark2=10;
+  int64 auditStatus=11;
+  int64  id=12;
+  string createdAt=13;
+  string updatedAt=14;
+  string deletedAt=15;
+
+}
+message artistVideoData{
+  int64  id =1;
+  string artistUid =2;
+  string lockTime =3;
+  string videoUrl =4;
+  int64  auditStatus =5;
+  string auditMark1 =6;
+  string auditMark2 =7;
+  string artistName =8;
+}
+message timeGroup {
+  string time =1;
+  repeated artworkSupplementData artworkSupplementList =2;
+  repeated artistSupplementData artistSupplementList =3;
+  repeated artistIndexData artistIndexList =4;
+  repeated artistVideoData artistVideoList =5;
+}
+message GetArtshowHistroyListResponse{
+   videoPagination page=1;
+   repeated  timeGroup Data =2;
 }

pb/artistinfoArtshow/artistinfoArtshow_triple.pb.go

@@ -37,6 +37,9 @@ type ArtistInfoArtshowClient interface {
 	AuditArtshowVideo(ctx context.Context, in *AuditArtshowVideoRequest, opts ...grpc_go.CallOption) (*emptypb.Empty, common.ErrorWithAttachment)
 	UpdateArtshowVideo(ctx context.Context, in *UpdateArtshowVideoRequest, opts ...grpc_go.CallOption) (*emptypb.Empty, common.ErrorWithAttachment)
 	DeletedArtshowVideo(ctx context.Context, in *DeletedArtshowVideoRequest, opts ...grpc_go.CallOption) (*emptypb.Empty, common.ErrorWithAttachment)
+	// rpc CheckeExists(CheckeExistsRequest)returns(google.protobuf.Empty){} //删除画展视频
+	// rpc GetArtistListOfVideo(ArtistListRequest)returns(){}//获取后台画家指数审批的画家列表
+	GetArtshowHistroyList(ctx context.Context, in *GetArtshowHistroyListRequest, opts ...grpc_go.CallOption) (*GetArtshowHistroyListResponse, common.ErrorWithAttachment)
 	// 画家指数
 	GetArtistIndexDetail(ctx context.Context, in *GetArtistIndexDetailRequest, opts ...grpc_go.CallOption) (*ArtistIndexInfo, common.ErrorWithAttachment)
 	GetArtistIndexList(ctx context.Context, in *GetArtistIndexListRequest, opts ...grpc_go.CallOption) (*GetArtistIndexListResponse, common.ErrorWithAttachment)
@@ -67,6 +70,7 @@ type ArtistInfoArtshowClientImpl struct {
 	AuditArtshowVideo           func(ctx context.Context, in *AuditArtshowVideoRequest) (*emptypb.Empty, error)
 	UpdateArtshowVideo          func(ctx context.Context, in *UpdateArtshowVideoRequest) (*emptypb.Empty, error)
 	DeletedArtshowVideo         func(ctx context.Context, in *DeletedArtshowVideoRequest) (*emptypb.Empty, error)
+	GetArtshowHistroyList       func(ctx context.Context, in *GetArtshowHistroyListRequest) (*GetArtshowHistroyListResponse, error)
 	GetArtistIndexDetail        func(ctx context.Context, in *GetArtistIndexDetailRequest) (*ArtistIndexInfo, error)
 	GetArtistIndexList          func(ctx context.Context, in *GetArtistIndexListRequest) (*GetArtistIndexListResponse, error)
 	CreateArtistIndex           func(ctx context.Context, in *ArtistIndexInfo) (*emptypb.Empty, error)
@@ -137,6 +141,12 @@ func (c *artistInfoArtshowClient) DeletedArtshowVideo(ctx context.Context, in *D
 	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/DeletedArtshowVideo", in, out)
 }
 
+func (c *artistInfoArtshowClient) GetArtshowHistroyList(ctx context.Context, in *GetArtshowHistroyListRequest, opts ...grpc_go.CallOption) (*GetArtshowHistroyListResponse, common.ErrorWithAttachment) {
+	out := new(GetArtshowHistroyListResponse)
+	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
+	return out, c.cc.Invoke(ctx, "/"+interfaceKey+"/GetArtshowHistroyList", in, out)
+}
+
 func (c *artistInfoArtshowClient) GetArtistIndexDetail(ctx context.Context, in *GetArtistIndexDetailRequest, opts ...grpc_go.CallOption) (*ArtistIndexInfo, common.ErrorWithAttachment) {
 	out := new(ArtistIndexInfo)
 	interfaceKey := ctx.Value(constant.InterfaceKey).(string)
@@ -233,6 +243,9 @@ type ArtistInfoArtshowServer interface {
 	AuditArtshowVideo(context.Context, *AuditArtshowVideoRequest) (*emptypb.Empty, error)
 	UpdateArtshowVideo(context.Context, *UpdateArtshowVideoRequest) (*emptypb.Empty, error)
 	DeletedArtshowVideo(context.Context, *DeletedArtshowVideoRequest) (*emptypb.Empty, error)
+	// rpc CheckeExists(CheckeExistsRequest)returns(google.protobuf.Empty){} //删除画展视频
+	// rpc GetArtistListOfVideo(ArtistListRequest)returns(){}//获取后台画家指数审批的画家列表
+	GetArtshowHistroyList(context.Context, *GetArtshowHistroyListRequest) (*GetArtshowHistroyListResponse, error)
 	// 画家指数
 	GetArtistIndexDetail(context.Context, *GetArtistIndexDetailRequest) (*ArtistIndexInfo, error)
 	GetArtistIndexList(context.Context, *GetArtistIndexListRequest) (*GetArtistIndexListResponse, error)
@@ -278,6 +291,9 @@ func (UnimplementedArtistInfoArtshowServer) UpdateArtshowVideo(context.Context,
 func (UnimplementedArtistInfoArtshowServer) DeletedArtshowVideo(context.Context, *DeletedArtshowVideoRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DeletedArtshowVideo not implemented")
 }
+func (UnimplementedArtistInfoArtshowServer) GetArtshowHistroyList(context.Context, *GetArtshowHistroyListRequest) (*GetArtshowHistroyListResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetArtshowHistroyList not implemented")
+}
 func (UnimplementedArtistInfoArtshowServer) GetArtistIndexDetail(context.Context, *GetArtistIndexDetailRequest) (*ArtistIndexInfo, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetArtistIndexDetail not implemented")
 }
@@ -551,6 +567,35 @@ func _ArtistInfoArtshow_DeletedArtshowVideo_Handler(srv interface{}, ctx context
 	return interceptor(ctx, in, info, handler)
 }
 
+func _ArtistInfoArtshow_GetArtshowHistroyList_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GetArtshowHistroyListRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	base := srv.(dubbo3.Dubbo3GrpcService)
+	args := []interface{}{}
+	args = append(args, in)
+	md, _ := metadata.FromIncomingContext(ctx)
+	invAttachment := make(map[string]interface{}, len(md))
+	for k, v := range md {
+		invAttachment[k] = v
+	}
+	invo := invocation.NewRPCInvocation("GetArtshowHistroyList", args, invAttachment)
+	if interceptor == nil {
+		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
+		return result, result.Error()
+	}
+	info := &grpc_go.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: ctx.Value("XXX_TRIPLE_GO_INTERFACE_NAME").(string),
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		result := base.XXX_GetProxyImpl().Invoke(ctx, invo)
+		return result, result.Error()
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 func _ArtistInfoArtshow_GetArtistIndexDetail_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc_go.UnaryServerInterceptor) (interface{}, error) {
 	in := new(GetArtistIndexDetailRequest)
 	if err := dec(in); err != nil {
@@ -992,6 +1037,10 @@ var ArtistInfoArtshow_ServiceDesc = grpc_go.ServiceDesc{
 			MethodName: "DeletedArtshowVideo",
 			Handler:    _ArtistInfoArtshow_DeletedArtshowVideo_Handler,
 		},
+		{
+			MethodName: "GetArtshowHistroyList",
+			Handler:    _ArtistInfoArtshow_GetArtshowHistroyList_Handler,
+		},
 		{
 			MethodName: "GetArtistIndexDetail",
 			Handler:    _ArtistInfoArtshow_GetArtistIndexDetail_Handler,

pb/artistinfoArtwork.proto

@@ -47,6 +47,7 @@ enum ArtworkQueryMode {
   NowAuditFlowOfBase= 3; //当前处于基本数据审核流程中的画作
   NowAuditFlowOfSupplementing = 4; //当前处于数据补充流程中的画作
   AllUnlockArtwork  = 5; //所有已解锁的画作(历史画作)
+  AllAuditPassArtwork=6; //所有审批已通过的画作
 }
 message GetArtworkLockRecordsRequest{
   string artistUid =1 [(validate.rules).message.required = true];//画家uid

pb/artistinfoUser.proto

@@ -28,6 +28,7 @@ service ArtistInfoUser {
   rpc UpdateUserData(UserInfo)returns(CommonNoParams){}  //更新用户信息
   rpc PreSaveArtistInfo(PreSaveArtistInfoData)returns(CommonNoParams){}//暂存艺术家信息
   rpc GetPreSaveArtistInfo(GetPreSaveArtistInfoRequest)returns(PreSaveArtistInfoData){}//获取暂存的艺术家信息
+  rpc GetInvitedUserList(GetInvitedUserListRequest)returns(GetInvitedUserListResponse){}//获取接受邀请的人员列表
 }
 message CommonNoParams{
 }
@@ -92,7 +93,7 @@ message CheckInvitedCodeRespond {
 
 }
 message UnFinishListRequest {
-  int64 id = 1;
+  int64 accId = 1;
 }
 
 message UnFinishListRespond {
@@ -392,6 +393,7 @@ message FindUsersRequest{
   bool isArtist=9;         //查询有艺术家uid的数据
   repeated string mgmtArtistUids =10;
   bool isLock =11;
+  int64 mgmtAccountId = 12;
   //  string Account = 3;
   //  string TelNum = 4;
   //  bool   IsLock = 5;
@@ -446,6 +448,8 @@ message UserInfo{
   string inviteCode = 27;
   int64 mgmtArtistId = 28; //艺术家id
   string latestLockTime=29; //最近一次上锁时间
+  string joinAssoTime =32;
+  string wxAccount=33;
   //手机号更新用
   string domain =30;
   string verCode=31;
@@ -465,6 +469,7 @@ message PreSaveArtistInfoData{
   string caaCertNum = 11;
   string caaJoinTime = 12;
   int32 joinShow = 13;
+  string wxAccount=33;
 }
 
 message GetPreSaveArtistInfoRequest{
@@ -481,27 +486,58 @@ message UserView{
   string photo=7;
   int64 isRealName=8;
   int64 fddState=9;
-  int64 is_read=10;
+  int64 isRead=10;
   bool isLock=11;
   string realName=12;
   string idNum=13;
   string sex=14;
   int64 age=15;
-  string address=16;
+  repeated string address=16;
   string idcardBack=17;
-  string idcard_front=18;
+  string idcardFront=18;
   string inviterInviteCode=19;
   string inviterRealName=20;
+  string joinAssoTime=29;
   int64  deletedAt = 21;
-  int64  updatedAt = 22;
+  string  updatedAt = 22;
-  int64  createdAt = 23;
+  string  createdAt = 23;
   string penName =24;
   string stageName=25;
   string certificateNum=26;
-  string openBank=27;
+  string certificateImg=30;
-  string latestLockTime=28;
+  string bankName=27;
+  string bankNum=28;
+  string latestLockTime=31;
+  string wxAccount=32;
 }
 message FindUsersUserViewResponse{
   repeated UserView data=1;
   UserCommonPageInfo page =2;
+}
+message GetInvitedUserListRequest{
+  string telNum =1;//可选 邀请者的电话号码
+  string inviterCode=2;//可选 邀请者的二维码
+  int64 page=3;
+  int64 pageSize=4;
+}
+message InvitedUser{
+  int64  userId=1;
+  int64  accId=2;
+  string artistUid=3;
+  string telNum=4;
+  string inviteCode=5;
+  string account=6;
+  string photo=7;
+  int64  isRealName=8;
+  int64  fddState=9;
+  string realName=12;
+  string sex=14;
+  int64  age=15;
+  string createdAt = 23;
+  string penName =24;
+  string stageName=25;
+}
+message GetInvitedUserListResponse{
+  repeated InvitedUser data =1;
+  UserCommonPageInfo page =2;
 }

pkg/db/init.go

@@ -59,6 +59,13 @@ func LoadMysqlData(file *ini.File) {
 	DbUser = file.Section("mysql").Key("DbUser").String()
 	DbPassWord = file.Section("mysql").Key("DbPassWord").String()
 	DbLogName = file.Section("mysql").Key("DbName").String()
+	fmt.Println("数据库配置=====================================================")
+	fmt.Println("\tDb:", Db)
+	fmt.Println("\tDbHost:", DbHost)
+	fmt.Println("\tDbPort:", DbPort)
+	fmt.Println("\tDbUser:", DbUser)
+	fmt.Println("\tDbPassWord:", DbPassWord)
+	fmt.Println("\tDbLogName:", DbLogName)
 }
 
 func Database(conn string) {
@@ -95,7 +102,7 @@ func Database(conn string) {
 func migration() {
 	//自迁移模式
 	err := DB.AutoMigrate(
-		&old.Bank{},
+		//&old.Bank{},
 		&model.RealName{},
 		&model.User{},
 		&model.Invite{},