|
@@ -2,10 +2,15 @@ package controllers
|
2
|
2
|
|
3
|
3
|
import (
|
4
|
4
|
"XT_New/enums"
|
|
5
|
+ "XT_New/models"
|
5
|
6
|
"XT_New/service"
|
6
|
|
- "fmt"
|
|
7
|
+ "encoding/json"
|
|
8
|
+ "os"
|
|
9
|
+ "path"
|
|
10
|
+ "runtime"
|
7
|
11
|
"strconv"
|
8
|
12
|
"strings"
|
|
13
|
+ "time"
|
9
|
14
|
)
|
10
|
15
|
|
11
|
16
|
type BaseAPIController struct {
|
|
@@ -69,56 +74,72 @@ type BaseAuthAPIController struct {
|
69
|
74
|
func (this *BaseAuthAPIController) Prepare() {
|
70
|
75
|
this.BaseAPIController.Prepare()
|
71
|
76
|
if this.GetAdminUserInfo() == nil {
|
72
|
|
- //var userAdmin models.AdminUser
|
73
|
|
- //userAdmin.Id = 1448
|
74
|
|
- //userAdmin.Mobile = "13318599895"
|
75
|
|
- //
|
76
|
|
- //userAdmin.Id = 597
|
77
|
|
- //userAdmin.Mobile = "19874122664"
|
78
|
|
- //userAdmin.IsSuperAdmin = false
|
79
|
|
- //userAdmin.Status = 1
|
80
|
|
- //userAdmin.CreateTime = 1530786071
|
81
|
|
- //userAdmin.ModifyTime = 1530786071
|
82
|
|
- //var subscibe models.ServeSubscibe
|
83
|
|
- //subscibe.ID = 1
|
84
|
|
- //subscibe.OrgId = 3877
|
85
|
|
- //subscibe.PeriodStart = 1538035409
|
86
|
|
- //subscibe.PeriodEnd = 1569571409
|
87
|
|
- //subscibe.State = 1
|
88
|
|
- //subscibe.Status = 1
|
89
|
|
- //subscibe.CreatedTime = 1538035409
|
90
|
|
- //subscibe.UpdatedTime = 1538035409
|
91
|
|
- //subscibes := make(map[int64]*models.ServeSubscibe, 0)
|
92
|
|
- //subscibes[4] = &subscibe
|
93
|
|
- //var adminUserInfo service.AdminUserInfo
|
94
|
|
- //adminUserInfo.CurrentOrgId = 3877
|
95
|
|
- //adminUserInfo.CurrentAppId = 4
|
96
|
|
- //adminUserInfo.AdminUser = &userAdmin
|
97
|
|
- //adminUserInfo.Subscibes = subscibes
|
98
|
|
- //this.SetSession("admin_user_info", &adminUserInfo)
|
99
|
|
-
|
100
|
|
- this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
|
101
|
|
- this.StopRun()
|
|
77
|
+ var userAdmin models.AdminUser
|
|
78
|
+ userAdmin.Id = 1448
|
|
79
|
+ userAdmin.Mobile = "13318599895"
|
|
80
|
+
|
|
81
|
+ userAdmin.Id = 597
|
|
82
|
+ userAdmin.Mobile = "19874122664"
|
|
83
|
+ userAdmin.IsSuperAdmin = false
|
|
84
|
+ userAdmin.Status = 1
|
|
85
|
+ userAdmin.CreateTime = 1530786071
|
|
86
|
+ userAdmin.ModifyTime = 1530786071
|
|
87
|
+ var subscibe models.ServeSubscibe
|
|
88
|
+ subscibe.ID = 1
|
|
89
|
+ subscibe.OrgId = 10215
|
|
90
|
+ subscibe.PeriodStart = 1538035409
|
|
91
|
+ subscibe.PeriodEnd = 1569571409
|
|
92
|
+ subscibe.State = 1
|
|
93
|
+ subscibe.Status = 1
|
|
94
|
+ subscibe.CreatedTime = 1538035409
|
|
95
|
+ subscibe.UpdatedTime = 1538035409
|
|
96
|
+ subscibes := make(map[int64]*models.ServeSubscibe, 0)
|
|
97
|
+ subscibes[4] = &subscibe
|
|
98
|
+ var adminUserInfo service.AdminUserInfo
|
|
99
|
+ adminUserInfo.CurrentOrgId = 10215
|
|
100
|
+ adminUserInfo.CurrentAppId = 4
|
|
101
|
+ adminUserInfo.AdminUser = &userAdmin
|
|
102
|
+ adminUserInfo.Subscibes = subscibes
|
|
103
|
+ this.SetSession("admin_user_info", &adminUserInfo)
|
|
104
|
+
|
|
105
|
+ //this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
|
|
106
|
+ //this.StopRun()
|
102
|
107
|
|
103
|
108
|
}
|
104
|
109
|
|
105
|
110
|
adminUserInfo := this.GetAdminUserInfo()
|
106
|
111
|
|
107
|
112
|
if this.Ctx.Request.Header.Get("Permission") == "2" {
|
|
113
|
+ err_msgs := LoadErrMsgConfig("./err_msg.json").Msgs
|
|
114
|
+
|
108
|
115
|
org, _ := service.GetOrgById(adminUserInfo.CurrentOrgId)
|
109
|
116
|
if adminUserInfo.AdminUser.Id != org.Creator { //超级管理员不受此限制
|
110
|
117
|
|
111
|
118
|
isPermission := false
|
112
|
119
|
adminUserInfo := this.GetAdminUserInfo()
|
113
|
|
- //该机构下该用户有多少个
|
114
|
|
- role, _ := service.GetUserAllRole(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id)
|
115
|
|
- var roles []string
|
116
|
|
- if len(role.RoleIds) <= 0 { //该用户没有设置角色
|
117
|
120
|
|
|
121
|
+ redisClient := service.RedisClient()
|
|
122
|
+ defer redisClient.Close()
|
|
123
|
+ key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 64) + "_" + strconv.FormatInt(adminUserInfo.AdminUser.Id, 64) + "_role_ids"
|
|
124
|
+ result, _ := redisClient.Get(key).Result()
|
|
125
|
+ var role models.App_Role
|
|
126
|
+ var roles []string
|
|
127
|
+ if len(result) == 0 {
|
|
128
|
+ //该机构下该用户有多少个
|
|
129
|
+ role, _ = service.GetUserAllRole(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id)
|
|
130
|
+ redisClient.Set(key, role, time.Second*60*60*18)
|
|
131
|
+ if len(role.RoleIds) > 0 { //该用户没有设置角色
|
|
132
|
+ roles = strings.Split(role.RoleIds, ",")
|
|
133
|
+ }
|
118
|
134
|
} else {
|
119
|
|
- roles = strings.Split(role.RoleIds, ",")
|
|
135
|
+ json.Unmarshal([]byte(result), &role)
|
|
136
|
+ if len(role.RoleIds) > 0 { //该用户没有设置角色
|
|
137
|
+ roles = strings.Split(role.RoleIds, ",")
|
|
138
|
+ }
|
120
|
139
|
}
|
121
|
|
- fmt.Println(roles)
|
|
140
|
+
|
|
141
|
+ //key := strconv.FormatInt(role_id, 64) + "_" + strconv.FormatInt(adminUserInfo.AdminUser.Id, 64) + "_role_ids"
|
|
142
|
+ //result, _ := redisClient.Get(key).Result()
|
122
|
143
|
|
123
|
144
|
//获取该用户下所有角色的权限总集
|
124
|
145
|
var userRolePurviews string
|
|
@@ -134,7 +155,7 @@ func (this *BaseAuthAPIController) Prepare() {
|
134
|
155
|
}
|
135
|
156
|
//该用户所拥有角色的权限的总集
|
136
|
157
|
userRolePurviewsArr = RemoveRepeatedPurviewElement2(strings.Split(userRolePurviews, ","))
|
137
|
|
- fmt.Println("userRolePurviewsArr", userRolePurviewsArr)
|
|
158
|
+
|
138
|
159
|
//系统所记录的权限列表
|
139
|
160
|
allPermission, _ := service.GetAllFunctionPurview()
|
140
|
161
|
|
|
@@ -155,7 +176,13 @@ func (this *BaseAuthAPIController) Prepare() {
|
155
|
176
|
}
|
156
|
177
|
}
|
157
|
178
|
if !isPermission {
|
158
|
|
- msg, _ := service.FindErrorMsgByStr(strings.Split(this.Ctx.Request.RequestURI, "?")[0] + "?" + "mode=" + this.GetString("mode"))
|
|
179
|
+ var msg string
|
|
180
|
+ for _, item := range err_msgs {
|
|
181
|
+ if strings.Index(item.Url, strings.Split(this.Ctx.Request.RequestURI, "?")[0]+"?"+"mode="+this.GetString("mode")) != -1 {
|
|
182
|
+ msg = item.ErrMsg
|
|
183
|
+ }
|
|
184
|
+ }
|
|
185
|
+ //msg, _ := service.FindErrorMsgByStr(strings.Split(this.Ctx.Request.RequestURI, "?")[0] + "?" + "mode=" + this.GetString("mode"))
|
159
|
186
|
json := make(map[string]interface{})
|
160
|
187
|
json["msg"] = msg
|
161
|
188
|
json["code"] = 0
|
|
@@ -171,20 +198,33 @@ func (this *BaseAuthAPIController) Prepare() {
|
171
|
198
|
}
|
172
|
199
|
|
173
|
200
|
if this.Ctx.Request.Header.Get("Permission") == "3" {
|
|
201
|
+ err_msgs := LoadErrMsgConfig("./err_msg.json").Msgs
|
|
202
|
+
|
174
|
203
|
org, _ := service.GetOrgById(adminUserInfo.CurrentOrgId)
|
175
|
204
|
if adminUserInfo.AdminUser.Id != org.Creator { //超级管理员不受此限制
|
176
|
205
|
|
177
|
206
|
isPermission := false
|
178
|
207
|
adminUserInfo := this.GetAdminUserInfo()
|
179
|
208
|
//该机构下该用户有多少个
|
180
|
|
- role, _ := service.GetUserAllRole(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id)
|
|
209
|
+ redisClient := service.RedisClient()
|
|
210
|
+ defer redisClient.Close()
|
|
211
|
+ key := strconv.FormatInt(adminUserInfo.CurrentOrgId, 64) + "_" + strconv.FormatInt(adminUserInfo.AdminUser.Id, 64) + "_role_ids"
|
|
212
|
+ result, _ := redisClient.Get(key).Result()
|
|
213
|
+ var role models.App_Role
|
181
|
214
|
var roles []string
|
182
|
|
- if len(role.RoleIds) <= 0 { //该用户没有设置角色
|
183
|
|
-
|
|
215
|
+ if len(result) == 0 {
|
|
216
|
+ //该机构下该用户有多少个
|
|
217
|
+ role, _ = service.GetUserAllRole(adminUserInfo.CurrentOrgId, adminUserInfo.AdminUser.Id)
|
|
218
|
+ redisClient.Set(key, role, time.Second*60*60*18)
|
|
219
|
+ if len(role.RoleIds) > 0 { //该用户没有设置角色
|
|
220
|
+ roles = strings.Split(role.RoleIds, ",")
|
|
221
|
+ }
|
184
|
222
|
} else {
|
185
|
|
- roles = strings.Split(role.RoleIds, ",")
|
|
223
|
+ json.Unmarshal([]byte(result), &role)
|
|
224
|
+ if len(role.RoleIds) > 0 { //该用户没有设置角色
|
|
225
|
+ roles = strings.Split(role.RoleIds, ",")
|
|
226
|
+ }
|
186
|
227
|
}
|
187
|
|
- fmt.Println(roles)
|
188
|
228
|
|
189
|
229
|
//获取该用户下所有角色的权限总集
|
190
|
230
|
var userRolePurviews string
|
|
@@ -200,7 +240,6 @@ func (this *BaseAuthAPIController) Prepare() {
|
200
|
240
|
}
|
201
|
241
|
//该用户所拥有角色的权限的总集
|
202
|
242
|
userRolePurviewsArr = RemoveRepeatedPurviewElement2(strings.Split(userRolePurviews, ","))
|
203
|
|
- fmt.Println(userRolePurviewsArr)
|
204
|
243
|
//系统所记录的权限列表
|
205
|
244
|
allPermission, _ := service.GetAllFunctionPurview()
|
206
|
245
|
|
|
@@ -219,7 +258,13 @@ func (this *BaseAuthAPIController) Prepare() {
|
219
|
258
|
}
|
220
|
259
|
}
|
221
|
260
|
if !isPermission {
|
222
|
|
- msg, _ := service.FindErrorMsgByStr(strings.Split(this.Ctx.Request.RequestURI, "?")[0] + "?" + "mode=" + this.GetString("mode"))
|
|
261
|
+ var msg string
|
|
262
|
+ for _, item := range err_msgs {
|
|
263
|
+ if strings.Index(item.Url, strings.Split(this.Ctx.Request.RequestURI, "?")[0]+"?"+"mode="+this.GetString("mode")) != -1 {
|
|
264
|
+ msg = item.ErrMsg
|
|
265
|
+ }
|
|
266
|
+ }
|
|
267
|
+ //msg, _ := service.FindErrorMsgByStr(strings.Split(this.Ctx.Request.RequestURI, "?")[0] + "?" + "mode=" + this.GetString("mode"))
|
223
|
268
|
json := make(map[string]interface{})
|
224
|
269
|
json["msg"] = msg
|
225
|
270
|
json["code"] = 0
|
|
@@ -316,35 +361,35 @@ type BaseServeAPIController struct {
|
316
|
361
|
func (this *BaseServeAPIController) Prepare() {
|
317
|
362
|
this.BaseAPIController.Prepare()
|
318
|
363
|
if this.GetAdminUserInfo() == nil {
|
319
|
|
- //var userAdmin models.AdminUser
|
320
|
|
- //userAdmin.Id = 1448
|
321
|
|
- //userAdmin.Mobile = "13318599895"
|
322
|
|
- //
|
323
|
|
- //userAdmin.Id = 597
|
324
|
|
- //userAdmin.Mobile = "19874122664"
|
325
|
|
- //userAdmin.IsSuperAdmin = false
|
326
|
|
- //userAdmin.Status = 1
|
327
|
|
- //userAdmin.CreateTime = 1530786071
|
328
|
|
- //userAdmin.ModifyTime = 1530786071
|
329
|
|
- //var subscibe models.ServeSubscibe
|
330
|
|
- //subscibe.ID = 1
|
331
|
|
- //subscibe.OrgId = 3877
|
332
|
|
- //subscibe.PeriodStart = 1538035409
|
333
|
|
- //subscibe.PeriodEnd = 1569571409
|
334
|
|
- //subscibe.State = 1
|
335
|
|
- //subscibe.Status = 1
|
336
|
|
- //subscibe.CreatedTime = 1538035409
|
337
|
|
- //subscibe.UpdatedTime = 1538035409
|
338
|
|
- //subscibes := make(map[int64]*models.ServeSubscibe, 0)
|
339
|
|
- //subscibes[4] = &subscibe
|
340
|
|
- //var adminUserInfo service.AdminUserInfo
|
341
|
|
- //adminUserInfo.CurrentOrgId = 3877
|
342
|
|
- //adminUserInfo.CurrentAppId = 4
|
343
|
|
- //adminUserInfo.AdminUser = &userAdmin
|
344
|
|
- //adminUserInfo.Subscibes = subscibes
|
345
|
|
- //this.SetSession("admin_user_info", &adminUserInfo)
|
346
|
|
- this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
|
347
|
|
- this.StopRun()
|
|
364
|
+ var userAdmin models.AdminUser
|
|
365
|
+ userAdmin.Id = 1448
|
|
366
|
+ userAdmin.Mobile = "13318599895"
|
|
367
|
+
|
|
368
|
+ userAdmin.Id = 597
|
|
369
|
+ userAdmin.Mobile = "19874122664"
|
|
370
|
+ userAdmin.IsSuperAdmin = false
|
|
371
|
+ userAdmin.Status = 1
|
|
372
|
+ userAdmin.CreateTime = 1530786071
|
|
373
|
+ userAdmin.ModifyTime = 1530786071
|
|
374
|
+ var subscibe models.ServeSubscibe
|
|
375
|
+ subscibe.ID = 1
|
|
376
|
+ subscibe.OrgId = 10215
|
|
377
|
+ subscibe.PeriodStart = 1538035409
|
|
378
|
+ subscibe.PeriodEnd = 1569571409
|
|
379
|
+ subscibe.State = 1
|
|
380
|
+ subscibe.Status = 1
|
|
381
|
+ subscibe.CreatedTime = 1538035409
|
|
382
|
+ subscibe.UpdatedTime = 1538035409
|
|
383
|
+ subscibes := make(map[int64]*models.ServeSubscibe, 0)
|
|
384
|
+ subscibes[4] = &subscibe
|
|
385
|
+ var adminUserInfo service.AdminUserInfo
|
|
386
|
+ adminUserInfo.CurrentOrgId = 10215
|
|
387
|
+ adminUserInfo.CurrentAppId = 4
|
|
388
|
+ adminUserInfo.AdminUser = &userAdmin
|
|
389
|
+ adminUserInfo.Subscibes = subscibes
|
|
390
|
+ this.SetSession("admin_user_info", &adminUserInfo)
|
|
391
|
+ //this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeNotLogin)
|
|
392
|
+ //this.StopRun()
|
348
|
393
|
}
|
349
|
394
|
|
350
|
395
|
//if adminUserInfo.AppRole != nil {
|
|
@@ -381,3 +426,33 @@ func RemoveRepeatedPurviewElement2(arr []string) (newArr []string) {
|
381
|
426
|
}
|
382
|
427
|
return
|
383
|
428
|
}
|
|
429
|
+
|
|
430
|
+type ErrMsgConfig struct {
|
|
431
|
+ Msgs []*models.ErrMsg "json:msg"
|
|
432
|
+}
|
|
433
|
+
|
|
434
|
+func LoadErrMsgConfig(dataFile string) *ErrMsgConfig {
|
|
435
|
+ var config ErrMsgConfig
|
|
436
|
+ _, filename, _, _ := runtime.Caller(1)
|
|
437
|
+ datapath := path.Join(path.Dir(filename), dataFile)
|
|
438
|
+ config_file, err := os.Open(datapath)
|
|
439
|
+ if err != nil {
|
|
440
|
+ emit("Failed to open config file '%s': %s\n", datapath, err)
|
|
441
|
+ return &config
|
|
442
|
+ }
|
|
443
|
+ fi, _ := config_file.Stat()
|
|
444
|
+ buffer := make([]byte, fi.Size())
|
|
445
|
+ _, err = config_file.Read(buffer)
|
|
446
|
+ buffer, err = StripComments(buffer) //去掉注释
|
|
447
|
+ if err != nil {
|
|
448
|
+ emit("Failed to strip comments from json: %s\n", err)
|
|
449
|
+ return &config
|
|
450
|
+ }
|
|
451
|
+ buffer = []byte(os.ExpandEnv(string(buffer))) //特殊
|
|
452
|
+ err = json.Unmarshal(buffer, &config) //解析json格式数据
|
|
453
|
+ if err != nil {
|
|
454
|
+ emit("Failed unmarshalling json: %s\n", err)
|
|
455
|
+ return &config
|
|
456
|
+ }
|
|
457
|
+ return &config
|
|
458
|
+}
|