不能修改组织账号

资源库所有页面排版、数据未绑

package-lock.json

@@ -1,5 +1,5 @@
 {
-  "name": "educoder",
+  "name": "forge",
   "version": "0.1.0",
   "lockfileVersion": 1,
   "requires": true,
@@ -3888,11 +3888,6 @@
         "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",
@@ -20480,6 +20475,16 @@
       "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",

package.json

@@ -111,7 +111,9 @@
     "webpack-dev-server": "^3.10.3",
     "webpack-manifest-plugin": "^2.2.0",
     "whatwg-fetch": "2.0.3",
-    "wrap-md-editor": "^0.2.20"
+    "wrap-md-editor": "^0.2.20",
+    "xterm": "4.8.1",
+    "xterm-addon-fit": "0.4.0"
   },
   "scripts": {
     "start": "node --max_old_space_size=15360 scripts/start.js",

public/css/edu-purge.css

@@ -2346,7 +2346,6 @@ input::-ms-clear {
 /*中间部分宽度固定为1200*/
 .newMain {
   margin: 0 auto;
-  padding-bottom: 110px;
   min-width: 1200px;
 }
 
@@ -4108,21 +4107,6 @@ em.vertical-line {
 
 /* 右侧内容宽度变化的话，需要调整posi-search right的值*/
 
-/*底部*/
-.newFooter {
-  max-height: 110px;
-}
-
-.newFooter {
-  position: absolute;
-  bottom: 0;
-  width: 100%;
-  background: #323232;
-  clear: both;
-  min-width: 1200px;
-  z-index: 8;
-  left: 0px;
-}
 
 .footercon {
   border-bottom: 1px solid #47494d;

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,10 +11,8 @@ broadcastChannelOnmessage('refreshPage', () => {
 })
 
 function locationurl(list) {
-  if (window.location.port === "3007") {
-
-  } else {
-    window.location.href = list
+  if (window.location.port !== "3007") {
+  window.location.href = list
   }
 }
 // TODO 开发期多个身份切换
@@ -26,53 +24,22 @@ 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 || 'admin'
 }                 
-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 = "https://testforgeplus.trustie.net";
 
-  const requestMap = {};
-  window.setfalseInRequestMap = function (keyName) {
-    requestMap[keyName] = false;
-  }
+  var proxy = "https://testforgeplus.trustie.net";
   //响应前的设置
   axios.interceptors.request.use(
     config => {
-      setpostcookie()
-      clearAllCookie()
-
-      if (config.url.indexOf(proxy) !== -1) {
+      if(config.url.indexOf("http") !== -1) {
         return config
       }
-      requestProxy(config)
-
+      requestProxy(config);
       let url = `/api${config.url}`;
 
       if (`${config[0]}` !== `true`) {
@@ -86,12 +53,6 @@ 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;
     },
@@ -146,8 +107,6 @@ export function initAxiosInterceptors(props) {
         message501 = false
       }, 2000);
     }
-    requestMap[response.config.url] = false;
-    setpostcookie();
     return response;
   }, function (error) {
     return Promise.reject(error);

src/common/UrlTool.js

@@ -15,7 +15,7 @@ export function getImageUrl(path) {
 	if (isDev) {
 		return `${local}/${path}`
 	}
-	return `/${path}`;
+	return `${path}`;
 }
 
 export function getImage(path) {
@@ -162,28 +162,28 @@ export function getmyUrl(geturl) {
 }
 
 export function getUploadActionUrl(path, goTest) {
-	return `${getUrl()}/api/attachments.json?debug=${window._debugType || 'admin'}`;
+	return `${getUrl()}/api/attachments.json${isDev ?`${isDev ?`?debug=${window._debugType || 'admin'}` : ""}` : ""}`;
 }
 
 export function getUploadLogoActionUrl() {
-	return `${getUrl()}/api/resumes/logo.json?debug=${window._debugType || 'admin'}`;
+	return `${getUrl()}/api/resumes/logo.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`;
 }
 
 export function getUploadActionUrltwo(id) {
-	return `${getUrlmys()}/api/shixuns/${id}/upload_data_sets.json?debug=${window._debugType || 'admin'}`
+	return `${getUrlmys()}/api/shixuns/${id}/upload_data_sets.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`
 }
 
 export function getUploadActionUrlthree() {
-	return `${getUrlmys()}/api/jupyters/import_with_tpm.json?debug=${window._debugType || 'admin'}`
+	return `${getUrlmys()}/api/jupyters/import_with_tpm.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`
 }
 
 export function getupload_git_file(id) {
-	return `${getUrlmys()}/api/shixuns/${id}/upload_git_file.json?debug=${window._debugType || 'admin'}`
+	return `${getUrlmys()}/api/shixuns/${id}/upload_git_file.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`
 }
 
 
 export function getUploadActionUrlOfAuth(id) {
-	return `${getUrl()}/api/users/accounts/${id}/auth_attachment.json?debug=${window._debugType || 'admin'}`
+	return `${getUrl()}/api/users/accounts/${id}/auth_attachment.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`
 }
 
 export function getRandomNumber(type) {

src/common/components/comment/CommentItem.js

@@ -64,7 +64,7 @@ function CommentItem({
   const commentAvatar = (author) => (
     <img
       className="item-flex flex-image"
-      src={author.image_url ? getImageUrl(`images/${author.image_url}`) : 'https://b-ssl.duitang.com/uploads/item/201511/13/20151113110434_kyReJ.jpeg'}
+      src={author.image_url ? getImageUrl(`/${author.image_url}`) : 'https://b-ssl.duitang.com/uploads/item/201511/13/20151113110434_kyReJ.jpeg'}
       alt=""
     />
   );

src/forge/Activity/ActivityItem.js

@@ -33,7 +33,7 @@ class ActivityItem extends Component {
           }
           <p className="itemLine mt10">
             <Link to={`/users/${item && item.user_login}`} className="show-user-link">
-              <img alt="" src={getImageUrl(`images/${item.user_avatar}`)} className="createImage" />
+              <img alt="" src={getImageUrl(`/${item.user_avatar}`)} className="createImage" />
               <span className="mr20">{item.user_name}</span>
             </Link>
             {item.created_at && <span className="color-grey-9">创建于<span className="ml2 color-grey-6">{item.created_at}</span></span>}

src/forge/Branch/Select.jsx

@@ -102,7 +102,7 @@ export default (({ projectsId , branch , owner , changeBranch , branchList , tag
     </div>
   );
   return(
-    <Popover placement="bottom" visible={flag} content={menu} onClick={()=>setFlag(!flag)} overlayClassName="branch-tagBox-list">
+    <Popover placement='bottomLeft' 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>

src/forge/Component/AddMember.jsx

@@ -42,7 +42,7 @@ function AddMember({getID,login}){
             className="user_img radius"
             width="28"
             height="28"
-            src={getImageUrl(`images/${item && item.image_url}`)}
+            src={getImageUrl(`/${item && item.image_url}`)}
             alt=""
           />
           <span className="ml10" style={{ "vertical-align": "middle" }}>

src/forge/Component/Cards.jsx

@@ -6,7 +6,7 @@ import './Component.scss';
 function Cards({img , title, desc , rightBtn , src}){
   return(
     <div className="cards">
-      {img &&<div className="img"><img src={getImageUrl(`images/${img}`)} alt=""/></div>}
+      {img &&<div className="img"><img src={getImageUrl(`/${img}`)} alt=""/></div>}
       <div className="content">
         <p className="titles">
           <Link to={src}>{title}</Link>

src/forge/Component/Component.scss

@@ -112,6 +112,9 @@ li.ant-menu-item{
   right:240px;
   z-index: 10000;
 }
+.laterest{
+  color: #05690d;
+}
 
 @media screen and (max-width: 1800px){
   .handleBox{
@@ -151,4 +154,42 @@ li.ant-menu-item{
   .ant-tree{
     margin:0px 20px!important;
   }
+}
+
+.menuPanels{
+  width: 240px;
+  height: 180px;
+  .ant-popover-content,.ant-popover-inner{
+    height: 100%;
+    width: 100%;
+  }
+}
+.halfs{
+  margin-top: 24px;
+  padding:24px 0px 0px 0px;
+  border-top: 1px solid #e8e8e8;
+  .attrPerson{
+    padding-bottom: 24px;
+  }
+}
+.menuinfos{
+  padding:15px 0px;
+  &>a{
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    border-right: 1px solid #eee;
+    flex: 1;
+    & >span:first-child{
+      font-size: 18px;
+      font-weight: 400;
+      color: #333;
+    }
+    & >span:last-child{
+      color: #666;
+    }
+    &:last-child{
+      border-right: none;
+    }
+  }
 }

src/forge/Component/Contributors.jsx

@@ -1,21 +1,154 @@
-import React from 'react';
+import React, { useEffect, useState } from 'react';
 import { AlignCenter , FlexAJ  } from '../Component/layout';
 import { Link } from 'react-router-dom';
+import { Popover , Spin } from 'antd';
 import { getImageUrl } from 'educoder';
+import './Component.scss';
+import { getUser } from '../GetData/getData';
+import axios from 'axios';
 
 function Contributors({contributors,owner,projectsId}){
+  const [ menuList ,setMenuList ]= useState([]);
+  const [ list , setList ]= useState(undefined);
+  const [ total , setTotal ]= useState(0);
+  const [ menu , setMenu ] = useState("");
+  const [ login , setLogin ] = useState(undefined);
+  const [ isSpin , setIsSpin ] = useState(false);
+
+  useEffect(()=>{
+    if(contributors && contributors.total_count>0){
+      setTotal(contributors.total_count);
+      setList(contributors.list);
+    }
+  },[contributors])
+
+  useEffect(()=>{
+    if(login){
+      getUsers(login);
+    }else{
+      setMenu(undefined);
+    }
+  },[login])
+
+  async function getUsers(login){
+    setIsSpin(true);
+    let a = menuList && menuList.filter(i=>i.login === login);
+    if(a.length === 0){
+      let result = await getUser(login);
+      let arr = menuList;
+      arr.push({...result});
+      setMenuList(arr);
+      setMenusFunc(result);
+      setIsSpin(false);
+    }else{
+      setMenusFunc(a[0]);
+      setIsSpin(false);
+    }
+  }
+
+  function setMenusFunc(data){
+    if(data){
+      let ele = (
+        <Spin spinning={isSpin}>
+          <FlexAJ>
+            <AlignCenter>
+              <Link to={`/users/${data.login}`}><img src={getImageUrl(`/${data.image_url}`)} alt="" className="radius" width="38px" height="38px"/></Link>
+              <Link to={`/users/${data.login}`} className="ml10">{data.name}</Link>
+            </AlignCenter>
+            {
+              data.is_watch ? <a className="color-grey-9" onClick={()=>FocusFunc(false,data.login)}>取消关注</a>:<a className="color-blue" onClick={()=>FocusFunc(true,data.login)}>关注</a>
+            }
+          </FlexAJ>
+          <AlignCenter className="menuinfos">
+            <a href={data.projects_url}>
+              <span>{data.projects_count}</span>
+              <span>项目数</span>
+            </a>
+            <a href={data.followers_url}>
+              <span>{data.followers_count}</span>
+              <span>粉丝数</span>
+            </a>
+            <a href={data.following_url}>
+              <span>{data.following_count}</span>
+              <span>关注数</span>
+            </a>
+          </AlignCenter>
+          {
+            data.organizations && data.organizations.length > 0 ?
+            <AlignCenter className="font-12 pt4 pb4">
+              <span>所属组织：</span>
+              <div className="task-hide flex1">
+                {renderArray(data.organizations)}
+              </div>
+            </AlignCenter>
+            :""
+          }
+          {
+            data.location && <AlignCenter className="font-12 pt4 pb4"><span>所在地址:</span><span className="ml5">{data.location}</span></AlignCenter>
+          }
+        </Spin>
+      )
+      setMenu(ele);
+    }
+  }
+
+  function FocusFunc(flag,login){
+    axios({
+      method: flag ? 'post' : 'delete',
+      url: `/watchers/${flag ? 'follow' : 'unfollow'}.json`,
+      params: {target_type: "user",id:login}
+    }).then(result => {
+      if (result && (result.data.status === 0 || result.data.status === 2)) {
+        let a = menuList && menuList.filter(i=>i.login === login);
+        if(a){
+          a[0].is_watch = flag;
+        }
+        setMenusFunc(a[0]);
+      }
+    })
+    .catch(error => {
+      console.log(error);
+    });
+  }
+
+  function renderArray(array){
+    let str = "";
+    for(var i = 0;i<array.length;i++){
+      str += array[i].name +"、";
+    }
+    let substr = str.substr(0,str.length-1);
+    return (<span title={substr}>{substr}</span>)
+  }
+
+  function setVisibleFunc(flag,l,index){
+    if(l !== login){
+      setLogin(l);
+    }
+    var lx = list.concat();
+    lx.map(i=>i.visible =false);
+    if(flag){
+      lx[index].visible = flag;
+    }
+    lx.splice();
+    setList(lx);
+  }
+
   return(
-    <div>
+    <div className="halfs">
       <FlexAJ>
         <AlignCenter><span className="font-16 color-grey-6">贡献者</span>{ contributors && contributors.total_count > 0 && <span className="infoCount">{contributors.total_count}</span>}</AlignCenter>
         <Link className="font-12 color-grey-9" to={`/projects/${owner}/${projectsId}/contribute`}>全部</Link>
       </FlexAJ>
-      <div className="attrPerson">
+      <div className="attrPerson" onMouseLeave={()=>setVisibleFunc(false)}>
         {
-          contributors && contributors.total_count > 0 ?
-          contributors.list.map((item,key)=>{
+          total > 0 ?
+          list.map((item,key)=>{
             return(
-              <Link key={key} to={`/users/${item.login}`}><img src={getImageUrl(`images/${item.image_url}`)} alt=""/></Link>
+              <Popover content={menu} visible={item.visible} overlayClassName="menuPanels" placement="top">
+                <Link key={key} to={`/users/${item.login}`}>
+                  <img src={getImageUrl(`/${item.image_url}`)} alt="" onMouseOver={()=>setVisibleFunc(true,item.login,key)}/>
+                </Link>
+              </Popover>
             )
           })
           :""

src/forge/Component/EAccount.scss

@@ -0,0 +1,9 @@
+.ant-modal-mask{
+  z-index: 10000;
+}
+.ant-modal-wrap{
+  z-index: 10001;
+  .ant-form-explain{
+    position: absolute;
+  }
+}

src/forge/Component/EducoderAccount.jsx

@@ -0,0 +1,60 @@
+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));

src/forge/Component/MemberCards.jsx

@@ -45,7 +45,7 @@ const Div = styled.div`{
 export default (({ user , img, name, time, focusStatus, is_current_user, login , successFunc }) => {
   return (
     <Div>
-      <Link to={`/users/${user && user.login}`}><Img src={getImageUrl(`images/${img}`)} /></Link>
+      <Link to={`/users/${user && user.login}`}><Img src={getImageUrl(`/${img}`)} /></Link>
       <div className="m-infos">
         <Link to={`/users/${user && user.login}`}><Name>{name}</Name></Link>
         <Time><I className="iconfont icon-shijian"></I>加入时间:{time}</Time>

src/forge/Component/Releases.jsx

@@ -20,10 +20,13 @@ function Releases({owner,projectsId,releaseVersions}){
         releaseVersions && releaseVersions.total_count>0 ?
           releaseVersions.list.map((item,key)=>{
             return(
-            <AlignTop className="mt10">
+            key === 0 &&<AlignTop className="mt10">
               <i className="iconfont icon-biaoqian3 color-grey-6 font-18 mr10"></i>
               <div>
-                <p className="font-16 color-grey-6"><Link to={`/projects/${owner}/${projectsId}/releases/8/update`}>{item.name}</Link></p>
+                <p className="font-16 color-grey-6">
+                  <Link to={`/projects/${owner}/${projectsId}/releases/8/update`}>{item.name}</Link>
+                  <span className="font-12 laterest ml5">最新</span>
+                </p>
                 <p className="color-grey-9 font-13">{item.created_at}</p>
               </div>
             </AlignTop>

src/forge/Component/SearchUser.jsx

@@ -44,7 +44,7 @@ export default ({ getUser })=>{
             className="user_img radius"
             width="28"
             height="28"
-            src={getImageUrl(`images/${item && item.image_url}`)}
+            src={getImageUrl(`/${item && item.image_url}`)}
             alt=""
           />
           <span className="ml10" style={{ "vertical-align": "middle" }}>

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 })=>{
+export default ({ url , name , column  , id , login })=>{
   const Img = styled.span`
     display:flex;
     ${column && "flex-direction: column;text-align:center;"}
@@ -19,6 +19,14 @@ export default ({ url , name , column })=>{
     }
   `;
   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>

src/forge/DevOps/About.jsx

@@ -36,8 +36,7 @@ function About(props, ref) {
   const [ disabled, setDisabled ] = useState(false);
   const [ typeFlag, setTypeFlag] = useState(false);
 
-
-  const AuthorLogin = props.author && props.author.login;
+  const AuthorLogin = props.projectDetail && props.projectDetail.author && props.projectDetail.author.login;
   const CurrentLogin = props.current_user && props.current_user.login;
   useEffect(()=>{
     if(CurrentLogin === AuthorLogin){
@@ -56,11 +55,6 @@ 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);

src/forge/DevOps/OpsDetailRightpanel.jsx

@@ -1,7 +1,8 @@
 import React, { useState, useEffect } from "react";
-import { Spin } from "antd";
+import { Spin , Menu } from "antd";
 import { FlexAJ, AlignCenter } from "../Component/layout";
 import axios from "axios";
+import CodeSSH from './ssh/Index';
 
 export default ({
   data,
@@ -17,6 +18,8 @@ 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]);
@@ -35,6 +38,7 @@ export default ({
           : p[0];
 
         setStep(sub);
+        setNav("0");
         if (sub && sub.status !== "skipped") {
           getStep(pre.number, sub.number);
         }
@@ -65,43 +69,55 @@ export default ({
     }
   }
   return (
-    <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 (
+    <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 ? (
                     <div className="opsDetailOut">
-                      <span>{key + 1}</span>
-                      <p>{item.out}</p>
+                      <span>1</span>
+                      <p>
+                        {stage && stage.name} – {step && step.name}: Skipped
+                      </p>
                     </div>
-                  );
-                })
-              ) : empty ? (
-                <div className="opsDetailOut">
-                  <span>1</span>
-                  <p>
-                    {stage && stage.name} – {step && step.name}: Skipped
-                  </p>
+                  ) : (
+                    ""
+                  )}
                 </div>
-              ) : (
-                ""
-              )}
-            </div>
+              </div>
+            ) : (
+              <div style={{ color: "red" }}>error:{data && data.error}</div>
+            )}
           </div>
-        ) : (
-          <div style={{ color: "red" }}>error:{data && data.error}</div>
-        )}
-      </div>
-    </Spin>
+        </Spin>
+      }
+      {
+        nav === "1" && <CodeSSH />
+      }
+    </React.Fragment>
   );
 };

src/forge/DevOps/Structure.jsx

@@ -58,6 +58,7 @@ 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,
@@ -244,7 +245,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"}} src={`${current_user && getUrl(`/images/${current_user.image_url}`)}`} />
+              <img style={{borderRadius:"50%",marginRight:"10px",width:"25px",height:"25px"}} alt="" src={`${item.image_url && getUrl(`/images/${item.image_url}`)}`} />
               <div className="task-hide ml5" style={{ maxWidth: "300px" }}>
                 {meg.message}
               </div>

src/forge/DevOps/ops.scss

@@ -194,6 +194,18 @@
       &.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;

src/forge/DevOps/ssh/Index.jsx

@@ -0,0 +1,42 @@
+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;

src/forge/DevOps/ssh/XmlPanel.jsx

@@ -0,0 +1,219 @@
+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>
+  );
+};

src/forge/DevOps/ssh/mediator.jsx

@@ -0,0 +1,46 @@
+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;

src/forge/GetData/getData.jsx

@@ -14,4 +14,8 @@ export const getHooks = async (id,params)=>{
 // 获取子目录列表
 export const getSubEntries = async (owner,projectsId,params)=>{
   return (await axios.get(`/${owner}/${projectsId}/sub_entries.json`,{params})).data;
+}
+// 获取用户信息
+export const getUser = async (login)=>{
+  return (await axios.get(`/users/${login}/hovercard.json`)).data;
 }

src/forge/Head/Footer.jsx

@@ -0,0 +1,66 @@
+import React, { useEffect , useState } from 'react';
+import './header.scss';
+
+function Footer(){
+  const [ value , setValue ] = useState(undefined);
+
+  useEffect(()=>{
+    try {
+      var chromesettingArray = JSON.parse(localStorage.getItem('chromesetting'));
+      setValue(chromesettingArray.footer);
+    } catch (e) {
+    }
+  },[])
+
+  function showhtml(htmlString){
+    var html = {__html:htmlString};
+    return <div dangerouslySetInnerHTML={html}></div> ;
+  }
+
+  return(
+    <div>
+      <div style={{height:"483px"}}></div>
+      <div className="newFooter edu-txt-center">
+        {value && showhtml(value)}
+        {/* <div className="footerInfos">
+          <ul>
+            <li>社区</li>
+            <li><a href={`/`} target="_blank">网站首页</a></li>
+            <li><a href={`https://www.trustie.net/agreement`} target="_blank">服务协议</a></li>
+            <li><a href={`https://forum.trustie.net/forums/1168/detail`} target="_blank">帮助中心</a></li>
+            <li><a href={`https://forum.trustie.net/`} target="_blank">问吧交流</a></li>
+            <li><a href={`https://www.trustie.net/cooperation`} target="_blank">合作伙伴</a></li>
+          </ul>
+          <ul>
+            <li>支持与服务</li>
+            <li><a href={`https://forgeplus.trustie.net/docs/api`} target="_blank">API文档</a></li>
+            <li><a href={`https://forum.trustie.net/forums/1168/detail`} target="_blank">帮助中心</a></li>
+            <li><a href={`https://git-scm.com`} target="_blank">Git常用命令</a></li>
+            <li><a href={`https://forum.trustie.net/forums/3080/detail`} target="_blank">DevOps使用文档</a></li>
+            <li><a href={`https://forgeplus.trustie.net/projects/jasder/forgeplus/tree/master/CHANGELOG.md`} target="_blank">日志更新</a></li>
+          </ul>
+          <ul>
+            <li>合作伙伴</li>
+            <li><a href={`http://www.sei.pku.edu.cn`} target="_blank">北京大学</a></li>
+            <li><a href={`http://scse.buaa.edu.cn`} target="_blank">北京航空航天大学</a></li>
+            <li><a href={`https://www.nju.edu.cn`} target="_blank">南京大学</a></li>
+            <li><a href={`https://www.xtu.edu.cn`} target="_blank">湘潭大学</a></li>
+            <li><a href={`http://www.iscas.ac.cn`} target="_blank">ISCAS</a></li>
+            <li><a href={`https://www.ucloud.cn`} target="_blank">UCloud优刻得</a></li>
+            <li><a href={`http://www.inforbus.com`} target="_blank">中创软件</a></li>
+            <li><a href={`https://www.inspur.com`} target="_blank">浪潮集团</a></li>
+            <li><a href={`http://www.copu.org.cn`} target="_blank">中国开源软件推进联盟</a></li>
+            <li><a href={`https://www.sjtu.edu.cn`} target="_blank">上海交通大学</a></li>
+          </ul>
+          <ul>
+            <li>合作伙伴</li>
+            <li><span>热线：</span></li>
+            <li><span>QQ群：1071514693</span></li>
+          </ul>
+        </div>
+        <p className="footerCopy">© Copyright 2007~2021 国防科技大学Trustie团队 & IntelliDE <a href="https://beian.miit.gov.cn">湘ICP备 17009477号</a></p> */}
+      </div>
+    </div>
+  )
+}
+export default Footer;

src/forge/Head/Header.js

@@ -111,7 +111,7 @@ class NewHeader extends Component {
   }
 
   onGlobalSearch=(value,item)=>{
-    window.location.href=`${item && item.url}?value=` + value;
+    window.location.href=`${item}?value=` + value;
   }
 
   openNotification = (messge) => {
@@ -577,8 +577,8 @@ class NewHeader extends Component {
       })
     }
 
-    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==="通知");
+    let search_url = settings && settings.common && settings.common.search;
+    let notice_url = settings && settings.common && settings.common.notice;
     return (
       <div className="newHeaders" id="nHeader">
         <div className="headerContent">
@@ -603,7 +603,7 @@ class NewHeader extends Component {
           <a href={settings && settings.new_course.default_url} className={"fl mr30"} style={{minWidth:"45px"}}>
             {
               settings && settings.nav_logo_url ?
-              <img alt="可控开源社区" className="logoimg" style={{ heigth: "40px" }} src={getImageUrl(settings.nav_logo_url)}></img>
+              <img alt="可控开源社区" className="logoimg" style={{ heigth: "40px" }} src={getImageUrl(`/${settings.nav_logo_url}`)}></img>
               :
               <img alt="可控开源社区" className="logoimg" style={{ heigth: "40px" }} src={logo}></img>
             }
@@ -646,7 +646,7 @@ class NewHeader extends Component {
             }
           </div>
           <div className="head-right">
-            {search_url && search_url.length>0 ? this.SearchInput(openSearch,search_url[0]):""}
+            {search_url ? this.SearchInput(openSearch,search_url):""}
             {
               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">
@@ -654,10 +654,10 @@ class NewHeader extends Component {
               </Dropdown>:""
             }
             
-            {this.props.user && this.props.user.login && (notice_url && notice_url.length>0) ?
+            {this.props.user && this.props.user.login && notice_url ?
               <div className="ml30 edu-menu-panel">
                 {user && user.login &&
-                  <a href={`${notice_url[0].url}`} style={{ position: 'relative' }}>
+                  <a href={`${notice_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>
@@ -696,15 +696,14 @@ class NewHeader extends Component {
             <span className="font-15 ml30">
               <a onClick={() => this.educoderlogin()} className="mr5 color-grey-6">登录</a>
               {
-                settings && settings.new_course && settings.new_course.register_url &&
-                <span><em className="vertical-line"></em><a className="ml5 color-grey-6" href={`${settings.new_course.register_url}`} target="_blank">注册</a></span>
+                settings && settings.common && settings.common.register &&
+                <span><em className="vertical-line"></em><a className="ml5 color-grey-6" href={`${settings.common.register}`} target="_blank">注册</a></span>
               }
             </span>
             :
             <div className="ml30 edu-menu-panel" style={{ height: "70px", lineHeight: "70px" }}>
               <a href={`/users/${this.props.current_user === undefined ? "" : this.props.current_user.login}/courses`}>
-                <img alt="头像" className="radius" height="34" id="nh_user_logo" name="avatar_image"
-                  src={getImageUrl(`images/` + user.image_url)} width="34">
+                <img alt="头像" className="radius" height="34" id="nh_user_logo" name="avatar_image" src={getImageUrl(`/${user.image_url}`)} width="34">
                 </img>
               </a>
               <ul className="edu-menu-list" style={{ top: '60px', textAlign: 'center' }}>

src/forge/Head/header.scss

@@ -7,4 +7,56 @@
   .ant-menu-vertical > .ant-menu-item{
     border:none
   }
+}
+
+.newFooter {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  background: #323232;
+  clear: both;
+  min-width: 1200px;
+  z-index: 8;
+  left: 0px;
+  p {
+    margin-top: 0;
+    margin-bottom:0px !important;
+  }
+  .footerInfos{
+    display: flex;
+    max-width: 1200px;
+    margin:0px auto;
+    justify-content: space-around;
+    padding:60px 0px;
+    & >ul{
+      padding:0px 40px;
+      box-sizing: border-box;
+      max-width: 25%;
+      text-align: left;
+      li{
+        color: #fff;
+        font-weight: 300;
+        &:first-child{
+          font-size: 17px;
+        }
+        &>a,&>span{
+          color: #bbb;
+        }
+        &>a:hover{
+          color: #4cacff;
+        }
+      }
+    }
+  }
+  .footerCopy{
+    color: #bbb;
+    border-top: 1px solid #4e4e4e;
+    padding:10px 0px;
+    a{
+      color: #bbb;
+      &:hover{
+        color: #4cacff;
+      }
+    }
+  }
 }

src/forge/Index.js

@@ -6,7 +6,6 @@ import { withRouter } from "react-router";
 import { SnackbarHOC } from "educoder";
 import { CNotificationHOC } from "../modules/courses/common/CNotificationHOC";
 import { TPMIndexHOC } from "../modules/tpm/TPMIndexHOC";
-import Handbook from './Component/Handbook';
 import "./css/index.scss";
 
 import Loadable from "react-loadable";
@@ -35,7 +34,6 @@ class Index extends Component {
   render() {
     return (
       <div className="newMain clearfix">
-        <Handbook />
         <Switch {...this.props}>
           <Route
             path="/projects/:projectsType/new/:OIdentifier"

src/forge/Main/CoderDepot.jsx

@@ -1,6 +1,6 @@
 import React , { useEffect , useState } from 'react';
 import { WhiteBack , Box , LongWidth , ShortWidth , Gap , AlignCenter , FlexAJ  } from '../Component/layout';
-import { Dropdown , Menu , Divider , Spin } from 'antd';
+import { Dropdown , Menu , Divider , Spin, Button } from 'antd';
 import { getImageUrl } from "educoder";
 import { Link } from 'react-router-dom';
 import CloneAddress from '../Branch/CloneAddress';
@@ -20,7 +20,9 @@ import DrawerPanel from '../Component/DrawerPanel';
 import UpdateDescModal from './sub/UpdateDescModal';
 import Nodata from '../Nodata';
 
-
+/**
+ * projectDetail.type:0是托管项目，1是镜像项目，2是同步镜像项目(为2时不支持在线创建、在线上传、在线修改、在线删除、创建合并请求等功能)
+ */
 function CoderDepot(props){
   const [ projectDetail , setProjectDetail ]= useState(undefined);
   const [ treeValue , setTreeValue ] = useState(undefined);
@@ -42,17 +44,18 @@ function CoderDepot(props){
   const [ openModal , setOpenModal ] = useState(false);
   const [ desc , setDesc ] = useState(undefined);
   const [ website , setWebsite ] = useState(undefined);
+  const [ lesson_url , setLessonUrl ] = useState(undefined);
 
   const owner = props.match.params.owner;
   const projectsId = props.match.params.projectsId;
   const branchName = props.match.params.branchName;
   let pathname = props.history.location.pathname;
-
   useEffect(()=>{
     if(props.projectDetail){
       setProjectDetail(props.projectDetail);
       setDesc(props.projectDetail.description);
       setWebsite(props.projectDetail.website);
+      setLessonUrl(props.projectDetail.lesson_url);
     }
   },[props])
 
@@ -65,17 +68,17 @@ function CoderDepot(props){
   },[treeValue])
 
   useEffect(()=>{
-    if (pathname){
+    if (pathname && projectDetail){
       if(pathname.indexOf(`/projects/${owner}/${projectsId}`) > -1 && pathname.indexOf(`/tree/${branchName}/`) > -1) {
         let url = pathname.split(`/tree/${branchName}/`)[1];
         setTreeValue(url);
         getFileInfo(url,branchName);
       }else{
         setTreeValue(undefined);
-        getDirInfo(branchName ||(projectDetail && projectDetail.default_branch));
+        getDirInfo(branchName ||projectDetail.default_branch);
       }
     } 
-  },[pathname])
+  },[pathname,projectDetail])
 
   // 获取主目录列表
   function getDirInfo(branch){
@@ -92,8 +95,9 @@ function CoderDepot(props){
         setZip_url(result.data.zip_url);
         let c = result.data.last_commit
         setLastCommit(c && c.commit);
-        setLastCommitAuthor(c && (c.author || (c.commit && c.commit.author)));
+        setLastCommitAuthor(c && c.committer);
         setMainFlag(true);
+        setReadOnly(true);
       }
       setTimeout(function(){setIsSpin(false);},500);
     }).catch(error=>{setIsSpin(false);})
@@ -133,8 +137,9 @@ function CoderDepot(props){
         }
         let c = result.data.last_commit
         setLastCommit(c && c.commit);
-        setLastCommitAuthor(c && (c.author || (c.commit && c.commit.author)));
+        setLastCommitAuthor(c && c.committer);
         setMainFlag(false);
+        setReadOnly(true);
       }
       setTimeout(function(){setIsSpin(false);},500)
     }).catch(error=>{setIsSpin(false);})
@@ -214,20 +219,26 @@ function CoderDepot(props){
       </Menu>
     </div>
   )
-  function okUpdate(d,w){
+  // 确认修改简介、website、实践课程链接
+  function okUpdate(d,w,l){
     const url = `/${owner}/${projectsId}.json`;
     axios.put(url,{
-      description:d,website:w
+      description:d,website:w,lesson_url:l
     }).then(result=>{
       if(result && result.data && result.data.id){
         setDesc(result.data.description);
         setWebsite(result.data.website);
+        setLessonUrl(result.data.lesson_url);
       }
     })
   }
+
+  let n = fileInfo && fileInfo.name;
+  const mdFlag = n && n.substring(n.length-3,n.length) === ".md";
+  
   return(
     <WhiteBack>
-      <UpdateDescModal desc={desc} website={website} visible={openModal} onCancel={()=>setOpenModal(false)} onOk={okUpdate}/>
+      <UpdateDescModal desc={desc} website={website} lesson_url={lesson_url} visible={openModal} onCancel={()=>setOpenModal(false)} onOk={okUpdate}/>
       <Spin spinning={isSpin}>
         {
           (dirInfo || fileInfo) && 
@@ -242,7 +253,10 @@ function CoderDepot(props){
               onClose={()=>setVisible(false)}
               list = {mainFlag ? dirInfo : undefined}
             />
-            <div className="drawerBtn" onClick={()=>setVisible(true)}><i className="iconfont icon-youjiantou"></i></div>
+            <div className="drawerBtn" onClick={()=>setVisible(true)}>
+              <i className="iconfont icon-youjiantou font-16"></i>
+              <span>目录</span>
+            </div>
           </React.Fragment>
         }
         <div style={{minHeight:"500px"}}>
@@ -284,11 +298,21 @@ function CoderDepot(props){
                     </AlignCenter>
                     <AlignCenter>
                       <div className="mr20 addOptionBtn">
-                        <a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/pulls/new`)} >+ 合并请求</a>
+                        {
+                          projectDetail.type !== 2 && 
+                          <a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/pulls/new`)} >+ 合并请求</a>
+                        }
                         <a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/issues/new`)} >+ 任务</a>
                       </div>
-                      { type === "dir" && <Dropdown.Button overlay={fileMenu} className="mr20">文件</Dropdown.Button>}
-                      <Dropdown.Button overlay={downloadMenu} type={'primary'}>下载</Dropdown.Button>
+                      { type === "dir" && projectDetail.type !== 2 &&
+                        <Dropdown overlay={fileMenu} className="mr20">
+                          <Button type="default">文件 <i className="iconfont icon-sanjiaoxing-down ml3 font-14 color-grey-9"></i></Button>
+                        </Dropdown>
+                      }
+                      
+                      <Dropdown overlay={downloadMenu} placement="bottomRight">
+                        <Button type={'primary'}>下载 <i className="iconfont icon-sanjiaoxing-down ml3 font-14 color-white"></i></Button>
+                      </Dropdown>
                     </AlignCenter>
                   </FlexAJ>
                   {
@@ -297,7 +321,7 @@ function CoderDepot(props){
                       {
                         lastCommit &&
                         <div className="listtablehead">
-                          <User url={getImageUrl(`images/${lastCommitAuthor && lastCommitAuthor.image_url}`)} name={lastCommitAuthor && lastCommitAuthor.name} />
+                          <User url={getImageUrl(`/${lastCommitAuthor && lastCommitAuthor.image_url}`)} name={lastCommitAuthor && lastCommitAuthor.name} id={lastCommitAuthor && lastCommitAuthor.id} login={lastCommitAuthor && lastCommitAuthor.login}/>
                           <div className={hideBtn && hide ? "ellipsistxt hide" :"ellipsistxt"}><p id="ptxt">{lastCommit && lastCommit.message}</p></div>
                           { hideBtn && <span className="ellipsis" onClick={()=>changeHide(hide)}><i className="iconfont icon-shenglvehao"></i></span> }
 
@@ -335,8 +359,10 @@ function CoderDepot(props){
                             {...props}
                             detail={fileInfo}
                             readOnly={readOnly}
+                            md={mdFlag}
                             onEdit={onEdit}
                             currentBranch={branchName || (projectDetail && projectDetail.default_branch)}
+                            type={projectDetail.type}
                           ></CoderRootFileDetail>
                         }
                       </ul>
@@ -347,7 +373,7 @@ function CoderDepot(props){
                     (dirInfo && dirInfo.length === 0) && (fileInfo && fileInfo.length === 0) ? <Nodata _html="暂未发现文件"/> :""
                   } 
                   {/* readme文件显示(显示文件详情时不显示readme文件) */}
-                  { dirInfo && (projectDetail && projectDetail.readme) ? <ReadMe ChangeFile={ChangeFile} readme={projectDetail && projectDetail.readme} operate={props && (props.isManager || props.isDeveloper)} history={props.history} /> :"" }
+                  { dirInfo && (projectDetail && projectDetail.readme) ? <ReadMe ChangeFile={ChangeFile} readme={projectDetail && projectDetail.readme} operate={props && (props.isManager || props.isDeveloper) && projectDetail.type !==2 } history={props.history} /> :"" }
                 </div>
               </LongWidth>
               {
@@ -358,12 +384,12 @@ function CoderDepot(props){
                       <FlexAJ className="font-18 color-grey-6 mb20" style={{lineHeight:"28px"}}>简介
                         {projectDetail.permission && (projectDetail.permission==="Admin" || projectDetail.permission==="Owner") && <i onClick={()=>setOpenModal(true)} className="iconfont icon-anquanshezhi color-grey-9 font-15"></i>}
                       </FlexAJ>
-                      {desc && <p className="font-14 color-grey-9 mb15 task-hide-2" style={{lineHeight:"22px",WebkitLineClamp:"4",textAlign:"justify"}}>{desc}</p>}
+                      {desc && <p className="font-14 color-grey-9 mb15 task-hide-2" style={{lineHeight:"22px",WebkitLineClamp:"4",textAlign:"justify",wordBreak:"break-all"}}>{desc}</p>}
                       {
                         website &&
                         <p className="color-grey-6 df">
                           <i className="iconfont icon-lianjie2 font-15 mr10 color-grey-9"></i>
-                          <span style={{wordBreak:"break-all",lineHeight:"20px",marginTop:"5px"}}>{website}</span>
+                          <a href={website} target="_blank" style={{wordBreak:"break-all",lineHeight:"20px",marginTop:"5px",textDecoration:"underline"}}>{website}</a>
                         </p>
                       }
                       <p>
@@ -382,6 +408,14 @@ function CoderDepot(props){
                         </p>
                       }
                     </div>
+                    {
+                      lesson_url &&
+                      <div>
+                        <Divider />
+                        <p className="font-16 color-grey-6">实践课程</p>
+                        <a href={lesson_url} target="_blank" className="color-grey-6" style={{textDecoration:"underline"}}>{lesson_url}</a>
+                      </div>
+                    }
                     {/* 发布 */}
                     {
                       projectDetail && projectDetail.release_versions &&
@@ -393,10 +427,7 @@ function CoderDepot(props){
                     {/* 贡献者 */}
                     {
                       projectDetail && projectDetail.contributors &&
-                      <React.Fragment>
-                        <Divider />
-                        <Contributors contributors={projectDetail && projectDetail.contributors} owner={owner} projectsId={projectsId}/>
-                      </React.Fragment>
+                      <Contributors contributors={projectDetail && projectDetail.contributors} owner={owner} projectsId={projectsId} />
                     }
                     {/* 语言 */}
                     { projectDetail && projectDetail.languages && 

src/forge/Main/CoderDepotReadme.jsx

@@ -1,13 +1,49 @@
-import React from 'react';
+import React, { useEffect, useState } from 'react';
 import RenderHtml from '../../components/render-html';
+import { Dropdown , Menu , Spin } from 'antd';
+import { Link } from 'react-router-dom';
+const $ = window.$;
 
 function CoderDepotReadme({ operate , history , readme , ChangeFile }){
+  const [ menuList ,setMenuList ] = useState(undefined);
+
+  useEffect(()=>{
+    if(readme && readme.content){
+      let path = history.location.pathname;
+      const items = $.map($("#readme").find("h1,h2,h3,h4,h5,h6"), function (el, _) {
+        const anchor = el.id;
+        const level = el.tagName.replace("H", "");
+        const href = `#${anchor}`;
+        return { href:`${path}${href}`,text:el.textContent , level:level }
+      });
+      setMenuList(items);
+    }
+  },[readme])
+
+  function menu(){
+    if(menuList && menuList.length > 0){
+      let hash = history.location.hash;
+      return(
+        <Menu className="menuslist">
+          {
+            menuList.map((item,key)=>{
+              return(
+                <Menu.Item key={item.id} className={decodeURI(hash).indexOf(item.text)>-1 ?"active":""}><Link to={`${item.href}`} style={{paddingLeft:`${item.level *10}px`}} title={item.text}>{item.text}</Link></Menu.Item>
+              )
+            })
+          }
+        </Menu>
+      )
+    }else{
+      return <Spin />
+    }
+  }
   return(
     <div className="commonBox" id="readme">
       <div className="commonBox-title">
-        <span className="mr10">
-          <i className="iconfont icon-wenjian1 font-16 color-grey-9 fl mt3"></i>
-        </span>
+        <Dropdown overlay={menu()}>
+          <i className="iconfont icon-zhangjie1 font-16 color-grey-3 mr10"></i>
+        </Dropdown>
         <span className="commonBox-title-read">README.md</span>
         {
           operate ?

src/forge/Main/CoderRootCommit.js

@@ -74,6 +74,7 @@ class CoderRootCommit extends Component{
           array.push({
             name:item.author && item.author.name,
             login: item.author && item.author.login,
+            id: item.author && item.author.id,
             image_url:item.author && item.author.image_url,
             sha:item.sha,
             time_from_now:item.time_from_now,
@@ -136,10 +137,18 @@ class CoderRootCommit extends Component{
                           <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="flex1 ml20 font-16 color-grey-3">{item.message}</Link>
                         </p>
                         <p className="f-wrap-alignCenter mt15">
-                          <Link to={`/users/${item.login}`} className="show-user-link">
-                            {item.image_url?<img src={getImageUrl(`images/${item.image_url}`)} alt="" width="28px" height="28px" className="mr15 radius"/>:""}
-                            <label className="font-14 color-grey-6" style={{verticalAlign:'middle'}}>{item.name ?`${item.name}:`:""}提交于 {item.time_from_now}</label>
-                          </Link>
+                          {
+                            item.id ?
+                            <Link to={`/users/${item.login}`} className="show-user-link">
+                              {item.image_url?<img src={getImageUrl(`/${item.image_url}`)} alt="" width="28px" height="28px" className="mr15 radius"/>:""}
+                              <label className="font-14 color-grey-6" style={{verticalAlign:'middle'}}>{item.name ?`${item.name}:`:""}提交于 {item.time_from_now}</label>
+                            </Link>:
+                            <span className="show-user-link">
+                              {item.image_url?<img src={getImageUrl(`/${item.image_url}`)} alt="" width="28px" height="28px" className="mr15 radius"/>:""}
+                              <label className="font-14 color-grey-6" style={{verticalAlign:'middle'}}>{item.name ?`${item.name}:`:""}提交于 {item.time_from_now}</label>
+                            </span>
+                          }
+                          
                         </p> 
                       </div>
                     )

src/forge/Main/CoderRootFileDetail.js

@@ -24,13 +24,25 @@ class CoderRootFileDetail extends Component {
   }
 
   componentDidMount = () => {
-    const { detail } = this.props;
+    const { detail , mdFlag } = this.props;
     this.setState({
       value: detail.content,
     });
     this.languages_total();
   };
 
+  componentDidUpdate=(prevProps)=>{
+    const { content } = this.props && this.props.detail;
+    const prevcontent = prevProps.detail && prevProps.detail.content;
+    if (content && prevcontent) {
+      if (prevcontent !== content){
+        this.setState({
+          description: content
+        });
+      }
+    }
+  }
+
   languages_total = () => {
     const { detail } = this.props;
     const file_name = detail.path.split("/").pop().split(".").pop();
@@ -164,9 +176,10 @@ class CoderRootFileDetail extends Component {
       current_user,
       isManager,
       isDeveloper,
-      md,
       currentBranch,
-      platform
+      platform,
+      md,
+      type
     } = this.props;
     const { language, languages, description } = this.state;
     let flag = current_user && current_user.login && (isManager || isDeveloper);
@@ -185,17 +198,18 @@ class CoderRootFileDetail extends Component {
                 {readOnly ? (
                   <span>
                     {
-                      detail.direct_download ?
-                        ""
-                        :
+                      !detail.direct_download?
                         <span>
                           <a onClick={() => this.DownLoadFile(detail.download_url)} className="ml20">
                             <i className="iconfont icon-xiazai1 font-15 color-grey-6"></i>
                           </a>
-                          <a onClick={() => this.EditFile(false)} className="ml20">
-                            <i className="iconfont icon-bianji1 font-15 color-grey-6"></i>
-                          </a>
-                        </span>
+                          {
+                            type !==2  &&
+                            <a onClick={() => this.EditFile(false)} className="ml20">
+                              <i className="iconfont icon-bianji1 font-15 color-grey-6"></i>
+                            </a>
+                          }
+                        </span>:""
                     }
                   </span>
                 ) : (
@@ -226,18 +240,21 @@ class CoderRootFileDetail extends Component {
                       </button>
                     </React.Fragment>
                   )}
-
-                <Popconfirm
-                  title="确认删除这个文件？"
-                  className="ml20"
-                  okText="确定"
-                  cancelText="取消"
-                  onConfirm={this.deleteFile}
-                >
-                  <a>
-                    <i className="iconfont icon-shanchu font-15 color-grey-6"></i>
-                  </a>
-                </Popconfirm>
+                {
+                  type !==2 &&
+                  <Popconfirm
+                    title="确认删除这个文件？"
+                    className="ml20"
+                    okText="确定"
+                    cancelText="取消"
+                    onConfirm={this.deleteFile}
+                  >
+                    <a>
+                      <i className="iconfont icon-shanchu font-15 color-grey-6"></i>
+                    </a>
+                  </Popconfirm>
+                }
+                
               </div>
             )}
           </p>
@@ -245,11 +262,7 @@ class CoderRootFileDetail extends Component {
         <div>
           {detail.image_type ? (
             <div className="edu-txt-center pt20 pb20">
-              <img
-                alt=""
-                src={detail.download_url}
-                style={{ maxWidth: "80%" }}
-              />
+              <img alt="" src={detail.download_url} style={{ maxWidth: "80%" }} />
             </div>
           ) : detail.direct_download ? (
             <div className="mt20 text-center">
@@ -268,7 +281,7 @@ class CoderRootFileDetail extends Component {
                 {...this.state}
                 language={language ? language : "javascript"}
                 filepath={`/${detail.path}`}
-                content={detail.content}
+                content={description}
                 readOnly={readOnly}
                 editorType="update"
                 currentBranch={currentBranch}

src/forge/Main/CoderRootIndex.js

@@ -13,10 +13,6 @@ const UploadFile = Loadable({
   loader: () => import('../Newfile/upload_file'),
   loading: Loading,
 })
-const CoderRootDirectory = Loadable({
-	loader: () => import('./CoderRootDirectory'),
-	loading: Loading,
-})
 const CoderRootCommit = Loadable({
 	loader: () => import('./CoderRootCommit'),
 	loading: Loading,

src/forge/Main/Detail.js

@@ -496,9 +496,11 @@ class Detail extends Component {
                     }
                   </span>
                   <span className="detail_tag_btn">
-                    <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>
+                    <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>
                     {
                       forked_count > 0 ?
                       platform ?
@@ -516,6 +518,7 @@ class Detail extends Component {
             {
               firstSync ? "" :
               <DetailBanner 
+                history={this.props.history}
                 list={bannerList}
                 owner={owner}
                 projectsId={projectsId}

src/forge/Main/Diff.jsx

@@ -65,7 +65,7 @@ export default ({ match , history }) => {
           <div className="f-wrap-between" style={{ alignItems: "center" }}>
             <ul className="df">
               <User
-                url={(committer && getImageUrl(`images/${committer.image_url}`))|| "https://dss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=3025493530,1989042357&fm=26&gp=0.jpg"}
+                url={(committer && getImageUrl(`/${committer.image_url}`))|| "https://dss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=3025493530,1989042357&fm=26&gp=0.jpg"}
                 name={committer && committer.name}
               />
               {committer && committer.time_from_now && <li className="ml20 mt2">{committer.time_from_now}</li>}

src/forge/Main/Index.js

@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import { Link } from 'react-router-dom';
 import { Menu, Input , Spin, Pagination , Popover , Select } from 'antd';
-import { getUrl } from 'educoder';
+import { getImageUrl } from 'educoder';
 import '../css/index.scss'
 import './list.css';
 import './Index.scss';
@@ -271,7 +271,7 @@ class Index extends Component {
                 return(
                   <div onClick={()=>this.getoDetail(item.author && item.author.login,item.identifier)}>
                     <div className="mainInfo">
-                      <img src={getUrl(`/images/${item.author && item.author.image_url}`)} alt=""/>
+                      <img src={getImageUrl(`/${item.author && item.author.image_url}`)} alt=""/>
                       <p className="school">{item.name}</p>
                       <p className="name">{item.author && item.author.name}</p>
                     </div>

src/forge/Main/Index.scss

@@ -83,10 +83,10 @@
   }
   .addOptionBtn{
     height: 32px;
-    line-height: 32px;
+    line-height: 30px;
     display: flex;
     border:1px solid #d9d9d9;
-    border-radius: 4px;
+    border-radius: 2px;
     a{
       padding:0px 13px;
       color: rgba(0, 0, 0, 0.65);
@@ -95,6 +95,9 @@
     & > a:first-child{
       border-right: 1px solid #d9d9d9;
     }
+    & > a:last-child{
+      border-right: none;
+    }
   }
   .infoCount{
     display: inline-block;
@@ -220,6 +223,9 @@
     .listtablebody{
       li.listtablepath{
         a{color: #40a9ff;}
+        p{
+          margin-bottom: 0px!important;
+        }
       }
       li{
         height: 42px;
@@ -254,23 +260,56 @@
 .drawerBtn{
   position: fixed;
   left: -13px;
-  border:1px solid #d9d9d9;
+  border:1px solid rgb(207,205,223);
   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: #d9d9d9;
+    color: #24292e;
+    height: 18px;
+    line-height: 18px;
+    width: 18px;
   }
 }
 .downMenu{
   box-shadow: 0px 0px 9px rgba(134, 134, 134,0.4);
   background-color: #fff;
+  .ant-menu-vertical .ant-menu-item:hover{
+    background-color: #e6f7ff;
+  }
+}
+
+.menuslist{
+  max-height: 200px;
+  overflow-y: auto;
+  padding:10px 15px;
+  border-radius: 4px;
+  .ant-dropdown-menu-item{
+    border-radius: 8px;
+    text-align: left!important;
+    a{
+      width: 350px;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
+  }
+  .ant-dropdown-menu-item.active{
+    background-color: #e6f7ff;
+  }
 }

src/forge/Main/IndexItem.js

@@ -27,8 +27,8 @@ class IndexItem extends Component {
                   <img className="p-r-photo" alt="" src={item.author && item.author.image_url} ></img>
                 </a>
                 :
-                <Link to={`/users/${item.author.login}`} className="show-user-link">
-                  <img className="p-r-photo" alt="" src={getImageUrl(`${item.author && item.author.image_url}`)} ></img>
+                <Link to={item.author && (item.author.type === "Organization" ? `/organize/${item.author.login}`:`/users/${item.author.login}`)} className="show-user-link">
+                  <img className="p-r-photo" alt="" src={getImageUrl(`/${item.author && item.author.image_url}`)} ></img>
                 </Link>
               }
               <div className="p-r-Infos">

src/forge/Main/list.css

@@ -281,7 +281,6 @@
   height:100%;
 }
 .files-md{
-  border:1px solid #eee;
   padding:20px;
 }
 /* 详情-代码 */
@@ -437,9 +436,6 @@
   font-size: 16px;
   border-bottom: 1px solid #d9d9d9;
 }
-.branchUl{
-  padding:0px 30px;
-}
 .branchUl li{
   display: flex;
   flex-wrap: wrap;

src/forge/Main/sub/Contribute.jsx

@@ -50,7 +50,7 @@ function Contribute(props){
                 list.map((item,key)=>{
                   return(
                     <AlignCenter>
-                      <img alt="" style={{borderRadius:"50%",marginRight:"10px"}} src={getImageUrl(`images/${item.image_url}`)} width="50px" height="50px"/>
+                      <img alt="" style={{borderRadius:"50%",marginRight:"10px"}} src={getImageUrl(`/${item.image_url}`)} width="50px" height="50px"/>
                       <div>
                         <Link to={`/users/${item.login}`} className="font-16">{item.name}</Link>
                         <p className="font-12 color-grey-9">提交{item.contributions}次</p>

src/forge/Main/sub/DetailBanner.jsx

@@ -1,11 +1,18 @@
 import React, { useEffect, useState } from 'react';
-import { Skeleton } from 'antd';
+import { Skeleton , Tooltip} from 'antd';
 import { Link } from 'react-router-dom';
 
-function DetailBanner({ list , owner , projectsId , isManager , url , pathname , state , urlFlag , projectDetail , platform ,open_devops }){
+function DetailBanner({ history,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]);
@@ -39,11 +46,13 @@ function DetailBanner({ list , owner , projectsId , isManager , url , pathname ,
                   {
                     item.menu_name === "issues" &&
                     <li className={pathname==="issues" ? "active" : ""}>
-                      <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>
+                      <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>
                     </li>
                   }
                   {
@@ -66,8 +75,8 @@ function DetailBanner({ list , owner , projectsId , isManager , url , pathname ,
                     </li>
                     :""
                   }
-                  {
-                    item.menu_name === "source" &&
+                  {/* {
+                    item.menu_name === "resources" &&
                     <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>
@@ -75,7 +84,7 @@ function DetailBanner({ list , owner , projectsId , isManager , url , pathname ,
                           {projectDetail && projectDetail.source_count ? <span className="num">{projectDetail.source_count}</span> :""}
                       </Link>
                     </li>
-                  }
+                  } */}
                   {
                     item.menu_name === "versions" &&
                     <li className={pathname==="milestones" ? "active" : ""}>
@@ -95,19 +104,19 @@ function DetailBanner({ list , owner , projectsId , isManager , url , pathname ,
                       </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}/>

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}){
+function UpdateDescModal({form , visible , onCancel , onOk,desc,website,lesson_url}){
   const { getFieldDecorator, validateFields , setFieldsValue } = form;
 
   useEffect(()=>{
     if(desc || website){
       setFieldsValue({
-        website,desc
+        website,desc,lesson_url
       })
     }
   },[desc,website])
@@ -17,7 +17,7 @@ function UpdateDescModal({form , visible , onCancel , onOk,desc,website}){
     validateFields((err,values)=>{
       if(!err){
         onCancel();
-        onOk(values.desc,values.website)
+        onOk(values.desc,values.website,values.lesson_url)
       }
     })
   }
@@ -49,6 +49,13 @@ function UpdateDescModal({form , visible , onCancel , onOk,desc,website}){
             <Input placeholder="website链接"/>
           )}
         </Form.Item>
+        <Form.Item label="实践课程">
+          {getFieldDecorator("lesson_url",{
+            rules:[]
+          })(
+            <Input placeholder="实践课程链接"/>
+          )}
+        </Form.Item>
       </Form>
     </Modal>
   )

src/forge/Merge/Commits.jsx

@@ -22,7 +22,7 @@ function Commits({ commits , projectsId , owner }){
                   <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(item.sha)}`} className="color-blue">浏览代码</Link>
                 </FlexAJ>
                 <AlignCenter className="mt15">
-                  <User url={getImageUrl(`images/${item.committer && item.committer.image_url}`)} name={`${item.committer && item.committer.name}`}></User><span>：提交于{item.time_from_now}</span>
+                  <User url={getImageUrl(`/${item.committer && item.committer.image_url}`)} name={`${item.committer && item.committer.name}`}></User><span>：提交于{item.time_from_now}</span>
                 </AlignCenter>
               </div>
             </div>

src/forge/Merge/MergeItem.js

@@ -1,6 +1,7 @@
 import React, { Component } from "react";
 import { Link } from "react-router-dom";
-import { Popconfirm, Tag } from "antd";
+import { Tag } from "antd";
+import { AlignCenter } from '../Component/layout';
 import { getImageUrl } from "educoder";
 import "./merge.css";
 
@@ -74,13 +75,13 @@ class MergeItem extends Component {
                   >
                     <img
                       className="radius"
-                      src={getImageUrl(`images/${item && item.avatar_url}`)}
+                      src={getImageUrl(`/${item && item.avatar_url}`)}
                       alt=""
                       width="24"
                       height="24"
                     />
                   </Link>
-                  <span>
+                  <AlignCenter>
                     <Link
                       to={`/users/${item && item.author_login}`}
                       className="show-user-link color-grey-8 ml5"
@@ -124,7 +125,7 @@ class MergeItem extends Component {
                         </Link>
                       </Tag>
                     </span>
-                  </span>
+                  </AlignCenter>
                 </p>
               </div>
               <ul

src/forge/Merge/MergeSubmit.js

@@ -101,7 +101,7 @@ class MergeSubmit extends Component{
         render: (text,item) => (
           <span className="f-wrap-alignCenter">
             <Link to={`/users/${item.login}`} className="show-user-link">
-                <img src={getImageUrl(`images/${item.image_url}`)} alt="" width="28px" height="28px" className="mr3 radius"/>
+                <img src={getImageUrl(`/${item.image_url}`)} alt="" width="28px" height="28px" className="mr3 radius"/>
           <label className="hide-1" style={{maxWidth:"75px",'vertical-align':'middle'}}>{text}</label>
           </Link>
           </span>

src/forge/Merge/MessageCount.js

@@ -331,26 +331,14 @@ class MessageCount extends Component {
                     }
 
                     <div className="mt15">
-                      <Link
-                        to={`/users/${data.issue.author_login}`}
-                        className="show-user-link"
-                      >
-                        <img
-                          className="mr5"
-                          src={getImageUrl(
-                            `images/${data.issue.author_picture}`
-                          )}
-                          alt=""
-                          width="24"
-                          height="24"
+                      <Link to={`/users/${data.issue.author_login}`} className="show-user-link">
+                        <img className="mr5" src={getImageUrl(`/${data.issue.author_picture}`)}
+                          alt="" width="24" height="24" style={{borderRadius:"50%"}}
                         />
                       </Link>
                       <span className="ver-middle">
                         <span className="color-grey-8 mr5">由</span>
-                        <Link
-                          to={`/users/${data.issue.author_login}`}
-                          className="show-user-link color-blue"
-                        >
+                        <Link to={`/users/${data.issue.author_login}`} className="show-user-link color-blue">
                           {data.issue.author_name}
                         </Link>
                         <span className="ml5 color-grey-8">

src/forge/Merge/merge.js

@@ -253,24 +253,6 @@ 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"}}>
@@ -419,9 +401,21 @@ 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>

src/forge/Newfile/UserSubmitComponent.js

@@ -117,7 +117,7 @@ class UserSubmitComponent extends Component {
         <span className="df" style={{ alignItems: "center" }}>
           <Link to={`/users/${current_user && current_user.login}`} className="show-user-link" >
             <img
-              src={getImageUrl(`images/${current_user && current_user.image_url}`)}
+              src={getImageUrl(`/${current_user && current_user.image_url}`)}
               alt=""
               className="screwImg"
             />

src/forge/Newfile/m_editor.js

@@ -12,6 +12,13 @@ class m_editor extends Component {
       editorValue: this.props.content,
     };
   }
+  componentDidUpdate=(prevProps)=>{
+    if(prevProps && this.props && this.props.content !== prevProps.content){
+      this.setState({
+        editorValue:this.props.content
+      })
+    }
+  }
   changeEditor = (editorValue) => {
     this.setState({
       editorValue,
@@ -44,7 +51,7 @@ class m_editor extends Component {
     return (
       <React.Fragment>
         <div>
-          <div className="branchTable">
+          <div className="branchTable" style={{border:"1px solid #eee"}}>
             <Editor
               height="400px"
               language={language ? language : "plaintext"}
@@ -57,7 +64,7 @@ class m_editor extends Component {
             />
           </div>
             {!readOnly && (
-              <div style={{padding:"20px",marginTop:"20px",borderTop:"1px solid #d9d9d9"}}>
+              <div style={{marginTop:"20px"}}>
                 <UserSubmitComponent
                   {...this.props}
                   {...this.state}

src/forge/Order/Detail.js

@@ -212,7 +212,7 @@ class Detail extends Component {
                 >
                   <img
                     className="user_img"
-                    src={getImageUrl(`images/${data && data.author_picture}`)}
+                    src={getImageUrl(`/${data && data.author_picture}`)}
                     alt=""
                     width="50"
                     height="50"

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.projectDetail && props.projectDetail.author;
+  const author = props && props.projectDetail && props.projectDetail.author;
 
   function getID(id){
     setNewId(id);
@@ -26,8 +26,8 @@ function Collaborator(props){
         {
           author && author.type === "Organization" ?
           <span>
-            <span style={{cursor:"pointer"}} className={nav === "1" ? "font-18 text-black color-blue":"font-18 text-black"} onClick={()=>setNav("1")}>协作者管理</span>
-            <span style={{cursor:"pointer"}} className={nav === "2" ? "font-18 text-black ml30 color-blue":"font-18 text-black ml30"} onClick={()=>setNav("2")}>团队管理</span>
+            <span style={{cursor:"pointer"}} className={nav === "1" ? "font-18 text-black color-blue":"font-18 text-black"} onClick={()=>{setNav("1");setNewId(undefined)}}>协作者管理</span>
+            <span style={{cursor:"pointer"}} className={nav === "2" ? "font-18 text-black ml30 color-blue":"font-18 text-black ml30"} onClick={()=>{setNav("2");setNewId(undefined)}}>团队管理</span>
           </span>
           :
           <span className="font-18 text-black">协作者管理</span>
@@ -42,7 +42,7 @@ function Collaborator(props){
       <div>
         {
           nav === "1" ? 
-          <Member newId={newId} projectsId={projectsId} owner={owner} project_id={props.project_id} author={props.author} showNotification={props.showNotification}/> 
+          <Member newId={newId} projectsId={projectsId} owner={owner} project_id={props.project_id} author={props.projectDetail && props.projectDetail.author} showNotification={props.showNotification}/> 
           :
           <Group owner={owner} projectsId={projectsId} newGroupId={newGroupId}/>
         }

src/forge/Settings/CollaboratorMember.jsx

@@ -20,8 +20,6 @@ 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);
@@ -188,7 +186,7 @@ function CollaboratorMember({projectsId,owner,project_id,author,showNotification
             className="show-user-link"
           >
             <img
-              src={getImageUrl(`images/${text}`)}
+              src={getImageUrl(`/${text}`)}
               alt=""
               width="32px"
               height="32px"

src/forge/Settings/Setting.js

@@ -13,6 +13,7 @@ const menu = [
   {name:"易修 (Issue)",index:"issues"},
   {name:"合并请求",index:"pulls"},
   {name:"工作流(beta版)",index:"devops"},
+  // {name:"资源库",index:"resources"},
   {name:"里程碑",index:"versions"},
   {name:"动态",index:"activity"},
 ]

src/forge/Source/AddTag.jsx

@@ -0,0 +1,47 @@
+import React , { forwardRef, useEffect } from 'react';
+import { Modal , Form , Input } from 'antd';
+
+function AddTag({form , visible , onCancel ,onOk}){
+  const { getFieldDecorator, validateFields , setFieldsValue } = form;
+
+  useEffect(()=>{
+    setFieldsValue({tagName:undefined})
+  },[visible])
+
+  function submit(){
+    validateFields((error,values)=>{
+      if(!error){
+        onOk(values);
+      }
+    })
+  }
+  const layout = {
+    labelCol: { span: 5 },
+    wrapperCol: { span: 18 },
+  };
+  return(
+    <Modal 
+      title={"新增标签"}
+      closable={false}
+      visible={visible}
+      onCancel={onCancel}
+      onOk={submit}
+      cancelText="取消"
+      okText="确定"
+      width="400px"
+      centered
+    >
+      <Form {...layout}>
+        <Form.Item label="标签名">
+          {getFieldDecorator("tagName",{
+            rules:[{required:true,message:"请输入标签名"}]
+          })(
+            <Input placeholder="请输入标签名" width="200px" autoComplete="off" />
+          )}
+        </Form.Item>
+      </Form>
+    </Modal>
+  )
+  
+}
+export default Form.create()(forwardRef(AddTag));

src/forge/Source/Index.jsx

@@ -1,16 +1,286 @@
-import React from 'react';
+import React, { useEffect, useState } from 'react';
 import './Index.scss';
-import { Blueback , FlexAJ } from '../Component/layout';
+import { AlignCenter, Blueback , FlexAJ } from '../Component/layout';
+import { Dropdown, Input , Menu , Pagination, Spin , Popconfirm, Button } from 'antd';
+import { Link } from 'react-router-dom';
+import UploadSource from './UploadSource';
+import AddTag from './AddTag';
+import { getImageUrl } from 'educoder';
+import Nodata from '../Nodata';
+import axios from 'axios';
 
+const { Search } = Input;
+const sort = [
+  "按上传时间排序",
+  "按下载次数排序"
+]
+const limit = 15;
+const https = 'https://testfiles.trustie.net';
 function Index(props){
+  const [ sortValue , setSortValue ] = useState(0);
+  const [ page , setPage ] = useState(1);
+  const [ total , setTotal ] = useState(0);
+  const [ search , setSearch ] = useState(undefined);
+  const [ data , setData ] = useState(undefined);
+  const [ isSpin , setIsSpin ] = useState(true);
+  const [ error , setError ] = useState(false);
+  const [ attachments , setAttachments ] = useState(undefined);
+  
+  const [ id , setId ] = useState(undefined);
+
+  const [ visible , setVisible ] = useState(false);
+  const [ addVisible , setAddVisible ] = useState(false);
+  
+  const repo_id = props.projectDetail && props.projectDetail.repo_id;
+  const owner = props.match.params.owner;
+  const current_user = props.current_user;
+
+  useEffect(()=>{
+    if(owner && repo_id){
+      setIsSpin(true);
+      getData();
+    }
+  },[repo_id,owner,search,sortValue,page])
+
+  function getData(){
+    const url = https +`/api/project/achievement/`;
+    axios.get(url,{
+      params:{
+        projectId:repo_id,
+        curPage:page,
+        pageSize:limit,
+        name:search,
+        sort:sortValue+1,
+      }
+    }).then(result=>{
+      if(result && result.data){
+        setData(result.data.data.rows);
+        setTotal(result.data.data.total);
+        setIsSpin(false);
+        setError(false);
+      }
+    }).catch(error=>{setIsSpin(false);setError(true);})
+  }
+
+  // 搜索
+  function onSearch(value){
+    setSearch(value);
+  }
+
+  // 切换排序方式
+  function changeSort(e,index){
+    setSortValue(index);
+  }
+
+
+  const menu=(
+    <Menu>
+      {
+        sort && sort.map((item,key)=>{
+          return(
+            <Menu.Item onClick={(e)=>changeSort(e,key)} value={key} className={key=== sortValue ?"color-blue":""}>{item}</Menu.Item>     
+          )
+        })
+      }
+    </Menu>
+  )
+
+  function listmenu(id,attachments,isPublic){
+    return(
+      <Menu>
+        <Menu.Item onClick={()=>{setId(id);setVisible(true);setAttachments(attachments)}}>更新版本</Menu.Item>
+        <Menu.Item onClick={()=>changeStatus(id,isPublic===1?0:1)}>{isPublic === 1 ? "设为私有":"设为公开"}</Menu.Item>
+        <Menu.Item onClick={()=>deleteSourceFunc(id)}>删除资源</Menu.Item>
+      </Menu>
+    )
+  }
+  // 更细私有状态
+  function changeStatus(id,isPublic){
+    const url = https+`/api/project/achievement/updateStatus`;
+    axios.put(url,{
+      id,status:isPublic
+    }).then(result=>{
+      if(result && result.data){
+        props.showNotification(`资源${isPublic === 1 ? "设为公开":"设为私有"}成功！`);
+        setIsSpin(true);
+        getData();
+      }
+    }).catch({})
+  }
+
+  // 删除资源方法
+  function deleteSourceFunc(id){
+    props.confirm({
+      content: "是否确认删除所选资源文件？",
+      onOk: () => {
+        const url = https + `/api/project/achievement/${id}`;
+        axios.delete(url).then(result=>{
+          if(result && result.data && result.data.code === "1"){
+            props.showNotification("资源删除成功");
+            setIsSpin(true);
+            getData();
+          }
+        })
+      }
+    })
+    
+  }
+    
+
+  // 上传资源成功
+  function onOk(){
+    setVisible(false);
+    setIsSpin(true);
+    getData();
+  }
+
+  //  确认删除标签
+  function removeTagFunc(id,tag){
+    const url = https + `/api/project/achievement/deleteTag`;
+    axios.delete(url,{
+      params:{id,tagName:tag}
+    }).then(result=>{
+      if(result && result.data){
+        props.showNotification("标签删除成功");
+        setIsSpin(true);
+        getData();
+      }
+    }).then(error=>{})
+  }
+
+  function addPanel(id){
+    setAddVisible(true);
+    setId(id);
+  }
+
+  function onCancelAdd(){
+    setId(undefined);
+    setAddVisible(false);
+  }
+
+  // 添加标签
+  function sureAddTag(values){
+    const url = https+`/api/project/achievement/addTag?id=`+id+`&tagName=`+values.tagName;
+    axios.put(url).then(result=>{
+      if(result){
+        setId(undefined);
+        setAddVisible(false);
+        setIsSpin(true);
+        getData();
+      }
+    })
+  }
+
   return(
     <div className="sourcePanel">
+      <AddTag 
+        visible={addVisible}
+        onCancel={onCancelAdd}
+        onOk={sureAddTag}
+      />
+      <UploadSource 
+        visible={visible} 
+        onCancel={()=>setVisible(false)} 
+        onOk={onOk} 
+        showNotification={props.showNotification}
+        owner={owner}
+        projectsId={repo_id}
+        id={id}
+        attachments={attachments}
+      />
       <div className="headtitle">
         <FlexAJ>
-          <span className="font-18">资源库</span>
-          <Blueback>上传资源</Blueback>
+          <span className="font-18">资源库{total ? <span>({total})</span>:""}</span>
+          { current_user && current_user.login && (props.projectDetail && props.projectDetail.permission) ?
+            <Blueback onClick={()=>{setId(undefined);setVisible(true);}}>上传资源</Blueback>:""
+          }
         </FlexAJ>
       </div>
+      <FlexAJ className="subHeadtitle">
+        <Search 
+          placeholder="在项目内搜索资源" 
+          onSearch={onSearch} 
+          allowClear 
+          enterButton="搜索"
+          width="220px"
+        />
+        <Dropdown overlay={menu} placement="bottomRight">
+          <span className="color-grey-9">{sort[sortValue]}<i className="iconfont icon-sanjiaoxing-down font-16 color-grey-9 ml3"></i></span>
+        </Dropdown>
+      </FlexAJ>
+      <Spin spinning={isSpin}>
+        <div className="bodycontent">
+        {
+          data && data.length> 0 &&
+          <ul className="bodycontentul">
+            {
+              data.map((item,key)=>{
+                return(
+                  <li>
+                    <Link to= {`/users/${item.login}`} className="infoImg"><img src={getImageUrl(`/${item.imageUrl}`)} alt="" /></Link>
+                    <div style={{flex:'1',width:"0"}}>
+                      <FlexAJ>
+                        <AlignCenter>
+                          <a href={https+`/busiAttachments/download/${item.attachId}`} download className="infoname">{item.fileName}</a>
+                          <a href={https + `/busiAttachments/view/${item.attachId}`}><i className="iconfont icon-shenqinggongkai font-15 ml10 color-grey-9"></i></a>
+                          {item.isPublic === 0 && <span className="privateTip">私有</span>}
+                        </AlignCenter>
+                        { current_user && current_user.login && 
+                          <Dropdown overlay={()=>listmenu(item.id,item.attachments,item.isPublic)} placement={'bottomRight'}>
+                            <i className="iconfont icon-gengduo1 color-grey-6"></i>
+                          </Dropdown>
+                        }
+                      </FlexAJ>
+                      <p className="infos">
+                        <span>上传时间：<span>{item.uploadTime}</span></span>
+                        <span>文件大小：<span>{item.fileSize}</span></span>
+                        <span>下载：<span>{item.download}</span></span>
+                      </p>
+                      <p className="infodesc task-hide-2">{item.remark}</p>
+                      <div className="infotag">
+                        {
+                          item.tags && item.tags.length>0 && item.tags.map((i,k)=>{
+                            return(
+                              <span>{i}
+                                {
+                                  current_user && (current_user.login === item.login) ?
+                                  <Popconfirm title="确定要删除当前标签？" onConfirm={()=>removeTagFunc(item.id,i)} okText="是" cancelText="否">
+                                    <i className="iconfont icon-guanbi font-12 ml2"></i>
+                                  </Popconfirm>:""
+                                }
+                              </span>
+                            )
+                          })
+                        }
+                        {
+                          current_user && (current_user.login === item.login) &&
+                          <a className="color-blue font-12" onClick={()=>addPanel(item.id)} style={{height:"20px",lineHeight:"20px"}}>+新增标签</a>
+                        }
+                      </div>
+                    </div>
+                  </li>
+                )
+              })
+            }
+          </ul>
+        }
+        {
+          ((data && data.length === 0) || error) && <Nodata _html="暂无数据"/>
+        }
+        {
+          total > limit && 
+          <div className="pt20 pb20 edu-txt-center">
+            <Pagination 
+              simple
+              current={page}
+              pageSize={limit}
+              total={total}
+              onChange={(p)=>{setPage(p)}}
+            />
+          </div>
+        }
+      </div>
+      </Spin>
     </div>
   )
 }

src/forge/Source/Index.scss

@@ -8,4 +8,102 @@
     padding:15px 20px;
     border-bottom: 1px solid #eee;
   }
+  .subHeadtitle{
+    padding:15px 20px;
+    border-bottom: 1px solid #eee;
+    .ant-input-group-wrapper{
+      width:320px;
+      .ant-btn.ant-input-search-button{
+        margin: 0px;
+        margin-top: -1px;
+      }
+    }
+  }
+  .bodycontent{
+    padding:0px 20px;
+    min-height: 500px;
+    & > ul.bodycontentul > li{
+      display: flex;
+      border-bottom: 1px solid #eee;
+      padding:20px 0px;
+      align-items: flex-start;
+      &:last-child{
+        border-bottom: none;
+      }
+      .infoImg{
+        img{
+          width: 50px;
+          height: 50px;
+          border-radius: 50%;
+        }
+        margin-right: 15px;        
+      }
+      .infoname{
+        font-size: 16px;
+      }
+      .privateTip{
+        display: block;
+        font-size: 12px;
+        margin-left: 10px;
+        background-color: orange;
+        height: 18px;
+        line-height: 18px;
+        padding:0px 3px;
+        color: #fff;
+      }
+      .infos{
+        & > span{
+          margin-right: 20px;
+          color: #999;
+          & >span{
+            color: #666;
+          }
+        }
+      }
+      .infodesc{
+        color: #666;
+        line-height: 20px;
+        margin:5px 0px!important;
+      }
+      .infotag{
+        display: flex;
+        flex-wrap: wrap;
+        span{
+          display: block;
+          padding:0px 4px;
+          height: 20px;
+          line-height: 20px;
+          font-size: 12px;
+          margin-right: 10px;
+          border: 1px solid #f8df8c;
+          background: #fffce6;
+          color: #0d90c3;
+          border-radius: 2px;
+          cursor: pointer;
+        }
+      }
+    }
+  }
+}
+.versionTable{
+  .currentTip{
+    display: block;
+    padding:0px 3px;
+    border-radius: 2px;
+    border:1px solid #68c7ec;
+    font-size: 12px;
+    color: #68c7ec;
+    height: 18px;
+    line-height: 18px;
+    margin-left: 5px;
+  }
+  .ant-table-body{
+    margin:0px!important;
+    thead{
+      background-color: #eee;
+    }
+    thead >tr >th,tbody > tr > td{
+      padding:4px 5px!important;
+    }
+  }
 }

src/forge/Source/Upload.jsx

@@ -0,0 +1,82 @@
+import React, { useEffect, useState } from "react";
+import { Upload, Button } from 'antd';
+import { appendFileSizeToUploadFileAll } from 'educoder';
+
+import axios from 'axios';
+function Uploads({ className , size , actionUrl,fileList,showNotification , load}) {
+  const [ files , setFiles ] = useState(undefined);
+
+  useEffect(()=>{
+    if(fileList){
+      init();
+    }
+  },[fileList]);
+
+  function init(){
+    let f = appendFileSizeToUploadFileAll(fileList);
+    setFiles(f);
+  }
+  function onAttachmentRemove(file){
+    if (!file.percent || file.percent === 100) {
+      deleteAttachment(file);
+      return false;
+    }
+  }
+  function deleteAttachment(file){
+    let id = file.response && file.response.data && file.response.data.id;
+    const url = actionUrl + `/busiAttachments/${id}`;
+    axios.delete(url).then((response) => {
+      if (response.data) {
+        if (response.data.code === "1") {
+          let nf = files.filter(item=>item.response.data.id !== id);
+          setFiles(nf);
+          fileIdList(nf);
+        } else {
+          showNotification(response.data.message)
+        }
+      }
+    }).catch(function (error) {
+      console.log(error);
+    });
+  }
+
+
+  function handleChange (info) {
+    if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
+      let fileList = info.fileList;
+      let len = info.fileList && info.fileList.length;
+      setFiles(appendFileSizeToUploadFileAll([fileList[len-1]]));
+      fileIdList(fileList[len-1]);
+    }
+  }
+
+  function fileIdList (fileList) {
+    let data = fileList.response && fileList.response.data;
+    fileList && load && load(data && data.id,data && data.fileName);
+  }
+
+  function beforeUpload(file){
+    const isLt100M = file.size / 1024 / 1024 < size;
+    if (!isLt100M) {
+      showNotification(`文件大小必须小于${size}MB!`);
+    }
+    return isLt100M;
+  }
+
+  const upload = {
+    name: 'file',
+    fileList: files,
+    action: actionUrl+`/busiAttachments/upload`,
+    onChange:handleChange,
+    onRemove:onAttachmentRemove,
+    beforeUpload:beforeUpload,
+    maxCount:1
+  };
+  return (
+    <Upload {...upload} className={className}>
+      <Button type={"default"}>上传文件</Button>
+      <span className="ml10 color-grey-9">(你可以上传小于<span className="color-red">{size}MB</span>的文件)</span>
+    </Upload>
+  )
+}
+export default Uploads;

src/forge/Source/UploadSource.jsx

@@ -0,0 +1,150 @@
+import React , { forwardRef, useEffect, useState } from 'react';
+import { Modal , Form , Checkbox , Input , Table } from 'antd';
+import Upload from './Upload';
+import { AlignCenter } from '../Component/layout';
+import axios from 'axios';
+const { TextArea } = Input;
+
+const https = 'https://testfiles.trustie.net';
+function UploadSource({ form , visible , onCancel , onOk , showNotification , attachments , id ,owner,projectsId}){
+  const [ tableData , setTableData ] = useState(undefined);
+  const [ fileId , setFilesId ] = useState(undefined);
+  const [ fileName , setFileName ] = useState(undefined);
+  const { getFieldDecorator, validateFields , setFieldsValue } = form;
+
+  useEffect(()=>{
+    if(id && attachments){
+      setTableData(attachments);
+    }
+  },[id,attachments])
+  // 上传附件后得到的文件id数组
+  function UploadFunc(id,name){
+    setFilesId(id);
+    setFileName(name);
+  }
+
+  const columns = [
+    {
+      dataIndex:"fileName",
+      key:"fileName",
+      title:"资源名称",
+      width:"42%",
+      ellipsis:true,
+      render:(value,item,key)=>{
+        return <AlignCenter>
+          <div className="task-hide" style={{maxWidth:key===0 ? "240px":"100%"}}>{value}</div>
+          { key === 0 && <span className="currentTip">当前版本</span> }
+        </AlignCenter>
+      }
+    },
+    {
+      dataIndex:"downloads",
+      key:"downloads",
+      title:"下载数",
+      width:"14%",
+      className:"edu-txt-center"
+    },
+    {
+      dataIndex:"fileSizeString",
+      key:"fileSizeString",
+      title:"文件大小",
+      width:"16%",
+      className:"edu-txt-center"
+    },
+    {
+      dataIndex:"createdAt",
+      key:"createdAt",
+      title:"上传时间",
+    }
+  ]
+
+  // 确定
+  function submit(){
+    if(fileId){
+      validateFields((error,values)=>{
+        if(!error){
+          postInfo(values);
+        }
+      })
+    }else{
+      showNotification("请先上传文件！");
+    }
+  }
+
+  function postInfo(values){
+    const url = https+`/api/project/achievement/`;
+    if(id){
+      // 修改
+      axios.put(url,{
+        id,fileName,fileId:`${fileId}`,
+        remark:values.remark
+      }).then(result=>{
+        if(result && result.data){
+          onOk();
+        }
+      }).catch(error=>{})
+    }else{
+      // 上传
+      axios.post(url,{
+        fileId:`${fileId}`,
+        fileName,
+        login:owner,
+        projectId:projectsId,
+        ...values
+      }).then(result=>{
+        if(result && result.data){
+          onOk();
+        }
+      }).catch(error=>{})
+    }
+    
+  }
+  return(
+    <Modal 
+      title={id?"更新资源版本":"上传资源"}
+      closable={false}
+      visible={visible}
+      onCancel={onCancel}
+      onOk={submit}
+      cancelText="取消"
+      okText="确定"
+      width="600px"
+      centered
+    >
+      <div>
+        <Form>
+          {id && <Table className="versionTable mb20" columns={columns} dataSource={tableData} pagination={false} size={"small"}/> }
+          <Form.Item style={{display:id?"none":"block"}}>
+            {getFieldDecorator("tagNames",{
+              rules:[]
+            })(
+              <Checkbox.Group>
+                <Checkbox value="软件版本">软件版本</Checkbox>
+                <Checkbox value="文档">文档</Checkbox>
+                <Checkbox value="代码">代码</Checkbox>
+                <Checkbox value="媒体">媒体</Checkbox>
+                <Checkbox value="论文">论文</Checkbox>
+                <Checkbox value="其它">其它</Checkbox>
+              </Checkbox.Group>
+            )}
+          </Form.Item>
+          <Upload 
+            className="commentStyle"
+            load={UploadFunc}
+            size={100}
+            showNotification={showNotification}
+            actionUrl= {https}
+          />
+          <Form.Item className="mt20">
+            {getFieldDecorator("remark",{
+              rules:[]
+            })(
+              <TextArea rows={4} placeholder="请输入资源描述" />
+            )}
+          </Form.Item>
+        </Form>
+      </div>
+    </Modal>
+  )
+}
+export default Form.create()(forwardRef(UploadSource));;

src/forge/Team/Group/GroupDetailMember.jsx

@@ -10,6 +10,7 @@ export default (({ data , current_user , successFunc }) => {
         data.map((item, key) => {
           return (
             <Cards
+              user={item.user}
               img={item.user.image_url}
               name={item.user.name}
               time={item.created_at}

src/forge/Team/Group/GroupDetailProject.jsx

@@ -30,8 +30,8 @@ export default (({projects}) => {
         projects.map((item, key) => {
         return (
           <Div>
-            <Imgs src={item.project && getImageUrl(`images/${item.project.owner_image_url}`)}/>
-            <Link to={`/projects/${item.project.owner_name}/${item.project.identifier}`}>{item.project.name}</Link>
+            <Imgs src={item.project && getImageUrl(`/${item.project.owner_image_url}`)}/>
+            <Link to={`/projects/${item.project.owner_login}/${item.project.identifier}`}>{item.project.name}</Link>
           </Div>
         )
         })

src/forge/Team/Group/GroupDetails.jsx

@@ -101,7 +101,7 @@ export default ((props) => {
           group ?
             <div>
               <AlignCenterBetween>
-                <span className="color-grey-3">{group.name}</span>
+                <span className="color-grey-3">{group.nickname}</span>
                 {group.is_member && !group.is_admin ?
                   <Popconfirm
                     title="确认离开团队吗？"

src/forge/Team/Group/GroupForm.jsx

@@ -137,17 +137,39 @@ export default Form.create()(
         history.push(`/organize/${OIdentifier}`);
       }
     }
+
+
+    function checkname(rule, value, callback){
+      if(!value){
+        callback();
+      }
+      if(value && !value.match(/^[a-zA-Z][a-zA-Z\d]{3,14}$/)){
+        callback("只能使用英文字母和数字，以字母开头，长度为4到15个字符");
+      }
+      callback();
+    }
     return (
       <Spin spinning={isSpin}>
-        <WhiteBack className="mb30" style={{border:"1px solid #eee"}}>
+        <WhiteBack className="mb30" style={{border:groupId?"none":"1px solid #eee"}}>
           <Banner>{groupId ? "基本设置" : "新建团队"}</Banner>
           <Div>
             <Form>
               {helper(
-                '团队名称：',
+                '团队标识：',
                 "name",
+                [
+                  { required: true, message: "请输入团队标识" },
+                  {
+                    validator:checkname
+                  }
+                ],
+                <Input placeholder="请输入团队标识" disabled={onwers}/>, true
+              )}
+              {helper(
+                '团队名称：',
+                "nickname",
                 [{ required: true, message: "请输入团队名称" }],
-                <Input placeholder="请输入团队名称" disabled={onwers}/>, true
+                <Input placeholder="请输入团队名称"/>, true
               )}
               {helper(
                 <span className="mb5">团队描述：<span className="color-grey-8">(描述团队的目的或作用)</span></span>,

src/forge/Team/Group/Setting/GroupMemberSetting.jsx

@@ -76,7 +76,7 @@ export default ((props) => {
       width: "7%",
       render: (value, item) => {
         return (
-          <Img src={getImageUrl(`images/${item.user.image_url}`)}></Img>
+          <Img src={getImageUrl(`/${item.user.image_url}`)}></Img>
         )
       }
     },

src/forge/Team/Group/Setting/GroupProjectSetting.jsx

@@ -180,7 +180,7 @@ function GroupProjectSetting(props) {
                 }
               >
                 <List.Item.Meta
-                  title={<a href={`/projects/${item.project.owner_name}/${item.project.name}`}>{item.project.owner_name}/{item.project.name}</a>}
+                  title={<a href={`/projects/${item.project.owner_login}/${item.project.identifier}`}>{item.project.owner_name}/{item.project.name}</a>}
                 />
               </List.Item>
             )}

src/forge/Team/New.jsx

@@ -1,15 +1,15 @@
 import React,{ forwardRef , useCallback , useEffect, useState } from 'react';
 import './Index.scss';
-import { Form , Input , Radio , Checkbox , Button, InputNumber } from "antd";
+import { Form , Input , Radio , Checkbox , Button } from "antd";
 import UploadImage from './Component/UploadImage';
 import axios from 'axios';
-
+const port = window.location.port;
+const hostname = window.location.hostname;
 export default Form.create()(
   forwardRef(({ form , showNotification , history })=>{
     const [ image , setImage ] = useState(undefined);
     const [ imageFlag , setImageFlag] = useState(false);
     const { getFieldDecorator, validateFields , setFieldsValue } = form;
-
     const radioStyle = {
       display: 'block',
       height: '30px',
@@ -60,19 +60,44 @@ export default Form.create()(
       })
     },[])
 
+    function checkname(rule, value, callback){
+      if(!value){
+        callback();
+      }
+      if(value && !value.match(/^[a-zA-Z][a-zA-Z0-9_-]{3,19}$/)){
+        callback("只能使用以字母开头，包含字母、数字、下划线、横杠等，长度4到20个字符");
+      }
+      callback();
+    }
+
     return(
-        <div className="main">
+        <div className="main" style={{padding:"0px",border:"none"}}>
           <div className="teamBox">
             <p className="teamBox-title">新建组织</p>
             <Form className="teamBox-form">
               {helper(
-                <span>组织名称：<span className="color-grey-8">(组织名称应该简单明了)</span></span>,
+                <span>组织账号：</span>,
                 "name",
+                [
+                  { required: true, message: "请输入组织账号" },
+                  {
+                    validator:checkname
+                  }
+                ],
+                <Input
+                  addonBefore={`https://`+ port ? `${hostname}:${port}/organize`:`${hostname}/organize`}
+                  placeholder="组织账号"
+                />
+              )}
+              {helper(
+                <span>组织名称：</span>,
+                "nickname",
                 [{ required: true, message: "请输入组织名称" }],
                 <Input
                   placeholder="请输入组织名称"
                 />
               )}
+              
               {helper(
                 '组织描述',
                 "description",

src/forge/Team/RightBox.jsx

@@ -72,7 +72,7 @@ function RightBox({ OIdentifier , history , admin }) {
             memberData.organization_users.map((item,key)=>{
               return(
                 <div className="teammembers" key={key}>
-                  <Link to={`/users/${item.user && item.user.login}`}><Img src={getImageUrl(`images/${item.user && item.user.image_url}`)} alt="" className="m-img"/></Link>
+                  <Link to={`/users/${item.user && item.user.login}`}><Img src={getImageUrl(`/${item.user && item.user.image_url}`)} alt="" className="m-img"/></Link>
                   <div>
                     <Link to={`/users/${item.user && item.user.login}`}><ListName>{item.user && item.user.name}</ListName></Link>
                     <Align><i className="iconfont icon-shijian color-green mr3 font-13"></i><Span>加入时间：{item.created_at}</Span></Align>

src/forge/Team/Setting/TeamSettingCommon.jsx

@@ -95,6 +95,15 @@ export default Form.create()(
       })
       setVisible(false);
     }
+    function checkname(rule, value, callback){
+      if(!value){
+        callback();
+      }
+      if(value && !value.match(/^[a-zA-Z][a-zA-Z0-9_-]{3,19}$/)){
+        callback("只能使用以字母开头，包含字母、数字、下划线、横杠等，长度4到20个字符");
+      }
+      callback();
+    }
     return(
       <div>
         <WhiteBack>
@@ -102,8 +111,19 @@ export default Form.create()(
           <Div>
             <Form>
               {helper(
-                "组织名称：",
+                "组织账号：",
                 "name",
+                [
+                  { required: true, message: "请输入组织账号" },
+                  {
+                    validator:checkname
+                  }
+                ],
+                <Input placeholder="请输入组织账号" disabled/>,true
+              )}
+              {helper(
+                "组织名称：",
+                "nickname",
                 [{ required: true, message: "请输入组织名称" }],
                 <Input placeholder="请输入组织名称" />,true
               )}
@@ -149,7 +169,7 @@ export default Form.create()(
                 <Input value="-1" style={{width:"350px"}}/>
               )}
               <p>选择头像:</p>
-              <UploadImage url={getImageUrl(`images/${image}`)} getImage={getImage}/>
+              <UploadImage url={getImageUrl(`/${image}`)} getImage={getImage}/>
               <Button type={"primary"} onClick={updateDetail}>更新仓库设置</Button>
             </Form>
           </Div>

src/forge/Team/Setting/TeamSettingMember.jsx

@@ -64,7 +64,7 @@ export default (({organizeDetail})=>{
       width:"5%",
       render:(value)=>{
         return(
-          value && <Link to={`/users/${value && value.login}`}><Img src={getImageUrl('images/'+value.image_url)}></Img> </Link>
+          value && <Link to={`/users/${value && value.login}`}><Img src={getImageUrl('/'+value.image_url)}></Img> </Link>
         )
       }
     },

src/forge/Team/Sub/Detail.jsx

@@ -78,7 +78,7 @@ function Detail(props){
         detail &&
         <Cards
           src={`/organize/${detail.name}`}
-          title={detail.name}
+          title={detail.nickname}
           desc={!buttonflag && detail.description}
           img={detail.avatar_url}
           rightBtn={

src/forge/Team/Sub/SubDetail.jsx

@@ -56,7 +56,7 @@ export default ((props)=>{
         detail && 
         <Cards
           src={`/organize/${OIdentifier}/group/${groupId}`}
-          title={detail.name}
+          title={detail.nickname||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>

src/forge/Team/TeamGroupItems.jsx

@@ -75,7 +75,7 @@ function TeamGroupItems({organizeDetail,limit, count , history}){
                 return(
                 <div key={key}>
                   <p className="g-head">
-                    <Link to={`/organize/${organizeDetail.name}/group/${item.id}`} className="color-grey-3 font-16">{item.name}</Link>
+                    <Link to={`/organize/${organizeDetail.name}/group/${item.id}`} className="color-grey-3 font-16">{item.nickname}</Link>
                     <span>
                       { item.is_admin && item.authorize!=="owner" && <Popconfirm title={`确定解散团队${item.name}?`} okText="是" cancelText="否" onConfirm={()=>disMissGroup(item.id)}><a className="color-red">解散团队</a></Popconfirm>}
                       { item.is_member && <LeaveTeam className="ml15" teamID={item.id} onOk={outTeam}/>}
@@ -86,7 +86,7 @@ function TeamGroupItems({organizeDetail,limit, count , history}){
                     {
                       item.users && item.users.map((i,k)=>{
                         return( 
-                          k < count ? <Link to={`/users/${i.login}`}><ImgContent title={i.name} key={k} src={getImageUrl(`images/${i.image_url}`)}/></Link> 
+                          k < count ? <Link to={`/users/${i.login}`}><ImgContent title={i.name} key={k} src={getImageUrl(`/${i.image_url}`)}/></Link> 
                           : 
                           k === count ? 
                           <Link to={`/organize/${organizeDetail && organizeDetail.name}/group/${item.id}`} className="moreMember" title="查看更多" ><i className="iconfont icon-zhunbeizhong"></i></Link>
@@ -105,7 +105,7 @@ function TeamGroupItems({organizeDetail,limit, count , history}){
             }
           </div>
         }
-        { list && list.length > 0 && <Nodata _html="暂无数据"/> }
+        { list && list.length === 0 && <Nodata _html="暂无数据"/> }
         {
           total > limit && 
           <div className="mt20 pb20 edu-txt-center">

src/forge/Upload/Index.js

@@ -1,6 +1,7 @@
 import React, { Component } from "react";
-import { Upload, Button, Icon } from 'antd';
+import { Upload, Icon , Button } from 'antd';
 import { getUploadActionUrl, appendFileSizeToUploadFileAll } from 'educoder';
+import { AlignCenter } from '../Component/layout';
 
 import axios from 'axios';
 const { Dragger } = Upload;
@@ -28,22 +29,12 @@ 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) => {
@@ -82,7 +73,7 @@ class Index extends Component {
   fileIdList = (fileList) => {
     let array = [];
     fileList && fileList.length > 0 && fileList.map((item) => {
-      return array.push(item.response && item.response.id);
+      return array.push(item.response && (item.response.id || (item.response.data && item.response.data.id)));
     })
     array && this.props.load && this.props.load(array);
   }
@@ -98,21 +89,27 @@ class Index extends Component {
 
   render() {
     //判断是否已经提交，如已提交评论则上一条评论数据清除
-    const { isComplete, icon } = this.props;
+    const { isComplete, icon , btn , className , size , actionUrl } = this.props;
     const { fileList } = this.state;
 
     let list = isComplete === true ? fileList : undefined;
     const upload = {
       name: 'file',
       fileList: list,
-      action: `${getUploadActionUrl()}`,
+      action: actionUrl || `${getUploadActionUrl()}`,
       onChange: this.handleChange,
       onRemove: this.onAttachmentRemove,
       beforeUpload: this.beforeUpload
     };
 
     return (
-      <Dragger {...upload} className={this.props.className}>
+      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}>
         {icon || <Icon type="inbox" />}
         <p className="ant-upload-text font-14">拖动文件或<span className="color-blue">点击此处上传</span></p>
       </Dragger>

src/forge/UsersList/focus_button.js

@@ -5,6 +5,7 @@ import "./list.css";
 
 function FocusButton({is_watch , fontClass, starText, is_block , id , successFunc}){
   const [ isSpin , setIsSpin ] = useState(false);
+  const [ watchFlag , setWatchFlag ] = useState(is_watch);
   // 关注和取消关注
   function focusFunc(flag){
     setIsSpin(true);
@@ -18,6 +19,7 @@ function FocusButton({is_watch , fontClass, starText, is_block , id , successFun
     }).then((result) => {
       if (result && result.data.status === 0) {
         successFunc && successFunc();
+        setWatchFlag(!watchFlag);
       }
       setIsSpin(false);
     })
@@ -25,8 +27,8 @@ function FocusButton({is_watch , fontClass, starText, is_block , id , successFun
   };
 
   return (
-    <Button type={is_watch ? "default" : "primary"} ghost={!is_watch} block={is_block} loading={isSpin} onClick={() => focusFunc(is_watch)}>
-      {is_watch ? (
+    <Button type={watchFlag ? "default" : "primary"} ghost={!watchFlag} block={is_block} loading={isSpin} onClick={() => focusFunc(watchFlag)}>
+      {watchFlag ? (
         <span className="">
           <i className="iconfont icon-shixing font-15 text-yellow mr-4"></i>
           <span className={fontClass || "font-12"}>已关注</span>

src/forge/UsersList/fork_users.js

@@ -88,7 +88,7 @@ class ForkUsers extends Component {
                 >
                   <img
                     className="avatar-60"
-                    src={getImageUrl(`images/${item.image_url}`)}
+                    src={getImageUrl(`/${item.image_url}`)}
                     alt=""
                   />
                 </Link>

src/forge/UsersList/user_list.js

@@ -18,7 +18,7 @@ class UserList extends Component {
                 >
                   <img
                     className="avatar-60"
-                    src={getImageUrl(`images/${item.image_url}`)}
+                    src={getImageUrl(`/${item.image_url}`)}
                     alt=""
                   />
                 </a>

src/forge/comments/children_comments.js

@@ -118,7 +118,7 @@ class children_comments extends Component {
           >
             <img
               className="radius"
-              src={getImageUrl(`images/${item && item.user_picture}`)}
+              src={getImageUrl(`/${item && item.user_picture}`)}
               alt=""
               width="30"
               height="30"

src/forge/comments/children_journals.js

@@ -82,7 +82,7 @@ class children_journals extends Component {
           >
             <img
               className="radius"
-              src={getImageUrl(`images/${item && item.user_picture}`)}
+              src={getImageUrl(`/${item && item.user_picture}`)}
               alt=""
               width="30"
               height="30"

src/forge/comments/comments.js

@@ -310,7 +310,7 @@ class comments extends Component {
             <img
               className="radius"
               src={getImageUrl(
-                `images/${current_user && current_user.image_url}`
+                `/${current_user && current_user.image_url}`
               )}
               alt=""
               width="30"
@@ -375,7 +375,7 @@ class comments extends Component {
             >
               <img
                 className="radius"
-                src={getImageUrl(`images/${item && item.user_picture}`)}
+                src={getImageUrl(`/${item && item.user_picture}`)}
                 alt=""
                 width="30"
                 height="30"
@@ -471,7 +471,7 @@ class comments extends Component {
                     className="radius"
                     src={
                       current_user && current_user.image_url
-                        ? getImageUrl(`images/${current_user.image_url}`)
+                        ? getImageUrl(`/${current_user.image_url}`)
                         : "images/avatars/User/b"
                     }
                     alt=""
@@ -528,7 +528,7 @@ class comments extends Component {
                           className="radius"
                           src={
                             current_user && current_user.image_url
-                              ? getImageUrl(`images/${current_user.image_url}`)
+                              ? getImageUrl(`/${current_user.image_url}`)
                               : "images/avatars/User/b"
                           }
                           alt=""

src/forge/users/Index.jsx

@@ -6,7 +6,6 @@ import { withRouter } from "react-router";
 import { SnackbarHOC } from "educoder";
 import { CNotificationHOC } from "../../modules/courses/common/CNotificationHOC";
 import { TPMIndexHOC } from "../../modules/tpm/TPMIndexHOC";
-import Handbook from '../Component/Handbook';
 const Infos = Loadable({
   loader: () => import("./Infos"),
   loading: Loading,
@@ -15,7 +14,6 @@ export default withRouter(
   (CNotificationHOC()(SnackbarHOC()(TPMIndexHOC((props)=>{
     return(
       <div>
-        <Handbook />
         <Switch>
           <Route
             path="/users/:username"

src/forge/users/Infos.js

@@ -150,7 +150,7 @@ class Infos extends Component {
                 <div className="list-l-Menu text-center pd20 ">
                   <Avatar
                     size={110}
-                    src={getImageUrl(`images/${user && user.image_url}`)}
+                    src={getImageUrl(`/${user && user.image_url}`)}
                   />
                   {user && user.user_identity && (
                     <div className="mt-n15 position-relative">

src/forge/users/Team-item.jsx

@@ -4,7 +4,7 @@ import { getImageUrl } from 'educoder';
 function TeamItem({item,history}){
   return(
     <div onClick={()=>{history.push(`/organize/${item.name}`)}} style={{cursor:"pointer"}}>
-      <div className="imgBox"><img alt="" src={getImageUrl(`images/${item.avatar_url}`)}/></div>
+      <div className="imgBox"><img alt="" src={getImageUrl(`/${item.avatar_url}`)}/></div>
       <div style={{flex:'1'}}>
         <span className="mb5 font-18 color-grey-3 task-hide">{item.name}</span>
         <div className="task-hide-2">

src/index.css

@@ -67,17 +67,6 @@ li {
   font-size: 25px !important;
 }
 
-.newFooter {
-  position: absolute;
-  bottom: 0;
-  width: 100%;
-  background: #323232;
-  clear: both;
-  min-width: 1200px;
-  z-index: 8;
-  left: 0px;
-  max-height: 110px;
-}
 
 .markdown-body {
   text-align: justify;

src/indexEduplus2RequestProxy.js

@@ -17,21 +17,6 @@ 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`
@@ -65,20 +50,4 @@ 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
- */
+}

src/modules/404/Shixunnopage.js

@@ -16,7 +16,7 @@ class http500 extends Component {
             <div className="newMain clearfix">
                     <div className=" edu-txt-center mt60 mb60">
                         {/*mt100 mb100*/}
-                        <img src={getImageUrl("images/warn/pic_404.jpg")} />
+                        <img src={getImageUrl("/images/warn/pic_404.jpg")} />
                             <p className="font-18 mt40">
                                 您可以稍后尝试&nbsp;<a href="/"
                                                 className="color-blue">返回首页</a>

src/modules/courses/competitions/Competitimain/CompetitionsIndex.js

@@ -78,7 +78,7 @@ class CompetitionsIndex extends Component{
 										.courses-head{
 												width: 100%;
 												height: 300px;
-									      background-image: url(${getImageUrl(this.props.mygetHelmetapi && this.props.mygetHelmetapi.competition_banner_url === null ?`images/educoder/competitions/courses.jpg`:this.props.mygetHelmetapi&&this.props.mygetHelmetapi.competition_banner_url)});
+									      background-image: url(${getImageUrl(this.props.mygetHelmetapi && this.props.mygetHelmetapi.competition_banner_url === null ?`/images/educoder/competitions/courses.jpg`:this.props.mygetHelmetapi&&this.props.mygetHelmetapi.competition_banner_url)});
 											  background-color: #081C4B;
 												background-position: center;
 												background-repeat: no-repeat;

src/modules/courses/competitions/Competitioncommon/CompetitionCommon.js

@@ -358,10 +358,10 @@ class CompetitionCommon extends Component{
 							data && data.permission.editable === true ? "" :
 								<div className={"CompetitionsListzhezhao"}>即将发布 敬请期待</div> : ""}
 						<img className={"Commonimg"}
-								 src={data.competition_status === "ended" ? getImageUrl(`images/educoder/competitions/groups1.png`) : data.competition_status === "nearly_published" ? getImageUrl(`images/educoder/competitions/groups2.png`) : data.competition_status === "progressing" ? getImageUrl(`images/educoder/competitions/groups3.png`) : ""}/>
+								 src={data.competition_status === "ended" ? getImageUrl(`/images/educoder/competitions/groups1.png`) : data.competition_status === "nearly_published" ? getImageUrl(`images/educoder/competitions/groups2.png`) : data.competition_status === "progressing" ? getImageUrl(`images/educoder/competitions/groups3.png`) : ""}/>
 						<Col span={15} className={"Commonimgbox"}>
 							<img className={"image_urlbox"}
-									 src={data === undefined ? getImageUrl(`images/educoder/competitions/mainbanner.jpg`) : data.avatar_url === null ? getImageUrl(`images/educoder/competitions/mainbanner.jpg`) : getImageUrl(data.avatar_url)}/>
+									 src={data === undefined ? getImageUrl(`/images/educoder/competitions/mainbanner.jpg`) : data.avatar_url === null ? getImageUrl(`/images/educoder/competitions/mainbanner.jpg`) : getImageUrl(data.avatar_url)}/>
 						</Col>
 						<Col className={"CompetitionCommonbannerfont"} span={9}>
 

src/modules/courses/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsChart.js

@@ -249,11 +249,11 @@ class CompetitionContents extends Component{
 										cover={
 											<div className={"Competitionfirstbox center"}>
 												<li className="pr Competitioncenter">
-														<img src={getImageUrl("images/educoder/huangguan.png")}/>
+														<img src={getImageUrl("/images/educoder/huangguan.png")}/>
 													<div className={"mt10"}>
 														<a href={`/users/${item.user_login}`} target={"_blank"} className="color-dark">
 														<div className={"relativef"}>
-															<img className={"rankingimg"} src={getImageUrl(`images/${item.user_image===null?`avatars/User/0?1442652658`:item.user_image}`)} />
+															<img className={"rankingimg"} src={getImageUrl(`/images/${item.user_image===null?`avatars/User/0?1442652658`:item.user_image}`)} />
 											      	<div className={"competimgabsolute"}><Badge count={item.competition_prize} style={{ backgroundColor: '#459BE5' }} title={item.competition_prize}/></div>
 														</div>
 															<p className="task-hide rankName mt5 jinshaifont">{personal===undefined||personal===null?item.record_user_name:personal===true?item.record_user_name:item.team_name}</p>

src/modules/courses/coursesHome/CoursesHome.js

@@ -171,7 +171,7 @@ class CoursesHome extends Component {
             coursesHomelist={coursesHomelist}></CoursesHomeCard>}
 
           {coursesHomelist === undefined ? "" : coursesHomelist.courses.length === 0 ? <div className="edu-tab-con-box clearfix edu-txt-center mb50">
-            <img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")} />
+            <img className="edu-nodata-img mb20" src={getImageUrl("/images/educoder/nodata.png")} />
             <p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p>
           </div> : ""}
 

src/modules/courses/css/Courses.css

@@ -1366,10 +1366,6 @@ 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 {
@@ -1722,12 +1718,6 @@ 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;

src/modules/courses/shixunHomework/Listofworksstudentone.js

@@ -295,7 +295,7 @@ class Listofworksstudentone extends Component {
 						计算规则:<br/>
 						学员离开实训学习界面停止计时；<br/>
 						评测首次通过之后，停止计时<br/>
-					</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
+					</pre>}><img src={getImageUrl("/images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
 					dataIndex: 'cost_time',
 					key: 'cost_time',
 					align: 'center',
@@ -381,7 +381,7 @@ class Listofworksstudentone extends Component {
 					title:<span>关卡得分<Tooltip placement="top" title={<pre>
 							计算规则:<br/>
               截止前学员完成的关卡才有成绩<br/>
-					</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
+					</pre>}><img src={getImageUrl("/images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
 					dataIndex: 'final_score',
 					key: 'final_score',
 					align: 'center',
@@ -420,7 +420,7 @@ class Listofworksstudentone extends Component {
 					学生工作效率= log(实训总得分/实训总耗时)<br/>
 					学生效率分 = 学生工作效率 / 课堂学生最高<br/>
 					工作效率 * 分值<br/>
-					</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
+					</pre>}><img src={getImageUrl("/images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
 					dataIndex: 'efficiencyscore',
 					key: 'efficiencyscore',
 					align: 'center',
@@ -694,7 +694,7 @@ class Listofworksstudentone extends Component {
 						计算规则:<br/>
 						学员离开实训学习界面停止计时；<br/>
 						评测首次通过之后，停止计时<br/>
-					</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
+					</pre>}><img src={getImageUrl("/images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
 					dataIndex: 'cost_time',
 					key: 'cost_time',
 					align: 'center',
@@ -780,7 +780,7 @@ class Listofworksstudentone extends Component {
 					title:<span>关卡得分<Tooltip placement="top" title={<pre>
 							计算规则:<br/>
               截止前学员完成的关卡才有成绩<br/>
-					</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
+					</pre>}><img src={getImageUrl("/images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
 					dataIndex: 'final_score',
 					key: 'final_score',
 					align: 'center',
@@ -819,7 +819,7 @@ class Listofworksstudentone extends Component {
 					学生工作效率= log(实训总得分/实训总耗时)<br/>
 					学生效率分 = 学生工作效率 / 课堂学生最高<br/>
 					工作效率 * 分值<br/>
-					</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
+					</pre>}><img src={getImageUrl("/images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
 					dataIndex: 'efficiencyscore',
 					key: 'efficiencyscore',
 					align: 'center',
@@ -1050,7 +1050,7 @@ class Listofworksstudentone extends Component {
 						计算规则:<br/>
 						学员离开实训学习界面停止计时；<br/>
 						评测首次通过之后，停止计时<br/>
-					</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
+					</pre>}><img src={getImageUrl("/images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
 					dataIndex: 'cost_time',
 					key: 'cost_time',
 					align: 'center',
@@ -1134,7 +1134,7 @@ class Listofworksstudentone extends Component {
 					title:<span>关卡得分<Tooltip placement="top" title={<pre>
 							计算规则:<br/>
               截止前学员完成的关卡才有成绩<br/>
-					</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
+					</pre>}><img src={getImageUrl("/images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
 					dataIndex: 'final_score',
 					key: 'final_score',
 					align: 'center',
@@ -1167,7 +1167,7 @@ class Listofworksstudentone extends Component {
 					学生工作效率= log(实训总得分/实训总耗时)<br/>
 					学生效率分 = 学生工作效率 / 课堂学生最高<br/>
 					工作效率 * 分值<br/>
-					</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
+					</pre>}><img src={getImageUrl("/images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
 					dataIndex: 'efficiencyscore',
 					key: 'efficiencyscore',
 					align: 'center',
@@ -1210,7 +1210,7 @@ class Listofworksstudentone extends Component {
 					title: <span>当前成绩<Tooltip placement="top"title={<pre>
 						 鼠标停留具体分值上可查<br/>
              看得分明细<br/>
-					</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
+					</pre>}><img src={getImageUrl("/images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
 					dataIndex: 'work_score',
 					key: 'work_score',
 					align: 'center',
@@ -1461,7 +1461,7 @@ class Listofworksstudentone extends Component {
 						计算规则:<br/>
 						学员离开实训学习界面停止计时；<br/>
 						评测首次通过之后，停止计时<br/>
-					</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
+					</pre>}><img src={getImageUrl("/images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
 					dataIndex: 'cost_time',
 					key: 'cost_time',
 					align: 'center',
@@ -1524,7 +1524,7 @@ class Listofworksstudentone extends Component {
 					title:<span>关卡得分<Tooltip placement="top" title={<pre>
 						  计算规则:<br/>
               截止前学员完成的关卡才有成绩<br/>
-					</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
+					</pre>}><img src={getImageUrl("/images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
 					dataIndex: 'final_score',
 					key: 'final_score',
 					align: 'center',
@@ -1557,7 +1557,7 @@ class Listofworksstudentone extends Component {
 					学生工作效率= log(实训总得分/实训总耗时)<br/>
 					学生效率分 = 学生工作效率 / 课堂学生最高<br/>
 					工作效率 * 分值<br/>
-					</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
+					</pre>}><img src={getImageUrl("/images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
 					dataIndex: 'efficiencyscore',
 					key: 'efficiencyscore',
 					align: 'center',
@@ -1600,7 +1600,7 @@ class Listofworksstudentone extends Component {
 					title: <span>当前成绩<Tooltip placement="top"  title={<pre>
 						 鼠标停留具体分值上可查<br/>
              看得分明细<br/>
-					</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
+					</pre>}><img src={getImageUrl("/images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
 					dataIndex: 'work_score',
 					key: 'work_score',
 					align: 'center',
@@ -3898,7 +3898,7 @@ class Listofworksstudentone extends Component {
 												<div id="forum_list" className="forum_table">
 													<div className="mh650 edu-back-white">
 														<div className="edu-tab-con-box clearfix edu-txt-center">
-															<img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/>
+															<img className="edu-nodata-img mb20" src={getImageUrl("/images/educoder/nodata.png")}/>
 															<p className="edu-nodata-p mb30">{this.state.searchtypes===false?"暂时还没有相关数据哦！":"抱歉没有您要搜索的内容，请换个词语试试看"}</p>
 														</div>
 													</div>
@@ -4175,7 +4175,7 @@ class Listofworksstudentone extends Component {
 															<div className="mh650 edu-back-white">
 																<div className="edu-tab-con-box clearfix edu-txt-center">
 																	<img className="edu-nodata-img mb20"
-																			 src={getImageUrl("images/educoder/nodata.png")}/>
+																			 src={getImageUrl("/images/educoder/nodata.png")}/>
 																	<p className="edu-nodata-p mb30">{this.state.searchtypes===false?"暂时还没有相关数据哦！":"抱歉没有您要搜索的内容，请换个词语试试看"}</p>
 																</div>
 															</div>
@@ -4409,7 +4409,7 @@ class Listofworksstudentone extends Component {
 															<div className="mh650 edu-back-white">
 																<div className="edu-tab-con-box clearfix edu-txt-center">
 																	<img className="edu-nodata-img mb20"
-																			 src={getImageUrl("images/educoder/nodata.png")}/>
+																			 src={getImageUrl("/images/educoder/nodata.png")}/>
 																	<p className="edu-nodata-p mb30">{this.state.searchtypes===false?"暂时还没有相关数据哦！":"抱歉没有您要搜索的内容，请换个词语试试看"}</p>
 																</div>
 															</div>

src/modules/courses/shixunHomework/ShixunWorkReport.js

@@ -514,7 +514,7 @@ class ShixunWorkReport extends Component {
 
 									<div className="fl edu-back-white ml10 ">
 										<img alt="头像" className="radius" height="91" id="nh_user_logo" name="avatar_image"
-												 src={ getImageUrl(`images/${data&&data.image_url}`)}
+												 src={ getImageUrl(`/${data&&data.image_url}`)}
 												 width="91"/>
 									</div>
 

src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js

@@ -266,7 +266,7 @@ class ShixunWorkModal extends Component{
 								<div id="forum_list" className="forum_table">
 									<div className=" edu-back-white">
 										<div className="edu-tab-con-box clearfix edu-txt-center">
-											<img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/>
+											<img className="edu-nodata-img mb20" src={getImageUrl("/images/educoder/nodata.png")}/>
 											<p className="edu-nodata-p mb30">暂时还没有相关数据哦！</p>
 										</div>
 									</div>

src/modules/login/EducoderLogin.js

@@ -1,34 +1,14 @@
 import React, {Component} from "react";
 import moment from 'moment';
-import { SnackbarHOC,getImageUrl } from 'educoder';
+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 LoginRegisterComponent from '../user/LoginRegisterComponent';
 import FindPasswordComponent from '../user/FindPasswordComponent';
-import passopen from "../../images/login/passopen.png";
 //educoder登入页面
-var sectionStyle = {
-    "height": "100%",
-    "width": "100%",
-    "min-width": "1000px",
-// makesure here is String确保这里是一个字符串，以下是es6写法
-
-
-};
-var imgback = {
-   " background-size":"cover",
-"background-repeat":"no-repeat",
-    backgroundImage: `url(${beijintulogontwo})`,
-}
-var imgmian ={
-     width: "100%",
-     background: `url(${beijintulogontwo})`,
-     position: "relative",
-
-}
 
 var newContainer={
     background: `url(${beijintulogontwo})`,
@@ -89,11 +69,6 @@ class EducoderLogin extends Component {
 
     }
 
-    componentDidMount() {
-     // console.log("EducoderLogin");
-     // console.log(this.props);
-    }
-
     Setlogins=(i)=>{
         console.log("96ye");
         console.log(i)
@@ -120,9 +95,6 @@ class EducoderLogin extends Component {
 
     render() {
         let {showbool,loginstatus,logini} = this.state;
-        // console.log("EducoderLogingetHelmetapi");
-        // console.log(this.props);
-        // console.log(this.props.mygetHelmetapi);
         return (
             <div style={newContainer} className=" clearfix" >
 

src/modules/login/LoginDialog.js

@@ -1,15 +1,10 @@
 import React, { Component } from 'react';
-import { Redirect } from 'react-router';
 
-import Dialog, {
-  DialogActions,
-  DialogContent,
-  DialogContentText,
-  DialogTitle,
-} from 'material-ui/Dialog';
-import { notification, Modal } from 'antd';
+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'
@@ -307,12 +302,9 @@ class LoginDialog extends Component {
   }
 
   componentWillReceiveProps(nextProps) {
-
     this.setState({
       isRender: nextProps.isRender
     })
-    // console.log(nextProps.isRender);
-
   }
   IsPC = () => {
     var userAgentInfo = navigator.userAgent;
@@ -329,7 +321,8 @@ class LoginDialog extends Component {
     return flag;
   }
   componentDidMount() {
-    let flag = this.IsPC(); //true为PC端，false为手机端
+    //true为PC端，false为手机端
+    let flag = this.IsPC();
     this.setState({
       isphone: flag
     })
@@ -361,7 +354,6 @@ class LoginDialog extends Component {
   }
 
   loginEDU = () => {
-
     let { loginValue, passValue, regular, isGoingValue } = this.state;
     if (regular === 1) {
       return
@@ -383,15 +375,8 @@ 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);
@@ -435,11 +420,6 @@ class LoginDialog extends Component {
   getloginurl = (url) => {
     window.location.href = url;
   };
-  openweixinlogin = () => {
-    this.setState({
-      weixinlogin: true
-    })
-  }
   openNotifications = (btn) => {
     // type  1 成功提示绿色 2提醒颜色黄色 3错误提示红色
     notification.open({
@@ -475,17 +455,16 @@ class LoginDialog extends Component {
   }
 
   render() {
-    let { qqlogin, login, isGoing, isGoingValue, disabled, bottonclass, Phonenumberisnotco,
-      dialogBox, isRender, weixinlogin } = this.state;
+    let { login, isGoing, isGoingValue, disabled , 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()}
@@ -516,7 +495,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' }}>
-                {weixinlogin === true ? "" : <form acceptCharset="UTF-8" action="/login" id="main_login_form" method="post">
+                <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>
@@ -541,9 +520,10 @@ 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}
@@ -553,8 +533,8 @@ class LoginDialog extends Component {
                         this.loginEDU : () => {
                         }
                       }
-                      placeholder="密码" >
-                    </input>
+                      placeholder="密码" 
+                    />
                     <div style={{ height: '25px' }}>
                       <p className="color-orange edu-txt-left none" id="password_error_notice">
                         请输入密码
@@ -580,43 +560,30 @@ class LoginDialog extends Component {
                       <label htmlFor="p_autolog" style={{ top: '0px' }}>下次自动登录</label>
                     </span>
                     <span className="fr">
-                      <a onClick={(url) => this.getloginurl("https://www.trustie.net/account/lost_password")}
-                        className="mr3 color-grey-9">找回密码</a><em className="vertical-line"></em>
-                      <a onClick={(url) => this.getloginurl("https://www.trustie.net/login?login=false")} className="color-grey-9">注册</a>
+                      <a onClick={(url) => this.getloginurl(`${settings && settings.common && settings.common.lost_password}`)} className="mr3 color-grey-9">找回密码</a>
+                      <em className="vertical-line"></em>
+                      <a onClick={(url) => this.getloginurl(`${settings && settings.common && settings.common.register}`)} className="color-grey-9">注册</a>
                     </span>
                   </p>
-
-                  {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">
-
+                  {
+                    settings && settings.third_party && settings.third_party.length > 0 ?
+                    <p className="clearfix mt20">
                       <span className={"startlogin"}>————————  快速登录  ————————</span>
                       <div className={"mt10"}>
-                        <a onClick={() => this.openphoneqqlogin()} className={"ml10"}>
-                          <img src={require('./qq.png')} alt="qq登录" />
-                        </a>
+                        {settings.third_party.map((item,key)=>{
+                          return(
+                            <a href={`${item.url}`}>
+                              <img src={item.name === "educoder" ? educoderLogo : ""} width="46px" alt={`${item.name}登录`} />
+                            </a>
+                          )
+                        })
+                        }
                       </div>
-                    </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> : ""}
+                    </p>
+                    :"" 
+                  }
+                </form>
               </div>
-              {/*快捷登录*/}
             </div>
           </div>
           : ""}

src/modules/message/js/Messagerouting.js

@@ -193,7 +193,7 @@ class Messagerouting extends Component{
            <a >
 						 {
 							 this.props.current_user!== undefined?
-								 <img className="person radius myw120 myh120"   src={getImageUrl("images/"+this.props.current_user.image_url)}/>
+								 <img className="person radius myw120 myh120"   src={getImageUrl("/images/"+this.props.current_user.image_url)}/>
 								 :""
 						 }
 

src/modules/modals/Bottomsubmit.js

@@ -32,9 +32,6 @@ class Bottomsubmit extends Component {
         <style>
           {
             `
-             .newFooter{
-               display:none;
-             }
              .newshixunbottombtn {
                   position: fixed;
                   z-index: 1000;

src/modules/question/Paperreview.js

@@ -379,16 +379,6 @@ class Paperreview extends Component {
 							""
 					}
 
-					<style>
-						{
-							`
-					
-						.newFooter{
-						display: none;
-						}
-						`
-						}
-					</style>
 					<div className="w1200ms">
 						<div className="w100s mt30">
 							{