no message

编辑合并请求-url地址错误
detail+同步镜像type=2的才不需要合并请求
2021-05-08 17:22:44 +08:00 · 2021-05-08 14:35:51 +08:00 · 2021-05-07 17:41:01 +08:00 · 2021-05-07 16:36:22 +08:00 · 2021-05-07 16:35:17 +08:00 · 2021-05-07 16:33:57 +08:00
50 changed files with 663 additions and 1993 deletions
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@ -499,7 +499,6 @@
        <option value="$PROJECT_DIR$/src/forge/Main/Detail.js" />
        <option value="$PROJECT_DIR$/src/forge/Main/CoderRootCommit.js" />
        <option value="$PROJECT_DIR$/src/forge/Activity/ActivityItem.js" />
-        <option value="$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js" />
        <option value="$PROJECT_DIR$/src/forge/Branch/CloneAddress.js" />
        <option value="$PROJECT_DIR$/src/forge/Version/version.js" />
        <option value="$PROJECT_DIR$/public/css/css_min_all.css" />
@ -1020,16 +1019,6 @@
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="153">
-          <caret line="9" column="50" lean-forward="true" selection-start-line="9" selection-start-column="50" selection-end-line="9" selection-end-column="50" />
-          <folding>
-            <element signature="n#CoderRootDirectory#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
    <entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/InfosBanner.js">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="192">
--- a/package-lock.json
+++ b/package-lock.json
@ -1,5 +1,5 @@
 {
-  "name": "forge",
+  "name": "educoder",
  "version": "0.1.0",
  "lockfileVersion": 1,
  "requires": true,
@ -3893,6 +3893,11 @@
        "randomfill": "^1.0.3"
      }
    },
+    "crypto-js": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npm.taobao.org/crypto-js/download/crypto-js-4.0.0.tgz",
+      "integrity": "sha1-KQSrJnep0EKFai6i74DekuSjbcw="
+    },
    "crypto-random-string": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
@ -20476,16 +20481,6 @@
      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
      "dev": true
    },
-    "xterm": {
-      "version": "4.8.1",
-      "resolved": "https://registry.npm.taobao.org/xterm/download/xterm-4.8.1.tgz",
-      "integrity": "sha1-FVoXKaQ+Gom0BlJOIsVjQznjnKE="
-    },
-    "xterm-addon-fit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npm.taobao.org/xterm-addon-fit/download/xterm-addon-fit-0.4.0.tgz",
-      "integrity": "sha1-BuDF0KaqrPsAnvVl76HIHpPZAZM="
-    },
    "y18n": {
      "version": "3.2.1",
      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
--- a/package.json
+++ b/package.json
@ -111,9 +111,7 @@
    "webpack-dev-server": "^3.10.3",
    "webpack-manifest-plugin": "^2.2.0",
    "whatwg-fetch": "2.0.3",
-    "wrap-md-editor": "^0.2.20",
-    "xterm": "4.8.1",
-    "xterm-addon-fit": "0.4.0"
+    "wrap-md-editor": "^0.2.20"
  },
  "scripts": {
    "start": "node --max_old_space_size=15360 scripts/start.js",
--- a/public/favicon-.ico
+++ b/public/favicon-.ico
--- a/public/favicon.ico
+++ b/public/favicon.ico
--- a/src/App.js
+++ b/src/App.js
@ -10,7 +10,7 @@ import {
 import axios from 'axios';
 import LoginDialog from './modules/login/LoginDialog';
 import 'babel-polyfill';
-import Loading from './Loading'
+import Loading from './Loading';

 import Loadable from 'react-loadable';
 import marked from './common/marked';
--- a/src/AppConfig.js
+++ b/src/AppConfig.js
@ -2,7 +2,7 @@ import axios from 'axios';
 import { requestProxy } from "./indexEduplus2RequestProxy";
 import { broadcastChannelOnmessage, isDev, queryString } from 'educoder';
 import { notification } from 'antd';
-
+import cookie from 'react-cookies';
 import './index.css';

 let message501 = false;
@ -11,8 +11,10 @@ broadcastChannelOnmessage('refreshPage', () => {
 })

 function locationurl(list) {
-  if (window.location.port !== "3007") {
-  window.location.href = list
+  if (window.location.port === "3007") {
+
+  } else {
+    window.location.href = list
  }
 }
 // TODO 开发期多个身份切换
@ -24,22 +26,53 @@ if (isDev) {
    parsed = queryString.parse(_search);
  }
  debugType = window.location.search.indexOf('debug=t') !== -1 ? 'teacher' :
-  window.location.search.indexOf('debug=s') !== -1 ? 'student' :
-  window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 'admin'
+    window.location.search.indexOf('debug=s') !== -1 ? 'student' :
+      window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || ''
 }                 
+function clearAllCookie() {
+  cookie.remove('_educoder_session', { path: '/' });
+  cookie.remove('autologin_trustie', { path: '/' });
+  setpostcookie()
+}
+clearAllCookie();
+function setpostcookie() {
+  const str = window.location.pathname;
+  if (str.indexOf("/wxcode") !== -1) {
+    cookie.remove('_educoder_session', { path: '/' });
+    cookie.remove('autologin_trustie', { path: '/' });
+    const _params = window.location.search;
+    if (_params) {
+      let _search = _params.split('?')[1];
+      let _educoder_sessions = _search.split('&')[0].split('=');
+      cookie.save('_educoder_session', _educoder_sessions[1], { domain: '.educoder.net', path: '/' });
+      let autologin_trusties = _search.split('&')[1].split('=');
+      cookie.save('autologin_trustie', autologin_trusties[1], { domain: '.educoder.net', path: '/' });
+    }
+  }
+}
+setpostcookie();
+
 window._debugType = debugType;
 export function initAxiosInterceptors(props) {
-  // 判断网络是否连接
  initOnlineOfflineListener();
+  var proxy = "http://localhost:3000";
+    proxy = "http://192.168.1.37:3000";

-  var proxy = "https://testforgeplus.trustie.net";
+  const requestMap = {};
+  window.setfalseInRequestMap = function (keyName) {
+    requestMap[keyName] = false;
+  }
  //响应前的设置
  axios.interceptors.request.use(
    config => {
-      if(config.url.indexOf("http") !== -1) {
+      setpostcookie()
+      clearAllCookie()
+
+      if (config.url.indexOf(proxy) !== -1) {
        return config
      }
-      requestProxy(config);
+      requestProxy(config)
+
      let url = `/api${config.url}`;

      if (`${config[0]}` !== `true`) {
@ -53,6 +86,12 @@ export function initAxiosInterceptors(props) {
        } else {
          config.url = url;
        }
+        setpostcookie();
+      }
+      if (config.url.indexOf('update_file') === -1) {
+        requestMap[config.url] = true;
+
+        window.setTimeout("setfalseInRequestMap('" + config.url + "')", 900)
      }
      return config;
    },
@ -107,6 +146,8 @@ export function initAxiosInterceptors(props) {
        message501 = false
      }, 2000);
    }
+    requestMap[response.config.url] = false;
+    setpostcookie();
    return response;
  }, function (error) {
    return Promise.reject(error);
--- a/src/common/UrlTool.js
+++ b/src/common/UrlTool.js
@ -162,28 +162,28 @@ export function getmyUrl(geturl) {
 }

 export function getUploadActionUrl(path, goTest) {
-	return `${getUrl()}/api/attachments.json${isDev ?`${isDev ?`?debug=${window._debugType || 'admin'}` : ""}` : ""}`;
+	return `${getUrl()}/api/attachments.json?debug=${window._debugType || 'admin'}`;
 }

 export function getUploadLogoActionUrl() {
-	return `${getUrl()}/api/resumes/logo.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`;
+	return `${getUrl()}/api/resumes/logo.json?debug=${window._debugType || 'admin'}`;
 }

 export function getUploadActionUrltwo(id) {
-	return `${getUrlmys()}/api/shixuns/${id}/upload_data_sets.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`
+	return `${getUrlmys()}/api/shixuns/${id}/upload_data_sets.json?debug=${window._debugType || 'admin'}`
 }

 export function getUploadActionUrlthree() {
-	return `${getUrlmys()}/api/jupyters/import_with_tpm.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`
+	return `${getUrlmys()}/api/jupyters/import_with_tpm.json?debug=${window._debugType || 'admin'}`
 }

 export function getupload_git_file(id) {
-	return `${getUrlmys()}/api/shixuns/${id}/upload_git_file.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`
+	return `${getUrlmys()}/api/shixuns/${id}/upload_git_file.json?debug=${window._debugType || 'admin'}`
 }


 export function getUploadActionUrlOfAuth(id) {
-	return `${getUrl()}/api/users/accounts/${id}/auth_attachment.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`
+	return `${getUrl()}/api/users/accounts/${id}/auth_attachment.json?debug=${window._debugType || 'admin'}`
 }

 export function getRandomNumber(type) {
--- a/src/forge/Branch/Select.jsx
+++ b/src/forge/Branch/Select.jsx
@ -102,7 +102,7 @@ export default (({ projectsId , branch , owner , changeBranch , branchList , tag
    </div>
  );
  return(
-    <Popover placement='bottomLeft' visible={flag} content={menu} onClick={()=>setFlag(!flag)} overlayClassName="branch-tagBox-list">
+    <Popover placement="bottom" visible={flag} content={menu} onClick={()=>setFlag(!flag)} overlayClassName="branch-tagBox-list">
      <div className="branch-tagBox">
        {/* {nav === 0 ?"分支":"标签"} */}
        <span className="color-grey-9 mr3 ml8"><i className="iconfont icon-fenzhi2 font-18"></i></span>
--- a/src/forge/Component/Cards.jsx
+++ b/src/forge/Component/Cards.jsx
@ -3,7 +3,7 @@ import { getImageUrl } from 'educoder';
 import { Link } from 'react-router-dom';
 import './Component.scss';

-function Cards({img , title, desc , rightBtn , src , bottomInfos}){
+function Cards({img , title, desc , rightBtn , src}){
  return(
    <div className="cards">
      {img &&<div className="img"><img src={getImageUrl(`/${img}`)} alt=""/></div>}
@ -15,7 +15,6 @@ function Cards({img , title, desc , rightBtn , src , bottomInfos}){
        <div className="desc">
          {desc}
        </div>
-        {bottomInfos}
      </div>
    </div>
  )
--- a/src/forge/Component/Component.scss
+++ b/src/forge/Component/Component.scss
@ -112,9 +112,6 @@ li.ant-menu-item{
  right:240px;
  z-index: 10000;
 }
-.laterest{
-  color: #05690d;
-}

@media screen and (max-width: 1800px){
  .handleBox{
--- a/src/forge/Component/EAccount.scss
+++ b/src/forge/Component/EAccount.scss
@ -1,9 +0,0 @@
-.ant-modal-mask{
-  z-index: 1001;
-}
-.ant-modal-wrap{
-  z-index: 1002;
-  .ant-form-explain{
-    position: absolute;
-  }
-}
--- a/src/forge/Component/EducoderAccount.jsx
+++ b/src/forge/Component/EducoderAccount.jsx
@ -1,60 +0,0 @@
-import React , {forwardRef, useEffect} from 'react';
-import { Modal , Form , Input , Button } from 'antd';
-import './EAccount.scss';
-
-function EducoderAccount({form , visible , onOk , email}){
-  const { getFieldDecorator, validateFields , setFieldsValue } = form;
-
-  useEffect(()=>{
-    if(email){
-      setFieldsValue({email})
-    }
-  },[email])
-
-  function onSure(){
-    validateFields((error,values)=>{
-      if(!error){
-        onOk(values);
-      }
-    })
-  }
-  const layout = {
-    labelCol: { span: 5 },
-    wrapperCol: { span: 18 },
-  };
-  return(
-    <Modal 
-      visible={visible}
-      title="提示"
-      width="500px"
-      closable={false}
-      footer={
-        <Button type="primary" onClick={onSure}>确定</Button>
-      }
-      centered
-    >
-      <div>
-        <p className="mb15 edu-txt-center" style={{maxWidth:"350px",margin:"0px auto"}}>
-        为确保您能正常使用平台功能，请确认以下信息:
-        </p>
-        <Form {...layout}>
-          <Form.Item label="邮箱">
-            {getFieldDecorator("email",{
-              rules:[{required:true,message:"请输入邮箱账号"}]
-            })(
-              <Input placeholder="请输入您的邮箱账号" width="220px"/>
-            )}
-          </Form.Item>
-          <Form.Item label="密码">
-            {getFieldDecorator("password",{
-              rules:[{required:true,message:"请输入邮箱密码"}]
-            })(
-              <Input.Password placeholder="请输入您的邮箱密码" width="220px"/>
-            )}
-          </Form.Item>
-        </Form>
-      </div>
-    </Modal>
-  )
-}
-export default Form.create()(forwardRef(EducoderAccount));
--- a/src/forge/Component/SearchUser.jsx
+++ b/src/forge/Component/SearchUser.jsx
@ -1,49 +1,45 @@
-import React , { useState , useEffect } from 'react';
+import React , { useState } from 'react';
 import { AutoComplete } from 'antd';
 import { getImageUrl } from "educoder";
 import axios from 'axios';

 const Option = AutoComplete.Option;

-export default ({ getUser , placeholder, width ,value })=>{
-  const [ source , setSource ] = useState(undefined);
+export default ({ getUser })=>{
  const [ searchKey , setSearchKey ] = useState(undefined);
-
-  useEffect(()=>{
-    if(!value){
-      setSearchKey(undefined);
-    }
-  },[value])
-  
-  useEffect(()=>{
-    getUserList();
-  },[searchKey])
+  const [ userDataSource , setUserDataSource ] = useState(undefined);

  function getUserList(e){
    const url = `/users/list.json`;
    axios.get(url, {
      params: {
-        search: searchKey,
+        search: e,
      },
-    }).then((result) => {
+    })
+    .then((result) => {
      if (result) {
-        sourceOptions(result.data.users);
+        setUserDataSource(result.data.users);
      }
    })
    .catch((error) => {
      console.log(error);
    });
  };
+  
+  function changeInputUser(value){
+    setSearchKey(value);
+    getUserList(value);
+  }

-  function sourceOptions(userDataSource){
-    const s = userDataSource && userDataSource.map((item, key) => {
+  function selectInputUser(id, option){
+    setSearchKey(option.props.value);
+    getUserList(option.props.value);
+    getUser && getUser(id);
+  }
+  const source =
+    userDataSource && userDataSource.map((item, key) => {
      return (
-        <Option
-          key={key}
-          value={`${item.user_id}`}
-          login={`${item.login}`}
-          name={item.username}
-        >
+        <Option key={key} value={`${item.login}`}>
          <img
            className="user_img radius"
            width="28"
@ -58,31 +54,14 @@ export default ({ getUser , placeholder, width ,value })=>{
        </Option>
      );
    });
-    setSource(s);
-  }
-
-  function changeInputUser(e){
-    setSearchKey(e);
-  };
-
-  // 选择用户
-  function selectInputUser(e, option){
-    setSearchKey(option.props.name);
-    getUser(option.props.login);
-  };
-
  return(
-    <div className="addPanel">
-      <AutoComplete
-        getPopupContainer={trigger => trigger.parentNode}
-        dataSource={source}
-        value={searchKey}
-        style={{ width: width || 300 }}
-        onChange={changeInputUser}
-        onSelect={selectInputUser}
-        placeholder={placeholder || "搜索需要添加的用户..."}
-        allowClear
-      />
-    </div>
+    <AutoComplete
+      dataSource={source}
+      value={searchKey}
+      style={{ width: 300 }}
+      onChange={changeInputUser}
+      onSelect={selectInputUser}
+      placeholder="搜索需要添加的用户..."
+    />
  )
 }
--- a/src/forge/Component/User.jsx
+++ b/src/forge/Component/User.jsx
@ -1,8 +1,8 @@
 import React from 'react';
 import styled from 'styled-components';
-import { Link } from 'react-router-dom';

-export default ({ url , name , column  , id , login })=>{
+
+export default ({ url , name , column })=>{
  const Img = styled.span`
    display:flex;
    ${column && "flex-direction: column;text-align:center;"}
@ -19,14 +19,6 @@ export default ({ url , name , column  , id , login })=>{
    }
  `;
  return(
-    id?
-    <Link to={`/users/${login}`}>
-      <Img>
-        { url && <img src={url} alt=""/> }
-        <span>{name}</span>
-      </Img>
-    </Link>
-    :
    <Img>
      { url && <img src={url} alt=""/> }
      <span>{name}</span>
--- a/src/forge/DevOps/About.jsx
+++ b/src/forge/DevOps/About.jsx
@ -36,7 +36,8 @@ function About(props, ref) {
  const [ disabled, setDisabled ] = useState(false);
  const [ typeFlag, setTypeFlag] = useState(false);

-  const AuthorLogin = props.projectDetail && props.projectDetail.author && props.projectDetail.author.login;
+
+  const AuthorLogin = props.author && props.author.login;
  const CurrentLogin = props.current_user && props.current_user.login;
  useEffect(()=>{
    if(CurrentLogin === AuthorLogin){
@ -55,6 +56,11 @@ function About(props, ref) {
      setIsSpining(false);
      if(result && result.data ){
        setStep(result.data.step);
+        // setStep(0);
+        // setFieldsValue({...result.data.cloud_account});
+        // if(result.data.cloud_account){
+        //   setDisabled(true);
+        // }
      }
    }).catch(error=>{
      setIsSpining(false);
--- a/src/forge/DevOps/OpsDetailRightpanel.jsx
+++ b/src/forge/DevOps/OpsDetailRightpanel.jsx
@ -1,8 +1,7 @@
 import React, { useState, useEffect } from "react";
-import { Spin , Menu } from "antd";
+import { Spin } from "antd";
 import { FlexAJ, AlignCenter } from "../Component/layout";
 import axios from "axios";
-import CodeSSH from './ssh/Index';

 export default ({
  data,
@ -18,8 +17,6 @@ export default ({
  const [spining, setSpining] = useState(true);
  const [stage, setStage] = useState(undefined);
  const [step, setStep] = useState(undefined);
-  const [nav, setNav] = useState("0");
-
  useEffect(() => {
    setSpining(rightSpin);
  }, [rightSpin]);
@ -38,7 +35,6 @@ export default ({
          : p[0];

        setStep(sub);
-        setNav("0");
        if (sub && sub.status !== "skipped") {
          getStep(pre.number, sub.number);
        }
@ -69,55 +65,43 @@ export default ({
    }
  }
  return (
-    <React.Fragment>
-      {/* <Menu className="devopsNav" onClick={(e)=>{setNav(e.key)}} selectedKeys={[nav]} mode="horizontal">
-        <Menu.Item key={'0'} value="0">开发流水线</Menu.Item>
-        <Menu.Item key={'1'} value="1">命令行</Menu.Item>
-      </Menu> */}
-      {
-        nav === "0" &&
-        <Spin spinning={spining}>
-          <div className="rightMainContent">
-            {data && data.status !== "error" ? (
-              <div>
-                <FlexAJ className="items">
-                  <span>{step && step.name}</span>
-                  <AlignCenter>
-                    {step && step.duration_time}
-                    <i className="iconfont icon-sanjiaoxing-down"></i>
-                  </AlignCenter>
-                </FlexAJ>
-                <div>
-                  {coders && coders.length > 0 ? (
-                    coders.map((item, key) => {
-                      return (
-                        <div className="opsDetailOut">
-                          <span>{key + 1}</span>
-                          <p>{item.out}</p>
-                        </div>
-                      );
-                    })
-                  ) : empty ? (
+    <Spin spinning={spining}>
+      <div className="rightMainContent">
+        {data && data.status !== "error" ? (
+          <div>
+            <FlexAJ className="items">
+              <span>{step && step.name}</span>
+              <AlignCenter>
+                {step && step.duration_time}
+                <i className="iconfont icon-sanjiaoxing-down"></i>
+              </AlignCenter>
+            </FlexAJ>
+            <div>
+              {coders && coders.length > 0 ? (
+                coders.map((item, key) => {
+                  return (
                    <div className="opsDetailOut">
-                      <span>1</span>
-                      <p>
-                        {stage && stage.name} – {step && step.name}: Skipped
-                      </p>
+                      <span>{key + 1}</span>
+                      <p>{item.out}</p>
                    </div>
-                  ) : (
-                    ""
-                  )}
+                  );
+                })
+              ) : empty ? (
+                <div className="opsDetailOut">
+                  <span>1</span>
+                  <p>
+                    {stage && stage.name} – {step && step.name}: Skipped
+                  </p>
                </div>
-              </div>
-            ) : (
-              <div style={{ color: "red" }}>error:{data && data.error}</div>
-            )}
+              ) : (
+                ""
+              )}
+            </div>
          </div>
-        </Spin>
-      }
-      {
-        nav === "1" && <CodeSSH />
-      }
-    </React.Fragment>
+        ) : (
+          <div style={{ color: "red" }}>error:{data && data.error}</div>
+        )}
+      </div>
+    </Spin>
  );
 };
--- a/src/forge/DevOps/Structure.jsx
+++ b/src/forge/DevOps/Structure.jsx
@ -58,7 +58,6 @@ function Structure(props,ref){
          return {
            ...item,
            author:item.author && item.author.name,
-            image_url:item.author && item.author.image_url,
            message: {
              branch: item.branch_target,
              message: item.message,
@ -245,7 +244,7 @@ function Structure(props,ref){
              {meg.sha && <span className="color-orange">{meg.sha}</span>}
            </div>
            <AlignCenter>
-              <img style={{borderRadius:"50%",marginRight:"10px",width:"25px",height:"25px"}} alt="" src={`${item.image_url && getUrl(`/images/${item.image_url}`)}`} />
+              <img style={{borderRadius:"50%",marginRight:"10px",width:"25px",height:"25px"}} src={`${current_user && getUrl(`/images/${current_user.image_url}`)}`} />
              <div className="task-hide ml5" style={{ maxWidth: "300px" }}>
                {meg.message}
              </div>
--- a/src/forge/DevOps/ops.scss
+++ b/src/forge/DevOps/ops.scss
@ -194,18 +194,6 @@
      &.rightSection{
        width:100%;
        background-color: #081930;
-        .devopsNav{
-          background-color: #111c24;
-          border-bottom: none;
-          .ant-menu-item{
-            color: #ccc;
-            padding:0px;
-            margin:0px 20px!important;
-          }
-          .ant-menu-item.ant-menu-item-selected{
-            color: #1890ff;
-          }
-        }
        .rightMainContent{
          padding:24px 30px;
          height:100vh;
--- a/src/forge/DevOps/ssh/Index.jsx
+++ b/src/forge/DevOps/ssh/Index.jsx
@ -1,42 +0,0 @@
-import React, { useState, useEffect } from "react";
-import XmlPanel from "./XmlPanel";
-import mediator from "./mediator";
-import axios from "axios";
-
-// const defaulturl = `http://47.111.130.18:48088`;
-const defaultValue = {
-  host: "106.75.231.63",
-  port: "2021",
-  ws_url: "wss://pre-webssh.educoder.net/ws",
-  username: "root",
-  secret: "Dron_123123",
-};
-function Index() {
-  const [sshConfigData, setSshConfigData] = useState(undefined);
-
-  useEffect(() => {
-    if (!sshConfigData) {
-      init();
-    }
-    setTimeout(() => {
-      mediator.publish("create-socket", 1);
-    }, 300);
-  }, [sshConfigData]);
-
-  // 获取服务器连接信息
-  function init() {
-    const url = `/api/ci/pipelines/ssh_server.json`;
-    axios.get(url).then(result=>{
-      if(result && result.data){
-        setSshConfigData({...result.data})
-      }
-    }).catch(error=>{})
-  }
-  return (
-    <XmlPanel
-      sshConfigData={sshConfigData||{}}
-      sid={1}
-    />
-  );
-}
-export default Index;
--- a/src/forge/DevOps/ssh/XmlPanel.jsx
+++ b/src/forge/DevOps/ssh/XmlPanel.jsx
@ -1,219 +0,0 @@
-import React, { useRef, useEffect, useState } from 'react';
-import { Base64 } from 'js-base64';
-
-import { Terminal } from 'xterm';
-import 'xterm/css/xterm.css';
-import mediator from './mediator';
-import ResizeObserver from 'resize-observer-polyfill';
-
-function getColsAndRows(width, height, term) {
-  let w = term._core._renderService.dimensions.actualCellWidth || 9.5;
-  let h = term._core._renderService.dimensions.actualCellHeight || 18;
-  const rows = Math.floor(height / h);
-  const cols = Math.floor(width / w);
-  return [cols, rows];
-}
-
-function onLayout(term, el) {
-  const ro = new ResizeObserver(entries => {
-    console.log(entries);
-    for (let entry of entries) {
-      if (entry.target.offsetHeight > 0 || entry.target.offsetWidth > 0) {
-        const [cols, rows] = getColsAndRows(
-          entry.target.offsetWidth,
-          entry.target.offsetHeight,
-          term,
-        );
-        console.log('cols, rows', cols, rows);
-        term.resize(cols, rows);
-        mediator.publish('ssh-xterm-resize', {
-          columns: cols,
-          rows: rows,
-          width: entry.target.offsetWidth,
-          height: entry.target.offsetHeight,
-        });
-      }
-    }
-  });
-  ro.observe(el);
-  return ro;
-}
-
-const TimeTicket = 30000;
-
-//建立 websockt 来交互
-//根据容器大小计算行数和列数并做到自适应
-//socket 与 term 需要分开初始化 因为socket 可能重置连接
-//mediator 监听消息，如果和id匹配，则建立连接，重置，或关闭连接
-
-export default ({ sshConfigData, sid }) => {
-  const [term, setTerm] = useState(null);
-
-  const { ws_url, password, port, secret } = sshConfigData;
-  const el = useRef();
-  const socket = useRef();
-  const isFirstConnected = useRef(false);
-
-  //term init
-  useEffect(() => {
-    if (el.current && ws_url) {
-      const term = new Terminal({ fontSize: 16, rendererType: 'dom' });
-      term.open(el.current);
-
-      term.onData(data => {
-        if (socket.current) {
-          if (socket.current.readyState === 1) {
-            socket.current.send(JSON.stringify({ tp: 'client', data: data }));
-            mediator.publish('on-operating-ssh'); //有操作则自动延时
-          } else {
-            //断开连接后重连
-            // socket.current = null
-            // mediator.publish('create-socket', sid)
-          }
-        }
-      });
-      term.write('Connecting...');
-      setTerm(term);
-      const ro = onLayout(term, el.current);
-      return () => {
-        term.dispose();
-        ro.unobserve(el.current);
-      };
-    }
-  }, [ws_url, el.current]);
-
-  useEffect(() => {
-    if (term && ws_url) {
-      function createSocket() {
-        const socketInstance = new WebSocket(ws_url);
-        socket.current = socketInstance;
-
-        socketInstance.onopen = () => {
-          let container = term.element.parentElement;
-          if (container) {
-            let width = container.offsetWidth;
-            let height = container.offsetHeight;
-            console.log('init', {
-              tp: 'init',
-              data: {
-                ...sshConfigData,
-                secret: secret,
-                width,
-                height,
-                rows: term.rows,
-                columns: term.cols,
-              },
-            });
-            socketInstance.send(
-              JSON.stringify({
-                tp: 'init',
-                data: {
-                  ...sshConfigData,
-                  secret: secret,
-                  width,
-                  height,
-                  rows: term.rows,
-                  columns: term.cols,
-                },
-              }),
-            );
-          }
-          term.focus();
-        };
-        socketInstance.onerror = error => {
-          console.log(
-            '------in socket error----',
-            error,
-            socketInstance,
-            ws_url,
-          );
-          //连接报错后，重新请求资源
-          // mediator.publish('on-recreate-socket')
-        };
-        socketInstance.onmessage = event => {
-          if (!isFirstConnected.current) {
-            term.write('\r');
-            // term.focus()
-            setTimeout(() => {
-              // term.clear();
-            }, 1000);
-          }
-          isFirstConnected.current = true;
-          console.log('event:', event);
-
-          const data = Base64.decode(event.data.toString());
-          let w = term._core._renderService.dimensions.actualCellWidth || 9.5;
-
-          console.log('data:', data, w, term);
-          term.write(data);
-        };
-
-        socketInstance.onclose = evt => {
-          if (tid) {
-            clearInterval(tid);
-          }
-          term.write('\r\nconnection closed');
-        };
-      }
-
-      const tid = setInterval(() => {
-        if (socket.current) {
-          socket.current.send(JSON.stringify({ tp: 'h' }));
-        }
-      }, TimeTicket);
-
-      const unSubCreate = mediator.subscribe('create-socket', id => {
-        if (sid === id) {
-          if (socket.current && socket.current.readyState === 1) {
-            term.focus();
-          } else {
-            createSocket();
-          }
-          term.focus();
-        }
-      });
-
-      const unSubClose = mediator.subscribe('close-socket', id => {
-        if (sid === id) {
-          if (socket.current) {
-            socket.current.close();
-            isFirstConnected.current = false;
-            term.clear();
-          }
-          socket.current = null;
-        }
-      });
-
-      const unSubResize = mediator.subscribe('ssh-xterm-resize', option => {
-        if (socket.current && socket.current.readyState === 1) {
-          socket.current.send(
-            JSON.stringify({ tp: 'resize', data: { ...option } }),
-          );
-        }
-      });
-
-      const unSubAddTime = mediator.subscribe('ssh-add-connect-time', () => {
-        if (socket.current && socket.current.readyState === 1) {
-          socket.current.send(JSON.stringify({ tp: 'overtime' }));
-        }
-      });
-
-      return () => {
-        unSubClose();
-        unSubCreate();
-        unSubResize();
-        unSubAddTime();
-        if (socket.current) {
-          socket.current.close();
-          isFirstConnected.current = false;
-        }
-      };
-    }
-  }, [term, ws_url, port]);
-
-  return (
-    <div ref={el} className="xterm-panel" style={{height:"100%"}}>
-      {!ws_url ? <p style={{ color: '#fff' }}>正在连接命令行服务...</p> : null}
-    </div>
-  );
-};
--- a/src/forge/DevOps/ssh/mediator.jsx
+++ b/src/forge/DevOps/ssh/mediator.jsx
@ -1,46 +0,0 @@
-function Mediator(obj) {
-  const channels = {};
-
-  const mediator = {
-    subscribe: function(channel, cb) {
-      if (!channels[channel]) {
-        channels[channel] = [];
-      }
-      channels[channel].push(cb);
-      return this.unsubscribe.bind(null, channel, cb);
-    },
-
-    unsubscribe: function(channel, cb) {
-      let rs = channels[channel];
-      let index = -1;
-      if (rs) {
-        for (let i = 0; i < rs.length; i++) {
-          if (rs[i].name === cb.name) {
-            index = i;
-            break;
-          }
-        }
-        if (index >= 0) {
-          channels[channel].splice(index, 1);
-          return true;
-        }
-      }
-      return false;
-    },
-
-    publish: function(channel) {
-      if (!channels[channel]) {
-        return false;
-      }
-      const args = Array.prototype.slice.call(arguments, 1);
-      channels[channel].forEach(subscription => {
-        subscription.apply(null, args);
-      });
-      return this;
-    },
-  };
-
-  return obj ? Object.assign(obj, mediator) : mediator;
-}
-const mediator = new Mediator();
-export default mediator;
--- a/src/forge/Divert/Index.scss
+++ b/src/forge/Divert/Index.scss
@ -1,12 +0,0 @@
-.diverModal{
-  .descUl{
-    background-color: #fffae6;
-    border-radius: 4px;
-    padding:10px 15px;
-    color: #efc16b;
-    border:1px solid #efc16b;
-  }
-  .ant-form-item-required::before{
-    content: "";
-  }
-}
--- a/src/forge/Head/Header.js
+++ b/src/forge/Head/Header.js
@ -109,7 +109,7 @@ class NewHeader extends Component {
  }

  onGlobalSearch=(value,item)=>{
-    window.location.href=`${item}?value=` + value;
+    window.location.href=`${item && item.url}?value=` + value;
  }

  openNotification = (messge) => {
@ -401,39 +401,13 @@ class NewHeader extends Component {
      visiblemyss: boll,
    })
  }
-
-  getAppdata = () => {
-    try {
-      var chromesettingArray = JSON.parse(localStorage.getItem('chromesetting'));
-      var chromesettingresponseArray = JSON.parse(localStorage.getItem('chromesettingresponse'));
-      this.setState({
-        settings: chromesettingArray
-      });
-      if (chromesettingArray.tab_logo_url) {
-        this.gettablogourldata(chromesettingresponseArray);
-      } else {
-        this.gettablogourlnull();
-      }
-    } catch (e) {
-      this.geturlsdata();
-    }
-  };
-
  geturlsdata = () => {
    let url = "/setting.json";
    axios.get(url).then((response) => {
      if (response && response.data) {
        this.setState({ settings: response.data.setting });
-        // localStorage.setItem('chromesetting', JSON.stringify(response.data.setting));
-        // localStorage.setItem('chromesettingresponse', JSON.stringify(response));
-        try {
-          if (response.data.setting.tab_logo_url) {
-            this.gettablogourldata(response);
-          } else {
-            this.gettablogourlnull();
-          }
-        } catch (e) {
-          this.gettablogourlnull();
+        if (response.data.setting.tab_logo_url) {
+          this.gettablogourldata(response);
        }
      } else {
        this.gettablogourlnull();
@ -480,19 +454,14 @@ class NewHeader extends Component {
  }

  render() {
-    const { match} = this.props;
+    const { match } = this.props;
    let current_user = this.props.user;
-    let { Addcoursestypes,
-      tojoinitemtype,
-      tojoinclasstitle,
-      code_notice,
-      checked_notice,
+    let { 
      AccountProfiletype,
      submitapplications,
      submitapplicationsvalue,
      user,
      isRender,
-      showSearchOpentype,
      headtypesonClickbool,
      headtypess,
      settings,
@ -575,8 +544,8 @@ class NewHeader extends Component {
      })
    }

-    let search_url = settings && settings.common && settings.common.search;
-    let notice_url = settings && settings.common && settings.common.notice;
+    let search_url = settings && settings.common && settings.common.length> 0 && settings.common.filter(item=>item.name==="搜索");
+    let notice_url = settings && settings.common && settings.common.length> 0 && settings.common.filter(item=>item.name==="通知");
    return (
      <div className="newHeaders" id="nHeader">
        <div className="headerContent">
@ -644,7 +613,7 @@ class NewHeader extends Component {
            }
          </div>
          <div className="head-right">
-            {search_url ? this.SearchInput(openSearch,search_url):""}
+            {search_url && search_url.length>0 ? this.SearchInput(openSearch,search_url[0]):""}
            {
              current_user && (current_user.main_site || current_user.login) && (settings && settings.add && settings.add.length>0)?
              <Dropdown overlay={this.addMenu(settings && settings.add)} placement="bottomRight">
@ -652,10 +621,10 @@ class NewHeader extends Component {
              </Dropdown>:""
            }
            
-            {this.props.user && this.props.user.login && notice_url ?
+            {this.props.user && this.props.user.login && (notice_url && notice_url.length>0) ?
              <div className="ml30 edu-menu-panel">
                {user && user.login &&
-                  <a href={`${notice_url}`} style={{ position: 'relative' }}>
+                  <a href={`${notice_url[0].url}`} style={{ position: 'relative' }}>
                    <i className="iconfont icon-xiaoxilingdang color-grey-6"></i>
                    <span className="newslight" style={{ display: this.props.Headertop === undefined ? "none" : this.props.Headertop.new_message === true ? "block" : "none" }}>
                    </span>
--- a/src/forge/Main/Detail.js
+++ b/src/forge/Main/Detail.js
@ -496,11 +496,9 @@ class Detail extends Component {
                    }
                  </span>
                  <span className="detail_tag_btn">
-                    <Tooltip title="复刻是fork的中文名，即复制代码仓库" placement="bottom">
-                      <a className="detail_tag_btn_name" style={{cursor:platform?"pointer":"default"}} onClick={this.forkFunc}>
-                        <i className="iconfont icon-fork color-grey-9 mr3"></i>复刻
-                      </a>
-                    </Tooltip>
+                    <a className="detail_tag_btn_name" style={{cursor:platform?"pointer":"default"}} onClick={this.forkFunc}>
+                      <i className="iconfont icon-fork color-grey-9 mr3"></i>复刻 (Fork)
+                    </a>
                    {
                      forked_count > 0 ?
                      platform ?
@ -518,7 +516,6 @@ class Detail extends Component {
            {
              firstSync ? "" :
              <DetailBanner 
-                history={this.props.history}
                list={bannerList}
                owner={owner}
                projectsId={projectsId}
--- a/src/forge/Main/Index.scss
+++ b/src/forge/Main/Index.scss
@ -83,10 +83,10 @@
  }
  .addOptionBtn{
    height: 32px;
-    line-height: 30px;
+    line-height: 32px;
    display: flex;
    border:1px solid #d9d9d9;
-    border-radius: 2px;
+    border-radius: 4px;
    a{
      padding:0px 13px;
      color: rgba(0, 0, 0, 0.65);
@ -95,9 +95,6 @@
    & > a:first-child{
      border-right: 1px solid #d9d9d9;
    }
-    & > a:last-child{
-      border-right: none;
-    }
  }
  .infoCount{
    display: inline-block;
@ -260,30 +257,20 @@
 .drawerBtn{
  position: fixed;
  left: -13px;
-  border:1px solid rgb(207,205,223);
+  border:1px solid #d9d9d9;
  width: 34px;
  border-radius: 0px 12px 12px 0px;
+  text-align: right;
  height: 70px;
+  line-height: 70px;
  top:50%;
  margin-top: -35px;
  cursor: pointer;
-  display: flex;
-  flex-direction: column;
-  align-items: flex-end;
-  justify-content: center;
  &:hover{
    box-shadow: 1px 0px 7px rgba(0,0,0,0.1);
  }
-  span{
-    writing-mode: vertical-lr;
-    color: #202429;
-    width: 25px;
-  }
  i{
-    color: #24292e;
-    height: 18px;
-    line-height: 18px;
-    width: 18px;
+    color: #d9d9d9;
  }
 }
 .downMenu{
--- a/src/forge/Main/sub/DetailBanner.jsx
+++ b/src/forge/Main/sub/DetailBanner.jsx
@ -1,18 +1,11 @@
 import React, { useEffect, useState } from 'react';
-import { Skeleton , Tooltip} from 'antd';
+import { Skeleton } from 'antd';
 import { Link } from 'react-router-dom';

-function DetailBanner({ history,list , owner , projectsId , isManager , url , pathname , state , urlFlag , projectDetail , platform ,open_devops }){
+function DetailBanner({ list , owner , projectsId , isManager , url , pathname , state , urlFlag , projectDetail , platform ,open_devops }){
  const [ menuName , setMenuName ] = useState(undefined);
  useEffect(()=>{
    if(list){
-      // 没有资源库banner但是通过连接进资源库页面时
-      if(pathname && pathname==="source"){
-        let a = list.filter(item=>item.menu_name === "resources");
-        if(a && a.length === 0){
-          history.push(`/projects/${owner}/${projectsId}`);
-        }
-      }
      setMenuName(list);
    }
  },[list]);
@ -46,13 +39,11 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
                  {
                    item.menu_name === "issues" &&
                    <li className={pathname==="issues" ? "active" : ""}>
-                      <Tooltip title="易修是Issue的中文名，即问题列表" placement="bottom">
-                        <Link to={{ pathname: `/projects/${owner}/${projectsId}/issues`, state }}>
-                          <i className={pathname==="issues" ? "iconfont icon-renwu color-grey-3 mr5 font-14":"iconfont icon-renwu color-grey-6 font-14 mr5"}></i>
-                          <span>易修</span>
-                          {projectDetail && projectDetail.issues_count ? <span className="num">{projectDetail.issues_count}</span> : ""}
-                        </Link>
-                      </Tooltip>
+                      <Link to={{ pathname: `/projects/${owner}/${projectsId}/issues`, state }}>
+                        <i className={pathname==="issues" ? "iconfont icon-renwu color-grey-3 mr5 font-14":"iconfont icon-renwu color-grey-6 font-14 mr5"}></i>
+                        <span>易修 (Issue)</span>
+                        {projectDetail && projectDetail.issues_count ? <span className="num">{projectDetail.issues_count}</span> : ""}
+                      </Link>
                    </li>
                  }
                  {
@ -75,8 +66,8 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
                    </li>
                    :""
                  }
-                  {/* {
-                    item.menu_name === "resources" &&
+                  {
+                    item.menu_name === "source" &&
                    <li className={pathname==="source" ? "active" : ""}>
                      <Link to={{ pathname: `/projects/${owner}/${projectsId}/source`, state }}>
                          <i className={pathname==="source" ? "iconfont icon-ziyuanpaihanghetuijian color-grey-3 mr5 font-14":"iconfont icon-ziyuanpaihanghetuijian color-grey-6 font-14 mr5"}></i>
@ -84,7 +75,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
                          {projectDetail && projectDetail.source_count ? <span className="num">{projectDetail.source_count}</span> :""}
                      </Link>
                    </li>
-                  } */}
+                  }
                  {
                    item.menu_name === "versions" &&
                    <li className={pathname==="milestones" ? "active" : ""}>
@ -104,19 +95,19 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
                      </Link>
                    </li>
                  }
-                  {
-                    item.menu_name === "setting" &&
-                    <li className={pathname === "setting" ? "active" : ""}>
-                      <Link to={`/projects/${owner}/${projectsId}/setting`}>
-                        <i className={url && url.indexOf("/setting") > 0 ? "iconfont icon-cangku color-grey-3 mr5 font-14":"iconfont icon-cangku color-grey-6 font-14 mr5"}></i>
-                        <span>仓库设置</span>
-                      </Link>
-                    </li>
-                  }
                </React.Fragment>
              )
            })
          }
+          {
+            isManager && platform ? 
+            <li className={pathname === "setting" ? "active" : ""}>
+              <Link to={`/projects/${owner}/${projectsId}/setting`}>
+                <i className={url && url.indexOf("/setting") > 0 ? "iconfont icon-cangku color-grey-3 mr5 font-14":"iconfont icon-cangku color-grey-6 font-14 mr5"}></i>
+                <span>仓库设置</span>
+              </Link>
+            </li>:""
+          }
        </ul>
        :
        <Skeleton paragraph={false} active={true}/>
--- a/src/forge/Main/sub/UpdateDescModal.jsx
+++ b/src/forge/Main/sub/UpdateDescModal.jsx
@ -2,13 +2,13 @@ import React , { forwardRef, useEffect } from 'react';
 import {Form , Modal , Input } from 'antd';
 import "./sub.scss";
 const { TextArea } = Input;
-function UpdateDescModal({form , visible , onCancel , onOk,desc,website,lesson_url}){
+function UpdateDescModal({form , visible , onCancel , onOk,desc,website}){
  const { getFieldDecorator, validateFields , setFieldsValue } = form;

  useEffect(()=>{
    if(desc || website){
      setFieldsValue({
-        website,desc,lesson_url
+        website,desc
      })
    }
  },[desc,website])
@ -17,7 +17,7 @@ function UpdateDescModal({form , visible , onCancel , onOk,desc,website,lesson_u
    validateFields((err,values)=>{
      if(!err){
        onCancel();
-        onOk(values.desc,values.website,values.lesson_url)
+        onOk(values.desc,values.website)
      }
    })
  }
@ -49,13 +49,6 @@ function UpdateDescModal({form , visible , onCancel , onOk,desc,website,lesson_u
            <Input placeholder="website链接"/>
          )}
        </Form.Item>
-        <Form.Item label="实践课程">
-          {getFieldDecorator("lesson_url",{
-            rules:[]
-          })(
-            <Input placeholder="实践课程链接"/>
-          )}
-        </Form.Item>
      </Form>
    </Modal>
  )
--- a/src/forge/Merge/merge.js
+++ b/src/forge/Merge/merge.js
@ -253,6 +253,24 @@ class merge extends Component {
        </Menu.Item>
      </Menu>
    );
+
+    const Paginations = (
+      <React.Fragment>
+        {search_count > limit ? (
+          <div className="mt30 mb50 edu-txt-center">
+            <Pagination
+              simple
+              defaultCurrent={page}
+              total={search_count}
+              pageSize={limit}
+              onChange={this.ChangePage}
+            ></Pagination>
+          </div>
+        ) : (
+          ""
+        )}
+      </React.Fragment>
+    );
    return (
      <div className="main" style={{padding:"0px"}}>
        <div className="topWrapper" style={{borderBottom:"none",padding:"20px"}}>
@ -401,21 +419,9 @@ class merge extends Component {
                  {...this.props}
                  {...this.state}
                ></OrderItem>
+                {Paginations}
              </div>
            ):""}
-            {search_count > select_params.limit ? (
-              <div className="mt30 mb50 edu-txt-center">
-                <Pagination
-                  simple
-                  current={select_params.page}
-                  total={search_count}
-                  pageSize={select_params.limit}
-                  onChange={this.ChangePage}
-                ></Pagination>
-              </div>
-            ) : (
-              ""
-            )}
            { data && data.issues && data.issues.length === 0 ? <NoneData _html="暂时还没有相关数据!" projectsId={projectsId} owner={owner} /> :""}
          </Spin>
        </div>
--- a/src/forge/Notice/Index.jsx
+++ b/src/forge/Notice/Index.jsx
@ -1,88 +0,0 @@
-import React, { useEffect, useState } from "react";
-import { Link } from 'react-router-dom';
-import './Index.scss';
-
-import Loadable from "react-loadable";
-import Loading from "../../Loading";
-import { Route, Switch } from "react-router-dom";
-
-const Notify = Loadable({
-  loader: () => import("./Notify"),
-  loading: Loading,
-});
-const UndoEvent = Loadable({
-  loader: () => import("./UndoEvent"),
-  loading: Loading,
-});
-function Index(props){
-  const username = props.match.params.username;
-  const pathname = props.history.location.pathname;
-  const user = props.user;
-  const undo_messages = props.undo_messages;
-
-  const [ menu , setMenu ] = useState("notify");
-  const [ messages , setMessages ] = useState(0);
-  const [ transferProjects , setTransferProjects ] = useState(0);
-
-  useEffect(()=>{
-    if(user){
-      setTransferProjects(user.undo_transfer_projects);
-    }
-    if(undo_messages){
-      setMessages(undo_messages);
-    }
-  },[user,undo_messages])
-
-  useEffect(()=>{
-    if(pathname && username){
-      if(pathname === `/users/${username}/notice`){
-        setMenu("notify");
-      }
-      if(pathname === `/users/${username}/notice/undo`){
-        setMenu("undo");
-      }
-    }
-  },[pathname])
-
-  function fetchUser(){
-    props && props.fetchUser();
-  }
-
-  function changeNum(){
-    fetchUser();
-  }
-
-  return (
-    <div>
-      <ul className="noticeMenu">
-        <li className={menu === "notify" ? "active":""}>
-          <Link to={`/users/${username}/notice`} onClick={changeNum}>
-            <span>通知</span>
-            {messages ? <span className="unNum">{messages}</span>:""}
-          </Link>
-        </li>
-        <li className={menu === "undo" ? "active":""}>
-          <Link to={`/users/${username}/notice/undo`}>
-            <span>接收仓库</span>
-            {transferProjects ? <span className="unNum">{transferProjects}</span>:""}
-          </Link>
-        </li>
-      </ul>
-      <Switch>
-        <Route
-          path="/users/:username/notice/undo"
-          render={(p) => {
-            return <UndoEvent {...props} {...p} fetchUser={fetchUser}/>;
-          }}
-        ></Route>
-        <Route
-          path="/users/:username/notice"
-          render={(p) => {
-            return <Notify {...props} {...p} fetchUser={fetchUser}/>;
-          }}
-        ></Route>
-      </Switch>
-  </div>
-  );
-}
-export default Index;
--- a/src/forge/Notice/Index.scss
+++ b/src/forge/Notice/Index.scss
@ -1,72 +0,0 @@
-.noticeMenu{
-  padding:0px 20px;
-  display: flex;
-  border-bottom: 1px solid #eee;
-  height: 54px;
-  line-height: 54px;
-  li{
-    font-size: 16px;
-    padding:0px;
-    margin:0px 30px 0px 20px!important;
-    height: 54px;
-    line-height: 54px;
-    position: relative;
-    transform: none;
-    a{
-      display: flex;
-      &>span{
-        position: relative;
-      }
-    }
-    &.active a span:first-child::after{
-      position: absolute;
-      bottom: 0px;
-      height: 2px;
-      left: 0px;
-      content: "";
-      background-color: #1890ff;
-      width: 100%;
-    }
-    .unNum{
-      color: #d38900;
-      font-size: 12px;
-      border-radius: 13px;
-      height: 16px;
-      line-height: 16px;
-      padding:0px 4px;
-      min-width: 23px;
-      text-align: center;
-      background-color: #ffe4b3;
-      margin-top: 19px;
-      margin-left: 10px;
-      display: block;
-    }
-  }
-}
-.notifyList{
-  padding:0px 20px;
-  min-height: 400px;
-  li{
-    display: flex;
-    border-bottom: 1px solid #eee;
-    padding:20px 0px;
-    .notifyImg{
-      width: 48px;
-      height: 48px;
-      border-radius: 50%;
-      margin-right: 15px;
-    }
-    .notifyFlex{
-      flex:1;
-      p{
-        margin:0px;
-      }
-      .notifyInfos{
-        margin-bottom: 8px;
-      }
-    }
-    &:last-child{
-      border-bottom: none;
-    }
-  }
-}
--- a/src/forge/Notice/Notify.jsx
+++ b/src/forge/Notice/Notify.jsx
@ -1,91 +0,0 @@
-import React, { useEffect, useState } from "react";
-import Nodata from '../Nodata';
-import {Pagination } from 'antd';
-import { Link } from 'react-router-dom';
-import { getImageUrl } from 'educoder';
-import Axios from "axios";
-
-const limit = 15;
-function Notify(props){
-  const username = props.match.params.username;
-  const [ list , setList ] = useState(undefined);
-  const [ page , setPage ] = useState(1);
-  const [ total , setTotal ] = useState(0);
-
-  useEffect(()=>{
-    if(username){
-      getList();
-    }
-  },[username,page])
-
-  function getList(){
-    const url = `/users/${username}/applied_messages.json`;
-    Axios.get(url,{
-      params:{
-        page,per_page:limit
-      }
-    }).then(result=>{
-      if(result){
-        setList(result.data.applied_messages);
-        setTotal(result.data.total_count);
-      }
-    }).catch(error=>{})
-  }
-
-  function renderStatus(status,applied){
-    let { project , owner} = applied
-    if(status){
-      switch(status){
-        case 'canceled':
-          return <p>取消转移【<Link to={`/projects/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】仓库</p>
-        case 'common':
-          return <p>正在将【<Link to={`/projects/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】仓库转移给【<Link to={`/users/${owner && owner.login}`}>{owner && owner.name}</Link>】</p>
-          case 'successed':
-          return <p>【<Link to={`/projects/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】仓库成功转移给【<Link to={`/users/${owner && owner.login}`}>{owner && owner.name}</Link>】</p>
-        default:
-          return <p>拒绝转移【<Link to={`/projects/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】仓库</p>
-      }
-
-    }else{
-      return ""
-    }
-  }
-
-  return(
-    <div>
-      {
-        list && list.length > 0 ? 
-        <div>
-          <ul className="notifyList">
-            {
-              list.map((i,k)=>{
-                return(
-                  <li>
-                    <Link to={`/users/${i.login}`}><img src={getImageUrl(`/${i.applied_user && i.applied_user.image_url}`)} alt="" className="notifyImg"/></Link>
-                    <div className="notifyFlex">
-                      <p className="notifyInfos">
-                        <Link to={`/users/${i.applied_user && i.applied_user.login}`} className="font-15 mr20">{i.applied_user && i.applied_user.name}</Link>
-                        <span className="color-grey-9">{i.time_ago}</span>
-                      </p>
-                      {renderStatus(i.status,i.applied)}
-                    </div>
-                  </li>
-                )
-              })
-            }
-          </ul>
-        </div>
-        :
-        ""
-      }
-      {list && list.length === 0 && <Nodata _html="暂无通知" />}
-      {
-        total > limit && 
-        <div className="edu-txt-center pt20 pb20">
-          <Pagination simple pageSize={limit} total={total} current={page} onChange={(p)=>{setPage(p)}}/>
-        </div>
-      }
-    </div>
-  )
-}
-export default Notify;
--- a/src/forge/Notice/UndoEvent.jsx
+++ b/src/forge/Notice/UndoEvent.jsx
@ -1,118 +0,0 @@
-import React, { useEffect, useState } from "react";
-import Nodata from '../Nodata';
-import { FlexAJ } from '../Component/layout';
-import { Pagination , Popconfirm } from 'antd';
-import { Link } from 'react-router-dom';
-import { getImageUrl } from 'educoder';
-import Axios from 'axios';
-
-const limit = 15;
-function UndoEvent(props){
-  const username = props.match.params.username;
-  const [ list , setList ] = useState(undefined);
-  const [ page , setPage ] = useState(1);
-  const [ total , setTotal ] = useState(0);
-
-  useEffect(()=>{
-    if(username){
-      getList();
-    }
-  },[username,page])
-
-  function getList(){
-    const url = `/users/${username}/applied_transfer_projects.json`;
-    Axios.get(url,{
-      params:{
-        page,per_page:limit
-      }
-    }).then(result=>{
-      if(result){
-        setList(result.data.applied_transfer_projects);
-        setTotal(result.data.total_count);
-      }
-    }).catch(error=>{})
-  }
-
-  // 接受
-  function acceptDivert(id){
-    const url =  `/users/${username}/applied_transfer_projects/${id}/accept.json`;
-    Axios.post(url).then(result=>{
-      if(result && result.data){
-        getList();
-        props && props.fetchUser();
-      }
-    }).catch(error=>{})
-  }
-
-  // 拒绝
-  function revertDivert(id){
-    const url =  `/users/${username}/applied_transfer_projects/${id}/refuse.json`;
-    Axios.post(url).then(result=>{
-      if(result && result.data){
-        getList();
-        props && props.fetchUser();
-      }
-    }).catch(error=>{})
-  }
-
-  return(
-    <div>
-      {
-        list && list.length > 0 ? 
-        <div>
-          <ul className="notifyList">
-            {
-              list.map((i,k)=>{
-                return(
-                  <li>
-                    <Link to={`/users/${i.user && i.user.login}`}><img src={getImageUrl(`/${i.user && i.user.image_url}`)} alt="" className="notifyImg"/></Link>
-                    <div className="notifyFlex">
-                      <p className="notifyInfos">
-                        <Link to={`/users/${i.login}`} className="font-15 mr20">{i.user && i.user.name}</Link>
-                        <span className="color-grey-9">{i.time_ago}</span>
-                      </p>
-                      <FlexAJ>
-                        <p className="color-grey-6">请求将仓库【<Link to={`/projects/${i.project && i.project.owner && i.project.owner.login}/${i.project && i.project.identifier}`}>{i.project && i.project.name}</Link>】
-                        转移给【<Link to={`/users/${i.owner && i.owner.login}`}>{i.owner && i.owner.name}</Link>】,是否接受？</p>
-                        {
-                          i.status === "common" &&
-                          <span>
-                            <Popconfirm title={`确定接受仓库${i.project && i.project.name}？`} okText="确定" cancelText="取消" onConfirm={()=>acceptDivert(i.id)}>
-                              <a className="color-blue">接受</a>
-                            </Popconfirm>
-                            <Popconfirm title={`确定拒绝接受仓库${i.project && i.project.name}？`} okText="确定" cancelText="取消" onConfirm={()=>revertDivert(i.id)}>
-                              <a className="color-red ml20">拒绝</a>
-                            </Popconfirm>
-                          </span>
-                        }
-                        {
-                          i.status === "canceled" && <span className="color-grey-9">对方已取消转移</span>
-                        }
-                        {
-                          i.status === "accepted" && <span className="color-grey-9">已接受</span>
-                        }
-                        {
-                          i.status === "refused" && <span className="color-grey-9">已拒绝</span>
-                        }
-                      </FlexAJ>
-                    </div>
-                  </li>
-                )
-              })
-            }
-          </ul>
-        </div>
-        :
-        ""
-      }
-      {list && list.length === 0 && <Nodata _html="暂无接收信息" />}
-      {
-        total > limit && 
-        <div className="edu-txt-center pt20 pb20">
-          <Pagination simple pageSize={limit} total={total} current={page} onChange={(p)=>{setPage(p)}}/>
-        </div>
-      }
-    </div>
-  )
-}
-export default UndoEvent;
--- a/src/forge/Settings/Collaborator.js
+++ b/src/forge/Settings/Collaborator.js
@ -11,7 +11,7 @@ function Collaborator(props){
  const [ newGroupId , setNewGroupId] = useState(undefined);
  const {projectsId ,owner} = props.match.params;

-  const author = props && props.projectDetail && props.projectDetail.author;
+  const author = props.projectDetail && props.projectDetail.author;

  function getID(id){
    setNewId(id);
@ -42,7 +42,7 @@ function Collaborator(props){
      <div>
        {
          nav === "1" ? 
-          <Member newId={newId} projectsId={projectsId} owner={owner} project_id={props.project_id} author={props.projectDetail && props.projectDetail.author} showNotification={props.showNotification}/> 
+          <Member newId={newId} projectsId={projectsId} owner={owner} project_id={props.project_id} author={props.author} showNotification={props.showNotification}/> 
          :
          <Group owner={owner} projectsId={projectsId} newGroupId={newGroupId}/>
        }
--- a/src/forge/Settings/CollaboratorMember.jsx
+++ b/src/forge/Settings/CollaboratorMember.jsx
@ -20,6 +20,8 @@ function CollaboratorMember({projectsId,owner,project_id,author,showNotification
  const [ role , setRole ] = useState(undefined);
  const [ listData , setListData ] = useState(undefined);
  const [ total , setTotal ] = useState(0);
+
+
  useEffect(()=>{
    if(newId){
      addCollaborator(newId);
--- a/src/forge/Settings/Setting.js
+++ b/src/forge/Settings/Setting.js
@ -2,8 +2,6 @@ import React, { Component } from "react";
 import { Form, Input, Checkbox, Select , Spin } from "antd";
 import Title from '../Component/Title';
 import {WhiteBack} from '../Component/layout';
-import DivertModal from '../Divert/DivertModal';
-import { Link } from 'react-router-dom';
 import axios from "axios";
 import "./setting.scss";
 const { TextArea } = Input;
@ -15,7 +13,6 @@ const menu = [
  {name:"易修 (Issue)",index:"issues"},
  {name:"合并请求",index:"pulls"},
  {name:"工作流(beta版)",index:"devops"},
-  // {name:"资源库",index:"resources"},
  {name:"里程碑",index:"versions"},
  {name:"动态",index:"activity"},
 ]
@ -27,9 +24,7 @@ class Setting extends Component {
      LanguageList: undefined,
      private_check: undefined,
      loading:true,
-      project_units:['home',"activity","code"],
-      divertVisible:false,
-      is_transfering:undefined,
+      project_units:['home',"activity","code"]
    };
  }

@ -77,9 +72,7 @@ class Setting extends Component {
          this.setState({
            private_check: result.data.private,
            loading:false,
-            project_units:units,
-            transfer:result.data.transfer,
-            is_transfering:result.data.is_transfering,
+            project_units:units
          });
        }
      })
@ -192,56 +185,15 @@ class Setting extends Component {
    });
  };

-  // 转移仓库
-  DivertProject=()=>{
-    this.setState({
-      divertVisible:true
-    })
-  }
-   // 取消仓库转移
-  CancelDivertProject=()=>{
-    this.props.confirm({
-      content: "是否确认取消将此项目转移给他人？",
-      onOk: () => {
-        const { projectsId , owner } = this.props.match.params;
-        const url =  `/${owner}/${projectsId}/applied_transfer_projects/cancel.json`;
-        axios.post(url).then(result=>{
-          if(result && result.data){
-            this.setState({
-              is_transfering:false
-            })
-          }
-        }).catch(error=>{})
-      },
-    });
-    
-  }
-  // 确定转移仓库
-  onSuccess=(owner)=>{
-    this.setState({
-      is_transfering:true,
-      divertVisible:false,
-      transfer:owner
-    })
-  }
-
  render() {
    const { getFieldDecorator } = this.props.form;
-    const { projectsId , owner } = this.props.match.params;
    const { projectDetail } = this.props;

-    const { CategoryList, LanguageList, private_check ,loading , divertVisible , is_transfering, transfer } = this.state;
+    const { CategoryList, LanguageList, private_check ,loading } = this.state;
    let mirror = projectDetail && projectDetail.mirror;
    let type = projectDetail && projectDetail.type;
    return (
      <div>
-        <DivertModal 
-          owner={owner}
-          repo={projectsId}
-          visible={divertVisible} 
-          onSuccess={this.onSuccess} 
-          onCancel={()=>{this.setState({divertVisible:false})}}
-        />
        <Spin spinning={loading}>
          <WhiteBack>
            <Title>基本设置</Title>
@ -329,48 +281,23 @@ class Setting extends Component {
            {/* 镜像设置部分，暂无接口，先不显示 */}
            {/* <Mirror /> */}
          </WhiteBack>
-          {
-            projectDetail && projectDetail.permission && (projectDetail.permission === "Admin" || projectDetail.permission === "Owner")?
-            <WhiteBack className="dangerousBox mb20">
+          <WhiteBack className="dangerousBox mb20">
+          <div>
+            <div className="dangerousTitle">危险操作区</div>
+            <div className="flex-a-center padding15-10">
              <div>
-                <div className="dangerousTitle">危险操作区</div>
-                <div className="flex-a-center padding15-10" style={{borderBottom:"1px solid #f9edbe"}}>
-                  <div>
-                    <p className="font-bd font-16">转移仓库</p>
-                    <p className="mt10">
-                      {
-                        is_transfering ?
-                        <span>此仓库正在转移给【
-                          {transfer && <Link to={transfer.type="User"?`/users/${transfer.login}`:`/organize/${transfer.login}`}>{transfer.name}</Link>}
-                          】，请联系对方接收此仓库。</span>
-                        :
-                        `将此仓库转移给其他用户或组织`
-                      }
-                    </p>
-                  </div>
-                  {
-                    is_transfering ? 
-                    <a onClick={this.CancelDivertProject} className="red_deleteBtn">取消转移</a>
-                    :
-                    <a onClick={this.DivertProject} className="red_deleteBtn">转移</a>
-                  }
-                </div>
-                <div className="flex-a-center padding15-10">
-                  <div>
-                    <p className="font-bd font-16">删除本仓库</p>
-                    <p className="mt10">
-                      删除仓库是永久性的,
-                      无法撤消，且删除后，与仓库关联的项目/任务/合并请求/版本发布等，均会被删除
-                    </p>
-                  </div>
-                  <a onClick={this.deleteProject} className="red_deleteBtn">
-                    删除本仓库
-                  </a>
-                </div>
+                <p className="font-bd font-16">删除本仓库</p>
+                <p className="mt10">
+                  删除仓库是永久性的,
+                  无法撤消，且删除后，与仓库关联的项目/任务/合并请求/版本发布等，均会被删除
+                </p>
              </div>
-            </WhiteBack>
-            :""
-          }
+              <a onClick={this.deleteProject} className="red_deleteBtn">
+                删除本仓库
+              </a>
+            </div>
+          </div>
+        </WhiteBack>
        </Spin>
      </div>
    );
--- a/src/forge/Team/ListItem.jsx
+++ b/src/forge/Team/ListItem.jsx
@ -7,7 +7,7 @@ function ListItem({item,key,OIdentifier}) {
    <div className="team_project" key={key}>
      <p className="t_p_title">
        <span className="flex1">
-          <Link to={`/projects/${OIdentifier}/${item.identifier}`} className="name">{item.name}</Link>
+          <Link to={`/projects/${OIdentifier}/${item.identifier}`} className="name">{item.identifier}</Link>
          { item.forked_from_project_id && <i className="iconfont icon-fork font-18 color-orange ml8" /> }
          {
            item.type && item.type !== 0 ? 
--- a/src/forge/Team/Sub/Detail.jsx
+++ b/src/forge/Team/Sub/Detail.jsx
@ -83,9 +83,10 @@ function Detail(props){
          img={detail.avatar_url}
          rightBtn={
            <React.Fragment>
-              {flag && !buttonflag && detail.is_admin ? 
-                <Link to={`/organize/${OIdentifier}/setting`} className="color-blue ml10 font-14">设置<i className="iconfont icon-shezhi2 ml3 fr"></i></Link>
-              :""}
+              {flag && !buttonflag && detail.is_admin ? <AlignCenter className="color-blue">
+                <Link to={`/organize/${OIdentifier}/setting`} className="color-blue">设置</Link>
+                <i className="iconfont icon-shezhi2 ml3"></i>
+              </AlignCenter> :""}
              {buttonflag && 
                <span className="subNavs">
                  <Link to={`/organize/${OIdentifier}/member`} className={pathname ===`/organize/${OIdentifier}/member` ? "active":""}><span>组织成员</span>{detail.num_users && <lable>{detail.num_users}</lable>}</Link>
@ -94,18 +95,6 @@ function Detail(props){
              }
            </React.Fragment>
          }
-          bottomInfos={
-            !buttonflag && <div>
-              {
-                detail.location && 
-                <span className="color-grey-6"><i className="iconfont icon-weizhi mr3 font-16 color-grey-6"></i>{detail.location}</span>
-              }
-              {
-                detail.website && 
-                <a href={detail.website} target="_blank" className="ml20 color-grey-6"><i className="iconfont icon-lianjie mr3 font-14"></i>{detail.website}</a>
-              }
-            </div>
-          }
        />
      }
      <Switch {...props}>
--- a/src/forge/Team/Sub/SubDetail.jsx
+++ b/src/forge/Team/Sub/SubDetail.jsx
@ -56,7 +56,7 @@ export default ((props)=>{
        detail && 
        <Cards
          src={`/organize/${OIdentifier}/group/${groupId}`}
-          title={detail.nickname||detail.name}
+          title={detail.name}
          rightBtn={
            flag && <span className="subNavs">
              <Link to={`/organize/${OIdentifier}/member`} className={pathname ===`/organize/${OIdentifier}/member` ? "active":""}><span>组织成员</span>{detail.num_users && <lable>{detail.num_users}</lable>}</Link>
--- a/src/forge/Upload/Index.js
+++ b/src/forge/Upload/Index.js
@ -1,7 +1,6 @@
 import React, { Component } from "react";
-import { Upload, Icon , Button } from 'antd';
+import { Upload, Button, Icon } from 'antd';
 import { getUploadActionUrl, appendFileSizeToUploadFileAll } from 'educoder';
-import { AlignCenter } from '../Component/layout';

 import axios from 'axios';
 const { Dragger } = Upload;
@ -29,12 +28,22 @@ class Index extends Component {

  onAttachmentRemove = (file) => {
    if (!file.percent || file.percent === 100) {
+      // this.props.confirm({
+      // 	content: '是否确认删除?',
+      // 	onOk: () => {
+      // 		this.deleteAttachment(file)
+      // 	},
+      // 	onCancel() {
+      // 		console.log('Cancel');
+      // 	},
+      // });
      this.deleteAttachment(file)
      return false;
    }
  }

  deleteAttachment = (file) => {
+
    const url = `/attachments/${file.response ? file.response.id : file.uid}.json`
    axios.delete(url, {
    }).then((response) => {
@ -73,7 +82,7 @@ class Index extends Component {
  fileIdList = (fileList) => {
    let array = [];
    fileList && fileList.length > 0 && fileList.map((item) => {
-      return array.push(item.response && (item.response.id || (item.response.data && item.response.data.id)));
+      return array.push(item.response && item.response.id);
    })
    array && this.props.load && this.props.load(array);
  }
@ -89,27 +98,21 @@ class Index extends Component {

  render() {
    //判断是否已经提交，如已提交评论则上一条评论数据清除
-    const { isComplete, icon , btn , className , size , actionUrl } = this.props;
+    const { isComplete, icon } = this.props;
    const { fileList } = this.state;

    let list = isComplete === true ? fileList : undefined;
    const upload = {
      name: 'file',
      fileList: list,
-      action: actionUrl || `${getUploadActionUrl()}`,
+      action: `${getUploadActionUrl()}`,
      onChange: this.handleChange,
      onRemove: this.onAttachmentRemove,
      beforeUpload: this.beforeUpload
    };

    return (
-      btn ? 
-      <Upload {...upload} className={className}>
-        <Button type={"default"}>上传文件</Button>
-        <span className="ml10 color-grey-9">(你可以上传小于<span className="color-red">{size}MB</span>的文件)</span>
-      </Upload>
-      :
-      <Dragger {...upload} className={className}>
+      <Dragger {...upload} className={this.props.className}>
        {icon || <Icon type="inbox" />}
        <p className="ant-upload-text font-14">拖动文件或<span className="color-blue">点击此处上传</span></p>
      </Dragger>
--- a/src/forge/users/Infos.js
+++ b/src/forge/users/Infos.js
@ -41,8 +41,8 @@ const FanUser = Loadable({
  loading: Loading,
 })

-const Notice = Loadable({
-  loader: () => import("../Notice/Index"),
+const UndoEvents = Loadable({
+  loader: () => import("./undo_events"),
  loading: Loading,
 })
 class Infos extends Component {
@ -52,9 +52,7 @@ class Infos extends Component {
      isSpin: false,
      user: undefined,
      project_type: undefined,
-      route_type: undefined,
-      undo_events:0,
-      undo_messages:0
+      route_type: undefined
    };
  }

@ -75,22 +73,14 @@ class Infos extends Component {
    });
    const { current_user } = this.props;
    const { username } = this.props.match.params;
-    const { pathname } = this.props.location;
-    const { notice } = this.state;

    let url = `/users/${username || (current_user && current_user.login)}.json`;
    axios
      .get(url)
      .then((result) => {
-        let e = result.data && result.data.undo_events;
-        let p = result.data && result.data.undo_messages;
-        let n = notice || pathname === `/users/${username}/notice` ;
        this.setState({
          user: result.data,
          isSpin: false,
-          undo_events:n ? (e-p) : e,
-          undo_messages:0,
-          notice:n
        });
      })
      .catch((error) => {
@ -124,15 +114,11 @@ class Infos extends Component {
  }

  undo_link = () => {
-    const {user } = this.state;
+    const {user} = this.state
    this.setState({
-      route_type: undefined,
-      project_type:"notice",
-      notice:true
-    },()=>{
-      this.props.history.push(`/users/${user && user.login}/notice`);
-      this.fetchUser();
+      route_type: undefined
    })
+    this.props.history.push(`/users/${user && user.login}/undo_events`)
  }

  route_link = (type) => {
@ -144,8 +130,7 @@ class Infos extends Component {
  organize_link = () => {
    const {user} = this.state
    this.setState({
-      route_type: undefined,
-      project_type:"organizes"
+      route_type: undefined
    })
    this.props.history.push(`/users/${user && user.login}/organizes`)
  }
@ -155,7 +140,7 @@ class Infos extends Component {
    const { current_user, mygetHelmetapi } = this.props;
    const { username } = this.props.match.params;

-    const { user, isSpin, project_type, route_type , undo_events , undo_messages } = this.state;
+    const { user, isSpin, project_type, route_type } = this.state;
    return (
      <div className="newMain clearfix">
        <Spin spinning={isSpin}>
@ -226,23 +211,21 @@ class Infos extends Component {
                  </div>
                </div>
              </div>
-              {current_user && user && user.login === current_user.login ? (
+              {/* {current_user && user && current_user.id === user.id && (
                <div className="bgcF">
                  <div className="list-l-Menu">
-                    <li className={project_type && project_type === "notice" ? "active" : ""}>
-                      <p onClick={() => this.undo_link()}>
-                        <span className="font-16 color-grey-3">
-                          <i className="iconfont icon-dahuizhongzuo3x font-15 mr5"></i>
-                          待办事项
-                        </span>
-                        <span className="text-yellow font-16">
-                          {undo_events}
-                        </span>
-                      </p>
-                    </li>
+                    <p className="list-l-p pd20" onClick={() => this.undo_link()}>
+                      <span className="font-16 color-grey-3">
+                        <i className="iconfont icon-dahuizhongzuo3x font-15 mr5"></i>
+                        待办事项
+                      </span>
+                      <span className="text-yellow font-16">
+                        {user.undo_events}
+                      </span>
+                    </p>
                  </div>
                </div>
-              ):""}
+              )} */}
              
              <div className="bgcF">
                <ul className="list-l-Menu">
@ -302,19 +285,19 @@ class Infos extends Component {
                  </ul>
                </div>
              }
+              
+
              <div className="bgcF">
                <div className="list-l-Menu">
-                  <li className={project_type && project_type === "organizes" ? "active" : ""}>
-                    <p onClick={() => this.organize_link()} >
-                      <span className="font-16 color-grey-3">
-                        <i className="iconfont icon-itsm-liuchengguanli font-15 mr5"></i>
-                        组织
-                      </span>
-                      <span className="color-blue font-16">
-                        {user && user.user_org_count}
-                      </span>
-                    </p>
-                  </li>
+                  <p className="list-l-p pd20" onClick={() => this.organize_link()} >
+                    <span className="font-16 color-grey-3">
+                      <i className="iconfont icon-itsm-liuchengguanli font-15 mr5"></i>
+                      组织
+                    </span>
+                    <span className="color-blue font-16">
+                      {user && user.user_org_count}
+                    </span>
+                  </p>
                </div>
              </div>
            </div>
@ -329,9 +312,9 @@ class Infos extends Component {
                      }}
                    ></Route>
                    <Route
-                      path="/users/:username/notice"
+                      path="/users/:username/undo_events"
                      render={() => {
-                        return <Notice {...this.props} {...this.state} fetchUser={this.fetchUser}/>;
+                        return <UndoEvents {...this.props} {...this.state} />;
                      }}
                    ></Route>
                    <Route
--- a/src/forge/users/undo_events.js
+++ b/src/forge/users/undo_events.js
@ -0,0 +1,16 @@
+import React, { Component } from "react";
+import Nodata from "../Nodata";
+class UndoEvents extends Component {
+
+  render() {
+    return (
+      <div className="pd20">
+      <div className="grid-item pb20 bbt">
+        <h3>待办事项</h3>
+      </div>
+      <Nodata _html={`暂时没有数据～`} />
+    </div>
+    );
+  }
+}
+export default UndoEvents;
--- a/src/images/login/logo.png
+++ b/src/images/login/logo.png
--- a/src/indexEduplus2RequestProxy.js
+++ b/src/indexEduplus2RequestProxy.js
@ -17,6 +17,21 @@ const paramRequestOldUrlArray = [

 ]
 const paramRequestNewUrlArray = [
+    // 获取代码内容
+    // (matchResult) => {
+    //     const stageId = matchResult[1]
+    //     return `/tasks/${stageId}/rep_content.json`
+    // },
+
+    // 获取版本库目录、文件
+    // http://testeduplus2.educoder.net/tasks/se79x25pzfwo/git_entries.json?path=&dev=master&gpid=3441
+    // (matchResult) => {
+    //     const stageId = matchResult[1]
+    //     // return `/tasks/${stageId}/git_entries.json`
+    //     return `/myshixuns/${stageId}/repository.json`
+    // },
+
+    // `/tasks/tonblikwzj78/choose_build.json`
    (matchResult) => {
        const stageId = matchResult[1]
        return `/tasks/${stageId}/choose_build.json`
@ -50,4 +65,20 @@ export function requestProxy(config) {
        });
    }
    return config;
-}
+}
+
+/**
+    ('/api/v1/careers/qweqw/edit/').match(/\/api\/v1\/careers\/(\w*)\/edit/i)
+    0: "/api/v1/careers/qweqw/edit"
+    1: "qweqw"
+
+    example:
+    `/api/v1/games/${this.props.game.identifier}/answer_grade` ->
+    `/tasks/${this.props.game.identifier}/answer_grade.json` 
+
+
+    https://testeduplus2.educoder.net/api/v1/games/feguz4tiqpvx/rep_content
+        ?path=src/step2/CLnkQueue.cpp&shixun_gpid=2791&status=0&retry=0   ->
+    http://testeduplus2.educoder.net/tasks/tonblikwzj78/rep_content.json
+        ?path=1-4.py&shixun_gpid=2448&status=0
+ */
--- a/src/modules/courses/css/Courses.css
+++ b/src/modules/courses/css/Courses.css
@ -1366,6 +1366,10 @@ samp {
  line-height: 40px;
 }

+.courseForm .ant-input-group>.ant-input:first-child,
+.ant-input-group-addon:first-child {
+  height: 40px;
+}

 .courseForm .ant-select-selection,
 .courseForm .ant-select-selection-selected-value {
@ -1718,6 +1722,12 @@ samp {
  background-color: #fff !important;
 }

+.ant-input-group-addon {
+  color: #666 !important;
+  font-size: 12px;
+  border: 1px solid #d9d9d9 !important;
+  border-left: none !important;
+}

 .check_on {
  background: #4CACFF;
--- a/src/modules/login/EducoderLogin.js
+++ b/src/modules/login/EducoderLogin.js
@ -1,14 +1,13 @@
-import React, {Component} from "react";
+import React, { Component } from "react";
 import moment from 'moment';
 import { getImageUrl } from 'educoder';
 import '../courses/css/members.css';
-import "../courses/common/formCommon.css";
+import "../courses/common/formCommon.css"
 import '../courses/css/Courses.css';
 import beijintulogontwo from '../../../src/images/login/beijintulogontwo.png';
-import educodernet from '../../../src/images/login/educodernet.png';
+import educodernet from '../../../src/images/login/logo.png';
 import LoginRegisterComponent from '../user/LoginRegisterComponent';
 import FindPasswordComponent from '../user/FindPasswordComponent';
-//educoder登入页面

 var newContainer={
    background: `url(${beijintulogontwo})`,
@ -47,7 +46,6 @@ class EducoderLogin extends Component {

                }
            }else if(props.match.url === "/register"){
-                // showbool: 1,
                  this.state = {
                    showbool: 1,
                    loginstatus:false,
@ -64,18 +62,12 @@ class EducoderLogin extends Component {
                    loginstatus:true,
                }
            }
-
        }
-
    }
-
    Setlogins=(i)=>{
-        console.log("96ye");
-        console.log(i)
        this.setState({
            logini:i
        })
-
    }
    gohome=()=>{
        window.location.href="/"
@ -94,84 +86,39 @@ class EducoderLogin extends Component {


    render() {
-        let {showbool,loginstatus,logini} = this.state;
+        let { showbool } = this.state;
+        const { settings } = this.props;
        return (
            <div style={newContainer} className=" clearfix" >
-
-                <div >
-                    <div style={{
-                        "display": "flex",
-                        "justify-content": "center",
-                        "align-items": "center",
-                        "width": "100%"
-                    }}>
-                        <div style={{cursor:"pointer"}}>
-                            {this.props.mygetHelmetapi === null ? ""
-                              :
-                                this.props.mygetHelmetapi===undefined||this.props.mygetHelmetapi.login_logo_url===null|| this.props.mygetHelmetapi.login_logo_url===undefined?
-                                  <img style={{cursor:"pointer"}} onClick={()=>this.gohome()} src={educodernet}/>
-                                  :
-                                  <img style={{cursor:"pointer"}} onClick={()=>this.gohome()} src={getImageUrl(this.props.mygetHelmetapi.login_logo_url)}/>
-                            }
-
-                        </div>
-
-
+                <div style={{"justify-content": "center","align-items": "center","width": "100%",textAlign:"center"}}>
+                    <div style={{cursor:"pointer"}}>
+                        {
+                            settings && settings.login_logo_url ?
+                            <img style={{cursor:"pointer"}} alt="" onClick={()=>this.gohome()} width="80px" src={getImageUrl(settings.login_logo_url)}/>
+                            :
+                            <img style={{cursor:"pointer"}} alt="" onClick={()=>this.gohome()} src={educodernet} width="80px"/>
+                        }
                    </div>
                    {
                        showbool === 1 ?
-                            <div style={{
-                                display: "flex",
-                                justifyContent: "center",
-                                width: "100%",
-                                marginTop: "25px",
-                            }}>
-                                <div>
-
-                                    <LoginRegisterComponent {...this.props} {...this.state}
-                                                            Setshowbool={(e)=>this.Setshowbool(e)} ></LoginRegisterComponent>
-
-                                </div>
-
+                        <div style={{
+                            display: "flex",
+                            justifyContent: "center",
+                            width: "100%",
+                            marginTop: "25px",
+                        }}>
+                            <div>
+                                <LoginRegisterComponent {...this.props} {...this.state} Setshowbool={(e)=>this.Setshowbool(e)} ></LoginRegisterComponent>
                            </div>
+                        </div>
                        :
-                          <div style={{
-                              display: "flex",
-                              justifyContent: "center",
-                              width: "100%",
-                              marginTop: "25px",
-                          }}>
-                              <div >
-                                  <FindPasswordComponent {...this.props} {...this.state}
-                                                         Setshowbool={(e)=>this.Setshowbool(e)}></FindPasswordComponent>
-
-                              </div>
-                          </div>
+                        <div style={{display: "flex",justifyContent: "center",width: "100%",marginTop: "25px",}}>
+                            <div>
+                                <FindPasswordComponent {...this.props} {...this.state} Setshowbool={(e)=>this.Setshowbool(e)}></FindPasswordComponent>
+                            </div>
+                        </div>
                    }
-									{this.props.mygetHelmetapi === null ? 	<div style={{
-										display: "flex",
-										justifyContent: "center",
-										width: "100%",
-									}}>
-										<div className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;{moment().year()}&nbsp;EduCoder<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
-									</div>:
-									this.props.mygetHelmetapi===undefined||this.props.mygetHelmetapi.main_site===null|| this.props.mygetHelmetapi.main_site===undefined?	<div style={{
-										display: "flex",
-										justifyContent: "center",
-										width: "100%",
-									}}>
-										<div className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;{moment().year()}&nbsp;EduCoder<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
-									</div>:this.props.mygetHelmetapi.main_site===true?
-										<div style={{
-											display: "flex",
-											justifyContent: "center",
-											width: "100%",
-										}}>
-											<div className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;{moment().year()}&nbsp;EduCoder<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
-										</div>
-										:""
-									}
-
+                    <div className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;{moment().year()}&nbsp;Trustie<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
                </div>
            </div>
        )
--- a/src/modules/login/LoginDialog.js
+++ b/src/modules/login/LoginDialog.js
@ -4,7 +4,6 @@ import Dialog from 'material-ui/Dialog';
 import { notification } from 'antd';

 import axios from 'axios';
-import educoderLogo from './educoder.png';

 import './LoginDialog.css';
 import { broadcastChannelPostMessage } from 'educoder'
@ -302,9 +301,12 @@ class LoginDialog extends Component {
  }

  componentWillReceiveProps(nextProps) {
+
    this.setState({
      isRender: nextProps.isRender
    })
+    // console.log(nextProps.isRender);
+
  }
  IsPC = () => {
    var userAgentInfo = navigator.userAgent;
@ -321,8 +323,8 @@ class LoginDialog extends Component {
    return flag;
  }
  componentDidMount() {
-    //true为PC端，false为手机端
-    let flag = this.IsPC();
+
+    let flag = this.IsPC(); //true为PC端，false为手机端
    this.setState({
      isphone: flag
    })
@ -354,6 +356,7 @@ class LoginDialog extends Component {
  }

  loginEDU = () => {
+
    let { loginValue, passValue, regular, isGoingValue } = this.state;
    if (regular === 1) {
      return
@ -375,8 +378,15 @@ class LoginDialog extends Component {
        if (response.data.message === "登录密码出错已达上限，账号已被锁定, 请10分钟后重新登录或找回密码") {
          const messge = (
            <div>
-              <p>登录密码出错已达上限，账号已被锁定；</p>
-              <p className="mt10">请10分钟后重新登录或<a href={'https://www.trustie.net/account/lost_password'} style={{textDecoration: "underline",color: "#4CACFF"}}>找回密码</a></p>
+              <p>
+                登录密码出错已达上限，账号已被锁定；
+                      </p>
+              <p className="mt10">
+                请10分钟后重新登录或<a href={'https://www.trustie.net/account/lost_password'} style={{
+                  textDecoration: "underline",
+                  color: "#4CACFF",
+                }}>找回密码</a>
+              </p>
            </div>
          )
          this.openNotifications(messge);
@ -420,6 +430,11 @@ class LoginDialog extends Component {
  getloginurl = (url) => {
    window.location.href = url;
  };
+  openweixinlogin = () => {
+    this.setState({
+      weixinlogin: true
+    })
+  }
  openNotifications = (btn) => {
    // type  1 成功提示绿色 2提醒颜色黄色 3错误提示红色
    notification.open({
@ -455,16 +470,18 @@ class LoginDialog extends Component {
  }

  render() {
-    let { login, isGoing, isGoingValue, disabled , Phonenumberisnotco , dialogBox, isRender, weixinlogin } = this.state;
-    let { settings } = this.props;
+    let { qqlogin, login, isGoing, isGoingValue, disabled, bottonclass, Phonenumberisnotco,
+      dialogBox, isRender, weixinlogin } = this.state;

+    let { settings } = this.props;
    if (isRender === undefined) {
      isRender = false
    }
+
    return (
      <Dialog open={true} id="DialogID"
        className="zindextest"
-        style={{ display: isRender === false ? 'none' : '' }}
+        style={{ display: isRender == false ? 'none' : '' }}
        disableEscapeKeyDown={true}
        disableBackdropClick={true}
        onClose={() => this.handleDialogClose()}
@ -495,7 +512,7 @@ class LoginDialog extends Component {
                <li onClick={() => { this.enter(0) }}>登录</li>
              </ul>}
              <div className="login-panel" id="login-panel-1" style={{ display: login == 0 ? 'block' : 'none' }}>
-                <form acceptCharset="UTF-8" action="/login" id="main_login_form" method="post">
+                {weixinlogin === true ? "" : <form acceptCharset="UTF-8" action="/login" id="main_login_form" method="post">

                  <div style={{ "display": "inline", "padding": "0", "margin": "0" }}>
                    <input name="utf8" type="hidden" value="✓"></input>
@ -520,10 +537,9 @@ class LoginDialog extends Component {

                  <div style={{ height: '25px' }}><p className="color-orange edu-txt-left none" id="username_error_notice"
                    style={{ display: Phonenumberisnotco === undefined ? 'none' : 'block' }}>{Phonenumberisnotco}</p></div>
+
                  <div>
-                    <input 
-                      type="password" 
-                      id="password_loggin_input"
+                    <input type="password" id="password_loggin_input"
                      name="password"
                      ref="passwordText"
                      onInput={this.passwordChange}
@ -533,8 +549,8 @@ class LoginDialog extends Component {
                        this.loginEDU : () => {
                        }
                      }
-                      placeholder="密码" 
-                    />
+                      placeholder="密码" >
+                    </input>
                    <div style={{ height: '25px' }}>
                      <p className="color-orange edu-txt-left none" id="password_error_notice">
                        请输入密码
@ -565,25 +581,38 @@ class LoginDialog extends Component {
                      <a onClick={(url) => this.getloginurl(`${settings && settings.common && settings.common.register}`)} className="color-grey-9">注册</a>
                    </span>
                  </p>
-                  {
-                    settings && settings.third_party && settings.third_party.length > 0 ?
-                    <p className="clearfix mt20">
+
+                  {this.props.user && this.props.user.main_site === true ? this.state.isphone === true ? <p className="clearfix mt20">
+                    <span className={"startlogin"}>————————  快速登录  ————————</span>
+                    <div className={"mt10"}>
+                      <a onClick={() => this.openweixinlogin()}>
+                        <img src={require('./WeChat.png')} alt="微信登录" />
+                      </a>
+                      <a onClick={() => this.openqqlogin()} className={"ml10"}>
+                        <img src={require('./qq.png')} alt="qq登录" />
+                      </a>
+                    </div>
+                  </p> : <p className="clearfix mt20">
+
                      <span className={"startlogin"}>————————  快速登录  ————————</span>
                      <div className={"mt10"}>
-                        {settings.third_party.map((item,key)=>{
-                          return(
-                            <a href={`${item.url}`}>
-                              <img src={item.name === "educoder" ? educoderLogo : ""} width="46px" alt={`${item.name}登录`} />
-                            </a>
-                          )
-                        })
-                        }
+                        <a onClick={() => this.openphoneqqlogin()} className={"ml10"}>
+                          <img src={require('./qq.png')} alt="qq登录" />
+                        </a>
                      </div>
-                    </p>
-                    :"" 
-                  }
-                </form>
+                    </p> : ""}
+                </form>}
+                {weixinlogin === true ? <iframe
+                  className={"weixinheight390"}
+                  frameBorder="0"
+                  sandbox="allow-scripts allow-same-origin allow-top-navigation"
+                  scrolling="no"
+                  src={`https://open.weixin.qq.com/connect/qrconnect?appid=wx6b119e2d829c13fa&redirect_uri=https%3a%2f%2fwww.educoder.net%2fotherloginstart&response_type=code&scope=snsapi_login&state=null,${window.location.host}#wechat_redirect`}></iframe> : ""}
+                {weixinlogin === true ? <p className="clearfix ">
+                  <a className={"startlogin color-blue"} onClick={() => this.hideweixinlogin()}>返回账号登录</a>
+                </p> : ""}
              </div>
+              {/*快捷登录*/}
            </div>
          </div>
          : ""}
--- a/src/modules/login/educoder.png
+++ b/src/modules/login/educoder.png
--- a/src/modules/tpm/TPMIndexHOC.js
+++ b/src/modules/tpm/TPMIndexHOC.js
@ -5,7 +5,6 @@ import axios from 'axios';
 import { Spin } from 'antd';
 import './TPMIndex.css';
 import LoginDialog from '../login/LoginDialog';
-import EducoderAccount from '../../forge/Component/EducoderAccount';

 export function TPMIndexHOC(WrappedComponent) {
 	return class II extends React.Component {
@ -206,14 +205,13 @@ export function TPMIndexHOC(WrappedComponent) {


 		render() {
-			let { isRender , current_user , giteaVisible , email } = this.state;
+			let { isRender , current_user } = this.state;
 			const common = {
 				showLoginDialog: this.showLoginDialog,
 				checkIfLogin: this.checkIfLogin,
 			};
 			return (
 				<div className="indexHOC">
-					<EducoderAccount visible={giteaVisible} email={email} onOk={this.onOk}/>
 					{isRender === true ? <LoginDialog
 						Modifyloginvalue={() => this.hideLoginDialog()}
 						{...this.props}
--- a/src/modules/user/LoginRegisterComponent.js
+++ b/src/modules/user/LoginRegisterComponent.js
Author	SHA1	Message	Date
caishi	ecc6387113	no message	2021-05-08 17:22:44 +08:00
caishi	990c4e22b0	编辑合并请求-url地址错误	2021-05-08 14:35:51 +08:00
caishi	7eea9316dd	detail+同步镜像type=2的才不需要合并请求	2021-05-07 17:41:01 +08:00
caishi	6a546c79e4	merge	2021-05-07 16:36:22 +08:00
caishi	4c48b6c77a	merge	2021-05-07 16:35:17 +08:00
caishi	4d5430c3ed	统一项目简介、项目概览	2021-05-07 16:33:57 +08:00
caishi	d49af735f1	merge	2021-05-06 17:21:19 +08:00
caishi	03370e8a07	merge	2021-05-06 17:19:09 +08:00
caishi	0b43fa8952	merge develop	2021-05-06 17:18:30 +08:00
caishi	465c4cc8c7	04-28休假期修改issue --需合并至其它分支（合并请求相关）	2021-04-28 20:23:57 +08:00
caishi	37668ddcd4	组织团队-无数据显示错误	2021-04-27 09:47:10 +08:00
caishi	7102594444	代码库编辑文件-切换到其它目录后要重新将编辑状态改为显示状态	2021-04-25 17:48:58 +08:00
caishi	b2f2df65bb	样式覆盖	2021-04-23 18:07:15 +08:00
caishi	8a577fb263	资源库	2021-04-23 17:16:50 +08:00
caishi	5c491071b6	+上关注后不需要提示	2021-04-23 16:37:16 +08:00
caishi	c554237076	+上贡献者悬浮框里增加的跳转链接不要新开页	2021-04-23 16:37:06 +08:00
caishi	d22a741bf7	贡献者-悬浮内容增加跳转链接	2021-04-23 16:36:56 +08:00
caishi	383b3f5d74	imageUrl + /	2021-04-23 16:36:41 +08:00
caishi	63da7adcf9	个人中心关注-关注或者取消关注未更新状态	2021-04-23 16:36:31 +08:00
caishi	3243aeebc6	贡献者-悬浮卡片-测试版1	2021-04-23 16:36:22 +08:00
caishi	1a86a75345	发布评论者头像路径错误	2021-04-23 16:36:11 +08:00
caishi	3b6cc99d49	merge	2021-04-23 16:35:49 +08:00
caishi	d872ffc606	merge	2021-04-23 16:31:15 +08:00
caishi	3b69c01ead	merge	2021-04-23 16:30:45 +08:00
caishi	1e0608aa14	合并请求-提出申请者头像显示问题	2021-04-23 16:30:07 +08:00
caishi	9b6816e346	团队项目-团队项目管理-显示的name和跳转的login	2021-04-23 16:29:57 +08:00
caishi	6ee257231d	切换左侧目录，选择不同的文件时，文件详情没有更新	2021-04-23 16:29:46 +08:00
caishi	70edb73f6c	all-默认头像（首字母加背景颜色）	2021-04-23 16:29:35 +08:00
caishi	5c7553d4aa	merge	2021-04-23 16:29:16 +08:00
caishi	278701f24b	上线后的getImageURL也不用在前面加/ + 一些小样式修改	2021-04-23 16:27:56 +08:00
caishi	97ab819bf9	merge	2021-04-23 16:27:37 +08:00
caishi	d870f17b85	readme-文件增加一个目录下拉icon	2021-04-23 16:26:02 +08:00
caishi	91ac6c2357	组织团队-新增一个团队标识	2021-04-23 16:25:47 +08:00
caishi	3702d1c1a5	merge	2021-04-23 16:25:35 +08:00
caishi	93d48c359e	merge	2021-04-23 16:25:03 +08:00
caishi	80dace18e9	资源库不需要按引用次数排序	2021-04-23 16:24:23 +08:00
caishi	375cbb37df	merge	2021-04-23 16:24:02 +08:00
caishi	10d933e037	merge develop	2021-04-23 16:23:29 +08:00
caishi	4fdd3f6f80	组织-团队列表的头像login为undefined	2021-04-23 16:22:36 +08:00
caishi	458b56e33b	去掉悬浮手册按钮	2021-04-23 16:22:22 +08:00
caishi	c256887132	注册成功后跳转到首页	2021-03-31 15:13:32 +08:00
caishi	6a588db7f6	清理代码	2021-03-31 15:03:16 +08:00
caishi	6c4e1c6665	Merge branch 'standalone' into dev_local	2021-03-31 14:42:24 +08:00
caishi	c554d2c00d	重置settings为undefined	2021-03-31 14:35:23 +08:00
caishi	b69bf5974a	remove	2021-03-31 14:28:22 +08:00
caishi	ecb1691b4d	Trustie	2021-03-31 14:17:48 +08:00
caishi	6a9f2b31a6	注册页面logo和底部信息	2021-03-31 14:04:09 +08:00
caishi	4947cd8456	浏览器ico要用trustie的logo	2021-03-31 12:07:11 +08:00
caishi	8429effe16	没logo时会将setting重置为空	2021-03-31 12:02:38 +08:00
caishi	49ebe450be	合并测试版分支	2021-03-31 11:21:07 +08:00
caishi	e3c926da77	注册	2021-03-29 17:37:16 +08:00
caishi	af48da2eb3	href	2021-03-29 17:14:56 +08:00
caishi	6630309466	Merge branch 'develop' into dev_local	2021-03-29 16:58:48 +08:00
caishi	a7c3dee7e3	；	2020-11-26 10:55:03 +08:00