Merge branch 'v2' of https://git.qianqiusoft.com/qianqiusoft/light-apiengine into v2

engine/apiengine.go

@@ -114,7 +114,7 @@ func (g *ApiEngine)LoadBusinessOrm()  {
 		g.AddBusinessDb(v.Id, v.Domain, v.Domain, v.DataSource, (v.SyncFlag == 0))
 	}
 	//将platformOrm添加到businessOrm中，这样平台账号登录上去也相当于使用相同的数据库配置
-	g.BusinessOrmEngine["qianqiusoft.com"] = g.PlatformOrmEngine
+	g.BusinessOrmEngine["qianqiuiot.com"] = g.PlatformOrmEngine
 }
 
 

engine/system_init.go

@@ -47,7 +47,7 @@ func initPlatformDbData(db *xorm.Engine) {
 	orgs := []models.SysOrg{
 		{
 			Id:             "287c50a4-caad-4557-80c8-aca81af9f370",
-			Name:           "千秋软件",
+			Name:           "安全智管家平台",
 			CreateTime:     time.Now(),
 			LastUpdateTime: time.Now().UnixNano(),
 		},
@@ -57,7 +57,7 @@ func initPlatformDbData(db *xorm.Engine) {
 			Id:             "187c50a4-caad-4557-80c8-aca81af9f370",
 			Name:           "管理员",
 			LoginId:        "admin",
-			Domain:         "qianqiusoft.com",
+			Domain:         "qianqiuiot.com",
 			OrgId:          "287c50a4-caad-4557-80c8-aca81af9f370",
 			Password:       utils.HashPassword("123456", ""),
 			CreateTime:     time.Now(),
@@ -90,6 +90,37 @@ func initPlatformDbData(db *xorm.Engine) {
 			Name:           "系统管理",
 			CreateTime:     models.NowLocal(),
 			LastUpdateTime: time.Now().UnixNano(),
+			OrderNum: 10000,
+		},
+		{
+			Id:             "64994cad-559f-445e-b1be-3009c9a4e850",
+			Name:           "域管理",
+			Parent:         "387c50a4-caad-4557-80c8-aca81af9f370",
+			Url:            "/sys/domain",
+			Component:      "system/domain",
+			CreateTime:     models.NowLocal(),
+			LastUpdateTime: time.Now().UnixNano(),
+			OrderNum: 1001,
+		},
+		{
+			Id:             "387c50a4-caad-4557-80c8-aca81af9f374",
+			Name:           "后台菜单",
+			Parent:         "387c50a4-caad-4557-80c8-aca81af9f370",
+			Url:            "/sys/menu",
+			Component:      "system/menu",
+			CreateTime:     models.NowLocal(),
+			LastUpdateTime: time.Now().UnixNano(),
+			OrderNum: 1002,
+		},
+		{
+			Id:             "f9928388-7861-4551-9273-e74858962ff8",
+			Name:           "APP菜单",
+			Parent:         "387c50a4-caad-4557-80c8-aca81af9f370",
+			Url:            "/sys/app_menu",
+			Component:      "system/app_menu",
+			CreateTime:     models.NowLocal(),
+			LastUpdateTime: time.Now().UnixNano(),
+			OrderNum: 1003,
 		},
 		{
 			Id:             "387c50a4-caad-4557-80c8-aca81af9f371",
@@ -99,6 +130,7 @@ func initPlatformDbData(db *xorm.Engine) {
 			Component:      "system/user",
 			CreateTime:     models.NowLocal(),
 			LastUpdateTime: time.Now().UnixNano(),
+			OrderNum: 1004,
 		},
 		{
 			Id:             "387c50a4-caad-4557-80c8-aca81af9f372",
@@ -108,6 +140,7 @@ func initPlatformDbData(db *xorm.Engine) {
 			Component:      "system/org",
 			CreateTime:     models.NowLocal(),
 			LastUpdateTime: time.Now().UnixNano(),
+			OrderNum: 1005,
 		},
 		{
 			Id:             "387c50a4-caad-4557-80c8-aca81af9f373",
@@ -117,15 +150,7 @@ func initPlatformDbData(db *xorm.Engine) {
 			Component:      "system/role",
 			CreateTime:     models.NowLocal(),
 			LastUpdateTime: time.Now().UnixNano(),
-		},
-		{
-			Id:             "387c50a4-caad-4557-80c8-aca81af9f374",
-			Name:           "菜单管理",
-			Parent:         "387c50a4-caad-4557-80c8-aca81af9f370",
-			Url:            "/sys/menu",
-			Component:      "system/menu",
-			CreateTime:     models.NowLocal(),
-			LastUpdateTime: time.Now().UnixNano(),
+			OrderNum: 1006,
 		},
 		{
 			Id:             "387c50a4-caad-4557-80c8-aca81af9f375",
@@ -135,6 +160,7 @@ func initPlatformDbData(db *xorm.Engine) {
 			Component:      "system/dic",
 			CreateTime:     models.NowLocal(),
 			LastUpdateTime: time.Now().UnixNano(),
+			OrderNum: 1007,
 		},
 		{
 			Id:             "387c50a4-caad-4557-80c8-aca81af9f376",
@@ -144,6 +170,7 @@ func initPlatformDbData(db *xorm.Engine) {
 			Component:      "system/log",
 			CreateTime:     models.NowLocal(),
 			LastUpdateTime: time.Now().UnixNano(),
+			OrderNum: 1008,
 		},
 	}