mmm-go / opp · 提交

转到一个项目

作者 yangfu
提交 165203f31cbd0b6b9e1a7534b222275dcb8516d4 1 个父辈 f64610ce

修改登录二次鉴权 用户信息

内嵌 并排对比
正在显示 7 个修改的文件 包含 29 行增加 和 18 行删除
1 appname = opportunity 1 appname = opportunity
2 httpport = 8080 2 httpport = 8080
3 -runmode = "${RUN_MODE||dev}" 3 +runmode = "${RUN_MODE||test}"
4 4
5 #没设置的话 this.Ctx.Input.RequestBody 没有值 5 #没设置的话 this.Ctx.Input.RequestBody 没有值
6 copyrequestbody = true 6 copyrequestbody = true
@@ -41,3 +41,6 @@ h5_host = "https://web-open.fjmaimaimai.com" @@ -41,3 +41,6 @@ h5_host = "https://web-open.fjmaimaimai.com"
41 41
42 #审核中心 42 #审核中心
43 suplus_approve_host ="https://public-interface.fjmaimaimai.com/approve" 43 suplus_approve_host ="https://public-interface.fjmaimaimai.com/approve"
  44 +
  45 +#企业平台
  46 +BUSINESS_ADMIN_SERVICE_HOST ="${BUSINESS_ADMIN_SERVICE_HOST||http://suplus-business-admin-test.fjmaimaimai.com/}"
1 [test] 1 [test]
2 #数据库相关 2 #数据库相关
3 mysql_user = "${MYSQL_USER||root}" 3 mysql_user = "${MYSQL_USER||root}"
4 -mysql_password = "${MYSQL_PASSWORD||sutianxia2015}"  
5 -mysql_host = "${MYSQL_HOST||115.29.205.99}" 4 +mysql_password = "${MYSQL_PASSWORD||sutianxia2018}"
  5 +mysql_host = "${MYSQL_HOST||101.37.68.23}"
6 mysql_port = "${MYSQL_PORT||3306}" 6 mysql_port = "${MYSQL_PORT||3306}"
7 -mysql_db_name = "${MYSQL_DB_NAME||opportunity}" 7 +mysql_db_name = "${MYSQL_DB_NAME||opportunity_test}"
8 8
9 #日志 9 #日志
10 log_level = "${LOG_LEVEL||debug}" 10 log_level = "${LOG_LEVEL||debug}"
@@ -41,3 +41,6 @@ h5_host = "http://mmm-web-open-test.fjmaimaimai.com" @@ -41,3 +41,6 @@ h5_host = "http://mmm-web-open-test.fjmaimaimai.com"
41 41
42 #审核中心 42 #审核中心
43 suplus_approve_host ="http://suplus-approve-test.fjmaimaimai.com" 43 suplus_approve_host ="http://suplus-approve-test.fjmaimaimai.com"
  44 +
  45 +#企业平台
  46 +BUSINESS_ADMIN_SERVICE_HOST ="${BUSINESS_ADMIN_SERVICE_HOST||http://suplus-business-admin-test.fjmaimaimai.com/}"
@@ -98,6 +98,12 @@ spec: @@ -98,6 +98,12 @@ spec:
98 value: "stdout" 98 value: "stdout"
99 - name: aliyun_logs_access 99 - name: aliyun_logs_access
100 value: " /opt/logs/app.log" 100 value: " /opt/logs/app.log"
  101 +
  102 + - name: BUSINESS_ADMIN_SERVICE_HOST
  103 + valueFrom:
  104 + configMapKeyRef:
  105 + name: suplus-config
  106 + key: service.businessadmin
101 volumes: 107 volumes:
102 - name: accesslogs 108 - name: accesslogs
103 emptyDir: {} 109 emptyDir: {}
@@ -98,6 +98,12 @@ spec: @@ -98,6 +98,12 @@ spec:
98 value: "stdout" 98 value: "stdout"
99 - name: aliyun_logs_access 99 - name: aliyun_logs_access
100 value: " /opt/logs/app.log" 100 value: " /opt/logs/app.log"
  101 +
  102 + - name: BUSINESS_ADMIN_SERVICE_HOST
  103 + valueFrom:
  104 + configMapKeyRef:
  105 + name: suplus-config
  106 + key: service.businessadmin
101 volumes: 107 volumes:
102 - name: accesslogs 108 - name: accesslogs
103 emptyDir: {} 109 emptyDir: {}
@@ -90,7 +90,6 @@ func LoginV3(header *protocol.RequestHeader, request *protocol.LoginRequest) (rs @@ -90,7 +90,6 @@ func LoginV3(header *protocol.RequestHeader, request *protocol.LoginRequest) (rs
90 err = protocol.NewErrWithMessage(2002, err) //账号不存在 90 err = protocol.NewErrWithMessage(2002, err) //账号不存在
91 return 91 return
92 } 92 }
93 - return  
94 } 93 }
95 /************后期移除************/ 94 /************后期移除************/
96 95
@@ -380,13 +380,14 @@ func UserInfo(header *protocol.RequestHeader, request *protocol.UserInfoRequest) @@ -380,13 +380,14 @@ func UserInfo(header *protocol.RequestHeader, request *protocol.UserInfoRequest)
380 func UserInfoV3(header *protocol.RequestHeader, request *protocol.UserInfoRequest) (rsp *protocol.UserInfoResponse, err error) { 380 func UserInfoV3(header *protocol.RequestHeader, request *protocol.UserInfoRequest) (rsp *protocol.UserInfoResponse, err error) {
381 var ( 381 var (
382 companyId int64 382 companyId int64
383 - userCompany *models.UserCompany 383 + //userCompany *models.UserCompany
384 userAuth *models.UserAuth 384 userAuth *models.UserAuth
385 userBaseAgg *protocol.UserBaseInfoAggregation 385 userBaseAgg *protocol.UserBaseInfoAggregation
386 companys []*models.Company 386 companys []*models.Company
387 userCompanys []*models.UserCompany 387 userCompanys []*models.UserCompany
388 tmpCompanys []*models.Company = make([]*models.Company, 0) 388 tmpCompanys []*models.Company = make([]*models.Company, 0)
389 defaultUserId int64 389 defaultUserId int64
  390 + defaultCompanyId int64
390 ) 391 )
391 if companys, err = models.GetCompanyByPermission(header.Uid); err != nil { 392 if companys, err = models.GetCompanyByPermission(header.Uid); err != nil {
392 log.Error(err) 393 log.Error(err)
@@ -398,11 +399,11 @@ func UserInfoV3(header *protocol.RequestHeader, request *protocol.UserInfoReques @@ -398,11 +399,11 @@ func UserInfoV3(header *protocol.RequestHeader, request *protocol.UserInfoReques
398 } 399 }
399 for i := range userCompanys { 400 for i := range userCompanys {
400 if hasAuth := agg.CheckUserModuleAuth(userCompanys[i].Id); !hasAuth { 401 if hasAuth := agg.CheckUserModuleAuth(userCompanys[i].Id); !hasAuth {
401 - log.Debug("检查公司权限：", userCompanys[i].Id, userCompanys[i].CompanyId, "无模块权限") 402 + log.Debug("检查公司权限：", "用户编号-", userCompanys[i].Id, "公司编号-", userCompanys[i].CompanyId, "无模块权限")
402 continue 403 continue
403 } 404 }
404 - if companyId == 0 { //取默认一个有权限的公司  
405 - companyId = userCompanys[i].CompanyId 405 + if defaultCompanyId == 0 { //取默认一个有权限的公司
  406 + defaultCompanyId = userCompanys[i].CompanyId
406 defaultUserId = userCompanys[i].Id 407 defaultUserId = userCompanys[i].Id
407 } 408 }
408 for j := 0; j < len(companys); j++ { 409 for j := 0; j < len(companys); j++ {
@@ -423,23 +424,16 @@ func UserInfoV3(header *protocol.RequestHeader, request *protocol.UserInfoReques @@ -423,23 +424,16 @@ func UserInfoV3(header *protocol.RequestHeader, request *protocol.UserInfoReques
423 return 424 return
424 } 425 }
425 if companyId == 0 { 426 if companyId == 0 {
426 - if userCompany, err = models.GetUserCompanysFirst(header.Uid); err != nil {  
427 - log.Error(err)  
428 - return  
429 - }  
430 if userAuth, err = models.GetUserAuthByUserId(header.Uid, protocol.DeviceType); err != nil { 427 if userAuth, err = models.GetUserAuthByUserId(header.Uid, protocol.DeviceType); err != nil {
431 log.Error(err) 428 log.Error(err)
432 return 429 return
433 } 430 }
434 if err = utils.UpdateTableByMap(&models.UserAuth{Id: userAuth.Id}, map[string]interface{}{ 431 if err = utils.UpdateTableByMap(&models.UserAuth{Id: userAuth.Id}, map[string]interface{}{
435 - "CurrentCompanyId": userCompany.CompanyId, "CurrentUserCompanyId": userCompany.Id}); err != nil { 432 + "CurrentCompanyId": defaultCompanyId, "CurrentUserCompanyId": defaultUserId}); err != nil {
436 log.Error(err) 433 log.Error(err)
437 return 434 return
438 } 435 }
439 - companyId = int64(userCompany.CompanyId)  
440 - header.UserId = userCompany.Id  
441 - }  
442 - if header.UserId == 0 { 436 + companyId = defaultCompanyId
443 header.UserId = defaultUserId 437 header.UserId = defaultUserId
444 } 438 }
445 if userBaseAgg, err = agg.GetUserBaseInfoAggregation(header.UserId, companyId); err != nil { 439 if userBaseAgg, err = agg.GetUserBaseInfoAggregation(header.UserId, companyId); err != nil {