diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1454e120..6a1b314e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,11 +3,8 @@
   <component name="ChangeListManager">
     <list default="true" id="9830c5da-176a-4c72-a301-9f6ce98c82fe" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/forge/Branch/CloneAddress.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Branch/CloneAddress.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/forge/Main/Detail.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/Detail.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/forge/New/Index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/New/Index.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/forge/Newfile/UserSubmitComponent.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Newfile/UserSubmitComponent.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/modules/tpm/NewFooter.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/modules/tpm/NewFooter.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/modules/tpm/NewHeader.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/modules/tpm/NewHeader.js" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -31,11 +28,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/forge/New/Index.js">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/forge/Main/Detail.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-371">
-              <caret line="365" column="18" selection-start-line="365" selection-start-column="18" selection-end-line="385" selection-end-column="30" />
+            <state relative-caret-position="480">
+              <caret line="211" column="38" lean-forward="true" selection-start-line="211" selection-start-column="38" selection-end-line="211" selection-end-column="38" />
               <folding>
                 <element signature="e#0#42#0" expanded="true" />
               </folding>
@@ -43,25 +40,40 @@
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/modules/tpm/NewHeader.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="196">
+              <caret line="1262" column="18" lean-forward="true" selection-start-line="1262" selection-start-column="18" selection-end-line="1262" selection-end-column="18" />
+              <folding>
+                <element signature="e#1358#2042#0" />
+                <element signature="n#!!block;n#componentDidMount#0;n#NewHeader#0" />
+                <element signature="e#2353#2665#0" />
+                <element signature="e#2760#2816#0" />
+                <element signature="e#2954#2960#0" />
+                <element signature="e#34394#34672#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/modules/tpm/NewFooter.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="431">
+              <caret line="49" lean-forward="true" selection-start-line="49" selection-end-line="49" />
+              <folding>
+                <element signature="e#0#41#0" expanded="true" />
+                <marker date="1587019525339" expanded="true" signature="1041:2769" ph="..." />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>item-list-right</find>
-      <find>form .ant-select</find>
-      <find>form .ant-cascader-picker, form .ant-select</find>
-      <find>.detailContent</find>
-      <find>.ant-spin-nested-loading</find>
-      <find>.newFooter</find>
-      <find>topmerge_btn</find>
-      <find>mergediv</find>
-      <find>index</find>
-      <find>prdetail</find>
-      <find>showNotification</find>
-      <find>copy_rep_content</find>
-      <find>CloneAddress</find>
-      <find>branchLastCommit</find>
-      <find>CoderRootDirectory</find>
       <find>该合并请求可以进行自动合并操作</find>
       <find>entries</find>
       <find>/branches</find>
@@ -77,15 +89,30 @@
       <find>subFileType</find>
       <find>coders</find>
       <find>upda</find>
+      <find>创建</find>
+      <find>new_he</find>
+      <find>/settings</find>
+      <find>/setting</find>
+      <find>head-navpre3</find>
+      <find>header-nav</find>
+      <find>mygetHelmetapi2</find>
+      <find>.ico</find>
+      <find>gettablogourlnull</find>
+      <find>activeForums</find>
+      <find>matchpaths</find>
+      <find>新建翻转</find>
+      <find>chrome</find>
+      <find>geturlsdata</find>
+      <find>edu-menu-list</find>
     </findStrings>
     <replaceStrings>
       <replace>任务</replace>
     </replaceStrings>
     <dirStrings>
-      <dir>$PROJECT_DIR$</dir>
       <dir>$PROJECT_DIR$/src/forge/Merge</dir>
       <dir>$PROJECT_DIR$/src/forge</dir>
       <dir>$PROJECT_DIR$/src</dir>
+      <dir>$PROJECT_DIR$</dir>
     </dirStrings>
   </component>
   <component name="Git.Settings">
@@ -96,7 +123,6 @@
       <list>
         <option value="$PROJECT_DIR$/src/AppConfig.js" />
         <option value="$PROJECT_DIR$/src/forge/Index.js" />
-        <option value="$PROJECT_DIR$/src/modules/tpm/NewHeader.js" />
         <option value="$PROJECT_DIR$/src/forge/Order/CopyDetail.js" />
         <option value="$PROJECT_DIR$/src/forge/Merge/NewMerge.js" />
         <option value="$PROJECT_DIR$/src/forge/Merge/MergeSubmit.js" />
@@ -138,6 +164,8 @@
         <option value="$PROJECT_DIR$/src/forge/Main/Detail.js" />
         <option value="$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js" />
         <option value="$PROJECT_DIR$/src/forge/New/Index.js" />
+        <option value="$PROJECT_DIR$/src/modules/tpm/NewFooter.js" />
+        <option value="$PROJECT_DIR$/src/modules/tpm/NewHeader.js" />
       </list>
     </option>
   </component>
@@ -151,7 +179,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -175,17 +202,11 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="forge" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="forgeplus-react" type="b2602c69:ProjectViewProjectNode" />
-              <item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="forge" type="462c0819:PsiDirectoryNode" />
-              <item name="New" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -201,6 +222,7 @@
   </component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/build" />
       <recent name="$PROJECT_DIR$/src/forge/Images" />
     </key>
   </component>
@@ -251,20 +273,22 @@
       <workItem from="1586330226261" duration="658000" />
       <workItem from="1586400014081" duration="18358000" />
       <workItem from="1586517058808" duration="1607000" />
-      <workItem from="1586741565210" duration="24702000" />
+      <workItem from="1586741565210" duration="25216000" />
+      <workItem from="1586946208505" duration="2914000" />
+      <workItem from="1587004932342" duration="7182000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="125447000" />
+    <option name="totallyTimeSpent" value="136057000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
+    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.18454936" />
+      <window_info content_ui="combo" id="Project" order="0" weight="0.18669528" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Favorites" order="2" side_tool="true" />
-      <window_info anchor="bottom" id="TypeScript" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" />
       <window_info anchor="bottom" id="Run" order="2" />
@@ -275,8 +299,9 @@
       <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
       <window_info anchor="bottom" id="Database Changes" order="8" />
       <window_info anchor="bottom" id="Version Control" order="9" weight="0.31084338" />
-      <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.6650602" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.1373494" />
       <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
+      <window_info anchor="bottom" id="TypeScript" order="12" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -337,40 +362,6 @@
     </option>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/build/asset-manifest.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="187">
-          <caret line="11" column="75" lean-forward="true" selection-start-line="11" selection-start-column="75" selection-end-line="11" selection-end-column="75" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Version/version.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="442">
-          <caret line="26" column="29" lean-forward="true" selection-start-line="26" selection-start-column="29" selection-end-line="26" selection-end-column="29" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Order/OrderItem.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="458">
-          <caret line="86" column="60" selection-start-line="86" selection-start-column="24" selection-end-line="86" selection-end-column="60" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeItem.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="458">
-          <caret line="49" column="19" selection-start-line="49" selection-start-column="19" selection-end-line="49" selection-end-column="19" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/css/index.css">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="458">
@@ -455,16 +446,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Settings/Index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="697">
-          <caret line="38" column="13" lean-forward="true" selection-start-line="38" selection-start-column="13" selection-end-line="38" selection-end-column="13" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Order/Milepost.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="300">
@@ -517,13 +498,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Merge/merge.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="51">
-          <caret line="3" column="21" selection-start-line="3" selection-start-column="21" selection-end-line="3" selection-end-column="21" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Order/UpdateDetail.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="364">
@@ -793,26 +767,81 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Main/Detail.js">
+    <entry file="file://$PROJECT_DIR$/src/forge/Merge/merge.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="172">
-          <caret line="147" column="27" lean-forward="true" selection-start-line="147" selection-start-column="27" selection-end-line="147" selection-end-column="27" />
+        <state relative-caret-position="164">
+          <caret line="272" column="45" selection-start-line="272" selection-start-column="45" selection-end-line="272" selection-end-column="45" />
           <folding>
             <element signature="e#0#42#0" expanded="true" />
-            <element signature="e#6461#6922#0" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/New/Index.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-371">
-          <caret line="365" column="18" selection-start-line="365" selection-start-column="18" selection-end-line="385" selection-end-column="30" />
+        <state relative-caret-position="509">
+          <caret line="406" column="47" selection-start-line="406" selection-start-column="47" selection-end-line="406" selection-end-column="47" />
           <folding>
             <element signature="e#0#42#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Settings/Index.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="935">
+          <caret line="52" column="21" lean-forward="true" selection-start-line="52" selection-start-column="21" selection-end-line="52" selection-end-column="21" />
+          <folding>
+            <element signature="e#0#42#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/App.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-228">
+          <caret line="487" column="31" lean-forward="true" selection-start-line="487" selection-start-column="31" selection-end-line="487" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build/favicon.ico">
+      <provider selected="true" editor-type-id="images" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Main/Detail.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="480">
+          <caret line="211" column="38" lean-forward="true" selection-start-line="211" selection-start-column="38" selection-end-line="211" selection-end-column="38" />
+          <folding>
+            <element signature="e#0#42#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/modules/tpm/NewFooter.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="431">
+          <caret line="49" lean-forward="true" selection-start-line="49" selection-end-line="49" />
+          <folding>
+            <element signature="e#0#41#0" expanded="true" />
+            <marker date="1587019525339" expanded="true" signature="1041:2769" ph="..." />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/modules/tpm/NewHeader.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="196">
+          <caret line="1262" column="18" lean-forward="true" selection-start-line="1262" selection-start-column="18" selection-end-line="1262" selection-end-column="18" />
+          <folding>
+            <element signature="e#1358#2042#0" />
+            <element signature="n#!!block;n#componentDidMount#0;n#NewHeader#0" />
+            <element signature="e#2353#2665#0" />
+            <element signature="e#2760#2816#0" />
+            <element signature="e#2954#2960#0" />
+            <element signature="e#34394#34672#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/src/modules/tpm/NewFooter.js b/src/modules/tpm/NewFooter.js
index 051bfadc..65f89eeb 100644
--- a/src/modules/tpm/NewFooter.js
+++ b/src/modules/tpm/NewFooter.js
@@ -4,7 +4,30 @@ import { Link } from 'react-router-dom';
 
 
 class NewFooter extends Component {
+  constructor(props) {
+    super(props)
+    this.state={
+      forge_footer: undefined
+    }
+  }
+  componentDidMount() {
+
+    //获取游览器地址
+    try {
+      var chromesettingArray = JSON.parse(localStorage.getItem('chromesetting'));
+      this.setState({
+        forge_footer: chromesettingArray.footer
+      })
+    } catch (e) {
+    }
+  }
+  showhtml=(htmlString)=>{
+    var html = {__html:htmlString};
+    return   <div dangerouslySetInnerHTML={html}></div> ;
+  }
+
   render() {
+    const {forge_footer} = this.state;
     return (
       <div className="newFooter edu-txt-center ">
 				<style>
@@ -21,30 +44,33 @@ class NewFooter extends Component {
 						`
 					}
 				</style>
+        {
+          forge_footer && this.showhtml(forge_footer)
+        }
 
-        <div className="inner-footer_con">
-          <ul className="clearfix inner-footernav">
-            <li><a href="/" className="fl" target="_blank">网站首页</a></li>
-            <li><Link to="/help/about_us" className="fl" target="_blank">关于我们</Link></li>
-            <li><Link to="/help/contact_us" className="fl" target="_blank">联系我们</Link></li>
-            <li><Link to="/help/cooperatives" className="fl" target="_blank">合作伙伴</Link></li>
-            <li><Link to="/help/agreement" className="fl" target="_blank">服务协议</Link></li>
-            <li><Link to="/help/help_center" className="fl" target="_blank">帮助中心</Link></li>
-            <li><Link to="/help/feedback" className="fl" target="_blank">意见反馈</Link></li>
-          </ul>
-        </div>
-        <div>
-          <p className="footer_con-p inline lineh-30  font-14">
-            <span className="font-18 fl">©</span>&nbsp;{moment().year()}&nbsp;EduCoder
-            <a style={{"color":"#888"}}  target="_blank" href="http://beian.miit.gov.cn/" className="ml15 mr15">湘ICP备17009477号</a>
-            <a style={{"color":"#888"}}  target="_blank" href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=43019002000962"  className="mr15">
-              <img className="vertical4" src={require('./beian.png')}/>湘公网安备43019002000962号
-            </a>
-            <a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside. <span
-            className="mr15">版权所有 湖南智擎科技有限公司</span>
-          </p>
-        </div>
-        <div className="cl"></div>
+        {/*<div className="inner-footer_con">*/}
+          {/*<ul className="clearfix inner-footernav">*/}
+            {/*<li><a href="/" className="fl" target="_blank">网站首页</a></li>*/}
+            {/*<li><Link to="/help/about_us" className="fl" target="_blank">关于我们</Link></li>*/}
+            {/*<li><Link to="/help/contact_us" className="fl" target="_blank">联系我们</Link></li>*/}
+            {/*<li><Link to="/help/cooperatives" className="fl" target="_blank">合作伙伴</Link></li>*/}
+            {/*<li><Link to="/help/agreement" className="fl" target="_blank">服务协议</Link></li>*/}
+            {/*<li><Link to="/help/help_center" className="fl" target="_blank">帮助中心</Link></li>*/}
+            {/*<li><Link to="/help/feedback" className="fl" target="_blank">意见反馈</Link></li>*/}
+          {/*</ul>*/}
+        {/*</div>*/}
+        {/*<div>*/}
+          {/*<p className="footer_con-p inline lineh-30  font-14">*/}
+            {/*<span className="font-18 fl">©</span>&nbsp;{moment().year()}&nbsp;EduCoder*/}
+            {/*<a style={{"color":"#888"}}  target="_blank" href="http://beian.miit.gov.cn/" className="ml15 mr15">湘ICP备17009477号</a>*/}
+            {/*<a style={{"color":"#888"}}  target="_blank" href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=43019002000962"  className="mr15">*/}
+              {/*<img className="vertical4" src={require('./beian.png')}/>湘公网安备43019002000962号*/}
+            {/*</a>*/}
+            {/*<a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside. <span*/}
+            {/*className="mr15">版权所有 湖南智擎科技有限公司</span>*/}
+          {/*</p>*/}
+        {/*</div>*/}
+        {/*<div className="cl"></div>*/}
       </div>
     );
   }
diff --git a/src/modules/tpm/NewHeader.js b/src/modules/tpm/NewHeader.js
index 8cce393d..c6e9fe1a 100644
--- a/src/modules/tpm/NewHeader.js
+++ b/src/modules/tpm/NewHeader.js
@@ -730,7 +730,6 @@ submittojoinclass=(value)=>{
 		try {
 			var chromesettingArray = JSON.parse(localStorage.getItem('chromesetting'));
 			var chromesettingresponseArray = JSON.parse(localStorage.getItem('chromesettingresponse'));
-			
       this.setState({
         mygetHelmetapi2:chromesettingArray
       });
@@ -788,25 +787,40 @@ submittojoinclass=(value)=>{
 
     matchpaths=(url)=>{
       const {match} = this.props;
-      if (url=== '/forums'&&match.path === '/forums') {
-         return true
-        } else if (url.startsWith('/shixuns')&&match.path.startsWith('/shixuns')) {
-        return true
+        if (url=== '/forums'&&match.path === '/forums') {
+          return true
+        } else if (url.startsWith('/projects')&&match.path.startsWith('/projects')) {
+          return true
         }else if (url.startsWith('/paths')&&match.path.startsWith('/paths')) {
-        return true
+          return true
         } else if (url.startsWith('/courses')&&match.path.startsWith('/courses')) {
-        return true
+          return true
         }else if (url.startsWith('/competitions')&&match.path.startsWith('/competitions')) {
-        return true
-        }else if (url.startsWith('/crowdsourcing')&&match.path.startsWith('/crowdsourcing')) {
-        return true
-        }else if(url.startsWith('/moop_cases')&&match.path.startsWith('/moop_cases')){
-        return true
-        }else if(url.startsWith('/developer')&&match.path.startsWith('/developer')){
-        return true
-        }else {
-        return false
+          return true
+        }else if (url.startsWith('/statistics')&&match.path.startsWith('/statistics')) {
+          return true
+        } else {
+          return false
         }
+      // if (url=== '/forums'&&match.path === '/forums') {
+      //    return true
+      //   } else if (url.startsWith('/shixuns')&&match.path.startsWith('/shixuns')) {
+      //   return true
+      //   }else if (url.startsWith('/paths')&&match.path.startsWith('/paths')) {
+      //   return true
+      //   } else if (url.startsWith('/courses')&&match.path.startsWith('/courses')) {
+      //   return true
+      //   }else if (url.startsWith('/competitions')&&match.path.startsWith('/competitions')) {
+      //   return true
+      //   }else if (url.startsWith('/crowdsourcing')&&match.path.startsWith('/crowdsourcing')) {
+      //   return true
+      //   }else if(url.startsWith('/moop_cases')&&match.path.startsWith('/moop_cases')){
+      //   return true
+      //   }else if(url.startsWith('/developer')&&match.path.startsWith('/developer')){
+      //   return true
+      //   }else {
+      //   return false
+      //   }
     }
 
 
@@ -820,6 +834,7 @@ submittojoinclass=(value)=>{
     const isLogin = true;   // 这里不会出现未登录的情况，服务端在服务端路由时发现如果是未登录，则跳转到登录页了。
     const {match} = this.props;
 
+
     let {Addcoursestypes,
       tojoinitemtype,
       tojoinclasstitle,
@@ -999,24 +1014,52 @@ submittojoinclass=(value)=>{
 											mygetHelmetapi2.navbar && mygetHelmetapi2.navbar.map((item,key)=>{
 												// console.log("headtypes");
 												// console.log(headtypes);hidden
-												var str=new RegExp("http");
-												var strbool=false;
-												//test方法返回值为(true或者false)
-												if(item.link){
-													if(str.test(item.link)===true){
-														strbool=true
-													}else{
-														strbool=false
-													}
-												}
+												// var str=new RegExp("http");
+												// var strbool=false;
+												// //test方法返回值为(true或者false)
+												// if(item.link){
+												// 	if(str.test(item.link)===true){
+												// 		strbool=true
+												// 	}else{
+												// 		strbool=false
+												// 	}
+												// }
+                        var new_link = item.link;
+                        var user_login = this.props.user && this.props.user.login;
+                        var is_hidden = item.hidden
+
+                        if(new_link.indexOf("courses") > -1 || new_link.indexOf("contests") > -1){
+                          if(user_login){
+                            if(new_link.indexOf("courses") > -1){
+                              new_link = new_link.replace(/courses/g,"users/"+user_login + "/courses")
+                            }else if(new_link.indexOf("contests") > -1){
+                              new_link = new_link.replace(/contests/g,"users/"+user_login + "/contests")
+                            }
+
+                          }else{
+                            is_hidden = true
+                          }
+                        }
+
+                        var str=new RegExp("projects");
+                        var strbool=false;
+                        //test方法返回值为(true或者false)
+                        if(item.link){
+                          if(str.test(item.link)===true){
+                            strbool=true
+                          }else{
+                            strbool=false
+                          }
+                        }
 												// console.log(item.hidden);
 												return(
-													<li key={key} onClick={()=>this.headtypesonClick(item.link,true)} className={`${this.matchpaths(item.link)===true?'pr active':'pr'}`} style={item.hidden==false?{display: 'block'}:{display: 'none'}}>
+													<li key={key} onClick={()=>this.headtypesonClick(item.link,true)} className={`${this.matchpaths(item.link)===true?'pr active':'pr'}`} style={!is_hidden?{display: 'block'}:{display: 'none'}}>
 														{
-															strbool===true?
-																<a href={item.link}>{item.name}</a>
+															strbool?
+                                <Link to={item.link}>{item.name}</Link>
+
 																:
-																<Link to={item.link}>{item.name}</Link>
+                                <a href={new_link} target='_blank'>{item.name}</a>
 														}
 													</li>
 												)
@@ -1046,30 +1089,30 @@ submittojoinclass=(value)=>{
 										{/*		</div>*/}
 										{/*	</Popover>*/}
 										{/*</li>*/}
+                    
+										{/*<li*/}
+											{/*style={{display: this.props.Headertop === undefined ? 'none' : this.props.Headertop.auth === null ? 'none' : 'block'}}*/}
+										{/*><a href={this.props.Headertop === undefined ? "" : this.props.Headertop.auth}>工程认证</a></li>*/}
 
-										<li
-											style={{display: this.props.Headertop === undefined ? 'none' : this.props.Headertop.auth === null ? 'none' : 'block'}}
-										><a href={this.props.Headertop === undefined ? "" : this.props.Headertop.auth}>工程认证</a></li>
-
-										<li className="fl edu-menu-panel  careershover "
-												style={{display: this.props.Headertop === undefined ?'none'  : this.props.Headertop.career_url.length > 0 ? 'block' : 'none'}}>
-											<a>职业路径</a>
-											<div
-												style={{display: this.props.Headertop === undefined ?'none'  : this.props.Headertop.career_url.length > 0 ? 'block' : 'none'}}>
-												<ul className="edu-menu-list edu-menu-listnew " style={{top:'60px'}}>
-													{this.props.Headertop === undefined ? "" : this.props.Headertop.career_url.map((item, key) => {
-														return(
-															<li key={key}><i className="iconfont icon-java left careersiconfont"
-																							 style={{color: '#000 important'}}
-															></i><a style={{width: '83%'}}
-																			href={item.url}>{item.name}</a></li>
-														)
-													})
-													}
-												</ul>
-											</div>
-										</li>
-                    <li><Link to={`/projects`}>开源项目</Link></li>
+										{/*<li className="fl edu-menu-panel  careershover "*/}
+												{/*style={{display: this.props.Headertop === undefined ?'none'  : this.props.Headertop.career_url.length > 0 ? 'block' : 'none'}}>*/}
+											{/*<a>职业路径</a>*/}
+											{/*<div*/}
+												{/*style={{display: this.props.Headertop === undefined ?'none'  : this.props.Headertop.career_url.length > 0 ? 'block' : 'none'}}>*/}
+												{/*<ul className="edu-menu-list edu-menu-listnew " style={{top:'60px'}}>*/}
+													{/*{this.props.Headertop === undefined ? "" : this.props.Headertop.career_url.map((item, key) => {*/}
+														{/*return(*/}
+															{/*<li key={key}><i className="iconfont icon-java left careersiconfont"*/}
+																							 {/*style={{color: '#000 important'}}*/}
+															{/*></i><a style={{width: '83%'}}*/}
+																			{/*href={item.url}>{item.name}</a></li>*/}
+														{/*)*/}
+													{/*})*/}
+													{/*}*/}
+												{/*</ul>*/}
+											{/*</div>*/}
+										{/*</li>*/}
+                    {/*<li><Link to={`/projects`}>开源项目</Link></li>*/}
                   </ul>
 								</div>
 								:
@@ -1218,28 +1261,44 @@ submittojoinclass=(value)=>{
                      src={getImageUrl(`images/`+user.image_url)} width="34">
                 </img>
               </a>
-              <ul className="edu-menu-list" style={{top:'60px'}}>
+              <ul className="edu-menu-list" style={{top:'60px', 'text-align': 'center'}}>
+                {
+                  mygetHelmetapi2 && mygetHelmetapi2.new_course.edit_account &&
+                  <li><a href={`${mygetHelmetapi2.new_course.edit_account}`} target="_blank">修改资料</a></li>
+                }
+                {
+                  mygetHelmetapi2 && mygetHelmetapi2.new_course.my_courses &&
+                  <li><a href={`${mygetHelmetapi2.new_course.my_courses}`} target="_blank">我的课程</a></li>
+                }
+                {
+                  mygetHelmetapi2 && mygetHelmetapi2.new_course.my_projects &&
+                  <li><a href={`${mygetHelmetapi2.new_course.my_projects}`} target="_blank">我的项目</a></li>
+                }
+                {
+                  mygetHelmetapi2 && mygetHelmetapi2.new_course.my_organ &&
+                  <li><a href={`${mygetHelmetapi2.new_course.my_organ}`} target="_blank">我的组织</a></li>
+                }
                 {/*<span className="bor-bottom-greyE currentName task-hide">{user.username}</span>*/}
-								<li><Link to={`/users/${this.props.current_user.login}/courses`}>我的个人主页</Link></li>
-								{coursestypes===true?"":<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/courses`}>{this.props.user&&this.props.user.main_site===false?"我的课堂":"我的翻转课堂"}</Link></li>}
-                {/* p 老师  l 学生 */}
-								{shixuntype===true?"":<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/shixuns`}>我的实训项目</Link></li>}
-								{pathstype===true?"":<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/paths`}>{this.props.user&&this.props.user.main_site===false?"我的课程":"我的实践课程"}</Link></li>}
-								{this.props.user&&this.props.user.main_site===true?<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/projects`}>我的开发项目</Link></li>:""}
-								{/*<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/package`}>我的众包</Link></li>*/}
-								<li style={{display: this.props.Headertop === undefined ? 'none'  : this.props.Headertop.customer_management_url===null || this.props.Headertop.customer_management_url===""? 'none' : 'block'}}>
-									<a href={this.props.Headertop === undefined ? ''  : this.props.Headertop.customer_management_url}>客户管理</a>
-								</li>
-                {
-                  this.props.Headertop && this.props.Headertop.college_identifier &&
-                  <li><a href={`/colleges/${this.props.Headertop.college_identifier}/statistics`}>学院统计</a></li>
-                }
-                {
-                  this.props.Headertop && this.props.Headertop.laboratory_user &&
-                  <li><a href={this.props.Headertop.laboratory_admin_url}>后台管理</a></li>
-                }
+								{/*<li><Link to={`/users/${this.props.current_user.login}/courses`}>我的个人主页</Link></li>*/}
+								{/*{coursestypes===true?"":<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/courses`}>{this.props.user&&this.props.user.main_site===false?"我的课堂":"我的翻转课堂"}</Link></li>}*/}
+                {/*/!* p 老师  l 学生 *!/*/}
+								{/*{shixuntype===true?"":<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/shixuns`}>我的实训项目</Link></li>}*/}
+								{/*{pathstype===true?"":<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/paths`}>{this.props.user&&this.props.user.main_site===false?"我的课程":"我的实践课程"}</Link></li>}*/}
+								{/*{this.props.user&&this.props.user.main_site===true?<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/projects`}>我的开发项目</Link></li>:""}*/}
+								{/*/!*<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/package`}>我的众包</Link></li>*!/*/}
+								{/*<li style={{display: this.props.Headertop === undefined ? 'none'  : this.props.Headertop.customer_management_url===null || this.props.Headertop.customer_management_url===""? 'none' : 'block'}}>*/}
+									{/*<a href={this.props.Headertop === undefined ? ''  : this.props.Headertop.customer_management_url}>客户管理</a>*/}
+								{/*</li>*/}
+                {/*{*/}
+                  {/*this.props.Headertop && this.props.Headertop.college_identifier &&*/}
+                  {/*<li><a href={`/colleges/${this.props.Headertop.college_identifier}/statistics`}>学院统计</a></li>*/}
+                {/*}*/}
+                {/*{*/}
+                  {/*this.props.Headertop && this.props.Headertop.laboratory_user &&*/}
+                  {/*<li><a href={this.props.Headertop.laboratory_admin_url}>后台管理</a></li>*/}
+                {/*}*/}
 
-                <li><a href={`/account/profile`}>账号管理</a></li>
+                {/*<li><a href={`/account/profile`}>账号管理</a></li>*/}
                 {/*<li><a onClick={()=>this.educoderlogin()} >登入测试接口</a></li>*/}
                 {/*<li><a onClick={()=>this.trialapplications()} >试用申请</a> </li>*/}
                 {/*<li><Link to={`/interest`}>兴趣页</Link></li>*/}
@@ -1264,106 +1323,107 @@ submittojoinclass=(value)=>{
             </a>:""}
 
             {/*</div>*/}
-            <div className="fl mr30 edu-menu-panel headIcon">
+           {
+             this.props.user&&this.props.user.login ?
+             <div className="fl mr30 edu-menu-panel headIcon">
 
 
-              <i className="iconfont icon-tianjiafangda color-white"></i>
+             <i className="iconfont icon-tianjiafangda color-white"></i>
 
-              <div className="edu-menu-list"  style={{top: '60px',width:"240px"}}>
-                <div className="overPart"></div>
-                <ul className={coursestypes===true&&this.props.user&&this.props.user.main_site===false?"fl headwith100b edu-txt-center pr ul-leftline":"fl with50 edu-txt-center pr ul-leftline"}>
-									{this.props.current_user&&this.props.current_user.user_identity==="学生"?"":coursestypes===false?
-										<li><a  onClick={(url)=>this.getUser("/courses/new")}>{this.props.user&&this.props.user.main_site===false?"新建课堂":"新建翻转课堂"}</a></li>:""
-									}
-									{shixuntype===true?"":
-										<li><a onClick={(url)=>this.getUser("/shixuns/new","newshixuns")}>新建实训项目</a></li>
-									}
-                  {this.props.user&&this.props.user.main_site===false?"":this.props.Headertop===undefined?"":<li><a onClick={(url)=>this.getUser("/paths/new")} >新建实践课程</a></li>}
-                  {this.props.user&&this.props.user.main_site===true?"":this.props.Headertop===undefined?"":
-                    pathstype===true?"":this.props.user&&this.props.user.admin===true||this.props.user&&this.props.user.is_teacher===true||this.props.user&&this.props.user.business===true?<li><a onClick={(url)=>this.getUser("/paths/new")} >新建实践课程</a></li>:""
-                  }
-									{/*{this.props.user&&this.props.user.login?<li><a onClick={(url)=>this.getUser("/projects/new","projects")} target="_blank">新建开发项目</a></li>:""}*/}
-                  {
-                    this.props.user&&this.props.user.login?<li><Link to={"/projects/mirror/new"}>新建镜像项目</Link></li>:""
-                  }
-                  {
-                    this.props.user&&this.props.user.login?<li><Link to={"/projects/deposit/new"}>新建托管项目</Link></li>:""
-                  }
+             <div className="edu-menu-list"  style={{top: '60px',width:"240px"}}>
+             <div className="overPart"></div>
+             <ul className={coursestypes===true&&this.props.user&&this.props.user.main_site===false?"fl headwith100b edu-txt-center pr ul-leftline":"fl with50 edu-txt-center pr ul-leftline"}>
+             {/*{this.props.current_user&&this.props.current_user.user_identity==="学生"?"":coursestypes===false?*/}
+             {/*<li><a  onClick={(url)=>this.getUser("/courses/new")}>{this.props.user&&this.props.user.main_site===false?"新建课堂":"新建翻转课堂"}</a></li>:""*/}
+             {/*}*/}
+             {/*{shixuntype===true?"":*/}
+             {/*<li><a onClick={(url)=>this.getUser("/shixuns/new","newshixuns")}>新建实训项目</a></li>*/}
+             {/*}*/}
+             {/*{this.props.user&&this.props.user.main_site===false?"":this.props.Headertop===undefined?"":<li><a onClick={(url)=>this.getUser("/paths/new")} >新建实践课程</a></li>}*/}
+             {/*{this.props.user&&this.props.user.main_site===true?"":this.props.Headertop===undefined?"":*/}
+             {/*pathstype===true?"":this.props.user&&this.props.user.admin===true||this.props.user&&this.props.user.is_teacher===true||this.props.user&&this.props.user.business===true?<li><a onClick={(url)=>this.getUser("/paths/new")} >新建实践课程</a></li>:""*/}
+             {/*}*/}
+             {/*{this.props.user&&this.props.user.login?<li><a onClick={(url)=>this.getUser("/projects/new","projects")} target="_blank">新建开发项目</a></li>:""}*/}
+               <li><a href={`${mygetHelmetapi2.new_course.new_syllabuses}`} target="_blank">新建课程</a></li>
+               <li><a href={`${mygetHelmetapi2.new_course.new_course}`} target="_blank">新建班级</a></li>
+             </ul>
+             {coursestypes===true&&this.props.user&&this.props.user.main_site===false?"":<ul className="fl with50 edu-txt-center">
+               <li><Link to={"/projects/mirror/new"}>新建镜像项目</Link></li>
+               <li><Link to={"/projects/deposit/new"}>新建托管项目</Link></li>
+               {/*{coursestypes===true?"":<li>*/}
+                 {/*<a onClick={this.tojoinclass}>{this.props.user&&this.props.user.main_site===false?"加入课堂":"加入翻转课堂"}</a>*/}
+               {/*</li>}*/}
 
-                </ul>
-								{coursestypes===true&&this.props.user&&this.props.user.main_site===false?"":<ul className="fl with50 edu-txt-center">
-
-                  {coursestypes===true?"":<li>
-                    <a onClick={this.tojoinclass}>{this.props.user&&this.props.user.main_site===false?"加入课堂":"加入翻转课堂"}</a>
-                  </li>}
-
-                  {Addcoursestypes===true?<Addcourses
-                   Addcoursestype={Addcoursestypes}
-                   hideAddcoursestype={this.hideAddcoursestypes}
-                   HideAddcoursestypess={(i)=>this.HideAddcoursestypess(i)}
-                 />:""}
-                  <Certifiedprofessional {...this.props} {...this.state}  ModalCancelsy={this.ModalCancelsy}/>
+               {/*{Addcoursestypes===true?<Addcourses*/}
+                 {/*Addcoursestype={Addcoursestypes}*/}
+                 {/*hideAddcoursestype={this.hideAddcoursestypes}*/}
+                 {/*HideAddcoursestypess={(i)=>this.HideAddcoursestypess(i)}*/}
+               {/*/>:""}*/}
+               {/*<Certifiedprofessional {...this.props} {...this.state}  ModalCancelsy={this.ModalCancelsy}/>*/}
 
 
-                  {/*  /courses/join_course_multi_role */}
-									{this.props.user&&this.props.user.main_site===true?<li>
-                  <a onClick={this.tojoinitem}>加入开发项目</a>
-                  </li>:""}
-									{tojoinitemtype===true?<Modal
-                    keyboard={false}
-                    title="加入项目"
-                    visible={tojoinitemtype}
-                    closable={false}
-                    footer={null}
-                  >
-                    <div className="task_popup_con">
-                      <div className="mr15">
-                        <ul>
-                          <li className="clearfix mb10">
-                            <label className="panel-form-label fl">项目邀请码：</label>
-                            <Input type="text" className="input-60-40 fl mt5" name="invite_code"
-																	 style={{width: '275px'}}
-                                   placeholder="请输入6位开发项目邀请码" value={tojoinclasstitle} onInput={this.inputjoinclassvalue}/>
-                          </li>
+               {/*/!*  /courses/join_course_multi_role *!/*/}
+               {/*{this.props.user&&this.props.user.main_site===true?<li>*/}
+                 {/*<a onClick={this.tojoinitem}>加入开发项目</a>*/}
+               {/*</li>:""}*/}
+               {/*{tojoinitemtype===true?<Modal*/}
+                 {/*keyboard={false}*/}
+                 {/*title="加入项目"*/}
+                 {/*visible={tojoinitemtype}*/}
+                 {/*closable={false}*/}
+                 {/*footer={null}*/}
+               {/*>*/}
+                 {/*<div className="task_popup_con">*/}
+                   {/*<div className="mr15">*/}
+                     {/*<ul>*/}
+                       {/*<li className="clearfix mb10">*/}
+                         {/*<label className="panel-form-label fl">项目邀请码：</label>*/}
+                         {/*<Input type="text" className="input-60-40 fl mt5" name="invite_code"*/}
+                                {/*style={{width: '275px'}}*/}
+                                {/*placeholder="请输入6位开发项目邀请码" value={tojoinclasstitle} onInput={this.inputjoinclassvalue}/>*/}
+                       {/*</li>*/}
 
-                          <p id="none_invite_code_notice"
-                             className="color-orange none f12"
-                             style={{marginLeft: '90px',display:code_notice===true?'block':"none"}}>请输入6位项目邀请码</p>
+                       {/*<p id="none_invite_code_notice"*/}
+                          {/*className="color-orange none f12"*/}
+                          {/*style={{marginLeft: '90px',display:code_notice===true?'block':"none"}}>请输入6位项目邀请码</p>*/}
 
-                          <li className="clearfix ">
+                       {/*<li className="clearfix ">*/}
 
-                            <label className="panel-form-label fl">身份：</label>
-                            <RadioGroup className="mt10" onChange={this.onChangeRadioGroup}>
-                              <Radio value={"manager"}>管理人员</Radio>
-                              <Radio value={"developer"}>开发人员</Radio>
-                              <Radio value={"reporter"}>报告人员</Radio>
-                            </RadioGroup>
+                         {/*<label className="panel-form-label fl">身份：</label>*/}
+                         {/*<RadioGroup className="mt10" onChange={this.onChangeRadioGroup}>*/}
+                           {/*<Radio value={"manager"}>管理人员</Radio>*/}
+                           {/*<Radio value={"developer"}>开发人员</Radio>*/}
+                           {/*<Radio value={"reporter"}>报告人员</Radio>*/}
+                         {/*</RadioGroup>*/}
 
-                          </li>
+                       {/*</li>*/}
 
-                          <p id="none_checked_notice" className="color-orange none f12"
-                             style={{marginLeft: '90px',display:checked_notice===true?'block':"none"}}>请选择一个身份</p>
+                       {/*<p id="none_checked_notice" className="color-orange none f12"*/}
+                          {/*style={{marginLeft: '90px',display:checked_notice===true?'block':"none"}}>请选择一个身份</p>*/}
 
-                          <li className="clearfix mt10 edu-txt-center">
-                            <a className="task-btn mr10"
-                               onClick={()=>this.hidetojoinclass(1)}>取消</a>
-                            <a
-                              className="task-btn task-btn-orange ml20"
-                              onClick={()=>this.submittojoinclass(1)}>确定</a>
-                          </li>
+                       {/*<li className="clearfix mt10 edu-txt-center">*/}
+                         {/*<a className="task-btn mr10"*/}
+                            {/*onClick={()=>this.hidetojoinclass(1)}>取消</a>*/}
+                         {/*<a*/}
+                           {/*className="task-btn task-btn-orange ml20"*/}
+                           {/*onClick={()=>this.submittojoinclass(1)}>确定</a>*/}
+                       {/*</li>*/}
 
-                        </ul>
-                      </div>
-                    </div>
-                  </Modal>:""}
-                </ul>}
-              </div>
-            </div>
+                     {/*</ul>*/}
+                   {/*</div>*/}
+                 {/*</div>*/}
+               {/*</Modal>:""}*/}
+             </ul>}
+             </div>
+             </div>
+               : ""
+           }
 
-					 {this.props.user&&this.props.user.main_site===true? <div className="fl mr30 edu-menu-panel headIcon">
+
+					 {this.props.user&&this.props.user.login? <div className="fl mr30 edu-menu-panel headIcon">
               { user===undefined?"":user.login===""?"": <a
-                href={`/messages/${user.login}/user_tidings`}
-                style={{position:'relative'}}
+                href={`${mygetHelmetapi2.new_course.default_url}messages/${user.login}/user_tidings`}
+                style={{position:'relative'}} target="_blank"
               >
                 <i className="iconfont icon-xiaoxilingdang color-white"></i>
                 <span className="newslight" style={{display:this.props.Headertop===undefined?"none":this.props.Headertop.new_message===true?"block":"none"}}>