- use auto router for callback msg.

- first normal demo api FinishedPickup added.

globals/beegodb/beegodb.go

@@ -3,8 +3,6 @@ package beegodb
 import (
 	"git.rosy.net.cn/jx-callback/business/legacymodel"
 	"git.rosy.net.cn/jx-callback/business/model"
-	"git.rosy.net.cn/jx-callback/globals"
-	"git.rosy.net.cn/jx-callback/legacy/models"
 	"github.com/astaxie/beego"
 	"github.com/astaxie/beego/orm"
 )
@@ -12,25 +10,20 @@ import (
 func Init() {
 	// set default database
 	orm.RegisterDataBase("default", "mysql", beego.AppConfig.String("dbConnectStr"), 30)
-	if globals.CallLegacyMsgHandler {
-		models.RegisterModels()
-	}
 	orm.RegisterModel(new(legacymodel.Config))
 	orm.RegisterModel(new(legacymodel.BlackClient))
-	if globals.CallNewMsgHandler {
-		orm.RegisterModel(new(model.GoodsOrder))
-		orm.RegisterModel(new(model.OrderSku))
-		orm.RegisterModel(new(model.Waybill))
-		orm.RegisterModel(new(model.OrderStatus))
 
-		orm.RegisterModel(new(legacymodel.Jxstorefeature))
+	orm.RegisterModel(new(model.GoodsOrder))
+	orm.RegisterModel(new(model.OrderSku))
+	orm.RegisterModel(new(model.Waybill))
+	orm.RegisterModel(new(model.OrderStatus))
+
+	orm.RegisterModel(new(legacymodel.Jxstorefeature))
+
+	orm.RegisterModel(new(legacymodel.TempLog))
+	orm.RegisterModel(new(legacymodel.Jxorder2))
+	orm.RegisterModel(new(legacymodel.Jxordersku2))
 
-		orm.RegisterModel(new(legacymodel.TempLog))
-		orm.RegisterModel(new(legacymodel.Jxorder2))
-		orm.RegisterModel(new(legacymodel.Jxordersku2))
-		// orm.RegisterModel(new(legacymodel.Elemeorder2))
-		// orm.RegisterModel(new(legacymodel.Jdorder2))
-	}
 	// create table
 	orm.RunSyncdb("default", false, true)
 }

globals/globals.go

@@ -13,8 +13,6 @@ const (
 )
 
 var (
-	CallLegacyMsgHandler  bool
-	CallNewMsgHandler     bool
 	GenerateLegacyJxOrder bool
 	ReallyCallPlatformAPI bool
 
@@ -40,20 +38,11 @@ func init() {
 }
 
 func Init() {
-	CallLegacyMsgHandler = beego.AppConfig.DefaultBool("callLegacyMsgHandler", true)
-	CallNewMsgHandler = beego.AppConfig.DefaultBool("callNewMsgHandler", false)
+	ReallyCallPlatformAPI = true
 	GenerateLegacyJxOrder = beego.AppConfig.DefaultBool("generateLegacyJxOrder", false)
-	ReallyCallPlatformAPI = !CallLegacyMsgHandler
 
-	if ReallyCallPlatformAPI {
-		JxorderTableName = "jxorder"
-		JxorderskuTableName = "jxordersku"
-		ElemeorderTableName = "elemeorder"
-		JdorderTableName = "jdorder"
-	} else {
-		JxorderTableName = "jxorder2"
-		JxorderskuTableName = "jxordersku2"
-		ElemeorderTableName = "elemeorder2"
-		JdorderTableName = "jdorder2"
-	}
+	JxorderTableName = "jxorder"
+	JxorderskuTableName = "jxordersku"
+	ElemeorderTableName = "elemeorder"
+	JdorderTableName = "jdorder"
 }