From bac40864eb8de650410adfcf69b463ef922553a7 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Mon, 31 Aug 2020 14:07:09 +0800
Subject: [PATCH] update

---
 src/forge/DevOps/About.jsx | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/forge/DevOps/About.jsx b/src/forge/DevOps/About.jsx
index 0d3fc347..63f09d62 100644
--- a/src/forge/DevOps/About.jsx
+++ b/src/forge/DevOps/About.jsx
@@ -25,7 +25,6 @@ function About(props, ref) {
   //1: 标识用户已填写了云服务器相关信息，但并未开启认证
   const [step, setStep] = useState(undefined);
   // step大于1时：为true，不能再修改服务器信息
-  const [firstCompleted, setFirstCompleted] = useState(false);
 
   const [ redirectUrl ,setRedirectUrl ] = useState(undefined);
   const [ cloudAccount , setCloudAccount] = useState(undefined);
@@ -38,8 +37,12 @@ function About(props, ref) {
   const CurrentLogin = props.current_user && props.current_user.login;
 
   useEffect(()=>{
-    auth('get');
-  },[])
+    if(CurrentLogin === AuthorLogin){
+      auth('get');
+    }else{
+      setIsSpining(false);
+    }
+  },[AuthorLogin,CurrentLogin])
 
   function auth(type){
     const url = `/${owner}/${projectsId}/ci_authorize.json`;
@@ -71,20 +74,21 @@ function About(props, ref) {
   );
   // 下一步
   function goStep() {
-    setIsSpining(true);
-    props.showNotification("服务器连接绑定中，请耐心等候！");
     validateFields((error, values) => {
       if (!error) {
+        setIsSpining(true);
         const url = `/${owner}/${projectsId}/cloud_accounts.json`;
         axios.post(url, {...values}).then((result) => {
           setIsSpining(false);
           if (result && result.data.redirect_url) {
+            props.showNotification("服务器信息配置完成！");
             setRedirectUrl(result.data.redirect_url);
             setStep(1);
           }
         })
         .catch((error) => {
           console.log(error);
+          setIsSpining(false);
         });
       }
     });
@@ -112,7 +116,7 @@ function About(props, ref) {
       <div className="activatePanel">
         <img src={activate} alt="" width="250px" />
         <P>定义DevOps工作流，帮助您检测bug、发布代码…</P>
-        <a href={"https://www.trustie.net/forums/82/memos/3080"} target="_blank" style={{ color: "#5091FF", marginBottom: "20px" }}>
+        <a href={"https://www.trustie.net/forums/82/memos/3080"} target="_blank" style={{ color: "#5091FF"}}>
           了解什么是DevOps？
         </a>
         {
@@ -120,7 +124,7 @@ function About(props, ref) {
           <React.Fragment>
             { step === 0 ?
             <React.Fragment>
-              <Form>
+              <Form style={{marginTop:"20px"}}>
                 <p className="mb20" style={{width:"370px"}}>请仔细核对您的服务器信息，一旦确认提交将无法修改</p>
                 {helper(
                   "服务器IP地址：",
@@ -130,7 +134,6 @@ function About(props, ref) {
                     placeholder="请输入服务器IP地址"
                     style={{ width: "368px" }}
                     size="large"
-                    disabled={firstCompleted}
                   />,
                   true
                 )}
@@ -138,14 +141,14 @@ function About(props, ref) {
                   "服务器用户名：",
                   "account",
                   [{ required: true, message: "请输入服务器用户名" }],
-                  <Input placeholder="请输入服务器用户名" size="large" disabled={firstCompleted} />,
+                  <Input placeholder="请输入服务器用户名" size="large" />,
                   true
                 )}
                 {helper(
                   "服务器密码：",
                   "secret",
                   [{ required: true, message: "请输入服务器密码" }],
-                  <Input.Password placeholder="请输入服务器密码" size="large" disabled={firstCompleted}/>,
+                  <Input.Password placeholder="请输入服务器密码" size="large" />,
                   true
                 )}
               </Form>
@@ -153,7 +156,7 @@ function About(props, ref) {
             </React.Fragment>
             :""}
             {step === 1 &&(
-              <div style={{textAlign:'center'}}>
+              <div style={{textAlign:'center',marginTop:"20px"}}>
                 <p style={{ maxWidth: "300px",textAlign:"left",color:"#999" }}>初始化配置已完成，请前往:<br/><a target="_blank" href={redirectUrl} className="color-blue">{redirectUrl}</a> 进入认证</p>
                 <Blueback onClick={startActive} className="mt20">开始激活</Blueback>
               </div>