From 673165c0490e7f1fa30fddd5877719cfb4d16098 Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Sun, 26 Apr 2020 16:23:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml             | 323 ++++++++++++++++++--------------
 src/forge/Merge/MergeSubmit.js  |   8 +-
 src/forge/Merge/MessageCount.js |  70 +++----
 src/forge/Merge/NewMerge.js     |   9 +-
 src/forge/Order/Detail.js       |  15 +-
 5 files changed, 240 insertions(+), 185 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 393c4db1..a21f44d1 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,8 +3,10 @@
   <component name="ChangeListManager">
     <list default="true" id="9830c5da-176a-4c72-a301-9f6ce98c82fe" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/forge/Order/New.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Order/New.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/forge/Order/UpdateDetail.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Order/UpdateDetail.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/forge/Merge/MergeSubmit.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Merge/MergeSubmit.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/forge/Merge/MessageCount.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Merge/MessageCount.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/forge/Merge/NewMerge.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Merge/NewMerge.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/forge/Order/Detail.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Order/Detail.js" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -29,36 +31,101 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/forge/Order/New.js">
+        <entry file="file://$PROJECT_DIR$/src/App.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="344">
-              <caret line="187" column="20" selection-start-line="187" selection-start-column="20" selection-end-line="187" selection-end-column="20" />
-              <folding>
-                <element signature="e#0#42#0" expanded="true" />
-                <element signature="e#5479#10047#0" />
-              </folding>
+            <state relative-caret-position="317">
+              <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="true">
-        <entry file="file://$PROJECT_DIR$/src/forge/Order/UpdateDetail.js">
+      <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="171">
-              <caret line="306" column="27" selection-start-line="306" selection-start-column="27" selection-end-line="306" selection-end-column="27" />
+            <state relative-caret-position="279">
+              <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#40#0" expanded="true" />
-                <element signature="e#6358#8304#0" />
+                <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="1182">
+              <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="83">
+              <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="226">
+              <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="332">
+              <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="false">
+        <entry file="file://$PROJECT_DIR$/src/forge/Order/Detail.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="186">
+              <caret line="537" column="16" selection-start-line="537" selection-start-column="16" selection-end-line="539" selection-end-column="23" />
+              <folding>
+                <element signature="e#0#40#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/forge/Merge/MessageCount.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="131">
-              <caret line="805" column="23" selection-start-line="805" selection-start-column="23" selection-end-line="805" selection-end-column="23" />
+            <state relative-caret-position="52">
+              <caret line="699" column="17" selection-start-line="699" selection-start-column="17" selection-end-line="699" selection-end-column="17" />
+              <folding>
+                <element signature="e#0#40#0" expanded="true" />
+                <element signature="e#21410#24556#0" />
+              </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="-483">
+              <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>
@@ -70,11 +137,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>fork_project_user_name</find>
-      <find>reposit</find>
-      <find>linenums</find>
-      <find>reference-link</find>
-      <find>language-bash</find>
       <find>commonBox-title-read</find>
       <find>high</find>
       <find>markdown</find>
@@ -100,6 +162,11 @@
       <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>
     </findStrings>
     <replaceStrings>
       <replace>任务</replace>
@@ -121,7 +188,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/forge/Order/UpdateMilepost.js" />
         <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" />
@@ -160,22 +226,23 @@
         <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/Merge/NewMerge.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/Order/Detail.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/Merge/MessageCount.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/Order/Detail.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" />
       </list>
     </option>
   </component>
-  <component name="ProjectFrameBounds" fullScreen="true">
+  <component name="ProjectFrameBounds" extendedState="6" fullScreen="true">
     <option name="y" value="23" />
     <option name="width" value="1440" />
     <option name="height" value="877" />
@@ -197,24 +264,6 @@
               <item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
               <item name="build" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="forgeplus-react" type="b2602c69:ProjectViewProjectNode" />
-              <item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="forgeplus-react" type="b2602c69:ProjectViewProjectNode" />
-              <item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="forge" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="forgeplus-react" type="b2602c69:ProjectViewProjectNode" />
-              <item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="forge" type="462c0819:PsiDirectoryNode" />
-              <item name="Order" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
@@ -303,17 +352,20 @@
       <workItem from="1587376745950" duration="14824000" />
       <workItem from="1587452961769" duration="4499000" />
       <workItem from="1587534020999" duration="19518000" />
-      <workItem from="1587863258736" duration="463000" />
+      <workItem from="1587863258736" duration="1097000" />
+      <workItem from="1587864581358" duration="777000" />
+      <workItem from="1587870344748" duration="138000" />
+      <workItem from="1587882941476" duration="4365000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="199809000" />
+    <option name="totallyTimeSpent" value="205723000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="0" y="0" width="1440" height="900" extended-state="0" />
+    <frame x="0" y="0" width="1440" height="900" extended-state="6" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19384836" />
+      <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" />
@@ -325,8 +377,8 @@
       <window_info anchor="bottom" id="TODO" order="6" />
       <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
       <window_info anchor="bottom" id="Database Changes" order="8" />
-      <window_info anchor="bottom" id="Version Control" order="9" sideWeight="0.49928468" weight="0.5301205" />
-      <window_info active="true" anchor="bottom" id="Terminal" order="10" sideWeight="0.49928468" visible="true" weight="0.673494" />
+      <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.7192771" />
       <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" />
@@ -389,13 +441,6 @@
     </option>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/Infos.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="4318">
-          <caret line="271" column="22" selection-start-line="271" selection-start-column="22" selection-end-line="271" selection-end-column="22" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/usersInfo.css">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="7973">
@@ -563,16 +608,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/AppConfig.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="257">
-          <caret line="122" column="36" selection-start-line="122" selection-start-column="36" selection-end-line="122" selection-end-column="36" />
-          <folding>
-            <element signature="e#0#26#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">
@@ -585,13 +620,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/App.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="317">
-          <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/forge/Main/IndexItem.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="175">
@@ -602,26 +630,6 @@
         </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="328">
-          <caret line="333" column="14" selection-start-line="333" selection-start-column="14" selection-end-line="335" selection-end-column="21" />
-          <folding>
-            <element signature="e#0#40#0" expanded="true" />
-          </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="222">
-          <caret line="89" column="10" selection-start-line="89" selection-start-column="10" selection-end-line="92" selection-end-column="17" />
-          <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">
@@ -762,29 +770,6 @@
         </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="326">
-          <caret line="570" column="16" selection-start-line="570" selection-start-column="16" selection-end-line="570" selection-end-column="16" />
-          <folding>
-            <element signature="e#0#40#0" expanded="true" />
-            <element signature="e#15687#16216#0" />
-            <element signature="e#16233#16368#0" />
-            <element signature="e#16581#18255#0" />
-          </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="230">
-          <caret line="23" column="15" selection-start-line="23" selection-start-column="15" selection-end-line="23" selection-end-column="15" />
-          <folding>
-            <element signature="e#0#40#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">
@@ -806,16 +791,6 @@
         </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="131">
-          <caret line="805" column="23" selection-start-line="805" selection-start-column="23" selection-end-line="805" selection-end-column="23" />
-          <folding>
-            <element signature="e#0#40#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeItem.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="216">
@@ -826,10 +801,48 @@
         </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/Order/Detail.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="186">
+          <caret line="537" column="16" selection-start-line="537" selection-start-column="16" selection-end-line="539" selection-end-column="23" />
+          <folding>
+            <element signature="e#0#40#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="317">
+          <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="279">
+          <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/MergeDetail.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="160">
-          <caret line="281" column="43" selection-start-line="281" selection-start-column="39" selection-end-line="281" selection-end-column="43" />
+        <state relative-caret-position="-483">
+          <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>
@@ -838,22 +851,58 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Order/New.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="344">
-          <caret line="187" column="20" selection-start-line="187" selection-start-column="20" selection-end-line="187" selection-end-column="20" />
+        <state relative-caret-position="226">
+          <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" />
-            <element signature="e#5479#10047#0" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Order/UpdateDetail.js">
+    <entry file="file://$PROJECT_DIR$/src/forge/Merge/MergeSubmit.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="171">
-          <caret line="306" column="27" selection-start-line="306" selection-start-column="27" selection-end-line="306" selection-end-column="27" />
+        <state relative-caret-position="1182">
+          <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" />
-            <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/forge/Merge/NewMerge.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="83">
+          <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$/.gitignore">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="332">
+          <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/MessageCount.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="52">
+          <caret line="699" column="17" selection-start-line="699" selection-start-column="17" selection-end-line="699" selection-end-column="17" />
+          <folding>
+            <element signature="e#0#40#0" expanded="true" />
+            <element signature="e#21410#24556#0" />
           </folding>
         </state>
       </provider>
diff --git a/src/forge/Merge/MergeSubmit.js b/src/forge/Merge/MergeSubmit.js
index e3972830..3cfb50c5 100644
--- a/src/forge/Merge/MergeSubmit.js
+++ b/src/forge/Merge/MergeSubmit.js
@@ -4,6 +4,7 @@ import axios from 'axios';
 
 import{ Form , Table , Spin } from 'antd'
 import { getImageUrl } from 'educoder';
+import {Link} from "react-router-dom";
 
 
 
@@ -70,6 +71,7 @@ class MergeSubmit extends Component{
         result.data && result.data.commits.length > 0 && result.data.commits.map((item,key)=>{
           array.push({
             name:item.author && item.author.name,
+            login: item.author && item.author.login,
             image_url:item.author && item.author.image_url,
             sha:item.sha,
             time_from_now:item.time_from_now,
@@ -97,8 +99,10 @@ class MergeSubmit extends Component{
         width:"10%",
         render: (text,item) => (
           <span className="f-wrap-alignCenter">
-            <img src={getImageUrl(`images/${item.image_url}`)} alt="" width="28px" height="28px" className="mr3 radius"/>
-            <label className="hide-1" style={{maxWidth:"75px"}}>{text}</label>
+            <Link to={`/users/${item.login}/projects`} className="show-user-link">
+                <img src={getImageUrl(`images/${item.image_url}`)} alt="" width="28px" height="28px" className="mr3 radius"/>
+          <label className="hide-1" style={{maxWidth:"75px",'vertical-align':'middle'}}>{text}</label>
+          </Link>
           </span>
         ),
       },{
diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js
index 206c6798..31e1d2db 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -553,7 +553,9 @@ class MessageCount extends Component{
                return(
                  <li key={key}>
                 <div className="df">
-                  <Link to={``}><img className="user_img" src={getImageUrl(`images/${item.user_picture && item.user_picture}`)} alt=""/></Link>
+                  <Link to={`/users/${item && item.user_login}/projects`} className="show-user-link">
+                    <img className="user_img" src={getImageUrl(`images/${item && item.user_picture}`)} alt=""/>
+                  </Link>
                   <div className="detail_context" >
                   <div className="topWrapper_detali">
                     <p className="ml6 detail_p lineH40">
@@ -680,6 +682,12 @@ class MessageCount extends Component{
               <li className={url.indexOf("Messagecount")>0? "active" : ""}><Link to={`/projects/${projectsId}/merge/${mergeId}/Messagecount`} className="color-grey">对话内容</Link></li>
               <li className={url.indexOf("MergeSubmit")>0 ? "active" : ""}><Link to={`/projects/${projectsId}/merge/${mergeId}/MergeSubmit`} className="color-grey">代码提交</Link></li>
             </ul>
+            {data && data.issue.user_permission &&
+            <div className="pull-right pt15">
+              <a className="Closeor_btn fr" type="submit"
+                 onClick={() => this.closedetail(data && data.issue.issue_status === "关闭" ? 2 : 5)}>{data && data.issue.issue_status === "关闭" ? "点击开启" : "关闭"}</a>
+            </div>
+            }
           </div>
         </div>
 
@@ -691,48 +699,28 @@ class MessageCount extends Component{
               <div className="item-list-right" >
                 {
                   data && data.issue.user_permission ?
-                    <div>
-                      <div className="df" style={{display:this.state.data&&this.state.data.pull_request.status===1?'none':'flex'}}>
+                    <div style={{display:data&&(data.pull_request.status===1 || data.issue.issue_status==="关闭")?'none':'flex'}}>
+                      <div className="df" >
+                        <Link to={`/users/${current_user && current_user.login}/projects`} className="show-user-link">
                         <img className="user_img" src={getImageUrl(`images/${current_user && current_user.image_url}`)} alt=""/>
-                        <div className="new_context" >
-                          <p>该合并请求可以进行自动合并操作</p>
-                          <p style={{marginTop:15,display:this.state.mergekey==='rebase'?this.state.buttonshow==='none'?"block":"none":this.state.ismesrge==='none'?"block":"none"}}>
-                            {/* <button className="topmerge_btn" onClick={this.submitmerge} >{this.state.mergename}</button> */}
-                            {/* <Dropdown style={{marginBottom:5}} overlay={menu} trigger={['click']} > */}
-                            <Dropdown.Button overlay={menu} type="primary" onClick={this.submitmerge} icon={<Icon type="caret-down"/>}>
-                              {this.state.mergename}
-                            </Dropdown.Button>
-                            {
-                              data&&data.pull_request.status===0 ?
-                                <div className="pull-right">
-                                  <a className="Closeor_btn fr" type="submit"
-                                     onClick={() => this.closedetail(data && data.issue.issue_status === "关闭" ? 2 : 5)}>{data && data.issue.issue_status === "关闭" ? "点击开启" : "关闭"}</a>
-                                  {/*<a className="cancel_btn fr" type="submit"*/}
-                                  {/*onClick={() => this.closedetail(data && data.issue.issue_status === "关闭" ? 2 : 5)}>{data && data.issue.issue_status === "关闭" ? "开启" : "关闭"}</a>*/}
-                                </div>
-                                : ""
+                      </Link>
+                        <div className="new_context">
+                          {
+                            data && data.issue.issue_status !== "关闭" &&
+                              <div className="pull-left">
+                                <p>该合并请求可以进行自动合并操作</p>
+                                <p style={{marginTop:15,display:this.state.mergekey==='rebase'?this.state.buttonshow==='none'?"block":"none":this.state.ismesrge==='none'?"block":"none"}}>
 
-                            }
+                                  <Dropdown.Button overlay={menu} type="primary" onClick={this.submitmerge} icon={<Icon type="caret-down"/>}>
+                                    {this.state.mergename}
+                                  </Dropdown.Button>
+                                </p>
+                              </div>
 
-                            {/* </Dropdown> */}
-                          </p>
+                          }
 
                           <div style={{display:this.state.ismesrge,marginTop:15}}>
                             <Input placeholder="标题" value={this.state.title} onChange={this.changtitlepr}/>
-                            {/*<div className="quillContent" style={{marginTop:"20px"}}>*/}
-                            {/*<QuillForEditor*/}
-                            {/*value = {this.state.body}*/}
-                            {/*wrapStyle={{*/}
-                            {/*height: '220px',*/}
-                            {/*opacity:1,*/}
-                            {/*}}*/}
-                            {/*// autoFocus={true}*/}
-                            {/*style={{ height: '170px' }}*/}
-                            {/*placeholder="请输入合并请求描述..."*/}
-                            {/*options={options}*/}
-                            {/*onContentChange={this.changbodypr}*/}
-                            {/*/>*/}
-                            {/*</div>*/}
                             <TextArea placeholder="请输入合并描述..." style={{height:"170px",marginTop:20}} value={this.state.body} onChange={this.changbodypr} />
                           </div>
                           <p className="clearfix mt15" style={{display:this.state.buttonshow}}>
@@ -740,11 +728,8 @@ class MessageCount extends Component{
                             <a className="a_btn cancel_btn " type="submit" style={{marginLeft:15}} onClick={this.nonemerge}>取消</a>
                           </p>
                         </div>
-
                     </div>
                       <div className="order_line" style={{marginLeft:80}}></div>
-
-
                     </div>
                     : ''
                 }
@@ -758,7 +743,10 @@ class MessageCount extends Component{
                 { Paginations }
 
                 <div className="df">
-                  <img className="user_img" src={getImageUrl(`images/${current_user && current_user.image_url}`)} alt=""/>
+                  <Link to={`/users/${current_user && current_user.login}/projects`} className="show-user-link">
+                    <img className="user_img" src={getImageUrl(`images/${current_user && current_user.image_url}`)} alt=""/>
+                  </Link>
+                  {/*<img className="user_img" src={getImageUrl(`images/${current_user && current_user.image_url}`)} alt=""/>*/}
                   <div className="new_context">
                     {/* <Form.Item>
                       {getFieldDecorator('content', {
diff --git a/src/forge/Merge/NewMerge.js b/src/forge/Merge/NewMerge.js
index 8a8a0606..fefa5423 100644
--- a/src/forge/Merge/NewMerge.js
+++ b/src/forge/Merge/NewMerge.js
@@ -190,6 +190,7 @@ class NewMerge extends Component{
         result.data && result.data.commits.length > 0 && result.data.commits.map((item,key)=>{
           array.push({
             name:item.author && item.author.name,
+            login: item.author && item.author.login,
             image_url:item.author && item.author.image_url,
             sha:item.sha,
             time_from_now:item.time_from_now,
@@ -248,8 +249,12 @@ class NewMerge extends Component{
       width:"10%",
       render: (text,item) => (
         <span className="f-wrap-alignCenter">
-          <img src={getImageUrl(`images/${item.image_url}`)} alt="" width="28px" height="28px" className="mr3 radius"/>
-          <label className="hide-1" style={{maxWidth:"75px"}}>{text}</label>
+           <Link to={`/users/${item.login}/projects`} className="show-user-link">
+                <img src={getImageUrl(`images/${item.image_url}`)} alt="" width="28px" height="28px" className="mr3 radius"/>
+          <label className="hide-1" style={{maxWidth:"75px",'vertical-align':'middle'}}>{text}</label>
+          </Link>
+          {/*<img src={getImageUrl(`images/${item.image_url}`)} alt="" width="28px" height="28px" className="mr3 radius"/>*/}
+          {/*<label className="hide-1" style={{maxWidth:"75px"}}>{text}</label>*/}
         </span>
       ),
     },{
diff --git a/src/forge/Order/Detail.js b/src/forge/Order/Detail.js
index dcea8f5a..2f3580f4 100644
--- a/src/forge/Order/Detail.js
+++ b/src/forge/Order/Detail.js
@@ -371,7 +371,10 @@ class Detail extends Component{
                     <div className="order_line" style={{marginLeft:80}}></div>
                    }
                   <div className="df">
-                    <img className="user_img" src={getImageUrl(`images/${item.user_picture && item.user_picture}`)} alt=""/>
+                    <Link to={`/users/${item && item.user_login}/projects`} className="show-user-link">
+                      <img className="user_img" src={getImageUrl(`images/${item && item.user_picture}`)} alt=""/>
+                    </Link>
+
                     <div className="detail_context" >
                     <div className="topWrapper_detali">
                       <p className="ml6 detail_p lineH40">
@@ -503,7 +506,10 @@ class Detail extends Component{
         <div className="f-wrap-between mt20" style={{alignItems:"flex-start"}}>
           <div className="item-list-right" >
             <div className="df ">
-              <Link to={``}><img className="user_img" src={getImageUrl(`images/${data && data.author_picture}`)} alt=""/></Link>
+              <Link to={`/users/${data && data.author_login}/projects`} className="show-user-link">
+                <img className="user_img" src={getImageUrl(`images/${data && data.author_picture}`)} alt=""/>
+              </Link>
+              {/*<Link to={``}><img className="user_img" src={getImageUrl(`images/${data && data.author_picture}`)} alt=""/></Link>*/}
               <div className="detail_context">
                 <div className="detail_p">
                   {data&&data.description&&(data.description.length > 0)?this.commentCtx(data.description): <span className="color-grey-9 ml3 mr3">没有描述</span>}
@@ -529,7 +535,10 @@ class Detail extends Component{
               <React.Fragment>
               <div className="order_line" style={{marginLeft:80}}></div>
               <div className="df">
-                <img className="user_img" src={getImageUrl(`images/${current_user && current_user.image_url}`)} alt=""/>
+                <Link to={`/users/${current_user && current_user.login}/projects`} className="show-user-link">
+                  <img className="user_img" src={getImageUrl(`images/${current_user && current_user.image_url}`)} alt=""/>
+                </Link>
+
                 <div className="new_context">
                   <div className="quillContent">
                     <QuillForEditor