From ec1eba24cbdc0a3138d70076c6737dfd6e95ecbe Mon Sep 17 00:00:00 2001 From: jjxu <428192774@qq.com> Date: Fri, 31 Mar 2023 16:59:23 +0800 Subject: [PATCH 01/12] update --- cmd/internal/logic/artistinfo_artwork.go | 81 ++++++++++++++++-------- 1 file changed, 55 insertions(+), 26 deletions(-) diff --git a/cmd/internal/logic/artistinfo_artwork.go b/cmd/internal/logic/artistinfo_artwork.go index 9db2bf1..4a2136e 100644 --- a/cmd/internal/logic/artistinfo_artwork.go +++ b/cmd/internal/logic/artistinfo_artwork.go @@ -110,9 +110,10 @@ func (a ArtistInfoArtworkLogic) GetArtworkLockHistoryGroup(request *artistInfoAr fmt.Println("artworkUidList", artworkUidList) //查询画作预览列表 previewListRes, err := service.ArtworkQueryImpl.ArtworkPreviewList(context.Background(), &artwork_query.ArtworkPreviewListRequest{ - Page: 1, - PageSize: -1, - ArtworkUids: artworkUidList, + Page: 1, + PageSize: -1, + // ArtworkUids: artworkUidList, + ArtistUid: request.ArtistUid, }) if err != nil { return nil, err @@ -135,30 +136,58 @@ func (a ArtistInfoArtworkLogic) GetArtworkLockHistoryGroup(request *artistInfoAr DataList: []*artistInfoArtwork.ArtworkPreviewInfo{}, }) } + var thisArtwork = &artistInfoArtwork.ArtworkPreviewInfo{ + ArtworkUid: v.ArtworkUid, + ArtistUuid: v.ArtistUid, + LockStatus: int32(v.Status), + BaseAuditStatus: v.BaseAuditStatus, + BaseAuditMark: v.BaseAuditMark, + BaseAuditMark2: v.BaseAuditMark2, + SupplementAuditStatus: v.SupplementAuditStatus, + SupplementAuditMark: v.SupplementAuditMark, + SupplementAuditMark2: v.SupplementAuditMark2, + AuditFlowIndex: v.AuditFlowIndex, + CreatedAt: v.CreatedAt, + UpdatedAt: v.UpdatedAt, + DeletedAt: v.DeletedAt, + } for _, artwork := range previewListRes.Data { - res.GroupList[groupIndex].DataList = append(res.GroupList[groupIndex].DataList, &artistInfoArtwork.ArtworkPreviewInfo{ - ArtistUuid: artwork.ArtistUuid, - ArtworkName: artwork.ArtworkName, - Length: artwork.Length, - Width: artwork.Width, - Ruler: artwork.Ruler, - CreatedAddress: strings.Split(artwork.CreatedAddress, "，"), - ArtistPhoto: artwork.ArtistPhoto, - HdPic: artwork.HdPic, - ArtworkUid: artwork.ArtworkUid, - CreatedDate: artwork.CreateDate, - LockStatus: int32(v.Status), - BaseAuditStatus: v.BaseAuditStatus, - BaseAuditMark: v.BaseAuditMark, - BaseAuditMark2: v.BaseAuditMark2, - SupplementAuditStatus: v.SupplementAuditStatus, - SupplementAuditMark: v.SupplementAuditMark, - SupplementAuditMark2: v.SupplementAuditMark2, - AuditFlowIndex: v.AuditFlowIndex, - CreatedAt: v.CreatedAt, - UpdatedAt: v.UpdatedAt, - DeletedAt: v.DeletedAt, - }) + if artwork.ArtworkUid == v.ArtworkUid { + // thisArtwork.ArtistUuid = artwork.ArtistUuid + thisArtwork.ArtworkName = artwork.ArtworkName + thisArtwork.Length = artwork.Length + thisArtwork.Width = artwork.Width + thisArtwork.Ruler = artwork.Ruler + thisArtwork.CreatedAddress = strings.Split(artwork.CreatedAddress, "，") + thisArtwork.ArtistPhoto = artwork.ArtistPhoto + thisArtwork.HdPic = artwork.HdPic + thisArtwork.CreatedDate = artwork.CreateDate + + // res.GroupList[groupIndex].DataList = append(res.GroupList[groupIndex].DataList, &artistInfoArtwork.ArtworkPreviewInfo{ + // ArtistUuid: artwork.ArtistUuid, + // ArtworkName: artwork.ArtworkName, + // Length: artwork.Length, + // Width: artwork.Width, + // Ruler: artwork.Ruler, + // CreatedAddress: strings.Split(artwork.CreatedAddress, "，"), + // ArtistPhoto: artwork.ArtistPhoto, + // HdPic: artwork.HdPic, + // ArtworkUid: artwork.ArtworkUid, + // CreatedDate: artwork.CreateDate, + // LockStatus: int32(v.Status), + // BaseAuditStatus: v.BaseAuditStatus, + // BaseAuditMark: v.BaseAuditMark, + // BaseAuditMark2: v.BaseAuditMark2, + // SupplementAuditStatus: v.SupplementAuditStatus, + // SupplementAuditMark: v.SupplementAuditMark, + // SupplementAuditMark2: v.SupplementAuditMark2, + // AuditFlowIndex: v.AuditFlowIndex, + // CreatedAt: v.CreatedAt, + // UpdatedAt: v.UpdatedAt, + // DeletedAt: v.DeletedAt, + // }) + + } } } fmt.Println("previewListRes count", len(previewListRes.Data)) From 87875ba6d054edb3f5718b8de61b9b5be7cb7d7b Mon Sep 17 00:00:00 2001 From: jjxu <428192774@qq.com> Date: Mon, 3 Apr 2023 14:55:41 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E5=8F=AA=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=94=BB=E5=AE=B6=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/internal/dao/artistInfo_user.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/internal/dao/artistInfo_user.go b/cmd/internal/dao/artistInfo_user.go index a8d2a71..7650588 100644 --- a/cmd/internal/dao/artistInfo_user.go +++ b/cmd/internal/dao/artistInfo_user.go @@ -550,7 +550,7 @@ func FindUserList(req *artistInfoUser.FindUsersRequest) (rep []*artistInfoUser.U datas = []model.User{} tx = db.DB.Model(model.User{}). Joins("LEFT JOIN real_name rn ON rn.id = sys_user.real_name_id"). - Preload("RealNameInfo").Where("sys_user.mgmt_artist_uid!=''") + Preload("RealNameInfo") //.Where("sys_user.mgmt_artist_uid!=''") ) if req.InvitedCode != "" { tx = tx.Where("invited_code = ?", req.InvitedCode) @@ -571,7 +571,7 @@ func FindUserList(req *artistInfoUser.FindUsersRequest) (rep []*artistInfoUser.U }) } if req.IsArtist { - tx = tx.Where("mgmt_artist_uid !='' ") + tx = tx.Where("sys_user.mgmt_artist_uid !='' ") } if req.IsLock { tx = tx.Where("is_lock=true") From aadf819e016a2307c0a241faf0728c9ea1489d58 Mon Sep 17 00:00:00 2001 From: jjxu <428192774@qq.com> Date: Tue, 4 Apr 2023 08:45:01 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=86=E5=9B=BE?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/model/view_user.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/model/view_user.go b/cmd/model/view_user.go index 8b3edad..2a0bdc5 100644 --- a/cmd/model/view_user.go +++ b/cmd/model/view_user.go @@ -75,7 +75,7 @@ SELECT su.updated_at, su.deleted_at, inviter.invited_code inviter_invite_code, - inviter_rn.name inviter_name, + inviter_rn.name inviter_real_name, su.latest_lock_time, su.join_asso_time, su.certificate_num, From 9a7912b28af79b0334439e6294234abf2e9dd545 Mon Sep 17 00:00:00 2001 From: jjxu <428192774@qq.com> Date: Tue, 4 Apr 2023 08:54:49 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5gorm?= =?UTF-8?q?=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/model/view_user.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/model/view_user.go b/cmd/model/view_user.go index 2a0bdc5..c3973e2 100644 --- a/cmd/model/view_user.go +++ b/cmd/model/view_user.go @@ -34,7 +34,7 @@ type UserView struct { IdcardFront string `json:"idcardFront" 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:邀请人的真实姓名"` + InviterRealName string `json:"inviterRealName" gorm:"column:inviter_real_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:"` From e476abd2d3b8aa14f328e77a97ff66bb18b978ca Mon Sep 17 00:00:00 2001 From: jjxu <428192774@qq.com> Date: Thu, 6 Apr 2023 14:49:54 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E8=A7=A3=E9=94=81=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=AD=EF=BC=8C=E6=B2=A1=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=95=B0=E6=8D=AE=E4=B8=8D=E8=AE=A9=E8=A7=A3=E9=94=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmd/internal/controller/artistInfo_user.go | 2 + cmd/internal/dao/artistInfo_user.go | 63 +++++++++++++++++++++- cmd/model/artist_operation_records.go | 5 ++ pkg/util/qrcode.go | 1 - 4 files changed, 69 insertions(+), 2 deletions(-) create mode 100644 cmd/model/artist_operation_records.go diff --git a/cmd/internal/controller/artistInfo_user.go b/cmd/internal/controller/artistInfo_user.go index c99669d..dcf29a3 100644 --- a/cmd/internal/controller/artistInfo_user.go +++ b/cmd/internal/controller/artistInfo_user.go @@ -118,9 +118,11 @@ func (a *ArtistInfoUserProvider) FinishVerify(ctx context.Context, req *artistIn } return rep, nil } + func (a *ArtistInfoUserProvider) UserLock(ctx context.Context, req *artistInfoUser.UserLockRequest) (rep *artistInfoUser.UserLockRespond, err error) { return a.artistInfoLogic.UserLock(req) } + func (a *ArtistInfoUserProvider) CheckUserLock(ctx context.Context, req *artistInfoUser.CheckUserLockRequest) (rep *artistInfoUser.CheckUserLockRespond, err error) { fmt.Println("第一处") // backup := &artistinfoUser.GetUserInfoRespond{} diff --git a/cmd/internal/dao/artistInfo_user.go b/cmd/internal/dao/artistInfo_user.go index 7650588..ad44101 100644 --- a/cmd/internal/dao/artistInfo_user.go +++ b/cmd/internal/dao/artistInfo_user.go @@ -6,6 +6,7 @@ import ( "errors" "fmt" "sort" + "strings" "time" _ "dubbo.apache.org/dubbo-go/v3/imports" @@ -303,27 +304,39 @@ func UserLock(req *artistInfoUser.UserLockRequest) (rep *artistInfoUser.UserLock } rep.LockTime = now if !req.IsLock { - fmt.Println("122312312312331") + fmt.Println("进入解锁流程") + // 如果当前锁定状态下没有任何数据变动，则报错 + if hasChanged, _ := WhetherAnyChangedAfterLocked(thisUser.MgmtArtistUid); !hasChanged { + tx.Rollback() + err = errors.New("此用户在锁定后未作任何修改，无法解锁") + return + } // 解锁时与另外4个模块联动 if err = tx.Model(model.ArtworkLockRecord{}).Where("artist_uid = ? AND status =2", thisUser.MgmtArtistUid).Update("status", 3).Error; err != nil { + tx.Rollback() return nil, err } if err = tx.Model(model.ArtshowArtistSupplement{}).Where("artist_uid = ? AND status =2", thisUser.MgmtArtistUid).Update("status", 3).Error; err != nil { + tx.Rollback() return nil, err } if err = tx.Model(model.ArtshowArtistIndex{}).Where("artist_uid = ? AND status =2", thisUser.MgmtArtistUid).Update("status", 3).Error; err != nil { + tx.Rollback() return nil, err } if err = tx.Model(model.ArtshowVideoRecord{}).Where("artist_uid = ? AND status =2", thisUser.MgmtArtistUid).Update("status", 3).Error; err != nil { + tx.Rollback() return nil, err } // 与画家宝的合同表进行联动 if err = tx.Model(model.Contract{}).Where("artist_uid = ? AND status =2", thisUser.MgmtArtistUid).Update("status", 3).Error; err != nil { + tx.Rollback() 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 { + tx.Rollback() return nil, err } fmt.Println("更新结束") @@ -333,6 +346,54 @@ func UserLock(req *artistInfoUser.UserLockRequest) (rep *artistInfoUser.UserLock return rep, nil } +// 简单判断锁定后数据是否有新增 +func WhetherAnyChangedAfterLocked(artistUid string) (changed bool, err error) { + //查询锁定时间 + var lockTime string + if err = db.DB.Model(model.User{}).Where("mgmt_artist_uid = ?", artistUid).Pluck("latest_lock_time", &lockTime).Error; err != nil { + return + } + //如果画作更新时间大于锁定时间,直接返回true + var artworks []model.ArtworkLockRecord + db.DB.Where("artist_uid = ? AND lock_time = ? ", artistUid, lockTime).Find(&artworks) + var lockTimeT, _ = stime.StringToTime(lockTime) + for _, a := range artworks { + if a.UpdatedAt.After(*lockTimeT) { + changed = true + return + } + } + //如果补充信息有新增则直接返回true + var sql = ` +SELECT + u.mgmt_artist_uid + ,u.latest_lock_time + ,(SELECT COUNT(1) FROM artshow_artist_index WHERE artist_uid = '{{artistUid}}' AND lock_time = '{{lockTime}}' AND deleted_at = 0) as artist_index_count + ,(SELECT COUNT(1) FROM artshow_artist_supplement WHERE artist_uid = '{{artistUid}}' AND lock_time = '{{lockTime}}' AND deleted_at = 0) as artist_supplement_count + ,(SELECT COUNT(1) FROM artshow_video_record WHERE artist_uid = '{{artistUid}}' AND lock_time = '{{lockTime}}' AND deleted_at = 0) as video_count + ,(SELECT COUNT(1) FROM contract WHERE artist_uid = '{{artistUid}}' AND lock_time = '{{lockTime}}' AND deleted_at = 0) as contract_count +FROM sys_user u +WHERE u.mgmt_artist_uid ='{{artistUid}}' AND u.deleted_at = 0 +` + sql = strings.Replace(sql, "{{artistUid}}", artistUid, -1) + sql = strings.Replace(sql, "{{lockTime}}", lockTime, -1) + var data struct { + MgmtArtistUid string `gorm:"column:mgmt_artist_uid"` + LatestLockTime string `gorm:"column:latest_lock_time"` + ArtistIndexCount int `gorm:"column:artist_index_count"` + ArtistSupplementCount int `gorm:"column:artist_supplement_count"` + VideoCount int `gorm:"column:video_count"` + ContractCount int `gorm:"column:contract_count"` + } + if err = db.DB.Debug().Raw(sql).Find(&data).Error; err != nil { + return + } + if data.ArtistIndexCount > 0 || data.ArtistSupplementCount > 0 || data.VideoCount > 0 || data.ContractCount > 0 { + return true, nil + } + return false, nil +} + func CheckInvitedCode(req *artistInfoUser.CheckInvitedCodeRequest) (rep *artistInfoUser.GetUserRespond, err error) { rep = &artistInfoUser.GetUserRespond{} // service := &artist.UserUpdateInfoService{} diff --git a/cmd/model/artist_operation_records.go b/cmd/model/artist_operation_records.go new file mode 100644 index 0000000..82c3fcf --- /dev/null +++ b/cmd/model/artist_operation_records.go @@ -0,0 +1,5 @@ +package model + +type OperationRecord struct { + Model +} diff --git a/pkg/util/qrcode.go b/pkg/util/qrcode.go index 85d0537..251152d 100644 --- a/pkg/util/qrcode.go +++ b/pkg/util/qrcode.go @@ -25,7 +25,6 @@ func CreateQrCode(invitedCode, userName string) error { tmp, err := os.Open(QrCodePath) if err != nil { return err - } defer tmp.Close() From 55067272209546a329807ce444e722b40f8b8c9a Mon Sep 17 00:00:00 2001 From: jjxu <428192774@qq.com> Date: Fri, 7 Apr 2023 08:08:08 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=20=E6=B3=A8=E9=87=8A=E6=8E=89=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E6=97=B6=E4=B8=8D=E9=9C=80=E8=A6=81=E7=9A=84?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/db/init.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkg/db/init.go b/pkg/db/init.go index 8e4da18..55d493f 100644 --- a/pkg/db/init.go +++ b/pkg/db/init.go @@ -104,19 +104,19 @@ func Database(conn string) { func migration() { //自迁移模式 err := DB.AutoMigrate( - //&old.Bank{}, + // &old.Bank{}, + // &old.Artwork{}, + // &model.Contract{}, + // &model.SupplyInfo{}, + // &model.ExhVideo{}, + // &model.ExhExam{}, + // &old.ArtistInfo{}, + // &old.ArtworkState{}, + // &old.ArtworkBatch{}, &model.RealName{}, &model.User{}, &model.Invite{}, - &old.Artwork{}, - //&model.Contract{}, - //&model.SupplyInfo{}, - //&model.ExhVideo{}, - //&model.ExhExam{}, - &old.ArtistInfo{}, &model.UserInvited{}, - &old.ArtworkState{}, - &old.ArtworkBatch{}, &model.TempArtistInfo{}, &model.ArtworkLockRecord{}, &model.ArtshowVideoRecord{}, //画展视频记录 From 247541fb24ed7bb12daad122c55bd9c9ceacff90 Mon Sep 17 00:00:00 2001 From: jjxu <428192774@qq.com> Date: Fri, 7 Apr 2023 09:48:25 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E5=BF=85?= =?UTF-8?q?=E8=A6=81=E7=9A=84=E6=95=B0=E6=8D=AE=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/db/init.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkg/db/init.go b/pkg/db/init.go index 55d493f..f613601 100644 --- a/pkg/db/init.go +++ b/pkg/db/init.go @@ -6,8 +6,6 @@ import ( "strings" "time" - "github.com/fonchain/fonchain-artistinfo/cmd/model/old" - "github.com/fonchain/fonchain-artistinfo/cmd/model" "github.com/fonchain/fonchain-artistinfo/pkg/m" "github.com/gin-gonic/gin" From 458c5e3bc822e40122a4b967834e7bff44bd5381 Mon Sep 17 00:00:00 2001 From: jjxu <428192774@qq.com> Date: Fri, 7 Apr 2023 10:08:49 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9dockerfile=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DockerfileSlim | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/DockerfileSlim b/DockerfileSlim index c9108d9..dac4154 100644 --- a/DockerfileSlim +++ b/DockerfileSlim @@ -11,4 +11,8 @@ COPY ./conf/ /app/conf/ COPY ./conf/ ./conf/ WORKDIR /app/main-client/bin -CMD ["./mainServer"] \ No newline at end of file + +ARG BUILD_DATE +ENV BUILD_DATE ${BUILD_DATE} +# 在容器启动时输出环境变量BUILD_DATE的值 +CMD ['echo "Container was built on: ${BUILD_DATE}" &&./mainServer'] \ No newline at end of file From 338439db59aa27718a27779dac89860705f89f40 Mon Sep 17 00:00:00 2001 From: jjxu <428192774@qq.com> Date: Fri, 7 Apr 2023 10:20:05 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DockerBuildTest.bat | 2 +- DockerfileSlim | 3 ++- cmd/app.go | 3 +++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/DockerBuildTest.bat b/DockerBuildTest.bat index 53bd56a..21e5d2e 100644 --- a/DockerBuildTest.bat +++ b/DockerBuildTest.bat @@ -5,7 +5,7 @@ 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 build . --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') -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 \ No newline at end of file diff --git a/DockerfileSlim b/DockerfileSlim index dac4154..255e7f4 100644 --- a/DockerfileSlim +++ b/DockerfileSlim @@ -15,4 +15,5 @@ WORKDIR /app/main-client/bin ARG BUILD_DATE ENV BUILD_DATE ${BUILD_DATE} # 在容器启动时输出环境变量BUILD_DATE的值 -CMD ['echo "Container was built on: ${BUILD_DATE}" &&./mainServer'] \ No newline at end of file +# CMD ['echo "Container was built on: ${BUILD_DATE}" &&./mainServer'] +CMD ["./mainServer"] \ No newline at end of file diff --git a/cmd/app.go b/cmd/app.go index 0fb6b3d..1ebddb7 100644 --- a/cmd/app.go +++ b/cmd/app.go @@ -2,6 +2,7 @@ package main import ( "fmt" + "os" "dubbo.apache.org/dubbo-go/v3/config" @@ -27,5 +28,7 @@ func main() { if err := config.Load(); err != nil { panic(err) } + buildDate := os.Getenv("BUILD_DATE") + fmt.Println("镜像生成时间:", buildDate) select {} } From 8f7618b8bd88e3fd743693ec938b0cc115ba027b Mon Sep 17 00:00:00 2001 From: jjxu <428192774@qq.com> Date: Fri, 7 Apr 2023 10:33:48 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E6=B5=8B=E8=AF=952?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- DockerfileSlim | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 333bd0e..47b6d99 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ MAINTAINER GY "wangyitao@163.com" RUN go env -w GO111MODULE=on && \ go env -w GOPROXY=https://goproxy.cn,direct - + WORKDIR /app COPY fonchain-artistinfo /app/fonchain-artistinfo diff --git a/DockerfileSlim b/DockerfileSlim index 255e7f4..235e876 100644 --- a/DockerfileSlim +++ b/DockerfileSlim @@ -1,7 +1,10 @@ FROM busybox:glibc +ARG BUILD_DATE +ENV BUILD_DATE ${BUILD_DATE} COPY ./docs/Shanghai /usr/share/zoneinfo/Asia/Shanghai RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone + #ENV TZ Asia/Shanghai WORKDIR /app/main-client @@ -12,8 +15,6 @@ COPY ./conf/ ./conf/ WORKDIR /app/main-client/bin -ARG BUILD_DATE -ENV BUILD_DATE ${BUILD_DATE} # 在容器启动时输出环境变量BUILD_DATE的值 -# CMD ['echo "Container was built on: ${BUILD_DATE}" &&./mainServer'] -CMD ["./mainServer"] \ No newline at end of file +CMD ['echo "Container was built on: ${BUILD_DATE}" &&./mainServer'] +# CMD ["./mainServer"] \ No newline at end of file From 4cba6ffd8ccea104a47fde48d3b01c3b87c683e0 Mon Sep 17 00:00:00 2001 From: jjxu <428192774@qq.com> Date: Fri, 7 Apr 2023 10:41:32 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E6=B5=8B=E8=AF=952?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DockerfileSlim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DockerfileSlim b/DockerfileSlim index 235e876..1b0d3cd 100644 --- a/DockerfileSlim +++ b/DockerfileSlim @@ -16,5 +16,5 @@ COPY ./conf/ ./conf/ WORKDIR /app/main-client/bin # 在容器启动时输出环境变量BUILD_DATE的值 -CMD ['echo "Container was built on: ${BUILD_DATE}" &&./mainServer'] +CMD ["sh", "-c","echo", "Container was built on: ${BUILD_DATE}", "&&./mainServer"] # CMD ["./mainServer"] \ No newline at end of file From 3d08ba4ee2e8e0f890a23270f8b45920632819f3 Mon Sep 17 00:00:00 2001 From: jjxu <428192774@qq.com> Date: Fri, 7 Apr 2023 11:42:27 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E6=B5=8B=E8=AF=953?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DockerBuildTest.bat | 2 +- DockerfileSlim | 3 +-- DockerfileWindowsTest | 3 +++ conf/buildDate | 0 4 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 conf/buildDate diff --git a/DockerBuildTest.bat b/DockerBuildTest.bat index 21e5d2e..518ebcb 100644 --- a/DockerBuildTest.bat +++ b/DockerBuildTest.bat @@ -5,7 +5,7 @@ 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 . --build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') -f .\DockerfileWindowsTest -t artistinfo-dev +docker build . -f .\DockerfileWindowsTest -t artistinfo-dev --build-arg BUILD_DATE=$(date) docker tag artistinfo-dev 121.229.45.214:9006/artistinfo-dev docker push 121.229.45.214:9006/artistinfo-dev pause \ No newline at end of file diff --git a/DockerfileSlim b/DockerfileSlim index 1b0d3cd..2e1c48e 100644 --- a/DockerfileSlim +++ b/DockerfileSlim @@ -16,5 +16,4 @@ COPY ./conf/ ./conf/ WORKDIR /app/main-client/bin # 在容器启动时输出环境变量BUILD_DATE的值 -CMD ["sh", "-c","echo", "Container was built on: ${BUILD_DATE}", "&&./mainServer"] -# CMD ["./mainServer"] \ No newline at end of file +CMD ["./mainServer"] \ No newline at end of file diff --git a/DockerfileWindowsTest b/DockerfileWindowsTest index 45e7697..a35c8b5 100644 --- a/DockerfileWindowsTest +++ b/DockerfileWindowsTest @@ -21,6 +21,9 @@ WORKDIR /build COPY ./build/artistinfo-dev /app/artistinfo-dev FROM alpine + +ARG BUILD_DATE +ENV BUILD_DATE ${BUILD_DATE} 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 diff --git a/conf/buildDate b/conf/buildDate new file mode 100644 index 0000000..e69de29