Merge branch 'test' of http://gitlab.fjmaimaimai.com/allied-creation/allied-crea…

…tion-gateway into test

@@ -134,13 +134,16 @@ func (svr AuthService) AuthLoginQrcode(queryParam *query.QrcodeLoginStatusQuery)
 		CompanyId:  qrmsgCache.CompanyId,
 		CompanyId:  qrmsgCache.CompanyId,
 		OrgId:      qrmsgCache.OrgId,
 		OrgId:      qrmsgCache.OrgId,
 	}
 	}
-	accessToken, err := loginToken.GenerateAccessToken()
+	// accessToken, err := loginToken.GenerateAccessToken()
+	// if err != nil {
+	// 	return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+	// }
+	qrCache.Remove(qrmsgCache.Id)
+	// _ = accessToken
+	result, err := svr.getToken(loginToken)
 	if err != nil {
 	if err != nil {
 		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
 		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
 	}
 	}
-	qrCache.Remove(qrmsgCache.Id)
-	_ = accessToken
-	result, err := svr.getToken(loginToken)
 	data := map[string]interface{}{
 	data := map[string]interface{}{
 		"isLogin": qrmsgCache.IsLogin,
 		"isLogin": qrmsgCache.IsLogin,
 		"access":  result["token"],
 		"access":  result["token"],

@@ -17,7 +17,7 @@ func NewHttplibAlliedCreationBasic(operator domain.Operator) *HttplibAlliedCreat
 	return &HttplibAlliedCreationBasic{
 	return &HttplibAlliedCreationBasic{
 		BaseServiceGateway: service_gateway.BaseServiceGateway{
 		BaseServiceGateway: service_gateway.BaseServiceGateway{
 			ConnectTimeout:   100 * time.Second,
 			ConnectTimeout:   100 * time.Second,
-			ReadWriteTimeout: 30 * time.Second,
+			ReadWriteTimeout: 100 * time.Second,
 			CompanyId:        operator.CompanyId,
 			CompanyId:        operator.CompanyId,
 			OrgId:            operator.OrgId,
 			OrgId:            operator.OrgId,
 			UserId:           operator.UserId,
 			UserId:           operator.UserId,

@@ -17,7 +17,7 @@ func NewHttplibAlliedCreationCooperation(operator domain.Operator) *HttplibAllie
 	return &HttplibAlliedCreationCooperation{
 	return &HttplibAlliedCreationCooperation{
 		BaseServiceGateway: service_gateway.BaseServiceGateway{
 		BaseServiceGateway: service_gateway.BaseServiceGateway{
 			ConnectTimeout:   100 * time.Second,
 			ConnectTimeout:   100 * time.Second,
-			ReadWriteTimeout: 30 * time.Second,
+			ReadWriteTimeout: 100 * time.Second,
 			CompanyId:        operator.CompanyId,
 			CompanyId:        operator.CompanyId,
 			OrgId:            operator.OrgId,
 			OrgId:            operator.OrgId,
 			UserId:           operator.UserId,
 			UserId:           operator.UserId,

@@ -218,6 +218,7 @@ func (gateway HttplibAlliedCreationCooperation) DividendsEstimateDividendsIncent
 	})
 	})
 	var result service_gateway.GatewayResponse
 	var result service_gateway.GatewayResponse
 	err = json.Unmarshal(byteResult, &result)
 	err = json.Unmarshal(byteResult, &result)
+	log.Logger.Debug("获取业务模块请求数据：确定预算分红激励+++++" + string(byteResult))
 	if err != nil {
 	if err != nil {
 		return nil, fmt.Errorf("解析确定预算分红激励：%w", err)
 		return nil, fmt.Errorf("解析确定预算分红激励：%w", err)
 	}
 	}

@@ -18,7 +18,7 @@ func NewHttplibAlliedCreationUser(operator domain.Operator) *HttplibAlliedCreati
 	return &HttplibAlliedCreationUser{
 	return &HttplibAlliedCreationUser{
 		BaseServiceGateway: service_gateway.BaseServiceGateway{
 		BaseServiceGateway: service_gateway.BaseServiceGateway{
 			ConnectTimeout:   100 * time.Second,
 			ConnectTimeout:   100 * time.Second,
-			ReadWriteTimeout: 30 * time.Second,
+			ReadWriteTimeout: 100 * time.Second,
 			CompanyId:        operator.CompanyId,
 			CompanyId:        operator.CompanyId,
 			OrgId:            operator.OrgId,
 			OrgId:            operator.OrgId,
 			UserId:           operator.UserId,
 			UserId:           operator.UserId,

@@ -138,6 +138,7 @@ func (gateway HttplibAlliedCreationUser) UserGet(param ReqGetUser) (*DataGateUse
 	}
 	}
 	var data DataGateUser
 	var data DataGateUser
 	err = gateway.GetResponseData(result, &data)
 	err = gateway.GetResponseData(result, &data)
+
 	return &data, err
 	return &data, err
 }
 }