修改配置文件读取结构

nyancatda · Mar 7, 2022 · 4660d43 · 4660d43
1 parent 7c973d5
commit 4660d43
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 16 deletions.
diff --git a/HttpAPI/API/Query.go b/HttpAPI/API/Query.go
@@ -1,10 +1,10 @@
 /*
  * @Author: NyanCatda
  * @Date: 2021-11-06 21:49:39
- * @LastEditTime: 2022-01-24 19:38:10
+ * @LastEditTime: 2022-03-07 19:51:39
  * @LastEditors: NyanCatda
  * @Description: 查询Wiki信息
- * @FilePath: \ShionBot\src\HttpAPI\API\Query.go
+ * @FilePath: \ShionBot\HttpAPI\API\Query.go
  */
 package API
 
@@ -21,7 +21,7 @@ import (
 func QueryInfo(c *gin.Context) map[string]interface{} {
 	title := c.DefaultQuery("title", "")
 	Config := ReadConfig.GetConfig
-	MainWikiName := Config.Wiki.([]interface{})[0].(map[interface{}]interface{})["WikiName"].(string)
+	MainWikiName := Config.Wiki[0].WikiName
 	WikiName := c.DefaultQuery("wiki_name", MainWikiName)
 	var Messagejson Struct.WebHookJson
 	WikiLink := ReadConfig.GetWikiLink("HttpAPI", Messagejson, WikiName)

diff --git a/Modular/GetWikiInfo/GetWikiInfo.go b/Modular/GetWikiInfo/GetWikiInfo.go
@@ -1,7 +1,7 @@
 /*
  * @Author: NyanCatda
  * @Date: 2021-10-03 02:14:31
- * @LastEditTime: 2022-03-07 19:43:03
+ * @LastEditTime: 2022-03-07 19:50:40
  * @LastEditors: NyanCatda
  * @Description: 获取Wiki页面信息
  * @FilePath: \ShionBot\Modular\GetWikiInfo\GetWikiInfo.go
@@ -64,8 +64,8 @@ func WikiNameExist(WikiName string, SNSName string, Messagejson Struct.WebHookJs
 
 	Config := ReadConfig.GetConfig
 	var ConfigWikiName string
-	for one := range Config.Wiki.([]interface{}) {
-		ConfigWikiName = Config.Wiki.([]interface{})[one].(map[interface{}]interface{})["WikiName"].(string)
+	for _, one := range Config.Wiki {
+		ConfigWikiName = one.WikiName
 		if find := strings.Contains(WikiName, ConfigWikiName); find {
 			return true
 		}
@@ -98,7 +98,7 @@ func GeiMainWikiName(SNSName string, Messagejson Struct.WebHookJson) string {
 	*/
 
 	Config := ReadConfig.GetConfig
-	MainWikiName := Config.Wiki.([]interface{})[0].(map[interface{}]interface{})["WikiName"].(string)
+	MainWikiName := Config.Wiki[0].WikiName
 	return MainWikiName
 }
 

diff --git a/Utils/ReadConfig/ConfigStruct.go b/Utils/ReadConfig/ConfigStruct.go
@@ -1,10 +1,10 @@
 /*
  * @Author: NyanCatda
  * @Date: 2022-01-24 19:35:15
- * @LastEditTime: 2022-01-24 19:35:16
+ * @LastEditTime: 2022-03-07 19:48:36
  * @LastEditors: NyanCatda
  * @Description: 配置文件结构体
- * @FilePath: \ShionBot\src\Utils\ReadConfig\ConfigStruct.go
+ * @FilePath: \ShionBot\Utils\ReadConfig\ConfigStruct.go
  */
 package ReadConfig
 
@@ -36,5 +36,8 @@ type Config struct {
 			Token  string `yaml:"Token"`
 		} `yaml:"KaiHeiLa"`
 	} `yaml:"SNS"`
-	Wiki interface{} `yaml:"Wiki"`
-}
+	Wiki []struct {
+		WikiName string `yaml:"WikiName"`
+		WikiLink string `yaml:"WikiLink"`
+	} `yaml:"Wiki"`
+}
diff --git a/Utils/ReadConfig/ReadConfig.go b/Utils/ReadConfig/ReadConfig.go
@@ -1,10 +1,10 @@
 /*
  * @Author: NyanCatda
  * @Date: 2021-10-03 04:14:10
- * @LastEditTime: 2022-01-24 19:54:41
+ * @LastEditTime: 2022-03-07 19:50:26
  * @LastEditors: NyanCatda
  * @Description: 读取配置文件
- * @FilePath: \ShionBot\src\Utils\ReadConfig\ReadConfig.go
+ * @FilePath: \ShionBot\Utils\ReadConfig\ReadConfig.go
  */
 package ReadConfig
 
@@ -97,10 +97,10 @@ func GetWikiLink(SNSName string, Messagejson Struct.WebHookJson, WikiName string
 
 	Config := GetConfig
 	var ConfigWikiName string
-	for one := range Config.Wiki.([]interface{}) {
-		ConfigWikiName = Config.Wiki.([]interface{})[one].(map[interface{}]interface{})["WikiName"].(string)
+	for _, one := range Config.Wiki {
+		ConfigWikiName = one.WikiName
 		if ConfigWikiName == WikiName {
-			return Config.Wiki.([]interface{})[one].(map[interface{}]interface{})["WikiLink"].(string)
+			return one.WikiLink
 		}
 	}
 	return ""