Merge remote-tracking branch 'origin/debug' into debug

controllers/sys_user.go

@@ -323,12 +323,12 @@ func (this *SysUserAuthController) GetCrmAuthCode() {
 	br.Msg = "获取成功"
 }
 
-// GetCrmToken
-// @Title 免密登录-获取CRM系统Token
-// @Description 免密登录-获取CRM系统Token
+// AuthCodeLogin
+// @Title 编码登录
+// @Description 编码登录
 // @Success 200 Ret=200 操作成功
-// @router /get_crm_token [get]
-func (this *SysUserController) GetCrmToken() {
+// @router /auth_code_login [get]
+func (this *SysUserController) AuthCodeLogin() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		if br.ErrMsg == "" {
@@ -344,7 +344,7 @@ func (this *SysUserController) GetCrmToken() {
 		return
 	}
 
-	data, e := services.GetCrmTokenFromMiddleServer(authCode)
+	data, e := services.CodeLoginFromMiddleServer(authCode)
 	if e != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取登录Token失败, Err: " + e.Error()

routers/commentsRouter.go

@@ -5913,8 +5913,8 @@ func init() {
 
     beego.GlobalControllerRouter["hongze/hz_eta_api/controllers:SysUserController"] = append(beego.GlobalControllerRouter["hongze/hz_eta_api/controllers:SysUserController"],
         beego.ControllerComments{
-            Method: "GetCrmToken",
-            Router: `/get_crm_token`,
+            Method: "AuthCodeLogin",
+            Router: `/auth_code_login`,
             AllowHTTPMethods: []string{"get"},
             MethodParams: param.Make(),
             Filters: nil,

services/crm_eta.go

@@ -112,9 +112,9 @@ type GetCrmTokenData struct {
 	Authority       int    `description:"管理权限，0：无，1：部门负责人，2：小组负责人,或者ficc销售主管，4:ficc销售组长"`
 }
 
-// GetCrmTokenFromMiddleServer CRM_ETA服务-获取Token
-func GetCrmTokenFromMiddleServer(authCode string) (tokenResp GetCrmTokenData, err error) {
-	url := fmt.Sprint(utils.CrmEtaServerUrl, "/api/auth/crm_token")
+// CodeLoginFromMiddleServer 中间服务-编码登录
+func CodeLoginFromMiddleServer(authCode string) (tokenResp GetCrmTokenData, err error) {
+	url := fmt.Sprint(utils.CrmEtaServerUrl, "/api/auth/eta_token")
 	param := GetCrmTokenReq{
 		AuthCode: authCode,
 	}

services/oss.go

@@ -186,7 +186,7 @@ func NewSTSToken() (item *STSToken, err error) {
 	}
 	request := sts.CreateAssumeRoleRequest()
 	request.Scheme = "https"
-	request.RegionId = "cn-shanghai"
+	request.RegionId = utils.RegionId
 	request.RoleArn = utils.RoleArn
 	now := time.Now().Format(utils.FormatDateTimeUnSpace)
 	request.RoleSessionName = utils.RoleSessionName + now

utils/config.go

@@ -129,6 +129,7 @@ var (
 
 // 阿里云oss前端上传用
 var (
+	RegionId           string
 	RoleArn            string
 	RoleSessionName    string
 	RAMAccessKeyId     string
@@ -312,6 +313,7 @@ func init() {
 
 	// OSS相关（前端使用）
 	{
+		RegionId = config["region_id"]
 		RoleArn = config["role_arn"]
 		RoleSessionName = config["role_session_name"]
 		RAMAccessKeyId = config["ram_access_key_id"]