csx 4 years ago
parent
commit
5546bb4635
2 changed files with 11 additions and 8 deletions
  1. 3 0
      conf/app.conf
  2. 8 8
      controllers/base_api_controller.go

+ 3 - 0
conf/app.conf View File

147
 call_domain = http://hf.szjkhd.com
147
 call_domain = http://hf.szjkhd.com
148
 front_end_domain = "http://xt.test.sgjyun.com/#"
148
 front_end_domain = "http://xt.test.sgjyun.com/#"
149
 
149
 
150
+org_id = 9919
151
+
152
+
150
 readmysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
153
 readmysqlhost = rm-wz9rg531npf61q03tro.mysql.rds.aliyuncs.com
151
 readmysqlport = 3306
154
 readmysqlport = 3306
152
 readmysqluser = root
155
 readmysqluser = root

+ 8 - 8
controllers/base_api_controller.go View File

3
 import (
3
 import (
4
 	"gdyb/enums"
4
 	"gdyb/enums"
5
 	"gdyb/models"
5
 	"gdyb/models"
6
+	"github.com/astaxie/beego"
6
 
7
 
7
 	//"XT_New/models"
8
 	//"XT_New/models"
8
 
9
 
9
 	//"XT_New/models"
10
 	//"XT_New/models"
10
 	"gdyb/service"
11
 	"gdyb/service"
11
-
12
 )
12
 )
13
 
13
 
14
 type BaseAPIController struct {
14
 type BaseAPIController struct {
67
 func (this *BaseAuthAPIController) Prepare() {
67
 func (this *BaseAuthAPIController) Prepare() {
68
 	this.BaseAPIController.Prepare()
68
 	this.BaseAPIController.Prepare()
69
 	if this.GetAdminUserInfo() == nil {
69
 	if this.GetAdminUserInfo() == nil {
70
+		org_id, _ := beego.AppConfig.Int64("org_id")
70
 		var userAdmin models.AdminUser
71
 		var userAdmin models.AdminUser
71
 		userAdmin.Id = 1448
72
 		userAdmin.Id = 1448
72
 		userAdmin.Mobile = "13318599895"
73
 		userAdmin.Mobile = "13318599895"
79
 		userAdmin.ModifyTime = 1530786071
80
 		userAdmin.ModifyTime = 1530786071
80
 		var subscibe models.ServeSubscibe
81
 		var subscibe models.ServeSubscibe
81
 		subscibe.ID = 1
82
 		subscibe.ID = 1
82
-		subscibe.OrgId = 4
83
+		subscibe.OrgId = org_id
83
 		subscibe.PeriodStart = 1538035409
84
 		subscibe.PeriodStart = 1538035409
84
 		subscibe.PeriodEnd = 1569571409
85
 		subscibe.PeriodEnd = 1569571409
85
 		subscibe.State = 1
86
 		subscibe.State = 1
89
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
90
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
90
 		subscibes[4] = &subscibe
91
 		subscibes[4] = &subscibe
91
 		var adminUserInfo service.AdminUserInfo
92
 		var adminUserInfo service.AdminUserInfo
92
-		adminUserInfo.CurrentOrgId = 4
93
+		adminUserInfo.CurrentOrgId = org_id
93
 		adminUserInfo.CurrentAppId = 8642
94
 		adminUserInfo.CurrentAppId = 8642
94
 		adminUserInfo.AdminUser = &userAdmin
95
 		adminUserInfo.AdminUser = &userAdmin
95
 
96
 
100
 
101
 
101
 	}
102
 	}
102
 
103
 
103
-
104
-
105
 	//if this.Ctx.Request.Method != "GET" {
104
 	//if this.Ctx.Request.Method != "GET" {
106
 	//	adminUserInfo := this.GetAdminUserInfo()
105
 	//	adminUserInfo := this.GetAdminUserInfo()
107
 	//
106
 	//
185
 func (this *BaseServeAPIController) Prepare() {
184
 func (this *BaseServeAPIController) Prepare() {
186
 	this.BaseAPIController.Prepare()
185
 	this.BaseAPIController.Prepare()
187
 	if this.GetAdminUserInfo() == nil {
186
 	if this.GetAdminUserInfo() == nil {
187
+		org_id, _ := beego.AppConfig.Int64("org_id")
188
+
188
 		var userAdmin models.AdminUser
189
 		var userAdmin models.AdminUser
189
 		userAdmin.Id = 1448
190
 		userAdmin.Id = 1448
190
 		userAdmin.Mobile = "13318599895"
191
 		userAdmin.Mobile = "13318599895"
197
 		userAdmin.ModifyTime = 1530786071
198
 		userAdmin.ModifyTime = 1530786071
198
 		var subscibe models.ServeSubscibe
199
 		var subscibe models.ServeSubscibe
199
 		subscibe.ID = 1
200
 		subscibe.ID = 1
200
-		subscibe.OrgId = 4
201
+		subscibe.OrgId = org_id
201
 		subscibe.PeriodStart = 1538035409
202
 		subscibe.PeriodStart = 1538035409
202
 		subscibe.PeriodEnd = 1569571409
203
 		subscibe.PeriodEnd = 1569571409
203
 		subscibe.State = 1
204
 		subscibe.State = 1
207
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
208
 		subscibes := make(map[int64]*models.ServeSubscibe, 0)
208
 		subscibes[4] = &subscibe
209
 		subscibes[4] = &subscibe
209
 		var adminUserInfo service.AdminUserInfo
210
 		var adminUserInfo service.AdminUserInfo
210
-		adminUserInfo.CurrentOrgId = 4
211
-		adminUserInfo.CurrentAppId = 8642
211
+		adminUserInfo.CurrentOrgId = org_id
212
 		adminUserInfo.AdminUser = &userAdmin
212
 		adminUserInfo.AdminUser = &userAdmin
213
 		this.SetSession("admin_user_info", &adminUserInfo)
213
 		this.SetSession("admin_user_info", &adminUserInfo)
214
 		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
214
 		//this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)