diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index fb351c06c..e942577ff 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,13 @@
   <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/modules/tpm/NewHeader.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/modules/tpm/NewHeader.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/modules/login/EducoderInteresse.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/modules/login/EducoderInteresse.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/modules/login/EducoderLogin.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/modules/login/EducoderLogin.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/modules/login/LoginDialog.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/modules/login/LoginDialog.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/modules/user/LoginRegisterComponent.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/modules/user/LoginRegisterComponent.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/modules/user/usersInfo/InfosBanner.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/modules/user/usersInfo/InfosBanner.js" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -30,93 +36,65 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/App.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="12410">
-              <caret line="762" column="54" selection-start-line="762" selection-start-column="54" selection-end-line="762" selection-end-column="54" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/Infos.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="357">
-              <caret line="38" column="31" selection-start-line="38" selection-start-column="31" selection-end-line="38" selection-end-column="31" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/InfosProject.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="170">
-              <caret line="10" column="29" selection-end-line="390" />
-              <folding>
-                <element signature="e#0#41#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="164">
+              <caret line="435" column="7" selection-start-line="435" selection-start-column="7" selection-end-line="435" selection-end-column="7" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/modules/tpm/NewHeader.js">
+        <entry file="file://$PROJECT_DIR$/src/modules/user/LoginRegisterComponent.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="323">
-              <caret line="1282" column="17" selection-start-line="1282" selection-start-column="17" selection-end-line="1282" selection-end-column="17" />
+            <state relative-caret-position="238">
+              <caret line="14" column="22" selection-start-line="14" selection-start-column="22" selection-end-line="14" selection-end-column="22" />
               <folding>
-                <element signature="e#0#41#0" expanded="true" />
-                <element signature="e#433#515#0" expanded="true" />
-                <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#0#39#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeDetail.js">
+        <entry file="file://$PROJECT_DIR$/src/modules/login/EducoderInteresse.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="136">
-              <caret line="8" column="27" selection-start-line="8" selection-start-column="27" selection-end-line="8" selection-end-column="27" />
+            <state relative-caret-position="254">
+              <caret line="78" column="28" selection-start-line="78" selection-start-column="28" selection-end-line="78" selection-end-column="28" />
               <folding>
-                <element signature="n#MergeDetail#0" />
-                <element signature="e#749#1100#0" />
+                <element signature="e#0#39#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Nodata.js">
+        <entry file="file://$PROJECT_DIR$/src/modules/login/LoginDialog.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="119">
-              <caret line="7" column="11" selection-start-line="7" selection-start-column="11" selection-end-line="7" selection-end-column="11" />
+            <state relative-caret-position="328">
+              <caret line="727" column="131" selection-start-line="727" selection-start-column="30" selection-end-line="727" selection-end-column="131" />
               <folding>
-                <element signature="e#0#42#0" expanded="true" />
+                <element signature="n#style#0;n#a#0;n#font#0;n#!!top" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Index.js">
+        <entry file="file://$PROJECT_DIR$/src/modules/login/EducoderLogin.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="544">
-              <caret line="32" column="2" selection-start-line="32" selection-start-column="2" selection-end-line="32" selection-end-column="2" />
+            <state relative-caret-position="272">
+              <caret line="162" selection-start-line="162" selection-end-line="162" />
               <folding>
-                <element signature="e#0#42#0" expanded="true" />
+                <element signature="e#0#39#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Version/version.css">
+        <entry file="file://$PROJECT_DIR$/src/modules/login/EducoderReg.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1921">
-              <caret line="113" column="1" selection-start-line="113" selection-start-column="1" selection-end-line="113" selection-end-column="11" />
+            <state relative-caret-position="41">
+              <caret line="17" column="12" selection-start-line="17" selection-start-column="12" selection-end-line="17" selection-end-column="12" />
             </state>
           </provider>
         </entry>
@@ -125,45 +103,48 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>detail</find>
-      <find>up</find>
-      <find>update</find>
+      <find>school</find>
+      <find>homepage_info</find>
+      <find>homepage_</find>
+      <find>翻转课堂</find>
+      <find>Infos</find>
+      <find>mygetHelmetapi</find>
+      <find>tool</find>
+      <find>console.log(&quot;c</find>
+      <find>公开</find>
+      <find>color: #</find>
+      <find>homepge</find>
+      <find>status</find>
+      <find>新建</find>
+      <find>course</find>
+      <find>user_phone_binded</find>
       <find>新建文件</find>
-      <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>
-      <find>ver</find>
-      <find>new_header.js</find>
-      <find>new_course</find>
-      <find>/projects&quot;</find>
-      <find>我的</find>
-      <find>/projects</find>
-      <find>mygetHelmetapi2.new_course</find>
-      <find>注册</find>
+      <find>快速帮助</find>
+      <find>NullData</find>
+      <find>spin</find>
+      <find>里程碑</find>
+      <find>动态</find>
+      <find>filePath</find>
+      <find>register</find>
+      <find>找回密码</find>
+      <find>target=</find>
+      <find>target={&quot;_blank&quot;}</find>
+      <find>登录</find>
+      <find>loading...</find>
+      <find>title</find>
+      <find>background: url</find>
     </findStrings>
     <replaceStrings>
       <replace>任务</replace>
     </replaceStrings>
     <dirStrings>
       <dir>$PROJECT_DIR$/src/forge/Merge</dir>
+      <dir>$PROJECT_DIR$</dir>
+      <dir>$PROJECT_DIR$/public</dir>
+      <dir>$PROJECT_DIR$/src/modules/user/usersInfo</dir>
+      <dir>$PROJECT_DIR$/src/modules/user</dir>
       <dir>$PROJECT_DIR$/src/forge</dir>
       <dir>$PROJECT_DIR$/src</dir>
-      <dir>$PROJECT_DIR$</dir>
     </dirStrings>
   </component>
   <component name="Git.Settings">
@@ -172,11 +153,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <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" />
-        <option value="$PROJECT_DIR$/src/forge/Settings/Setting.js" />
-        <option value="$PROJECT_DIR$/.gitignore" />
         <option value="$PROJECT_DIR$/src/forge/Settings/Collaborator.js" />
         <option value="$PROJECT_DIR$/src/forge/Settings/setting.css" />
         <option value="$PROJECT_DIR$/src/forge/Branch/branch.css" />
@@ -208,8 +184,6 @@
         <option value="$PROJECT_DIR$/src/forge/Merge/MessageCount.js" />
         <option value="$PROJECT_DIR$/src/forge/Branch/CloneAddress.js" />
         <option value="$PROJECT_DIR$/src/forge/Newfile/UserSubmitComponent.js" />
-        <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/AppConfig.js" />
@@ -218,13 +192,22 @@
         <option value="$PROJECT_DIR$/src/forge/Index.js" />
         <option value="$PROJECT_DIR$/src/modules/user/Projects.js" />
         <option value="$PROJECT_DIR$/src/App.js" />
+        <option value="$PROJECT_DIR$/.gitignore" />
         <option value="$PROJECT_DIR$/src/modules/user/usersInfo/Infos.js" />
-        <option value="$PROJECT_DIR$/src/modules/user/usersInfo/Projects.js" />
+        <option value="$PROJECT_DIR$/src/modules/user/usersInfo/usersInfo.css" />
         <option value="$PROJECT_DIR$/src/modules/tpm/NewHeader.js" />
+        <option value="$PROJECT_DIR$/src/modules/user/usersInfo/Projects.js" />
+        <option value="$PROJECT_DIR$/src/modules/user/usersInfo/InfosBanner.js" />
+        <option value="$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js" />
+        <option value="$PROJECT_DIR$/src/forge/Main/Detail.js" />
+        <option value="$PROJECT_DIR$/src/modules/login/LoginDialog.js" />
+        <option value="$PROJECT_DIR$/src/modules/login/EducoderLogin.js" />
+        <option value="$PROJECT_DIR$/src/modules/user/LoginRegisterComponent.js" />
+        <option value="$PROJECT_DIR$/src/modules/login/EducoderInteresse.js" />
       </list>
     </option>
   </component>
-  <component name="ProjectFrameBounds" fullScreen="true">
+  <component name="ProjectFrameBounds" extendedState="6" fullScreen="true">
     <option name="y" value="23" />
     <option name="width" value="1440" />
     <option name="height" value="877" />
@@ -247,33 +230,6 @@
               <item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
               <item name="src" 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" />
-            </path>
-            <path>
-              <item name="forgeplus-react" type="b2602c69:ProjectViewProjectNode" />
-              <item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="modules" 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="modules" type="462c0819:PsiDirectoryNode" />
-              <item name="user" 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="modules" type="462c0819:PsiDirectoryNode" />
-              <item name="user" type="462c0819:PsiDirectoryNode" />
-              <item name="usersInfo" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
@@ -293,6 +249,7 @@
   </component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$" />
       <recent name="$PROJECT_DIR$/src/modules/user/usersInfo" />
       <recent name="$PROJECT_DIR$/build" />
       <recent name="$PROJECT_DIR$/src/forge/Images" />
@@ -352,18 +309,24 @@
       <workItem from="1587021467416" duration="8000" />
       <workItem from="1587022017639" duration="2902000" />
       <workItem from="1587047814589" duration="8239000" />
-      <workItem from="1587117033332" duration="126000" />
+      <workItem from="1587117033332" duration="611000" />
+      <workItem from="1587362728834" duration="185000" />
+      <workItem from="1587374749323" duration="458000" />
+      <workItem from="1587375511570" duration="1067000" />
+      <workItem from="1587376696494" duration="11000" />
+      <workItem from="1587376745950" duration="14824000" />
+      <workItem from="1587452961769" duration="3903000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="148391000" />
+    <option name="totallyTimeSpent" value="169324000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="0" y="0" width="1440" height="900" extended-state="0" />
+    <frame x="0" y="0" width="1440" height="900" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19098713" />
+      <window_info content_ui="combo" id="Project" order="0" weight="0.16309012" />
       <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="Message" order="0" />
@@ -375,8 +338,8 @@
       <window_info anchor="bottom" id="TODO" order="6" />
       <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.45301205" />
+      <window_info anchor="bottom" id="Version Control" order="9" weight="0.41686746" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.5987952" />
       <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" />
@@ -439,115 +402,6 @@
     </option>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/forge/Settings/Setting.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-526">
-          <caret line="115" column="22" lean-forward="true" selection-start-line="115" selection-start-column="22" selection-end-line="115" selection-end-column="22" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Settings/Collaborator.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="270">
-          <caret line="197" column="45" lean-forward="true" selection-start-line="197" selection-start-column="45" selection-end-line="197" selection-end-column="45" />
-          <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">
-          <caret line="280" column="16" lean-forward="true" selection-start-line="280" selection-start-column="16" selection-end-line="280" selection-end-column="16" />
-          <folding>
-            <element signature="e#0#40#0" expanded="true" />
-            <element signature="e#9724#10047#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Order/Tags.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="102">
-          <caret line="6" column="31" lean-forward="true" selection-start-line="6" selection-start-column="31" selection-end-line="6" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Settings/new_tags.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="154">
-          <caret line="331" column="28" lean-forward="true" selection-start-line="331" selection-start-column="28" selection-end-line="331" selection-end-column="28" />
-          <folding>
-            <element signature="e#0#40#0" expanded="true" />
-            <element signature="e#6460#6910#0" />
-            <element signature="e#6923#8163#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Order/Detail.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="170">
-          <caret line="461" column="41" selection-start-line="461" selection-start-column="41" selection-end-line="461" selection-end-column="41" />
-          <folding>
-            <element signature="e#0#40#0" expanded="true" />
-            <element signature="e#8674#13519#0" />
-            <element signature="e#16700#18374#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Activity/Activity.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="500">
-          <caret line="187" column="15" selection-start-line="187" selection-start-column="15" selection-end-line="187" selection-end-column="15" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </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">
-          <caret line="243" selection-start-line="243" selection-end-line="245" selection-end-column="15" />
-          <folding>
-            <element signature="e#0#40#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Order/New.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="51">
-          <caret line="3" selection-start-line="3" selection-end-line="3" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Order/order.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="378">
-          <caret line="390" column="10" selection-start-line="390" selection-start-column="10" selection-end-line="401" selection-end-column="16" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Images/fork.png">
-      <provider selected="true" editor-type-id="images" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootFileDetail.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="110">
-          <caret line="126" column="20" lean-forward="true" selection-start-line="126" selection-start-column="20" selection-end-line="126" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Branch/SelectBranch.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="335">
@@ -679,16 +533,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Branch/CloneAddress.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="170">
-          <caret line="13" column="11" lean-forward="true" selection-start-line="13" selection-start-column="11" selection-end-line="13" selection-end-column="11" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootBranch.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="187">
@@ -719,16 +563,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="340">
-          <caret line="82" column="39" lean-forward="true" selection-start-line="82" selection-start-column="39" selection-end-line="82" selection-end-column="39" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Main/IndexItem.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-267">
@@ -786,16 +620,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Main/Detail.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="618">
-          <caret line="211" column="38" 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/forge/Version/version.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="254">
@@ -825,47 +649,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Main/Index.js">
+    <entry file="file://$PROJECT_DIR$/scripts/build.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2242">
-          <caret line="96" column="24" selection-start-line="96" selection-start-column="24" selection-end-line="96" selection-end-column="24" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/Projects.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="208">
-          <caret line="153" column="13" lean-forward="true" selection-start-line="153" selection-start-column="13" selection-end-line="153" selection-end-column="13" />
-          <folding>
-            <element signature="e#0#41#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="12410">
-          <caret line="762" column="54" selection-start-line="762" selection-start-column="54" selection-end-line="762" selection-end-column="54" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/Infos.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="357">
-          <caret line="38" column="31" selection-start-line="38" selection-start-column="31" selection-end-line="38" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/InfosProject.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="170">
-          <caret line="10" column="29" selection-end-line="390" />
-          <folding>
-            <element signature="e#0#41#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="221">
+          <caret line="13" column="36" selection-start-line="13" selection-start-column="36" selection-end-line="13" selection-end-column="36" />
         </state>
       </provider>
     </entry>
@@ -890,16 +677,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="544">
-          <caret line="32" column="2" selection-start-line="32" selection-start-column="2" selection-end-line="32" selection-end-column="2" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </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="1921">
@@ -907,10 +684,51 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/.gitignore">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="162">
+          <caret line="49" lean-forward="true" selection-start-line="49" selection-end-line="49" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/InfosProject.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="6630">
+          <caret line="389" column="27" selection-start-line="389" selection-start-column="15" selection-end-line="389" selection-end-column="27" />
+          <folding>
+            <element signature="e#0#41#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/Infos.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="4318">
+          <caret line="271" column="22" selection-start-line="271" selection-start-column="22" selection-end-line="271" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/usersInfo.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="7973">
+          <caret line="469" column="1" selection-start-line="469" selection-start-column="1" selection-end-line="469" selection-end-column="12" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/publicCreatNew.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="714">
+          <caret line="42" column="22" selection-start-line="42" selection-start-column="22" selection-end-line="42" selection-end-column="22" />
+          <folding>
+            <element signature="e#0#41#0" expanded="true" />
+          </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="323">
-          <caret line="1282" column="17" selection-start-line="1282" selection-start-column="17" selection-end-line="1282" selection-end-column="17" />
+        <state relative-caret-position="18683">
+          <caret line="1179" column="17" selection-start-line="1179" selection-start-column="17" selection-end-line="1179" selection-end-column="17" />
           <folding>
             <element signature="e#0#41#0" expanded="true" />
             <element signature="e#433#515#0" expanded="true" />
@@ -923,5 +741,149 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Branch/CloneAddress.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="207">
+          <caret line="20" column="9" lean-forward="true" selection-start-line="20" selection-start-column="9" selection-end-line="20" selection-end-column="9" />
+          <folding>
+            <element signature="e#0#42#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Main/NullData.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="443">
+          <caret line="63" column="23" selection-start-line="63" selection-start-column="15" selection-end-line="63" selection-end-column="23" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/Projects.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="783">
+          <caret line="395" column="16" lean-forward="true" selection-start-line="395" selection-start-column="16" selection-end-line="395" selection-end-column="16" />
+          <folding>
+            <element signature="e#0#41#0" expanded="true" />
+            <element signature="e#4148#5191#0" />
+            <element signature="e#5202#6120#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/InfosBanner.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="905">
+          <caret line="158" selection-start-line="158" selection-end-line="158" />
+          <folding>
+            <element signature="e#0#41#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="115">
+          <caret line="295" column="17" lean-forward="true" selection-start-line="295" selection-start-column="17" selection-end-line="295" selection-end-column="17" />
+          <folding>
+            <element signature="e#0#42#0" expanded="true" />
+            <element signature="e#9003#11685#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Main/Detail.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="89">
+          <caret line="340" column="21" lean-forward="true" selection-start-line="340" selection-start-column="21" selection-end-line="340" selection-end-column="21" />
+          <folding>
+            <element signature="e#0#42#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/modules/login/EducoderLogin.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="272">
+          <caret line="162" selection-start-line="162" selection-end-line="162" />
+          <folding>
+            <element signature="e#0#39#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/modules/login/EducoderInteresse.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="254">
+          <caret line="78" column="28" selection-start-line="78" selection-start-column="28" selection-end-line="78" selection-end-column="28" />
+          <folding>
+            <element signature="e#0#39#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/modules/login/LoginDialog.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="328">
+          <caret line="727" column="131" selection-start-line="727" selection-start-column="30" selection-end-line="727" selection-end-column="131" />
+          <folding>
+            <element signature="n#style#0;n#a#0;n#font#0;n#!!top" 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="164">
+          <caret line="435" column="7" selection-start-line="435" selection-start-column="7" selection-end-line="435" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Main/Index.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="194">
+          <caret line="216" column="38" selection-start-line="216" selection-start-column="33" selection-end-line="216" selection-end-column="38" />
+          <folding>
+            <element signature="e#0#42#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Index.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="311">
+          <caret line="58" column="38" selection-start-line="58" selection-start-column="38" selection-end-line="58" selection-end-column="38" />
+          <folding>
+            <element signature="e#0#42#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/modules/login/Trialapplication.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="251">
+          <caret line="118" lean-forward="true" selection-start-line="118" selection-end-line="118" />
+          <folding>
+            <element signature="e#0#39#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/modules/login/EducoderReg.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="41">
+          <caret line="17" column="12" selection-start-line="17" selection-start-column="12" selection-end-line="17" selection-end-column="12" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/modules/user/LoginRegisterComponent.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="238">
+          <caret line="14" column="22" selection-start-line="14" selection-start-column="22" selection-end-line="14" selection-end-column="22" />
+          <folding>
+            <element signature="e#0#39#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/src/forge/Main/CoderRootDirectory.js b/src/forge/Main/CoderRootDirectory.js
index 435f64b07..fad7bea42 100644
--- a/src/forge/Main/CoderRootDirectory.js
+++ b/src/forge/Main/CoderRootDirectory.js
@@ -321,66 +321,62 @@ class CoderRootDirectory extends Component{
     let array = filePath && filePath.split("/");
     return(
       <Spin spinning={isSpin}>
-        {(rootList && rootList.length > 0) || (fileDetail && fileDetail.length > 0) ?
-          <div>
-            <Top { ...this.props } {...this.state} />
-            <div className="f-wrap-between mt20">
-              <div className="f-wrap-alignCenter">
-                <SelectBranch branch={branch} changeBranch={this.changeBranch} {...this.props} {...this.state}></SelectBranch>
-                
-                {
-                  filePath && 
-                  <span className="ml20 font-16">
+        <div>
+          <Top { ...this.props } {...this.state} />
+          <div className="f-wrap-between mt20">
+            <div className="f-wrap-alignCenter">
+              <SelectBranch branch={branch} changeBranch={this.changeBranch} {...this.props} {...this.state}></SelectBranch>
+
+              {
+                filePath &&
+                <span className="ml20 font-16">
                     <a onClick={()=>this.returnMain(branch)} className="color-blue">{ projectDetail && projectDetail.identifier }</a>
-                    {
-                      array && array.map((item,key)=>{
-                        return(
-                          <React.Fragment>
-                            {
-                              key === array.length-1 ?
+                  {
+                    array && array.map((item,key)=>{
+                      return(
+                        <React.Fragment>
+                          {
+                            key === array.length-1 ?
                               <span className="color-grey-6 subFileName" key={key}>{item}</span>
                               :
                               key === 0?
-                              <Link to={`/projects/${projectsId}/coders/filesurl/${item}`} className="color-blue subFileName" key={key}>{item}</Link>
-                              :
-                              <Link to={`/projects/${projectsId}/coders/filesurl/${array[key-1]}/${item}`} className="color-blue subFileName" key={key}>{item}</Link>
-                            }
-                          </React.Fragment>
-                        )
-                      })
-                    }
+                                <Link to={`/projects/${projectsId}/coders/filesurl/${item}`} className="color-blue subFileName" key={key}>{item}</Link>
+                                :
+                                <Link to={`/projects/${projectsId}/coders/filesurl/${array[key-1]}/${item}`} className="color-blue subFileName" key={key}>{item}</Link>
+                          }
+                        </React.Fragment>
+                      )
+                    })
+                  }
                   </span>
-                }
-              </div>
-              <div className="f-wrap-alignCenter">
-                {
-                  subFileType !== "file" && (isManager || isDeveloper) &&
-                  <p className="addFile mr30">
-                    <Link to={`/projects/${projectsId}/coders/${branch}/newfile${urlRoot}`} >新建文件</Link>
-                  </p>
-                }
-                {
-                  filePath && filePath.length === 0 && <CloneAddress http_url={http_url} downloadUrl={downloadUrl} showNotification={this.props.showNotification}></CloneAddress>
-                }
-              </div>
+              }
             </div>
-              {/* 主目录列表 */}
+            <div className="f-wrap-alignCenter">
               {
-                rootList && 
-                <RootTable columns = {columns} data={rootList} title={() => title()}></RootTable>
-
+                subFileType !== "file" && (isManager || isDeveloper) &&
+                <p className="addFile mr30">
+                  <Link to={`/projects/${projectsId}/coders/${branch}/newfile${urlRoot}`} >新建文件</Link>
+                </p>
               }
-              {/* 子目录列表、文件 */}
               {
-                fileDetail && fileDetail.length>0 &&
-                <CoderRootFileDetail detail = {fileDetail[0]} {...this.props} {...this.state} readOnly={this.state.readOnly}></CoderRootFileDetail>
+                http_url && <CloneAddress http_url={http_url} downloadUrl={downloadUrl} showNotification={this.props.showNotification}></CloneAddress>
               }
-              {/* readme.txt (isManager || isDeveloper)*/}
-              { this.renderReadMeContent(readMeContent,(isManager || isDeveloper)) }
+            </div>
           </div>
-          :
-          <NullData {...this.props} {...this.state} http_url={http_url} ></NullData>
-        }
+          {/* 主目录列表 */}
+          {
+            rootList &&
+            <RootTable columns = {columns} data={rootList} title={() => title()}></RootTable>
+
+          }
+          {/* 子目录列表、文件 */}
+          {
+            fileDetail && fileDetail.length>0 &&
+            <CoderRootFileDetail detail = {fileDetail[0]} {...this.props} {...this.state} readOnly={this.state.readOnly}></CoderRootFileDetail>
+          }
+          {/* readme.txt (isManager || isDeveloper)*/}
+          { this.renderReadMeContent(readMeContent,(isManager || isDeveloper)) }
+        </div>
       </Spin>
     )
   }
diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js
index 04ff54c63..b56df2294 100644
--- a/src/forge/Main/Detail.js
+++ b/src/forge/Main/Detail.js
@@ -330,8 +330,9 @@ class Detail extends Component{
                   <li className={(url.indexOf("orders")>-1 && !(url.indexOf("Milepost")>0 || url.indexOf("meilpost")>0 || url.indexOf("tags")>0))? "active" : ""}><Link to={{pathname:`/projects/${projectsId}/orders`,state}}><img alt="" src={img_2} width="12" />任务{projectDetail&&projectDetail.issues_count===0?"":projectDetail&&projectDetail.issues_count===0?projectDetail.issues_count:""}</Link></li>
                   <li className={url.indexOf("merge")>-1 ? "active" : ""}><Link to={{pathname:`/projects/${projectsId}/merge`,state}}><img alt="" src={img_3} width="13" />合并请求{projectDetail&&projectDetail.pull_requests_count===0?"":projectDetail&&projectDetail.pull_requests_count===0?projectDetail.pull_requests_count:""}</Link></li>
                   <li className={url.indexOf("version")>-1 ? "active" : ""}><Link to={{pathname:`/projects/${projectsId}/version`,state}}><img alt="" src={img_4} width="16" />版本发布</Link></li>
-                  <li className={url.indexOf("trends")>-1 ? "active" : ""}><Link to={{pathname:`/projects/${projectsId}/trends`,state}}><img alt="" src={img_6} width="16" />动态</Link></li>
+
                   <li className={(url.indexOf("Milepost")>-1 || url.indexOf("meilpost")>-1) ? "active" : ""}><Link to={{pathname:`/projects/${projectsId}/orders/Milepost`,state}}><img alt="" src={img_milepost} width="16" />里程碑</Link></li>
+                  <li className={url.indexOf("trends")>-1 ? "active" : ""}><Link to={{pathname:`/projects/${projectsId}/trends`,state}}><img alt="" src={img_6} width="16" />动态</Link></li>
                   {
                     isManager &&
                       <li className={url.indexOf("setting")>0 ? "active" : ""}><Link to={`/projects/${projectsId}/setting`}><img alt="" src={img_7} width="19" />仓库设置</Link></li>
diff --git a/src/modules/login/EducoderInteresse.js b/src/modules/login/EducoderInteresse.js
index 5f62153c3..9f8eeb11c 100644
--- a/src/modules/login/EducoderInteresse.js
+++ b/src/modules/login/EducoderInteresse.js
@@ -80,7 +80,7 @@ class EducoderInteresse extends Component {
 						justifyContent: "center",
 						width: "100%",
 					}}>
-						<div className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;{moment().year()}&nbsp;EduCoder<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
+						<div className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;{moment().year()}&nbsp;国防科技大学<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
 					</div>
 				</div>
 			</div>
diff --git a/src/modules/login/EducoderLogin.js b/src/modules/login/EducoderLogin.js
index 5663c69c8..dd2ef7a39 100644
--- a/src/modules/login/EducoderLogin.js
+++ b/src/modules/login/EducoderLogin.js
@@ -181,21 +181,21 @@ class EducoderLogin extends Component {
 										justifyContent: "center",
 										width: "100%",
 									}}>
-										<div className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;{moment().year()}&nbsp;EduCoder<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
+										<div className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;{moment().year()}&nbsp;国防科技大学<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
 									</div>:
 									this.props.mygetHelmetapi===undefined||this.props.mygetHelmetapi.main_site===null|| this.props.mygetHelmetapi.main_site===undefined?	<div style={{
 										display: "flex",
 										justifyContent: "center",
 										width: "100%",
 									}}>
-										<div className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;{moment().year()}&nbsp;EduCoder<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
+										<div className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;{moment().year()}&nbsp;湘ICP备17009477号<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
 									</div>:this.props.mygetHelmetapi.main_site===true?
 										<div style={{
 											display: "flex",
 											justifyContent: "center",
 											width: "100%",
 										}}>
-											<div className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;{moment().year()}&nbsp;EduCoder<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
+											<div className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;{moment().year()}&nbsp;湘ICP备17009477号<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
 										</div>
 										:""
 									}
diff --git a/src/modules/login/LoginDialog.js b/src/modules/login/LoginDialog.js
index 801d3cd00..d09654df8 100644
--- a/src/modules/login/LoginDialog.js
+++ b/src/modules/login/LoginDialog.js
@@ -720,9 +720,12 @@ class LoginDialog extends Component {
                             </span>
 
                             <span className="fr">
-                              <a onClick={(url) => this.getloginurl("/changepassword")}
-																 className="mr3 color-grey-9">找回密码</a><em className="vertical-line"></em>
-                              <a onClick={(url)=>this.getloginurl("/register")} className="color-grey-9">注册</a>
+                              <a href="https://www.trustie.net/account/lost_password" className="mr3 color-grey-9" target={"_blank"}>找回密码</a>
+                              {/*<a onClick={(url) => this.getloginurl("/changepassword")}*/}
+																 {/*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 href="https://www.trustie.net/login?login=false" target={"_blank"} className="color-grey-9">注册</a>
                             </span>
 
                           </p>
diff --git a/src/modules/tpm/NewHeader.js b/src/modules/tpm/NewHeader.js
index 09ca7af07..55dd36a37 100644
--- a/src/modules/tpm/NewHeader.js
+++ b/src/modules/tpm/NewHeader.js
@@ -1173,10 +1173,15 @@ submittojoinclass=(value)=>{
                   mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.my_courses &&
                   <li><a href={`${mygetHelmetapi2.new_course.my_courses}`} target="_blank">我的课程</a></li>
                 }
+                {/*{*/}
+                  {/*mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.my_projects &&*/}
+                  {/*<li><a href={`${mygetHelmetapi2.new_course.my_projects}`} target="_blank">我的项目</a></li>*/}
+                {/*}*/}
                 {
                   mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.my_projects &&
-                  <li><a href={`${mygetHelmetapi2.new_course.my_projects}`} target="_blank">我的项目</a></li>
+                  <li><Link to={`/users/${this.props.current_user.login}/projects`} >我的项目</Link></li>
                 }
+
                 {
                   mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.my_organ &&
                   <li><a href={`${mygetHelmetapi2.new_course.my_organ}`} target="_blank">我的组织</a></li>
diff --git a/src/modules/user/LoginRegisterComponent.js b/src/modules/user/LoginRegisterComponent.js
index c42ceed88..b480b8a03 100644
--- a/src/modules/user/LoginRegisterComponent.js
+++ b/src/modules/user/LoginRegisterComponent.js
@@ -995,7 +995,10 @@ class LoginRegisterComponent extends Component {
               <div>
 								{weixinlogin===false&&this.props.weixinlogin===undefined?<Menu mode="horizontal" selectedKeys={tab} onClick={this.changeTab} className="mt20">
                       <Menu.Item key="0" className={tab===0?"active font-18":"font-18"}   > 登录</Menu.Item>
-                      <Menu.Item key="1" className={tab===1?"active font-18 ":"font-18 "} style={{marginLeft:"10px"}}  >注册</Menu.Item>
+                      <Menu.Item key="1" className={tab===1?"active font-18 ":"font-18 "} style={{marginLeft:"10px"}}>
+                          <a href="https://www.trustie.net/login?login=false" target={"_blank"}>注册</a>
+                          {/*注册*/}
+                      </Menu.Item>
                   </Menu>:""}
 
 								{
@@ -1078,9 +1081,9 @@ class LoginRegisterComponent extends Component {
 
                           <div className="left_right  font-12 " style={{color: '#676767'}}>
                               <Checkbox onChange={this.onAutoLoginChange} checked={autoLogin}>下次自动登录</Checkbox>
-
-                              <a onClick={()=>this.StudyMakeMoney()}
-                                 className="mr3 color-grey-9 mt3 font-12">找回密码</a>
+                              <a href="https://www.trustie.net/account/lost_password" className="mr3 color-grey-9 mt3 font-12" target={"_blank"}>找回密码</a>
+                              {/*<a onClick={()=>this.StudyMakeMoney()}*/}
+                                 {/*className="mr3 color-grey-9 mt3 font-12">找回密码</a>*/}
                           </div>
 
                           <Button className="login_btn font-16" type="primary" style={{height:"46px"}} onClick={() => this.postLogin()}
diff --git a/src/modules/user/usersInfo/Infos.js b/src/modules/user/usersInfo/Infos.js
index 9587cdf3c..bda24aa74 100644
--- a/src/modules/user/usersInfo/Infos.js
+++ b/src/modules/user/usersInfo/Infos.js
@@ -64,7 +64,7 @@ class Infos extends Component{
       type:0,
       login:undefined,
       isRenders:false,
-      moduleName:"courses",
+      moduleName:"projects",
       next_gold:undefined
     }
   }
@@ -113,8 +113,8 @@ class Infos extends Component{
 						data:result.data,
 						followed:result.data.followed,
 						sign:result.data.brief_introduction,
-						id:result.data.id,
-						next_gold:result.data.tomorrow_attendance_gold
+						// id:result.data.id,
+						// next_gold:result.data.tomorrow_attendance_gold
 					})
 				}
       }
diff --git a/src/modules/user/usersInfo/InfosBanner.js b/src/modules/user/usersInfo/InfosBanner.js
index 16b70895f..9226e084e 100644
--- a/src/modules/user/usersInfo/InfosBanner.js
+++ b/src/modules/user/usersInfo/InfosBanner.js
@@ -27,39 +27,48 @@ class InfosBanner extends Component{
      let {pathname}=this.props.location;
      moduleName=pathname.split("/")[3];
 
-    let user_id=this.props.current_user&&this.props.current_user.user_id;
-		let user_type=this.props.current_user&&this.props.current_user.user_identity;
-		let targetuserid=this.props.data&&this.props.data.id;
+    // let user_id=this.props.current_user&&this.props.current_user.user_id;
+		// let user_type=this.props.current_user&&this.props.current_user.user_identity;
+		// let targetuserid=this.props.data&&this.props.data.id;
 
 		 // console.log(is_current)
 		 // console.log(current_user)
 		// console.log(current_user.is_teacher)
-		let shixuntype=false;
-		let pathstype=false;
-		let coursestypes=false;
-		if(this.props&&this.props.mygetHelmetapi!=null){
-			let shixun="/shixuns";
-			let paths="/paths";
-			let courses="/courses";
-			this.props.mygetHelmetapi.navbar.map((item,key)=>{
-				var reg = RegExp(item.link);
-				if(shixun.match(reg)){
-					if(item.hidden===true){
-						shixuntype=true
-					}
-				}
-				if(paths.match(reg)){
-					if(item.hidden===true){
-						pathstype=true
-					}
-				}
-				if(courses.match(reg)){
-					if(item.hidden===true){
-						coursestypes=true
-					}
-				}
-			})
-		}
+		// let shixuntype=false;
+		// let pathstype=false;
+		// let coursestypes=false;
+		// let projectstypes=false;
+
+		// if(this.props&&this.props.mygetHelmetapi!=null){
+    //   console.log("this.props", this.props.mygetHelmetapi)
+		// 	let shixun="/shixuns";
+		// 	let paths="/paths";
+		// 	let courses="/courses";
+		// 	let projects = "/projects";
+		// 	this.props.mygetHelmetapi.navbar.map((item,key)=>{
+		// 		var reg = RegExp(item.link);
+		// 		if(shixun.match(reg)){
+		// 			if(item.hidden===true){
+		// 				shixuntype=true
+		// 			}
+		// 		}
+		// 		if(paths.match(reg)){
+		// 			if(item.hidden===true){
+		// 				pathstype=true
+		// 			}
+		// 		}
+		// 		if(courses.match(reg)){
+		// 			if(item.hidden===true){
+		// 				coursestypes=true
+		// 			}
+		// 		}
+    //     if(projects.match(reg)){
+    //       if(item.hidden===true){
+    //         projectstypes=true
+    //       }
+    //     }
+		// 	})
+		// }
 
     return(
       <div className="bannerPanel mb60">
@@ -68,94 +77,86 @@ class InfosBanner extends Component{
             <p className="myPhoto mr20 fl"><img alt="头像" src={data && `${getImageUrl('images/'+data.avatar_url)}`}/></p>
             <div className="fl">
               <p className="clearfix mt20">
-                <span className="username task-hide" style={{"maxWidth":'370px'}}>{data && data.name}</span>
-                {/*{*/}
-                  {/*data && is_current == false && data.identity =="学生" ? "" : */}
-                  {/*<span className="userpost"><label>{data && data.identity}</label></span>*/}
-                {/*}*/}
-              </p>
-              <p className="mt15">
-                <Tooltip placement='bottom' title={ data && data.professional_certification ?"已职业认证":"未职业认证"}>
-                  <i className={ data && data.professional_certification ? "iconfont icon-shenfenzhenghaomaguizheng font-18 user-colorgrey-blue mr20 ml2":"iconfont icon-shenfenzhenghaomaguizheng font-18 user-colorgrey-B8 mr20 ml2"}></i>
-                </Tooltip>
-                <Tooltip placement='bottom' title={ data && data.authentication ?"已实名认证":"未实名认证"}>
-                  <i className={ data && data.authentication ? "iconfont icon-renzhengshangjia font-18 user-colorgrey-blue":"iconfont icon-renzhengshangjia font-18 user-colorgrey-B8"}></i>
-                </Tooltip>
+                <span className="username task-hide" style={{"maxWidth":'370px'}}>
+                  {data && data.name}
+                </span>
+                {
+                  data && data.identity &&
+                  <span className="userpost"><label>{data && data.identity}</label></span>
+                }
               </p>
+              {
+                data && data.brief_introduction &&
+                <p className="mt15 text-grey-e">{data.brief_introduction}</p>
+              }
+              {/*<p className="mt15">*/}
+                {/*<Tooltip placement='bottom' title={ data && data.professional_certification ?"已职业认证":"未职业认证"}>*/}
+                  {/*<i className={ data && data.professional_certification ? "iconfont icon-shenfenzhenghaomaguizheng font-18 user-colorgrey-blue mr20 ml2":"iconfont icon-shenfenzhenghaomaguizheng font-18 user-colorgrey-B8 mr20 ml2"}></i>*/}
+                {/*</Tooltip>*/}
+                {/*<Tooltip placement='bottom' title={ data && data.authentication ?"已实名认证":"未实名认证"}>*/}
+                  {/*<i className={ data && data.authentication ? "iconfont icon-renzhengshangjia font-18 user-colorgrey-blue":"iconfont icon-renzhengshangjia font-18 user-colorgrey-B8"}></i>*/}
+                {/*</Tooltip>*/}
+              {/*</p>*/}
             </div>
             <div className="fr">
-              <div class="fl headtab mt20">
-                <span>{is_current ? "我":"TA"}的经验值</span>
-                <a style={{"cursor":"default"}}>{data && data.experience}</a>
-              </div> 
-              <div class="fl headtab mt20 pr leftTransform pl20">
-                <span>{is_current ? "我":"TA"}的金币</span>
-                <a style={{"cursor":"default"}}>{data && data.grade}</a>
-              </div> 
-              {
-                is_current ? 
-                <span className="fl mt35 ml60">
-                  {
-                    data && data.attendance_signed ? 
-                    <span className="user_default_btn user_grey_btn font-18">已签到</span>
-                    :
-                    <a herf="javascript:void(0);" onClick={this.props.signFor} className="user_default_btn user_yellow_btn fl font-18">签到</a>
-                  }
-                </span> 
-                :
-                <span className="fl mt35 ml60">
-                  <LinkAfterLogin 
-                    {...this.props} 
-                    {...this.state} 
-                    className="user_default_btn user_yellow_btn fl font-18" 
-                    to={`/messages/${login}/message_detail?target_ids=${id}`}
-                  >
-                  私信
-                  </LinkAfterLogin>
-                </span>
-              }
+              <div className="fl headtab mt20">
+                <span>全部项目数</span>
+                <a style={{"cursor": "default"}}>{data && data.projects_count}</a>
+              </div>
+              {/*<div class="fl headtab mt20">*/}
+                {/*<span>{is_current ? "我":"TA"}的经验值</span>*/}
+                {/*<a style={{"cursor":"default"}}>{data && data.experience}</a>*/}
+              {/*</div> */}
+              {/*<div class="fl headtab mt20 pr leftTransform pl20">*/}
+                {/*<span>{is_current ? "我":"TA"}的金币</span>*/}
+                {/*<a style={{"cursor":"default"}}>{data && data.grade}</a>*/}
+              {/*</div> */}
+              {/*{*/}
+                {/*is_current ? */}
+                {/*<span className="fl mt35 ml60">*/}
+                  {/*{*/}
+                    {/*data && data.attendance_signed ? */}
+                    {/*<span className="user_default_btn user_grey_btn font-18">已签到</span>*/}
+                    {/*:*/}
+                    {/*<a herf="javascript:void(0);" onClick={this.props.signFor} className="user_default_btn user_yellow_btn fl font-18">签到</a>*/}
+                  {/*}*/}
+                {/*</span> */}
+                {/*:*/}
+                {/*<span className="fl mt35 ml60">*/}
+                  {/*<LinkAfterLogin */}
+                    {/*{...this.props} */}
+                    {/*{...this.state} */}
+                    {/*className="user_default_btn user_yellow_btn fl font-18" */}
+                    {/*to={`/messages/${login}/message_detail?target_ids=${id}`}*/}
+                  {/*>*/}
+                  {/*私信*/}
+                  {/*</LinkAfterLogin>*/}
+                {/*</span>*/}
+              {/*}*/}
             </div>
           </div>
           <div className="userNav">
-						{coursestypes===true?"":<li className={`${moduleName == 'courses' ||moduleName == undefined ? 'active' : '' }`}>
-              <Link
-                onClick={() => this.setState({moduleName: 'courses'})}
-                to={`/users/${username}/courses`}>翻转课堂</Link>
-            </li>}
-						{shixuntype===true?"":<li className={`${moduleName == 'shixuns' ? 'active' : '' }`}>
-              <Link
-                onClick={() => this.setState({moduleName: 'shixuns'})}
-                to={`/users/${username}/shixuns`}>实训项目</Link>
-            </li>}
-						{pathstype===true?"":<li className={`${moduleName == 'paths' ? 'active' : '' }`}>
-              <Link 
-                onClick={() => this.setState({moduleName: 'paths'})}
-                to={`/users/${username}/paths`}>实践课程</Link>
-            </li>}
-						{this.props.user&&this.props.user.main_site===true?<li className={`${moduleName == 'projects' ? 'active' : '' }`}>
+						{/*{coursestypes===true?"":<li className={`${moduleName == 'courses' ||moduleName == undefined ? 'active' : '' }`}>*/}
+              {/*<Link*/}
+                {/*onClick={() => this.setState({moduleName: 'courses'})}*/}
+                {/*to={`/users/${username}/courses`}>翻转课堂</Link>*/}
+            {/*</li>}*/}
+						{/*{shixuntype===true?"":<li className={`${moduleName == 'shixuns' ? 'active' : '' }`}>*/}
+              {/*<Link*/}
+                {/*onClick={() => this.setState({moduleName: 'shixuns'})}*/}
+                {/*to={`/users/${username}/shixuns`}>实训项目</Link>*/}
+            {/*</li>}*/}
+						{/*{pathstype===true?"":<li className={`${moduleName == 'paths' ? 'active' : '' }`}>*/}
+              {/*<Link */}
+                {/*onClick={() => this.setState({moduleName: 'paths'})}*/}
+                {/*to={`/users/${username}/paths`}>实践课程</Link>*/}
+            {/*</li>}*/}
+            <li className={`${moduleName === 'projects' ? 'active' : '' }`}>
               <Link
                 onClick={() => this.setState({moduleName: 'projects'})}
                 to={`/users/${username}/projects`}>开发项目</Link>
-            </li>:""}
-            {/*<li className={`${moduleName == 'package' ? 'active' : '' }`}>*/}
-            {/*  <Link*/}
-            {/*    onClick={() => this.setState({moduleName: 'package'})}*/}
-            {/*    to={`/users/${username}/package`}>众包</Link>*/}
-            {/*</li>*/}
-            {this.props.user&&this.props.user.main_site===true?((is_current && current_user && current_user.is_teacher ) || current_user && current_user.admin)
-            && <li className={`${moduleName == 'videos' ? 'active' : '' }`}>
-              <Link
-                onClick={() => this.setState({moduleName: 'videos'})}
-                to={`/users/${username}/videos`}>视频</Link>
-            </li>:""}
+            </li>
 
-            {/*自己的主页且不是学生显示题库按钮*/}
-						{this.props.user&&this.props.user.main_site===true?(is_current && current_user&& current_user.is_teacher )
-						&&<li className={`${moduleName == 'topics' ? 'active' : '' }`}>
-							<Link
-								onClick={() => this.setState({moduleName: 'topics'})}
-								to={`/users/${username}/topics/personal`}>题库</Link>
-						</li>:""}
 
           </div>
         </div>
diff --git a/src/modules/user/usersInfo/Projects.js b/src/modules/user/usersInfo/Projects.js
index 7ed676413..b419d40e2 100644
--- a/src/modules/user/usersInfo/Projects.js
+++ b/src/modules/user/usersInfo/Projects.js
@@ -158,7 +158,6 @@ class Projects extends Component{
     let isStudent = this.props.isStudent();
     let  is_current=this.props.is_current;
     const {current_user} = this.props
-    console.log("current_user", current_user)
 
     const menu = (
       <Menu>
@@ -222,7 +221,7 @@ class Projects extends Component{
               className={is_current ? "font-16 w66" : "font-16 w80"}>{is_current ? "我" : "TA"}管理的</a></li>
             <li className={category == "study" ? "active font-16 whitepanelysllis" : "font-16 whitepanelysllis"}><a
               href="javascript:void(0)" onClick={() => this.changeCategory("study")}
-              className={is_current ? "font-16 w66" : "font-16 w80"}>{is_current ? "我" : "TA"}学习的</a></li>
+              className={is_current ? "font-16 w66" : "font-16 w80"}>{is_current ? "我" : "TA"}参与的</a></li>
           </div>
           <style>
             {
@@ -316,7 +315,7 @@ class Projects extends Component{
             {/* 289 */}
             {
               page == 1 && is_current ?
-                <Create href={`${this.props.Headertop && this.props.Headertop.old_url}/projects/new`} name={"新建开发项目"} index="4" Createtype={"projects"}
+                <Create href={`/projects/deposit/new`} name={"新建开发项目"} index="4" Createtype={"projects"}
                         {...this.props} {...this.state}
                 ></Create>:""
             }
@@ -352,24 +351,41 @@ class Projects extends Component{
                       </p>
                       <span><img alt="用户" className="radius mt15" height="60" src={getImageUrl(`images/${item.owner.avatar_url}`)} width="60"/></span>
                       <p className="font-14 mt10 task-hide"><span>{item.owner.real_name}</span></p>
-                      <p className="font-16 mb15 mt10 task-hide"><span className="color-grey-9">{item.owner.school_name}</span></p>
+                      <p className="font-16 mb15 mt10 task-hide">
+                        {
+                          item.category && item.category.name && <span className="projectTag categoryTag">{item.category.name}</span>
+                        }
+                        {
+                          item.language && item.language.name && <span className="projectTag languageTag">{item.language.name}</span>
+                        }
+                        {/*<span className="color-grey-9">{item.category.school_name}</span>*/}
+                      </p>
                     </div>
                     <div className="edu-txt-center course-bottom">
                       <div className="inline color-grey-6">
                         {
                           item.members_count > 0 &&
-                          <span className="mr10 ml10 fl squareIconSpan">
-                          <i className="iconfont icon-chengyuan fl mr3" data-tip-down="成员"></i>{item.members_count}</span>
+                          <Tooltip placement="bottom" title={"成员数"}>
+                            <span className="mr10 ml10 fl squareIconSpan">
+                            <i className="iconfont icon-chengyuan fl mr3"></i>{item.members_count}</span>
+                          </Tooltip>
+
                         }
                         {
                           item.issues_count > 0 &&
-                          <span className="mr10 ml10 fl squareIconSpan">
-                            <i className="iconfont icon-issue fl mr3" data-tip-down="issues数"></i>{item.issues_count}</span>
+                          <Tooltip placement="bottom" title={"任务数"}>
+                            <span className="mr10 ml10 fl squareIconSpan">
+                            <i className="iconfont icon-issue fl mr3"></i>{item.issues_count}</span>
+                          </Tooltip>
+
                         }
                         {
                           item.changesets_count > 0 &&
-                          <span className="mr10 ml10 fl squareIconSpan">
-                          <i className="iconfont icon-banbenku fl mr3" data-tip-down="版本库"></i>{item.changesets_count}</span>
+                          <Tooltip placement="bottom" title={"版本库"}>
+                            <span className="mr10 ml10 fl squareIconSpan">
+                          <i className="iconfont icon-banbenku fl mr3"></i>{item.changesets_count}</span>
+                          </Tooltip>
+
                         }
                       </div>
                     </div>
diff --git a/src/modules/user/usersInfo/usersInfo.css b/src/modules/user/usersInfo/usersInfo.css
index fc45a4480..97df7fb37 100644
--- a/src/modules/user/usersInfo/usersInfo.css
+++ b/src/modules/user/usersInfo/usersInfo.css
@@ -457,3 +457,14 @@
 .w80 {
     width: 80px !important;
 }
+.projectTag{
+    padding: 3px 10px;
+    border-radius: 15px;
+    color: #333;
+    height: 24px;
+    line-height: 24px;
+    font-size: 12px;
+}
+.categoryTag{background: #FFF3DC;}
+.languageTag{margin-left: 10px;background: #EBF4FE}
+.text-grey-e{color: #eee;}