diff --git a/.zd.conf b/.zd.conf index c6f0b2827f9c0ee762c66279f0fddf61c18cb102..b75481b00cdf0ece1e348b27c7893576822d8afa 100644 --- a/.zd.conf +++ b/.zd.conf @@ -1,3 +1,3 @@ -Version = 1.6 +Version = 1.7 Language = zh diff --git a/Makefile b/Makefile index 55698eb337336ad2f43e057e9ccf9a2cd02b07f8..cf4506d6c6e31c2c6c0a0ec3c257e874a9bccfe5 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -VERSION=1.6 -PROJECT=zendata +VERSION=1.7 +PROJECT=zd QINIU_DIR=/Users/aaron/work/zentao/qiniu/ QINIU_DIST_DIR=${QINIU_DIR}${PROJECT}/${VERSION}/ PACKAGE=${PROJECT}-${VERSION} diff --git a/res/en/messages.json b/res/en/messages.json index 11301864e4b8d21fdca91364effd38aa6b55c992..dabe590b79ad5a751b629601da583307610f8642 100644 --- a/res/en/messages.json +++ b/res/en/messages.json @@ -166,6 +166,10 @@ "translation": "Fail to exec command '%s', error is '%s'." }, + { + "id": "no_new_ver", + "translation": "Current %s is already the newest version." + }, { "id": "find_new_ver", "translation": "Find new version %s" diff --git a/res/zh/messages.json b/res/zh/messages.json index db6d67596fc9a4d0b13f4d5355ec624bdbf28caf..b968e31e8ce3d094f2960f1db3e65e5d8ae4afd6 100644 --- a/res/zh/messages.json +++ b/res/zh/messages.json @@ -157,6 +157,10 @@ "translation": "执行命令'%s'失败,错误消息为'%s'。" }, + { + "id": "no_new_ver", + "translation": "当前版本%s已经为最新。" + }, { "id": "find_new_ver", "translation": "发现新版本%s。" diff --git a/src/server/service/upgrade.go b/src/server/service/upgrade.go index 92c8f7d95f178610ca1b0607120ae8127e699829..ca4d9837b9920c93f7aae0092025d272eafcc59c 100644 --- a/src/server/service/upgrade.go +++ b/src/server/service/upgrade.go @@ -42,6 +42,8 @@ func (s *UpgradeService) CheckUpgrade() { if pass && err == nil { s.RestartVersion(versionStr) } + } else { + logUtils.PrintToWithColor(i118Utils.I118Prt.Sprintf("no_new_ver", content), color.FgCyan) } } diff --git a/src/utils/const/const.go b/src/utils/const/const.go index e9109f38f7c0a33d830ab4cace6f2401032fc31f..8bf4b3c4c13b0aac8b2e6381c9bbd0191ed8de92 100644 --- a/src/utils/const/const.go +++ b/src/utils/const/const.go @@ -7,7 +7,7 @@ import ( ) const ( - AppName = "zendata" + AppName = "zd" ) var (