!41 fix-middle-tools

Merge pull request !41 from bandl/fix-middle-tools

makefile

@@ -13,6 +13,7 @@ build:
 
 .PHONY: install
 install:
+	@make gen-middleware
 	@make build
 
 .PHONY: dev
@@ -27,5 +28,6 @@ gen-struct:
 gen-protobuf:
 	@python3 ./shell/gen_protobuf.py
 
+.PHONY: gen-middleware
 gen-middleware:
 	@python3 ./shell/gen_middleware.py

middleware/config/middle.gen.go

@@ -5,17 +5,16 @@ package config
 
 import (
 	"gitee.com/timedb/wheatCache/middleware"
-    
-    logMiddle "gitee.com/timedb/wheatCache/middleware/log-middle"
-    mapKey "gitee.com/timedb/wheatCache/middleware/map-key"
+
+	logMiddle "gitee.com/timedb/wheatCache/middleware/log-middle"
+	mapKey "gitee.com/timedb/wheatCache/middleware/map-key"
 )
 
+func GetMiddlewareMap() map[string]middleware.MiddleToolsInterface {
 
-func GetMiddlewareMap() map[string]middleware.MiddlewareInterface {
+	return map[string]middleware.MiddleToolsInterface{
 
-    return map[string]middleware.MiddlewareInterface{
-		
-        "logMiddle":logMiddle.NewMiddleware(),
-        "mapKey":mapKey.NewMiddleware(),
+		"logMiddle": logMiddle.NewMiddleware(),
+		"mapKey":    mapKey.NewMiddleware(),
 	}
-}
+}

middleware/config/middle.template

@@ -11,9 +11,9 @@ import (
 )
 
 
-func GetMiddlewareMap() map[string]middleware.MiddlewareInterface {
+func GetMiddlewareMap() map[string]middleware.MiddleToolsInterface {
 
-    return map[string]middleware.MiddlewareInterface{
+    return map[string]middleware.MiddleToolsInterface{
 		{%for dir in dirs %}
         "{{dir[0]}}":{{dir[0]}}.NewMiddleware(),
         {%- endfor%}

middleware/define.go

@@ -1,6 +1,6 @@
 package middleware
 
-type MiddlewareInterface interface {
+type MiddleToolsInterface interface {
 	Init()
-	Exat(interface{}) (interface{}, error)
+	Exec(interface{}) (interface{}, error)
 }

middleware/log-middle/middleware.go

@@ -12,11 +12,11 @@ type A struct {
 func (i *A) Init() {
 }
 
-func (i *A) Exat(interface{}) (interface{}, error) {
+func (i *A) Exec(interface{}) (interface{}, error) {
 	fmt.Println(1)
 	return nil, nil
 }
 
-func NewMiddleware() middleware.MiddlewareInterface {
+func NewMiddleware() middleware.MiddleToolsInterface {
 	return &A{}
 }

middleware/map-key/middleware.go

@@ -12,11 +12,11 @@ type ABB struct {
 func (i *ABB) Init() {
 }
 
-func (i *ABB) Exat(interface{}) (interface{}, error) {
+func (i *ABB) Exec(interface{}) (interface{}, error) {
 	fmt.Println(1)
 	return nil, nil
 }
 
-func NewMiddleware() middleware.MiddlewareInterface {
+func NewMiddleware() middleware.MiddleToolsInterface {
 	return &ABB{}
 }