..

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