Merge pull request #268 from ArtisanCloud/dev/michaelhu

refact(version): change version location
ArtisanCloud · Oct 15, 2023 · 4f13b8e · 4f13b8e
2 parents 615c250 + cd2a816
commit 4f13b8e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/etc/powerx-example.yaml b/etc/powerx-example.yaml
@@ -1,3 +1,4 @@
+Version: v1.0.0            # 版本
 Server:
   Name: PowerX后台系统        # 服务器名称
   Host: 0.0.0.0             # 服务器地址

diff --git a/internal/config/config.go b/internal/config/config.go
@@ -97,11 +97,12 @@ type Root struct {
 }
 
 type Config struct {
-	Server rest.RestConf
-	EtcDir string `json:",optional"`
-	Log    zerox.LogConf
-	Cors   Cors
-	JWT    struct {
+	Version string
+	Server  rest.RestConf
+	EtcDir  string `json:",optional"`
+	Log     zerox.LogConf
+	Cors    Cors
+	JWT     struct {
 		JWTSecret    string
 		MPJWTSecret  string
 		WebJWTSecret string

diff --git a/internal/logic/gethomelogic.go b/internal/logic/gethomelogic.go
@@ -27,6 +27,6 @@ func (l *GetHomeLogic) GetHome() (resp *types.GetHomeReply, err error) {
 	return &types.GetHomeReply{
 		Greet:       "Hello, I am PowerX!",
 		Description: "This is awesome! you create me and make me alive",
-		Version:     "V1.0.1",
+		Version:     l.svcCtx.Config.Version,
 	}, nil
 }