数据统计描述问题

个人主页页面描述问题
Merge pull request '前端页面优化' (#282 ) from hc1913847458/forgeplus-react:testdev into develop
2021-11-29 10:30:25 +08:00 · 2021-11-29 10:29:58 +08:00 · 2021-11-25 09:43:19 +08:00 · 2021-11-24 18:31:46 +08:00 · 2021-11-23 18:00:05 +08:00 · 2021-11-23 15:04:34 +08:00
335 changed files with 10085 additions and 7293 deletions
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@ -1,918 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AutoImportSettings">
-    <option name="autoReloadType" value="SELECTIVE" />
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="9830c5da-176a-4c72-a301-9f6ce98c82fe" name="Default Changelist" comment="色值修改">
-      <change beforePath="$PROJECT_DIR$/src/forge/Branch/branch.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Branch/branch.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/forge/Component/Component.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Component/Component.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/forge/Main/Index.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/Index.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/forge/Main/list.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/list.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/forge/Main/sub/sub.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/sub/sub.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/forge/Wiki/Index.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Wiki/Index.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/forge/Wiki/components/Login/index.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Wiki/components/Login/index.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/forge/Wiki/components/ModalFun/index.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Wiki/components/ModalFun/index.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/forge/css/index.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/css/index.css" afterDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="DatabaseView">
-    <option name="SHOW_INTERMEDIATE" value="true" />
-    <option name="GROUP_DATA_SOURCES" value="true" />
-    <option name="GROUP_SCHEMA" value="true" />
-    <option name="GROUP_CONTENTS" value="false" />
-    <option name="SORT_POSITIONED" value="false" />
-    <option name="SHOW_EMPTY_GROUPS" value="false" />
-    <option name="AUTO_SCROLL_FROM_SOURCE" value="false" />
-    <option name="HIDDEN_KINDS">
-      <set />
-    </option>
-    <expand />
-    <select />
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <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="12376">
-              <caret line="760" column="37" selection-start-line="760" selection-start-column="37" selection-end-line="760" selection-end-column="37" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/AppConfig.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1989">
-              <caret line="125" column="13" selection-start-line="125" selection-start-column="13" selection-end-line="125" selection-end-column="13" />
-              <folding>
-                <element signature="e#0#26#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeSubmit.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1564">
-              <caret line="98" column="20" selection-start-line="98" selection-start-column="20" selection-end-line="98" selection-end-column="20" />
-              <folding>
-                <element signature="e#0#40#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Merge/NewMerge.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="4097">
-              <caret line="248" column="18" selection-start-line="248" selection-start-column="18" selection-end-line="248" selection-end-column="18" />
-              <folding>
-                <element signature="e#0#40#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Order/New.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2431">
-              <caret line="155" column="14" selection-start-line="155" selection-start-column="14" selection-end-line="157" selection-end-column="21" />
-              <folding>
-                <element signature="e#0#42#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/.gitignore">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="765">
-              <caret line="45" column="8" selection-start-line="45" selection-start-column="8" selection-end-line="45" selection-end-column="8" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/forge/Order/Detail.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="306">
-              <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
-              <folding>
-                <element signature="e#0#40#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Merge/MessageCount.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="14127">
-              <caret line="820" lean-forward="true" selection-start-line="820" selection-end-line="820" />
-              <folding>
-                <element signature="e#0#40#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">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="4726">
-              <caret line="286" column="34" selection-start-line="286" selection-start-column="34" selection-end-line="286" selection-end-column="34" />
-              <folding>
-                <element signature="e#0#40#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>high</find>
-      <find>markdown</find>
-      <find>markdown-body</find>
-      <find>readme</find>
-      <find>SSH</find>
-      <find>clone</find>
-      <find>edu_pu</find>
-      <find>edu_</find>
-      <find>.str</find>
-      <find>ssh</find>
-      <find>/projects</find>
-      <find>全部项目数</find>
-      <find>未选择标签</find>
-      <find>未选择里程碑</find>
-      <find>.issueItem</find>
-      <find>未选择</find>
-      <find>issueItem</find>
-      <find>detailContent</find>
-      <find>df mt20</find>
-      <find>.detailHeader-wrapper</find>
-      <find>headerMenu-wrapper</find>
-      <find>对话</find>
-      <find>issueNo</find>
-      <find>f-wrap-between</find>
-      <find>user_img</find>
-      <find>getCommitList</find>
-      <find>login</find>
-      <find>点击开启</find>
-      <find>build</find>
-      <find>HEAD</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">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/src/forge/Order/newMilepost.js" />
-        <option value="$PROJECT_DIR$/src/forge/Order/Milepost.js" />
-        <option value="$PROJECT_DIR$/src/forge/Settings/Index.js" />
-        <option value="$PROJECT_DIR$/src/forge/Order/Tags.js" />
-        <option value="$PROJECT_DIR$/src/forge/Settings/new_tags.js" />
-        <option value="$PROJECT_DIR$/src/forge/Merge/MergeDetail.js" />
-        <option value="$PROJECT_DIR$/src/forge/Merge/merge.js" />
-        <option value="$PROJECT_DIR$/src/forge/Main/Index.js" />
-        <option value="$PROJECT_DIR$/src/forge/Main/CoderRootFileDetail.js" />
-        <option value="$PROJECT_DIR$/src/forge/Merge/merge.css" />
-        <option value="$PROJECT_DIR$/src/forge/New/Index.js" />
-        <option value="$PROJECT_DIR$/src/modules/tpm/NewFooter.js" />
-        <option value="$PROJECT_DIR$/src/forge/Version/version.css" />
-        <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/usersInfo.css" />
-        <option value="$PROJECT_DIR$/src/modules/tpm/NewHeader.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" />
-        <option value="$PROJECT_DIR$/src/modules/user/usersInfo/Projects.js" />
-        <option value="$PROJECT_DIR$/src/forge/Newfile/UserSubmitComponent.js" />
-        <option value="$PROJECT_DIR$/src/AppConfig.js" />
-        <option value="$PROJECT_DIR$/src/forge/quillForEditor/index.js" />
-        <option value="$PROJECT_DIR$/src/forge/Main/IndexItem.js" />
-        <option value="$PROJECT_DIR$/src/forge/Main/Detail.js" />
-        <option value="$PROJECT_DIR$/src/forge/Main/CoderRootCommit.js" />
-        <option value="$PROJECT_DIR$/src/forge/Activity/ActivityItem.js" />
-        <option value="$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js" />
-        <option value="$PROJECT_DIR$/src/forge/Branch/CloneAddress.js" />
-        <option value="$PROJECT_DIR$/src/forge/Version/version.js" />
-        <option value="$PROJECT_DIR$/public/css/css_min_all.css" />
-        <option value="$PROJECT_DIR$/public/index.html" />
-        <option value="$PROJECT_DIR$/src/modules/user/usersInfo/InfosBanner.js" />
-        <option value="$PROJECT_DIR$/src/forge/Order/CopyDetail.js" />
-        <option value="$PROJECT_DIR$/src/forge/Merge/UpdateMerge.js" />
-        <option value="$PROJECT_DIR$/src/forge/Order/order.js" />
-        <option value="$PROJECT_DIR$/src/forge/Order/OrderItem.js" />
-        <option value="$PROJECT_DIR$/src/forge/Main/list.css" />
-        <option value="$PROJECT_DIR$/src/forge/Order/order.css" />
-        <option value="$PROJECT_DIR$/src/forge/Merge/MergeItem.js" />
-        <option value="$PROJECT_DIR$/src/forge/Order/New.js" />
-        <option value="$PROJECT_DIR$/src/forge/Order/UpdateDetail.js" />
-        <option value="$PROJECT_DIR$/src/forge/Merge/MergeSubmit.js" />
-        <option value="$PROJECT_DIR$/src/forge/Merge/NewMerge.js" />
-        <option value="$PROJECT_DIR$/src/forge/Merge/MessageCount.js" />
-        <option value="$PROJECT_DIR$/src/forge/Order/Detail.js" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectFrameBounds" fullScreen="true">
-    <option name="width" value="1440" />
-    <option name="height" value="900" />
-  </component>
-  <component name="ProjectId" id="1xHteQnKsYu4IEUm8tEsYIEEC5E" />
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
-  <component name="ProjectView">
-    <navigator proportions="" version="1">
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="forgeplus-react" type="b2602c69:ProjectViewProjectNode" />
-              <item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="forgeplus-react" type="b2602c69:ProjectViewProjectNode" />
-              <item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
-              <item name="build" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="Scope" />
-    </panes>
-  </component>
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent">
-    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
-    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/forge/Main" />
-    <property name="node.js.detected.package.eslint" value="true" />
-    <property name="node.js.path.for.package.eslint" value="project" />
-    <property name="node.js.path.for.package.tslint" value="project" />
-    <property name="node.js.selected.package.eslint" value="E:\file\forgeplus-react\node_modules\eslint" />
-    <property name="node.js.selected.package.tslint" value="(autodetect)" />
-    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
-    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
-    <property name="nodejs_package_manager_path" value="npm" />
-    <property name="ts.external.directory.path" value="$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external" />
-    <property name="vue.rearranger.settings.migration" value="true" />
-  </component>
-  <component name="RecentsManager">
-    <key name="CopyFile.RECENT_KEYS">
-      <recent name="E:\file\forgeplus-react\src\forge\Main" />
-    </key>
-    <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" />
-    </key>
-  </component>
-  <component name="RubyModuleManagerSettings">
-    <option name="blackListedRootsPaths">
-      <list>
-        <option value="$PROJECT_DIR$" />
-      </list>
-    </option>
-  </component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="SpringUtil" SPRING_PRE_LOADER_OPTION="true" />
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="9830c5da-176a-4c72-a301-9f6ce98c82fe" name="Default Changelist" comment="" />
-      <created>1584692398144</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1584692398144</updated>
-      <workItem from="1584692401543" duration="6228000" />
-      <workItem from="1585015135223" duration="21118000" />
-      <workItem from="1585194891947" duration="1630000" />
-      <workItem from="1585210651078" duration="1600000" />
-      <workItem from="1585217705353" duration="104000" />
-      <workItem from="1585217834609" duration="4000" />
-      <workItem from="1585217980103" duration="3406000" />
-      <workItem from="1585288258489" duration="17495000" />
-      <workItem from="1585732642767" duration="11458000" />
-      <workItem from="1585817691582" duration="2125000" />
-      <workItem from="1585900267463" duration="136000" />
-      <workItem from="1585902299727" duration="2113000" />
-      <workItem from="1586153685130" duration="10062000" />
-      <workItem from="1586245827209" duration="1692000" />
-      <workItem from="1586330226261" duration="658000" />
-      <workItem from="1586400014081" duration="18358000" />
-      <workItem from="1586517058808" duration="1607000" />
-      <workItem from="1586741565210" duration="25216000" />
-      <workItem from="1586946208505" duration="2914000" />
-      <workItem from="1587004932342" duration="7698000" />
-      <workItem from="1587020811560" duration="543000" />
-      <workItem from="1587021467416" duration="8000" />
-      <workItem from="1587022017639" duration="2902000" />
-      <workItem from="1587047814589" duration="8239000" />
-      <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="4499000" />
-      <workItem from="1587534020999" duration="19518000" />
-      <workItem from="1587863258736" duration="1097000" />
-      <workItem from="1587864581358" duration="777000" />
-      <workItem from="1587870344748" duration="138000" />
-      <workItem from="1587882941476" duration="4365000" />
-      <workItem from="1587891008299" duration="390000" />
-      <workItem from="1630023942152" duration="459000" />
-      <workItem from="1630024424307" duration="17223000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="206113000" />
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="0" y="0" width="1440" height="900" extended-state="0" />
-    <layout>
-      <window_info content_ui="combo" id="Project" order="0" weight="0.20243205" />
-      <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" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <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" sideWeight="0.49928468" weight="0.5638554" />
-      <window_info active="true" anchor="bottom" id="Terminal" order="10" sideWeight="0.49928468" visible="true" weight="0.44457832" />
-      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.5007153" side_tool="true" weight="0.713253" />
-      <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" />
-      <window_info anchor="right" id="Database" order="3" />
-    </layout>
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="3" />
-  </component>
-  <component name="Vcs.Log.History.Properties">
-    <option name="COLUMN_ORDER">
-      <list>
-        <option value="0" />
-        <option value="2" />
-        <option value="3" />
-        <option value="1" />
-      </list>
-    </option>
-  </component>
-  <component name="Vcs.Log.Tabs.Properties">
-    <option name="TAB_STATES">
-      <map>
-        <entry key="MAIN">
-          <value>
-            <State />
-          </value>
-        </entry>
-      </map>
-    </option>
-    <option name="RECENT_FILTERS">
-      <map>
-        <entry key="Branch">
-          <value>
-            <list />
-          </value>
-        </entry>
-        <entry key="User">
-          <value>
-            <list />
-          </value>
-        </entry>
-      </map>
-    </option>
-    <option name="oldMeFiltersMigrated" value="true" />
-  </component>
-  <component name="XDebuggerManager">
-    <breakpoint-manager>
-      <breakpoints>
-        <line-breakpoint enabled="true" type="javascript">
-          <url>file://$PROJECT_DIR$/src/forge/Main/CoderDepot.jsx</url>
-          <line>409</line>
-          <properties lambdaOrdinal="-1" />
-          <option name="timeStamp" value="1" />
-        </line-breakpoint>
-      </breakpoints>
-    </breakpoint-manager>
-  </component>
-  <component name="editorHistoryManager">
-    <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/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/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/EducoderInteresse.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1190">
-          <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="12104">
-          <caret line="727" column="131" selection-start-line="727" selection-start-column="30" selection-end-line="727" selection-end-column="131" />
-        </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="2584">
-          <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/EducoderReg.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="289">
-          <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="161">
-          <caret line="28" column="49" selection-start-line="28" selection-start-column="49" selection-end-line="28" selection-end-column="49" />
-          <folding>
-            <element signature="e#0#39#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/build/css/edu-all.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="221">
-          <caret line="12" column="10" selection-start-line="12" selection-start-column="10" selection-end-line="12" selection-end-column="10" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/modules/courses/busyWork/ConnectProject.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="335">
-          <caret line="61" column="24" selection-start-line="61" selection-start-column="24" selection-end-line="61" selection-end-column="24" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/node_modules/@types/react/index.d.ts">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="204">
-          <caret line="446" column="8" selection-start-line="446" selection-start-column="8" selection-end-line="446" selection-end-column="8" />
-        </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="204">
-          <caret line="1181" column="72" lean-forward="true" selection-start-line="1181" selection-start-column="40" selection-end-line="1181" selection-end-column="72" />
-          <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" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Newfile/Index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="133">
-          <caret line="43" column="50" selection-start-line="43" selection-start-column="50" selection-end-line="43" selection-end-column="50" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Newfile/UserSubmitComponent.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="86">
-          <caret line="65" column="17" selection-start-line="65" selection-start-column="17" selection-end-line="65" selection-end-column="17" />
-          <folding>
-            <element signature="e#0#38#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/quillForEditor/index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="287">
-          <caret line="45" column="10" lean-forward="true" selection-start-line="45" selection-start-column="10" selection-end-line="45" selection-end-column="10" />
-          <folding>
-            <element signature="n#!!doc" expanded="true" />
-            <element signature="e#166#188#0" expanded="true" />
-            <element signature="e#373#392#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="680">
-          <caret line="40" column="16" selection-start-line="40" selection-start-column="16" selection-end-line="40" 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/forge/Main/IndexItem.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="175">
-          <caret line="25" column="12" selection-start-line="25" selection-start-column="12" selection-end-line="28" selection-end-column="19" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Activity/ActivityItem.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="217">
-          <caret line="42" column="18" lean-forward="true" selection-start-line="42" selection-start-column="18" selection-end-line="42" selection-end-column="18" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/js/index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="188">
-          <caret line="2068" column="17" selection-start-line="2068" selection-start-column="17" selection-end-line="2068" selection-end-column="17" />
-          <folding>
-            <element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Merge/UpdateMerge.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="282">
-          <caret line="204" column="12" selection-start-line="204" selection-start-column="12" selection-end-line="206" selection-end-column="19" />
-          <folding>
-            <element signature="e#0#40#0" expanded="true" />
-            <element signature="e#8046#8546#0" />
-            <element signature="e#8575#9036#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="-984">
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external/react.d.ts">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret line="927" column="16" lean-forward="true" selection-start-line="927" selection-start-column="16" selection-end-line="927" selection-end-column="16" />
-        </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="170">
-          <caret line="10" column="26" lean-forward="true" selection-start-line="10" selection-start-column="26" selection-end-line="10" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/App.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1050">
-          <caret line="12" column="16" lean-forward="true" selection-start-line="12" selection-start-column="16" selection-end-line="12" selection-end-column="16" />
-        </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="130">
-          <caret line="16" column="39" selection-start-line="16" selection-start-column="39" selection-end-line="16" selection-end-column="39" />
-          <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="505">
-          <caret line="110" column="75" selection-start-line="110" selection-start-column="75" selection-end-line="110" selection-end-column="75" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/common/TextUtil.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="204">
-          <caret line="12" column="39" selection-start-line="12" selection-start-column="39" selection-end-line="12" selection-end-column="39" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/public/css/edu-all.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="171">
-          <caret line="3481" column="26" selection-start-line="3481" selection-start-column="26" selection-end-line="3481" selection-end-column="26" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/public/index.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="72">
-          <caret line="38" column="38" selection-start-line="38" selection-start-column="38" selection-end-line="38" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/public/css/css_min_all.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="43928">
-          <caret line="1673" column="27300" selection-start-line="1673" selection-start-column="27300" selection-end-line="1673" selection-end-column="27300" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="153">
-          <caret line="9" column="50" lean-forward="true" selection-start-line="9" selection-start-column="50" selection-end-line="9" selection-end-column="50" />
-          <folding>
-            <element signature="n#CoderRootDirectory#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/InfosBanner.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="192">
-          <caret line="85" column="23" lean-forward="true" selection-start-line="85" selection-start-column="23" selection-end-line="85" selection-end-column="23" />
-          <folding>
-            <element signature="e#0#41#0" expanded="true" />
-          </folding>
-        </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="-1670">
-          <caret line="60" selection-start-line="60" selection-end-line="60" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Main/list.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="326">
-          <caret line="375" column="28" selection-start-line="375" selection-start-column="28" selection-end-line="375" selection-end-column="28" />
-        </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="187">
-          <caret line="59" column="93" selection-start-line="59" selection-start-column="26" selection-end-line="59" selection-end-column="93" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Order/order.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="3400">
-          <caret line="200" column="35" selection-start-line="200" selection-start-column="35" selection-end-line="200" selection-end-column="35" />
-        </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="216">
-          <caret line="51" column="38" selection-start-line="51" selection-start-column="38" selection-end-line="51" selection-end-column="38" />
-          <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="301">
-          <caret line="337" column="28" lean-forward="true" selection-start-line="337" selection-start-column="28" selection-end-line="337" selection-end-column="28" />
-          <folding>
-            <element signature="e#0#40#0" expanded="true" />
-            <element signature="e#6358#8304#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootCommit.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="229">
-          <caret line="86" column="18" lean-forward="true" selection-start-line="86" selection-start-column="18" selection-end-line="86" selection-end-column="18" />
-          <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="12376">
-          <caret line="760" column="37" selection-start-line="760" selection-start-column="37" selection-end-line="760" selection-end-column="37" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/AppConfig.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1989">
-          <caret line="125" column="13" selection-start-line="125" selection-start-column="13" selection-end-line="125" selection-end-column="13" />
-          <folding>
-            <element signature="e#0#26#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeSubmit.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1564">
-          <caret line="98" column="20" selection-start-line="98" selection-start-column="20" selection-end-line="98" selection-end-column="20" />
-          <folding>
-            <element signature="e#0#40#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Merge/NewMerge.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="4097">
-          <caret line="248" column="18" selection-start-line="248" selection-start-column="18" selection-end-line="248" selection-end-column="18" />
-          <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="2431">
-          <caret line="155" column="14" selection-start-line="155" selection-start-column="14" selection-end-line="157" selection-end-column="21" />
-          <folding>
-            <element signature="e#0#42#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/.gitignore">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="765">
-          <caret line="45" column="8" selection-start-line="45" selection-start-column="8" selection-end-line="45" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeDetail.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="4726">
-          <caret line="286" column="34" selection-start-line="286" selection-start-column="34" selection-end-line="286" selection-end-column="34" />
-          <folding>
-            <element signature="e#0#40#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Merge/MessageCount.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="14127">
-          <caret line="820" lean-forward="true" selection-start-line="820" selection-end-line="820" />
-          <folding>
-            <element signature="e#0#40#0" expanded="true" />
-          </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="306">
-          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
-          <folding>
-            <element signature="e#0#40#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-  </component>
-</project>
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -0,0 +1,2 @@
+{
+}
--- a/124
+++ b/124
@ -0,0 +1,124 @@
+木兰宽松许可证， 第2版
+
+2020年1月 http://license.coscl.org.cn/MulanPSL2
+
+您对“软件”的复制、使用、修改及分发受木兰宽松许可证，第2版（“本许可证”）的如下条款的约束：
+
+0.   定义
+
+“软件” 是指由“贡献”构成的许可在“本许可证”下的程序和相关文档的集合。
+
+“贡献” 是指由任一“贡献者”许可在“本许可证”下的受版权法保护的作品。
+
+“贡献者” 是指将受版权法保护的作品许可在“本许可证”下的自然人或“法人实体”。
+
+“法人实体” 是指提交贡献的机构及其“关联实体”。
+
+“关联实体” 是指，对“本许可证”下的行为方而言，控制、受控制或与其共同受控制的机构，此处的控制是指有受控方或共同受控方至少50%直接或间接的投票权、资金或其他有价证券。
+
+1.   授予版权许可
+
+每个“贡献者”根据“本许可证”授予您永久性的、全球性的、免费的、非独占的、不可撤销的版权许可，您可以复制、使用、修改、分发其“贡献”，不论修改与否。
+
+2.   授予专利许可
+
+每个“贡献者”根据“本许可证”授予您永久性的、全球性的、免费的、非独占的、不可撤销的（根据本条规定撤销除外）专利许可，供您制造、委托制造、使用、许诺销售、销售、进口其“贡献”或以其他方式转移其“贡献”。前述专利许可仅限于“贡献者”现在或将来拥有或控制的其“贡献”本身或其“贡献”与许可“贡献”时的“软件”结合而将必然会侵犯的专利权利要求，不包括对“贡献”的修改或包含“贡献”的其他结合。如果您或您的“关联实体”直接或间接地，就“软件”或其中的“贡献”对任何人发起专利侵权诉讼（包括反诉或交叉诉讼）或其他专利维权行动，指控其侵犯专利权，则“本许可证”授予您对“软件”的专利许可自您提起诉讼或发起维权行动之日终止。
+
+3.   无商标许可
+
+“本许可证”不提供对“贡献者”的商品名称、商标、服务标志或产品名称的商标许可，但您为满足第4条规定的声明义务而必须使用除外。
+
+4.   分发限制
+
+您可以在任何媒介中将“软件”以源程序形式或可执行形式重新分发，不论修改与否，但您必须向接收者提供“本许可证”的副本，并保留“软件”中的版权、商标、专利及免责声明。
+
+5.   免责声明与责任限制
+
+“软件”及其中的“贡献”在提供时不带任何明示或默示的担保。在任何情况下，“贡献者”或版权所有者不对任何人因使用“软件”或其中的“贡献”而引发的任何直接或间接损失承担责任，不论因何种原因导致或者基于何种法律理论,即使其曾被建议有此种损失的可能性。
+
+6.   语言
+
+“本许可证”以中英文双语表述，中英文版本具有同等法律效力。如果中英文版本存在任何冲突不一致，以中文版为准。
+
+条款结束
+
+如何将木兰宽松许可证，第2版，应用到您的软件
+
+如果您希望将木兰宽松许可证，第2版，应用到您的新软件，为了方便接收者查阅，建议您完成如下三步：
+
+1， 请您补充如下声明中的空白，包括软件名、软件的首次发表年份以及您作为版权人的名字；
+
+2， 请您在软件包的一级目录下创建以“LICENSE”为名的文件，将整个许可证文本放入该文件中；
+
+3， 请将如下声明文本放入每个源文件的头部注释中。
+
+Copyright (c) [Year] [name of copyright holder]
+[Software Name] is licensed under Mulan PSL v2.
+You can use this software according to the terms and conditions of the Mulan PSL v2.
+You may obtain a copy of Mulan PSL v2 at:
+         http://license.coscl.org.cn/MulanPSL2
+THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+See the Mulan PSL v2 for more details.
+Mulan Permissive Software License，Version 2
+Mulan Permissive Software License，Version 2 (Mulan PSL v2)
+
+January 2020 http://license.coscl.org.cn/MulanPSL2
+
+Your reproduction, use, modification and distribution of the Software shall be subject to Mulan PSL v2 (this License) with the following terms and conditions:
+
+0. Definition
+
+Software means the program and related documents which are licensed under this License and comprise all Contribution(s).
+
+Contribution means the copyrightable work licensed by a particular Contributor under this License.
+
+Contributor means the Individual or Legal Entity who licenses its copyrightable work under this License.
+
+Legal Entity means the entity making a Contribution and all its Affiliates.
+
+Affiliates means entities that control, are controlled by, or are under common control with the acting entity under this License, ‘control’ means direct or indirect ownership of at least fifty percent (50%) of the voting power, capital or other securities of controlled or commonly controlled entity.
+
+1. Grant of Copyright License
+
+Subject to the terms and conditions of this License, each Contributor hereby grants to you a perpetual, worldwide, royalty-free, non-exclusive, irrevocable copyright license to reproduce, use, modify, or distribute its Contribution, with modification or not.
+
+2. Grant of Patent License
+
+Subject to the terms and conditions of this License, each Contributor hereby grants to you a perpetual, worldwide, royalty-free, non-exclusive, irrevocable (except for revocation under this Section) patent license to make, have made, use, offer for sale, sell, import or otherwise transfer its Contribution, where such patent license is only limited to the patent claims owned or controlled by such Contributor now or in future which will be necessarily infringed by its Contribution alone, or by combination of the Contribution with the Software to which the Contribution was contributed. The patent license shall not apply to any modification of the Contribution, and any other combination which includes the Contribution. If you or your Affiliates directly or indirectly institute patent litigation (including a cross claim or counterclaim in a litigation) or other patent enforcement activities against any individual or entity by alleging that the Software or any Contribution in it infringes patents, then any patent license granted to you under this License for the Software shall terminate as of the date such litigation or activity is filed or taken.
+
+3. No Trademark License
+
+No trademark license is granted to use the trade names, trademarks, service marks, or product names of Contributor, except as required to fulfill notice requirements in section 4.
+
+4. Distribution Restriction
+
+You may distribute the Software in any medium with or without modification, whether in source or executable forms, provided that you provide recipients with a copy of this License and retain copyright, patent, trademark and disclaimer statements in the Software.
+
+5. Disclaimer of Warranty and Limitation of Liability
+
+THE SOFTWARE AND CONTRIBUTION IN IT ARE PROVIDED WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED. IN NO EVENT SHALL ANY CONTRIBUTOR OR COPYRIGHT HOLDER BE LIABLE TO YOU FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO ANY DIRECT, OR INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING FROM YOUR USE OR INABILITY TO USE THE SOFTWARE OR THE CONTRIBUTION IN IT, NO MATTER HOW IT’S CAUSED OR BASED ON WHICH LEGAL THEORY, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+6. Language
+
+THIS LICENSE IS WRITTEN IN BOTH CHINESE AND ENGLISH, AND THE CHINESE VERSION AND ENGLISH VERSION SHALL HAVE THE SAME LEGAL EFFECT. IN THE CASE OF DIVERGENCE BETWEEN THE CHINESE AND ENGLISH VERSIONS, THE CHINESE VERSION SHALL PREVAIL.
+
+END OF THE TERMS AND CONDITIONS
+
+How to Apply the Mulan Permissive Software License，Version 2 (Mulan PSL v2) to Your Software
+
+To apply the Mulan PSL v2 to your work, for easy identification by recipients, you are suggested to complete following three steps:
+
+Fill in the blanks in following statement, including insert your software name, the year of the first publication of your software, and your name identified as the copyright owner;
+Create a file named "LICENSE" which contains the whole context of this License in the first directory of your software package;
+Attach the statement to the appropriate annotated syntax at the beginning of each source file.
+Copyright (c) [Year] [name of copyright holder]
+[Software Name] is licensed under Mulan PSL v2.
+You can use this software according to the terms and conditions of the Mulan PSL v2.
+You may obtain a copy of Mulan PSL v2 at:
+         http://license.coscl.org.cn/MulanPSL2
+THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
+EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
+MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
+See the Mulan PSL v2 for more details.
--- a/config/webpack.config.prod.js
+++ b/config/webpack.config.prod.js
@ -19,7 +19,8 @@ const getClientEnvironment = require("./env");

 let publicPath = "/react/build/";
 const publicUrl = publicPath.slice(0, -1);
-const shouldUseSourceMap = process.env.GENERATE_SOURCEMAP !== "false";
+// const shouldUseSourceMap = process.env.GENERATE_SOURCEMAP !== "false";
+const shouldUseSourceMap = process.env.NODE_ENV !== "production";
 const env = getClientEnvironment(publicPath);

 // This is the production configuration.
@ -54,7 +55,8 @@ module.exports = {
  },
  bail: true,
  mode: "production",
-  devtool: false, //测试版
+  // devtool: false, //测试版
+  devtool: shouldUseSourceMap?'source-map':false,
  entry: [require.resolve("./polyfills"), paths.appIndexJs],
  output: {
    path: paths.appBuild,
--- a/package-lock.json
+++ b/package-lock.json
@ -3425,9 +3425,9 @@
      "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw=="
    },
    "clipboard": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.6.tgz",
-      "integrity": "sha512-g5zbiixBRk/wyKakSwCKd7vQXDjFnAMGHoEyBogG/bw9kTD9GvdAvaoRR1ALcEzt3pVKxZR0pViekPMIS0QyGg==",
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.8.tgz",
+      "integrity": "sha512-Y6WO0unAIQp5bLmk1zdThRhgJt/x3ks6f30s3oE3H1mgIEU33XyQjEf8gsf6DxC7NPX8Y1SsNWjUjL/ywLnnbQ==",
      "requires": {
        "good-listener": "^1.2.2",
        "select": "^1.1.2",
@ -3875,6 +3875,52 @@
        "warning": "^4.0.3"
      }
    },
+    "cross-env": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",
+      "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==",
+      "requires": {
+        "cross-spawn": "^7.0.1"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+          "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+          "requires": {
+            "path-key": "^3.1.0",
+            "shebang-command": "^2.0.0",
+            "which": "^2.0.1"
+          }
+        },
+        "path-key": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
+        },
+        "shebang-command": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+          "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+          "requires": {
+            "shebang-regex": "^3.0.0"
+          }
+        },
+        "shebang-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
+        },
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
+      }
+    },
    "cross-fetch": {
      "version": "3.1.4",
      "resolved": "https://registry.nlark.com/cross-fetch/download/cross-fetch-3.1.4.tgz",
@ -4885,7 +4931,7 @@
    },
    "dom-closest": {
      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/dom-closest/-/dom-closest-0.2.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/dom-closest/download/dom-closest-0.2.0.tgz",
      "integrity": "sha1-69n5HRvyLo1vR3h2u80+yQIWwM8=",
      "requires": {
        "dom-matches": ">=1.0.1"
@ -4929,7 +4975,7 @@
    },
    "dom-matches": {
      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/dom-matches/-/dom-matches-2.0.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/dom-matches/download/dom-matches-2.0.0.tgz",
      "integrity": "sha1-0nKLQWqHUzmA6wibhI0lPPI6dYw="
    },
    "dom-scroll-into-view": {
@ -5187,7 +5233,7 @@
    },
    "enquire.js": {
      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/enquire.js/-/enquire.js-2.1.6.tgz",
+      "resolved": "https://registry.npm.taobao.org/enquire.js/download/enquire.js-2.1.6.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fenquire.js%2Fdownload%2Fenquire.js-2.1.6.tgz",
      "integrity": "sha1-PoeAybi4NQhMP2DhZtvDwqPImBQ="
    },
    "entities": {
@ -5706,7 +5752,7 @@
    },
    "eventlistener": {
      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/eventlistener/-/eventlistener-0.0.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/eventlistener/download/eventlistener-0.0.1.tgz",
      "integrity": "sha1-7Suqu4UiJ68rz4iRUscsY8pTLrg="
    },
    "events": {
@ -8040,7 +8086,7 @@
    },
    "hammerjs": {
      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz",
+      "resolved": "https://registry.npm.taobao.org/hammerjs/download/hammerjs-2.0.8.tgz",
      "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE="
    },
    "handle-thing": {
@ -8881,7 +8927,7 @@
    },
    "immutable": {
      "version": "3.7.6",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.7.6.tgz",
+      "resolved": "https://registry.npm.taobao.org/immutable/download/immutable-3.7.6.tgz",
      "integrity": "sha1-E7TTyxK++hVIKib+Gy665kAHHks="
    },
    "import-fresh": {
@ -10486,7 +10532,7 @@
    },
    "lodash.throttle": {
      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/lodash.throttle/download/lodash.throttle-4.1.1.tgz",
      "integrity": "sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ="
    },
    "lodash.uniq": {
@ -16586,6 +16632,11 @@
        }
      }
    },
+    "save-dev": {
+      "version": "0.0.1-security",
+      "resolved": "https://registry.npmjs.org/save-dev/-/save-dev-0.0.1-security.tgz",
+      "integrity": "sha512-k6knZTDNK8PKKbIqnvxiOveJinuw2LcQjqDoaorZWP9M5AR2EPsnpDeSbeoZZ0pHr5ze1uoaKdK8NBGQrJ34Uw=="
+    },
    "sax": {
      "version": "1.2.4",
      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
--- a/package.json
+++ b/package.json
@ -22,10 +22,11 @@
    "case-sensitive-paths-webpack-plugin": "2.1.1",
    "chalk": "1.1.3",
    "classnames": "^2.2.5",
-    "clipboard": "^2.0.6",
+    "clipboard": "^2.0.8",
    "code-prettify": "^0.1.0",
    "codemirror": "^5.53.0",
    "connected-react-router": "4.4.1",
+    "cross-env": "^7.0.3",
    "css-loader": "^3.5.2",
    "dompurify": "^2.0.15",
    "dotenv": "4.0.0",
@ -103,6 +104,7 @@
    "redux-thunk": "2.3.0",
    "rsuite": "^4.3.4",
    "sass-loader": "7.3.1",
+    "save-dev": "0.0.1-security",
    "scroll-into-view": "^1.14.2",
    "showdown": "^1.9.1",
    "showdown-katex": "^0.8.0",
@ -122,8 +124,8 @@
  },
  "scripts": {
    "start": "node --max_old_space_size=15360 scripts/start.js",
-    "build": "NODE_ENV=production node --max_old_space_size=15360 scripts/build.js",
-    "test-build": "NODE_ENV=testBuild node --max_old_space_size=15360 scripts/build.js",
+    "build": "cross-env NODE_ENV=production node --max_old_space_size=15360 scripts/build.js",
+    "test-build": "cross-env NODE_ENV=testBuild node --max_old_space_size=15360 scripts/build.js",
    "pre-build": "NODE_ENV=preBuild node --max_old_space_size=15360 scripts/build.js",
    "gen_stats": "NODE_ENV=production webpack --profile --config=./config/webpack.config.prod.js --json > stats.json",
    "ana": "webpack-bundle-analyzer ./stats.json",
--- a/public/css/edu-purge.css
+++ b/public/css/edu-purge.css
@ -1,3 +1,4 @@
+@charset "utf-8";
 /* 头部 */
 .header {
  width: 100%;
@ -1271,7 +1272,7 @@ html body {
  font-size: 14px;
  line-height: 2.0;
  background: #fafafa;
-  font-family: "微软雅黑", "宋体";
+  font-family: "Microsoft YaHei", "SimSun";
  color: #05101a;
  height: 100%;
  position: relative;
@ -1307,6 +1308,7 @@ td,
 span {
  margin: 0;
  padding: 0;
+  margin-bottom: 0px!important;
 }

 table,
@ -1363,10 +1365,6 @@ a:visited {
  color: #05101a;
 }

-/*a:hover {*/
-/*  color: #2A61FF!important;*/
-/*}*/
-
 ol,
 ul,
 li {
@ -1522,7 +1520,15 @@ a.edu-txt-w80,
 .font-16 {
  font-size: 16px !important;
 }
-
+.weight400{
+  font-weight: 400;
+}
+.weight500{
+  font-weight: 500;
+}
+.weight{
+  font-weight: bold;
+}
 .font-17 {
  font-size: 17px !important;
 }
@ -1542,6 +1548,9 @@ a.edu-txt-w80,
 .font-25 {
  font-size: 25px !important;
 }
+.font-26 {
+  font-size: 26px !important;
+}

 .font-24 {
  font-size: 24px !important;
@ -1563,6 +1572,9 @@ a.edu-txt-w80,
  font-size: 36px !important;
 }

+.font-40 {
+  font-size: 40px !important;
+}
 .font-50 {
  font-size: 50px !important;
 }
@ -1609,7 +1621,7 @@ a.decoration {
 }

 .mt6 {
-  margin-top: 3px;
+  margin-top: 6px;
 }

 .mt7 {
@ -1748,6 +1760,14 @@ a.decoration {
  margin-bottom: 10px;
 }

+.mb12 {
+  margin-bottom: 12px;
+}
+
+.mb13 {
+  margin-bottom: 13px;
+}
+
 .mb14 {
  margin-bottom: 14px;
 }
@ -2436,7 +2456,11 @@ a.hoverLine:hover{


 .color-grey-9 {
-  color: #333333 !important;
+  color: #999 !important;
+}
+
+a:hover{
+  color: #466AFF !important;
 }

 .color-grey-98 {
@ -2471,18 +2495,17 @@ a.hoverLine:hover{
 a.color-grey-name:hover,
 a.color-dark:hover,
 a.color-grey-6:hover,
-a.color-grey-3:hover,a.color-ooo span:hover{
-  color: #466AFF !important;
+a.color-grey-3:hover,a.color-ooo:hover {
+  color: #2A61FF !important;
 }

 /*蓝色*/
-.color-blue, .color-blue-file{
-  color: #4CACFF !important;
-}
-
 .color-blue {
  color: #2A61FF !important;
 }
+.color-blue-file {
+  color: #4598FA!important;
+}
 /* 绿色 */
 /*主*/
 .color-blue_4C {
@ -3948,9 +3971,12 @@ html>body #ajax-indicator {
  display: block;
  height: 100%;
  width: 100%;
-  color: #333;
+  color: #fff;
  font-size: 16px;
 }
+.head-right i{
+  color: #fff!important;
+}

 .head-nav ul#header-nav li a:hover,.head-nav ul#header-nav li.active a {
  color: #5091FF;
--- a/public/css/iconfont.css
+++ b/public/css/iconfont.css
@ -1,8 +1,8 @@
@font-face {
  font-family: "iconfont"; /* Project id 2340181 */
-  src: url('iconfont.woff2?t=1629875571487') format('woff2'),
-       url('iconfont.woff?t=1629875571487') format('woff'),
-       url('iconfont.ttf?t=1629875571487') format('truetype');
+  src: url('iconfont.woff2?t=1634881729644') format('woff2'),
+       url('iconfont.woff?t=1634881729644') format('woff'),
+       url('iconfont.ttf?t=1634881729644') format('truetype');
 }

 .iconfont {
@ -13,6 +13,154 @@
  -moz-osx-font-smoothing: grayscale;
 }

+.icon-wenjian7:before {
+  content: "\e8e0";
+}
+
+.icon-xiangyoujiantou:before {
+  content: "\e8de";
+}
+
+.icon-xiangzuojiantou:before {
+  content: "\e8df";
+}
+
+.icon-a-liulanicon2x:before {
+  content: "\e8dd";
+}
+
+.icon-wenjianicon:before {
+  content: "\e8dc";
+}
+
+.icon-a-yuanquan2x:before {
+  content: "\e8db";
+}
+
+.icon-xiangmubiaoqian:before {
+  content: "\e8da";
+}
+
+.icon-icon:before {
+  content: "\e8ce";
+}
+
+.icon-tar:before {
+  content: "\e8cf";
+}
+
+.icon-a-fuzhi2:before {
+  content: "\e8d0";
+}
+
+.icon-fujian1:before {
+  content: "\e8d1";
+}
+
+.icon-a-bianji1:before {
+  content: "\e8d2";
+}
+
+.icon-banbenicon:before {
+  content: "\e8d3";
+}
+
+.icon-shanchuicon2:before {
+  content: "\e8d4";
+}
+
+.icon-a-lajitong_icon3x:before {
+  content: "\e8d5";
+}
+
+.icon-xialaanniu2:before {
+  content: "\e8d6";
+}
+
+.icon-xiazai-icon:before {
+  content: "\e8d7";
+}
+
+.icon-master_icon1:before {
+  content: "\e8d8";
+}
+
+.icon-shangchuanicon:before {
+  content: "\e8d9";
+}
+
+.icon-gerenziliao1:before {
+  content: "\e8c7";
+}
+
+.icon-lichengbeiicon:before {
+  content: "\e885";
+}
+
+.icon-cangkushezhiicon:before {
+  content: "\e889";
+}
+
+.icon-dongtaiicon:before {
+  content: "\e88a";
+}
+
+.icon-gongzuoliuicon:before {
+  content: "\e88b";
+}
+
+.icon-yixiuicon1:before {
+  content: "\e89b";
+}
+
+.icon-a-wikiicon1:before {
+  content: "\e8c6";
+}
+
+.icon-daimakuicon1:before {
+  content: "\e8c5";
+}
+
+.icon-wodetongzhi:before {
+  content: "\e8c8";
+}
+
+.icon-tongzhiguanli:before {
+  content: "\e8c9";
+}
+
+.icon-xuanzhong3:before {
+  content: "\e8ca";
+}
+
+.icon-xitongtongzhiicon:before {
+  content: "\e8cb";
+}
+
+.icon-xiaoxi2:before {
+  content: "\e8cc";
+}
+
+.icon-sshmiyue:before {
+  content: "\e8cd";
+}
+
+.icon-gerenziliao:before {
+  content: "\e8c4";
+}
+
+.icon-xinshouzhiyin:before {
+  content: "\e8e4";
+}
+
+.icon-xinjianxiangmu:before {
+  content: "\e8e6";
+}
+
+.icon-jiaruketang1:before {
+  content: "\e8e9";
+}
+
 .icon-xiangmugonggao:before {
  content: "\e8c2";
 }
@ -105,10 +253,6 @@
  content: "\e883";
 }

-.icon-cangkushezhiicon:before {
-  content: "\e885";
-}
-
 .icon-lianjieicon:before {
  content: "\e887";
 }
@ -117,18 +261,6 @@
  content: "\e888";
 }

-.icon-lichengbeiicon:before {
-  content: "\e889";
-}
-
-.icon-gongzuoliuicon:before {
-  content: "\e88a";
-}
-
-.icon-dongtaiicon:before {
-  content: "\e88b";
-}
-
 .icon-morendianzan_icon:before {
  content: "\e88e";
 }
@ -233,10 +365,6 @@
  content: "\e898";
 }

-.icon-weixuanzhongqingqiuicon:before {
-  content: "\e89b";
-}
-
 .icon-xiezuozheguanliicon:before {
  content: "\e8a1";
 }
--- a/public/css/iconfont.js
+++ b/public/css/iconfont.js
--- a/public/css/iconfont.json
+++ b/public/css/iconfont.json
@ -5,6 +5,265 @@
  "css_prefix_text": "icon-",
  "description": "",
  "glyphs": [
+    {
+      "icon_id": "24656750",
+      "name": "文件",
+      "font_class": "wenjian7",
+      "unicode": "e8e0",
+      "unicode_decimal": 59616
+    },
+    {
+      "icon_id": "630094",
+      "name": "向右箭头",
+      "font_class": "xiangyoujiantou",
+      "unicode": "e8de",
+      "unicode_decimal": 59614
+    },
+    {
+      "icon_id": "630095",
+      "name": "向左箭头",
+      "font_class": "xiangzuojiantou",
+      "unicode": "e8df",
+      "unicode_decimal": 59615
+    },
+    {
+      "icon_id": "24600282",
+      "name": "浏览icon@2x",
+      "font_class": "a-liulanicon2x",
+      "unicode": "e8dd",
+      "unicode_decimal": 59613
+    },
+    {
+      "icon_id": "24567893",
+      "name": "文件icon",
+      "font_class": "wenjianicon",
+      "unicode": "e8dc",
+      "unicode_decimal": 59612
+    },
+    {
+      "icon_id": "24527422",
+      "name": "圆圈@2x",
+      "font_class": "a-yuanquan2x",
+      "unicode": "e8db",
+      "unicode_decimal": 59611
+    },
+    {
+      "icon_id": "24378423",
+      "name": "项目标签",
+      "font_class": "xiangmubiaoqian",
+      "unicode": "e8da",
+      "unicode_decimal": 59610
+    },
+    {
+      "icon_id": "24368060",
+      "name": "icon",
+      "font_class": "icon",
+      "unicode": "e8ce",
+      "unicode_decimal": 59598
+    },
+    {
+      "icon_id": "24368061",
+      "name": "tar",
+      "font_class": "tar",
+      "unicode": "e8cf",
+      "unicode_decimal": 59599
+    },
+    {
+      "icon_id": "24289113",
+      "name": "复制 (2)",
+      "font_class": "a-fuzhi2",
+      "unicode": "e8d0",
+      "unicode_decimal": 59600
+    },
+    {
+      "icon_id": "24289114",
+      "name": "附件",
+      "font_class": "fujian1",
+      "unicode": "e8d1",
+      "unicode_decimal": 59601
+    },
+    {
+      "icon_id": "24289115",
+      "name": "编 辑",
+      "font_class": "a-bianji1",
+      "unicode": "e8d2",
+      "unicode_decimal": 59602
+    },
+    {
+      "icon_id": "24289116",
+      "name": "版本icon",
+      "font_class": "banbenicon",
+      "unicode": "e8d3",
+      "unicode_decimal": 59603
+    },
+    {
+      "icon_id": "24289117",
+      "name": "删除icon",
+      "font_class": "shanchuicon2",
+      "unicode": "e8d4",
+      "unicode_decimal": 59604
+    },
+    {
+      "icon_id": "24289118",
+      "name": "垃圾桶_icon@3x",
+      "font_class": "a-lajitong_icon3x",
+      "unicode": "e8d5",
+      "unicode_decimal": 59605
+    },
+    {
+      "icon_id": "24289119",
+      "name": "下拉按钮",
+      "font_class": "xialaanniu2",
+      "unicode": "e8d6",
+      "unicode_decimal": 59606
+    },
+    {
+      "icon_id": "24289120",
+      "name": "下载-icon",
+      "font_class": "xiazai-icon",
+      "unicode": "e8d7",
+      "unicode_decimal": 59607
+    },
+    {
+      "icon_id": "24289121",
+      "name": "master_icon",
+      "font_class": "master_icon1",
+      "unicode": "e8d8",
+      "unicode_decimal": 59608
+    },
+    {
+      "icon_id": "24289122",
+      "name": "上传icon",
+      "font_class": "shangchuanicon",
+      "unicode": "e8d9",
+      "unicode_decimal": 59609
+    },
+    {
+      "icon_id": "24059956",
+      "name": "个人资料",
+      "font_class": "gerenziliao1",
+      "unicode": "e8c7",
+      "unicode_decimal": 59591
+    },
+    {
+      "icon_id": "24059409",
+      "name": "里程碑icon",
+      "font_class": "lichengbeiicon",
+      "unicode": "e885",
+      "unicode_decimal": 59525
+    },
+    {
+      "icon_id": "24059410",
+      "name": "仓库设置icon",
+      "font_class": "cangkushezhiicon",
+      "unicode": "e889",
+      "unicode_decimal": 59529
+    },
+    {
+      "icon_id": "24059411",
+      "name": "动态icon",
+      "font_class": "dongtaiicon",
+      "unicode": "e88a",
+      "unicode_decimal": 59530
+    },
+    {
+      "icon_id": "24059412",
+      "name": "工作流icon",
+      "font_class": "gongzuoliuicon",
+      "unicode": "e88b",
+      "unicode_decimal": 59531
+    },
+    {
+      "icon_id": "24059413",
+      "name": "易修icon",
+      "font_class": "yixiuicon1",
+      "unicode": "e89b",
+      "unicode_decimal": 59547
+    },
+    {
+      "icon_id": "24059414",
+      "name": "wiki icon",
+      "font_class": "a-wikiicon1",
+      "unicode": "e8c6",
+      "unicode_decimal": 59590
+    },
+    {
+      "icon_id": "24047186",
+      "name": "代码库icon",
+      "font_class": "daimakuicon1",
+      "unicode": "e8c5",
+      "unicode_decimal": 59589
+    },
+    {
+      "icon_id": "24047189",
+      "name": "我的通知",
+      "font_class": "wodetongzhi",
+      "unicode": "e8c8",
+      "unicode_decimal": 59592
+    },
+    {
+      "icon_id": "24047190",
+      "name": "通知管理",
+      "font_class": "tongzhiguanli",
+      "unicode": "e8c9",
+      "unicode_decimal": 59593
+    },
+    {
+      "icon_id": "24047191",
+      "name": "选中",
+      "font_class": "xuanzhong3",
+      "unicode": "e8ca",
+      "unicode_decimal": 59594
+    },
+    {
+      "icon_id": "24047192",
+      "name": "系统通知icon",
+      "font_class": "xitongtongzhiicon",
+      "unicode": "e8cb",
+      "unicode_decimal": 59595
+    },
+    {
+      "icon_id": "24047193",
+      "name": "消息",
+      "font_class": "xiaoxi2",
+      "unicode": "e8cc",
+      "unicode_decimal": 59596
+    },
+    {
+      "icon_id": "24047194",
+      "name": "ssh密钥",
+      "font_class": "sshmiyue",
+      "unicode": "e8cd",
+      "unicode_decimal": 59597
+    },
+    {
+      "icon_id": "24014152",
+      "name": "个人资料",
+      "font_class": "gerenziliao",
+      "unicode": "e8c4",
+      "unicode_decimal": 59588
+    },
+    {
+      "icon_id": "23655968",
+      "name": "新手指引",
+      "font_class": "xinshouzhiyin",
+      "unicode": "e8e4",
+      "unicode_decimal": 59620
+    },
+    {
+      "icon_id": "23655969",
+      "name": "新建项目",
+      "font_class": "xinjianxiangmu",
+      "unicode": "e8e6",
+      "unicode_decimal": 59622
+    },
+    {
+      "icon_id": "23658111",
+      "name": "加入课堂",
+      "font_class": "jiaruketang1",
+      "unicode": "e8e9",
+      "unicode_decimal": 59625
+    },
    {
      "icon_id": "23791639",
      "name": "项目公告",
@ -166,13 +425,6 @@
      "unicode": "e883",
      "unicode_decimal": 59523
    },
-    {
-      "icon_id": "23472256",
-      "name": "仓库设置icon",
-      "font_class": "cangkushezhiicon",
-      "unicode": "e885",
-      "unicode_decimal": 59525
-    },
    {
      "icon_id": "23472258",
      "name": "链接icon",
@ -187,27 +439,6 @@
      "unicode": "e888",
      "unicode_decimal": 59528
    },
-    {
-      "icon_id": "23472260",
-      "name": "里程碑icon",
-      "font_class": "lichengbeiicon",
-      "unicode": "e889",
-      "unicode_decimal": 59529
-    },
-    {
-      "icon_id": "23472261",
-      "name": "工作流icon",
-      "font_class": "gongzuoliuicon",
-      "unicode": "e88a",
-      "unicode_decimal": 59530
-    },
-    {
-      "icon_id": "23472262",
-      "name": "动态icon",
-      "font_class": "dongtaiicon",
-      "unicode": "e88b",
-      "unicode_decimal": 59531
-    },
    {
      "icon_id": "23472263",
      "name": "默认点赞_icon",
@ -390,13 +621,6 @@
      "unicode": "e898",
      "unicode_decimal": 59544
    },
-    {
-      "icon_id": "23144155",
-      "name": "未选中请求icon",
-      "font_class": "weixuanzhongqingqiuicon",
-      "unicode": "e89b",
-      "unicode_decimal": 59547
-    },
    {
      "icon_id": "23144158",
      "name": "协作者管理icon",
--- a/public/css/iconfont.ttf
+++ b/public/css/iconfont.ttf
--- a/public/css/iconfont.woff
+++ b/public/css/iconfont.woff
--- a/public/css/iconfont.woff2
+++ b/public/css/iconfont.woff2
--- a/public/js/editormd/editormd.min.js
+++ b/public/js/editormd/editormd.min.js
@ -3319,9 +3319,9 @@
                    text = text.replace(emailReg, function ($1, $2, $3, $4) {
                        return $1.replace(/@/g, "_#_&#64;_#_");
                    });
-
+                    // " + editormd.urls.atLinkBase + "" + $2 + "
                    text = text.replace(atLinkReg, function ($1, $2) {
-                        return "<a href=\"" + editormd.urls.atLinkBase + "" + $2 + "\" title=\"&#64;" + $2 + "\" class=\"at-link\">" + $1 + "</a>";
+                        return "<span title=\"&#64;" + $2 + "\" class=\"at-link\"> " + $1 + " </span>";
                    }).replace(/_#_&#64;_#_/g, "@");
                }

--- a/src/App.js
+++ b/src/App.js
@ -3,7 +3,7 @@ import './App.css';
 import { ConfigProvider } from 'antd'
 import zhCN from 'antd/lib/locale-provider/zh_CN';
 import {
-	BrowserRouter as Router,
+	// BrowserRouter as Router,
 	Route,
 	Switch
 } from 'react-router-dom';
@ -19,7 +19,7 @@ import moment from 'moment'
 import { MuiThemeProvider, createMuiTheme } from 'material-ui/styles';
 import SiderBar from './forge/Component/SiderBar'

-import { SnackbarHOC } from 'educoder'
+import { SnackbarHOC } from 'educoder';
 import { initAxiosInterceptors } from './AppConfig'
 import { Provider } from 'react-redux';
 import configureStore from './redux/stores/configureStore';
@ -39,6 +39,11 @@ const Projects = Loadable({
 	loader: () => import('./forge/Index'),
 	loading: Loading,
 })
+// forge项目详情
+const ProjectDetail = Loadable({
+  loader: () => import("./forge/Main/DetailAdaptor"),
+  loading: Loading,
+});
 //forge安全设置
 const Security = Loadable({
 	loader: () => import('./forge/SecuritySetting/Index'),
@ -91,6 +96,15 @@ const ProjectIndex = Loadable({
 	loader: () => import("./forge/Index"),
 	loading: Loading,
 });
+
+// const CreateMerge = Loadable({
+//   loader: () => import('./forge/Merge/NewMerge'),
+//   loading: Loading,
+// })
+
+// 此处仅维护前端可能的一级路由，不用进行项目或者组织判断的字段。
+const keyWord = ["explore", "settings", "setting", "mulan", "wiki", "issues", "setting", "trending", "code", "projects", "pulls", "mine", "login", "register", "email", "export", "nopage", "404", "403", "500", "501", "search", "organize"];
+
 class App extends Component {
 	constructor(props) {
 		super(props);
@ -100,6 +114,51 @@ class App extends Component {
 			mydisplay: false,
 			occupation: 0,
 			mygetHelmetapi: null,
+			pathType: null,
+			pathName: null,
+		}
+	}
+
+	UNSAFE_componentWillMount() {
+		initAxiosInterceptors(this.props);
+		let pathname = window.location.pathname ? window.location.pathname.split('/')[1] : '';
+		pathname && this.getPathnameType(pathname);
+
+		// 添加路由监听，决定组织还是个人
+		this.unlisten = this.props.history.listen((location) => {
+			let newPathname = location.pathname.split('/')[1];
+			if (this.state.pathName !== newPathname) {
+				// this.setState({ pathType: '' });
+				newPathname && this.getPathnameType(newPathname);
+			}
+		});
+	}
+
+	shouldComponentUpdate(nextProps, nextState) {
+		// (!keyWord.includes(this.props.location.pathname.split('/')[1])) &&
+		if (nextProps.location.pathname.split('/')[1] !== this.props.location.pathname.split('/')[1] && nextState.pathType === this.state.pathType) {
+			return false;
+		} else {
+			return true;
+		}
+	}
+
+	getPathnameType = (pathname) => {
+		if (!keyWord.includes(pathname)) {
+			let url = `/owners/${pathname}.json`;
+			axios.get(url).then((response) => {
+				if (response && response.status === 200) {
+					this.setState({
+						pathType: response.data.type || '404',
+						pathName: pathname,
+					})
+				}
+			});
+		}else{
+			this.setState({
+				pathType: pathname,
+				pathName: pathname,
+			});
 		}
 	}

@ -119,13 +178,19 @@ class App extends Component {

 	componentDidMount() {
 		document.title = "loading...";
-		initAxiosInterceptors(this.props);
+
 		this.getAppdata();

 		window.addEventListener('error', (event) => {
 			const msg = `${event.type}: ${event.message}`;
 		});
+
 	}
+
+	componentWillUnmount() {
+		this.unlisten && this.unlisten(); // 执行解绑
+	}
+
 	//修改登录方法
 	Modifyloginvalue = () => {
 		this.setState({
@ -196,7 +261,7 @@ class App extends Component {
 	};

 	render() {
-		const { mygetHelmetapi } = this.state;
+		const { mygetHelmetapi, pathType} = this.state;
 		let personal = mygetHelmetapi && mygetHelmetapi.personal;
 		return (
 			<Provider store={store}>
@ -204,87 +269,138 @@ class App extends Component {
 					<MuiThemeProvider theme={theme}>
 						<LoginDialog {...this.props} {...this.state} Modifyloginvalue={() => this.Modifyloginvalue()}></LoginDialog>
 						<SiderBar />
-						<Router>
-							<Switch>
-								{/* wiki预览 */}
-								<Route path="/projects/:owner/:projectsId/wiki/preview/:projectName/:projectId" render={
+						{/* <Router> */}
+						<Switch>
+							{/* wiki预览 */}
+							<Route path="/:owner/:projectsId/wiki/preview/:projectName/:projectId" render={
+								(props) => {
+									return (<WikiPreview {...this.props} {...props} {...this.state} />)
+								}
+							} />
+
+							{/* 项目PR */}
+							<Route path="/:owner/:projectsId/compare"
+								render={
+									(props) => (<ProjectDetail {...this.props} {...props} {...this.state} />)
+								}
+							></Route>
+
+							{/*项目*/}
+							<Route
+								path={"/:owner/:projectId/devops/:opsId/detail"}
+								render={
 									(props) => {
-										return (<WikiPreview {...this.props} {...props} {...this.state} />)
+										return (<OpsDetail {...this.props} {...props} {...this.state} />)
 									}
-								} />
-
-								{/*项目*/}
-								<Route
-									path={"/projects/:owner/:projectId/devops/:opsId/detail"}
-									render={
-										(props) => {
-											return (<OpsDetail {...this.props} {...props} {...this.state} />)
-										}
-									}>
-								</Route>
-								<Route
-									path={"/settings"}
-									render={
-										(props) => {
-											return (<Security {...this.props} {...props} {...this.state} />)
-										}
-									}>
-								</Route>
-								{/*项目*/}
-								<Route
-									path={"/projects"}
-									render={
-										(props) => {
-											return (<Projects {...this.props} {...props} {...this.state} />)
-										}
-									}>
-								</Route>
-								<Route
-									path="/register"
-									render={
-										(props) => {
-											return (<EducoderLogin {...this.props} {...props} {...this.state} />)
-										}
+								}>
+							</Route>
+							<Route
+								path={"/settings"}
+								render={
+									(props) => {
+										return (<Security {...this.props} {...props} {...this.state} />)
 									}
-								/>
-								{/*403*/}
-								<Route path="/403" component={Shixunauthority} />
+								}>
+							</Route>

-								<Route path="/500" component={http500} />
-								<Route path={"/organize"}
-									render={
-										(props) => {
-											return (<OrganizeIndex {...props} {...this.props} {...this.state} />)
-										}
-									}>
-								</Route>
-								{/*404*/}
-								<Route path="/nopage" component={Shixunnopage} />
-
-								{/* 查询 */}
-								<Route path="/search" component={Search} />
-
-
-								{/* 个人主页 */}
-								<Route path="/users/:username"
-									render={
-										(props) => {
-											return (<InfosIndex {...this.props} {...this.state} />)
-										}
-									}></Route>
-								<Route exact path="/"
-									render={
-										(props) => (
-											personal && personal.length > 0 ?
-												<InfosIndex {...this.props} {...props} />
-												:
-												<ProjectIndex {...this.props} {...props} />
-										)
+							<Route
+								path="/register"
+								render={
+									(props) => {
+										return (<EducoderLogin {...this.props} {...props} {...this.state} />)
 									}
-								/>
-								<Route component={Shixunnopage} />
-							</Switch>
-						</Router>
+								}
+							/>
+							{/*403*/}
+							<Route path="/403" component={Shixunauthority} />
+
+							<Route path="/500" component={http500} />
+
+							{/*404*/}
+							<Route path="/nopage" component={Shixunnopage} />
+
+							{/* 查询 */}
+							<Route path="/search" component={Search} />
+
+							<Route exact path="/explore/all"
+								render={
+									(props) => (
+											<ProjectIndex {...this.props} {...props} />
+									)
+								}
+							/>
+							<Route exact path="/explore"
+								render={
+									(props) => (
+											<ProjectIndex {...this.props} {...props} />
+									)
+								}
+							/>
+
+
+							{/* 组织 */}
+							<Route path={"/organize"}
+								render={
+									(props) => {
+										return (<OrganizeIndex {...props} {...this.props} {...this.state} />)
+									}
+								}>
+							</Route>
+							
+							{/*新建项目等*/}
+							<Route
+								path={"/projects"}
+								render={
+									(props) => {
+										return (<Projects {...this.props} {...props} {...this.state} />)
+									}
+								}>
+							</Route>
+
+							{/* 判断为用户/组织，并进入对应页面 */}
+							{
+								pathType === 'User' ?
+									<Route exact path="/:username"
+										render={
+											(props) => {
+												return (<InfosIndex {...this.props} {...this.state} />)
+											}
+										}
+									/> : pathType === 'Organization' ? <Route path={"/:OIdentifier"}
+										render={
+											(props) => {
+												return (<OrganizeIndex {...props} {...this.props} {...this.state} />)
+											}
+										}>
+									</Route> : pathType === '404' ? <Route component={Shixunnopage} />:
+										<Route exact path="/"
+											render={
+												(props) => (
+													personal && personal.length > 0 ?
+														<InfosIndex {...this.props} {...props} />
+														:
+														<ProjectIndex {...this.props} {...props} />
+												)
+											}
+										/>
+								// <Route path="/" component={Loading} />
+								// <Route path="/" component={Shixunnopage} /> 
+							}
+
+
+
+							{/* 个人主页 */}
+							<Route path="/:username"
+								render={
+									(props) => {
+										return (<InfosIndex {...this.props} {...this.state} />)
+									}
+								}></Route>
+
+
+							<Route component={Shixunnopage} />
+						</Switch>
+						{/* </Router> */}
 					</MuiThemeProvider>
 				</ConfigProvider>
 			</Provider>
--- a/src/AppConfig.js
+++ b/src/AppConfig.js
@ -85,7 +85,10 @@ export function initAxiosInterceptors(props) {
    }

    if (response.data.status === 404) {
-      locationurl('/nopage');
+      let responseURL = response.request ? response.request.responseURL:'';
+      if (responseURL.indexOf('/api/users/') === -1 && responseURL.indexOf('/api/organizations/') === -1 ) {
+        locationurl('/nopage');
+      }
    }

    if (response.data.status === 500) {
--- a/src/college/College.js
+++ b/src/college/College.js
@ -195,7 +195,7 @@ class College extends Component {
 					align: 'center',
 					className: "edu-txt-center font-14 maxnamewidth105",
 					render: (text, record) => (
-						<a href={`/users/${record.login}`} title={record.name} target="_blank"  className="task-hide maxnamewidth105" style={{
+						<a href={`/${record.login}`} title={record.name} target="_blank"  className="task-hide maxnamewidth105" style={{
 							color:'#007bff',

 						}}>	{
--- a/src/common/DateUtil.js
+++ b/src/common/DateUtil.js
@ -107,7 +107,7 @@ export function timeAgo(backDate) {
  try {
    moment(backDate);
  } catch (e) {
-    return;
+    return '刚刚';
  }
  if(typeof backDate ==='number'){
    backDate=backDate*1000
@ -134,4 +134,5 @@ export function timeAgo(backDate) {
  if (seconds) {
    return seconds + "秒前";
  }
+  return "刚刚";
 }
--- a/src/common/TextUtil.js
+++ b/src/common/TextUtil.js
@ -69,7 +69,7 @@ export function appendFileSizeToUploadFile(item) {
 }
 export function appendFileSizeToUploadFileAll(fileList) {
    return fileList.map(item => {
-        if (item.name.indexOf(uploadNameSizeSeperator) == -1) {
+        if (item.name.indexOf(uploadNameSizeSeperator) === -1) {
            return Object.assign({}, item, { name: `${item.name}${uploadNameSizeSeperator}${bytesToSize(item.size)}` })
        }
        return item
--- a/src/context/TPIContextProvider.js
+++ b/src/context/TPIContextProvider.js
@ -435,11 +435,11 @@ class TPIContextProvider extends Component {
 		image_url: "avatars/User/1"
 		login: "innov"
 		name: "Coder"
-		user_url: "/users/innov"
+		user_url: "/innov"
 		 */
 		let user = resData.user;
 		user.username = resData.user.name;
-		user.user_url = `/users/${resData.user.login}`;
+		user.user_url = `/${resData.user.login}`;
 		// user.image_url = resData.image_url;
 		user.is_teacher = resData.is_teacher;
 		resData.user = user;
--- a/src/forge/Activity/Activity.js
+++ b/src/forge/Activity/Activity.js
@ -10,6 +10,10 @@ import ActivityItem from './ActivityItem';
 import axios from 'axios';
 const LIMIT = 15;
 const ARRAY = [
+  {
+    id:"",
+    name:'全部'
+  },
  {
    id:1,
    name:'1天'
@ -32,10 +36,15 @@ class Activity extends Component{
  constructor(props){
    super(props);
    this.state={
-      time:'30',
+      time:undefined,
      type:undefined,
      state:undefined,
      page:1,
+      pr_count:undefined,
+      new_pr_count:undefined,
+      close_issues_count:undefined,
+      open_issues_count:undefined,
+      pr_all_count:undefined,issues_count:undefined,

      data:undefined,
      project_trends:undefined,
@ -63,8 +72,15 @@ class Activity extends Component{
        this.setState({
          data:result.data,
          project_trends:result.data.project_trends,
-          isSpin:false
+          isSpin:false,
+          pr_count:result.data.pr_count,
+          new_pr_count:result.data.new_pr_count,
+          close_issues_count:result.data.close_issues_count,
+          open_issues_count:result.data.open_issues_count,
+          pr_all_count:result.data.pr_all_count,
+          issues_count:result.data.issues_count,
        })
+        window.scrollTo(0,0);
      }
    }).catch(error=>{
      console.log(error);
@ -74,19 +90,19 @@ class Activity extends Component{
  // 切换周期
  changeTime=(e)=>{
    this.setState({
-      time:e.key,
+      time:e.key ==="item_0"?undefined:e.key,
      isSpin:true
    })
    const { type,status,page } = this.state;
-    this.getInfo(e.key,type,status,page);
+    this.getInfo(e.key ==="item_0"?undefined:e.key,type,status,page);
  }
   //筛选
   changeTrends=(type,status)=>{
    this.setState({
-      type,status
+      type,status,page:1
    })
-    const {time,page}=this.state;
-    this.getInfo(time,type,status,page);
+    const {time}=this.state;
+    this.getInfo(time,type,status,1);
   }
  // 分页
  ChangePage=(page)=>{
@ -108,12 +124,14 @@ class Activity extends Component{
    </Menu>
  )
  render(){
-    const { time , data , page , project_trends , isSpin } = this.state;
+    const { time , data , page , project_trends , isSpin , pr_count , new_pr_count , close_issues_count , open_issues_count , pr_all_count ,issues_count } = this.state;
+    let name = time ? ARRAY.filter(item=>item.id === parseInt(time)) :[{name:"全部"}];

-    let name = time && ARRAY.filter(item=>item.id === parseInt(time)) ;
-    const second_per = (parseInt(data && data.close_issues_count)/parseInt(data && data.issues_count)*100)+'%';
-    const third_per = (parseInt(data && data.close_issues_count)/parseInt(data && data.issues_count)*100)+'%';
-    const fourth_per = (parseInt(data && data.open_issues_count)/parseInt(data && data.issues_count)*100)+'%';
+    const first_per = pr_all_count > 0 ? `${parseFloat(pr_count/pr_all_count).toFixed(2)*100}%` :"50%";
+    const second_per =pr_all_count > 0 ? `${parseFloat(new_pr_count/pr_all_count).toFixed(2)*100}%` :"50%";
+    const third_per =issues_count > 0 ?`${parseFloat(close_issues_count/issues_count).toFixed(2)*100}%` :"50%";
+    const fourth_per =issues_count > 0 ?`${parseFloat(open_issues_count/issues_count).toFixed(2)*100}%` :"50%";
+    
    return(
      <div className="main">
        
@ -122,7 +140,7 @@ class Activity extends Component{
          <div className="orderInfo">
            <div>
              <div className="percentLine prPercent">
-                <p className="percent_purple" style={{width:'100%'}}></p>
+                <p className="percent_purple" style={{width:first_per}}></p>
                <p className="percent_green resetStyle" style={{width:`${second_per}`}}></p>
              </div>
              <span>{data && data.pr_all_count}合并请求</span>
@ -132,25 +150,25 @@ class Activity extends Component{
                <p className="percent_red" style={{width:`${third_per}`}}></p>
                <p className="percent_green" style={{width:`${fourth_per}`}}></p>
              </div>
-              <span>{data && data.issues_count}任务</span>
+              <span>{data && data.issues_count}易修</span>
            </div>
          </div>
          <ul className="percentBox">
            <li>
              <span className="purple">{data && data.pr_count}</span>
-              <span className="change" onClick={()=>this.changeTrends("PullRequest","close")}>已处理的合并请求</span>
+              <span className="change" onClick={()=>this.changeTrends("PullRequest","delay")}>已处理的合并请求</span>
            </li>
            <li>
              <span className="green">{data && data.new_pr_count}</span>
-              <span className="change" onClick={()=>this.changeTrends("PullRequest","create")}>未处理的合并请求</span>
+              <span className="change" onClick={()=>this.changeTrends("PullRequest","not_delay")}>未处理的合并请求</span>
            </li>
            <li>
              <span className="red">{data && data.close_issues_count}</span>
-              <span className="change" onClick={()=>this.changeTrends("Issue","close")}>已关闭的任务</span>
+              <span className="change" onClick={()=>this.changeTrends("Issue","delay")}>已关闭的易修</span>
            </li>
            <li>
              <span className="green">{data && data.open_issues_count}</span>
-              <span className="change" onClick={()=>this.changeTrends("Issue","create")}>未处理的任务</span>
+              <span className="change" onClick={()=>this.changeTrends("Issue","not_delay")}>未处理的易修</span>
            </li>
          </ul>
        </div>
--- a/src/forge/Activity/ActivityItem.js
+++ b/src/forge/Activity/ActivityItem.js
@ -14,25 +14,25 @@ class ActivityItem extends Component {
          {/* 如果是版本发布 */}
          {item.trend_type === "VersionRelease" ?
          <p className="itemLine">
-            <Link to={`/projects/${owner}/${projectsId}/version`} className="color-blue font-16">{item.name}</Link>
+            <Link to={`/${owner}/${projectsId}/releases`} className="color-blue font-16">{item.name}</Link>
            <span className="activity_type">{item.trend_type}</span>
          </p >
          :
          // 如果是任务
          item.trend_type === "Issue" ?
            <p className="itemLine">
-              <Link to={`/projects/${owner}/${projectsId}/issues/${item.trend_id}/detail`} className="color-blue font-16">{item.name}</Link>
+              <Link to={`/${owner}/${projectsId}/issues/${item.trend_id}`} className="color-blue font-16">{item.name}</Link>
              <span className="activity_type">{item.trend_type}</span>
            </p >
            :
            // 如果是合并请求
            <p className="itemLine">
-              <Link to={`/projects/${owner}/${projectsId}/pulls/${item.trend_id}/Messagecount`} className="color-blue font-16">{item.name}</Link>
+              <Link to={`/${owner}/${projectsId}/pulls/${item.trend_id}`} className="color-blue font-16">{item.name}</Link>
              <span className="activity_type">{item.trend_type}</span>
            </p >
          }
          <p className="itemLine mt10">
-            <Link to={`/users/${item && item.user_login}`} className="show-user-link">
+            <Link to={`/${item && item.user_login}`} className="show-user-link">
              <img alt="" src={getImageUrl(`/${item.user_avatar}`)} className="createImage" />
              <span className="mr20">{item.user_name}</span>
            </Link>
--- a/src/forge/Branch/CloneAddress.js
+++ b/src/forge/Branch/CloneAddress.js
@ -1,16 +1,10 @@
 import React, { useState } from 'react';
-import { Dropdown, Menu, Tooltip } from 'antd';
+import { Menu } from 'antd';
 import "./branch.scss";
+import CopyTool from '../Component/CopyTool';

 function CloneAddress({http_url , ssh_url , zip_url , tar_url}) {
  const [ key , setKey ] = useState("HTTP");
-  // 点击按钮复制功能
-  function jsCopy(){
-    var e = document.getElementById("copy_rep_content");
-    e.select();
-    document.execCommand("Copy");
-  }
-
  return (
    <div className="downMenu">
      <div style={{borderBottom:"1px solid #eee"}}>
@ -20,9 +14,7 @@ function CloneAddress({http_url , ssh_url , zip_url , tar_url}) {
        </Menu>
        <div className="gitAddressClone">
          <input type="text" id="copy_rep_content" value={key==="HTTP" ? http_url:ssh_url} />
-          <Tooltip title="复制链接">
-            <span className="color-blue" onClick={jsCopy}><i className="iconfont icon-fuzhi"></i></span>
-          </Tooltip>
+          <CopyTool inputId="copy_rep_content" className="copytool"/>
        </div>
      </div>
      <Menu className="edu-txt-center">
--- a/src/forge/Branch/Select.jsx
+++ b/src/forge/Branch/Select.jsx
@ -1,34 +1,63 @@
-import React , { useState , useEffect } from 'react';
-import { Popover , Dropdown , Input , Spin } from 'antd';
+import React , { useState , useEffect , useRef } from 'react';
+import { Dropdown} from 'antd';
 import './branch.scss';
-import { getBranch , getTag } from '../GetData/getData';
 import SelectOverlay from './SelectOverlay';
-
+import { findDOMNode } from 'react-dom';

 export default (({ projectsId , branch , owner , changeBranch , branchList , tagflag = true })=>{
  const [ showValue , setShowValue ] = useState(branch);
+  const [ visible , setVisible ] = useState(false);
+
+  const refFa = useRef(null);
+  const refBox = useRef(null);
+
+  useEffect(() => {
+    document.addEventListener('click', clickMe , false);
+  }, [])
+
+  const clickMe = ({ target }) => {
+    // 查找父组件
+    const faComponent = findDOMNode(refFa.current);
+    const boxComponent = findDOMNode(refBox.current);
+
+    if (faComponent && boxComponent) {
+      const isChild = faComponent.contains(target);
+      const isBox = boxComponent.contains(target);
+      if(!isChild && !isBox){
+        setVisible(false);
+      }
+    }
+  }

  useEffect(()=>{
    setShowValue(branch);
  },[branch])

+  function ChangeB(params) {
+    setVisible(false);
+    changeBranch(params);
+  }
+
  const menu = (
-    <SelectOverlay 
-      changeBranch={changeBranch} 
-      tagflag={tagflag} 
-      projectsId={projectsId}
-      owner={owner}
-      branchList={branchList}
+    <div ref={refFa}>
+      <SelectOverlay 
+        visible={visible}
+        changeBranch={ChangeB} 
+        tagflag={tagflag} 
+        projectsId={projectsId}
+        owner={owner}
+        branchList={branchList}
      />
+    </div>
  );
  return(
-    <Dropdown placement='bottomLeft' overlay={menu} overlayClassName="branch-tagBox-list" trigger={['click']} >
-      <div className="branch-tagBox">
+    <Dropdown placement='bottomLeft' visible={visible} overlay={menu} overlayClassName="branch-tagBox-list" trigger={['click']} >
+      <div className="branch-tagBox" ref={refBox} onClick={()=>setVisible(visible ? false : true)}>
        {/* {nav === 0 ?"分支":"标签"} */}
        <span className="color-grey-9 mr3 ml8"><i className="iconfont icon-fenzhi2 font-18"></i></span>
-        <a className="ant-dropdown-link task-hide">
+        <span className="ant-dropdown-link task-hide" style={{fontWeight:"500",minWidth:"45px",maxWidth:"270px"}}>
          {showValue}
-        </a>
+        </span>
        <i className="showtag iconfont icon-sanjiaoxing-down font-15 color-grey-9 mr5 ml5 mt1" />
      </div>
    </Dropdown>
--- a/src/forge/Branch/SelectOverlay.jsx
+++ b/src/forge/Branch/SelectOverlay.jsx
@ -2,7 +2,7 @@ import React , { useState , useEffect } from 'react';
 import { Input , Spin , Menu } from 'antd';
 import { getBranch , getTag } from '../GetData/getData';

-function SelectOverlay({ changeBranch , tagflag , branchList , projectsId , owner }) {
+function SelectOverlay({ changeBranch , tagflag , projectsId , owner , visible }) {
  const [ inputValue , setInputValue] = useState(undefined);
  const [ nav , setNav ] = useState(0);
  const [ isSpin , setIsSpin ] = useState(true);
@ -12,12 +12,12 @@ function SelectOverlay({ changeBranch , tagflag , branchList , projectsId , owne
  const [ keys ,setKeys] = useState("branch");

  useEffect(()=>{
-    if(branchList){
-      setData(branchList);
-      setDatas(branchList);
-      setIsSpin(false);
+    if(visible){
+      setKeys("branch");
+      getBranchs(projectsId,owner);
+      setIsSpin(true);
    }
-  },[branchList])
+  },[visible])

  async function getBranchs(id,owner){
    let result = await getBranch(id,owner);
@ -45,8 +45,10 @@ function SelectOverlay({ changeBranch , tagflag , branchList , projectsId , owne
    setIsSpin(true);
    if(e.key === "branch"){
      getBranchs(projectsId,owner);
+      setNav(0);
    }else{
      getTags(projectsId,owner);
+      setNav(1);
    }
  }

@ -55,7 +57,7 @@ function SelectOverlay({ changeBranch , tagflag , branchList , projectsId , owne
      <div className="padding15" style={{paddingBottom:"0px"}}>
        <Input 
          prefix={<i className="iconfont icon-sousuo_icon1 font-14"></i>}
-          placeholder="请输入分支或标签名称搜索" 
+          placeholder={`请输入分支${tagflag ? "或标签" :""}名称搜索`}
          autocomplete="off" className="OptionsInput" 
          value={inputValue} 
          onChange={changeInputValue}
@ -68,12 +70,16 @@ function SelectOverlay({ changeBranch , tagflag , branchList , projectsId , owne
      <Spin spinning={isSpin}>
        <ul className="OptionsUl" id="ul-btn">
          {
-            datas && datas.length>0 ?
+            datas && datas.length>0 &&
            datas.map((item,key)=>{
              return(
                <li key={key} onClick={()=>chooseitem(item.name)}><a className="task-hide ulALink">{item.name}</a></li>
              )
-            }):
+            })
+           
+          }
+          {
+            datas && datas.length === 0 &&
            <p className="listTips">暂无{inputValue}{nav === 0 ?"分支":"标签"}~</p>
          }
        </ul>
--- a/src/forge/Branch/branch.css
+++ b/src/forge/Branch/branch.css
@ -1,132 +0,0 @@
-.branchDropdown {
-  border: 1px solid #eee;
-  border-radius: 4px;
-  display: flex;
-  justify-content: center;
-  height: 40px;
-  line-height: 40px;
-  min-width: 220px;
-}
-
-.branchDropdown .ant-dropdown-trigger {
-  width: 100%;
-  padding: 0px 15px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  cursor: pointer;
-}
-
-.branchOptions {
-  width: 220px;
-  box-shadow: 0px 0px 3px 1px rgba(134, 134, 134, 0.4);
-  border-radius: 3px;
-  background: #fff;
-  max-height: 300px;
-}
-
-.OptionsUl {
-  max-height: 220px;
-  overflow-y: auto;
-}
-
-.OptionsUl li {
-  height: 30px;
-  line-height: 30px;
-  cursor: pointer;
-  padding: 0px 20px;
-  margin: 5px 0px;
-}
-
-.OptionsUl li:hover {
-  background-color: #F0F0F0;
-}
-
-.OptionsUl li a {
-  display: block;
-}
-
-.OptionsInput {
-  height: 32px;
-  padding-left: 4px;
-  line-height: 32px;
-  width: 100%;
-}
-
-.branch-tagBox {
-  border: 1px solid #D0D0D0;
-  border-radius: 3px;
-  height: 36px;
-  display: flex;
-  align-items: center;
-  cursor: pointer;
-  min-width: 104px;
-}
-
-.branch-tagBox:hover {
-  background-color: #F3F4F6;
-}
-
-.branch-tagBox-list {
-  background: #FFFFFF;
-  box-shadow: 0px 4px 8px 2px rgba(212, 212, 212, 0.5);
-  border-radius: 4px;
-}
-.branch-tagBox-list .ant-popover-arrow {
-  display: none;
-}
-.branch-tagBox-list.ant-popover.ant-popover-placement-bottom {
-  padding-top: 0px;
-}
-.branch-tagBox-list .branch-tagBox .ant-dropdown-link {
-  display: block;
-  flex: 1;
-  max-width: 105px;
-}
-.branch-tagBox-list .ant-popover-inner-content {
-  padding: 0px;
-}
-
-.overlayBranch {
-  width: 325px;
-}
-.overlayBranch .navUl {
-  margin-top: 8px;
-  height: 30px;
-  line-height: 30px;
-}
-.overlayBranch .navUl li {
-  height: 30px;
-  line-height: 30px;
-  padding: 0px 5px;
-  margin-left: 20px !important;
-}
-
-.listTips {
-  padding: 20px 0px;
-  text-align: center;
-}
-
-.urlMenu {
-  line-height: 30px;
-  margin-bottom: 10px;
-  padding: 15px 20px 0px 20px;
-  border-bottom: none;
-}
-.urlMenu li.ant-menu-item {
-  height: 30px;
-  line-height: 30px;
-  padding: 0px 5px;
-  margin-right: 20px !important;
-}
-.urlMenu li.ant-menu-item.ant-menu-item-selected, .urlMenu li.ant-menu-item.ant-menu-item-active {
-  color: #333;
-}
-.urlMenu li.ant-menu-item.ant-menu-item-selected {
-  border-color: #1890ff !important;
-}
-.urlMenu li.ant-menu-item.ant-menu-item-active {
-  border-color: transparent;
-}
-
-/*# sourceMappingURL=branch.css.map */
--- a/src/forge/Branch/branch.css.map
+++ b/src/forge/Branch/branch.css.map
@ -1 +0,0 @@
-{"version":3,"sourceRoot":"","sources":["branch.scss"],"names":[],"mappings":"AAAA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACG;;;AAEH;EACE;;;AAEF;EACE;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;;AACA;EACE;;AAEF;EACE;;AAEF;EACE;EACA;EACA;;AAEF;EACE;;;AAGJ;EACE;;AACA;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;;AAIN;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;AACA;EACE;;AAEF;EACE;;AAEF;EACE","file":"branch.css"}
--- a/src/forge/Branch/branch.scss
+++ b/src/forge/Branch/branch.scss
@ -23,6 +23,7 @@
  max-height: 300px;
 }
 .OptionsUl{
+  min-height: 50px;
  max-height: 220px;
  overflow-y: auto;
 }
@ -48,7 +49,7 @@
 .branch-tagBox{
  border:1px solid #D0D0D0;
  border-radius: 3px;
-  height: 36px;
+  height: 32px;
  display: flex;
  align-items: center;
  cursor: pointer;
@ -87,6 +88,13 @@
      line-height: 30px;
      padding:0px 5px;
      margin-left: 20px!important;
+      &.ant-menu-item-selected{
+        border-color:#466aff!important;
+        color:#466aff!important;
+      }
+      &.ant-menu-item-active{
+        border-color:transparent ;
+      }
    }
  }
 }
@ -109,10 +117,13 @@
      color: #333;
    }
    &.ant-menu-item-selected{
-      border-color:#1890ff!important;
+      border-color:#466aff!important;
    }
    &.ant-menu-item-active{
      border-color:transparent ;
    }
  }
+}
+.copytool{
+  margin:0px 10px;
 }
--- a/src/forge/Component/AddGroup.jsx
+++ b/src/forge/Component/AddGroup.jsx
@ -55,6 +55,7 @@ function AddGroup({organizeId,getGroupID}){

  function addCollaborator(){
    getGroupID && getGroupID(id);
+    setID(undefined);
  }

  return(
--- a/src/forge/Component/Component.css
+++ b/src/forge/Component/Component.css
@ -1,432 +0,0 @@
-@charset "UTF-8";
-ul.ant-menu {
-  border-right: none;
-}
-
-ul.ant-menu li:last-child {
-  border-bottom: none;
-}
-
-li.ant-menu-item {
-  margin: 0px !important;
-  border-bottom: 1px solid #eee;
-}
-
-.flags {
-  border: 1px solid red;
-  border-radius: 5px;
-}
-
-.cards {
-  display: flex;
-  align-items: center;
-  padding: 20px 34px;
-  background-color: #fff;
-  margin-bottom: 18px;
-  min-height: 130px;
-  border: 1px solid #eee;
-}
-.cards .img {
-  margin-right: 20px;
-  width: 190px;
-  height: 90px;
-  border: 1px solid #eeeeee;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  overflow: hidden;
-}
-.cards .img img {
-  max-width: 100%;
-  max-height: 100%;
-}
-.cards .content {
-  flex: 1;
-  width: 0;
-}
-.cards .content .titles {
-  display: flex;
-  justify-content: space-between;
-  margin-bottom: 10px !important;
-  align-items: center;
-  height: 22px;
-  line-height: 22px;
-}
-.cards .content .titles > a {
-  font-size: 18px;
-  color: #333;
-}
-.cards .content .desc {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-  -webkit-line-clamp: 2;
-  line-height: 20px;
-}
-
-.tabsStyle {
-  border: 1px solid #eee;
-}
-.tabsStyle .ant-tabs-bar.ant-tabs-top-bar {
-  padding-left: 35px;
-  margin-bottom: 0px;
-}
-.tabsStyle .ant-tabs-nav .ant-tabs-tab {
-  padding: 19px 0px;
-  margin-right: 40px;
-}
-.tabsStyle .ant-tabs-ink-bar {
-  width: 25px !important;
-  bottom: 10px;
-}
-
-.statusColor {
-  display: inline-block;
-  padding: 0px 10px;
-  height: 20px;
-  line-height: 20px;
-  border-radius: 11px;
-  color: #fff;
-  margin-left: 5px;
-  font-size: 12px;
-}
-.statusColor.running {
-  background: #5091FF;
-  color: #F1F8FF;
-}
-.statusColor.Preparing {
-  background: #ff6e21;
-  color: #fff8f4;
-}
-.statusColor.pass {
-  background: #28BD6C;
-  color: #EEFDF5;
-}
-.statusColor.failed {
-  background: #F73030;
-  color: #FCEEEE;
-}
-.statusColor.killed {
-  background: #eee;
-  color: #999;
-}
-
-.handleBox {
-  position: fixed;
-  top: 45%;
-  right: 240px;
-  z-index: 10000;
-}
-
-.laterest {
-  background-color: #EF3131;
-  color: #fff;
-  font-size: 12px;
-  margin-left: 10px;
-  padding: 0px 5px;
-  border-radius: 2px;
-  height: 18px;
-  line-height: 18px;
-}
-
-@media screen and (max-width: 1800px) {
-  .handleBox {
-    right: 190px;
-  }
-}
-@media screen and (max-width: 1700px) {
-  .handleBox {
-    right: 140px;
-  }
-}
-@media screen and (max-width: 1600px) {
-  .handleBox {
-    right: 90px;
-  }
-}
-@media screen and (max-width: 1450px) {
-  .handleBox {
-    right: 10px;
-  }
-}
-@media screen and (max-width: 1380px) {
-  .handleBox {
-    right: 0px;
-  }
-}
-.ant-drawer {
-  z-index: 10000 !important;
-}
-
-.ant-drawer-body {
-  padding: 0px !important;
-}
-.ant-drawer-body .drawerHead {
-  background-color: #333;
-  color: #fff;
-  padding: 15px 20px;
-}
-.ant-drawer-body .ant-tree {
-  margin: 0px 20px !important;
-}
-
-.menuPanels {
-  width: 295px;
-}
-.menuPanels .leftline {
-  position: relative;
-  color: #666;
-  height: 16px;
-}
-.menuPanels .leftline::before {
-  position: absolute;
-  left: -10px;
-  top: 3px;
-  height: 12px;
-  width: 1px;
-  background-color: #666666;
-  content: "";
-}
-.menuPanels .ant-btn {
-  height: 36px;
-  line-height: 34px;
-  width: 83px;
-  text-align: center;
-  padding: 0px;
-  font-weight: 500;
-  font-size: 14px;
-}
-.menuPanels .ant-btn.currentBtn {
-  cursor: default;
-  color: #333;
-}
-.menuPanels .ant-btn.currentBtn:hover {
-  color: #333;
-  border-color: #d0d0d0;
-}
-.menuPanels .ant-btn-default {
-  color: #333;
-  border-color: #d0d0d0;
-}
-.menuPanels .ant-btn-default:hover {
-  background: #F3F4F6;
-}
-.menuPanels .ant-btn-primary {
-  color: #fff;
-  background-color: #2A61FF;
-}
-.menuPanels .focusPanelHeadInfo {
-  padding: 14px 16px;
-  border-bottom: 1px solid #eee;
-}
-.menuPanels .ant-popover-content, .menuPanels .ant-popover-inner {
-  height: 100%;
-  width: 100%;
-}
-.menuPanels .ant-popover-inner-content {
-  padding: 0px;
-}
-
-.halfs {
-  margin-top: 24px;
-  padding: 24px 0px 0px 0px;
-  border-top: 1px solid #e8e8e8;
-}
-
-.aboutSubTitle {
-  display: flex;
-  align-items: center;
-}
-
-.menuinfos {
-  padding: 10px 20px;
-}
-.menuinfos > a {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  flex: 1;
-}
-.menuinfos > a > span:first-child {
-  font-size: 16px;
-  font-weight: 500;
-  color: #333;
-  line-height: 22px;
-}
-.menuinfos > a > span:last-child {
-  color: #666;
-  font-weight: 400;
-  line-height: 20px;
-  margin-top: 6px;
-}
-
-/*-------------------个人主页：右侧提示区域--------------------------*/
-.-task-sidebar {
-  position: fixed;
-  width: 40px;
-  right: 0;
-  bottom: 80px;
-  z-index: 10;
-}
-
-@media screen and (max-width: 1920px) {
-  .-task-sidebar {
-    right: 220px;
-  }
-}
-@media screen and (max-width: 1750px) {
-  .-task-sidebar {
-    right: 160px;
-  }
-}
-@media screen and (max-width: 1650px) {
-  .-task-sidebar {
-    right: 115px;
-  }
-}
-@media screen and (max-width: 1550px) {
-  .-task-sidebar {
-    right: 90px;
-  }
-}
-@media screen and (max-width: 1450px) {
-  .-task-sidebar {
-    right: 45px;
-  }
-}
-@media screen and (max-width: 1200px) {
-  .-task-sidebar {
-    right: 0px;
-    display: none;
-  }
-}
-.-task-sidebar > div {
-  height: 40px;
-  line-height: 40px;
-  box-sizing: border-box;
-  width: 40px;
-  color: #999;
-  font-size: 20px;
-  text-align: center;
-  margin-bottom: 20px;
-  border-radius: 50%;
-  background: #FFFFFF;
-  box-shadow: 0px 0px 10px 1px #F1F1F1;
-}
-
-.-task-sidebar > div i {
-  color: #999;
-}
-
-.-task-sidebar > div:hover i {
-  color: #fff !important;
-}
-
-.-task-sidebar > div:hover {
-  background: #1890FF;
-  box-shadow: 0px 0px 10px 2px #B6D0FC;
-}
-
-.helpBox {
-  width: 260px;
-  z-index: 103;
-}
-.helpBox.shareContent {
-  width: 200px;
-}
-.helpBox .ant-popover-inner-content {
-  padding: 0px;
-}
-.helpBox p.titlecontent {
-  font-size: 18px;
-  color: #333;
-  line-height: 20px;
-  padding: 15px 20px;
-}
-.helpBox .faqUl {
-  padding: 0px 20px 10px;
-  max-height: 230px;
-  overflow-y: auto;
-}
-.helpBox .faqUl li {
-  background: #F5F5F5;
-  border-radius: 20px;
-  padding: 0px 20px;
-  color: #333;
-  height: 34px;
-  line-height: 34px;
-  margin-bottom: 10px;
-}
-.helpBox .faqUl li a {
-  display: block;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-}
-.helpBox .faqUl li:hover {
-  background-color: #D1E9FF;
-}
-.helpBox .faqUl li:hover a {
-  color: #333 !important;
-}
-.helpBox .shareUl {
-  padding: 10px 0px;
-  display: flex;
-  align-items: center;
-}
-.helpBox .shareUl .titlecontent {
-  margin-right: 20px;
-}
-.helpBox .shareUl li > i {
-  font-size: 32px !important;
-}
-
-.-task-desc {
-  background: #494949;
-  width: 90px;
-  line-height: 36px;
-  text-align: center;
-  position: absolute;
-  color: #fff;
-  font-size: 13px;
-  z-index: 999999;
-  opacity: 0;
-}
-
-.-task-desc div {
-  position: absolute;
-  top: 10px;
-  right: -7px;
-  height: 13px;
-}
-
-.-task-desc div img {
-  float: left;
-}
-
-.-task-sidebar .scan_ewm {
-  position: absolute !important;
-  right: 45px !important;
-  bottom: 0px !important;
-  background-color: #494949 !important;
-  -webkit-box-sizing: border-box !important;
-  box-sizing: border-box !important;
-  font-size: 14px !important;
-  line-height: 16px !important;
-  display: none;
-  height: 213px !important;
-}
-
-.trangle_right {
-  position: absolute;
-  right: -5px;
-  bottom: 15px;
-  width: 0;
-  height: 0px;
-  border-top: 6px solid transparent;
-  border-left: 5px solid #494949;
-  border-bottom: 6px solid transparent;
-}
-
-/*# sourceMappingURL=Component.css.map */
--- a/src/forge/Component/Component.css.map
+++ b/src/forge/Component/Component.css.map
@ -1 +0,0 @@
-{"version":3,"sourceRoot":"","sources":["Component.scss"],"names":[],"mappings":";AAAA;EACE;;;AAEF;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AAGJ;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;;;AAKN;EACE;;AACA;EACE;EACA;;AAEF;EACE;EACA;;AAEF;EACE;EACA;;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AAEF;EACE;EACA;;AAEF;EACE;EACA;;AAEF;EACE;EACA;;AAEF;EACE;EACA;;;AAGJ;EACE;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;IACE;;;AAGJ;EACE;IACE;;;AAGJ;EACE;IACE;;;AAGJ;EACE;IACE;;;AAGJ;EACE;IACE;;;AAGJ;EACE;;;AAEF;EACE;;AACA;EACE;EACA;EACA;;AAEF;EACE;;;AAIJ;EACE;;AACA;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;;AACA;EACE;EACA;;AAIN;EACE;EACA;;AACA;EACE;;AAGJ;EACE;EACA;;AAEF;EACE;EACA;;AAEF;EACE;EACA;;AAEF;EACE;;;AAGJ;EACE;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;;AACA;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;;;AAKN;AACA;EACE;EACA;EACA;EACA;EACA;;;AAGF;EACE;IACE;;;AAGJ;EACE;IACE;;;AAGJ;EACE;IACE;;;AAGJ;EACE;IACE;;;AAGJ;EACE;IACE;;;AAGJ;EACE;IACE;IACA;;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;;AACA;EACE;;AAEF;EACE;;AAEF;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;AAEF;EACE;;AACA;EACE;;AAKR;EACE;EACA;EACA;;AACA;EACE;;AAEF;EACE;;;AAON;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA","file":"Component.css"}
--- a/src/forge/Component/Component.scss
+++ b/src/forge/Component/Component.scss
@ -162,20 +162,29 @@ li.ant-menu-item{
    margin:0px 20px!important;
  }
 }
-
+.hoverA{
+  display:flex;
+  align-items: center;
+  max-width: 78px;
+  &:hover a{
+    color:#2A61FF !important ;
+  }
+}
 .menuPanels{
  width: 295px;
  .leftline{
    position: relative;
    color: #666;
    height: 16px;
+    margin-left: 14px;
+    font-size: 12px;
    &::before{
      position: absolute;
-      left: -10px;
+      left: -7px;
      top:3px;
      height: 12px;
      width: 1px;
-      background-color: #666666;
+      background-color: #999;
      content: "";
    }
  }
@ -203,9 +212,18 @@ li.ant-menu-item{
      background: #F3F4F6;
    }
  }
+  .ant-btn{
+    width: 102px;
+    height: 32px;
+    line-height: 30px;
+  }
  .ant-btn-primary{
    color: #fff;
-    background-color: #2A61FF;
+    background-color: #466AFF;
+    border:none;
+    &:hover{
+      background-color: rgba(70,106,255,0.85);
+    }
  }
  .focusPanelHeadInfo{
    padding:14px 16px;
@ -228,8 +246,12 @@ li.ant-menu-item{
  display: flex;
  align-items: center;
 }
+.menuMaininfos{
+  padding:10px 16px 14px;
+  border-bottom: 1px solid #eee;
+}
 .menuinfos{
-  padding:10px 20px;
+  padding:10px 20px 16px;
  &>a{
    display: flex;
    flex-direction: column;
--- a/src/forge/Component/Contributors.jsx
+++ b/src/forge/Component/Contributors.jsx
@ -46,45 +46,47 @@ function Contributors({contributors,owner,projectsId,currentLogin}){
    }
  }

+  function renderOrganize(list) {
+    let str = "";
+    list.map(i=>{
+      str = str+i.name + "、";
+    })
+    return str && str.substr(0,str.length - 1);
+  }
+
  function setMenusFunc(data){
    if(data){
      let ele = (
        <Spin spinning={isSpin}>
-          <AlignCenter className="focusPanelHeadInfo">
-            <Link to={`/users/${data.login}`}><img src={getImageUrl(`/${data.image_url}`)} alt="" className="radius" width="38px" height="38px"/></Link>
-            <div className="flex1 ml10" style={{width:"0"}}>
-              <AlignCenter>
-                <Link to={`/users/${data.login}`} className="font-16">{data.name}</Link>
+          <FlexAJ className="menuMaininfos">
+            <AlignCenter>
+              <Link to={`/${data.login}`}><img src={getImageUrl(`/${data.image_url}`)} alt="" className="radius" width="38px" height="38px"/></Link>
+             
+              <div className="ml10">
+                <Link to={`/${data.login}`}>{data.name}</Link>
+                { data.location && <span className="leftline">{data.location}</span> }
                {
-                  data.location && 
-                  <span className="ml20 font-12 leftline">{data.location}</span>
+                  data.organizations && data.organizations.length>0&&
+                  <p className="task-hide" style={{maxWidth:"215px"}}>
+                    所属组织：{renderOrganize(data.organizations)}
+                  </p>
                }
-              </AlignCenter>
-              {
-                data.organizations && data.organizations.length > 0 ?
-                <AlignCenter className="font-12 mt5">
-                  <span>所属组织：</span>
-                  <div className="task-hide flex1">
-                    {renderArray(data.organizations)}
-                  </div>
-                </AlignCenter>
-                :""
-              }
-            </div>
-          </AlignCenter>
+              </div>
+            </AlignCenter>
+          </FlexAJ>
          <AlignCenter className="menuinfos">
-            <a href={data.projects_url}>
+            <Link to={`/${data.login}/projects`}>
              <span>{data.projects_count}</span>
              <span>项目数</span>
-            </a>
-            <a href={data.followers_url}>
+            </Link>
+            <Link to={`/${data.login}/followers`}>
              <span>{data.followers_count}</span>
              <span>粉丝数</span>
-            </a>
-            <a href={data.following_url}>
+            </Link>
+            <Link to={`/${data.login}/following`}>
              <span>{data.following_count}</span>
              <span>关注数</span>
-            </a>
+            </Link>
          </AlignCenter>
          <div className={"pb20"} style={{display:"flex",justifyContent:'center'}}>
            {
@ -147,7 +149,7 @@ function Contributors({contributors,owner,projectsId,currentLogin}){

  return(
    <div className="halfs">
-      <Link to={`/projects/${owner}/${projectsId}/contribute`} className="font-16 color-ooo aboutSubTitle">
+      <Link to={`/${owner}/${projectsId}/contribute`} className="font-16 color-ooo hoverA">
        <span>贡献者</span>
        { contributors && contributors.total_count > 0 && <span className="infoCount">{contributors.total_count}</span>}
      </Link>
@ -157,7 +159,7 @@ function Contributors({contributors,owner,projectsId,currentLogin}){
          list.map((item,key)=>{
            return(
              <Popover content={menu} visible={item.visible} overlayClassName="menuPanels" placement="top">
-                <Link key={key} to={`/users/${item.login}`}>
+                <Link key={key} to={`/${item.login}`}>
                  <img src={getImageUrl(`/${item.image_url}`)} alt="" onMouseOver={()=>setVisibleFunc(true,item.login,key)}/>
                </Link>
              </Popover>
--- a/src/forge/Component/CopyTool.jsx
+++ b/src/forge/Component/CopyTool.jsx
@ -0,0 +1,51 @@
+import React, { useState, useCallback, memo } from 'react';
+import { Tooltip } from 'antd';
+
+CopyTool.defaultProps = {
+  beforeText: '复制链接',     //浮动过去显示的文字
+  afterText: '复制成功',  //点击后显示的文字
+  className: '',         //传给svg的class
+  inputId: 'copyText',    //要复制的文本的ID
+  timeOut:true, //复制后将浮动的文字改为beforeText
+};
+
+
+function CopyTool({ beforeText, afterText, className , inputId , timeOut }) {
+  const [title, setTitle] = useState(() => {
+    return beforeText;
+  });
+
+  // 复制链接
+  const copyUrl = useCallback(() => {
+    const copyEle = document.querySelector(`#${inputId}`); // 获取要复制的节点
+    if (!copyEle) {
+      console.error("您的CopyTool未设置正确的inputId");
+      return;
+    }
+    copyEle.select(); // 执行选中元素
+    if (document.execCommand('copy')) {
+      document.execCommand('copy');
+    }
+    document.getSelection().removeAllRanges();
+    
+    setTitle(afterText);
+    if(timeOut){
+      setTimeout(function(){
+        setTitle(beforeText);
+      },1500)
+    }
+  }, []);
+
+  return (
+    <Tooltip
+      placement="top"
+      title={title}
+      onVisibleChange={() => { setTitle(beforeText) }}
+    >
+      <i className={`iconfont icon-fuzhiicon ${className}`} style={{ color: '#466aff' }} onClick={copyUrl}></i>
+    </Tooltip>
+  );
+}
+
+
+export default memo(CopyTool);
--- a/src/forge/Component/DeleteModal/Index.jsx
+++ b/src/forge/Component/DeleteModal/Index.jsx
@ -1,7 +1,7 @@
 import React from 'react';
 import { AlignCenter } from '../layout';
-import { Modal , Button } from 'antd';
-import './Index.scss';
+import { Button } from 'antd';
+import Modals from '../PublicModal/Index';

 function DeleteBox({ 
  visible , 
@ -12,24 +12,22 @@ function DeleteBox({
  content
 }) {
  return(
-    <Modal
-      visible={visible}
-      onCancel={onCancel}
-      title={title}
-      width="600px"
-      className="deleteBox"
-      footer={
+    <Modals 
+      title={title} 
+      btn={
        <div>
          <Button size={'large'} onClick={onCancel}>取消</Button>
          <Button type={"danger"} size={"large"} onClick={onSuccess}>确认删除</Button>
        </div>
-      }
+      } 
+      onCancel={onCancel} 
+      visible={visible}
    >
      <div className="desc">
        <AlignCenter className="descMain"><i className="iconfont icon-shanchu_tc_icon mr10"></i>{content}</AlignCenter>
-        <p>{subTitle}</p>
+      <p>{subTitle}</p>
      </div>
-    </Modal>
+    </Modals>
  )
 }
 export default DeleteBox;
--- a/src/forge/Component/DeleteModal/Index.scss
+++ b/src/forge/Component/DeleteModal/Index.scss
@ -1,45 +0,0 @@
-.deleteBox{
-  .ant-modal-header{
-    background-color: #f8f8f8;
-    border-bottom: none;
-    .ant-modal-title{
-      text-align: left;
-      font-size: 20px;
-    }
-  }
-  .ant-modal-body{
-    padding:30px 50px;
-    p{
-      font-size: 16px;
-      line-height: 26px;
-      color:#666;
-      word-break: break-all;
-    }
-    .desc{
-      .descMain{
-        align-items: center;
-        justify-content: center;
-        font-size: 20px;
-        margin-bottom: 10px;
-        i{
-          font-size: 38px!important;
-          color:#DF0002
-        }
-      }
-    }
-  }
-  .ant-modal-footer{
-    border-top: none;
-    text-align: center;
-    padding-bottom: 40px;
-    button{
-      width: 120px;
-      margin:0px 20px;
-      &.ant-btn-danger{
-        background-color: #fff;
-        color: #DF0002;
-        border-color: #D0D0D0;
-      }
-    }
-  }
-}
--- a/src/forge/Component/DrawerPanel.jsx
+++ b/src/forge/Component/DrawerPanel.jsx
@ -78,7 +78,7 @@ function DrawerPanel({visible,onClose,branch,owner,projectsId,history, name , li
    if(dataref.type==="file"){
      onClose();
      let value = turnbar(branch);
-      history.push(`/projects/${owner}/${projectsId}/tree/${value}/${dataref.path}`);
+      history.push(`/${owner}/${projectsId}/tree/${value}/${dataref.path}`);
    }
  }

--- a/src/forge/Component/EAccount.css
+++ b/src/forge/Component/EAccount.css
@ -1,9 +0,0 @@
-.ant-modal-mask {
-  z-index: 1001;
-}
-
-.ant-modal-wrap {
-  z-index: 1002;
-}
-
-/*# sourceMappingURL=EAccount.css.map */
--- a/src/forge/Component/EAccount.css.map
+++ b/src/forge/Component/EAccount.css.map
@ -1 +0,0 @@
-{"version":3,"sourceRoot":"","sources":["EAccount.scss"],"names":[],"mappings":"AAAA;EACE;;;AAEF;EACE","file":"EAccount.css"}
--- a/src/forge/Component/EAccount.scss
+++ b/src/forge/Component/EAccount.scss
@ -1,6 +1,6 @@
 .ant-modal-mask{
-  z-index: 1001;
+  z-index: 1031;
 }
 .ant-modal-wrap{
-  z-index: 1002;
+  z-index: 1032;
 }
--- a/src/forge/Component/HeadSearch.jsx
+++ b/src/forge/Component/HeadSearch.jsx
@ -32,7 +32,7 @@ export default ({history}) => {
            />
          </div>
          :
-          <i className="iconfont icon-sousuo font-18 color-grey-6 ml30" onClick={() => {
+          <i className="iconfont icon-sousuo font-18 ml30" onClick={() => {
            setOpenSearch(true)
          }} />
      }
--- a/src/forge/Component/MemberCards.jsx
+++ b/src/forge/Component/MemberCards.jsx
@ -45,15 +45,15 @@ const Div = styled.div`{
 export default (({ user , img, name, time, focusStatus, is_current_user, login , successFunc }) => {
  return (
    <Div>
-      <Link to={`/users/${user && user.login}`}><Img src={getImageUrl(`/${img}`)} /></Link>
+      <Link to={`/${user && user.login}`}><Img src={getImageUrl(`/${img}`)} /></Link>
      <div className="m-infos">
-        <Link to={`/users/${user && user.login}`}><Name>{name}</Name></Link>
+        <Link to={`/${user && user.login}`}><Name>{name}</Name></Link>
        <Time><I className="iconfont icon-shijian"></I>加入时间:{time}</Time>
        {
          is_current_user ?
          <Button type="default">当前用户</Button>
          : 
-          <FocusButton is_watch={focusStatus} id={login} successFunc={successFunc}/>
+          <FocusButton is_watch={focusStatus} id={login} successFunc={successFunc} notReset={true}/>
        }
      </div>
    </Div>
--- a/src/forge/Component/ModalFun/index.jsx
+++ b/src/forge/Component/ModalFun/index.jsx
@ -0,0 +1,125 @@
+/* eslint-disable react/jsx-no-duplicate-props */
+import React, { useState } from 'react';
+import * as ReactDOM from 'react-dom';
+import { Modal, Button } from 'antd';
+import './index.scss';
+
+// 函数式调用删除、通知等模态框
+
+InitModal.defaultProps = {
+  okText: '确认',     //确定按钮的文字
+  cancelText: '取消',  //取消按钮的文字
+  className: '',         //传入的模态框类名
+  inputId: 'copyText',    //要复制的文本的ID
+  onCancel:()=>{},        //取消的回调
+  onOk:()=>{},            //确认的回调
+  title:'提示',            //模态框名字
+  contentTitle:'',        //内容标题
+  content:'',             //详细内容
+  afterClose:()=>{},      //关闭模态框以后的回调
+};
+
+// 使用函数调用删除组件
+export default function DelModal(props) {
+  renderModal({ ...props, type: 'delete' })
+}
+
+// 使用函数调用选择模态框组件
+export function Confirm(props) {
+  renderModal({ ...props, type: 'confirm' })
+}
+
+function renderModal(props) {
+  const { type, afterClose } = props;
+  const div = document.createElement('div');
+  document.body.appendChild(div);
+
+  function destroy() {
+    afterClose && afterClose();
+    const unmountResult = ReactDOM.unmountComponentAtNode(div);
+    if (unmountResult && div.parentNode) {
+      div.parentNode.removeChild(div);
+    }
+  }
+
+  function modalType(type) {
+    if (type === 'delete') {
+      return <InitModal
+        title="删除"
+        contentTitle="确定要删除吗？"
+        okText="确认删除"
+        {...props}
+
+        afterClose={destroy}
+        contentTitle={<React.Fragment>
+          <i className="red-circle iconfont icon-shanchu_tc_icon mr3"></i>
+          {props.contentTitle}
+        </React.Fragment>}
+      />
+    } else if (type === 'confirm') {
+      return <InitModal title="选择" afterClose={destroy} {...props} />
+    } else {
+      return <InitModal title="选择" afterClose={destroy} {...props} />
+    }
+  }
+
+  function render() {
+    setTimeout(() => {
+      ReactDOM.render(
+        modalType(type),
+        div,
+      );
+    });
+  }
+  render();
+}
+
+// 选择模态框组件
+function InitModal({
+  onCancel,
+  onOk,
+  title,
+  contentTitle,
+  content,
+  okText,
+  cancelText,
+  afterClose,
+  className,
+}) {
+
+  const [visible, setVisible] = useState(true);
+
+  function onCancelModal() {
+    setVisible(false);
+    onCancel && onCancel()
+  }
+
+  function onSuccess() {
+    setVisible(false);
+    onOk && onOk();
+  }
+
+  return (
+    <Modal
+      visible={visible}
+      onCancel={onCancelModal}
+      afterClose={afterClose}
+      title={title}
+      className={`myself-modal ${className}`}
+      centered
+      footer={[
+        <Button type="default" key="back" onClick={onCancelModal}>
+          {cancelText}
+        </Button>,
+        <Button className="foot-submit" key="submit" onClick={onSuccess}>
+          {okText}
+        </Button>,
+      ]}
+    >
+      <div>
+        {contentTitle && <p className="content-title">{contentTitle}</p>}
+        <p className="content-descibe">{content}</p>
+      </div>
+    </Modal>
+  )
+}
--- a/src/forge/Wiki/components/Login/index.scss
+++ b/src/forge/Wiki/components/Login/index.scss
@ -1,4 +1,4 @@
-.delete-modal {
+.myself-modal {
  .ant-modal-header {
    padding: 9px 24px;
    background: #f8f8f8;
@ -16,7 +16,7 @@
  .ant-modal-body {
    text-align: center;
  }
-  .delete-title {
+  .content-title {
    display: flex;
    justify-content: center;
    align-items: center;
@ -32,7 +32,7 @@
    color: #ca0002;
    font-size: 1.5rem !important;
  }
-  .delete-descibe {
+  .content-descibe {
    font-size: 14px;
    color: #666;
    line-height: 33px;
@ -53,4 +53,11 @@
      border-color: #df0002;
    }
  }
+  .ant-btn-default:hover,
+  .ant-btn-default:active,
+  .ant-btn-default:focus {
+    background: #f3f4f6;
+    color: #333;
+    border-color: #d0d0d0;
+  }
 }
--- a/src/forge/Component/NoticeModal/Index.scss
+++ b/src/forge/Component/NoticeModal/Index.scss
@ -0,0 +1,90 @@
+.systemBox{
+  .ant-modal-body{
+    padding:1px 0px 0px 0px;
+    .sysBox{
+      background-image: url('./bg.png');
+      background-repeat: no-repeat;
+      background-size: 100% 334px;
+      margin-top: -55px;
+    }
+    .sysnoticeBox{
+      width: 100%;
+      padding:80px 0px 34px;
+      display: flex;
+      flex-direction: column;
+      width: 780px;
+      margin: 0px auto;
+      p.ntitle{
+        height: 33px;
+        font-size: 24px;
+        font-weight: 500;
+        color: #31FFF7;
+        line-height: 33px;
+        text-align: center;
+      }
+      p.nSubtitle{
+        height: 25px;
+        line-height: 25px;
+        font-size: 18px;
+        font-weight: 500;
+        color: #FFFFFF;
+        margin-top: 60px;
+        padding-left: 20px;
+      }
+      .markdown-body{
+        box-shadow: 0px 0px 17px rgba(0,0,0,0.2);
+        border-radius: 4px;
+        margin-top: 17px!important;
+      }
+      .nContent{
+        padding:20px 34px;
+        background-color: #fff;
+        line-height: 30px;
+        font-size: 15px;
+        font-weight: 400;
+        color: #333;
+        .realmName{
+          margin-top: 20px;
+          display: flex;
+          ul{
+            width: 50%;
+            padding-left: 0px!important;
+            li{
+              font-size: 15px;
+              font-weight: 500;
+              line-height: 32px;
+              text-align: left;
+              color: #000;
+              list-style-type: none!important;
+              &:first-child{
+                color: #E65714;
+              }
+            }
+          }
+        }
+        .nSubdesc{
+          font-size: 15px;
+          font-weight: 400;
+          color: #000000;
+          line-height: 31px;
+          margin-top: 20px;
+        }
+        .nInfo{
+          font-size: 14px;
+          font-weight: 400;
+          color: #333333;
+          text-align: right;
+          margin-top: 25px;
+          p{
+            height: 20px;
+            line-height: 20px;
+          }
+        }
+      }
+      .nBtn{
+        text-align: center;
+        margin-top: 33px;
+      }
+    }
+  }
+}
--- a/src/forge/Component/NoticeModal/SystemNotice.jsx
+++ b/src/forge/Component/NoticeModal/SystemNotice.jsx
@ -0,0 +1,76 @@
+import React , { useEffect , useState } from 'react';
+import { Modal , Button } from 'antd';
+import './Index.scss';
+import '../../css/index.scss';
+import RenderHtml from '../../../components/render-html';
+import cookie from 'react-cookies';
+
+function SystemNotice({system_notification,history}){
+  const [ visible , setVisible ] = useState(false);
+
+  useEffect(()=>{
+    if(system_notification && !cookie.load('notice_stage')){
+      setVisible(true);
+    }
+  },[system_notification,history.location])
+
+  function sureContinue() {
+    cookie.remove('notice_stage');
+
+    let inFifteenMinutes = new Date(new Date().getTime() + 24 * 3600 * 1000);//一天
+    // let inFifteenMinutes = new Date(new Date().getTime() + 60 * 1000);//一分钟
+    cookie.save('notice_stage', true,{ expires: inFifteenMinutes,path:"/" });
+
+    setVisible(false);
+  }
+
+  return (
+    <Modal
+      visible = {visible}
+      width="1000px"
+      footer={false}
+      title={false}
+      centered={true}
+      closable={false}
+      wrapClassName={'systemBox'}
+    >
+      <div className="sysBox">
+        <div className="sysnoticeBox">
+          <p className="ntitle">{system_notification && system_notification.subject}</p>
+          <p className="nSubtitle">{system_notification && system_notification.sub_subject}</p>
+          {/* <div className="nContent">
+            <div className="nMaindesc">
+            为了给用户提供更加稳定、优质的服务，我们即将对平台门户首页、平台名称、平台域名进行一次全面升级与变更。原平台名称：Trustie（中文名：确实）将于2021年10月xx日统一更改为Gitlink（中文名：确实开源）。届时平台域名将统一进行更换，更换规则如下
+            </div>
+            <div className="realmName">
+              <ul>
+                <li>原域名：</li>
+                <li>官网顶级域名https://www.trustie.net</li>
+                <li>版本库子域名https://forgeplus.trustie.net</li>
+                <li>论坛子域名https://forum.trustie.net/forums</li>
+              </ul>
+              <ul>
+                <li>更换后域名：</li>
+                <li>官网顶级域名https://www.gitlink.org.cn</li>
+                <li>版本库子域名https://www.git.gitlink.org.cn</li>
+                <li>论坛子域名https://forum.gitlink.org.cn</li>
+              </ul>
+            </div>
+            <div className="nSubdesc">
+            自2021年10月xx日起，旧域名将停止访问。因平台名称与域名变更给您带来的不便，我们深表歉意!非常感谢您一直以来对本平台的信任与支持，我们将一如既往地为您提供优质的服务。 特此通知!
+            </div>
+            <div className="nInfo">
+              <p>Gitlink运营团队</p>
+              <p>2021年10月xx日</p>
+            </div>
+          </div> */}
+          <RenderHtml className="break_word_comments imageLayerParent" value={system_notification && system_notification.content} url={history.location}/>
+          <div className="nBtn">
+            <Button type="primary" className="btnblue" onClick={sureContinue}>确认并继续</Button>
+          </div>
+        </div>
+      </div>
+    </Modal>
+  )
+}
+export default SystemNotice;
--- a/src/forge/Component/NoticeModal/bg.png
+++ b/src/forge/Component/NoticeModal/bg.png
--- a/src/forge/Component/ProfileModal/Index.jsx
+++ b/src/forge/Component/ProfileModal/Index.jsx
@ -0,0 +1,72 @@
+import React , { useEffect , useState } from 'react';
+import Modals from '../PublicModal/Index';
+import { Button } from 'antd';
+import axios from 'axios';
+
+import ProfileImg from './images/profile.png';
+import './Index.scss';
+
+function ProfileModal({visible,onCancel,history}) {
+  const [ modalVis , setModalVis ] = useState(visible);
+  const [ addMemberCheck , setAddMemberCheck ] = useState(false);
+
+  useEffect(()=>{
+    axios.interceptors.response.use((response) => {
+      if (response && (response.data.status === 411 || response.data.status === 412)) {
+        setModalVis(true);
+        if(response.data.status === 412){
+          setAddMemberCheck(true);
+        }
+      }
+      return response;
+      }, (error) => {
+    });
+  },[])
+
+  useEffect(()=>{
+    setModalVis(visible);
+  },[visible])
+  
+  function onOk(){
+    onCancel();
+    setModalVis(false);
+    setTimeout(function(){
+      window.open(`/settings/profile`,"_blank");
+    },200)
+  }
+
+  function onNo() {
+    onCancel();
+    setModalVis(false);
+  }
+
+  return(
+    <Modals 
+      title="完善资料" 
+      onCancel={onNo} 
+      visible={modalVis}
+      btn={
+        addMemberCheck?
+        <div>
+          <Button type={'primary'} size={"large"} onClick={onNo}>好的</Button>
+        </div>
+        :
+        <div>
+          <Button size={"large"} onClick={onNo}>暂不补充</Button>
+          <Button type={'primary'} size={"large"} onClick={onOk}>好的</Button>
+        </div>
+      }  
+    >
+      <div className="contents">
+        <img src={ProfileImg} alt=""/> 
+        {
+          addMemberCheck ?
+          <p>目标用户个人资料不完整，需提醒目标用户补充资料后以进行后续操作</p>
+          :
+          <p>您目前的个人资料不完整，需要补充资料以进行后续操作。是否前往补充个人信息？</p>
+        }
+      </div>
+    </Modals>
+  )
+}
+export default ProfileModal;
--- a/src/forge/Component/ProfileModal/Index.scss
+++ b/src/forge/Component/ProfileModal/Index.scss
@ -0,0 +1,18 @@
+.contents{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin:10px auto 0px;
+  img{
+    margin-right: 13px;
+    width: 44px;
+  }
+  p{
+    line-height: 29px;
+    max-width: 327px;
+    font-size: 16px!important;
+  }
+}
+.font-44{
+  font-size: 44px!important;
+}
--- a/src/forge/Component/ProfileModal/Profile.jsx
+++ b/src/forge/Component/ProfileModal/Profile.jsx
@ -0,0 +1,17 @@
+import React from 'react';
+
+function Profile({children,sureFunc,showCompeleteDialog , completeProfile, className}) {
+
+  function checkProfile() {
+    if(!completeProfile){
+      showCompeleteDialog && showCompeleteDialog();
+    }else{
+      sureFunc();
+    }
+  }
+
+  return(
+    <a className={className} onClick={checkProfile}>{children}</a>
+  )
+}
+export default Profile;
--- a/src/forge/Component/ProfileModal/images/profile.png
+++ b/src/forge/Component/ProfileModal/images/profile.png
--- a/src/forge/Component/PublicModal/Index.jsx
+++ b/src/forge/Component/PublicModal/Index.jsx
@ -0,0 +1,20 @@
+import React from 'react';
+import { Modal } from 'antd';
+import './Index.scss';
+
+function Modals({title,children,btn,onCancel,visible}) {
+  return(
+    <Modal
+      visible={visible}
+      onCancel={onCancel}
+      title={title}
+      width={"520px"}
+      footer={btn}
+      centered={true}
+      wrapClassName={"deleteBox"}
+    >
+      {children}
+    </Modal>
+  )
+}
+export default Modals;
--- a/src/forge/Component/PublicModal/Index.scss
+++ b/src/forge/Component/PublicModal/Index.scss
@ -0,0 +1,75 @@
+.deleteBox{
+  z-index: 1033;
+  .ant-modal-close-x{
+    font-size: 17px!important;
+  }
+  .ant-modal-header{
+    background-color: #f8f8f8;
+    padding:10px 30px;
+    .ant-modal-title{
+      text-align: left;
+      font-size: 16px;
+      font-weight: bold;
+    }
+  }
+  .ant-modal-close{
+    top:0px !important;
+    font-size: 24px !important;
+  }
+  .ant-modal-body{
+    padding:30px 50px;
+    p{
+      font-size: 14px;
+      line-height: 26px;
+      color:#666;
+      word-break: break-all;
+    }
+    .desc{
+      .descMain{
+        align-items: center;
+        justify-content: center;
+        font-size: 20px;
+        margin-bottom: 10px;
+        i.red{
+          color:#DF0002;
+        }
+      }
+    }
+  }
+  .ant-modal-footer{
+    border-top: none;
+    text-align: center;
+    padding-bottom: 40px;
+    button,a{
+      width: 96px;
+      height: 32px;
+      margin:0px 20px;
+      font-weight: 400;
+      font-size: 14px;
+      &.ant-btn{
+        border-color: #D0D0D0;
+        color: #666;
+        &:hover,&:active,&:focus{
+          background: #f3f4f6;
+        }
+      }
+      &.ant-btn-danger{
+        background-color: #fff;
+        color: #DF0002;
+        border-color: #D0D0D0;
+        &:hover,&:active,&:focus{
+          border-color: #DF0002;
+          background-color: #fff;
+        }
+      }
+      &.ant-btn.ant-btn-primary{
+        background-color: #466AFF;
+        color: #fff;
+        border-color: #466AFF;
+        &:hover,&:focus,&:active{
+          background-color: rgba(70,106,255,0.85);
+        }
+      }
+    }
+  }
+}
--- a/src/forge/Component/Releases.jsx
+++ b/src/forge/Component/Releases.jsx
@ -1,14 +1,13 @@
 import React from 'react';
-import { AlignCenter , AlignTop , FlexAJ  } from '../Component/layout';
+import { AlignTop } from '../Component/layout';
 import { Link } from 'react-router-dom';

-function Releases({owner,projectsId,releaseVersions , baseOperate , projectType}){
-  
+function Releases({ owner, projectsId, releaseVersions, distribution }) {
  return(
    <div>
-      <Link to={`/projects/${owner}/${projectsId}/releases`} className="font-16 color-ooo aboutSubTitle">
+      <Link to={`/${owner}/${projectsId}/releases`} className="font-16 color-ooo hoverA">
        <span>发行版</span>
-        { releaseVersions && releaseVersions.total_count > 0 && <span className="infoCount">{releaseVersions.total_count}</span>}
+      { releaseVersions && releaseVersions.total_count > 0 && <span className="infoCount">{releaseVersions.total_count}</span>}
      </Link>
      {
        releaseVersions && releaseVersions.total_count>0 ?
@ -16,9 +15,10 @@ function Releases({owner,projectsId,releaseVersions , baseOperate , projectType}
            return(
            key === 0 &&<AlignTop className="mt10">
              <div>
-                <p className="font-16">
-                  <Link to={`/projects/${owner}/${projectsId}/releases`} className="color-grey-3">发布{item.name}版本</Link>
-                  <span className="laterest">最新</span>
+                <p className="font-16 color-grey-6" style={{display:'flex',alignItems:'center'}}>
+                  {/* 如果是点击最新则发行版列表页只展示最新的一个 */}
+                  <Link to={{pathname:`/${owner}/${projectsId}/releases`,query:{turnFromNew:true}}} style={{maxWidth:'200px',overflow: 'hidden',whiteSpace: 'nowrap',textOverflow:'ellipsis'}}>{item.name}</Link>
+                  <span className="font-12 laterest ml5">最新</span>
                </p>
                <p className="color-grey-3 font-12">{item.created_at}</p>
              </div>
@ -27,7 +27,8 @@ function Releases({owner,projectsId,releaseVersions , baseOperate , projectType}
          })
        :
        <div className="mt8">
-          您暂未发布任何版本{baseOperate && projectType !==2 && <Link className="color-blue ml20" to={`/projects/${owner}/${projectsId}/releases/new`}>创建新版本</Link>}
+          您暂未发布任何版本
+          {distribution && <Link className="color-blue ml20" to={{pathname:`/${owner}/${projectsId}/releases/new`,state:{stable:true}}}>创建新版本</Link>}
        </div>
      }
      
--- a/src/forge/Component/Sort.jsx
+++ b/src/forge/Component/Sort.jsx
@ -2,9 +2,9 @@ import React from 'react';
 import {Popover} from 'antd';
 import './Component.scss';

-export default (({menu , children})=>{
+export default (({menu , children, overlayClassName})=>{
  return(
-    <Popover content={menu} trigger={['click']} placement='bottom'>
+    <Popover content={menu} trigger={['click']} placement='bottom' overlayClassName={overlayClassName}>
      {children}
    </Popover>
  )
--- a/src/forge/Component/User.jsx
+++ b/src/forge/Component/User.jsx
@ -5,6 +5,7 @@ import { Link } from 'react-router-dom';
 export default ({ url , name , column  , id , login })=>{
  const Img = styled.span`
    display:flex;
+    font-weight: bold;
    ${column && "flex-direction: column;text-align:center;"}
    align-items: center;
    & img{
@ -20,7 +21,7 @@ export default ({ url , name , column  , id , login })=>{
  `;
  return(
    id?
-    <Link to={`/users/${login}`}>
+    <Link to={`/${login}`}>
      <Img>
        { url && <img src={url} alt=""/> }
        <span>{name}</span>
--- a/src/forge/DevOps/About.jsx
+++ b/src/forge/DevOps/About.jsx
@ -149,7 +149,7 @@ function About(props, ref) {
    axios.post(url).then(result=>{
      setIsSpining(false);
      if(result && result.data.status === 0){
-        props.history.push(`/projects/${owner}/${projectsId}/devops/dispose`);
+        props.history.push(`/${owner}/${projectsId}/devops`);
        // 需要将顶部的open_devops修改
        let { changeOpenDevops } = props;
        changeOpenDevops && changeOpenDevops(true);
--- a/src/forge/DevOps/Dispose.jsx
+++ b/src/forge/DevOps/Dispose.jsx
@ -96,7 +96,7 @@ function Dispose(props){
          setVisible(false);
          if(result && result.data){
            props.showNotification("流水线新增成功，请进行工作流配置！");
-            props.history.push(`/projects/${owner}/${projectsId}/devops/dispose/${result.data.id}`);
+            props.history.push(`/${owner}/${projectsId}/devops/${result.data.id}`);
          }else{
            props.showNotification("流水线新增失败，请稍后再试！");
          }
@ -134,12 +134,12 @@ function Dispose(props){

  // 模板管理
  function toModalManage(){
-    props.history.push(`/projects/${owner}/${projectsId}/devops/mould`);
+    props.history.push(`/${owner}/${projectsId}/devops/mould`);
  }

  // 参数管理
  function toparameter(){
-    props.history.push(`/projects/${owner}/${projectsId}/devops/params`);
+    props.history.push(`/${owner}/${projectsId}/devops/params`);
  }

  const operate = current_user && (permission && permission !== "Reporter");
--- a/src/forge/DevOps/Dispose/List.jsx
+++ b/src/forge/DevOps/Dispose/List.jsx
@ -73,7 +73,7 @@ function List({ list, operate , projectsId , owner , showModal , deleteFunc }){
      render:(value,item)=>{
        let v = turnbar(item.branch);
        return(
-          <Link to={`/projects/${owner}/${projectsId}/tree/${v}/${value}`} className="color-blue">{value}</Link>
+          <Link to={`/${owner}/${projectsId}/tree/${v}/${value}`} className="color-blue">{value}</Link>
        )
      }
    },
@ -117,7 +117,7 @@ function List({ list, operate , projectsId , owner , showModal , deleteFunc }){
        return(
          <span>
            { operate ? 
-              <Link to={`/projects/${owner}/${projectsId}/devops/dispose/${item.id}`} className="mr10 color-grey-6">
+              <Link to={`/${owner}/${projectsId}/devops/${item.id}`} className="mr10 color-grey-6">
              <i className="iconfont icon-zaibianji font-13 mr3"></i>编辑</Link> :""
            }
            { operate ? 
@ -125,7 +125,7 @@ function List({ list, operate , projectsId , owner , showModal , deleteFunc }){
                <a className="mr10 color-grey-6"><i className="iconfont icon-lajitong font-13 mr3"></i>删除</a>
              </Popconfirm>:""
            }
-            <Link to={`/projects/${owner}/${projectsId}/devops/list/${item.branch}`} className="color-grey-6"><i className="iconfont icon-yunhang font-13 mr3"></i>查看运行记录</Link>
+            <Link to={`/${owner}/${projectsId}/devops/list/${item.branch}`} className="color-grey-6"><i className="iconfont icon-yunhang font-13 mr3"></i>查看运行记录</Link>
          </span>
        )
      }
--- a/src/forge/DevOps/Dispose/PipelineName.jsx
+++ b/src/forge/DevOps/Dispose/PipelineName.jsx
@ -51,7 +51,7 @@ function PipelineName({visible,onCancel,onOk,value ,branchList}){
            })
          }
        </Select>
-        <Select mode="multiple" allowClear value={eventValue} dropdownClassName="chooseCon" style={{width:"180px",marginLeft:"10px"}} onChange={(e)=>{console.log(e);setEventValue(e)}}>
+        <Select mode="multiple" allowClear value={eventValue} dropdownClassName="chooseCon" style={{width:"180px",marginLeft:"10px"}} onChange={(e)=>{setEventValue(e)}}>
          {
            EVENT.map((item,key)=>{
              return(
--- a/src/forge/DevOps/Index.jsx
+++ b/src/forge/DevOps/Index.jsx
@ -36,39 +36,37 @@ export default ((props)=>{
  return(
    <WhiteBack className="opsPanel">
      <Switch {...props}>
-        <Route path="/projects/:owner/:projectsId/devops/dispose/:disposeId"
-          render={
-            (p) => (<New {...props} {...p}/>)
-          }
-        ></Route>
-        <Route path="/projects/:owner/:projectsId/devops/params"
+        
+        <Route path="/:owner/:projectsId/devops/params"
          render={
            (p) => (<Params {...props} {...p}/>)
          }
        ></Route>
-        <Route path="/projects/:owner/:projectsId/devops/mould"
+        <Route path="/:owner/:projectsId/devops/mould"
          render={
            (p) => (<Mould {...props} {...p}/>)
          }
        ></Route>
-        <Route path="/projects/:owner/:projectsId/devops/dispose/new"
+        <Route path="/:owner/:projectsId/devops/new"
          render={
            (p) => (<New {...props} {...p}/>)
          }
        ></Route>
-        <Route path="/projects/:owner/:projectsId/devops/dispose"
-          render={
-            (p) => (<Dispose {...props} {...p}/>)
-          }
-        ></Route>
-        <Route path="/projects/:owner/:projectsId/devops/list/:branch"
+        
+        <Route path="/:owner/:projectsId/devops/list/:branch"
          render={
            (p) => (<Stucture {...props} {...p}/>)
          }
        ></Route>
-        <Route path="/projects/:owner/:projectsId/devops"
+        <Route path="/:owner/:projectsId/devops/:disposeId"
          render={
-            (p) => (<About {...props} {...p}/>)
+            (p) => (<New {...props} {...p}/>)
+          }
+        ></Route>
+        {/* 原本的两种合为一个 */}
+        <Route path="/:owner/:projectsId/devops"
+          render={
+            (p) =>{return( p.location.state.open_devops?<Dispose {...props} {...p}/>:<About {...props} {...p}/>)}
          }
        ></Route>
      </Switch>
--- a/src/forge/DevOps/Infos.jsx
+++ b/src/forge/DevOps/Infos.jsx
@ -26,7 +26,7 @@ export default ((props)=>{
  return(
    <div className="disposePanel">
      <Banner>
-        { permission !=="Reporter" && <Link to={`/projects/${owner}/${props.match.params.projectsId}/devops/dispose`}>工作流配置</Link>}
+        { permission !=="Reporter" && <Link to={`/${owner}/${props.match.params.projectsId}/devops`}>工作流配置</Link>}
      </Banner>
      <Div>
        <Dispost {...props}/>
--- a/src/forge/DevOps/Manage/Params.jsx
+++ b/src/forge/DevOps/Manage/Params.jsx
@ -104,7 +104,7 @@ function Params(props){
      <Banner>
        <FlexAJ>
          <span className="font-18">工作流 - 参数管理</span>
-          <Link to={`/projects/${owner}/${projectsId}/devops/dispose`} className="font-14 color-grey-9 ml20">返回</Link>
+          <Link to={`/${owner}/${projectsId}/devops`} className="font-14 color-grey-9 ml20">返回</Link>
        </FlexAJ>
      </Banner>
      <Div className="disposeList">
--- a/src/forge/DevOps/Mould.jsx
+++ b/src/forge/DevOps/Mould.jsx
@ -126,7 +126,7 @@ function Mould(props){
    <div>
      <New wrappedComponentRef={(f) => childRef.current = f} ref={childRef} visible={visible} onCancel={()=>setVisible(false)} onOk={onOk}></New>
      <Banner>
-        <FlexAJ><span>工作流 - 模板管理</span><Link to={`/projects/${owner}/${projectsId}/devops/dispose`} className="font-14 color-grey-9">返回</Link></FlexAJ>
+        <FlexAJ><span>工作流 - 模板管理</span><Link to={`/${owner}/${projectsId}/devops`} className="font-14 color-grey-9">返回</Link></FlexAJ>
      </Banner>
      <Div className="disposeList">
        <FlexAJ>
--- a/src/forge/DevOps/Structure.jsx
+++ b/src/forge/DevOps/Structure.jsx
@ -198,7 +198,7 @@ function Structure(props,ref){
  }

  function clickRows(event,e){
-    props.history.push(`/projects/${owner}/${projectsId}/devops/${e.number}/detail`);
+    props.history.push(`/${owner}/${projectsId}/devops/${e.number}/detail`);
  }
  const column = [
    {
@ -290,7 +290,7 @@ function Structure(props,ref){
      <Banner>
        <FlexAJ>
          <span>构建列表</span>
-          <Link to={`/projects/${owner}/${projectsId}/devops/dispose`} className="font-15 color-grey-9">返回</Link>
+          <Link to={`/${owner}/${projectsId}/devops`} className="font-15 color-grey-9">返回</Link>
        </FlexAJ>
      </Banner>
      <Div>
--- a/src/forge/DevOps/disposePipeline.jsx
+++ b/src/forge/DevOps/disposePipeline.jsx
@ -275,7 +275,7 @@ function disposePipeline(props){
      ...params
    }).then(result=>{
      if(result){
-        props.history.push(`/projects/${owner}/${projectsId}/devops/dispose`);
+        props.history.push(`/${owner}/${projectsId}/devops`);
      }
      setLoading(false);
    }).catch(error=>{
--- a/src/forge/DevOps/opsDetail.jsx
+++ b/src/forge/DevOps/opsDetail.jsx
@ -48,7 +48,7 @@ export default (props) => {
      axios.post(url).then((result) => {
        if (result && result.data) {
          props.showNotification("工作流正在重新构建！");
-          props.history.push(`/projects/${owner}/${projectId}/devops/${result.data.number}/detail`);
+          props.history.push(`/${owner}/${projectId}/devops/${result.data.number}/detail`);
        }
      })
      .catch((error) => {
@ -87,7 +87,7 @@ export default (props) => {
          </AlignCenter>
          <Link
            style={{ color: "#ddd" }}
-            to={`/projects/${owner}/${projectId}/devops/dispose`}
+            to={`/${owner}/${projectId}/devops`}
          >
            <i className="iconfont icon-yiguanbi font-15 mr5"></i>退出
          </Link>
--- a/src/forge/DevOps/ssh/XmlPanel.jsx
+++ b/src/forge/DevOps/ssh/XmlPanel.jsx
@ -24,7 +24,6 @@ function onLayout(term, el) {
          entry.target.offsetHeight,
          term,
        );
-        console.log('cols, rows', cols, rows);
        term.resize(cols, rows);
        mediator.publish('ssh-xterm-resize', {
          columns: cols,
@ -139,12 +138,10 @@ export default ({ sshConfigData, sid }) => {
            }, 1000);
          }
          isFirstConnected.current = true;
-          console.log('event:', event);

          const data = Base64.decode(event.data.toString());
          let w = term._core._renderService.dimensions.actualCellWidth || 9.5;

-          console.log('data:', data, w, term);
          term.write(data);
        };

--- a/src/forge/Divert/DivertModal.jsx
+++ b/src/forge/Divert/DivertModal.jsx
@ -41,14 +41,15 @@ function DivertModal({form , visible , onSuccess , onCancel,owner,repo}){
  // 确认转移
  function onOk(){
    validateFields((error,values)=>{
-      console.log(...values);
      if(!error){
        const url = `/${owner}/${repo}/applied_transfer_projects.json`;
        Axios.post(url,{
          ...values
        }).then(result=>{
-          if(result){
+          if(result && result.data.id){
            onSuccess(result.data && result.data.owner);
+          }else{
+            onSuccess();
          }
        }).catch(error=>{})
      }
@ -104,7 +105,7 @@ function DivertModal({form , visible , onSuccess , onCancel,owner,repo}){
          </ul>
          :
          <ul className="descUl">
-            <li>仓库仅可以转移到您已经加入的组织中，不可以转移到未加入的组织中</li>
+            <li>仓库仅可以转移到您具有管理权限的组织中</li>
            <li>涉及到仓库改名操作，请提前做好仓库备份并且在转移后对本地仓库的remote进行修改</li>
            <li>转移仓库到组织后，你和组织创建者/管理员同时拥有对该仓库的管理操作</li>
          </ul>
--- a/src/forge/Head/AddProjectModal.jsx
+++ b/src/forge/Head/AddProjectModal.jsx
@ -1,6 +1,7 @@
 import React, { useState , forwardRef, useEffect } from 'react';
 import { Form , Modal , Input , Radio } from 'antd';
 import Axios from 'axios';
+import CheckProfile from '../Component/ProfileModal/Profile';

 export default Form.create()(
  forwardRef((props)=>{
@ -77,7 +78,7 @@ export default Form.create()(
            </Form.Item>
          </Form>
        </Modal>
-        <a onClick={()=>setVisible(true)}>加入项目</a>
+        <CheckProfile {...props} sureFunc={()=>setVisible(true)}>加入项目</CheckProfile>
      </React.Fragment>
    )
  })
--- a/src/forge/Head/AppPullRefresh.jsx
+++ b/src/forge/Head/AppPullRefresh.jsx
@ -0,0 +1,108 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { Icon } from 'antd';
+import _ from 'lodash';
+import Nodata from '../Nodata';
+
+
+class PullRefresh extends Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+    }
+    this.pullRef = {};
+    // 节流
+    this.onScrollList = _.throttle(this.handleScroll, 200, {
+      leading: false,
+      trailing: true,
+    });
+  }
+
+  componentDidMount() {
+    let dom = document.querySelector('.pull-refresh-wrap');
+    dom && dom.addEventListener('scroll', this.onScrollList);
+  }
+
+  componentWillUnmount() {
+    let dom = document.querySelector('.pull-refresh-wrap');
+    dom && dom.removeEventListener('scroll', this.onScrollList)
+  }
+
+
+  handleScroll = () => {
+    if (this.props.count < this.props.pageSize) return;
+    if (this.props.type === 1 || this.props.type === 2) return;
+    const wrap = this.pullRef;
+    const currentScroll = wrap.scrollTop + wrap.clientHeight
+
+    // 触底
+    if (currentScroll >= (wrap.scrollHeight - 200)) {
+      this.loadData()
+    }
+  }
+
+
+  handleLoadClick = () => {
+    this.loadData();
+  }
+
+  loadData = () => {
+    this.props.onPullRefresh()
+  }
+
+
+  renderLoading() {
+    switch (this.props.type) {
+      case 0:   // 加载更多
+        return <div className='text-center' onClick={this.handleLoadClick}>显示更多</div>
+      case 1: // 加载中
+        return (
+          <div className='text-center'>
+            <Icon type="loading" />
+            <span className='text-center'>加载中...</span>
+          </div>
+        )
+      case 2: // 无样式
+        return <div className='text-center'>没有更多了</div>
+      default:
+        return <div className='text-center'>没有更多了</div>
+    }
+  }
+
+
+  render() {
+    const { className, count, children } = this.props;
+    return (
+      <div
+        className={`pull-refresh-wrap ${className}`}
+        ref={dom => { this.pullRef = dom }}
+      >
+
+        {children}
+
+        {
+          count < 1 && <Nodata _html="暂无未读消息"/> 
+        }
+
+        {/* 大于分页数据才显示loading */}
+        {/* {this.props.count >= this.props.pageSize ? this.renderLoading() : null} */}
+
+      </div>
+
+    )
+  }
+
+}
+
+
+PullRefresh.propTypes = {
+  className: PropTypes.string,
+  children: PropTypes.any,
+  onPullRefresh: PropTypes.func.isRequired,
+  type: PropTypes.oneOf([0, 1, 2]),
+  count: PropTypes.number.isRequired,
+  pageSize: PropTypes.number.isRequired,
+}
+
+
+export default PullRefresh
--- a/src/forge/Head/Footer.jsx
+++ b/src/forge/Head/Footer.jsx
@ -19,7 +19,7 @@ function Footer(){

  return(
    <div>
-      <div style={{height:"497px"}}></div>
+      <div style={{height:"483px"}}></div>
      <div className="newFooter edu-txt-center">
        {value && showhtml(value)}
        {/* <div className="footerInfos">
--- a/src/forge/Head/Header.js
+++ b/src/forge/Head/Header.js
@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import AccountProfile from "../../modules/user/AccountProfile";
 import { getImageUrl } from 'educoder'
 import axios from 'axios';
-import { Input , notification , Dropdown , Menu } from 'antd';
+import { Input , notification , Dropdown ,Popover, Menu,Badge, Button } from 'antd';
 import { Link } from 'react-router-dom';

 import LoginDialog from '../../modules/login/LoginDialog';
@ -10,8 +10,10 @@ import HeadSearch from '../Component/HeadSearch';

 import AddProjectModal from './AddProjectModal';
 import '../../modules/tpm/TPMIndex.css';
+import CheckProfile from '../Component/ProfileModal/Profile';

 import './header.scss';
+import NoticeContent from './NoticeContent';
 const $ = window.$
 // TODO 这部分脚本从公共脚本中直接调用
 const { Search } = Input;
@ -46,6 +48,7 @@ class NewHeader extends Component {
      settings: null,
      visiblemyss: false,
      openSearch:false,
+      visible:false,  //浮动消息框展示控制
    }
  }
  componentDidMount() {
@ -91,9 +94,6 @@ class NewHeader extends Component {
    this.setState({
      user: newProps.user
    })
-    if (newProps.Headertop !== undefined) {
-      old_url = newProps.Headertop.old_url
-    }
  }

  educoderlogin = () => {
@ -120,7 +120,6 @@ class NewHeader extends Component {
    })
  };
  HideAddcoursestypess = (i) => {
-    console.log("调用了");
    this.setState({
      Addcoursestypes: false,
      mydisplay: true,
@ -222,6 +221,15 @@ class NewHeader extends Component {
      }
    }
  }
+  
+  checkProfile=(url)=>{
+    const { showCompeleteDialog , completeProfile } = this.props;
+    if(!completeProfile){
+      showCompeleteDialog && showCompeleteDialog();
+    }else{
+      window.location.href(url);
+    }
+  }

  addMenu=(list)=>{
    return(
@ -231,21 +239,27 @@ class NewHeader extends Component {
          {
            list.map((item,key)=>{
              return(
-                (item.name !=="加入课堂" && item.name !=="加入开发项目") && <Menu.Item key={item.name+key}><a href={item.url}>{item.name}</a></Menu.Item>
+                (item.name !=="加入课堂" && item.name !=="加入开发项目") && 
+                <Menu.Item key={item.name+key}>
+                  <CheckProfile {...this.props} sureFunc={()=>{window.location.href=item.url}}>{item.name}</CheckProfile>
+                </Menu.Item>
              )
            })
          }
-          <Menu.Item><AddProjectModal showNotification={this.props.showNotification}/></Menu.Item>
+          <Menu.Item>
+            <AddProjectModal {...this.props} showNotification={this.props.showNotification}/>
+          </Menu.Item>
        </Menu>
      </div>
    )
  }
+
  renderMenu=(personal)=>{
    const { current_user } = this.props;
    return(
      <Menu className="currentMenu">
        <Menu.Item>
-          <span title={current_user && current_user.username}>{current_user && current_user.username}</span>
+          <span className="currentName" title={current_user && current_user.username}>{current_user && current_user.username}</span>
        </Menu.Item>
          {
            personal && personal.length > 0 && personal.map((item,key)=>{
@ -254,14 +268,18 @@ class NewHeader extends Component {
              )
            })
          }
-          <li><Link to={`/settings/SSH`}>设置</Link></li>
+          {/* <li><Link to={`/settings/profile`}>设置</Link></li> */}
        <Menu.Item><a onClick={() => this.educoderloginysl()}>退出</a></Menu.Item>
      </Menu>
    )
  }

+  handleVisibleChange = visible => {
+    this.setState({ visible });
+  };
+
  render() {
-    const { match} = this.props;
+    const { match ,resetUserInfo ,showNotification} = this.props;
    let current_user = this.props.user;
    let {
      AccountProfiletype,
@ -270,6 +288,7 @@ class NewHeader extends Component {
      headtypesonClickbool,
      headtypess,
      settings,
+      visible,
    } = this.state;
    /*用户名称  用户头像url*/
    let activeIndex = false;
@ -347,8 +366,7 @@ class NewHeader extends Component {
      })
    }

-    // let search_url = settings && settings.common && settings.common.search;
-    let notice_url = settings && settings.common && settings.common.notice;
+    let search_url = settings && settings.common && settings.common.search;
    return (
      <div className="newHeaders" id="nHeader">
        <div className="headerContent">
@ -380,21 +398,21 @@ class NewHeader extends Component {
                {
                  settings.navbar && settings.navbar.map((item, key) => {
                    var new_link = item.link;
-                    var user_login = this.props.user && this.props.user.login;
+                    var user_login = current_user && current_user.login;
                    var is_hidden = item.hidden
                    if (new_link && (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")
+                          new_link = new_link.replace(/courses/g, user_login + "/courses")
                        } else if (new_link.indexOf("contests") > -1) {
-                          new_link = new_link.replace(/contests/g, "users/" + user_login + "/contests")
+                          new_link = new_link.replace(/contests/g, user_login + "/contests")
                        }
                      } else {
                        is_hidden = true
                      }
                    }
                    if (user_login && (new_link && new_link.indexOf("homes") > -1)) {
-                      new_link = new_link.replace(/homes/g, "users/" + user_login + "/user_activities")
+                      new_link = new_link.replace(/homes/g, user_login + "/user_activities")
                    }
                    
                    var waiLian = (new_link && str.filter(item=>new_link.indexOf(item)>-1) );
@ -411,38 +429,43 @@ class NewHeader extends Component {
            }
          </div>
          <div className="head-right">
-            {/* {search_url ? this.SearchInput(openSearch,search_url):""} */}
-            <HeadSearch {...this.props}/>
+            { search_url && <HeadSearch {...this.props}/>}
            {
              current_user && (current_user.main_site || current_user.login) && (settings && settings.add && settings.add.length>0)?
              <Dropdown overlay={this.addMenu(settings && settings.add)} placement="bottomRight">
-                <i className="iconfont icon-tianjiafangda color-grey-6 ml30"></i>
+                <i className="iconfont icon-tianjiafangda ml30 mr15"></i>
              </Dropdown>:""
            }
            
-            {this.props.user && this.props.user.login && notice_url ?
-              <div className="ml30 edu-menu-panel">
-                {user && user.login &&
-                  <a href={`${notice_url}`} style={{ position: 'relative' }}>
-                    <i className="iconfont icon-xiaoxilingdang color-grey-6"></i>
-                    <span className="newslight" style={{ display: this.props.Headertop === undefined ? "none" : this.props.Headertop.new_message === true ? "block" : "none" }}>
-                    </span>
-                  </a>
-                }
-              </div>:""
+            { (settings && settings.common && settings.common.notice) && (current_user && current_user.login)?
+              <Popover
+                overlayClassName="notice-popover"
+                placement={`bottomRight`}
+                content={<NoticeContent visible={visible} current_user={current_user} showNotification={showNotification} resetUserInfo={resetUserInfo}/>}
+                visible={visible}
+                onVisibleChange={this.handleVisibleChange}
+                destroyTooltipOnHide
+              >
+                <Link to={"/settings/notice"} className="message-icon">
+                  {current_user && <Badge count={current_user.message_unread_total}>
+                    <i className="iconfont icon-xiaoxilingdang ml15 mr15"></i>
+                  </Badge>}
+                </Link>
+              </Popover>
+              : ""
            }
          </div>
          {!user || (user && !user.login)  ?
            <span className="font-15 ml30">
-              <a onClick={() => this.educoderlogin()} className="mr5 color-grey-6">登录</a>
+              <a onClick={() => this.educoderlogin()} className="mr5 color-white">登录</a>
              {
                settings && settings.common && settings.common.register &&
-                <span><em className="vertical-line"></em><a className="ml5 color-grey-6" href={`${settings.common.register}`} target="_blank">注册</a></span>
+                <span><em className="vertical-line"></em><a className="ml5 color-white" href={`${settings.common.register}`} target="_blank">注册</a></span>
              }
            </span>
            :
            <Dropdown placement={`bottomRight`} overlay={this.renderMenu(settings && settings.personal)}>
-              <a href={`/users/${this.props.current_user  && this.props.current_user.login}`}>
+              <a href={`/${this.props.current_user  && this.props.current_user.login}`}>
                <img alt="头像" src={getImageUrl(`/${user.image_url}`)} className="currentImg"></img>
              </a>
            </Dropdown>
--- a/src/forge/Head/NoticeContent.jsx
+++ b/src/forge/Head/NoticeContent.jsx
@ -0,0 +1,262 @@
+import React, { useEffect, useState } from 'react';
+import { Badge, Menu } from 'antd';
+import { Link } from 'react-router-dom';
+import axios from 'axios';
+import AppPullRefresh from './AppPullRefresh';
+import { noticeSourceType } from '../common/static';
+import './header.scss';
+import '../SecuritySetting/notice/manager/Index.scss';
+import '../SecuritySetting/Index.scss';
+import '../SecuritySetting/notice/myNotice/Index.scss';
+
+
+function NoticeContent({ visible, showNotification, resetUserInfo, current_user: { login } }) {
+  const [initialize, setInitialize] = useState(true);
+  const [noticeType, setNoticeType] = useState("notification");
+  const [letterUnreadCount, setLetterUnreadCount] = useState(0);//未读私信数量
+
+  const [noticeUnreadCount, setNoticeUnreadCount] = useState(0);//未读系统通知数量
+  const [noticePage, setNoticePage] = useState(0);
+  const [noticeUnreadList, setNoticeUnreadList] = useState([]);//未读系统通知列表
+
+  const [atUnreadCount, setAtUnreadCount] = useState();//未读@我数量
+  const [atPage, setAtPage] = useState(0);
+  const [atUnreadList, setAtUnreadList] = useState([]);//未读@我列表
+
+  useEffect(() => {
+    resetUserInfo();
+  }, [noticeUnreadCount,atUnreadCount]);
+
+  useEffect(()=>{
+    setNoticePage(0);
+    setAtPage(0);
+  },[visible])
+
+  useEffect(() => {
+    const params = {
+      type: noticeType,
+      limit: 10,
+      page: noticeType === "notification" ? noticePage : noticeType === "atme" ? atPage : "",
+      status: 1,
+    }
+    getMessageList(params);
+  }, [noticePage, atPage]);
+
+  useEffect(() => {
+    const params = {
+      type: noticeType,
+      limit: 10,
+      page: 0,
+      status: 1,
+    };
+    if (initialize) {
+      params.type = "atme"
+    }
+    visible && getMessageList(params);
+  }, [visible]);
+
+
+  function getMessageList(params) {
+    axios.get(`/users/${login}/messages.json`, {
+      params: params,
+    }).then((response) => {
+      if (response && response.data) {
+        setNoticeUnreadCount(response.data.unread_notification);
+        setAtUnreadCount(response.data.unread_atme);
+        if (params.type === "notification") {
+          let list = response.data.messages;
+          if (params.page !== 0) {
+            list = [...noticeUnreadList, ...list];
+          }
+          setNoticeUnreadList(list);
+          if (initialize) {
+            // 如果是第一次加载，根据数据量判断是否切换tab栏
+            setInitialize(false);
+            if (response.data.unread_notification === 0 && response.data.unread_atme !== 0) {
+              setNoticeType("atme");
+            }
+          }
+        } else if (params.type === "atme") {
+          let list = response.data.messages;
+          if (params.page !== 0) {
+            list = [...atUnreadList, ...list];
+          }
+          setAtUnreadList(list);
+        }
+      }
+    })
+  }
+
+  function readAll() {
+    axios.post(`/users/${login}/messages/read.json`, {
+      type: noticeType,
+      ids: [-1]
+    }).then((response) => {
+      let data = response.data;
+      if (!data) return;
+      if (data.status === 0) {
+        changeReadMarkAll(noticeType);
+      } else {
+        showNotification(data.message);
+      }
+    });
+  }
+
+
+  function changeReadMarkAll(noticeType) {
+    if (noticeType === "notification") {
+      let list = noticeUnreadList.slice();
+      list.forEach(item => {
+        item.status = 2;
+      })
+      setNoticeUnreadList(list);
+      setNoticeUnreadCount(0);
+    } else if (noticeType === "atme") {
+      let list = atUnreadList.slice();
+      list.forEach(item => {
+        item.status = 2;
+      })
+      setAtUnreadList(list);
+      setAtUnreadCount(0);
+    }
+  }
+
+  // const [letter_unread_list, setLetter_unread_list] = useState([
+  //   {
+  //     id: 122,
+  //     read: 0,                         //是否已读，0未读，1已读
+  //     send_name: "蒋宇航",              //消息发送人
+  //     send_login: "jiangYuHang",       //消息发送人的login，前端根据这个跳转到消息内页
+  //     content: "私信内容",              //最近一条未读消息的内容
+  //     create_time: "2019-03-04 18:08", //发送时间
+  //   },
+  // ]);
+
+  function readItem(item) {
+    axios.post(`/users/${login}/messages/read.json`, {
+      type: noticeType,
+      ids: [item.id]
+    }).then((response) => {
+      let data = response.data;
+      if (!data) return;
+      if (data.status === 0) {
+        changeReadMark(item);
+        item.notification_url && window.open(item.notification_url);
+      } else {
+        showNotification(data.message);
+      }
+    });
+  }
+
+
+  function changeReadMark(item) {
+    if (item.type === "notification") {
+      let list = noticeUnreadList.slice();
+      let index = noticeUnreadList.indexOf(item);
+      list[index].status = 2;
+      setNoticeUnreadList(list);
+      if (noticeUnreadCount > 0) {
+        setNoticeUnreadCount(noticeUnreadCount - 1);
+      }
+    } else if (item.type === "atme") {
+      let list = atUnreadList.slice();
+      let index = atUnreadList.indexOf(item);
+      list[index].status = 2;
+      setAtUnreadList(list);
+      if (atUnreadCount > 0) {
+        setAtUnreadCount(atUnreadCount - 1);
+      }
+    }
+  }
+
+  return (
+    <div className="messageHoverDiv notice01">
+      <div className="sshHead hoverNotice-head">
+        <Menu mode="horizontal" selectedKeys={noticeType} onClick={(e) => setNoticeType(e.key)}>
+          <Menu.Item key="notification"><Badge count={noticeUnreadCount}>系统通知</Badge></Menu.Item>
+          {/* <Menu.Item key="1" id="item-private"><Badge count={letterUnreadCount}>私信</Badge></Menu.Item> */}
+          <Menu.Item key="atme"><Badge count={atUnreadCount}>@我</Badge></Menu.Item>
+        </Menu>
+      </div>
+
+      {/* 系统通知 */}
+      {noticeType === "notification" && <AppPullRefresh
+        className='hoverNotice-body' // 外部添加className加以区分
+        onPullRefresh={() => { setNoticePage(noticePage + 1); }} //触发加载ajax的function
+        // type={2} // 传送加载组件的状态
+        count={noticeUnreadList.length} // 数据当前的总数量
+        pageSize={10} // 
+      >
+        {
+          noticeUnreadList.map(item => {
+            return (
+              <div key={item.id + Math.random()} className="noticeCont-back" onClick={() => { readItem(item) }}>
+                <div className={`noticeCont ${item.notification_url?'pointer':''}`}>
+                  <span style={{ visibility: item.status === 1 ? 'visible' : 'hidden' }}>
+                    <Badge color="#FA2020" />
+                  </span>
+                  <i className={"iconfont " + noticeSourceType[item.source]}></i>
+                  <div className="noticeCont-text">
+                    <span className="content-span notice-cont-span" dangerouslySetInnerHTML={{ __html: item.content }}></span>
+                    <span className="timeSpan">{item.time_ago}</span>
+                  </div>
+                </div>
+              </div>
+            )
+          })
+        }
+      </AppPullRefresh>
+      }
+
+      {/* @我 */}
+      {noticeType === "atme" && <AppPullRefresh
+        className='hoverNotice-body' // 外部添加className加以区分
+        onPullRefresh={() => { setAtPage(atPage + 1); }} //触发加载ajax的function
+        // type={1} // 传送加载组件的状态
+        count={atUnreadList.length} // 数据当前的总数量
+        pageSize={10} // 
+      >
+        {atUnreadList.map(item => {
+          return (
+            <div key={item.id + Math.random()} className="noticeCont-back" onClick={() => { readItem(item) }}>
+              <div className="noticeCont">
+                <span style={{ visibility: item.status === 1 ? 'visible' : 'hidden' }}>
+                  <Badge color="#FA2020" />
+                </span>
+                <div className="noticeCont-text">
+                  <span className="content-span atme-cont-span" dangerouslySetInnerHTML={{ __html: item.content }}></span>
+                  <span className="timeSpan">{item.time_ago}</span>
+                </div>
+              </div>
+            </div>
+          )
+        })
+        }
+      </AppPullRefresh>
+      }
+
+      {/* 私信 */}
+      {/* {noticeType === "1" ? letter_unread_list.length > 0 ? letter_unread_list.map(item => {
+          return (
+            <div className="noticeCont-back">
+              <div className="noticeCont" style={{ height: item.content.length >= 30 && item.content.length <= 34 ? '65px' : "" }}>
+                <Badge color="#FA2020" />
+                <div className="noticeCont-text">
+                  <span>{item.send_name}：</span>
+                  <span className="boldSpan" dangerouslySetInnerHTML={{ __html: item.content.length >= 50 ? item.content.substr(0, 50) + "..." : item.content }}></span>
+                  <span className="timeSpan">{item.create_time ? timeAgo(item.create_time) : "刚刚"}</span>
+                </div>
+              </div>
+            </div>
+          )
+        }) : "暂无数据" : ""} */}
+      <div className="hoverNotice-buttom">
+        <Link to={{pathname:"/settings/notice",query:{noticeType:noticeType}}}>全部消息</Link>
+        {noticeUnreadCount > 0 && noticeType === "notification" && <a onClick={readAll}>所有系统消息一键已读</a>}
+        {atUnreadCount > 0 && noticeType === "atme" && <a onClick={readAll}>所有@我一键已读</a>}
+      </div>
+    </div>
+
+  )
+}
+export default NoticeContent;
--- a/src/forge/Head/header.scss
+++ b/src/forge/Head/header.scss
@ -24,12 +24,20 @@
  width: 34px;
  height: 34px;
  border-radius: 50%;
-  margin-left: 30px;
+  margin-left: 15px;
 }
+
 .currentMenu{
  width: 120px;
  text-align: center;
  padding:0px;
+  .currentName{
+    padding:0px 8px;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    display: block;
+  }
  li{
    height: 40px;
    line-height: 40px;
@ -119,4 +127,139 @@
    width: 110px;
    text-align: right;
  }
+}
+
+// 右上角小铃铛单独样式
+.notice-popover{
+  //popover小尖尖
+  .ant-popover-arrow{
+    display: none;
+  }
+
+  //popover框
+  .ant-popover-inner-content {
+    width: 386px;
+    height: 446px;
+    box-shadow: 0px 4px 8px 2px rgba(212, 212, 212, 0.5);
+    border-radius: 4px;
+    margin-top: -10px;
+    padding: 12px 1px 12px 0;
+  }
+}
+
+.messageHoverDiv .ant-menu-item{
+  margin-right: 24px !important;
+}
+
+.hoverNotice-head{
+  margin-left: 18px;
+
+  & .ant-badge{
+    font-size: 14px !important;
+  }
+
+  &>.ant-menu-horizontal {
+    border-bottom: 1px solid #e8e8e8 !important;
+  }
+} 
+
+.hoverNotice-body{
+  height: 342px;
+  overflow-y: scroll;
+
+  & b{
+    font-weight: 400;
+    text-shadow: 0.5px 0 0 #333;
+  }
+
+  .none_panels{
+    height: 100%;
+  }
+}
+
+.message-icon{
+  position: relative;
+  .ant-scroll-number{
+    right:12px;
+    padding: 0 0px;
+  }
+}
+
+
+
+.hoverNotice-buttom{
+  display: flex;
+  justify-content: space-between;
+  padding: 12px 18px;
+  a{
+    color: #466AFF;
+    &:hover{
+      opacity:0.85;
+    }
+  }
+}
+
+.noticeCont-back{
+  .pointer{
+    cursor: pointer;
+  }
+  &:hover{
+    background: #F3F4F6;
+  }
+}
+
+.noticeCont{
+  display: flex;
+  margin: 0 16px 0 18px;
+  padding: 12px 0 10px 0;
+  line-height: 24px;
+  border-bottom: 1px solid #EEEEEE;
+  cursor: default;
+  i{
+    font-size: 14px !important;
+    margin-right: 6px;
+    color: #333333;
+  }
+
+  .boldSpan{
+    font-weight: 400;
+    text-shadow: 0.5px 0 0 #333;
+  }
+
+  .noticeCont-text{
+    display: flex;
+    color:#333333;
+    flex:auto;
+    justify-content: space-between;
+
+    & .content-span{
+      word-break: break-all;
+      text-overflow: ellipsis;
+      display: -webkit-box;
+      -webkit-box-orient: vertical;
+      -webkit-line-clamp: 2;
+      overflow: hidden;
+    }
+
+    & .atme-cont-span{
+      width: 272px;
+    }
+
+    & .notice-cont-span{
+       width: 255px;
+    }
+
+    .timeSpan{
+      font-size: 12px;
+      color: #666666;
+    }
+
+    .at-name{
+      margin-right: 12px;
+    }
+  }
+}
+
+.text-center{
+  text-align: center;
 }
--- a/src/forge/Images/taskbar.png
+++ b/src/forge/Images/taskbar.png
--- a/src/forge/Index.js
+++ b/src/forge/Index.js
@ -12,8 +12,9 @@ import Loadable from "react-loadable";
 import Loading from "../Loading";
 import { ImageLayerOfCommentHOC } from "../modules/page/layers/ImageLayerOfCommentHOC";

+
 const ProjectNew = Loadable({
-  loader: () => import("./New/Index"), 
+  loader: () => import("./New/Index"),
  loading: Loading,
 });
 const ProjectIndex = Loadable({
@ -21,21 +22,28 @@ const ProjectIndex = Loadable({
  loading: Loading,
 });

-const ProjectDetail = Loadable({
-  loader: () => import("./Main/Detail"),
+const ProjectHome = Loadable({
+  loader: () => import("./Main/projecthome/Index"),
  loading: Loading,
 });

+// 项目详情放在用户和组织下作为二级菜单存在
+// const ProjectDetail = Loadable({
+//   loader: () => import("./Main/Detail"),
+//   loading: Loading,
+// });
+
 class Index extends Component {

-  componentDidUpdate=()=>{
-    this.props.history.listen(()=>{
+  componentDidUpdate = () => {
+    this.props.history.listen(() => {
      if (document.body.scrollTop || document.documentElement.scrollTop > 0) {
        window.scrollTo(0, 0)
      }
    })
  }
  render() {
+    
    return (
      <div className="newMain clearfix">
        <Switch {...this.props}>
@ -52,27 +60,34 @@ class Index extends Component {
            )}
          ></Route>
          <Route
-            path="/projects/new"
+            path="/projects/mirror/new"
            render={(props) => (
              <ProjectNew {...this.props} {...props} />
            )}
          ></Route>
-          <Route
-            path="/projects/:owner/:projectsId"
+          {/* <Route
+            path="/:owner/:projectsId"
            render={(props) => (
              <ProjectDetail {...this.props} {...props} />
            )}
-          ></Route>
+          ></Route> */}
          <Route
-            path="/projects"
+            path="/explore/all"
            render={(props) => (
              <ProjectIndex {...this.props} {...props} />
            )}
          ></Route>
+
+          <Route
+            path="/explore"
+            render={(props) => (
+              <ProjectHome {...this.props} {...props} />
+            )}
+          ></Route>
          <Route
            path="/"
            render={(props) => (
-              <ProjectIndex {...this.props} {...props} />
+              <ProjectHome {...this.props} {...props} />
            )}
          ></Route>
        </Switch>
@ -86,3 +101,10 @@ export default withRouter(
    parentSelector: ".newMain",
  })(CNotificationHOC()(SnackbarHOC()(TPMIndexHOC(Index))))
 );
+
+// export default withRouter(
+//   ImageLayerOfCommentHOC({
+//     imgSelector: ".imageLayerParent img, .imageLayerParent .imageTarget",
+//     parentSelector: ".newMain",
+//   })(Index)
+// );
--- a/src/forge/Main/CoderDepot.jsx
+++ b/src/forge/Main/CoderDepot.jsx
@ -3,6 +3,7 @@ import { WhiteBack , Box , LongWidth , ShortWidth , Gap , AlignCenter , FlexAJ
 import { Dropdown , Menu , Divider , Spin, Button , Typography } from 'antd';
 import { getImageUrl } from "educoder";
 import { Link } from 'react-router-dom';
+import { truncateCommitId } from "../common/util";
 import CloneAddress from '../Branch/CloneAddress';

 import SelectBranch from '../Branch/Select';
@ -20,6 +21,8 @@ import DrawerPanel from '../Component/DrawerPanel';
 import UpdateDescModal from './sub/UpdateDescModal';
 import Nodata from '../Nodata';
 import Invite from './sub/Invite';
+import CheckProfile from '../Component/ProfileModal/Profile';
+import RenderHtml from '../../components/render-html';
 /**
 * projectDetail.type:0是托管项目，1是镜像项目，2是同步镜像项目(为2时不支持在线创建、在线上传、在线修改、在线删除、创建合并请求等功能)
 */
@ -65,6 +68,7 @@ function CoderDepot(props){
  const [ editReadme , setEditReadme ] = useState(false);
  const [ pullsFlag , setPullsFlag ] = useState(true);
  const [ issuesFlag , setIssuesFlag ] = useState(true);
+  const [ releaseVersions , setReleaseVersions] = useState(undefined);

  const owner = props.match.params.owner;
  const projectsId = props.match.params.projectsId;
@ -72,7 +76,8 @@ function CoderDepot(props){
  branchName = returnbar(branchName);
  const details = props.projectDetail;
  let pathname = props.history.location.pathname;
-  
+  //distribution：判断此用户是否可以创建发行版
+  const distribution = details && details.type != 2 && (details.permission === "Admin" || details.permission === "Owner" || details.permission === "Manager");
  const { bannerList } = props;

  useEffect(()=>{
@ -112,19 +117,52 @@ function CoderDepot(props){
  useEffect(()=>{
    if (projectsId && owner && defaultBranch){
      let b = turnbar(branchName) ;
-      if(pathname.indexOf(`/projects/${owner}/${projectsId}`) > -1 && pathname.indexOf(`/tree/${b}/`) > -1) {
+      if(pathname.indexOf(`/${owner}/${projectsId}`) > -1 && pathname.indexOf(`/tree/${b}/`) > -1) {
        let url = pathname.split(`/tree/${b}/`)[1];
        setTreeValue(url);
        getFileInfo(url,branchName);
        setType("file");
+        // getReadmeInfo(url,branchName);
+        // setReadme(undefined);
      }else{
        setTreeValue(undefined);
        getDirInfo(branchName || defaultBranch);
        setType("dir");
+        // getReadmeInfo('', branchName || defaultBranch);
      }
    } 
  },[projectsId,owner,pathname,defaultBranch])

+  useEffect(()=>{
+    axios.get(`/${owner}/${projectsId}/releases.json`).then((result)=>{
+      if(result && result.data){
+        const release = {
+          "list":result.data.releases,
+          "total_count":result.data.releases && result.data.releases.length
+        }
+        setReleaseVersions(release);
+      }
+    })
+  },[])
+
+  // 获取readme信息
+  function getReadmeInfo(path, ref) {
+    axios.get(`/${owner}/${projectsId}/readme.json`, { 
+      params:{
+        owner: owner,
+        repo: projectsId,
+        filepath:path,
+        ref:ref || branchName
+      }
+    }).then((result) => {
+      if (result) {
+        setReadme(result.data);
+      } else {
+        setReadme(undefined);
+      }
+    })
+  }
+
  // 获取主目录列表
  function getDirInfo(branch){
    setIsSpin(true);
@ -144,9 +182,10 @@ function CoderDepot(props){
        setLastCommitAuthor(c && c.committer);
        setMainFlag(true);
        setReadOnly(true);
-        setReadme(result.data.readme);
+        // setReadme(result.data.readme);
        setEditReadme(false);
        setHide(true);
+        getReadmeInfo('', branchName || defaultBranch);
      }
      setTimeout(function(){setIsSpin(false);},500);
    }).catch(error=>{setIsSpin(false);})
@ -158,7 +197,7 @@ function CoderDepot(props){
      let ele = document.getElementById("ptxt");
      if(ele){
        let h = ele.offsetHeight;
-        if( h > 18 ) setHideBtn(true);
+        if( h > 35 ) setHideBtn(true);
      }
    }
  },[projectDetail,lastCommit])
@ -179,15 +218,18 @@ function CoderDepot(props){
          setDirInfo(undefined);
          setFileInfo(en);
          setType(en.type);
+          setReadme(undefined);
        }else{
          setFileInfo(undefined);
          setDirInfo(en);
          setType("dir");
+          getReadmeInfo(path, branchName || defaultBranch);
        }
        let c = result.data.last_commit
        setLastCommit(c && c.commit);
        setLastCommitAuthor(c && c.committer);
        setMainFlag(false);
+        setReadOnly(true);
        setReadOnly(!editReadme);
        setHide(true);
      }
@ -198,7 +240,7 @@ function CoderDepot(props){
  // 切换分支或者标签
  function changeBranch(value){
    let checkvalue = turnbar(value);
-    let url = `/projects/${owner}/${projectsId}${value && `/tree/${checkvalue}`}${treeValue ? `/${treeValue}`:""}`;
+    let url = `/${owner}/${projectsId}${value && `/tree/${checkvalue}`}${treeValue ? `/${treeValue}`:""}`;
    props.history.push(url);
  }
    
@ -207,9 +249,13 @@ function CoderDepot(props){
    let b = branchName || defaultBranch;
    let checkvalue = turnbar(b);
    return (
-    <Menu>
-      <Menu.Item><a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/${checkvalue}/uploadfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>上传文件</a></Menu.Item>
-      <Menu.Item><a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/${checkvalue}/newfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>新建文件</a></Menu.Item>
+    <Menu className="fileMenu">
+      <Menu.Item>
+        <CheckProfile {...props} sureFunc={()=>urlLink(`/${owner}/${projectsId}/${checkvalue}/uploadfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>上传文件</CheckProfile>
+      </Menu.Item>
+      <Menu.Item>
+        <CheckProfile  {...props} sureFunc={()=>urlLink(`/${owner}/${projectsId}/${checkvalue}/newfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>新建文件</CheckProfile>
+      </Menu.Item>
    </Menu>
    )
  }
@ -228,12 +274,12 @@ function CoderDepot(props){
    setTreeValue(undefined);
    let branch = branchName || defaultBranch;
    let checkvalue = turnbar(branch);
-    props.history.push(`/projects/${owner}/${projectsId}/tree/${checkvalue}`);
+    props.history.push(`/${owner}/${projectsId}/tree/${checkvalue}`);
  };
  // 子目录路径返回链接
  function returnUlr(url){
    let enBranch = turnbar(branchName);
-    props.history.push(`/projects/${owner}/${projectsId}/tree${enBranch?`/${enBranch}`:""}/${url}`);
+    props.history.push(`/${owner}/${projectsId}/tree${enBranch?`/${enBranch}`:""}/${url}`);
  }
  // 点击跳转到子目录
  function goToSubRoot(path,type,filename){
@ -241,7 +287,7 @@ function CoderDepot(props){
      let enBranch = branchName || defaultBranch;
      let checkvalue = turnbar(enBranch);
      setType(type);
-      props.history.push(`/projects/${owner}/${projectsId}${`/tree/${checkvalue}`}${path?`/${path}`:""}`);
+      props.history.push(`/${owner}/${projectsId}${`/tree/${checkvalue}`}${path?`/${path}`:""}`);
    }
  }

@ -253,7 +299,7 @@ function CoderDepot(props){
    //点击直接跳转页面 加载一次路由
    let enBranch = branchName || defaultBranch;
    let checkvalue = turnbar(enBranch);
-    props.history.push(`/projects/${owner}/${projectsId}/tree/${checkvalue}/${path}`);
+    props.history.push(`/${owner}/${projectsId}/tree/${checkvalue}/${path}`);
    setType("file");
    setEditReadme(true);
  };
@ -295,8 +341,10 @@ function CoderDepot(props){
  const mdFlag = n && n.substring(n.length-3,n.length) === ".md";

  const { current_user } = props;
-  const baseOperate = projectDetail && projectDetail.permission && projectDetail.permission !=="Reporter";
+  const baseOper = current_user && current_user.login && issuesFlag;
+  const baseOperate = projectDetail && projectDetail.permission && projectDetail.permission !=="Reporter" && projectDetail.type !== 2 && pullsFlag;
  const fileOperate = type === "dir" && projectDetail && projectDetail.type !== 2 && ((projectDetail.permission && projectDetail.permission !=="Reporter") || (current_user && current_user.admin));
+
  return(
    <WhiteBack>
      <UpdateDescModal desc={desc} website={website} lesson_url={lesson_url} visible={openModal} onCancel={()=>setOpenModal(false)} onOk={okUpdate}/>
@ -341,36 +389,59 @@ function CoderDepot(props){
                            branchList={projectDetail && projectDetail.branches && projectDetail.branches.list}
                          ></SelectBranch>
                          :
-                          <span>分支：<span className="color-grey-6">{branchName || defaultBranch}</span></span>
+                          <span>分支：<span className="color-grey-6">{branchName || defaultBranch}</span></span>  
                        }
                      </div>
-                      <AlignCenter className="mr20">
-                        <Link to={`/projects/${owner}/${projectsId}/branchs`} className="depotNum">
-                          <i className="iconfont icon-master_icon font-14 mr3"></i>
-                          <span className="mr3">分支</span>
-                          <span>{projectDetail && projectDetail.branches && projectDetail.branches.total_count}</span>
-                        </Link>
-                      </AlignCenter>
-                      <AlignCenter className="mr20">
-                        <Link to={`/projects/${owner}/${projectsId}/tag`} className="depotNum">
-                          <i className="iconfont icon-biaoqianicon font-14 mr3"></i>
-                          <span className="mr3">标签</span>
-                          <span>{projectDetail && projectDetail.tags && projectDetail.tags.total_count}</span>
-                        </Link>
-                      </AlignCenter>
+           {
+                        treeValuePath && treeValuePath.length > 0 ?
+                        <Path
+                            identifier={projectDetail && projectDetail.identifier}
+                            treeValuePath={treeValuePath}
+                            returnUlr={returnUlr}
+                            returnMain={returnMain}
+                            getPathUrl={getPathUrl}
+                        />
+                        :
+                        <React.Fragment>
+                          <AlignCenter className="mr20">
+                            <Link to={`/${owner}/${projectsId}/branches`} className="iconBtn">
+                              <i className="iconfont icon-master_icon font-16"></i>
+                              <span>分支</span>
+                              <span>{projectDetail && projectDetail.branches_count}</span>
+                            </Link>
+                          </AlignCenter>
+                          <AlignCenter className="mr20">
+                              <Link to={`/${owner}/${projectsId}/tags`} className="iconBtn">
+                                  <i className="iconfont icon-biaoqianicon font-16"></i>
+                                  <span>标签</span>
+                                  <span>{projectDetail && projectDetail.tags_count}</span>
+                              </Link>
+                          </AlignCenter>
+                        </React.Fragment>
+                      }
                    </AlignCenter>
                    <AlignCenter className="depotBtn">
                      {
-                        baseOperate && projectDetail.type !== 2 && pullsFlag &&
-                        <Button type="default" onClick={()=>urlLink(`/projects/${owner}/${projectsId}/pulls/new`)} className="mr10"><i className="iconfont icon-xinjian2 font-12 mr3"></i> 合并请求</Button>
-                      }
-                      {
-                        baseOperate && issuesFlag &&
-                        <Button type="default" onClick={()=>urlLink(`/projects/${owner}/${projectsId}/issues/new`)} className="mr10"><i className="iconfont icon-xinjian2 font-12 mr3"></i> 任务</Button>
+                        (baseOperate || baseOper) &&
+                        <div className="addOptionBtn">
+                          {
+                            baseOperate &&
+                            <CheckProfile {...props} sureFunc={()=>urlLink(`/${owner}/${projectsId}/compare/master...${branchName || defaultBranch}`)} >+ 合并请求</CheckProfile>
+                          }
+                          {
+                            baseOper &&
+                            <CheckProfile {...props} sureFunc={()=>urlLink(`/${owner}/${projectsId}/issues/new`)} >+ 易修</CheckProfile>
+                          }
+                        </div>
                      }
                      { fileOperate &&
-                        <Dropdown overlay={fileMenu()} className="mr10" trigger={['click']}>
-                          <Button type="default">文件 <i className="iconfont icon-sanjiaoxing-down ml3 font-14 color-grey-6 mr-5"></i></Button>
+                        <Dropdown 
+                          overlay={fileMenu()} 
+                          className="mr10" 
+                          trigger={['click']}
+                          getPopupContainer={document.parentNode}
+                        >
+                          <a>文件 <i className="iconfont icon-sanjiaoxing-down ml3 font-14 color-grey-6 mr-5"></i></a>
                        </Dropdown>
                      }
                      
@ -380,37 +451,27 @@ function CoderDepot(props){
                    </AlignCenter>
                  </FlexAJ>
                  {
-                    dirInfo || fileInfo ?
+                    (dirInfo && dirInfo.length>0) || fileInfo ?
                    <div className="listtable">
                      {
                        lastCommit &&
                        <div className="listtablehead">
                          <User url={getImageUrl(`/${lastCommitAuthor && lastCommitAuthor.image_url}`)} name={lastCommitAuthor && lastCommitAuthor.name} id={lastCommitAuthor && lastCommitAuthor.id} login={lastCommitAuthor && lastCommitAuthor.login}/>
                          <div className={hideBtn && hide ? "ellipsistxt hidetxt" :"ellipsistxt"}>
-                            <pre id="ptxt">{lastCommit && lastCommit.message}</pre>
+                            <pre id="ptxt"><Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(lastCommit.sha)}`}><RenderHtml value={lastCommit.message}/></Link></pre>
                          </div>
                          { hideBtn && <span className="ellipsis" onClick={()=>changeHide(hide)}><i className="iconfont icon-shenglvehao"></i></span> }
-                         
-                          <span className="ml20 color-grey-9 mt1">{lastCommit && lastCommit.time_from_now}</span>
+
+                          <span className="ml20 color-grey-6 font-12 mt3">{lastCommit.time_from_now}</span>
                          { 
                            commitCount ? 
-                            <Link to={`/projects/${owner}/${projectsId}/commits/branch/${turnbar(branchName || defaultBranch)}`} className="ml20 color-grey-9" style={{height:"30px",lineHeight:"30px"}}>
-                              <i className="iconfont icon-tijiaoicon mr3 font-16"></i>{commitCount}次提交
+                            <Link to={`/${owner}/${projectsId}/commits/branch/${turnbar(branchName || defaultBranch)}`} className="ml20 color-grey-3"style={{height:"28px",lineHeight:"28px"}}>
+                              <i className="iconfont icon-tijiaoicon mr3 font-16"></i><span style={{fontWeight:"500"}}>{commitCount}次提交</span>
                            </Link>:"" 
                          }
                        </div>
                      }
                      <ul className="listtablebody">
-                        {
-                          treeValuePath && treeValuePath.length > 0 &&
-                          <Path 
-                            identifier={projectDetail && projectDetail.identifier} 
-                            treeValuePath={treeValuePath}
-                            returnUlr={returnUlr}
-                            returnMain={returnMain}
-                            getPathUrl={getPathUrl}
-                          />
-                        }
                        {
                          dirInfo && dirInfo.length > 0 &&
                          dirInfo.map((item,key)=>{
@ -434,27 +495,28 @@ function CoderDepot(props){
                            onEdit={onEdit}
                            currentBranch={branchName || defaultBranch}
                            type={projectDetail.type}
-                          ></CoderRootFileDetail>[[]]
+                          ></CoderRootFileDetail>
                        }
                      </ul>
                    </div>
                    : ""
                  }
                  {
-                    (dirInfo && dirInfo.length === 0) && (fileInfo && fileInfo.length === 0) ? <Nodata _html="暂未发现文件"/> :""
+                    (dirInfo && dirInfo.length === 0) && !fileInfo ? <Nodata _html="暂未发现文件"/> :""
                  } 
                  {/* readme文件显示(显示文件详情时不显示readme文件) */}
-                  { dirInfo && (readme && readme.content) ? <ReadMe ChangeFile={ChangeFile} readme={readme} operate={props && (props.isManager || props.isDeveloper) && projectDetail.type !==2 } history={props.history} /> :"" }
+                  { (readme && readme.content) ? <ReadMe ChangeFile={ChangeFile} readme={readme} operate={props && (props.isManager || props.isDeveloper) && projectDetail.type !==2 } history={props.history} /> :"" }
                </div>
              </LongWidth>
              {
-                !fileInfo && 
+                 (!(treeValuePath && treeValuePath.length > 0) && !fileInfo) &&
                <ShortWidth>
                  <Gap style={{paddingLeft:"30px"}}>
                    <div className="panelmenu">
-                      <FlexAJ className="font-16 color-ooo mb10" style={{lineHeight:"22px"}}>关于
-                        {projectDetail.permission && (projectDetail.permission==="Admin" || projectDetail.permission==="Owner") && 
-                          <a className="color-grey-6" href="javascript:void(0)"><i onClick={()=>setOpenModal(true)} className="iconfont icon-a-shezhi font-15"></i></a>
+                      <FlexAJ className="font-18 color-ooo mb20" style={{lineHeight:"28px"}}>关于
+                        {
+                        projectDetail.permission && (projectDetail.permission==="Admin" || projectDetail.permission==="Owner" || projectDetail.permission==="Manager") && 
+                          <i onClick={()=>setOpenModal(true)} className="iconfont icon-a-shezhi color-grey-9 font-15"></i>
                        }
                      </FlexAJ>
                      {desc && <p className="font-14 color-grey-3 mb15 task-hide-2" style={{lineHeight:"24px",WebkitLineClamp:"4",textAlign:"justify",wordBreak:"break-all"}}>{desc}</p>}
@ -475,9 +537,9 @@ function CoderDepot(props){
                      </div>
                      {
                        projectDetail && projectDetail.license_name &&
-                        <div>
-                          <i className="iconfont icon-xieyiicon font-16 mr10 color-grey-6"></i>
-                          <span className="color-grey-6">{projectDetail.license_name}</span>
+                        <div className="pinfos">
+                          <i className="iconfont icon-xieyiicon font-16 mr10"></i>
+                          <Link to={`/${owner}/${projectsId}/tree/${branchName || defaultBranch}/LICENSE`} className="color-grey-6">{projectDetail.license_name}</Link>
                        </div>
                      }
                    </div>
@ -498,28 +560,22 @@ function CoderDepot(props){
                    }
                    {/* 发布 */}
                    {
-                      projectDetail && projectDetail.release_versions &&
+                      releaseVersions &&
                      <React.Fragment>
                        <Divider />
-                        <Releases
+                        <Releases 
                          owner={owner} 
                          projectsId={projectsId} 
-                          releaseVersions={projectDetail.release_versions} 
+                          releaseVersions={releaseVersions} 
                          history={props.history}
-                          baseOperate={baseOperate}
-                          projectType={projectDetail.type}
+                          distribution={distribution}
                        />
                      </React.Fragment>
                    }
                    {/* 贡献者 */}
                    {
-                      projectDetail && projectDetail.contributors &&
-                      <Contributors 
-                        contributors={projectDetail && projectDetail.contributors} 
-                        owner={owner} 
-                        projectsId={projectsId} 
-                        currentLogin={current_user && current_user.login}
-                      />
+                      projectDetail && projectDetail.contributors && projectDetail.contributors.total_count >0 && 
+                      <Contributors contributors={projectDetail.contributors} owner={owner} projectsId={projectsId} />
                    }
                    {/* 语言 */}
                    { projectDetail && projectDetail.languages && 
--- a/src/forge/Main/CoderDepotCatalogue.jsx
+++ b/src/forge/Main/CoderDepotCatalogue.jsx
@ -4,8 +4,8 @@ import { truncateCommitId } from '../common/util';

 const typeIco = {
  "submodule":"icon-file-submodule font-17",
-  "file":'icon-wenjian6 font-15',
-  "dir":"icon-wenjianjia4 font-15"
+  "file":'icon-wenjian6 font-15 color-blue-file',
+  "dir":"icon-wenjianjia4 font-15 color-blue_4C"
 }

 function CoderDepotCatalogue({item , goToSubRoot , owner , projectsId }){
@ -13,15 +13,15 @@ function CoderDepotCatalogue({item , goToSubRoot , owner , projectsId }){
    <li>
      <span>
        <a onClick={()=>goToSubRoot(item.path,item.type,item.name)} className={item.type === "submodule" && "submoduleStyle"}>
-          <i className={`iconfont ${typeIco[`${item.type}`]} color-blue-file mr8`}></i>{item.name}
+          <i className={`iconfont ${typeIco[`${item.type}`]} mr8`}></i>{item.name}
        </a>
      </span>
      <span title="init project">
-        <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.commit && item.commit.sha}`)}`} title={item.commit && item.commit.message}>
+        <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.commit && item.commit.sha}`)}`} title={item.commit && item.commit.message}>
          {item.commit && item.commit.message}
        </Link>
      </span>
-      <span>{item.commit && item.commit.time_from_now}</span>
+      <span title={item.commit && item.commit.created_at}>{item.commit && item.commit.time_from_now}</span>
    </li>
  )
 }
--- a/src/forge/Main/CoderDepotPath.jsx
+++ b/src/forge/Main/CoderDepotPath.jsx
@ -1,3 +1,4 @@
+import { result } from 'lodash';
 import React from 'react';


--- a/src/forge/Main/CoderDepotReadme.jsx
+++ b/src/forge/Main/CoderDepotReadme.jsx
@ -41,7 +41,7 @@ function CoderDepotReadme({ operate , history , readme , ChangeFile }){

  return(
    <div className="commonBox readBox" id="readme">
-      <Anchor offsetTop={70} targetOffset={160}>
+      <Anchor offsetTop={70}>
        <div className="commonBox-title boxTitle">
          <AlignCenter>
            <Dropdown overlay={menu()} trigger={['hover']} overlayClassName="menuslist">
@ -50,7 +50,9 @@ function CoderDepotReadme({ operate , history , readme , ChangeFile }){
                <span>目录</span>
              </span>
            </Dropdown>
-            <span className="commonBox-title-read">README.md</span>
+            
+              <span className="commonBox-title-read"><a href="#readme ">README.md</a></span>
+            
          </AlignCenter>
          {
            operate ?
--- a/src/forge/Main/CoderRootBranch.js
+++ b/src/forge/Main/CoderRootBranch.js
@ -38,9 +38,9 @@ export default ((props)=>{
              return(
                <li key={key}>
                  <div>
-                    <Link to={`/projects/${owner}/${projectsId}/tree/${turnbar(item.name)}`} className="color-blue font-15" style={{"maxWidth":"100px"}}>{item.name}</Link>
+                    <Link to={`/${owner}/${projectsId}/tree/${turnbar(item.name)}`} className="color-blue font-15" style={{"maxWidth":"100px"}}>{item.name}</Link>
                    <p className="f-wrap-alignCenter mt15">
-                      <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.last_commit.sha}`)}`} className="mr5 commitKey" style={{marginLeft:0}}>{item.last_commit && truncateCommitId(item.last_commit.sha)}</Link>
+                      <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.last_commit.sha}`)}`} className="mr5 commitKey" style={{marginLeft:0}}>{item.last_commit && truncateCommitId(item.last_commit.sha)}</Link>
                      <span className="color-grey-3 hide-1 messages leftPoint">{item.last_commit && item.last_commit.message}</span>
                      <span className="color-grey-8 ml30">最后更新于{item.last_commit && item.last_commit.time_from_now}</span>
                    </p>
@ -48,7 +48,7 @@ export default ((props)=>{
                  <span>
                    {
                      (isManager || isDeveloper) && (projectDetail && projectDetail.type!==2) &&
-                      <Link to={`/projects/${owner}/${projectsId}/pulls/new/${item.name}`} className="mr20 color-blue mr30">创建合并请求</Link>
+                      <Link to={`/${owner}/${projectsId}/pulls/new/${item.name}`} className="mr20 color-blue mr30">创建合并请求</Link>
                    }
                    <Dropdown overlay={menu(item.zip_url,item.tar_url)} trigger={['click']} placement="bottomRight" className="color-green-file">
                      <a className="ant-dropdown-link">
--- a/src/forge/Main/CoderRootCommit.js
+++ b/src/forge/Main/CoderRootCommit.js
@ -1,13 +1,19 @@
 import React , { Component } from 'react';
-import { Spin , Pagination } from 'antd';
+import { Spin , Pagination, Timeline } from 'antd';
 import { getImageUrl } from 'educoder';
-import { truncateCommitId } from '../common/util';
+import { truncateCommitId ,timeFormat } from '../common/util';
 import { AlignTop } from '../Component/layout';
 import SelectBranch from '../Branch/Select';
 import Nodata from '../Nodata';

+import User from '../Component/User';
+import RenderHtml from '../../components/render-html.jsx';
+import Tree from './img/tree.png';
 import axios from 'axios';
 import {Link} from "react-router-dom";
+import CopyTool from '../Component/CopyTool';
+
+import './tree/Index.scss'

 function returnbar(str){
  if(str && str.length>0 && str.indexOf("%2F")>-1){
@ -15,14 +21,16 @@ function returnbar(str){
  }
  return str;
 }
+
+//代码库--提交页面
 class CoderRootCommit extends Component{
  constructor(props){
-    super(props)
+    super(props);
    this.state={
      commitDatas:undefined,
      dataCount:undefined,
-      limit:20,
-      page:1,
+      limit:10,
+      page: 1,
      isSpining:false,
      branchList:undefined
    }
@ -50,20 +58,34 @@ class CoderRootCommit extends Component{
      this.Init();
    }
  }
+
+  UrlParamHash(url){
+    const params = {};
+    let h;
+    let hash = url.slice(url.indexOf('?')+1).split('&');
+    for(let i = 0; i<hash.length;i++){
+      h = hash[i].split('=');
+      params[h[0]] = h[1];
+    }
+    return params;
+  }
+
  Init =()=>{
    const { branchName } = this.props.match.params;
-    const { page , limit } = this.state;
+    const { limit } = this.state;
+    const {search} = this.props.location;
+    const realPage = (search && this.UrlParamHash(search).page) ? parseInt(this.UrlParamHash(search).page) : 1;
    this.setState({
-      isSpining:true
+      isSpining:true,
+      page:realPage
    })
-    this.getCommitList( branchName , page , limit );
+    this.getCommitList( branchName , realPage , limit );
  }

  getCommitList=(branch , page , limit)=>{
    this.setState({
      isSpining:true
    })
-    console.log(returnbar(branch));
    const { projectsId , owner } = this.props.match.params;
    const url = `/${owner}/${projectsId}/commits.json`;
    axios.get(url,{
@ -86,7 +108,8 @@ class CoderRootCommit extends Component{
            image_url:item.author && item.author.image_url,
            sha:item.sha,
            time_from_now:item.time_from_now,
-            message:item.message
+            message:item.message,
+            timestamp:item.timestamp
          })
        })
        this.setState({
@ -101,14 +124,13 @@ class CoderRootCommit extends Component{
  // 切换分支 search:tag为根据标签搜索
  changeBranch=(value)=>{
    const { projectsId , owner } = this.props.match.params;
-    this.props.history.push(`/projects/${owner}/${projectsId}/commits/branch/${value}`);
+    this.props.history.push(`/${owner}/${projectsId}/commits/branch/${value}`);
  }

  ChangePage=(page)=>{
-    const { branchName } = this.props.match.params;
-    const { limit } = this.state;
-    this.getCommitList(branchName , page , limit);
+    this.props.history.push({pathname: this.props.history.location.pathname,search: `page=${page}`})
  }
+  
  render(){
    const { commitDatas , dataCount , limit , page , isSpining , branchList } = this.state;
    const { projectDetail, commit_class , defaultBranch } = this.props;
@ -129,46 +151,50 @@ class CoderRootCommit extends Component{
            ></SelectBranch>
          </div>
          <Spin spinning={isSpining}>
-            <div className="commonBox">
-              <div className="commonBox-title">
-                <div className="f-wrap-between" style={{alignItems:"center"}}>
-                  <span className="font-16">{dataCount}次提交代码({branch})</span>
-                </div>
-              </div>
-              <div className="commitList">
-                {
-                  commitDatas && commitDatas.length > 0 && commitDatas.map((item,k)=>{
-                    return(
-                      <div key={k}>
-                        <AlignTop>
-                          <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitKey" style={{marginLeft:0,marginTop:"3px"}}>{truncateCommitId(`${item.sha}`)}</Link>
-                          <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitDesc">{item.message}</Link>
-                        </AlignTop>
-                        <p className="f-wrap-alignCenter mt15">
-                          {
-                            item.id ?
-                            <Link to={`/users/${item.login}`} className="show-user-link">
-                              {item.image_url?<img src={getImageUrl(`/${item.image_url}`)} alt="" width="28px" height="28px" className="mr15 radius"/>:""}
-                              <label className="font-14 color-grey-6" style={{verticalAlign:'middle'}}>{item.name ?`${item.name}:`:""}提交于 {item.time_from_now}</label>
-                            </Link>:
-                            <span className="show-user-link">
-                              {item.image_url?<img src={getImageUrl(`/${item.image_url}`)} alt="" width="28px" height="28px" className="mr15 radius"/>:""}
-                              <label className="font-14 color-grey-6" style={{verticalAlign:'middle'}}>{item.name ?`${item.name}:`:""}提交于 {item.time_from_now}</label>
-                            </span>
-                          }
-                          
-                        </p> 
+            <Timeline className="commitList">
+              {
+                commitDatas && commitDatas.length > 0 && commitDatas.map((item,k)=>{
+                  return(
+                    <Timeline.Item key={k} dot={page ===1 && k===0 ?<span className="new-conmmit">最新</span>:<i className="iconfont icon-a-yuanquan2x"></i>}>
+                      <div className="commitList-item f-wrap-between">
+                        <div>
+                          <AlignTop>
+                            <div className="commitDesc"><Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="font-14 color-grey-3 font-bd"><RenderHtml value={item.message}/></Link></div>
+                          </AlignTop>
+                          <p className="f-wrap-alignCenter mt15 pb5">
+                            <User
+                              id={item.id}
+                              url={(item.image_url && getImageUrl(`/${item.image_url}`)) || "https://dss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=3025493530,1989042357&fm=26&gp=0.jpg"}
+                              name={item.name}
+                              login={item.login}
+                            />
+                            {item.timestamp && <label className="font-14 color-grey-3 ml3">提交于 {timeFormat(item.timestamp)}</label>}
+                          </p>
+                        </div>
+                        <div>
+                          <div className="treecopy">
+                            <div>
+                              <span className="treecopy-cont shadow">
+                                <img src={Tree} alt="sha" width={"16px"}/>
+                                <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`}>{truncateCommitId(`${item.sha}`)}</Link>
+                                <input type="text" id={`value${k}`} value={`${truncateCommitId(`${item.sha}`)}`}/>
+                              </span>
+                              <CopyTool beforeText="复制commit id" afterText="复制成功" inputId={`value${k}`}/>
+                            </div>
+                            <button className="btn-83" onClick={()=>{window.location.href=`/${owner}/${projectsId}/tree/${truncateCommitId(item.sha)}`}}>浏览文件</button>
+                          </div>
+                        </div>
                      </div>
-                    )
-                  })
-                }
-                {commitDatas && commitDatas.length === 0 && <Nodata _html="暂无数据"/>}
-              </div>
-            </div>
+                    </Timeline.Item>
+                  )
+                })
+              }
+              {commitDatas && commitDatas.length === 0 && <Nodata _html="暂无数据"/>}
+            </Timeline>
            {
              dataCount > limit ?
                <div className="edu-txt-center pt30 mb30">
-                  <Pagination simple defaultCurrent={page} total={dataCount} pageSize={limit} onChange={this.ChangePage}></Pagination>
+                  <Pagination simple current={page} total={dataCount} pageSize={limit} onChange={this.ChangePage}></Pagination>
                </div>
              :""
            }
--- a/src/forge/Main/CoderRootFileDetail.js
+++ b/src/forge/Main/CoderRootFileDetail.js
@ -1,10 +1,12 @@
 import React, { Component } from "react";
-import { Popconfirm , Select } from "antd";
+import { Popconfirm , Select , Dropdown , Spin , Anchor } from "antd";
 import "./list.scss";
 import axios from "axios";
 import Meditor from "../Newfile/m_editor";
 import RenderHtml from "../../components/render-html";
+import ReadmeCatelogue from "./sub/ReadmeCatelogue";

+const $ = window.$;
 function bytesToSize(bytes) {
  if (bytes === 0) return "0 B";
  let k = 1024,
@ -19,11 +21,13 @@ class CoderRootFileDetail extends Component {
      value: undefined,
      language: undefined,
      languages: undefined,
-      description: props.detail.content
+      description: props.detail.content,
+      menuList:undefined
    };
  }

  componentDidMount = () => {
+    window.scrollTo(0, 0);
    const { detail , mdFlag } = this.props;
    this.setState({
      value: detail.content,
@ -149,7 +153,7 @@ class CoderRootFileDetail extends Component {
      .then((result) => {
        if (result) {
          this.props.showNotification("删除成功!");
-          this.props.history.push(`/projects/${owner}/${projectsId}`);
+          this.props.history.push(`/${owner}/${projectsId}`);
        }
      })
      .catch((error) => {
@ -169,6 +173,31 @@ class CoderRootFileDetail extends Component {
    });
  };

+  renderMenulist=()=>{
+    const { description } = this.state;
+      if(description){
+        const items = $.map($("#files-md").find("h1,h2,h3,h4,h5,h6"), function (el, _) {
+          const anchor = el.id;
+          const level = el.tagName.replace("H", "");
+          const href = `#${anchor}`;
+          return { href:`${href}`,text:el.textContent , level:level }
+        });
+        return items;
+      }
+    return [];
+  }
+
+  menu=()=>{
+    const menuList = this.renderMenulist();
+    if(menuList && menuList.length > 0){
+      return(
+        <ReadmeCatelogue menuList={menuList} hash={this.props.history.location.hash}/>
+      )
+    }else{
+      return <Spin />
+    }
+  }
+
  render() {
    const {
      readOnly,
@ -186,79 +215,88 @@ class CoderRootFileDetail extends Component {
    const Option = Select.Option;
    return (
      <React.Fragment>
-        <div className="grid-item branchTitle">
-          <div className="grid-item">
-            <span className="ml20 color-grey-6 font-16">
+        <Anchor className="griditemAnchor" offsetTop={70}>
+          <div className="griditemCate">
+            {
+              md && readOnly &&
+              <Dropdown overlay={this.menu()} trigger={['hover']} overlayClassName="menuslist">
+                <span className="catelogue mr20">
+                  <i className="iconfont icon-muluicon font-12 mr5"></i>
+                  <span>目录</span>
+                </span>
+              </Dropdown>
+            }
+            <span className="color-grey-6 font-16">
              {bytesToSize(detail && detail.size)}
            </span>
          </div>
          <p className="text-right">
-            {flag && platform && (
-              <div>
-                {readOnly ? (
-                  <span>
-                    {
-                      !detail.direct_download?
-                        <span>
-                          <a onClick={() => this.DownLoadFile(detail.download_url)} className="ml20">
-                            <i className="iconfont icon-xiazai1 font-15 color-grey-6"></i>
-                          </a>
-                          {
-                            type !==2  &&
-                            <a onClick={() => this.EditFile(false)} className="ml20">
-                              <i className="iconfont icon-bianji1 font-15 color-grey-6"></i>
+              {flag && platform && (
+                <div>
+                  {readOnly ? (
+                    <span>
+                      {
+                        !detail.direct_download?
+                          <span>
+                            <a onClick={() => this.DownLoadFile(detail.download_url)} className="ml20">
+                              <i className="iconfont icon-xiazai1 font-15 color-grey-6"></i>
                            </a>
-                          }
-                        </span>:""
-                    }
-                  </span>
-                ) : (
-                    <React.Fragment>
-                      <Select
-                        showSearch={true}
-                        placeholder={"请选择文本语言"}
-                        style={{ width: 200 }}
-                        value={language}
-                        onChange={this.select_language}
-                      >
-                        <Option value={undefined}>请选择文本语言</Option>
-                        {languages &&
-                          languages.map((item, key) => {
-                            return (
-                              <Option value={item} key={key}>
-                                {item}
-                              </Option>
-                            );
-                          })}
-                      </Select>
-                      <button
-                        type="button"
-                        className="ant-btn ant-btn-sm ml20"
-                        onClick={() => this.EditFile(true)}
-                      >
-                        <span>取 消</span>
-                      </button>
-                    </React.Fragment>
-                  )}
-                {
-                  type !==2 &&
-                  <Popconfirm
-                    title="确认删除这个文件？"
-                    className="ml20"
-                    okText="确定"
-                    cancelText="取消"
-                    onConfirm={this.deleteFile}
-                  >
-                    <a>
-                      <i className="iconfont icon-shanchu font-15 color-grey-6"></i>
-                    </a>
-                  </Popconfirm>
-                }
-                
-              </div>
-            )}
-          </p>
-        </div>
+                            {
+                              type !==2  &&
+                              <a onClick={() => this.EditFile(false)} className="ml20">
+                                <i className="iconfont icon-bianji1 font-15 color-grey-6"></i>
+                              </a>
+                            }
+                          </span>:""
+                      }
+                    </span>
+                  ) : (
+                      <React.Fragment>
+                        <Select
+                          showSearch={true}
+                          placeholder={"请选择文本语言"}
+                          style={{ width: 200 }}
+                          value={language}
+                          onChange={this.select_language}
+                        >
+                          <Option value={undefined}>请选择文本语言</Option>
+                          {languages &&
+                            languages.map((item, key) => {
+                              return (
+                                <Option value={item} key={key}>
+                                  {item}
+                                </Option>
+                              );
+                            })}
+                        </Select>
+                        <button
+                          type="button"
+                          className="ant-btn ant-btn-sm ml20"
+                          onClick={() => this.EditFile(true)}
+                        >
+                          <span>取 消</span>
+                        </button>
+                      </React.Fragment>
+                    )}
+                  {
+                    type !==2 &&
+                    <Popconfirm
+                      title="确认删除这个文件？"
+                      className="ml20"
+                      okText="确定"
+                      cancelText="取消"
+                      onConfirm={this.deleteFile}
+                    >
+                      <a>
+                        <i className="iconfont icon-shanchu font-15 color-grey-6"></i>
+                      </a>
+                    </Popconfirm>
+                  }
+                  
+                </div>
+              )}
+            </p>
+        </Anchor>
        <div>
          {detail.image_type ? (
            <div className="edu-txt-center pt20 pb20">
@ -272,7 +310,7 @@ class CoderRootFileDetail extends Component {
            </div>
          ) : (
            md && readOnly ?
-              <div className="files-md">
+              <div className="files-md" id="files-md">
                <RenderHtml className="file-md imageLayerParent" value={description}  url={this.props.history.location}/>
              </div>
              :
--- a/src/forge/Main/CoderRootIndex.js
+++ b/src/forge/Main/CoderRootIndex.js
@ -1,9 +1,9 @@
 import React , { Component } from 'react';
 import { Route , Switch } from 'react-router-dom';
-import Top from './DetailTop';
+// import Top from './DetailTop';
 import Loadable from 'react-loadable';
 import Loading from '../../Loading';
-import axios from 'axios';
+import './Index.scss';

 const FileNew = Loadable({
  loader: () => import('../Newfile/Index'),
@ -18,25 +18,25 @@ const CoderRootCommit = Loadable({
 	loading: Loading,
 })
 const CoderRootBranch = Loadable({
-	loader: () => import('./CoderRootBranch'),
+	loader: () => import('./tree/Index'),
 	loading: Loading,
 })
 const CoderRootTag = Loadable({
-  loader: () => import('./CoderRootTag'),
+  loader: () => import('./tag/Index'),
  loading: Loading,
 })
 const CoderRootVersion = Loadable({
-  loader: () => import('../Version/version'),
-  loading: Loading,
-})
-const CoderRootVersionNew = Loadable({
-  loader: () => import('../Version/New'),
-  loading: Loading,
-})
-const CoderRootVersionUpdate = Loadable({
-  loader: () => import('../Version/New'),
+  loader: () => import('./version/Index'),
  loading: Loading,
 })
+// const CoderRootVersionNew = Loadable({
+//   loader: () => import('./version/New'),
+//   loading: Loading,
+// })
+// const CoderRootVersionUpdate = Loadable({
+//   loader: () => import('./version/New'),
+//   loading: Loading,
+// })
 const Diff =  Loadable({
  loader: () => import('./Diff'),
  loading: Loading,
@ -50,94 +50,94 @@ class CoderRootIndex extends Component{
    }
  }

-  componentDidMount=()=>{
-    this.Init();
-  }
-  componentDidUpdate=(prevProps)=>{
-    const { location } = this.props;
-    const prevlocation = prevProps && prevProps.location;
-    if (location !== prevlocation) {
-      this.Init();
-    }
-  }
+  // componentDidMount=()=>{
+  //   this.Init();
+  // }
+  // componentDidUpdate=(prevProps)=>{
+  //   const { location } = this.props;
+  //   const prevlocation = prevProps && prevProps.location;
+  //   if (location !== prevlocation) {
+  //     this.Init();
+  //   }
+  // }

-  Init=()=>{
-    const { branchName } = this.props.match.params;
-    const { defaultBranch } = this.props;
-    this.getTopCount(branchName || defaultBranch);
-  }
+  // Init=()=>{
+  //   const { branchName } = this.props.match.params;
+  //   const { defaultBranch } = this.props;
+  //   this.getTopCount(branchName || defaultBranch);
+  // }

  // 获取<Top />组件里要显示的数据
-  getTopCount=(branch)=>{
-    const { projectsId , owner } = this.props.match.params;
-    const url = `/${owner}/${projectsId}/top_counts.json`;
-    axios.get(url,{params:{
-      ref:branch
-    }}).then(result=>{
-      if(result){
-        this.setState({
-          coderCount:result.data
-        })
-      }
-    }).catch(error=>{console.log(error);})
-  }
+  // getTopCount=(branch)=>{
+  //   const { projectsId , owner } = this.props.match.params;
+  //   const url = `/${owner}/${projectsId}/top_counts.json`;
+  //   axios.get(url,{params:{
+  //     ref:branch
+  //   }}).then(result=>{
+  //     if(result){
+  //       this.setState({
+  //         coderCount:result.data
+  //       })
+  //     }
+  //   }).catch(error=>{console.log(error);})
+  // }
  render(){
    return(
-      <div>
-        <Top {...this.props} {...this.state}/>
+      <div className="coderSubPage">
+        {/* <Top {...this.props} {...this.state}/> */}
        <Switch {...this.props}>
          {/* 新建文件 */}
-          <Route path="/projects/:owner/:projectsId/:branch/newfile/:path"
+          <Route path="/:owner/:projectsId/:branch/newfile/:path"
            render={
              (props) => (<FileNew {...this.props} {...props} {...this.state} />)
            }
          ></Route>
-          <Route path="/projects/:owner/:projectsId/:branch/uploadfile"
+          <Route path="/:owner/:projectsId/:branch/uploadfile"
            render={
              (props) => (<UploadFile {...this.props} {...props} {...this.state} />)
            }
          ></Route>
-          <Route path="/projects/:owner/:projectsId/:branch/newfile"
+          <Route path="/:owner/:projectsId/:branch/newfile"
            render={
-              (props) => (<FileNew {...this.props} {...props} {...this.state} getTopCount={this.getTopCount} />)
+              (props) => (<FileNew {...this.props} {...props} {...this.state} />)
            }
          ></Route>
-          <Route path="/projects/:owner/:projectsId/commits/branch/:branchName"
+          <Route path="/:owner/:projectsId/commits/branch/:branchName"
            render={
-              () => (<CoderRootCommit {...this.props} {...this.state} commit_class="main" getTopCount={this.getTopCount}  />)
+              () => (<CoderRootCommit {...this.props} {...this.state} commit_class="main" />)
            }
          ></Route>
-          <Route path="/projects/:owner/:projectsId/commits/:sha"
+          <Route path="/:owner/:projectsId/commits/:sha"
            render={
              (props) => (<Diff {...this.props} {...props} {...this.state}/>)
            }
          ></Route>
-          <Route path="/projects/:owner/:projectsId/commits"
+          <Route path="/:owner/:projectsId/commits"
            render={
-              () => (<CoderRootCommit {...this.props} {...this.state} commit_class="main" getTopCount={this.getTopCount}  />)
+              () => (<CoderRootCommit {...this.props} {...this.state} commit_class="main" />)
            }
          ></Route>
-          <Route path="/projects/:owner/:projectsId/releases/:versionId/update"
+          {/* <Route path="/:owner/:projectsId/releases/:versionId/update"
            render={
              (props) => (<CoderRootVersionUpdate {...this.props} {...this.state} {...props} />)
            }
          ></Route>
-          <Route path="/projects/:owner/:projectsId/releases/new"
+          <Route path="/:owner/:projectsId/releases/new"
            render={
              () => (<CoderRootVersionNew {...this.props} {...this.state} />)
            }
-          ></Route>
-          <Route path="/projects/:owner/:projectsId/releases"
+          ></Route> */}
+          <Route path="/:owner/:projectsId/releases"
            render={
              () => (<CoderRootVersion {...this.props} {...this.state} />)
            }
          ></Route>
-          <Route path="/projects/:owner/:projectsId/tag"
+          <Route path="/:owner/:projectsId/tags"
            render={
              () => (<CoderRootTag {...this.props} {...this.state} />)
            }
          ></Route>
-          <Route path="/projects/:owner/:projectsId/branchs"
+          <Route path="/:owner/:projectsId/branches"
            render={
              () => (<CoderRootBranch {...this.props} {...this.state} />)
            }
--- a/src/forge/Main/CoderRootTag.js
+++ b/src/forge/Main/CoderRootTag.js
@ -34,7 +34,7 @@ export default (( props, { projectDetail }) => {
            <div className="div_table">
              <ul className="ul_thead">
                <li>
-                  <span className="flex1">标签名</span>
+                  <span className="flex1">标记名</span>
                  <span>提交信息</span>
                  <span className="ul_tbody_forth">下载</span>
                </li>
@ -49,7 +49,7 @@ export default (( props, { projectDetail }) => {
                          <span className="font-16">{item.name}</span>
                        </span>
                        <span className="ul_tbody_third">
-                          <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.id}`)}`} className="commitKey" style={{ "marginLeft": 0 }}>{truncateCommitId(`${item.id}`)}</Link>
+                          <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.id}`)}`} className="commitKey" style={{ "marginLeft": 0 }}>{truncateCommitId(`${item.id}`)}</Link>
                        </span>
                        <span className="ul_tbody_forth">
                          <a href={item.tarball_url} style={{ color: "#4CC1DA" }} className="mr30"><i className="iconfont icon-TAR font-18 mr5"></i>TAR</a>
--- a/src/forge/Main/Detail.js
+++ b/src/forge/Main/Detail.js
--- a/src/forge/Main/DetailAdaptor.js
+++ b/src/forge/Main/DetailAdaptor.js
@ -0,0 +1,28 @@
+import React from 'react';
+import { Route, Switch } from "react-router-dom";
+import { withRouter } from "react-router";
+import Loadable from "react-loadable";
+import Loading from "../../Loading";
+import { SnackbarHOC } from "educoder";
+import { CNotificationHOC } from "../../modules/courses/common/CNotificationHOC";
+import { TPMIndexHOC } from "../../modules/tpm/TPMIndexHOC";
+
+// forge项目详情
+const ProjectDetail = Loadable({
+  loader: () => import("../Main/Detail"),
+  loading: Loading,
+});
+export default withRouter(
+  (CNotificationHOC()(SnackbarHOC()(TPMIndexHOC((props) => {
+    return (
+      <Switch>
+        <Route
+          path="/:owner/:projectsId"
+          render={(p) => (
+            <ProjectDetail  {...props} {...p} />
+          )}
+        ></Route>
+      </Switch>
+    )
+  }))))
+)
--- a/src/forge/Main/DetailTop.js
+++ b/src/forge/Main/DetailTop.js
@ -12,19 +12,19 @@ class DetailTop extends Component {
        {
          platform ?
          <React.Fragment>
-            <Link to={`/projects/${owner}/${projectsId}/commits`} className={pathname.indexOf("/commits") > 0 ? "active" : ""}>
+            <Link to={`/${owner}/${projectsId}/commits`} className={pathname.indexOf("/commits") > 0 ? "active" : ""}>
              <i className="iconfont icon-tijiaojilu font-20 mr3 font-bd"></i>
              <span>{(coderCount && coderCount.commits_count) || 0}</span>个提交
            </Link>
-            <Link to={`/projects/${owner}/${projectsId}/branchs`} className={pathname.indexOf("/branchs") > 0 ? "active" : ""}>
+            <Link to={`/${owner}/${projectsId}/branches`} className={pathname.indexOf("/branches") > 0 ? "active" : ""}>
              <i className="iconfont icon-fenzhi1 font-18 mr3"></i>
              <span>{(coderCount && coderCount.branches_count) || 0}</span>个分支
            </Link>
-            <Link to={`/projects/${owner}/${projectsId}/tag`} className={pathname.indexOf("/tag") > 0 ? "active" : ""}>
+            <Link to={`/${owner}/${projectsId}/tags`} className={pathname.indexOf("/tags") > 0 ? "active" : ""}>
              <i className="iconfont icon-biaoqian3 font-18 mr3"></i>
              <span>{(coderCount && coderCount.tags_count) || 0}</span>个标签
            </Link>
-            <Link to={`/projects/${owner}/${projectsId}/releases`} className={pathname.indexOf("/releases") > 0 ? "active" : ""}>
+            <Link to={`/${owner}/${projectsId}/releases`} className={pathname.indexOf("/releases") > 0 ? "active" : ""}>
              <i className="iconfont icon-fahangban font-18 mr3"></i>
              <span>{(coderCount && coderCount.version_releasesed_count) || 0}</span>个发行版
            </Link>
--- a/src/forge/Main/Diff.jsx
+++ b/src/forge/Main/Diff.jsx
@ -1,35 +1,65 @@
 import React, { useEffect, useState } from "react";
 import styled from "styled-components";
 import { Button ,Spin } from "antd";
-import { truncateCommitId } from '../common/util';
+import { timeFormat, truncateCommitId } from '../common/util';
 import { getImageUrl } from 'educoder';
 import Files from '../Merge/Files';
-
+import Tree from "./img/tree.png";
 import User from "../Component/User";
-import Keys from "../Component/Keys";
-
+import RenderHtml  from "../../components/render-html";
 import axios from "axios";
+import { Link } from "react-router-dom";

 const Infos = styled.div`
-  border: 1px solid #dddddd;
+  border: 1px solid #FAFCFF;
  margin-bottom:15px;
  & .commitinfos {
    background-color: #f1f8ff;
-    border-bottom: 1px solid #ddd;
-    padding: 20px;
+    border: 1px solid rgba(42, 97, 255, 0.23);
+    border-radius: 3px 3px 0px 0px;
+    padding: 10px 20px 10px 16px;
+    & .markdown-body table{
+      background: #f1f8ff;
+    }
+    & .btnblue{
+      margin-top: 12px;
+    }
+    & .task-hide{
+      width: 65rem;
+      overflow:hidden;
+      white-space:normal;
+      word-break:break-all;
+      font-weight: bold;
+      color: #333333;
+      font-size: 16px;
+    }
  }
  & > .f-wrap-between {
-    padding: 10px 20px;
+    padding: 14px 20px 14px 16px;
+    border-radius: 3px 3px 0px 0px;
+    border: 1px solid #D0D0D0;
+    .df{
+      align-items: center;
+      & .underline:hover{
+        text-decoration: underline;
+      }
+    }
  }
 `;
-
-export default ({ match , history }) => {
+function turnbar(str){
+  if(str && str.length>0 && str.indexOf("/")>-1){
+    return str.replaceAll('/','%2F');
+  }
+  return str;
+}
+//提交详情页
+export default (props) => {
+  const {match , history } = props;
  const [data, setData] = useState({undefined});
  const [commit, setCommit] = useState(undefined);
  const [parents, setParents] = useState(undefined);
  const [committer, setCommitter] = useState(undefined);
  const [isSpin, setIsSpin] = useState(true);
-
  const { sha , projectsId, owner } = match.params;
  useEffect(() => {
    if (projectsId && owner && sha) {
@ -43,6 +73,7 @@ export default ({ match , history }) => {
            setParents(result.data.parents);
            setCommitter(result.data.committer || (result.data.commit && result.data.commit.committer));
            setIsSpin(false);
+            
          }
        })
        .catch(error => {
@ -56,29 +87,42 @@ export default ({ match , history }) => {
        <Infos>
          <div className="commitinfos">
            <div className="f-wrap-between">
-              {commit && commit.message &&
-                <pre className="task-hide" style={{marginBottom:"0px",height:"28px",whiteSpace:"pre-wrap"}}>{commit.message}</pre>
-              }
-              <Button type="primary" onClick={()=>{history.push(`/projects/${owner}/${projectsId}/tree/${truncateCommitId(sha)}`)}} className="ml30">浏览代码</Button>
+              <div>
+                {commit && commit.message &&
+                  <RenderHtml className="task-hide" value={commit.message}/>
+                }
+                <Link to={`/${owner}/${projectsId}/tree/${data.branch}`}><i className="iconfont icon-fenzhi2 font-18"></i>{data.branch}</Link>
+              </div>
+              <Button type="primary" onClick={()=>{history.push(`/${owner}/${projectsId}/tree/${truncateCommitId(sha)}`)}} className="btnblue" style={{height:"36px"}}>浏览文件</Button>
            </div>
          </div>
          <div className="f-wrap-between" style={{ alignItems: "center" }}>
            <ul className="df">
              <User
-                url={(committer && getImageUrl(`/${committer.image_url}`))|| "https://dss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=3025493530,1989042357&fm=26&gp=0.jpg"}
+                id = {committer && committer.id}
+                url={(committer && getImageUrl(`/${committer.image_url}`))}
                name={committer && committer.name}
+                login={committer && committer.login}
              />
-              {committer && committer.time_from_now && <li className="ml20 mt2">{committer.time_from_now}</li>}
+              {commit && commit.timestamp && <li className="ml4">提交于{timeFormat(commit.timestamp)}</li>}
            </ul>
            <li className="df">
              {
                parents && parents.length > 0 && parents.map((item,key)=>{
                  return(
-                    <Keys title="父节点" value={truncateCommitId(item.sha)} key={key} className="mr20"></Keys>
+                    <div className="ml40 f-wrap-alignCenter">
+                      <label className="mr8">父节点</label>
+                      <img src={Tree} alt="sha" width={"16px"} className="mr4"/>
+                      <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}/${data.branch}`} className="underline">{truncateCommitId(item.sha)}</Link>
+                    </div>
                  )
                })
              }
-              <Keys title="当前节点" value={truncateCommitId(sha)}></Keys>
+              <div className="ml40 f-wrap-alignCenter">
+                <label className="mr8">当前节点</label>
+                <img src={Tree} alt="sha" width={"16px"} className="mr4"/>
+                <span>{truncateCommitId(sha)}</span>
+              </div>
            </li>
          </div>
        </Infos>
@ -87,6 +131,7 @@ export default ({ match , history }) => {
          data={data} 
          owner={owner} 
          projectsId={projectsId} 
+          parentsSha={parents && parents.length > 0 && parents[0].sha}
        />
      </Spin>
    </div>
--- a/src/forge/Main/Index.css
+++ b/src/forge/Main/Index.css
@ -1,420 +0,0 @@
-.recommandOri.slick-slider {
-  width: 1300px;
-  margin: 20px auto 40px;
-}
-.recommandOri.slick-slider .slick-track {
-  margin-left: 0px;
-}
-.recommandOri.slick-slider .slick-slide li > a {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-/* recommandProjects */
-.recommandProjects.slick-slider {
-  width: 1230px;
-  margin: 20px auto 40px;
-}
-.recommandProjects.slick-slider .slick-track {
-  margin-left: 0px;
-}
-.recommandProjects.slick-slider .slick-arrow.slick-prev:before, .recommandProjects.slick-slider .slick-arrow.slick-next:before {
-  color: #999;
-}
-.recommandProjects.slick-slider .slick-arrow.slick-prev li.slick-active button:before, .recommandProjects.slick-slider .slick-arrow.slick-next li.slick-active button:before {
-  color: #999;
-}
-.recommandProjects.slick-slider .slick-dots {
-  bottom: -29px;
-}
-.recommandProjects.slick-slider .slick-dots li button:before {
-  color: #909090;
-}
-.recommandProjects.slick-slider .slick-slide {
-  padding: 0px 15px;
-  box-sizing: border-box;
-}
-.recommandProjects.slick-slider .slick-slide > div {
-  background-color: #fff;
-  border-radius: 10px;
-  width: 100%;
-  cursor: pointer;
-  border: 1px solid #eee;
-}
-.recommandProjects.slick-slider .slick-slide > div:hover {
-  box-shadow: 0px 2px 20px 0px rgba(0, 0, 0, 0.1);
-}
-.recommandProjects.slick-slider .baseInfo {
-  padding: 18px 15px;
-  display: flex;
-  font-size: 12px;
-  color: #888;
-}
-.recommandProjects.slick-slider .baseInfo .look {
-  margin-right: 10px;
-}
-.recommandProjects.slick-slider .baseInfo .look i {
-  margin-right: 5px;
-}
-.recommandProjects.slick-slider .baseInfo .type {
-  flex: 1;
-  width: 0;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  text-align: right;
-}
-.recommandProjects.slick-slider .mainInfo {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  min-height: 160px;
-  border-bottom: 1px solid #eee;
-  padding: 20px;
-  box-sizing: border-box;
-}
-.recommandProjects.slick-slider .mainInfo img {
-  height: 50px;
-  width: 50px;
-  border-radius: 50%;
-}
-.recommandProjects.slick-slider .mainInfo .name {
-  font-size: 13px;
-  color: #666;
-  height: 18px;
-  line-height: 18px;
-  margin-top: 12px;
-}
-.recommandProjects.slick-slider .mainInfo .school {
-  margin-top: 12px;
-  color: #333;
-  font-size: 16px;
-  height: 22px;
-  line-height: 22px;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  max-width: 100%;
-}
-
-.Panels {
-  max-width: 1200px;
-  margin: 0 auto;
-}
-.Panels .panelmenu {
-  padding-top: 30px;
-}
-.Panels .panelmenu .depotBtn .mr-5 {
-  margin-right: -5px;
-}
-.Panels .panelmenu .depotBtn .ant-btn {
-  height: 36px;
-  line-height: 34px;
-  width: 83px;
-  text-align: center;
-  padding: 0px;
-  font-weight: 500;
-  font-size: 14px;
-}
-.Panels .panelmenu .depotBtn .ant-btn-default {
-  color: #333;
-  border-color: #d0d0d0;
-}
-.Panels .panelmenu .depotBtn .ant-btn-default:hover {
-  background: #F3F4F6;
-}
-.Panels .panelmenu .depotBtn .ant-btn-primary {
-  color: #fff;
-  background-color: #466AFF;
-  opacity: 0.8;
-}
-.Panels .addOptionBtn {
-  height: 32px;
-  line-height: 30px;
-  display: flex;
-  border: 1px solid #d9d9d9;
-  border-radius: 2px;
-}
-.Panels .addOptionBtn a {
-  padding: 0px 13px;
-  color: rgba(0, 0, 0, 0.65);
-  cursor: pointer;
-}
-.Panels .addOptionBtn > a:first-child {
-  border-right: 1px solid #d9d9d9;
-}
-.Panels .addOptionBtn > a:last-child {
-  border-right: none;
-}
-.Panels .infoCount {
-  display: inline-block;
-  width: 24px;
-  text-align: center;
-  height: 24px;
-  line-height: 24px;
-  background-color: rgba(153, 153, 153, 0.13);
-  color: #666;
-  border-radius: 12px;
-  margin-left: 6px;
-  font-size: 12px;
-}
-.Panels .attrPerson {
-  padding-top: 12px;
-  display: flex;
-  flex-wrap: wrap;
-  padding-bottom: 2px;
-}
-.Panels .attrPerson a {
-  margin: 0px 17px 0px 0px;
-}
-.Panels .attrPerson a img {
-  border-radius: 50%;
-  width: 40px;
-  height: 40px;
-}
-.Panels .attrPerson a:nth-child(6) {
-  margin-right: 0px;
-}
-.Panels .progress {
-  display: flex;
-  border-radius: 10px;
-  height: 7px;
-  margin-top: 12px;
-}
-.Panels .progress span:first-child {
-  border-radius: 10px 0px 0px 10px;
-}
-.Panels .progress span:last-child {
-  border-radius: 0px 10px 10px 0px;
-}
-.Panels .progresstip {
-  margin-top: 15px;
-  flex-wrap: wrap;
-}
-.Panels .progresstip i.zero {
-  position: absolute;
-  display: block;
-  border-radius: 50%;
-  height: 8px;
-  width: 8px;
-  left: 0px;
-  top: 10px;
-}
-.Panels .progresstip > span {
-  padding-left: 15px;
-  position: relative;
-  min-width: 33.5%;
-  font-size: 12px;
-  font-weight: 400;
-  color: #666;
-}
-.Panels .progresstip > span span:last-child {
-  margin-left: 5px;
-}
-.Panels .listtable {
-  margin-top: 20px;
-}
-.Panels .listtable .listtablehead {
-  height: 55px;
-  display: flex;
-  justify-content: space-between;
-  align-items: flex-start;
-  border-bottom: 1px solid #d9d9d9;
-  padding: 13px 20px;
-  border-radius: 4px 4px 0px 0px;
-  border: 1px solid rgba(42, 97, 255, 0.23);
-  background-color: #FAFCFF;
-}
-.Panels .listtable .listtablehead .ellipsistxt {
-  margin-top: 6px;
-  margin-left: 13px;
-  line-height: 18px;
-  flex: 1;
-  width: 0;
-  color: #666;
-}
-.Panels .listtable .listtablehead .ellipsistxt #ptxt {
-  margin-bottom: 0px;
-  word-break: break-all;
-  overflow: unset;
-  white-space: pre-wrap;
-  /* css3.0 */
-  white-space: -moz-pre-wrap;
-  /* Firefox */
-  white-space: -pre-wrap;
-  /* Opera 4-6 */
-  white-space: -o-pre-wrap;
-  /* Opera 7 */
-  word-wrap: break-word;
-}
-.Panels .listtable .listtablehead .ellipsistxt.hidetxt {
-  height: 18px;
-  overflow: hidden;
-  position: relative;
-  padding-right: 8px;
-}
-.Panels .listtable .listtablehead .ellipsis {
-  margin-left: 8px;
-  cursor: pointer;
-  border-radius: 2px;
-  height: 16px;
-  background: rgba(153, 153, 153, 0.2);
-  border-radius: 2px;
-  padding: 0px 4px;
-  height: 14px;
-  line-height: 14px;
-  margin-top: 9px;
-}
-.Panels .listtable .listtablehead .ellipsis i {
-  font-size: 15px !important;
-  color: #333;
-  height: 14px;
-  line-height: 14px;
-}
-.Panels .listtable .listtablebody {
-  border-radius: 0px 0px 4px 4px;
-  border: 1px solid #D0D0D0;
-  border-top: none;
-}
-.Panels .listtable .listtablebody li.listtablepath a {
-  color: #40a9ff;
-}
-.Panels .listtable .listtablebody li.listtablepath p {
-  margin-bottom: 0px !important;
-}
-.Panels .listtable .listtablebody > li {
-  height: 38px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  border-bottom: 1px solid #d9d9d9;
-  padding: 0px 20px 0px 24px;
-}
-.Panels .listtable .listtablebody > li:hover {
-  background-color: #F3F4F6;
-}
-.Panels .listtable .listtablebody > li > span:first-child {
-  width: 30%;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-}
-.Panels .listtable .listtablebody > li > span:nth-child(2) {
-  width: 60%;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-}
-.Panels .listtable .listtablebody > li > span:nth-child(3) {
-  width: 10%;
-  text-align: right;
-}
-.Panels .listtable .listtablebody > li:last-child {
-  border-bottom: none;
-}
-
-.drawerBtn {
-  position: fixed;
-  left: -13px;
-  width: 33px;
-  background: #FFFFFF;
-  box-shadow: 0px 0px 8px 3px rgba(0, 0, 0, 0.09);
-  border: 1px solid #666666;
-  border-radius: 0px 12px 12px 0px;
-  height: 70px;
-  top: 50%;
-  margin-top: -35px;
-  cursor: pointer;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  padding-left: 7px;
-}
-.drawerBtn:hover {
-  box-shadow: 0px 0px 8px 3px rgba(0, 0, 0, 0.09);
-}
-.drawerBtn span {
-  writing-mode: vertical-lr;
-  color: #333;
-  width: 25px;
-  font-size: 14px;
-}
-.drawerBtn i {
-  color: #333;
-  height: 14px;
-  line-height: 14px;
-  width: 14px;
-  margin-left: 2px;
-  margin-bottom: 3px;
-}
-
-.downMenu {
-  width: 329px;
-  background-color: #fff;
-  box-shadow: 0px 1px 8px 1px rgba(212, 212, 212, 0.5);
-  padding-bottom: 14px;
-}
-.downMenu .ant-menu-item {
-  height: 50px;
-  line-height: 50px;
-}
-
-.catelogue {
-  cursor: pointer;
-  background: #FAFBFC;
-  border-radius: 4px;
-  border: 1px solid #D0D0D0;
-  font-size: 15px;
-  font-weight: normal;
-  margin-right: 12px;
-  padding: 0px 10px;
-  height: 30px;
-  line-height: 30px;
-  color: #666 !important;
-  display: flex;
-  align-items: center;
-}
-.catelogue:hover {
-  background-color: #F3F4F6;
-}
-.catelogue span {
-  margin-top: 1px;
-}
-
-.submoduleStyle {
-  cursor: default;
-}
-.submoduleStyle i {
-  cursor: default;
-}
-.submoduleStyle:hover {
-  color: #05101a;
-}
-
-.pinfos i, .pinfos a {
-  color: #666;
-}
-.pinfos:hover i, .pinfos:hover a {
-  color: #466AFF;
-}
-
-.graph {
-  flex: 1;
-  margin: 0px 12px;
-}
-.graph .ant-typography {
-  white-space: pre-wrap;
-  margin-bottom: 0px;
-}
-
-.ant-anchor-wrapper {
-  padding-left: 2px;
-}
-.ant-anchor-wrapper .ant-anchor-ink::before {
-  background-color: #fff;
-}
-
-/*# sourceMappingURL=Index.css.map */
--- a/src/forge/Main/Index.css.map
+++ b/src/forge/Main/Index.css.map
@ -1 +0,0 @@
-{"version":3,"sourceRoot":"","sources":["Index.scss"],"names":[],"mappings":"AAAA;EACE;EACA;;AACA;EACE;;AAGA;EAEE;EACA;EACA;;;AAIN;AACA;EACE;EACA;;AACA;EACE;;AAGA;EACE;;AAEF;EACE;;AAGJ;EACE;;AACA;EACE;;AAGJ;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;;AAIN;EACE;EACA;EACA;EACA;;AACA;EAIE;;AAHA;EACE;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAKN;EACE;EACA;;AACA;EACE;;AAEE;EACE;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;;AACA;EACE;;AAGJ;EACE;EACA;EACA;;AAIN;EACE;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;;AAEF;EACE;;AAEF;EACE;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;;AACA;EACE;;AACA;EACE;EACA;EACA;;AAEF;EACE;;AAIN;EACE;EACA;EACA;EACA;;AAEE;EACE;;AAEF;EACE;;AAIN;EACE;EACA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;AAEE;EACE;;AAKR;EACE;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EAWA;EACA;EACA;EACA;EACA;;AAdA;EACE;EACA;EACA;EACA;AAAsB;EACtB;AAA2B;EAC3B;AAAuB;EACvB;AAAyB;EACzB;;AAOF;EACE;EACA;EACA;EACA;;AASJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;AAIN;EACE;EACA;EACA;;AAEE;EAAE;;AACF;EACE;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;AAEF;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;;AAGJ;EACE;;;AAKR;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;AAEF;EACE;EACA;EACA;EACA;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;;;AAIJ;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;AAEF;EACE;;;AAGJ;EACE;;AACA;EACE;;AAEF;EACE;;;AAIF;EAAI;;AACJ;EACE;;;AAGJ;EACE;EACA;;AACA;EACE;EACA;;;AAGJ;EACE;;AACA;EACE","file":"Index.css"}
--- a/src/forge/Main/Index.js
+++ b/src/forge/Main/Index.js
@ -1,5 +1,4 @@
 import React, { Component } from 'react';
-import { Link } from 'react-router-dom';
 import { Menu, Input , Spin, Pagination , Popover , Select } from 'antd';
 import Slider from "react-slick";
 import { getImageUrl } from 'educoder';
@ -13,6 +12,8 @@ import axios from 'axios';
 import img_new from '../Images/new.png';
 import img_array from '../Images/array.png';
 import banner from '../Images/banner_list.jpg';
+import CheckProfile from '../Component/ProfileModal/Profile';
+
 const Search = Input.Search;

 class Index extends Component {
@ -49,7 +50,7 @@ class Index extends Component {

    this.getCategory();

-    this.getRecommand();
+    // this.getRecommand();

    this.getLanguage();

@ -228,7 +229,7 @@ class Index extends Component {
  }

  getoDetail=(login,identifier)=>{
-    this.props.history.push(`/projects/${login}/${identifier}`);
+    this.props.history.push(`/${login}/${identifier}`);
  }

  // 选择语言类别
@ -254,10 +255,14 @@ class Index extends Component {

  newItem = ()=>{
    return(
-      <Menu>
-        <Menu.Item key="created_mirror"><Link to={`/projects/mirror/new`}>新建镜像项目</Link></Menu.Item>
-        <Menu.Item key="created_deposit"><Link to={`/projects/deposit/new`}>新建托管项目</Link></Menu.Item>
-      </Menu>
+      <ul>
+        <li>
+          <CheckProfile {...this.props} sureFunc={()=>{this.props.history.push('/projects/deposit/new')}}>新建项目</CheckProfile>
+        </li>
+        <li>
+          <CheckProfile {...this.props} sureFunc={()=>{this.props.history.push('/projects/mirror/new')}}>导入项目</CheckProfile>
+        </li>
+      </ul>
    )
  }

@ -299,9 +304,9 @@ class Index extends Component {

    return (
      <div>
-        <p className="t_project_banner">
+        {/* <p className="t_project_banner">
          <img src={banner} width="100%" alt=""/>
-        </p>
+        </p> */}
        {/* {
          recommendOriList && recommendOriList.length>0?
            <Slider {...settings} className="recommandOri">
@ -315,7 +320,7 @@ class Index extends Component {
            </Slider>
          :""
        } */}
-        {
+        {/* {
          recommendList && recommendList.length>0 &&
          <Slider {...setting} className={recommendList.length>5 ? "recommandProjects":"recommandProjects mb20"}>
            {
@ -336,7 +341,7 @@ class Index extends Component {
              })
            }
          </Slider>
-        }
+        } */}
        <div className="ProjectListIndex">
          <div className="list-left">
            <ul className="list-l-Menu">
@ -387,7 +392,13 @@ class Index extends Component {
                <div>
                  {
                    current_user && current_user.login &&
-                    <Popover content={this.newItem()} trigger={["click"]} placement='bottom' className="mr50">
+                    <Popover
+                      overlayClassName="newPopUl" 
+                      content={this.newItem()} 
+                      trigger={["click"]} 
+                      placement='bottom' 
+                      className="mr50"
+                    >
                      <a className="ant-dropdown-link">
                        <span className="color-blue font-16"><img src={img_new} alt="" width="13px" /> 新建</span>
                      </a>
--- a/src/forge/Main/Index.scss
+++ b/src/forge/Main/Index.scss
@ -13,6 +13,21 @@
    }
  }
 }
+.iconBtn{
+  i{
+    color: #666;
+  }
+  span{
+    margin-left: 4px;
+    color: #333!important;
+    &:last-child{
+      font-weight: 500;
+    }
+  }
+  &:hover span,&:hover i{
+    color: #466AFF!important;
+  }
+}
 /* recommandProjects */
 .recommandProjects.slick-slider{
  width: 1230px;
@ -113,8 +128,8 @@
        margin-right: -5px;
      }
      .ant-btn{
-        height: 36px;
-        line-height: 34px;
+        height: 32px;
+        line-height: 32px;
        width: 83px;
        text-align: center;
        padding:0px ;
@ -131,26 +146,29 @@
      .ant-btn-primary{
        color: #fff;
        background-color: #466AFF;
-        opacity: 0.8;
+        border: none;
+        &:hover{
+          background-color: rgba(70,106,255,0.85);
+        }
      }
    }
  }
-  .addOptionBtn{
-    height: 32px;
-    line-height: 30px;
+  .depotBtn,.addOptionBtn{
    display: flex;
-    border:1px solid #d9d9d9;
-    border-radius: 2px;
    a{
-      padding:0px 13px;
-      color: rgba(0, 0, 0, 0.65);
-      cursor: pointer;
-    }
-    & > a:first-child{
-      border-right: 1px solid #d9d9d9;
-    }
-    & > a:last-child{
-      border-right: none;
+      color: #333!important;
+      font-weight: 500!important;
+      border-radius: 5px;
+      width: 83px;
+      height: 32px;
+      line-height: 30px;
+      background: #fff;
+      border: 1px solid #D0D0D0;
+      margin-right: 10px;
+      text-align: center;
+      &:hover,&:active{
+        background: #F3F4F6;
+      }
    }
  }
  .infoCount{
@ -171,28 +189,28 @@
    flex-wrap: wrap;
    padding-bottom: 2px;
    a{
-      margin: 0px 17px 0px 0px;
+      margin: 0px 17px 10px 0px;
      img{
        border-radius: 50%;
        width: 40px;
        height: 40px;
      }
-      &:nth-child(6){
+      &:nth-child(5n){
        margin-right: 0px;
      }
    }
  }
  .progress{
    display: flex;
-    border-radius: 10px;
-    height: 7px;
+    border-radius: 2px;
+    height: 11px;
    margin-top: 12px;
    span{
      &:first-child{
-        border-radius: 10px 0px 0px 10px;
+        border-radius: 2px 0px 0px 2px;
      }
      &:last-child{
-        border-radius: 0px 10px 10px 0px;
+        border-radius: 0px 2px 2px 0px;
      }
    }
  }
@ -206,7 +224,7 @@
      height: 8px;
      width: 8px;
      left: 0px;
-      top:10px
+      top:8px;
    }
    &>span{
      padding-left: 15px;
@ -225,17 +243,23 @@
  .listtable{
    margin-top: 20px;
    .listtablehead{
-      height: 55px;
      display: flex;
      justify-content: space-between;
      align-items: flex-start;
      border-bottom: 1px solid #d9d9d9;
-      padding:13px 20px;
+      padding:12px 20px 11px;
      border-radius: 4px 4px 0px 0px;
      border: 1px solid rgba(42, 97, 255, 0.23);
      background-color: #FAFCFF;
      .ellipsistxt{
-        margin-top: 6px;
+        &:hover .markdown-body{
+          color: #466AFF;
+          & a{
+            color: #466AFF;
+          }
+        }
+        margin-top: 2px;
+        // cursor: pointer;
        #ptxt{
          margin-bottom: 0px;
          word-break: break-all;
@ -245,6 +269,27 @@
          white-space:-pre-wrap; /* Opera 4-6 */ 
          white-space:-o-pre-wrap; /* Opera 7 */ 
          word-wrap:break-word;
+          .markdown-body{
+            line-height: 10px;
+            font-size: 14px;
+            & p {
+              margin: 1px 0px  0px !important;
+              font-size: 14px !important;
+            }
+            & ol,ul{
+              padding-bottom: 3px;
+              & li{
+                min-height: 18px;
+              }
+            }
+            & table{
+              line-height: 1;
+              background: #FAFCFF;
+            }
+            &:first-child {
+              margin-top: -1px !important;
+            }
+          }
        }
        margin-left: 13px;
        line-height:18px;
@ -252,7 +297,7 @@
        width: 0;
        color: #666;
        &.hidetxt{
-          height: 18px;
+          height: 24px;
          overflow: hidden;
          position: relative;
          padding-right:8px;
@ -371,11 +416,29 @@
    line-height: 50px;
  }
 }
+.fileMenu{
+  width: 83px;
+  li{
+    padding:6px 0px!important;
+    text-align: center;
+    width: 100%;
+  }
+}

 .catelogue{
  cursor: pointer;
  background: #FAFBFC;
  border-radius: 4px;
+  .ant-dropdown-menu-item{
+    border-radius: 8px;
+    text-align: left!important;
+    a{
+      width: 350px;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
+  }
  border: 1px solid #D0D0D0;
  font-size: 15px;
  font-weight: normal;
@ -405,7 +468,7 @@
 .pinfos{
  i,a{color: #666;}
  &:hover i,&:hover a{
-    color: #466AFF;
+    color: #2A61FF!important;
  }
 }
 .graph{
@ -417,8 +480,32 @@
  }
 }
 .ant-anchor-wrapper{
-  padding-left: 2px;
+  padding-left: 2px!important;
  .ant-anchor-ink::before{
    background-color: #fff;
  }
+}
+.coderSubPage{
+  width: 1200px;
+  margin:0px auto;
+}
+.griditemAnchor{
+  margin-left: 0px!important;
+  padding: 0px!important;
+  border-bottom: 1px solid #ddd;
+  .ant-anchor{
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 10px 20px;
+  }
+  .griditemCate{
+    color: #333;
+    font-size: 16px;
+    display: flex;
+    align-items: center;
+    .catelogue{
+      margin-left: 0px;
+    }
+  }
 }
--- a/src/forge/Main/IndexItem.js
+++ b/src/forge/Main/IndexItem.js
@ -28,36 +28,30 @@ class IndexItem extends Component {
                  <img className="p-r-photo" alt="" src={item.author && item.author.image_url} ></img>
                </a>
                :
-                <Link to={item.author && (item.author.type === "Organization" ? `/organize/${item.author.login}`:`/users/${item.author.login}`)} className="show-user-link">
+                <Link to={`/${item.author && item.author.login}`} className="show-user-link">
                  <img className="p-r-photo" alt="" src={getImageUrl(`/${item.author && item.author.image_url}`)} ></img>
                </Link>
              }
              <div className="p-r-Infos">
                <div className="p-r-name">
                  <AlignCenter>
-                    <Link to={`/projects/${item.author.login}/${item.identifier}`} title={`${item.author.name}/${item.name}`} className="color-grey-3 font-18 task-hide " style={{maxWidth: 470 }}>
+                    <Link to={`/${item.author.login}/${item.identifier}`} title={`${item.author.name}/${item.name}`} className="color-grey-3 font-18 task-hide " style={{maxWidth: 470 }}>
                      {item.author.name}/{item.name}
                    </Link>
                    { !item.is_public && <span className="privateTag">私有</span> }
                    {
                      item.forked_from_project_id ?
-                        <span className="ml5">
+                        <Tooltip title="该项目是一个fork仓库" className="ml5">
                          <i className="iconfont icon-fork font-18 color-orange" />
-                        </span>
+                        </Tooltip>
                        : ""
                    }
                    {
                      item.type && item.type === 2 ?
-                      <Tooltip title="该项目是一个镜像" className="ml5">
+                      <Tooltip title="该项目是一个同步镜像仓库" className="ml5">
                        <i className="iconfont icon-banbenku font-18 color-green" />
                      </Tooltip>:""
                    }
-                    {
-                      item.type && item.type === 1 ?
-                      <span className="ml5">
-                        <i className="iconfont icon-jingxiang font-18 color-green" />
-                      </span>:""
-                    }
                  </AlignCenter>
                  <span className="p-r-tags">
                    {
--- a/src/forge/Main/img/index/banner.png
+++ b/src/forge/Main/img/index/banner.png
--- a/src/forge/Main/img/index/box.png
+++ b/src/forge/Main/img/index/box.png
--- a/src/forge/Main/img/index/data.png
+++ b/src/forge/Main/img/index/data.png
--- a/src/forge/Main/img/index/earth.png
+++ b/src/forge/Main/img/index/earth.png
--- a/src/forge/Main/img/index/eye.png
+++ b/src/forge/Main/img/index/eye.png
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				{"version":3,"sourceRoot":"","sources":["branch.scss"],"names":[],"mappings":"AAAA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACE;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;;;AAEF;EACG;;;AAEH;EACE;;;AAEF;EACE;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA;;AACA;EACE;;AAEF;EACE;;AAEF;EACE;EACA;EACA;;AAEF;EACE;;;AAGJ;EACE;;AACA;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;;AAIN;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;EACA;EACA;;AACA;EACE;;AAEF;EACE;;AAEF;EACE","file":"branch.css"}
				`@ -1 +0,0 @@`
				`{"version":3,"sourceRoot":"","sources":["EAccount.scss"],"names":[],"mappings":"AAAA;EACE;;;AAEF;EACE","file":"EAccount.css"}`