框架优化

application.go

@@ -20,8 +20,7 @@ import (
 )
 
 type Application struct {
-	*code.MakeCode
-	MakeCodeRouter Router
+	MakeCodeRouter map[string]*code.MakeCode
 	MethodRouter
 	Router
 	ContextBase
@@ -533,32 +532,41 @@ func Init(config string) Application {
 
 	SetDB(&appIns)
 	appIns.SetCache()
-	appIns.MakeCode = &code.MakeCode{}
 	codeConfig := appIns.Config.GetMap("codeConfig")
-	appIns.MakeCodeRouter = Router{}
+
 	if codeConfig != nil {
 
 		for k, _ := range codeConfig {
-			if appIns.Config.GetInt("mode") == 2 {
-				appIns.MakeCode.Db2JSON(k, codeConfig.GetString(k), &appIns.Db, true)
-				appIns.MakeCodeRouter[k] = Proj{}
-			} else if appIns.Config.GetInt("mode") == 3 {
-				appIns.MakeCode.Db2JSON(k, codeConfig.GetString(k), &appIns.Db, false)
-				appIns.MakeCodeRouter[k] = Proj{}
+			codeMake := codeConfig.GetMap(k)
+			if codeMake == nil {
+				continue
+			}
+			codeMake["table"] = k
+			if appIns.MakeCodeRouter == nil {
+				appIns.MakeCodeRouter = map[string]*code.MakeCode{}
+			}
+			if appIns.Config.GetInt("mode") > 0 {
+				appIns.MakeCodeRouter[codeMake.GetString("name")] = &code.MakeCode{}
+				appIns.MakeCodeRouter[codeMake.GetString("name")].Db2JSON(&appIns.Db, codeMake)
 			} else {
-				appIns.MakeCode.Db2JSON(k, codeConfig.GetString(k), nil, false)
-				appIns.MakeCodeRouter[k] = Proj{}
+				appIns.MakeCodeRouter[codeMake.GetString("name")] = &code.MakeCode{}
+				appIns.MakeCodeRouter[codeMake.GetString("name")].Db2JSON(nil, codeMake)
 			}
 			//接入动态代码层
 			if appIns.Router == nil {
 				appIns.Router = Router{}
 			}
-			appIns.Router[k] = TptProject
-			for k1, _ := range appIns.MakeCode.TableColumns {
-				appIns.Router[k][k1] = appIns.Router[k]["hotimeCommon"]
+
+			if codeMake.GetString("name") == "" {
+				codeMake["name"] = k
 			}
 
-			setMakeCodeLintener(k, &appIns)
+			appIns.Router[codeMake.GetString("name")] = TptProject
+			for k1, _ := range appIns.MakeCodeRouter[codeMake.GetString("name")].TableColumns {
+				appIns.Router[codeMake.GetString("name")][k1] = appIns.Router[codeMake.GetString("name")]["hotimeCommon"]
+			}
+
+			setMakeCodeLintener(codeMake.GetString("name"), &appIns)
 
 		}