diff --git a/component/interfaceOauth2/interfaceOauth2.js b/component/interfaceOauth2/interfaceOauth2.js index 213cf4d..36dc063 100755 --- a/component/interfaceOauth2/interfaceOauth2.js +++ b/component/interfaceOauth2/interfaceOauth2.js @@ -67,14 +67,14 @@ class ProjectInterfaceOauth extends Component { } handleClick = (key, data) => { - this.setCurOauth(data._id); + this.setCurOauth(data._id, data.domain); this.setState({ currentEnvMsg: data, currentKey: key }); }; - setCurOauth(envId) { + setCurOauth(envId, envDomain) { let currOauth = {}; if (!this.state.projectAllOauth) { this.setState({ @@ -89,6 +89,7 @@ class ProjectInterfaceOauth extends Component { this.state.projectAllOauth[i].env_id == envId ) { currOauth = this.state.projectAllOauth[i]; + currOauth.domain = envDomain; break; } } diff --git a/component/oauth2Content/oauth2Content.js b/component/oauth2Content/oauth2Content.js index 296fb40..1389b26 100755 --- a/component/oauth2Content/oauth2Content.js +++ b/component/oauth2Content/oauth2Content.js @@ -219,7 +219,7 @@ class OAuth2Content extends Component { } try { let res = await axios.post('/api/plugin/oauthInterface/url/valid', { - url: get_token_url, + url: this.props.envMsg.domain + get_token_url, method: request_type, headers_data: headers_data, dataType, diff --git a/model/oauthModel.js b/model/oauthModel.js index b4b2d7c..16c0138 100755 --- a/model/oauthModel.js +++ b/model/oauthModel.js @@ -22,6 +22,8 @@ class oauthModel extends baseModel { env_id: String, //环境变量的名称 env_name: String, + // 环境变量的域 + domain: String //保存到哪个header上 token_header: String, //上次成功同步接口时间, diff --git a/utils/syncTokenUtil.js b/utils/syncTokenUtil.js index 068f58d..3ccfb5e 100755 --- a/utils/syncTokenUtil.js +++ b/utils/syncTokenUtil.js @@ -126,7 +126,7 @@ class syncTokenUtils { } let projectId = projectData._id; - let getTokenUrl = oauthData.get_token_url; + let getTokenUrl = oauthData.domain + oauthData.get_token_url; let method = oauthData.request_type; let headers_data = oauthData.headers_data; let result;