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

 appname = opportunity
 httpport = 8080
-runmode = "${RUN_MODE||dev}"
+runmode = "${RUN_MODE||test}"
 
 #没设置的话 this.Ctx.Input.RequestBody 没有值
 copyrequestbody = true

@@ -40,4 +40,7 @@ user_center_app_secret ="cykbjnfqgctn"
 h5_host = "https://web-open.fjmaimaimai.com"
 
 #审核中心
-suplus_approve_host ="https://public-interface.fjmaimaimai.com/approve"
\ No newline at end of file
+suplus_approve_host ="https://public-interface.fjmaimaimai.com/approve"
+
+#企业平台
+BUSINESS_ADMIN_SERVICE_HOST ="${BUSINESS_ADMIN_SERVICE_HOST||http://suplus-business-admin-test.fjmaimaimai.com/}"
\ No newline at end of file

 [test]
 #数据库相关
 mysql_user = "${MYSQL_USER||root}"
-mysql_password = "${MYSQL_PASSWORD||sutianxia2015}"
-mysql_host = "${MYSQL_HOST||115.29.205.99}"
+mysql_password = "${MYSQL_PASSWORD||sutianxia2018}"
+mysql_host = "${MYSQL_HOST||101.37.68.23}"
 mysql_port = "${MYSQL_PORT||3306}"
-mysql_db_name = "${MYSQL_DB_NAME||opportunity}"
+mysql_db_name = "${MYSQL_DB_NAME||opportunity_test}"
 
 #日志
 log_level = "${LOG_LEVEL||debug}"
@@ -40,4 +40,7 @@ user_center_app_secret ="cykbjnfqgctn"
 h5_host = "http://mmm-web-open-test.fjmaimaimai.com"
 
 #审核中心
-suplus_approve_host ="http://suplus-approve-test.fjmaimaimai.com"
\ No newline at end of file
+suplus_approve_host ="http://suplus-approve-test.fjmaimaimai.com"
+
+#企业平台
+BUSINESS_ADMIN_SERVICE_HOST ="${BUSINESS_ADMIN_SERVICE_HOST||http://suplus-business-admin-test.fjmaimaimai.com/}"
\ No newline at end of file

@@ -98,6 +98,12 @@ spec:
               value: "stdout"
             - name: aliyun_logs_access
               value: " /opt/logs/app.log"
+
+            - name: BUSINESS_ADMIN_SERVICE_HOST
+                valueFrom:
+                  configMapKeyRef:
+                    name: suplus-config
+                    key: service.businessadmin
       volumes:
         - name: accesslogs
           emptyDir: {}

@@ -98,6 +98,12 @@ spec:
               value: "stdout"
             - name: aliyun_logs_access
               value: " /opt/logs/app.log"
+
+            - name: BUSINESS_ADMIN_SERVICE_HOST
+                valueFrom:
+                  configMapKeyRef:
+                    name: suplus-config
+                    key: service.businessadmin
       volumes:
         - name: accesslogs
           emptyDir: {}

@@ -90,7 +90,6 @@ func LoginV3(header *protocol.RequestHeader, request *protocol.LoginRequest) (rs
 			err = protocol.NewErrWithMessage(2002, err) //账号不存在
 			return
 		}
-		return
 	}
 	/************后期移除************/
 

@@ -379,14 +379,15 @@ func UserInfo(header *protocol.RequestHeader, request *protocol.UserInfoRequest)
 //用户信息
 func UserInfoV3(header *protocol.RequestHeader, request *protocol.UserInfoRequest) (rsp *protocol.UserInfoResponse, err error) {
 	var (
-		companyId     int64
-		userCompany   *models.UserCompany
-		userAuth      *models.UserAuth
-		userBaseAgg   *protocol.UserBaseInfoAggregation
-		companys      []*models.Company
-		userCompanys  []*models.UserCompany
-		tmpCompanys   []*models.Company = make([]*models.Company, 0)
-		defaultUserId int64
+		companyId int64
+		//userCompany   *models.UserCompany
+		userAuth         *models.UserAuth
+		userBaseAgg      *protocol.UserBaseInfoAggregation
+		companys         []*models.Company
+		userCompanys     []*models.UserCompany
+		tmpCompanys      []*models.Company = make([]*models.Company, 0)
+		defaultUserId    int64
+		defaultCompanyId int64
 	)
 	if companys, err = models.GetCompanyByPermission(header.Uid); err != nil {
 		log.Error(err)
@@ -398,11 +399,11 @@ func UserInfoV3(header *protocol.RequestHeader, request *protocol.UserInfoReques
 	}
 	for i := range userCompanys {
 		if hasAuth := agg.CheckUserModuleAuth(userCompanys[i].Id); !hasAuth {
-			log.Debug("检查公司权限：", userCompanys[i].Id, userCompanys[i].CompanyId, "无模块权限")
+			log.Debug("检查公司权限：", "用户编号-", userCompanys[i].Id, "公司编号-", userCompanys[i].CompanyId, "无模块权限")
 			continue
 		}
-		if companyId == 0 { //取默认一个有权限的公司
-			companyId = userCompanys[i].CompanyId
+		if defaultCompanyId == 0 { //取默认一个有权限的公司
+			defaultCompanyId = userCompanys[i].CompanyId
 			defaultUserId = userCompanys[i].Id
 		}
 		for j := 0; j < len(companys); j++ {
@@ -423,23 +424,16 @@ func UserInfoV3(header *protocol.RequestHeader, request *protocol.UserInfoReques
 		return
 	}
 	if companyId == 0 {
-		if userCompany, err = models.GetUserCompanysFirst(header.Uid); err != nil {
-			log.Error(err)
-			return
-		}
 		if userAuth, err = models.GetUserAuthByUserId(header.Uid, protocol.DeviceType); err != nil {
 			log.Error(err)
 			return
 		}
 		if err = utils.UpdateTableByMap(&models.UserAuth{Id: userAuth.Id}, map[string]interface{}{
-			"CurrentCompanyId": userCompany.CompanyId, "CurrentUserCompanyId": userCompany.Id}); err != nil {
+			"CurrentCompanyId": defaultCompanyId, "CurrentUserCompanyId": defaultUserId}); err != nil {
 			log.Error(err)
 			return
 		}
-		companyId = int64(userCompany.CompanyId)
-		header.UserId = userCompany.Id
-	}
-	if header.UserId == 0 {
+		companyId = defaultCompanyId
 		header.UserId = defaultUserId
 	}
 	if userBaseAgg, err = agg.GetUserBaseInfoAggregation(header.UserId, companyId); err != nil {