aarongao / leyoutu_server

Download as
Browse Code »

Commit 869149fa13676aaaf20cf2c62c1c69d61bec9c77

Authored by aarongao
1 parent 483ade81
Exists in v1.2 and in 1 other branch v1.1

..

Showing 5 changed files with 8 additions and 14 deletions   Show diff stats
API/SystemInfo.go
  Diff comments   View file @869149f
@@ -3,7 +3,6 @@ package Api @@ -3,7 +3,6 @@ package Api
3 import ( 3 import (
4 "github.com/aarongao/tools" 4 "github.com/aarongao/tools"
5 "github.com/gin-gonic/gin" 5 "github.com/gin-gonic/gin"
6 - "letu/Config"  
7 "letu/DB" 6 "letu/DB"
8 ) 7 )
9 8
@@ -11,7 +10,7 @@ import ( @@ -11,7 +10,7 @@ import (
11 // @Description 查询系统信息接口 10 // @Description 查询系统信息接口
12 // @Accept json 11 // @Accept json
13 // @Produce json 12 // @Produce json
14 -// @Success 200 {object} tools.ResponseSeccess "Version=最新版本号UpdateLocationInterval上报位置时间间隔(秒)" 13 +// @Success 200 {object} tools.ResponseSeccess "ApiVersion=最新的api版本号SupportVersion=支持最低的app版本号UpdateLocationInterval上报位置时间间隔(秒)"
15 // @Failure 500 {object} tools.ResponseError "{"errcode":1,"errmsg":"错误原因"}" 14 // @Failure 500 {object} tools.ResponseError "{"errcode":1,"errmsg":"错误原因"}"
16 // @Router /SystemInfo? [get] 15 // @Router /SystemInfo? [get]
17 func SystemInfo(c *gin.Context) { 16 func SystemInfo(c *gin.Context) {
@@ -19,12 +18,11 @@ func SystemInfo(c *gin.Context) { @@ -19,12 +18,11 @@ func SystemInfo(c *gin.Context) {
19 c.Header("Access-Control-Allow-Credentials", "true") 18 c.Header("Access-Control-Allow-Credentials", "true")
20 19
21 info := make(map[string]interface{}) 20 info := make(map[string]interface{})
22 - info["ApiVersion"] = Config.Info.ApiVersion 21 + ApiVersion := DB.Redis.Get("ApiVersion")
  22 + info["ApiVersion"] = ApiVersion
23 23
24 - info["SupportVersion"] = Config.Info.SupportVersion  
25 -  
26 - //SupportVersion := DB.Redis.Get("SupportVersion")  
27 - //info["SupportVersion"] = SupportVersion 24 + SupportVersion := DB.Redis.Get("SupportVersion")
  25 + info["SupportVersion"] = SupportVersion
28 26
29 UpdateLocationInterval := DB.Redis.Get("UpdateLocationInterval") 27 UpdateLocationInterval := DB.Redis.Get("UpdateLocationInterval")
30 info["UpdateLocationInterval"] = UpdateLocationInterval 28 info["UpdateLocationInterval"] = UpdateLocationInterval
Config/config.go
  Diff comments   View file @869149f
@@ -10,8 +10,6 @@ type Config struct { @@ -10,8 +10,6 @@ type Config struct {
10 Env string 10 Env string
11 TokenSecret string 11 TokenSecret string
12 ServerPort string 12 ServerPort string
13 - ApiVersion string  
14 - SupportVersion string  
15 } 13 }
16 14
17 var Info = Config{} 15 var Info = Config{}
Config/config.json
  Diff comments   View file @869149f
@@ -7,7 +7,5 @@ @@ -7,7 +7,5 @@
7 "redisPath": "127.0.0.1:6379", 7 "redisPath": "127.0.0.1:6379",
8 "Env": "DEV", 8 "Env": "DEV",
9 "tokenSecret": "token.secret", 9 "tokenSecret": "token.secret",
10 - "ServerPort": ":8080",  
11 - "ApiVersion": "1.1",  
12 - "SupportVersion": "1.0" 10 + "ServerPort": ":8080"
13 } 11 }
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 ## 乐游图后端接口文档 2 ## 乐游图后端接口文档
3 | Specification | Value | 3 | Specification | Value |
4 |-----|-----| 4 |-----|-----|
5 -| API Version | 1.0.0 | 5 +| API Version | 1.1.0 |
6 | BasePath | 正式 leyoutu.st-i.com.cn; 测试 leyoutu.sti-uat.com | 6 | BasePath | 正式 leyoutu.st-i.com.cn; 测试 leyoutu.sti-uat.com |
7 7
8 8
@@ -880,7 +880,7 @@ @@ -880,7 +880,7 @@
880 880
881 | Code | Type | Model | Message | 881 | Code | Type | Model | Message |
882 |-----|-----|-----|-----| 882 |-----|-----|-----|-----|
883 -| 200 | object | [ResponseSeccess](#github.com.aarongao.tools.ResponseSeccess) | Version=最新版本号UpdateLocationInterval上报位置时间间隔(秒) | 883 +| 200 | object | [ResponseSeccess](#github.com.aarongao.tools.ResponseSeccess) | ApiVersion=最新的api版本号SupportVersion=支持最低的app版本号UpdateLocationInterval上报位置时间间隔(秒) |
884 | 500 | object | [ResponseError](#github.com.aarongao.tools.ResponseError) | {"errcode":1,"errmsg":"错误原因"} | 884 | 500 | object | [ResponseError](#github.com.aarongao.tools.ResponseError) | {"errcode":1,"errmsg":"错误原因"} |
885 885
886 886
main_1.1 0 → 100755
View file @869149f
No preview for this file type