xxq250
/
forgeplus-react
forked from Gitlink/forgeplus-react
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request '修改注册链接和超时时间' (#263) from tongChong/forgeplus-react:local_military into dev_military_local

This commit is contained in:
jasder 2021-11-18 09:08:32 +08:00
parent 6611b6d16f 82c35888f4
commit 8de1c7a0d3
4 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/forge/users/Infos.js
View File

@ -137,10 +137,13 @@ class Infos extends Component {
render() {
const { current_user, main_web_site_url } = this.props;
const { current_user } = this.props;
const { username } = this.props.match.params;
const { user, isSpin, project_type, route_type } = this.state;
let main_web_site_url = JSON.parse(localStorage.chromesetting).main_web_site_url;
return (
<div className="newMain clearfix">
<Spin spinning={isSpin}>
@ -167,7 +170,7 @@ class Infos extends Component {
<Button
block
className="text-button-grey"
href={`${main_web_site_url || "https://osredm.com/"}users/${user.login}/profiles`}
href={`${main_web_site_url || "https://osredm.com"}/users/${user.login}/profiles`}
>
{" "}
<i className="iconfont icon-shezhi4 font-15 mr5"></i>
@ -257,29 +260,29 @@ class Infos extends Component {
</ul>
</div>
{
current_user && current_user.login && current_user.login === username &&
<div className="bgcF">
<ul className="list-l-Menu">
<li className="MenuTitle">
<i className="iconfont icon-gongzuoliu font-15 mr5"></i>
DevOps工作流
<i className="iconfont icon-youjiantou font-15 mr20 color-grey-9 pull-right"></i>
</li>
<li className={project_type && project_type === "CIService" ? "active" : ""} onClick={() => this.change_devops_type("CIService")}>
<p>
<span className="font-16 color-grey-3">CI服务</span>
</p>
</li>
{/* <li className={project_type && project_type === "CDService" ? "active" : ""} onClick={() => this.change_devops_type("CDService")}>
<p>
<span className="font-16">CD服务</span>
<span className="color-blue">
{user && user.common_projects_count}
</span>
</p>
</li> */}
</ul>
</div>
// current_user && current_user.login && current_user.login === username &&
// <div className="bgcF">
// <ul className="list-l-Menu">
// <li className="MenuTitle">
// <i className="iconfont icon-gongzuoliu font-15 mr5"></i>
// DevOps工作流
// <i className="iconfont icon-youjiantou font-15 mr20 color-grey-9 pull-right"></i>
// </li>
// <li className={project_type && project_type === "CIService" ? "active" : ""} onClick={() => this.change_devops_type("CIService")}>
// <p>
// <span className="font-16 color-grey-3">CI服务</span>
// </p>
// </li>
// {/* <li className={project_type && project_type === "CDService" ? "active" : ""} onClick={() => this.change_devops_type("CDService")}>
// <p>
// <span className="font-16">CD服务</span>
// <span className="color-blue">
// {user && user.common_projects_count}
// </span>
// </p>
// </li> */}
// </ul>
// </div>
}

2
src/military/fetch.js
View File

@ -15,7 +15,7 @@ const TokenKey = 'autologin_forge_military';
// 创建axios实例
const service = axios.create({
baseURL: httpUrl,
timeout: 10000, // 请求超时时间
timeout: 1800000, // 请求超时时间
});
// request拦截器

2
src/military/notice/fetch.js
View File

@ -16,7 +16,7 @@ const TokenKey = 'autologin_forge_military';
// 创建axios实例
const service = axios.create({
baseURL: httpUrl,
timeout: 10000, // 请求超时时间
timeout: 1800000, // 请求超时时间
});
// request拦截器

9
src/modules/login/LoginDialog.js
View File

@ -433,7 +433,8 @@ class LoginDialog extends Component {
}
};
getloginurl = (url) => {
window.location.href = url;
let settings=JSON.parse(localStorage.chromesetting);
window.location.href =settings.main_web_site_url+url;
};
openweixinlogin = () => {
this.setState({
@ -580,9 +581,9 @@ class LoginDialog extends Component {
<label htmlFor="p_autolog" style={{ top: '0px' }}>下次自动登录</label>
</span>
<span className="fr">
<a onClick={(url) => this.getloginurl("https://osredm.com/account/lost_password")}
className="mr3 color-grey-9">找回密码</a><em className="vertical-line"></em>
<a onClick={(url) => this.getloginurl("https://osredm.com/user_join")} className="color-grey-9">注册</a>
{/* <a onClick={(url) => this.getloginurl("/account/lost_password")}
className="mr3 color-grey-9">找回密码</a><em className="vertical-line"></em> */}
<a onClick={(url) => this.getloginurl("/user_join")} className="color-grey-9">注册</a>
</span>
</p>