命名规范化

M3chD09 · M3chD09 · commit 85cfc41db448 · 2020-05-17T20:19:06.000+08:00
diff --git a/DataPack/DataPack.go b/DataPack/DataPack.go
@@ -44,12 +44,12 @@ type VariableT struct {
 	Tick  uint32
 }
 
-type jsonCurrentVariablesT struct {
+type jsonVariablesT struct {
 	Variables []VariableT
 }
 
-var CurrentVariables jsonCurrentVariablesT
-var ModVariables jsonCurrentVariablesT
+var VariableRead jsonVariablesT
+var VariableModi jsonVariablesT
 
 type DataToChartT struct {
 	Board uint8
diff --git a/Docs/API.md b/Docs/API.md
@@ -112,7 +112,7 @@
 ##### 请求地址
 |  方法 |    URL     |
 |-------|-----------|
-| `GET` | `/variable` |
+| `GET` | `/variable-read/list` |
 ##### 请求参数
 无
 ##### 响应结果
@@ -126,7 +126,7 @@
 | Variables[].Data |  float   | 变量值 |
 ##### 调用示例
 请求示例：  
-`GET /variable`  
+`GET /variable-read/list`  
 响应示例：  
 ```
 {
@@ -176,7 +176,7 @@
 ##### 请求地址
 |  方法 |    URL     |
 |-------|-----------|
-| `POST` | `/variable/add` |
+| `POST` | `/variable-read/add` |
 ##### 请求参数
 | 参数 | 类型    | 说明  |
 |------|--------|-------|
@@ -190,7 +190,7 @@
 | status | int | 状态码 |
 ##### 调用示例
 请求示例：  
-`POST /variable/add`  
+`POST /variable-read/add`  
 ```
 {
     "Board":1,
@@ -210,7 +210,7 @@
 ##### 请求地址
 |  方法 |    URL     |
 |-------|-----------|
-| `POST` | `/variable/del` |
+| `POST` | `/variable-read/del` |
 ##### 请求参数
 | 参数 | 类型    | 说明  |
 |------|--------|-------|
@@ -224,7 +224,7 @@
 | status | int | 状态码 |
 ##### 调用示例
 请求示例：  
-`POST /variable/del`  
+`POST /variable-read/del`  
 ```
 {
     "Board":1,
@@ -244,7 +244,7 @@
 ##### 请求地址
 |  方法 |    URL     |
 |-------|-----------|
-| `POST` | `/variable/mod` |
+| `POST` | `/variable-modi/mod` |
 ##### 请求参数
 | 参数 | 类型    | 说明  |
 |------|--------|-------|
@@ -259,7 +259,7 @@
 | status | int | 状态码 |
 ##### 调用示例
 请求示例：  
-`POST /variable/mod`  
+`POST /variable-modi/mod`  
 ```
 {
     "Board":1,
diff --git a/FileHandle/FileConfig.go b/FileHandle/FileConfig.go
@@ -3,18 +3,18 @@ package filehandle
 import "os"
 
 type ConfigT struct {
-	IsSaveDataAddr        bool
-	IsSaveVariablesToMod  bool
-	IsSaveVariablesToRead bool
+	IsSaveDataAddr     bool
+	IsSaveVariableModi bool
+	IsSaveVariableRead bool
 }
 
 var Config ConfigT
 
 func LoadConfig() {
 	if _, err := os.Stat("Config.json"); os.IsNotExist(err) {
 		Config.IsSaveDataAddr = true
-		Config.IsSaveVariablesToMod = true
-		Config.IsSaveVariablesToRead = true
+		Config.IsSaveVariableModi = true
+		Config.IsSaveVariableRead = true
 	} else {
 		jsonLoad("Config.json", &Config)
 	}
@@ -27,10 +27,10 @@ func SaveConfig() {
 	} else {
 		jsonSave("DataAddr.json", ProjectVariables)
 	}
-	if !Config.IsSaveVariablesToMod {
+	if !Config.IsSaveVariableModi {
 		os.Remove("VariablesToMod.json")
 	}
-	if !Config.IsSaveVariablesToRead {
+	if !Config.IsSaveVariableRead {
 		os.Remove("VariablesToRead.json")
 	}
 }
diff --git a/FileHandle/FileSave.go b/FileHandle/FileSave.go
@@ -36,11 +36,11 @@ func jsonSave(filename string, v interface{}) {
 
 func SaveAll() {
 	SaveConfig()
-	if Config.IsSaveVariablesToMod {
-		jsonSave("VariablesToMod.json", datapack.ModVariables)
+	if Config.IsSaveVariableModi {
+		jsonSave("VariablesToMod.json", datapack.VariableModi)
 	}
-	if Config.IsSaveVariablesToRead {
-		jsonSave("VariablesToRead.json", datapack.CurrentVariables)
+	if Config.IsSaveVariableRead {
+		jsonSave("VariablesToRead.json", datapack.VariableRead)
 	}
 }
 
@@ -49,10 +49,10 @@ func LoadSaves() {
 	if Config.IsSaveDataAddr {
 		jsonLoad("DataAddr.json", &ProjectVariables)
 	}
-	if Config.IsSaveVariablesToMod {
-		jsonLoad("VariablesToMod.json", &datapack.ModVariables)
+	if Config.IsSaveVariableModi {
+		jsonLoad("VariablesToMod.json", &datapack.VariableModi)
 	}
-	if Config.IsSaveVariablesToRead {
-		jsonLoad("VariablesToRead.json", &datapack.CurrentVariables)
+	if Config.IsSaveVariableRead {
+		jsonLoad("VariablesToRead.json", &datapack.VariableRead)
 	}
 }
diff --git a/SerialHandle/SerialHandle.go b/SerialHandle/SerialHandle.go
@@ -158,7 +158,7 @@ func SerialPraseThread(chRxBuff chan []byte, chJson chan string) {
 			chartData.Board = buff[i*20]
 			chartData.Tick = datapack.BytesToUint32(buff[i*20+15 : i*20+19])
 			addr := datapack.BytesToUint32(buff[i*20+3 : i*20+7])
-			for _, v := range datapack.CurrentVariables.Variables {
+			for _, v := range datapack.VariableRead.Variables {
 				if v.Addr == addr {
 					chartData.Name = v.Name
 					switch v.Type {
@@ -203,7 +203,7 @@ func SerialPraseThread(chRxBuff chan []byte, chJson chan string) {
 func SerialReceiveThread(chRxBuff chan []byte) {
 	for {
 		<-chOpen
-		for _, v := range datapack.CurrentVariables.Variables {
+		for _, v := range datapack.VariableRead.Variables {
 			SerialSendCmd(datapack.ACT_SUBSCRIBE, v)
 			time.Sleep(10 * time.Millisecond)
 		}
diff --git a/WebHandle/HandleFunc.go b/WebHandle/HandleFunc.go
@@ -66,8 +66,8 @@ func closeSerialPortWebHandler(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
-func currentVariablesWebHandler(w http.ResponseWriter, _ *http.Request) {
-	b, _ := json.Marshal(datapack.CurrentVariables)
+func variableReadListWebHandler(w http.ResponseWriter, _ *http.Request) {
+	b, _ := json.Marshal(datapack.VariableRead)
 	io.WriteString(w, string(b))
 }
 
@@ -84,12 +84,12 @@ func variableTypesWebHandler(w http.ResponseWriter, _ *http.Request) {
 	io.WriteString(w, string(b))
 }
 
-func variableAddWebHandler(w http.ResponseWriter, r *http.Request) {
+func variableReadAddWebHandler(w http.ResponseWriter, r *http.Request) {
 	defer r.Body.Close()
 	var newVariable datapack.VariableT
 	postData, _ := ioutil.ReadAll(r.Body)
 	if json.Unmarshal(postData, &newVariable) == nil {
-		for _, v := range datapack.CurrentVariables.Variables {
+		for _, v := range datapack.VariableRead.Variables {
 			if v.Addr == newVariable.Addr {
 				io.WriteString(w, "{\"status\":23}")
 				return
@@ -98,25 +98,25 @@ func variableAddWebHandler(w http.ResponseWriter, r *http.Request) {
 		if serialhandle.SerialSendCmd(datapack.ACT_SUBSCRIBE, newVariable) != nil {
 			io.WriteString(w, "{\"status\":22}")
 		} else {
-			datapack.CurrentVariables.Variables = append(datapack.CurrentVariables.Variables, newVariable)
+			datapack.VariableRead.Variables = append(datapack.VariableRead.Variables, newVariable)
 			io.WriteString(w, "{\"status\":0}")
 		}
 	} else {
 		io.WriteString(w, "{\"status\":21}")
 	}
 }
 
-func variableDelWebHandler(w http.ResponseWriter, r *http.Request) {
+func variableReadDelWebHandler(w http.ResponseWriter, r *http.Request) {
 	defer r.Body.Close()
 	var oldVariable datapack.VariableT
 	postData, _ := ioutil.ReadAll(r.Body)
 	if json.Unmarshal(postData, &oldVariable) == nil {
-		for i, v := range datapack.CurrentVariables.Variables {
+		for i, v := range datapack.VariableRead.Variables {
 			if v.Addr == oldVariable.Addr {
 				if serialhandle.SerialSendCmd(datapack.ACT_UNSUBSCRIBE, oldVariable) != nil {
 					io.WriteString(w, "{\"status\":22}")
 				} else {
-					datapack.CurrentVariables.Variables = append(datapack.CurrentVariables.Variables[:i], datapack.CurrentVariables.Variables[i+1:]...)
+					datapack.VariableRead.Variables = append(datapack.VariableRead.Variables[:i], datapack.VariableRead.Variables[i+1:]...)
 					io.WriteString(w, "{\"status\":0}")
 				}
 				return
@@ -128,7 +128,7 @@ func variableDelWebHandler(w http.ResponseWriter, r *http.Request) {
 	io.WriteString(w, "{\"status\":21}")
 }
 
-func variableModWebHandler(w http.ResponseWriter, r *http.Request) {
+func variableModiModWebHandler(w http.ResponseWriter, r *http.Request) {
 	defer r.Body.Close()
 	var modVariable datapack.VariableT
 	postData, _ := ioutil.ReadAll(r.Body)
@@ -143,32 +143,32 @@ func variableModWebHandler(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
-func variableModAddWebHandler(w http.ResponseWriter, r *http.Request) {
+func variableModiAddWebHandler(w http.ResponseWriter, r *http.Request) {
 	defer r.Body.Close()
 	var newVariable datapack.VariableT
 	postData, _ := ioutil.ReadAll(r.Body)
 	if json.Unmarshal(postData, &newVariable) == nil {
-		for _, v := range datapack.ModVariables.Variables {
+		for _, v := range datapack.VariableModi.Variables {
 			if v.Addr == newVariable.Addr {
 				io.WriteString(w, "{\"status\":23}")
 				return
 			}
 		}
-		datapack.ModVariables.Variables = append(datapack.ModVariables.Variables, newVariable)
+		datapack.VariableModi.Variables = append(datapack.VariableModi.Variables, newVariable)
 		io.WriteString(w, "{\"status\":0}")
 	} else {
 		io.WriteString(w, "{\"status\":21}")
 	}
 }
 
-func variableModDelWebHandler(w http.ResponseWriter, r *http.Request) {
+func variableModiDelWebHandler(w http.ResponseWriter, r *http.Request) {
 	defer r.Body.Close()
 	var oldVariable datapack.VariableT
 	postData, _ := ioutil.ReadAll(r.Body)
 	if json.Unmarshal(postData, &oldVariable) == nil {
-		for i, v := range datapack.ModVariables.Variables {
+		for i, v := range datapack.VariableModi.Variables {
 			if v.Addr == oldVariable.Addr {
-				datapack.ModVariables.Variables = append(datapack.ModVariables.Variables[:i], datapack.ModVariables.Variables[i+1:]...)
+				datapack.VariableModi.Variables = append(datapack.VariableModi.Variables[:i], datapack.VariableModi.Variables[i+1:]...)
 				io.WriteString(w, "{\"status\":0}")
 				return
 			}
@@ -179,8 +179,8 @@ func variableModDelWebHandler(w http.ResponseWriter, r *http.Request) {
 	io.WriteString(w, "{\"status\":21}")
 }
 
-func variableModListWebHandler(w http.ResponseWriter, _ *http.Request) {
-	b, _ := json.Marshal(datapack.ModVariables)
+func variableModiListWebHandler(w http.ResponseWriter, _ *http.Request) {
+	b, _ := json.Marshal(datapack.VariableModi)
 	io.WriteString(w, string(b))
 }
 
@@ -225,10 +225,10 @@ func fileConfigWebHandler(w http.ResponseWriter, r *http.Request) {
 			filehandle.Config.IsSaveDataAddr, _ = strconv.ParseBool(strings.Join(r.Form["sda"], ""))
 		}
 		if _, ok := r.Form["svm"]; ok {
-			filehandle.Config.IsSaveVariablesToMod, _ = strconv.ParseBool(strings.Join(r.Form["svm"], ""))
+			filehandle.Config.IsSaveVariableModi, _ = strconv.ParseBool(strings.Join(r.Form["svm"], ""))
 		}
 		if _, ok := r.Form["svr"]; ok {
-			filehandle.Config.IsSaveVariablesToRead, _ = strconv.ParseBool(strings.Join(r.Form["svr"], ""))
+			filehandle.Config.IsSaveVariableRead, _ = strconv.ParseBool(strings.Join(r.Form["svr"], ""))
 		}
 		filehandle.SaveConfig()
 		io.WriteString(w, "{\"status\":0}")
@@ -242,21 +242,21 @@ func Reg() {
 	go serialhandle.SerialTransmitThread()
 	go serialhandle.SerialReceiveThread(rxBuff)
 	go serialhandle.SerialPraseThread(rxBuff, jsonWS)
-	WebSocketHandler := makeWebSocketHandler(jsonWS)
+	webSocketHandler := makeWebSocketHandler(jsonWS)
 	http.HandleFunc("/serial", currentSerialPortWebHandler)
 	http.HandleFunc("/serial/list", listSerialPortsWebHandler)
 	http.HandleFunc("/serial/open", openSerialPortWebHandler)
 	http.HandleFunc("/serial/close", closeSerialPortWebHandler)
-	http.HandleFunc("/variable", currentVariablesWebHandler)
 	http.HandleFunc("/variable/types", variableTypesWebHandler)
-	http.HandleFunc("/variable/add", variableAddWebHandler)
-	http.HandleFunc("/variable/del", variableDelWebHandler)
-	http.HandleFunc("/variable/mod", variableModWebHandler)
-	http.HandleFunc("/variable/modadd", variableModAddWebHandler)
-	http.HandleFunc("/variable/moddel", variableModDelWebHandler)
-	http.HandleFunc("/variable/modlist", variableModListWebHandler)
+	http.HandleFunc("/variable-read/list", variableReadListWebHandler)
+	http.HandleFunc("/variable-read/add", variableReadAddWebHandler)
+	http.HandleFunc("/variable-read/del", variableReadDelWebHandler)
+	http.HandleFunc("/variable-modi/list", variableModiListWebHandler)
+	http.HandleFunc("/variable-modi/add", variableModiAddWebHandler)
+	http.HandleFunc("/variable-modi/del", variableModiDelWebHandler)
+	http.HandleFunc("/variable-modi/mod", variableModiModWebHandler)
 	http.HandleFunc("/file/upload", fileUploadWebHandler)
 	http.HandleFunc("/file/variables", fileVariablesWebHandler)
 	http.HandleFunc("/file/config", fileConfigWebHandler)
-	http.HandleFunc("/ws", WebSocketHandler)
+	http.HandleFunc("/ws", webSocketHandler)
 }
diff --git a/WebPage/assets/js/file.js b/WebPage/assets/js/file.js
@@ -72,7 +72,7 @@ var appFileVariables = new Vue({
             }
         },
         variableadd: function(index){
-            axios.post('/variable/add', {
+            axios.post('/variable-read/add', {
                     Board: 1,
                     Name: appFileVariables.lists[index].Name,
                     Type: appFileVariables.lists[index].Type,
@@ -92,7 +92,7 @@ var appFileVariables = new Vue({
                     console.log(error);
                 })
                 .then(function () {
-                    axios.get('/variable')
+                    axios.get('/variable-read/list')
                         .then(function (response) {
                             appVariableList.lists=response.data.Variables
                         })
@@ -102,7 +102,7 @@ var appFileVariables = new Vue({
                 });
         },
         variablemodadd: function(index){
-            axios.post('/variable/modadd', {
+            axios.post('/variable-modi/add', {
                     Board: 1,
                     Name: appFileVariables.lists[index].Name,
                     Type: appFileVariables.lists[index].Type,
@@ -122,7 +122,7 @@ var appFileVariables = new Vue({
                     console.log(error);
                 })
                 .then(function () {
-                    axios.get('/variable/modlist')
+                    axios.get('/variable-modi/list')
                         .then(function (response) {
                             appVariableModList.lists=response.data.Variables
                         })
diff --git a/WebPage/assets/js/switch.js b/WebPage/assets/js/switch.js
@@ -7,8 +7,8 @@ $.fn.bootstrapSwitch.defaults.size = 'mini';
 axios.get('/file/config')
     .then(function (response) {
         $("[name='checkbox-sda']").bootstrapSwitch('state',response.data.IsSaveDataAddr,true)
-        $("[name='checkbox-svm']").bootstrapSwitch('state',response.data.IsSaveVariablesToMod,true)
-        $("[name='checkbox-svr']").bootstrapSwitch('state',response.data.IsSaveVariablesToRead,true)
+        $("[name='checkbox-svm']").bootstrapSwitch('state',response.data.IsSaveVariableModi,true)
+        $("[name='checkbox-svr']").bootstrapSwitch('state',response.data.IsSaveVariableRead,true)
     })
     .catch(function (error) {
         console.log(error);
diff --git a/WebPage/assets/js/variable.js b/WebPage/assets/js/variable.js

Original file line number	Diff line number	Diff line change
`@@ -44,12 +44,12 @@ type VariableT struct {`
`44`	`44`	`Tick uint32`
`45`	`45`	`}`
`46`	`46`
`47`		`-type jsonCurrentVariablesT struct {`
	`47`	`+type jsonVariablesT struct {`
`48`	`48`	`Variables []VariableT`
`49`	`49`	`}`
`50`	`50`
`51`		`-var CurrentVariables jsonCurrentVariablesT`
`52`		`-var ModVariables jsonCurrentVariablesT`
	`51`	`+var VariableRead jsonVariablesT`
	`52`	`+var VariableModi jsonVariablesT`
`53`	`53`
`54`	`54`	`type DataToChartT struct {`
`55`	`55`	`Board uint8`
Original file line number	Diff line number	Diff line change
`@@ -3,18 +3,18 @@ package filehandle`
`3`	`3`	`import "os"`
`4`	`4`
`5`	`5`	`type ConfigT struct {`
`6`		`- IsSaveDataAddr bool`
`7`		`- IsSaveVariablesToMod bool`
`8`		`- IsSaveVariablesToRead bool`
	`6`	`+ IsSaveDataAddr bool`
	`7`	`+ IsSaveVariableModi bool`
	`8`	`+ IsSaveVariableRead bool`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`var Config ConfigT`
`12`	`12`
`13`	`13`	`func LoadConfig() {`
`14`	`14`	`if _, err := os.Stat("Config.json"); os.IsNotExist(err) {`
`15`	`15`	`Config.IsSaveDataAddr = true`
`16`		`- Config.IsSaveVariablesToMod = true`
`17`		`- Config.IsSaveVariablesToRead = true`
	`16`	`+ Config.IsSaveVariableModi = true`
	`17`	`+ Config.IsSaveVariableRead = true`
`18`	`18`	`} else {`
`19`	`19`	`jsonLoad("Config.json", &Config)`
`20`	`20`	`}`
`@@ -27,10 +27,10 @@ func SaveConfig() {`
`27`	`27`	`} else {`
`28`	`28`	`jsonSave("DataAddr.json", ProjectVariables)`
`29`	`29`	`}`
`30`		`- if !Config.IsSaveVariablesToMod {`
	`30`	`+ if !Config.IsSaveVariableModi {`
`31`	`31`	`os.Remove("VariablesToMod.json")`
`32`	`32`	`}`
`33`		`- if !Config.IsSaveVariablesToRead {`
	`33`	`+ if !Config.IsSaveVariableRead {`
`34`	`34`	`os.Remove("VariablesToRead.json")`
`35`	`35`	`}`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,11 +36,11 @@ func jsonSave(filename string, v interface{}) {`
`36`	`36`
`37`	`37`	`func SaveAll() {`
`38`	`38`	`SaveConfig()`
`39`		`- if Config.IsSaveVariablesToMod {`
`40`		`- jsonSave("VariablesToMod.json", datapack.ModVariables)`
	`39`	`+ if Config.IsSaveVariableModi {`
	`40`	`+ jsonSave("VariablesToMod.json", datapack.VariableModi)`
`41`	`41`	`}`
`42`		`- if Config.IsSaveVariablesToRead {`
`43`		`- jsonSave("VariablesToRead.json", datapack.CurrentVariables)`
	`42`	`+ if Config.IsSaveVariableRead {`
	`43`	`+ jsonSave("VariablesToRead.json", datapack.VariableRead)`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`
`@@ -49,10 +49,10 @@ func LoadSaves() {`
`49`	`49`	`if Config.IsSaveDataAddr {`
`50`	`50`	`jsonLoad("DataAddr.json", &ProjectVariables)`
`51`	`51`	`}`
`52`		`- if Config.IsSaveVariablesToMod {`
`53`		`- jsonLoad("VariablesToMod.json", &datapack.ModVariables)`
	`52`	`+ if Config.IsSaveVariableModi {`
	`53`	`+ jsonLoad("VariablesToMod.json", &datapack.VariableModi)`
`54`	`54`	`}`
`55`		`- if Config.IsSaveVariablesToRead {`
`56`		`- jsonLoad("VariablesToRead.json", &datapack.CurrentVariables)`
	`55`	`+ if Config.IsSaveVariableRead {`
	`56`	`+ jsonLoad("VariablesToRead.json", &datapack.VariableRead)`
`57`	`57`	`}`
`58`	`58`	`}`