Merge pull request '修复登陆和未登陆时，访问没有的项目返回页面不同的问题' (#50) from tongChong/forgeplus-react:feature_router into feature_router

# Conflicts:
#	src/forge/Team/List.jsx

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,

package-lock.json

@@ -1273,7 +1273,7 @@
     },
     "babel-cli": {
       "version": "6.26.0",
-      "resolved": "https://registry.npm.taobao.org/babel-cli/download/babel-cli-6.26.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-cli/-/babel-cli-6.26.0.tgz",
       "integrity": "sha1-UCq1SHTX24itALiHoGODzgPQAvE=",
       "dev": true,
       "requires": {
@@ -1296,7 +1296,7 @@
       "dependencies": {
         "chokidar": {
           "version": "1.7.0",
-          "resolved": "https://registry.npm.taobao.org/chokidar/download/chokidar-1.7.0.tgz?cache=0&sync_timestamp=1602585438968&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchokidar%2Fdownload%2Fchokidar-1.7.0.tgz",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
           "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
           "dev": true,
           "optional": true,
@@ -1314,7 +1314,7 @@
         },
         "source-map": {
           "version": "0.5.7",
-          "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
           "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
           "dev": true
         }
@@ -1413,7 +1413,7 @@
     },
     "babel-helper-bindify-decorators": {
       "version": "6.24.1",
-      "resolved": "https://registry.npm.taobao.org/babel-helper-bindify-decorators/download/babel-helper-bindify-decorators-6.24.1.tgz",
+      "resolved": "https://registry.npmjs.org/babel-helper-bindify-decorators/-/babel-helper-bindify-decorators-6.24.1.tgz",
       "integrity": "sha1-FMGeXxQte0fxmlJDHlKxzLxAozA=",
       "dev": true,
       "requires": {
@@ -1476,7 +1476,7 @@
     },
     "babel-helper-explode-class": {
       "version": "6.24.1",
-      "resolved": "https://registry.npm.taobao.org/babel-helper-explode-class/download/babel-helper-explode-class-6.24.1.tgz",
+      "resolved": "https://registry.npmjs.org/babel-helper-explode-class/-/babel-helper-explode-class-6.24.1.tgz",
       "integrity": "sha1-fcKjkQ3uAHBW4eMdZAztPVTqqes=",
       "dev": true,
       "requires": {
@@ -1676,7 +1676,7 @@
     },
     "babel-plugin-syntax-async-generators": {
       "version": "6.13.0",
-      "resolved": "https://registry.npm.taobao.org/babel-plugin-syntax-async-generators/download/babel-plugin-syntax-async-generators-6.13.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz",
       "integrity": "sha1-a8lj67FuzLrmuStZbrfzXDQqi5o=",
       "dev": true
     },
@@ -1687,7 +1687,7 @@
     },
     "babel-plugin-syntax-decorators": {
       "version": "6.13.0",
-      "resolved": "https://registry.npm.taobao.org/babel-plugin-syntax-decorators/download/babel-plugin-syntax-decorators-6.13.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz",
       "integrity": "sha1-MSVjtNvePMgGzuPkFszurd0RrAs=",
       "dev": true
     },
@@ -1723,7 +1723,7 @@
     },
     "babel-plugin-transform-async-generator-functions": {
       "version": "6.24.1",
-      "resolved": "https://registry.npm.taobao.org/babel-plugin-transform-async-generator-functions/download/babel-plugin-transform-async-generator-functions-6.24.1.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz",
       "integrity": "sha1-8FiQAUX9PpkHpt3yjaWfIVJYpds=",
       "dev": true,
       "requires": {
@@ -1755,7 +1755,7 @@
     },
     "babel-plugin-transform-decorators": {
       "version": "6.24.1",
-      "resolved": "https://registry.npm.taobao.org/babel-plugin-transform-decorators/download/babel-plugin-transform-decorators-6.24.1.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.24.1.tgz",
       "integrity": "sha1-eIAT2PjGtSIr33s0Q5Df13Vp4k0=",
       "dev": true,
       "requires": {
@@ -2060,7 +2060,7 @@
     },
     "babel-plugin-transform-runtime": {
       "version": "6.23.0",
-      "resolved": "https://registry.npm.taobao.org/babel-plugin-transform-runtime/download/babel-plugin-transform-runtime-6.23.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz",
       "integrity": "sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=",
       "requires": {
         "babel-runtime": "^6.22.0"
@@ -2077,7 +2077,7 @@
     },
     "babel-polyfill": {
       "version": "6.26.0",
-      "resolved": "https://registry.npm.taobao.org/babel-polyfill/download/babel-polyfill-6.26.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz",
       "integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=",
       "requires": {
         "babel-runtime": "^6.26.0",
@@ -2087,7 +2087,7 @@
       "dependencies": {
         "regenerator-runtime": {
           "version": "0.10.5",
-          "resolved": "https://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.10.5.tgz?cache=0&sync_timestamp=1595456367497&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregenerator-runtime%2Fdownload%2Fregenerator-runtime-0.10.5.tgz",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
           "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg="
         }
       }
@@ -2131,7 +2131,7 @@
     },
     "babel-preset-es2015": {
       "version": "6.24.1",
-      "resolved": "https://registry.npm.taobao.org/babel-preset-es2015/download/babel-preset-es2015-6.24.1.tgz",
+      "resolved": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz",
       "integrity": "sha1-1EBQ1rwsn+6nAqrzjXJ6AhBTiTk=",
       "dev": true,
       "requires": {
@@ -2179,7 +2179,7 @@
     },
     "babel-preset-react": {
       "version": "6.24.1",
-      "resolved": "https://registry.npm.taobao.org/babel-preset-react/download/babel-preset-react-6.24.1.tgz",
+      "resolved": "https://registry.npmjs.org/babel-preset-react/-/babel-preset-react-6.24.1.tgz",
       "integrity": "sha1-umnfrqRfw+xjm2pOzqbhdwLJE4A=",
       "requires": {
         "babel-plugin-syntax-jsx": "^6.3.13",
@@ -2212,7 +2212,7 @@
     },
     "babel-preset-stage-2": {
       "version": "6.24.1",
-      "resolved": "https://registry.npm.taobao.org/babel-preset-stage-2/download/babel-preset-stage-2-6.24.1.tgz",
+      "resolved": "https://registry.npmjs.org/babel-preset-stage-2/-/babel-preset-stage-2-6.24.1.tgz",
       "integrity": "sha1-2eKWD7PXEYfw5k7sYrwHdnIZvcE=",
       "dev": true,
       "requires": {
@@ -2224,7 +2224,7 @@
     },
     "babel-preset-stage-3": {
       "version": "6.24.1",
-      "resolved": "https://registry.npm.taobao.org/babel-preset-stage-3/download/babel-preset-stage-3-6.24.1.tgz",
+      "resolved": "https://registry.npmjs.org/babel-preset-stage-3/-/babel-preset-stage-3-6.24.1.tgz",
       "integrity": "sha1-g2raCp56f6N8sTj7kyb4eTSkg5U=",
       "dev": true,
       "requires": {
@@ -3507,7 +3507,7 @@
     },
     "code-prettify": {
       "version": "0.1.0",
-      "resolved": "https://registry.npm.taobao.org/code-prettify/download/code-prettify-0.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/code-prettify/-/code-prettify-0.1.0.tgz",
       "integrity": "sha1-RocMyMGlDQm61TmzOpg9vUqjSx4="
     },
     "codemirror": {
@@ -4885,7 +4885,7 @@
     },
     "dom-closest": {
       "version": "0.2.0",
-      "resolved": "https://registry.npm.taobao.org/dom-closest/download/dom-closest-0.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/dom-closest/-/dom-closest-0.2.0.tgz",
       "integrity": "sha1-69n5HRvyLo1vR3h2u80+yQIWwM8=",
       "requires": {
         "dom-matches": ">=1.0.1"
@@ -4929,7 +4929,7 @@
     },
     "dom-matches": {
       "version": "2.0.0",
-      "resolved": "https://registry.npm.taobao.org/dom-matches/download/dom-matches-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/dom-matches/-/dom-matches-2.0.0.tgz",
       "integrity": "sha1-0nKLQWqHUzmA6wibhI0lPPI6dYw="
     },
     "dom-scroll-into-view": {
@@ -5187,7 +5187,7 @@
     },
     "enquire.js": {
       "version": "2.1.6",
-      "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",
+      "resolved": "https://registry.npmjs.org/enquire.js/-/enquire.js-2.1.6.tgz",
       "integrity": "sha1-PoeAybi4NQhMP2DhZtvDwqPImBQ="
     },
     "entities": {
@@ -5706,7 +5706,7 @@
     },
     "eventlistener": {
       "version": "0.0.1",
-      "resolved": "https://registry.npm.taobao.org/eventlistener/download/eventlistener-0.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/eventlistener/-/eventlistener-0.0.1.tgz",
       "integrity": "sha1-7Suqu4UiJ68rz4iRUscsY8pTLrg="
     },
     "events": {
@@ -8040,7 +8040,7 @@
     },
     "hammerjs": {
       "version": "2.0.8",
-      "resolved": "https://registry.npm.taobao.org/hammerjs/download/hammerjs-2.0.8.tgz",
+      "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz",
       "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE="
     },
     "handle-thing": {
@@ -8881,7 +8881,7 @@
     },
     "immutable": {
       "version": "3.7.6",
-      "resolved": "https://registry.npm.taobao.org/immutable/download/immutable-3.7.6.tgz",
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.7.6.tgz",
       "integrity": "sha1-E7TTyxK++hVIKib+Gy665kAHHks="
     },
     "import-fresh": {
@@ -10486,7 +10486,7 @@
     },
     "lodash.throttle": {
       "version": "4.1.1",
-      "resolved": "https://registry.npm.taobao.org/lodash.throttle/download/lodash.throttle-4.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz",
       "integrity": "sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ="
     },
     "lodash.uniq": {
@@ -11673,7 +11673,7 @@
     },
     "output-file-sync": {
       "version": "1.1.2",
-      "resolved": "https://registry.npm.taobao.org/output-file-sync/download/output-file-sync-1.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/output-file-sync/-/output-file-sync-1.1.2.tgz",
       "integrity": "sha1-0KM+7+YaIF+suQCS6CZZjVJFznY=",
       "dev": true,
       "requires": {
@@ -19100,7 +19100,7 @@
     },
     "user-home": {
       "version": "1.1.1",
-      "resolved": "https://registry.npm.taobao.org/user-home/download/user-home-1.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
       "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=",
       "dev": true
     },
@@ -19157,7 +19157,7 @@
     },
     "v8flags": {
       "version": "2.1.1",
-      "resolved": "https://registry.npm.taobao.org/v8flags/download/v8flags-2.1.1.tgz?cache=0&sync_timestamp=1590964281452&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fv8flags%2Fdownload%2Fv8flags-2.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz",
       "integrity": "sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=",
       "dev": true,
       "requires": {

public/css/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2340181 */
-  src: url('iconfont.woff2?t=1627870211301') format('woff2'),
+  src: url('iconfont.woff2?t=1630632852475') format('woff2'),
-       url('iconfont.woff?t=1627870211301') format('woff'),
+       url('iconfont.woff?t=1630632852475') format('woff'),
-       url('iconfont.ttf?t=1627870211301') format('truetype');
+       url('iconfont.ttf?t=1630632852475') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,246 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.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";
+}
+
+.icon-chengguo:before {
+  content: "\e8c3";
+}
+
+.icon-chengjiaogonggao:before {
+  content: "\e8c0";
+}
+
+.icon-jishuzichan:before {
+  content: "\e8c1";
+}
+
+.icon-feibiaogonggao:before {
+  content: "\e8bc";
+}
+
+.icon-zhongbiaogonggao:before {
+  content: "\e8bd";
+}
+
+.icon-gengzhenggonggao:before {
+  content: "\e8be";
+}
+
+.icon-zhaobiaogonggao:before {
+  content: "\e8bf";
+}
+
+.icon-wenjian6:before {
+  content: "\e8ba";
+}
+
+.icon-wenjianjia4:before {
+  content: "\e8bb";
+}
+
+.icon-quxiaoguanzhu:before {
+  content: "\e89a";
+}
+
+.icon-dianzan_icon:before {
+  content: "\e8a2";
+}
+
+.icon-wenjian5:before {
+  content: "\e896";
+}
+
+.icon-wenjianjia3:before {
+  content: "\e8a9";
+}
+
+.icon-fuzhiicon:before {
+  content: "\e886";
+}
+
+.icon-zhuye-fill:before {
+  content: "\e876";
+}
+
+.icon-daimakuicon:before {
+  content: "\e884";
+}
+
+.icon-xinjian2:before {
+  content: "\e8b0";
+}
+
+.icon-xieyiicon:before {
+  content: "\e870";
+}
+
+.icon-neicunicon:before {
+  content: "\e891";
+}
+
+.icon-zishuwenjian_icon:before {
+  content: "\e8a6";
+}
+
+.icon-biaoqianicon:before {
+  content: "\e882";
+}
+
+.icon-a-bianji:before {
+  content: "\e883";
+}
+
+.icon-lianjieicon:before {
+  content: "\e887";
+}
+
+.icon-hebingqingqiuicon:before {
+  content: "\e888";
+}
+
+.icon-morendianzan_icon:before {
+  content: "\e88e";
+}
+
+.icon-muluicon:before {
+  content: "\e894";
+}
+
+.icon-a-shezhi:before {
+  content: "\e899";
+}
+
+.icon-tijiaoicon:before {
+  content: "\e89e";
+}
+
+.icon-morenguanzhu_ICON:before {
+  content: "\e89f";
+}
+
+.icon-xialaanniu1:before {
+  content: "\e8a4";
+}
+
+.icon-zuohuaicon:before {
+  content: "\e8b5";
+}
+
+.icon-master_icon:before {
+  content: "\e8b6";
+}
+
+.icon-morenfuke_icon:before {
+  content: "\e8b7";
+}
+
+.icon-a-wikiicon:before {
+  content: "\e8b8";
+}
+
+.icon-yixiuicon:before {
+  content: "\e8b9";
+}
+
+.icon-suofang:before {
+  content: "\e87f";
+}
+
+.icon-fangdaicon:before {
+  content: "\e881";
+}
+
+.icon-sousuo_icon1:before {
+  content: "\e873";
+}
+
+.icon-huanying_icon:before {
+  content: "\e878";
+}
+
+.icon-wenjianjia2:before {
+  content: "\e879";
+}
+
+.icon-shanchuicon1:before {
+  content: "\e87a";
+}
+
 .icon-qingqiuicon:before {
   content: "\e871";
 }
@@ -49,22 +289,10 @@
   content: "\e898";
 }
 
-.icon-xialaanniu_icon:before {
-  content: "\e89a";
-}
-
-.icon-weixuanzhongqingqiuicon:before {
-  content: "\e89b";
-}
-
 .icon-xiezuozheguanliicon:before {
   content: "\e8a1";
 }
 
-.icon-xuanzhongxiangyingicon:before {
-  content: "\e8a2";
-}
-
 .icon-xuanzhongfenzhiicon:before {
   content: "\e8a3";
 }
@@ -81,18 +309,6 @@
   content: "\e8af";
 }
 
-.icon-xinzengmulu_xuantingicon:before {
-  content: "\e884";
-}
-
-.icon-xinzengyemian_morenicon:before {
-  content: "\e885";
-}
-
-.icon-zhankai_morenicon:before {
-  content: "\e889";
-}
-
 .icon-shanchu_tc_icon:before {
   content: "\e88c";
 }
@@ -101,26 +317,14 @@
   content: "\e88d";
 }
 
-.icon-xinzengyemian_shubiaodianjiicon:before {
-  content: "\e88e";
-}
-
 .icon-daorumoban_icon:before {
   content: "\e86f";
 }
 
-.icon-daochu_xuanfu:before {
-  content: "\e870";
-}
-
 .icon-cuowu:before {
   content: "\e872";
 }
 
-.icon-chenggong1:before {
-  content: "\e873";
-}
-
 .icon-gengduo_icon:before {
   content: "\e874";
 }
@@ -129,26 +333,10 @@
   content: "\e875";
 }
 
-.icon-fuzhi_icon:before {
-  content: "\e876";
-}
-
 .icon-shanchuicon:before {
   content: "\e877";
 }
 
-.icon-a-lajitong_icon3x:before {
-  content: "\e878";
-}
-
-.icon-shouqi_morenicon:before {
-  content: "\e879";
-}
-
-.icon-huanying_icon:before {
-  content: "\e87a";
-}
-
 .icon-sousuo_shanchuicon:before {
   content: "\e87b";
 }
@@ -161,22 +349,10 @@
   content: "\e87e";
 }
 
-.icon-wenjianjia_icon:before {
-  content: "\e87f";
-}
-
 .icon-xialaanniu:before {
   content: "\e880";
 }
 
-.icon-xinzengmulu_morenicon:before {
-  content: "\e882";
-}
-
-.icon-xinzengmulu_shubiaodianjiicon:before {
-  content: "\e883";
-}
-
 .icon-erciqueren_icon:before {
   content: "\e867";
 }

public/css/iconfont.json

@@ -5,6 +5,426 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "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": "项目公告",
+      "font_class": "xiangmugonggao",
+      "unicode": "e8c2",
+      "unicode_decimal": 59586
+    },
+    {
+      "icon_id": "23791640",
+      "name": "成果",
+      "font_class": "chengguo",
+      "unicode": "e8c3",
+      "unicode_decimal": 59587
+    },
+    {
+      "icon_id": "23791410",
+      "name": "成交公告",
+      "font_class": "chengjiaogonggao",
+      "unicode": "e8c0",
+      "unicode_decimal": 59584
+    },
+    {
+      "icon_id": "23791411",
+      "name": "技术资产",
+      "font_class": "jishuzichan",
+      "unicode": "e8c1",
+      "unicode_decimal": 59585
+    },
+    {
+      "icon_id": "23790928",
+      "name": "废标公告",
+      "font_class": "feibiaogonggao",
+      "unicode": "e8bc",
+      "unicode_decimal": 59580
+    },
+    {
+      "icon_id": "23790929",
+      "name": "中标公告",
+      "font_class": "zhongbiaogonggao",
+      "unicode": "e8bd",
+      "unicode_decimal": 59581
+    },
+    {
+      "icon_id": "23790930",
+      "name": "更正公告",
+      "font_class": "gengzhenggonggao",
+      "unicode": "e8be",
+      "unicode_decimal": 59582
+    },
+    {
+      "icon_id": "23790931",
+      "name": "招标公告",
+      "font_class": "zhaobiaogonggao",
+      "unicode": "e8bf",
+      "unicode_decimal": 59583
+    },
+    {
+      "icon_id": "23732532",
+      "name": "文件",
+      "font_class": "wenjian6",
+      "unicode": "e8ba",
+      "unicode_decimal": 59578
+    },
+    {
+      "icon_id": "23732533",
+      "name": "文件夹",
+      "font_class": "wenjianjia4",
+      "unicode": "e8bb",
+      "unicode_decimal": 59579
+    },
+    {
+      "icon_id": "23642443",
+      "name": "取消关注",
+      "font_class": "quxiaoguanzhu",
+      "unicode": "e89a",
+      "unicode_decimal": 59546
+    },
+    {
+      "icon_id": "23642444",
+      "name": "点赞_icon",
+      "font_class": "dianzan_icon",
+      "unicode": "e8a2",
+      "unicode_decimal": 59554
+    },
+    {
+      "icon_id": "23639530",
+      "name": "文件",
+      "font_class": "wenjian5",
+      "unicode": "e896",
+      "unicode_decimal": 59542
+    },
+    {
+      "icon_id": "23639533",
+      "name": "文件夹",
+      "font_class": "wenjianjia3",
+      "unicode": "e8a9",
+      "unicode_decimal": 59561
+    },
+    {
+      "icon_id": "23639440",
+      "name": "复制icon",
+      "font_class": "fuzhiicon",
+      "unicode": "e886",
+      "unicode_decimal": 59526
+    },
+    {
+      "icon_id": "23639422",
+      "name": "主页-fill",
+      "font_class": "zhuye-fill",
+      "unicode": "e876",
+      "unicode_decimal": 59510
+    },
+    {
+      "icon_id": "23639423",
+      "name": "代码库icon",
+      "font_class": "daimakuicon",
+      "unicode": "e884",
+      "unicode_decimal": 59524
+    },
+    {
+      "icon_id": "23572260",
+      "name": "新建",
+      "font_class": "xinjian2",
+      "unicode": "e8b0",
+      "unicode_decimal": 59568
+    },
+    {
+      "icon_id": "23567674",
+      "name": "协议icon",
+      "font_class": "xieyiicon",
+      "unicode": "e870",
+      "unicode_decimal": 59504
+    },
+    {
+      "icon_id": "23567675",
+      "name": "内存icon",
+      "font_class": "neicunicon",
+      "unicode": "e891",
+      "unicode_decimal": 59537
+    },
+    {
+      "icon_id": "23567676",
+      "name": "自述文件_icon",
+      "font_class": "zishuwenjian_icon",
+      "unicode": "e8a6",
+      "unicode_decimal": 59558
+    },
+    {
+      "icon_id": "23472253",
+      "name": "标签icon",
+      "font_class": "biaoqianicon",
+      "unicode": "e882",
+      "unicode_decimal": 59522
+    },
+    {
+      "icon_id": "23472254",
+      "name": "编 辑",
+      "font_class": "a-bianji",
+      "unicode": "e883",
+      "unicode_decimal": 59523
+    },
+    {
+      "icon_id": "23472258",
+      "name": "链接icon",
+      "font_class": "lianjieicon",
+      "unicode": "e887",
+      "unicode_decimal": 59527
+    },
+    {
+      "icon_id": "23472259",
+      "name": "合并请求icon",
+      "font_class": "hebingqingqiuicon",
+      "unicode": "e888",
+      "unicode_decimal": 59528
+    },
+    {
+      "icon_id": "23472263",
+      "name": "默认点赞_icon",
+      "font_class": "morendianzan_icon",
+      "unicode": "e88e",
+      "unicode_decimal": 59534
+    },
+    {
+      "icon_id": "23472265",
+      "name": "目录icon",
+      "font_class": "muluicon",
+      "unicode": "e894",
+      "unicode_decimal": 59540
+    },
+    {
+      "icon_id": "23472267",
+      "name": "设 置",
+      "font_class": "a-shezhi",
+      "unicode": "e899",
+      "unicode_decimal": 59545
+    },
+    {
+      "icon_id": "23472269",
+      "name": "提交icon",
+      "font_class": "tijiaoicon",
+      "unicode": "e89e",
+      "unicode_decimal": 59550
+    },
+    {
+      "icon_id": "23472270",
+      "name": "默认关注_ICON",
+      "font_class": "morenguanzhu_ICON",
+      "unicode": "e89f",
+      "unicode_decimal": 59551
+    },
+    {
+      "icon_id": "23472272",
+      "name": "下拉按钮",
+      "font_class": "xialaanniu1",
+      "unicode": "e8a4",
+      "unicode_decimal": 59556
+    },
+    {
+      "icon_id": "23472276",
+      "name": "左滑icon",
+      "font_class": "zuohuaicon",
+      "unicode": "e8b5",
+      "unicode_decimal": 59573
+    },
+    {
+      "icon_id": "23472277",
+      "name": "master_icon",
+      "font_class": "master_icon",
+      "unicode": "e8b6",
+      "unicode_decimal": 59574
+    },
+    {
+      "icon_id": "23472278",
+      "name": "默认复刻_icon",
+      "font_class": "morenfuke_icon",
+      "unicode": "e8b7",
+      "unicode_decimal": 59575
+    },
+    {
+      "icon_id": "23472279",
+      "name": "wiki icon",
+      "font_class": "a-wikiicon",
+      "unicode": "e8b8",
+      "unicode_decimal": 59576
+    },
+    {
+      "icon_id": "23472280",
+      "name": "易修icon",
+      "font_class": "yixiuicon",
+      "unicode": "e8b9",
+      "unicode_decimal": 59577
+    },
+    {
+      "icon_id": "23436350",
+      "name": "缩放",
+      "font_class": "suofang",
+      "unicode": "e87f",
+      "unicode_decimal": 59519
+    },
+    {
+      "icon_id": "23436351",
+      "name": "放大icon",
+      "font_class": "fangdaicon",
+      "unicode": "e881",
+      "unicode_decimal": 59521
+    },
+    {
+      "icon_id": "23384231",
+      "name": "搜索_icon",
+      "font_class": "sousuo_icon1",
+      "unicode": "e873",
+      "unicode_decimal": 59507
+    },
+    {
+      "icon_id": "23384232",
+      "name": "欢迎_icon",
+      "font_class": "huanying_icon",
+      "unicode": "e878",
+      "unicode_decimal": 59512
+    },
+    {
+      "icon_id": "23384233",
+      "name": "文件夹",
+      "font_class": "wenjianjia2",
+      "unicode": "e879",
+      "unicode_decimal": 59513
+    },
+    {
+      "icon_id": "23384234",
+      "name": "删除icon",
+      "font_class": "shanchuicon1",
+      "unicode": "e87a",
+      "unicode_decimal": 59514
+    },
     {
       "icon_id": "23261798",
       "name": "请求icon",
@@ -68,20 +488,6 @@
       "unicode": "e898",
       "unicode_decimal": 59544
     },
-    {
-      "icon_id": "23144154",
-      "name": "下拉按钮_icon",
-      "font_class": "xialaanniu_icon",
-      "unicode": "e89a",
-      "unicode_decimal": 59546
-    },
-    {
-      "icon_id": "23144155",
-      "name": "未选中请求icon",
-      "font_class": "weixuanzhongqingqiuicon",
-      "unicode": "e89b",
-      "unicode_decimal": 59547
-    },
     {
       "icon_id": "23144158",
       "name": "协作者管理icon",
@@ -89,13 +495,6 @@
       "unicode": "e8a1",
       "unicode_decimal": 59553
     },
-    {
-      "icon_id": "23144159",
-      "name": "选中响应icon",
-      "font_class": "xuanzhongxiangyingicon",
-      "unicode": "e8a2",
-      "unicode_decimal": 59554
-    },
     {
       "icon_id": "23144160",
       "name": "选中分支icon",
@@ -124,27 +523,6 @@
       "unicode": "e8af",
       "unicode_decimal": 59567
     },
-    {
-      "icon_id": "23046282",
-      "name": "新增目录_悬停icon",
-      "font_class": "xinzengmulu_xuantingicon",
-      "unicode": "e884",
-      "unicode_decimal": 59524
-    },
-    {
-      "icon_id": "23046283",
-      "name": "新增页面_默认icon",
-      "font_class": "xinzengyemian_morenicon",
-      "unicode": "e885",
-      "unicode_decimal": 59525
-    },
-    {
-      "icon_id": "23046287",
-      "name": "展开_默认icon",
-      "font_class": "zhankai_morenicon",
-      "unicode": "e889",
-      "unicode_decimal": 59529
-    },
     {
       "icon_id": "23046290",
       "name": "shanchu_tc_icon",
@@ -159,13 +537,6 @@
       "unicode": "e88d",
       "unicode_decimal": 59533
     },
-    {
-      "icon_id": "23046311",
-      "name": "新增页面_鼠标点击icon",
-      "font_class": "xinzengyemian_shubiaodianjiicon",
-      "unicode": "e88e",
-      "unicode_decimal": 59534
-    },
     {
       "icon_id": "23046244",
       "name": "导入模版_icon",
@@ -173,13 +544,6 @@
       "unicode": "e86f",
       "unicode_decimal": 59503
     },
-    {
-      "icon_id": "23046247",
-      "name": "导出_悬浮",
-      "font_class": "daochu_xuanfu",
-      "unicode": "e870",
-      "unicode_decimal": 59504
-    },
     {
       "icon_id": "23046252",
       "name": "错误",
@@ -187,13 +551,6 @@
       "unicode": "e872",
       "unicode_decimal": 59506
     },
-    {
-      "icon_id": "23046254",
-      "name": "成功",
-      "font_class": "chenggong1",
-      "unicode": "e873",
-      "unicode_decimal": 59507
-    },
     {
       "icon_id": "23046255",
       "name": "更多_icon",
@@ -208,13 +565,6 @@
       "unicode": "e875",
       "unicode_decimal": 59509
     },
-    {
-      "icon_id": "23046262",
-      "name": "复制_icon",
-      "font_class": "fuzhi_icon",
-      "unicode": "e876",
-      "unicode_decimal": 59510
-    },
     {
       "icon_id": "23046268",
       "name": "删除icon",
@@ -222,27 +572,6 @@
       "unicode": "e877",
       "unicode_decimal": 59511
     },
-    {
-      "icon_id": "23046269",
-      "name": "垃圾桶_icon@3x",
-      "font_class": "a-lajitong_icon3x",
-      "unicode": "e878",
-      "unicode_decimal": 59512
-    },
-    {
-      "icon_id": "23046270",
-      "name": "收起_默认icon",
-      "font_class": "shouqi_morenicon",
-      "unicode": "e879",
-      "unicode_decimal": 59513
-    },
-    {
-      "icon_id": "23046271",
-      "name": "欢迎_icon",
-      "font_class": "huanying_icon",
-      "unicode": "e87a",
-      "unicode_decimal": 59514
-    },
     {
       "icon_id": "23046273",
       "name": "搜索_删除icon",
@@ -264,13 +593,6 @@
       "unicode": "e87e",
       "unicode_decimal": 59518
     },
-    {
-      "icon_id": "23046277",
-      "name": "文件夹_icon",
-      "font_class": "wenjianjia_icon",
-      "unicode": "e87f",
-      "unicode_decimal": 59519
-    },
     {
       "icon_id": "23046278",
       "name": "下拉按钮",
@@ -278,20 +600,6 @@
       "unicode": "e880",
       "unicode_decimal": 59520
     },
-    {
-      "icon_id": "23046280",
-      "name": "新增目录_默认icon",
-      "font_class": "xinzengmulu_morenicon",
-      "unicode": "e882",
-      "unicode_decimal": 59522
-    },
-    {
-      "icon_id": "23046281",
-      "name": "新增目录_鼠标点击icon",
-      "font_class": "xinzengmulu_shubiaodianjiicon",
-      "unicode": "e883",
-      "unicode_decimal": 59523
-    },
     {
       "icon_id": "22906287",
       "name": "二次确认_icon",

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'),
@@ -82,11 +87,24 @@ const Search = Loadable({
 	loader: () => import('./modules/search/'),
 	loading: Loading,
 })
+const WikiPreview = Loadable({
+	loader: () => import('./forge/Wiki/Preview'),
+	loading: Loading,
+})
 
 const ProjectIndex = Loadable({
-  loader: () => import("./forge/Index"),
+	loader: () => import("./forge/Index"),
-  loading: Loading,
+	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);
@@ -96,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,
+			});
 		}
 	}
 
@@ -115,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({
@@ -192,87 +261,139 @@ class App extends Component {
 	};
 
 	render() {
-		const { mygetHelmetapi } = this.state;
+		const { mygetHelmetapi, pathType} = this.state;
 		let personal = mygetHelmetapi && mygetHelmetapi.personal;
 		return (
 			<Provider store={store}>
 				<ConfigProvider locale={zhCN}>
 					<MuiThemeProvider theme={theme}>
 						<LoginDialog {...this.props} {...this.state} Modifyloginvalue={() => this.Modifyloginvalue()}></LoginDialog>
-						<SiderBar/>
+						<SiderBar />
-						<Router>
+						{/* <Router> */}
-							<Switch>
+						<Switch>
-								{/*项目*/}
+							{/* wiki预览 */}
-								<Route
+							<Route path="/:owner/:projectsId/wiki/preview/:projectName/:projectId" render={
-									path={"/projects/:owner/:projectId/devops/:opsId/detail"}
+								(props) => {
-									render={
+									return (<WikiPreview {...this.props} {...props} {...this.state} />)
-										(props) => {
+								}
-											return (<OpsDetail {...this.props} {...props} {...this.state} />)
+							} />
-										}
+
-									}>
+							{/* 项目PR */}
-								</Route>
+							<Route path="/:owner/:projectsId/pulls/new"
-								<Route
+								render={
-									path={"/settings"}
+									(props) => (<ProjectDetail {...this.props} {...props} {...this.state} />)
-									render={
+								}
-										(props) => {
+							></Route>
-											return (<Security {...this.props} {...props} {...this.state} />)
+
-										}
+							{/*项目*/}
-									}>
+							<Route
-								</Route>
+								path={"/:owner/:projectId/devops/:opsId/detail"}
-								{/*项目*/}
+								render={
-								<Route
+									(props) => {
-									path={"/projects"}
+										return (<OpsDetail {...this.props} {...props} {...this.state} />)
-									render={
-										(props) => {
-											return (<Projects {...this.props} {...props} {...this.state} />)
-										}
-									}>
-								</Route>
-								<Route
-									path="/register"
-									render={
-										(props) => {
-											return (<EducoderLogin {...this.props} {...props} {...this.state} />)
-										}
 									}
-								/>
+								}>
-								{/*403*/}
+							</Route>
-								<Route path="/403" component={Shixunauthority} />
+							<Route
+								path={"/settings"}
+								render={
+									(props) => {
+										return (<Security {...this.props} {...props} {...this.state} />)
+									}
+								}>
+							</Route>
 
-								<Route path="/500" component={http500} />
+							<Route
-								<Route path={"/organize"}
+								path="/register"
-									render={
+								render={
-										(props) => {
+									(props) => {
-											return (<OrganizeIndex {...props} {...this.props} {...this.state} />)
+										return (<EducoderLogin {...this.props} {...props} {...this.state} />)
-										}
+									}
-									}>
+								}
-								</Route>
+							/>
-								{/*404*/}
+							{/*403*/}
-								<Route path="/nopage" component={Shixunnopage} />
+							<Route path="/403" component={Shixunauthority} />
 
-								{/* 查询 */}
+							<Route path="/500" component={http500} />
-								<Route path="/search" component={Search} />
 
-								{/* 个人主页 */}
+							{/*404*/}
-								<Route path="/users/:username"
+							<Route path="/nopage" component={Shixunnopage} />
-									render={
+
-										(props) => {
+							{/* 查询 */}
-											return (<InfosIndex {...this.props} {...this.state} />)
+							<Route path="/search" component={Search} />
-										}
+
-								}></Route>
+							<Route exact path="/explore"
-								<Route exact path="/"
+								render={
-									render={
+									(props) => (
-										(props) => (
-											personal && personal.length > 0 ?
-											<InfosIndex {...this.props} {...props} />
-											:
 											<ProjectIndex {...this.props} {...props} />
-										)
+									)
+								}
+							/>
+
+
+							{/* 组织 */}
+							<Route path={"/organize"}
+								render={
+									(props) => {
+										return (<OrganizeIndex {...props} {...this.props} {...this.state} />)
 									}
-								/>
+								}>
-								<Route component={Shixunnopage} />
+							</Route>
-							</Switch>
+							
-						</Router>
+							{/*新建项目等*/}
+							<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>

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) {

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',
 
 						}}>	{

src/common/DateUtil.js

@@ -1,4 +1,5 @@
 import moment  from "moment";
+import { number } from "prop-types";
 
 // 处理整点 半点
 // 取传入时间往后的第一个半点
@@ -97,3 +98,41 @@ export function formatDuring(mss){
 	}
   return days + "天" + hours + "小时" + minutes + "分";
 }
+
+/*
+  返回：多久以前
+  backDate：以前的某个日期
+*/
+export function timeAgo(backDate) {
+  try {
+    moment(backDate);
+  } catch (e) {
+    return '刚刚';
+  }
+  if(typeof backDate ==='number'){
+    backDate=backDate*1000
+  }else{
+    backDate= moment(backDate);
+  }
+  let time = new Date() - backDate;
+  var days = Math.floor(time / (1000 * 60 * 60 * 24));
+  var hours = Math.floor((time % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60));
+  var minutes = Math.floor((time % (1000 * 60 * 60)) / (1000 * 60));
+  var seconds = Math.floor((time % (1000 * 60 * 60)) / 1000);
+  if (time <= 0) {
+    return "刚刚";
+  }
+  if (days) {
+    return days + "天前";
+  }
+  if (hours) {
+    return hours + "小时前";
+  }
+  if (minutes) {
+    return minutes + "分前";
+  }
+  if (seconds) {
+    return seconds + "秒前";
+  }
+  return "刚刚";
+}

src/common/educoder.js

@@ -27,7 +27,7 @@ export {
 	markdownToHTML, uploadNameSizeSeperator, appendFileSizeToUploadFile, appendFileSizeToUploadFileAll, isImageExtension,
 	downloadFile, sortDirections, validateLength, mdJSONParse, exportMdtoHtml
 } from './TextUtil'
-export { handleDateString, getNextHalfHourOfMoment, formatDuring, formatSeconds } from './DateUtil'
+export { handleDateString, getNextHalfHourOfMoment, formatDuring, formatSeconds ,timeAgo} from './DateUtil'
 
 export { configShareForIndex, configShareForPaths, configShareForShixuns, configShareForCourses, configShareForCustom } from './util/ShareUtil'
 

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;

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}/Messagecount`} 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>

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={{padding:"10px 20px 20px 20px",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="复制链接">
+          <CopyTool inputId="copy_rep_content" className="copytool"/>
-            <span className="color-blue" onClick={jsCopy}><i className="iconfont icon-fuzhi"></i></span>
-          </Tooltip>
         </div>
       </div>
       <Menu className="edu-txt-center">

src/forge/Branch/branch.scss

@@ -102,4 +102,7 @@
       border-color:transparent ;
     }
   }
+}
+.copytool{
+  margin:0px 10px;
 }

src/forge/Component/AddGroup.jsx

@@ -55,6 +55,7 @@ function AddGroup({organizeId,getGroupID}){
 
   function addCollaborator(){
     getGroupID && getGroupID(id);
+    setID(undefined);
   }
 
   return(

src/forge/Component/Contributors.jsx

@@ -52,8 +52,8 @@ function Contributors({contributors,owner,projectsId}){
         <Spin spinning={isSpin}>
           <FlexAJ>
             <AlignCenter>
-              <Link to={`/users/${data.login}`}><img src={getImageUrl(`/${data.image_url}`)} alt="" className="radius" width="38px" height="38px"/></Link>
+              <Link to={`/${data.login}`}><img src={getImageUrl(`/${data.image_url}`)} alt="" className="radius" width="38px" height="38px"/></Link>
-              <Link to={`/users/${data.login}`} className="ml10">{data.name}</Link>
+              <Link to={`/${data.login}`} className="ml10">{data.name}</Link>
             </AlignCenter>
             {
               data.is_watch ? <a className="color-grey-9" onClick={()=>FocusFunc(false,data.login)}>取消关注</a>:<a className="color-blue" onClick={()=>FocusFunc(true,data.login)}>关注</a>
@@ -137,7 +137,7 @@ function Contributors({contributors,owner,projectsId}){
     <div className="halfs">
       <FlexAJ>
         <AlignCenter><span className="font-16 color-grey-6">贡献者</span>{ contributors && contributors.total_count > 0 && <span className="infoCount">{contributors.total_count}</span>}</AlignCenter>
-        <Link className="font-12 color-grey-9" to={`/projects/${owner}/${projectsId}/contribute`}>全部</Link>
+        <Link className="font-12 color-grey-9" to={`/${owner}/${projectsId}/contribute`}>全部</Link>
       </FlexAJ>
       <div className="attrPerson" onMouseLeave={()=>setVisibleFunc(false)}>
         {
@@ -145,7 +145,7 @@ function Contributors({contributors,owner,projectsId}){
           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>

src/forge/Component/CopyTool.jsx

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

src/forge/Component/DeleteModal/Index.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { AlignCenter } from '../layout';
-import { Modal , Button } from 'antd';
+import { Button } from 'antd';
-import './Index.scss';
+import Modals from '../PublicModal/Index';
 
 function DeleteBox({ 
   visible , 
@@ -12,24 +12,22 @@ function DeleteBox({
   content
 }) {
   return(
-    <Modal
+    <Modals 
-      visible={visible}
+      title={title} 
-      onCancel={onCancel}
+      btn={
-      title={title}
-      width="600px"
-      className="deleteBox"
-      footer={
         <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;

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;
-      }
-    }
-  }
-}

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}`);
     }
   }
 

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;
 }

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>

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;

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;
+}

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;

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;

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);
+        }
+      }
+    }
+  }
+}

src/forge/Component/Releases.jsx

@@ -11,9 +11,9 @@ function Releases({owner,projectsId,releaseVersions , baseOperate , projectType}
           { releaseVersions && releaseVersions.total_count > 0 && <span className="infoCount">{releaseVersions.total_count}</span>}
         </AlignCenter>
         { (releaseVersions && releaseVersions.total_count > 0) || projectType ===2 ? 
-          <Link className="font-12 color-grey-9" to={`/projects/${owner}/${projectsId}/releases`}>全部</Link>
+          <Link className="font-12 color-grey-9" to={`/${owner}/${projectsId}/releases`}>全部</Link>
           : 
-          baseOperate && <Link className="font-12 color-blue" to={`/projects/${owner}/${projectsId}/releases/new`}>新建</Link>
+          baseOperate && <Link className="font-12 color-blue" to={`/${owner}/${projectsId}/releases/new`}>新建</Link>
         }
       </FlexAJ>
       {
@@ -24,7 +24,7 @@ function Releases({owner,projectsId,releaseVersions , baseOperate , projectType}
               <i className="iconfont icon-biaoqian3 color-grey-6 font-18 mr10"></i>
               <div>
                 <p className="font-16 color-grey-6">
-                  <Link to={`/projects/${owner}/${projectsId}/releases`}>{item.name}</Link>
+                  <Link to={`/${owner}/${projectsId}/releases`}>{item.name}</Link>
                   <span className="font-12 laterest ml5">最新</span>
                 </p>
                 <p className="color-grey-9 font-13">{item.created_at}</p>

src/forge/Component/User.jsx

@@ -20,7 +20,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>

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);

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");

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>
         )
       }

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={
+        <Route path="/:owner/:projectsId/devops/params"
-            (p) => (<New {...props} {...p}/>)
-          }
-        ></Route>
-        <Route path="/projects/: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={
+        <Route path="/:owner/:projectsId/devops/list/:branch"
-            (p) => (<Dispose {...props} {...p}/>)
-          }
-        ></Route>
-        <Route path="/projects/: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>

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}/>

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">

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>

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>

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=>{

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>

src/forge/Divert/DivertModal.jsx

@@ -41,15 +41,19 @@ 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){
-            onSuccess(result.data && result.data.owner);
+            if(result.data.status === 0){
+              onSuccess(result.data && result.data.owner);
+            }else{
+              onSuccess();
+            }
           }
+
         }).catch(error=>{})
       }
     })
@@ -104,7 +108,7 @@ function DivertModal({form , visible , onSuccess , onCancel,owner,repo}){
           </ul>
           :
           <ul className="descUl">
-            <li>仓库仅可以转移到您已经加入的组织中，不可以转移到未加入的组织中</li>
+            <li>仓库仅可以转移到您具有管理权限的组织中</li>
             <li>涉及到仓库改名操作，请提前做好仓库备份并且在转移后对本地仓库的remote进行修改</li>
             <li>转移仓库到组织后，你和组织创建者/管理员同时拥有对该仓库的管理操作</li>
           </ul>

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>
     )
   })

src/forge/Head/Header.js

@@ -10,6 +10,7 @@ import HeadSearch from '../Component/HeadSearch';
 
 import AddProjectModal from './AddProjectModal';
 import '../../modules/tpm/TPMIndex.css';
+import CheckProfile from '../Component/ProfileModal/Profile';
 
 import './header.scss';
 const $ = window.$
@@ -222,6 +223,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,11 +241,16 @@ 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>
     )
@@ -245,7 +260,7 @@ class NewHeader extends Component {
     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,7 +269,7 @@ 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>
     )
@@ -347,7 +362,7 @@ class NewHeader extends Component {
       })
     }
 
-    // let search_url = settings && settings.common && settings.common.search;
+    let search_url = settings && settings.common && settings.common.search;
     let notice_url = settings && settings.common && settings.common.notice;
     return (
       <div className="newHeaders" id="nHeader">
@@ -385,16 +400,16 @@ class NewHeader extends Component {
                     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) );
@@ -412,7 +427,7 @@ 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">
@@ -442,7 +457,7 @@ class NewHeader extends Component {
             </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>

src/forge/Head/header.scss

@@ -30,6 +30,13 @@
   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;

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,23 @@ const ProjectIndex = Loadable({
   loading: Loading,
 });
 
-const ProjectDetail = Loadable({
+// 项目详情放在用户和组织下作为二级菜单存在
-  loader: () => import("./Main/Detail"),
+// const ProjectDetail = Loadable({
-  loading: Loading,
+//   loader: () => import("./Main/Detail"),
-});
+//   loading: Loading,
+// });
 
 class Index extends Component {
 
-  componentDidUpdate=()=>{
+  componentDidUpdate = () => {
-    this.props.history.listen(()=>{
+    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,23 +55,24 @@ class Index extends Component {
             )}
           ></Route>
           <Route
-            path="/projects/new"
+            path="/projects/mirror/new"
             render={(props) => (
               <ProjectNew {...this.props} {...props} />
             )}
           ></Route>
-          <Route
+          {/* <Route
-            path="/projects/:owner/:projectsId"
+            path="/:owner/:projectsId"
             render={(props) => (
               <ProjectDetail {...this.props} {...props} />
             )}
-          ></Route>
+          ></Route> */}
           <Route
-            path="/projects"
+            path="/explore"
             render={(props) => (
               <ProjectIndex {...this.props} {...props} />
             )}
           ></Route>
+
           <Route
             path="/"
             render={(props) => (
@@ -86,3 +90,10 @@ export default withRouter(
     parentSelector: ".newMain",
   })(CNotificationHOC()(SnackbarHOC()(TPMIndexHOC(Index))))
 );
+
+// export default withRouter(
+//   ImageLayerOfCommentHOC({
+//     imgSelector: ".imageLayerParent img, .imageLayerParent .imageTarget",
+//     parentSelector: ".newMain",
+//   })(Index)
+// );

src/forge/Main/CoderDepot.jsx

@@ -20,6 +20,7 @@ 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';
 /**
  * projectDetail.type:0是托管项目，1是镜像项目，2是同步镜像项目(为2时不支持在线创建、在线上传、在线修改、在线删除、创建合并请求等功能)
  */
@@ -112,7 +113,7 @@ 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);
@@ -147,6 +148,7 @@ function CoderDepot(props){
         setReadme(result.data.readme);
         setEditReadme(false);
         setHide(true);
+        console.log("dddd:",result.data.entries);
       }
       setTimeout(function(){setIsSpin(false);},500);
     }).catch(error=>{setIsSpin(false);})
@@ -198,7 +200,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);
   }
     
@@ -208,8 +210,12 @@ function CoderDepot(props){
     let checkvalue = turnbar(b);
     return (
     <Menu>
-      <Menu.Item><a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/${checkvalue}/uploadfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>上传文件</a></Menu.Item>
+      <Menu.Item>
-      <Menu.Item><a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/${checkvalue}/newfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>新建文件</a></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 +234,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 +247,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 +259,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);
   };
@@ -345,13 +351,13 @@ function CoderDepot(props){
                         }
                       </div>
                       <AlignCenter className="mr20">
-                        <Link to={`/projects/${owner}/${projectsId}/branchs`} className="color-grey-9">
+                        <Link to={`/${owner}/${projectsId}/branches`} className="color-grey-9">
                           <i className="iconfont icon-fenzhi2 font-18 color-grey-9 mr3"></i>
                           <span className="color-grey-6 mr3">{projectDetail && projectDetail.branches && projectDetail.branches.total_count}个</span>分支
                         </Link>
                       </AlignCenter>
                       <AlignCenter className="mr20">
-                        <Link to={`/projects/${owner}/${projectsId}/tag`} className="color-grey-9">
+                        <Link to={`/${owner}/${projectsId}/tags`} className="color-grey-9">
                           <i className="iconfont icon-biaoqian3 font-16 color-grey-9 mr3"></i>
                           <span className="color-grey-6 mr3">{projectDetail && projectDetail.tags && projectDetail.tags.total_count}个</span>标签
                         </Link>
@@ -363,11 +369,11 @@ function CoderDepot(props){
                         <div className="mr20 addOptionBtn">
                           {
                             projectDetail.type !== 2 && pullsFlag &&
-                            <a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/pulls/new`)} >+ 合并请求</a>
+                            <CheckProfile {...props} sureFunc={()=>urlLink(`/${owner}/${projectsId}/pulls/new`)} >+ 合并请求</CheckProfile>
                           }
                           {
                             issuesFlag &&
-                            <a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/issues/new`)} >+ 任务</a>
+                            <CheckProfile {...props} sureFunc={()=>urlLink(`/${owner}/${projectsId}/issues/new`)} >+ 任务</CheckProfile>
                           }
                         </div>
                       }
@@ -383,7 +389,7 @@ function CoderDepot(props){
                     </AlignCenter>
                   </FlexAJ>
                   {
-                    dirInfo || fileInfo ?
+                    (dirInfo && dirInfo.length>0) || fileInfo ?
                     <div className="listtable">
                       {
                         lastCommit &&
@@ -395,7 +401,7 @@ function CoderDepot(props){
                           { hideBtn && <span className="ellipsis" onClick={()=>changeHide(hide)}><i className="iconfont icon-shenglvehao"></i></span> }
 
                           <span className="ml12 color-grey-9 mt3">{lastCommit && lastCommit.time_from_now}</span>
-                          { commitCount ? <Link to={`/projects/${owner}/${projectsId}/commits/branch/${turnbar(branchName || defaultBranch)}`} className="ml12 color-grey-9">
+                          { commitCount ? <Link to={`/${owner}/${projectsId}/commits/branch/${turnbar(branchName || defaultBranch)}`} className="ml12 color-grey-9">
                             <i className="iconfont icon-tijiao mr3 font-17 color-grey-9"></i>{commitCount}次提交
                           </Link>:"" }
                         </div>
@@ -441,7 +447,7 @@ function CoderDepot(props){
                     : ""
                   }
                   {
-                    (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} /> :"" }
@@ -453,7 +459,10 @@ function CoderDepot(props){
                   <Gap style={{paddingLeft:"30px"}}>
                     <div className="panelmenu">
                       <FlexAJ className="font-18 color-grey-6 mb20" style={{lineHeight:"28px"}}>简介
-                        {projectDetail.permission && (projectDetail.permission==="Admin" || projectDetail.permission==="Owner") && <i onClick={()=>setOpenModal(true)} className="iconfont icon-anquanshezhi color-grey-9 font-15"></i>}
+                        {
+                        projectDetail.permission && (projectDetail.permission==="Admin" || projectDetail.permission==="Owner" || projectDetail.permission==="Manager") && 
+                          <i onClick={()=>setOpenModal(true)} className="iconfont icon-anquanshezhi color-grey-9 font-15"></i>
+                        }
                       </FlexAJ>
                       {desc && <p className="font-14 color-grey-9 mb15 task-hide-2" style={{lineHeight:"22px",WebkitLineClamp:"4",textAlign:"justify",wordBreak:"break-all"}}>{desc}</p>}
                       {
@@ -511,11 +520,11 @@ function CoderDepot(props){
                     }
                     {/* 贡献者 */}
                     {
-                      projectDetail && projectDetail.contributors &&
+                      projectDetail && projectDetail.contributors && projectDetail.contributors.length >0 && 
                       <Contributors contributors={projectDetail && projectDetail.contributors} owner={owner} projectsId={projectsId} />
                     }
                     {/* 语言 */}
-                    { projectDetail && projectDetail.languages && 
+                    { projectDetail && projectDetail.languages && projectDetail.languages.length >0 &&
                       <React.Fragment>
                         <Divider />
                         <LanguagePower languages={projectDetail.languages}/>

src/forge/Main/CoderDepotCatalogue.jsx

@@ -17,7 +17,7 @@ function CoderDepotCatalogue({item , goToSubRoot , owner , projectsId }){
         </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>

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">

src/forge/Main/CoderRootCommit.js

@@ -101,7 +101,7 @@ 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)=>{
@@ -141,13 +141,13 @@ class CoderRootCommit extends Component{
                     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={`/${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>
+                          <Link to={`/${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">
+                            <Link to={`/${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>:

src/forge/Main/CoderRootFileDetail.js

@@ -149,7 +149,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) => {

src/forge/Main/CoderRootIndex.js

@@ -87,57 +87,57 @@ class CoderRootIndex extends Component{
         <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} />)
             }
           ></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}  />)
             }
           ></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}  />)
             }
           ></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 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} />)
             }

src/forge/Main/CoderRootTag.js

@@ -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>

src/forge/Main/Detail.js

@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
-import { Spin, Tooltip , Button } from 'antd';
+import { Spin, Tooltip, Button } from 'antd';
 import { Link, Route, Switch } from 'react-router-dom';
-import { Content , AlignTop } from '../Component/layout';
+import { Content, AlignTop } from '../Component/layout';
 import DetailBanner from './sub/DetailBanner';
 import '../css/index.scss'
 import './list.css';
@@ -103,12 +103,12 @@ const Contribute = Loadable({
 })
 
 const CoderRootCommit = Loadable({
-	loader: () => import('./CoderRootCommit'),
+  loader: () => import('./CoderRootCommit'),
-	loading: Loading,
+  loading: Loading,
 })
 const CoderDepot = Loadable({
-	loader: () => import('./CoderDepot'),
+  loader: () => import('./CoderDepot'),
-	loading: Loading,
+  loading: Loading,
 })
 
 const TrendsIndex = Loadable({
@@ -127,30 +127,40 @@ const Source = Loadable({
 const DevIndex = Loadable({
   loader: () => import('../DevOps/Index'),
   loading: Loading,
-})
+});
+const Wiki = Loadable({
+  loader: () => import('../Wiki/Index'),
+  loading: Loading,
+});
+const WikiEdit = Loadable({
+  loader: () => import('../Wiki/EditWiki'),
+  loading: Loading,
+});
 /**
  * permission：Manager:管理员，Reporter：报告人员(只有读取权限)，Developer：开发人员（除不能设置仓库信息外）
  */
-function checkPathname(projectsId,owner,pathname){
+function checkPathname(projectsId, owner, pathname) {
   let name = "";
-  if(pathname && pathname !== `/projects/${owner}/${projectsId}`){
+  if (pathname && pathname !== `/${owner}/${projectsId}`) {
-    let url = pathname.split(`/projects/${owner}/${projectsId}`)[1];
+    let url = pathname.split(`/${owner}/${projectsId}`)[1] || '';
-    if(url.indexOf("/about")>-1){
+    if (url.indexOf("/about") > -1) {
-      name="about"
+      name = "about"
-    }else if(url.indexOf("/issues")>-1 ||url.indexOf("Milepost") > 0){
+    } else if (url.indexOf("/issues") > -1 || url.indexOf("Milepost") > 0) {
       name = "issues";
-    }else if(url.indexOf("/pulls")>-1){
+    } else if (url.indexOf("/pulls") > -1) {
-      name="pulls"
+      name = "pulls"
-    }else if(url.indexOf("/milestones")>-1){
+    } else if (url.indexOf("/milestones") > -1) {
-      name="milestones"
+      name = "milestones"
-    }else if(url.indexOf("/activity")>-1){
+    } else if (url.indexOf("/activity") > -1) {
-      name="activity"
+      name = "activity"
-    }else if(url.indexOf("/setting")>-1){
+    } else if (url.indexOf("/settings") > -1) {
-      name="setting"
+      name = "settings"
-    }else if(url.indexOf(`/devops`)>-1){
+    } else if (url.indexOf(`/devops`) > -1) {
-      name="devops"
+      name = "devops"
-    }else if(url.indexOf(`/source`)>-1){
+    } else if (url.indexOf(`/source`) > -1) {
-      name="source"
+      name = "source"
+    } else if (url.indexOf(`/wiki`) > -1) {
+      name = "wiki"
     }
   }
   return name;
@@ -173,15 +183,15 @@ class Detail extends Component {
       branchs: undefined,
       branchList: undefined,
       project: null,
-      firstSync:false,
+      firstSync: false,
-      secondSync:false,
+      secondSync: false,
-      open_devops:false,
+      open_devops: false,
-      forkSpin:false,
+      forkSpin: false,
       // 默认分支
-      defaultBranch:undefined,
+      defaultBranch: undefined,
 
       // 非本平台项目
-      platform:false
+      platform: false
     }
   }
 
@@ -198,36 +208,38 @@ class Detail extends Component {
   }
 
   getProject = (num) => {
-    const { projectsId , owner } = this.props.match.params;
+    const { projectsId, owner } = this.props.match.params;
     const url = `/${owner}/${projectsId}/simple.json`;
     axios.get(url).then((result) => {
       if (result && result.data) {
         this.setState({
           project: result.data,
-          open_devops:result.data.open_devops,
+          open_devops: result.data.open_devops,
-          platform:result.data.platform && result.data.platform !== 'educoder'
+          platform: result.data.platform && result.data.platform !== 'educoder'
         })
 
         if (result.data.type !== 0 && result.data.mirror_status === 1) {
           console.log("--------start channel --------");
           // 是镜像项目，且未完成迁移
           this.canvasChannel();
-          if(num){
+          if (num) {
             this.setState({
-              secondSync:true,
+              secondSync: true,
-              firsrtSync:false
+              firstSync: false
             })
-          }else{
+          } else {
             this.setState({
-              firstSync:true,
+              firstSync: true,
-              secondSync:false
+              secondSync: false
             })
           }
-        }else{
+        } else if (result.data.mirror_status === 2) {
+          this.deleteProjectBack();
+        } else {
           this.getDetail();
           this.setState({
-            firsrtSync:false,
+            firstSync: false,
-            secondSync:false
+            secondSync: false
           })
         }
       }
@@ -235,9 +247,9 @@ class Detail extends Component {
   }
 
   // 工作流激活后修改状态
-  changeOpenDevops=(flag)=>{
+  changeOpenDevops = (flag) => {
     this.setState({
-      open_devops:flag
+      open_devops: flag
     })
   }
   canvasChannel = () => {
@@ -247,7 +259,7 @@ class Detail extends Component {
     var cable = actioncable.createConsumer(`wss://${name}/cable`);
     this.canvasChannel1 = cable.subscriptions.create({
       channel: `MirrorProjectChannel`,
-      id: project && project.identifier
+      id: project && project.id
     }, {
       connected: () => {
         console.log("###### channel connected! ######");
@@ -255,16 +267,41 @@ class Detail extends Component {
       disconnected: () => { },
       received: data => {
         console.log(`###### ---received data--- ######`);
+        console.log(data);
         if (data) {
+          if ( data.project && data.project.mirror_status === 2) {
+            this.deleteProjectBack();
+          }
           this.getDetail();
+          this.setState({
+            firstSync: false,
+            secondSync: false
+          });
           cable.subscriptions.consumer.disconnect();
         }
       }
     })
   }
 
+  deleteProjectBack = () => {
+    const { history } = this.props;
+    const { projectsId, owner } = this.props.match.params;
+    axios.delete(`/${owner}/${projectsId}.json`).then(res => {
+      let hash = '/projects/mirror/new';
+      if (res && res.data) {
+        history.push({
+          pathname: hash,
+          mirror_status: 2
+        });
+      }
+      else {
+        window.location.hash = hash;
+      }
+    });
+  }
+
   getDetail = () => {
-    const { projectsId , owner } = this.props.match.params;
+    const { projectsId, owner } = this.props.match.params;
     this.getBanner();
     const url = `/${owner}/${projectsId}/detail.json`;
     axios.get(url).then((result) => {
@@ -281,29 +318,29 @@ class Detail extends Component {
           watchers_count: result.data.watchers_count,
           praises_count: result.data.praises_count,
           forked_count: result.data.forked_count,
-          defaultBranch:result.data.default_branch
+          defaultBranch: result.data.default_branch
         })
       }
     }).catch((error) => { })
   }
 
   // 获取动态导航栏菜单
-  getBanner(){
+  getBanner() {
-    const { projectsId , owner } = this.props.match.params;
+    const { projectsId, owner } = this.props.match.params;
     const url = `/${owner}/${projectsId}/menu_list.json`;
-    axios.get(url).then(result=>{
+    axios.get(url).then(result => {
-      if(result){
+      if (result) {
         this.setState({
-          bannerList:result.data
+          bannerList: result.data
         })
       }
-    }).catch(error=>{})
+    }).catch(error => { })
   }
 
   // 关注和取消关注
   focusFunc = (flag) => {
     const { platform } = this.state;
-    if(!platform)return;
+    if (!platform) return;
 
     const { project_id } = this.state;
     axios({
@@ -318,15 +355,15 @@ class Detail extends Component {
         this.setWatchersCount(result.data.watchers_count, result.data.watched);
       }
     })
-    .catch(error => {
+      .catch(error => {
-      console.log(error);
+        console.log(error);
-    });
+      });
   }
 
   // 点赞和取消点赞
   pariseFunc = (flag) => {
     const { platform } = this.state;
-    if(!platform)return;
+    if (!platform) return;
     const { project_id } = this.state;
     axios({
       method: flag ? 'delete' : 'post',
@@ -336,9 +373,9 @@ class Detail extends Component {
         this.setPraisesCount(result.data.praises_count, result.data.praised)
       }
     })
-    .catch(error => {
+      .catch(error => {
-      console.log(error);
+        console.log(error);
-    });
+      });
   }
 
   setWatchersCount = (count, is_watched) => {
@@ -358,24 +395,24 @@ class Detail extends Component {
   // fork项目
   forkFunc = () => {
     const { platform } = this.state;
-    if(!platform)return;
+    if (!platform) return;
     this.setState({
-      forkSpin:true
+      forkSpin: true
     })
     const { current_user } = this.props
-    const { projectsId , owner } = this.props.match.params;
+    const { projectsId, owner } = this.props.match.params;
     const url = `/${owner}/${projectsId}/forks.json`;
     axios.post(url).then(result => {
       if (result && result.data.status === 0) {
-        this.props.history.push(`/projects/${current_user && current_user.login}/${result.data.identifier}`);
+        this.props.history.push(`/${current_user && current_user.login}/${result.data.identifier}`);
         this.props.showNotification(result.data.message);
       }
       this.setState({
-        forkSpin:false
+        forkSpin: false
       })
     }).catch(error => {
       this.setState({
-        forkSpin:false
+        forkSpin: false
       })
     })
   }
@@ -383,8 +420,8 @@ class Detail extends Component {
   // 同步镜像
   synchronismMirror = () => {
     const { platform } = this.state;
-    if(!platform)return;
+    if (!platform) return;
-    const { projectsId , owner } = this.props.match.params;
+    const { projectsId, owner } = this.props.match.params;
     const url = `/${owner}/${projectsId}/sync_mirror.json`;
     axios.post(url).then(result => {
       if (result && result.data && result.data.status === 0) {
@@ -398,326 +435,345 @@ class Detail extends Component {
     })
   }
 
-  textFunc = (forked_from_project_id,fork_info)=>{
+  textFunc = (forked_from_project_id, fork_info) => {
     let type = fork_info && fork_info.fork_project_user_type;
     return forked_from_project_id && fork_info ?
       <div className="color-grey-9 df">
         <span>复刻自</span>
-        <Link to={`${type ==="Organization" ? "/organize":'/users'}/${fork_info.fork_project_user_login}`} className="show-user-link color-grey-6 ml5">{fork_info.fork_project_user_name}</Link>
+        <Link to={`/${fork_info.fork_project_user_login}`} className="show-user-link color-grey-6 ml5">{fork_info.fork_project_user_name}</Link>
         <span> / </span>
-        <Link to={`/projects/${fork_info.fork_project_user_login}/${fork_info.fork_project_identifier}`} className="color-grey-6 task-hide flex1" style={{maxWidth:"400px"}} title={fork_info.fork_form_name}>{fork_info.fork_form_name}</Link>
+        <Link to={`/${fork_info.fork_project_user_login}/${fork_info.fork_project_identifier}`} className="color-grey-6 task-hide flex1" style={{ maxWidth: "400px" }} title={fork_info.fork_form_name}>{fork_info.fork_form_name}</Link>
       </div> : ""
   }
-  
+
 
   render() {
-    const { projectDetail, watchers_count, praises_count, 
+    const { projectDetail, watchers_count, praises_count,
-      forked_count, firstSync , secondSync , 
+      forked_count, firstSync, secondSync,
-      isManager, watched, praised, 
+      isManager, watched, praised,
-      project , open_devops , platform , defaultBranch , bannerList , forkSpin } = this.state;
+      project, open_devops, platform, defaultBranch, bannerList, forkSpin } = this.state;
     const url = this.props.history.location.pathname;
     const urlArr = url.split("/");
     const urlFlag = (urlArr.length === 3);
 
-    const { projectsId , owner } = this.props.match.params;
+    const { projectsId, owner } = this.props.match.params;
     const { current_user } = this.props;
-    let pathname = checkPathname(projectsId,owner,url);
+    let pathname = checkPathname(projectsId, owner, url);
 
     const { state } = this.props.history.location;
-    
+
     const common = {
       getDetail: this.getDetail,
-      changeOpenDevops:this.changeOpenDevops,
+      changeOpenDevops: this.changeOpenDevops,
       defaultBranch
     }
     return (
       <div>
         <div className="detailHeader-wrapper">
           <div className="normal">
-            <AlignTop style={{padding:"20px 0px 10px",justifyContent:"space-between"}}>
+            <AlignTop style={{ padding: "20px 0px 10px", justifyContent: "space-between" }}>
               <div>
                 <AlignTop>
                   <div className="projectallName">
                     {project && project.author &&
-                      <Link to={`${project.author.type ==="Organization" ? "/organize":'/users'}/${project.author.login}`}>{project.author.name}</Link>
+                      <Link to={`/${project.author.login}`}>{project.author.name}</Link>
                     }
                     <span className="ml5 mr5">/</span>
-                    <Link to={`/projects/${owner}/${projectsId}`} className="projectN mt6">{projectDetail && projectDetail.name}</Link>
+                    <Link to={`/${owner}/${projectsId}`} className="projectN mt6">{projectDetail && projectDetail.name}</Link>
                   </div>
-                  { projectDetail && projectDetail.private && <span className="privateTag mt6">私有</span>}
+                  {projectDetail && projectDetail.private && <span className="privateTag mt6">私有</span>}
                 </AlignTop>
                 <div className="mt8">
                   {
                     projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ?
-                    this.textFunc(projectDetail.forked_from_project_id,projectDetail.fork_info)
+                      this.textFunc(projectDetail.forked_from_project_id, projectDetail.fork_info)
-                    :""
+                      : ""
                   }
                   {
-                    projectDetail && projectDetail.type && projectDetail.type !== 0 ? 
+                    projectDetail && projectDetail.type && projectDetail.type !== 0 ?
-                    <span className="color-grey-9">镜像自 <a className="color-grey-6" target="_blank" href={projectDetail.mirror_url}>{projectDetail.mirror_url}</a></span>
+                      <span className="color-grey-9">镜像自 <a className="color-grey-6" target="_blank" href={projectDetail.mirror_url}>{projectDetail.mirror_url}</a></span>
-                    :""
+                      : ""
                   }
                 </div>
               </div>
               <div>
                 {
-                  firstSync ? "":
+                  firstSync ? "" :
-                  <span className="df">
+                    <span className="df">
-                    {
-                      ((current_user && current_user.admin) || isManager) && (projectDetail && projectDetail.type && projectDetail.type === 2) ?
-                      <a className="synchronism ml30" onClick={this.synchronismMirror}>同步镜像</a> : ""
-                    }
-                    <Button className="detail_tag_btn">
-                      <a className="detail_tag_btn_name" style={{cursor:platform?"pointer":"default"}} onClick={() => this.focusFunc(watched)}>
-                        <i className={watched ? "iconfont icon-shixing color-orange font-16 mr3":"iconfont icon-kongxing color-grey-9 font-16 mr3"}></i>
-                        <span>{watched ? '取消关注' : '关注'}</span>
-                      </a>
                       {
-                        watchers_count > 0 ?
+                        ((current_user && current_user.admin) || isManager) && (projectDetail && projectDetail.type && projectDetail.type === 2) ?
-                        platform ?
+                          <a className="synchronism ml30" onClick={this.synchronismMirror}>同步镜像</a> : ""
-                        <Link className="detail_tag_btn_count" style={{color:`${watched?"#2878FF":"#666"}`}} to={platform?{ pathname: `/projects/${owner}/${projectsId}/watchers`, state }:""}>
-                          {watchers_count}
-                        </Link>
-                        :
-                        <span className="detail_tag_btn_count">{watchers_count}</span>
-                        :""
                       }
-                    </Button>
+                      <Button className="detail_tag_btn">
-                    <Button className="detail_tag_btn">
+                        <a className="detail_tag_btn_name" style={{ cursor: platform ? "pointer" : "default" }} onClick={() => this.focusFunc(watched)}>
-                      <a className="detail_tag_btn_name" style={{cursor:platform?"pointer":"default"}} onClick={() => this.pariseFunc(praised)}>
+                          <i className={watched ? "iconfont icon-shixing color-orange font-16 mr3" : "iconfont icon-kongxing color-grey-9 font-16 mr3"}></i>
-                        <i className={praised ? "iconfont icon-weibiaoti105 color-orange font-14 mr3":"iconfont icon-guanzhu color-grey-9 font-14 mr3"}></i>
+                          <span>{watched ? '取消关注' : '关注'}</span>
-                        <span>{praised ? '取消点赞' : '点赞'}</span>
-                      </a>
-                      {
-                        praises_count > 0 ?
-                        platform ?
-                        <Link className="detail_tag_btn_count" style={{color:`${praised?"#2878FF":"#666"}`}} to={{ pathname: `/projects/${owner}/${projectsId}/stargazers`, state }}>
-                          {praises_count}
-                        </Link>:
-                        <span className="detail_tag_btn_count">{praises_count}</span>
-                        :""
-                      }
-                    </Button>
-                    <Button className="detail_tag_btn" loading={forkSpin}>
-                      <Tooltip title="复刻是fork的中文名，即复制代码仓库" placement="bottom">
-                        <a className="detail_tag_btn_name" style={{cursor:platform?"pointer":"default"}} onClick={this.forkFunc}>
-                          <i className="iconfont icon-fork color-grey-9 mr3"></i>复刻
                         </a>
-                      </Tooltip>
+                        {
-                      {
+                          watchers_count > 0 ?
-                        forked_count > 0 ?
+                            platform ?
-                        platform ?
+                              <Link className="detail_tag_btn_count" style={{ color: `${watched ? "#2878FF" : "#666"}` }} to={platform ? { pathname: `/${owner}/${projectsId}/following`, state } : ""}>
-                        <Link className="detail_tag_btn_count" to={{ pathname: `/projects/${owner}/${projectsId}/fork_users`, state }}>
+                                {watchers_count}
-                          {forked_count}
+                              </Link>
-                        </Link>
+                              :
-                        :
+                              <span className="detail_tag_btn_count">{watchers_count}</span>
-                        <span className="detail_tag_btn_count">{forked_count}</span>
+                            : ""
-                        :""
+                        }
-                      }
+                      </Button>
-                    </Button>
+                      <Button className="detail_tag_btn">
-                  </span>
+                        <a className="detail_tag_btn_name" style={{ cursor: platform ? "pointer" : "default" }} onClick={() => this.pariseFunc(praised)}>
+                          <i className={praised ? "iconfont icon-weibiaoti105 color-orange font-14 mr3" : "iconfont icon-guanzhu color-grey-9 font-14 mr3"}></i>
+                          <span>{praised ? '取消点赞' : '点赞'}</span>
+                        </a>
+                        {
+                          praises_count > 0 ?
+                            platform ?
+                              <Link className="detail_tag_btn_count" style={{ color: `${praised ? "#2878FF" : "#666"}` }} to={{ pathname: `/${owner}/${projectsId}/stargazers`, state }}>
+                                {praises_count}
+                              </Link> :
+                              <span className="detail_tag_btn_count">{praises_count}</span>
+                            : ""
+                        }
+                      </Button>
+                      <Button className="detail_tag_btn" loading={forkSpin}>
+                        <Tooltip title="复刻是fork的中文名，即复制代码仓库" placement="bottom">
+                          <a className="detail_tag_btn_name" style={{ cursor: platform ? "pointer" : "default" }} onClick={this.forkFunc}>
+                            <i className="iconfont icon-fork color-grey-9 mr3"></i>复刻
+                          </a>
+                        </Tooltip>
+                        {
+                          forked_count > 0 ?
+                            platform ?
+                              <Link className="detail_tag_btn_count" to={{ pathname: `/${owner}/${projectsId}/members`, state }}>
+                                {forked_count}
+                              </Link>
+                              :
+                              <span className="detail_tag_btn_count">{forked_count}</span>
+                            : ""
+                        }
+                      </Button>
+                    </span>
                 }
               </div>
             </AlignTop>
             {
               firstSync ? "" :
-              <DetailBanner 
+                <DetailBanner
-                history={this.props.history}
+                  history={this.props.history}
-                list={bannerList}
+                  list={bannerList}
-                owner={owner}
+                  owner={owner}
-                projectsId={projectsId}
+                  projectsId={projectsId}
-                pathname={pathname}
+                  pathname={pathname}
-                state={state}
+                  state={state}
-                projectDetail={projectDetail}
+                  projectDetail={projectDetail}
-                open_devops={open_devops}
+                  open_devops={open_devops}
-                platform={platform}
+                  platform={platform}
-                urlFlag={urlFlag}
+                  urlFlag={urlFlag}
-                isManager={isManager}
+                  isManager={isManager}
-              />
+                />
             }
           </div>
         </div>
         {
           firstSync ?
-          <Content className="spincontent">
+            <Content className="spincontent">
-            <Spin className="spinstyle" tip={project && `正在从 ${project.mirror_url} 迁移`} size="large" />
+              <Spin className="spinstyle" tip={project && `正在从 ${project.mirror_url} 迁移`} size="large" />
-          </Content>
+            </Content>
-          :
+            :
-          <Spin spinning={secondSync} className="spinstyle" tip="正在同步镜像" size="large">
+            <Spin spinning={secondSync} className="spinstyle" tip="正在同步镜像" size="large">
-            <Switch {...this.props}>
+              <Switch {...this.props}>
-              {/* 资源 */}
+                {/* 资源 */}
-              <Route path="/projects/:owner/:projectsId/source"
+                <Route path="/:owner/:projectsId/source"
-                render={
+                  render={
-                  () => (<Source {...this.props} {...this.state} {...common} />)
+                    () => (<Source {...this.props} {...this.state} {...common} />)
-                }
+                  }
-              ></Route>
+                ></Route>
-              {/* 主页 */}
+                {/* 主页 */}
-              <Route path="/projects/:owner/:projectsId/about"
+                <Route path="/:owner/:projectsId/about"
-                render={
+                  render={
-                  () => (<DevAbout {...this.props} {...this.state} {...common} />)
+                    () => (<DevAbout {...this.props} {...this.state} {...common} />)
-                }
+                  }
-              ></Route>
+                ></Route>
-              {/* 工作流 */}
+                {/* wiki新增文件 */}
-              <Route path="/projects/:owner/:projectsId/devops"
+                <Route path="/:owner/:projectsId/wiki/add"
-                render={
+                  render={
-                  () => (<DevIndex {...this.props} {...this.state} {...common} />)
+                    () => (<WikiEdit {...this.props} {...this.state} {...common} />)
-                }
+                  }
-              ></Route>
+                ></Route>
-              {/* 标签列表 */}
+                {/* wiki编辑文件 */}
-              <Route path="/projects/:owner/:projectsId/issues/tags"
+                <Route path="/:owner/:projectsId/wiki/edit/:wikiName"
-                render={
+                  render={
-                  (props) => (<TagList {...this.props} {...props} {...this.state} {...common} />)
+                    () => (<WikiEdit {...this.props} {...this.state} {...common} />)
-                }
+                  }
-              ></Route>
+                ></Route>
-              {/* 仓库设置 */}
+                {/* wiki */}
-              <Route path="/projects/:owner/:projectsId/setting"
+                <Route path="/:owner/:projectsId/wiki"
-                render={
+                  render={
-                  (props) => (<Setting {...this.props} {...props} {...this.state} {...common} />)
+                    () => (<Wiki {...this.props} {...this.state} {...common} />)
-                }
+                  }
-              ></Route>
+                ></Route>
-              {/* 任务详情 */}
+                {/* 工作流 */}
-              <Route path="/projects/:owner/:projectsId/issues/:orderId/detail"
+                <Route path="/:owner/:projectsId/devops"
-                render={
+                  render={
-                  (props) => (<OrderDetail {...this.props} {...this.state} {...props} {...common} />)
+                    () => (<DevIndex {...this.props} {...this.state} {...common} />)
-                }
+                  }
-              ></Route>
+                ></Route>
-              {/*修改里程碑*/}
+                {/* 标签列表 */}
-              <Route path="/projects/:owner/:projectsId/milestones/:meilid/edit"
+                <Route path="/:owner/:projectsId/issues/tags"
-                render={
+                  render={
-                  (props) => (<OrderupdateMilepost {...this.props} {...props} {...this.state} {...common} />)
+                    (props) => (<TagList {...this.props} {...props} {...this.state} {...common} />)
-                }
+                  }
-              ></Route>
+                ></Route>
-              {/* 新建里程碑 */}
+                {/* 仓库设置 */}
-              <Route path="/projects/:owner/:projectsId/milestones/new"
+                <Route path="/:owner/:projectsId/settings"
-                render={
+                  render={
-                  (props) => (<OrdernewMilepost {...this.props} {...props} {...this.state} {...common} />)
+                    (props) => (<Setting {...this.props} {...props} {...this.state} {...common} />)
-                }
+                  }
-              ></Route>
+                ></Route>
-              {/*里程碑详情*/}
+               
-              <Route path="/projects/:owner/:projectsId/milestones/:meilid"
+                {/*修改里程碑*/}
-                render={
+                <Route path="/:owner/:projectsId/milestones/:meilid/edit"
-                  (props) => (<MilepostDetail {...this.props} {...props} {...this.state} {...common} />)
+                  render={
-                }
+                    (props) => (<OrderupdateMilepost {...this.props} {...props} {...this.state} {...common} />)
-              ></Route>
+                  }
-              {/* 里程碑 */}
+                ></Route>
-              <Route path="/projects/:owner/:projectsId/milestones"
+                {/* 新建里程碑 */}
-                render={
+                <Route path="/:owner/:projectsId/milestones/new"
-                  (props) => (<OrderMilepost {...this.props} {...props} {...this.state} {...common} />)
+                  render={
-                }
+                    (props) => (<OrdernewMilepost {...this.props} {...props} {...this.state} {...common} />)
-              ></Route>
+                  }
-              {/* 里程碑页面新建任务 */}
+                ></Route>
-              <Route path="/projects/:owner/:projectsId/issues/:milepostId/new"
+                {/*里程碑详情*/}
-                render={
+                <Route path="/:owner/:projectsId/milestones/:meilid"
-                  (props) => (<OrderNew {...this.props} {...props} {...this.state} {...common} />)
+                  render={
-                }
+                    (props) => (<MilepostDetail {...this.props} {...props} {...this.state} {...common} />)
-              ></Route>
+                  }
-              {/* 新建任务 */}
+                ></Route>
-              <Route path="/projects/:owner/:projectsId/issues/new"
+                {/* 里程碑 */}
-                render={
+                <Route path="/:owner/:projectsId/milestones"
-                  (props) => (<OrderNew {...this.props} {...props} {...this.state} {...common} />)
+                  render={
-                }
+                    (props) => (<OrderMilepost {...this.props} {...props} {...this.state} {...common} />)
-              ></Route>
+                  }
-              {/* 修改详情 */}
+                ></Route>
-              <Route path="/projects/:owner/:projectsId/issues/:orderId/updatedetail"
+                {/* 里程碑页面新建任务 */}
-                render={
+                <Route path="/:owner/:projectsId/issues/:milepostId/new"
-                  (props) => (<OrderupdateDetail  {...this.props} {...props} {...this.state} {...common} />)
+                  render={
-                }
+                    (props) => (<OrderNew {...this.props} {...props} {...this.state} {...common} />)
-              ></Route>
+                  }
-              {/* 复制详情 */}
+                ></Route>
-              <Route path="/projects/:owner/:projectsId/issues/:orderId/copyetail"
+                {/* 新建任务 */}
-                render={
+                <Route path="/:owner/:projectsId/issues/new"
-                  (props) => (<OrdercopyDetail  {...this.props} {...props} {...this.state} {...common} />)
+                  render={
-                }
+                    (props) => (<OrderNew {...this.props} {...props} {...this.state} {...common} />)
-              ></Route>
+                  }
-              {/* 动态 */}
+                ></Route>
-              <Route path="/projects/:owner/:projectsId/activity"
+                {/* 修改详情 */}
-                render={
+                <Route path="/:owner/:projectsId/issues/:orderId/updatedetail"
-                  (props) => (<TrendsIndex {...this.props} {...props} {...this.state} {...common} />)
+                  render={
-                }
+                    (props) => (<OrderupdateDetail  {...this.props} {...props} {...this.state} {...common} />)
-              ></Route>
+                  }
-              {/* 代码Index */}
+                ></Route>
-              <Route path="/projects/:owner/:projectsId/issues"
+                {/* 复制详情 */}
-                render={
+                <Route path="/:owner/:projectsId/issues/:orderId/copyetail"
-                  (props) => (<OrderIndex {...this.props} {...props} {...this.state} {...common} />)
+                  render={
-                }
+                    (props) => (<OrdercopyDetail  {...this.props} {...props} {...this.state} {...common} />)
-              ></Route>
+                  }
-              {/* 新建合并请求 */}
+                ></Route>
-              <Route path="/projects/:owner/:projectsId/pulls/new/:branch"
+                 {/* 任务详情 */}
-                render={
+                 <Route path="/:owner/:projectsId/issues/:orderId"
-                  (props) => (<CreateMerge {...this.props} {...props} {...this.state} {...common} is_fork={true} />)
+                  render={
-                }
+                    (props) => (<OrderDetail {...this.props} {...this.state} {...props} {...common} />)
-              ></Route>
+                  }
-              <Route path="/projects/:owner/:projectsId/pulls/new"
+                ></Route>
-                render={
+                {/* 动态 */}
-                  (props) => (<CreateMerge {...this.props} {...props} {...this.state} {...common} is_fork={true} />)
+                <Route path="/:owner/:projectsId/activity"
-                }
+                  render={
-              ></Route>
+                    (props) => (<TrendsIndex {...this.props} {...props} {...this.state} {...common} />)
-              <Route path="/projects/:owner/:projectsId/pulls/:mergeId/UpdateMerge"
+                  }
-                render={
+                ></Route>
-                  (props) => (<UpdateMerge {...this.props} {...props} {...this.state} {...common} />)
+                {/* 代码Index */}
-                }
+                <Route path="/:owner/:projectsId/issues"
-              ></Route>
+                  render={
-              <Route path="/projects/:owner/:projectsId/pulls/:mergeId/Messagecount"
+                    (props) => (<OrderIndex {...this.props} {...props} {...this.state} {...common} />)
-                render={
+                  }
-                  (props) => (<MessageCount {...this.props} {...props} {...this.state} {...common} />)
+                ></Route>
-                }
+                {/* 新建合并请求 */}
-              ></Route>
+                <Route path="/:owner/:projectsId/pulls/new/:branch"
-              <Route path="/projects/:owner/:projectsId/pulls/:mergeId/MergeSubmit"
+                  render={
-                render={
+                    (props) => (<CreateMerge {...this.props} {...props} {...this.state} {...common} is_fork={true} />)
-                  (props) => (<MessageCount {...this.props} {...props} {...this.state} {...common} />)
+                  }
-                }
+                ></Route>
-              ></Route>
+                <Route path="/:owner/:projectsId/pulls/new"
+                  render={
+                    (props) => (<CreateMerge {...this.props} {...props} {...this.state} {...common} is_fork={true} />)
+                  }
+                ></Route>
+                <Route path="/:owner/:projectsId/pulls/:mergeId/UpdateMerge"
+                  render={
+                    (props) => (<UpdateMerge {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                <Route path="/:owner/:projectsId/pulls/:mergeId/Messagecount"
+                  render={
+                    (props) => (<MessageCount {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                <Route path="/:owner/:projectsId/pulls/:mergeId/MergeSubmit"
+                  render={
+                    (props) => (<MessageCount {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
 
-              <Route path="/projects/:owner/:projectsId/pulls"
+                <Route path="/:owner/:projectsId/pulls"
-                render={
+                  render={
-                  (props) => (<MergeIndexDetail {...this.props} {...props} {...this.state} {...common} />)
+                    (props) => (<MergeIndexDetail {...this.props} {...props} {...this.state} {...common} />)
-                }
+                  }
-              ></Route>
+                ></Route>
-              <Route path="/projects/:owner/:projectsId/watchers"
+                <Route path="/:owner/:projectsId/following"
-                render={
+                  render={
-                  (props) => (<WatchUsers {...this.props} {...props} {...this.state} {...common} />)
+                    (props) => (<WatchUsers {...this.props} {...props} {...this.state} {...common} />)
-                }
+                  }
-              ></Route>
+                ></Route>
-              <Route path="/projects/:owner/:projectsId/stargazers"
+                <Route path="/:owner/:projectsId/stargazers"
-                render={
+                  render={
-                  (props) => (<PraiseUsers {...this.props} {...props} {...this.state} {...common} />)
+                    (props) => (<PraiseUsers {...this.props} {...props} {...this.state} {...common} />)
-                }
+                  }
-              ></Route>
+                ></Route>
-              <Route path="/projects/:owner/:projectsId/fork_users"
+                <Route path="/:owner/:projectsId/members"
-                render={
+                  render={
-                  (props) => (<ForkUsers {...this.props} {...props} {...this.state} {...common} />)
+                    (props) => (<ForkUsers {...this.props} {...props} {...this.state} {...common} />)
-                }
+                  }
-              ></Route>
+                ></Route>
-              {/* 贡献者列表 */}
+                {/* 贡献者列表 */}
-              <Route path="/projects/:owner/:projectsId/contribute"
+                <Route path="/:owner/:projectsId/contribute"
-                render={
+                  render={
-                  () => (<Contribute {...this.props} {...this.state} {...common} />)
+                    () => (<Contribute {...this.props} {...this.state} {...common} />)
-                }
+                  }
-              ></Route>
+                ></Route>
 
-              {/* 代码库----详情页面 */}
+                {/* 代码库----详情页面 */}
-              <Route path="/projects/:owner/:projectsId/commits/branch/:branchName"
+                <Route path="/:owner/:projectsId/commits/branch/:branchName"
-                render={
+                  render={
-                  (props) => (<CoderRootCommit {...this.props} {...props} {...this.state} {...common}/>)
+                    (props) => (<CoderRootCommit {...this.props} {...props} {...this.state} {...common} />)
-                }
+                  }
-              ></Route>
+                ></Route>
-              <Route path="/projects/:owner/:projectsId/tree/:branchName"
+                <Route path="/:owner/:projectsId/tree/:branchName"
-                render={
+                  render={
-                  (props) => (<CoderDepot {...this.props} {...props} {...this.state} {...common}/>)
+                    (props) => (<CoderDepot {...this.props} {...props} {...this.state} {...common} />)
-                }
+                  }
-              ></Route>
+                ></Route>
-              <Route path="/projects/:owner/:projectsId/:subIndex"
+                <Route path="/:owner/:projectsId/:subIndex"
-                render={
+                  render={
-                  (props) => (<CoderRootIndex {...this.props} {...props} {...this.state} {...common}/>)
+                    (props) => (<CoderRootIndex {...this.props} {...props} {...this.state} {...common} />)
-                }
+                  }
-              ></Route>
+                ></Route>
-              <Route path="/projects/:owner/:projectsId"
+                <Route path="/:owner/:projectsId"
-                render={
+                  render={
-                  (props) => (<CoderDepot {...this.props} {...props} {...this.state} {...common}/>)
+                    (props) => (<CoderDepot {...this.props} {...props} {...this.state} {...common} />)
-                }
+                  }
-              ></Route>
+                ></Route>
-            </Switch>
+              </Switch>
-          </Spin>
+            </Spin>
         }
       </div>
     )

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>
+    )
+  }))))
+)

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>

src/forge/Main/Diff.jsx

@@ -59,7 +59,7 @@ export default ({ match , history }) => {
               {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>
+              <Button type="primary" onClick={()=>{history.push(`/${owner}/${projectsId}/tree/${truncateCommitId(sha)}`)}} className="ml30">浏览代码</Button>
             </div>
           </div>
           <div className="f-wrap-between" style={{ alignItems: "center" }}>

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 {
@@ -228,7 +229,7 @@ class Index extends Component {
   }
 
   getoDetail=(login,identifier)=>{
-    this.props.history.push(`/projects/${login}/${identifier}`);
+    this.props.history.push(`/${login}/${identifier}`);
   }
 
   // 选择语言类别
@@ -255,8 +256,12 @@ class Index extends Component {
   newItem = ()=>{
     return(
       <Menu>
-        <Menu.Item key="created_mirror"><Link to={`/projects/mirror/new`}>新建镜像项目</Link></Menu.Item>
+        <Menu.Item key="created_mirror">
-        <Menu.Item key="created_deposit"><Link to={`/projects/deposit/new`}>新建托管项目</Link></Menu.Item>
+          <CheckProfile {...this.props} sureFunc={()=>{this.props.history.push('/projects/mirror/new')}}>新建镜像项目</CheckProfile>
+        </Menu.Item>
+        <Menu.Item key="created_deposit">
+          <CheckProfile {...this.props} sureFunc={()=>{this.props.history.push('/projects/deposit/new')}}>新建托管项目</CheckProfile>
+        </Menu.Item>
       </Menu>
     )
   }

src/forge/Main/IndexItem.js

@@ -28,14 +28,14 @@ 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> }

src/forge/Main/sub/Contribute.jsx

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

src/forge/Main/sub/DetailBanner.jsx

@@ -10,7 +10,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
       if(pathname && pathname==="source"){
         let a = list.filter(item=>item.menu_name === "resources");
         if(a && a.length === 0){
-          history.push(`/projects/${owner}/${projectsId}`);
+          history.push(`/${owner}/${projectsId}`);
         }
       }
       setMenuName(list);
@@ -22,13 +22,13 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
         menuName && projectDetail ? 
         <ul className="headerMenu-wrapper">
           {
-            menuName.map((item,key)=>{
+           Array.isArray(menuName)&& menuName.map((item,key)=>{
               return(
-                <React.Fragment>
+                <React.Fragment key={item.menu_name}>
                   {
                     item.menu_name === "home" &&
                     <li className={pathname==="about" ? "active" : ""}>
-                      <Link to={{ pathname: `/projects/${owner}/${projectsId}/about`, state }}>
+                      <Link to={{ pathname: `/${owner}/${projectsId}/about`, state }}>
                         <i className={(pathname==="" || urlFlag) ? "iconfont icon-zhuye1 color-grey-3 mr5 font-14":"iconfont icon-zhuye1 color-grey-6 font-14 mr5"}></i>
                         <span>主页</span>
                         </Link>
@@ -37,7 +37,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
                   {
                     item.menu_name === "code" &&
                     <li className={(pathname==="" || urlFlag) ? "active" : ""}>
-                      <Link to={{ pathname: `/projects/${owner}/${projectsId}`, state }}>
+                      <Link to={{ pathname: `/${owner}/${projectsId}`, state }}>
                         <i className={(pathname==="" || urlFlag) ? "iconfont icon-daimaku color-grey-3 mr5 font-14":"iconfont icon-daimaku color-grey-6 font-14 mr5"}></i>
                         <span>代码库</span>
                         </Link>
@@ -47,7 +47,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
                     item.menu_name === "issues" &&
                     <li className={pathname==="issues" ? "active" : ""}>
                       <Tooltip title="易修是Issue的中文名，即问题列表" placement="bottom">
-                        <Link to={{ pathname: `/projects/${owner}/${projectsId}/issues`, state }}>
+                        <Link to={{ pathname: `/${owner}/${projectsId}/issues`, state }}>
                           <i className={pathname==="issues" ? "iconfont icon-renwu color-grey-3 mr5 font-14":"iconfont icon-renwu color-grey-6 font-14 mr5"}></i>
                           <span>易修</span>
                           {projectDetail && projectDetail.issues_count ? <span className="num">{projectDetail.issues_count}</span> : ""}
@@ -58,17 +58,27 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
                   {
                     item.menu_name === "pulls" && projectDetail && parseInt(projectDetail.type) !== 2 && platform ?
                     <li className={pathname==="pulls" ? "active" : ""}>
-                      <Link to={{ pathname: `/projects/${owner}/${projectsId}/pulls`, state }}>
+                      <Link to={{ pathname: `/${owner}/${projectsId}/pulls`, state }}>
                         <i className={pathname==="pulls" ? "iconfont icon-hebingqingqiu1 color-grey-3 mr5 font-14":"iconfont icon-hebingqingqiu1 color-grey-6 font-14 mr5"}></i>
                         <span>合并请求</span>
                         {projectDetail && projectDetail.pull_requests_count ? <span className="num">{projectDetail.pull_requests_count}</span> : ""}
                       </Link>
                     </li>:""
                   }
+                  {
+                    item.menu_name === "wiki" &&
+                    <li className={pathname === "wiki" ? "active" : ""}>
+                      <Link to={{ pathname: `/${owner}/${projectsId}/wiki`, state }}>
+                        <i className={pathname==="wiki" ? "iconfont icon-wiki_icon color-grey-3 mr5 font-14":"iconfont icon-wiki_icon color-grey-6 font-14 mr5"}></i>
+                        <span>Wiki</span>
+                      </Link>
+                    </li>
+                  }
                   {
                     item.menu_name === "devops" && platform ? 
                     <li className={pathname==="devops" ? "active" : ""}>
-                      <Link to={{ pathname: `/projects/${owner}/${projectsId}/devops${open_devops ? `/dispose`:""}`, state }}>
+                      {/* <Link to={{ pathname: `/${owner}/${projectsId}/devops${open_devops ? `/dispose`:""}`, state }}> */}
+                      <Link to={{ pathname: `/${owner}/${projectsId}/devops`, state:{...state,open_devops} }}>
                         <i className="iconfont icon-gongzuoliu font-13 mr8"></i>工作流(beta版)
                         {projectDetail && projectDetail.ops_count ? <span>{projectDetail.ops_count}</span> : ""} 
                       </Link>
@@ -76,19 +86,19 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
                     :""
                   }
                   {
-                    item.menu_name === "resources" &&
+                    // item.menu_name === "resources" &&
-                    <li className={pathname==="source" ? "active" : ""}>
+                    // <li className={pathname==="source" ? "active" : ""}>
-                      <Link to={{ pathname: `/projects/${owner}/${projectsId}/source`, state }}>
+                    //   <Link to={{ pathname: `/${owner}/${projectsId}/source`, state }}>
-                          <i className={pathname==="source" ? "iconfont icon-ziyuanpaihanghetuijian color-grey-3 mr5 font-14":"iconfont icon-ziyuanpaihanghetuijian color-grey-6 font-14 mr5"}></i>
+                    //       <i className={pathname==="source" ? "iconfont icon-ziyuanpaihanghetuijian color-grey-3 mr5 font-14":"iconfont icon-ziyuanpaihanghetuijian color-grey-6 font-14 mr5"}></i>
-                          <span>资源库</span>
+                    //       <span>资源库</span>
-                          {projectDetail && projectDetail.source_count ? <span className="num">{projectDetail.source_count}</span> :""}
+                    //       {projectDetail && projectDetail.source_count ? <span className="num">{projectDetail.source_count}</span> :""}
-                      </Link>
+                    //   </Link>
-                    </li>
+                    // </li>
                   }
                   {
                     item.menu_name === "versions" &&
                     <li className={pathname==="milestones" ? "active" : ""}>
-                      <Link to={{ pathname: `/projects/${owner}/${projectsId}/milestones`, state }}>
+                      <Link to={{ pathname: `/${owner}/${projectsId}/milestones`, state }}>
                           <i className={pathname==="milestones" ? "iconfont icon-lichengbei color-grey-3 mr5 font-14":"iconfont icon-lichengbei color-grey-6 font-14 mr5"}></i>
                           <span>里程碑</span>
                           {projectDetail && projectDetail.versions_count ? <span className="num">{projectDetail.versions_count}</span> :""}
@@ -98,17 +108,17 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
                   {
                     item.menu_name === "activity" &&
                      <li className={pathname==="activity" ? "active" : ""}>
-                      <Link to={{ pathname: `/projects/${owner}/${projectsId}/activity`, state }}>
+                      <Link to={{ pathname: `/${owner}/${projectsId}/activity`, state }}>
                         <i className={pathname==="activity" ? "iconfont icon-tongzhi color-grey-3 mr5 font-14":"iconfont icon-tongzhi color-grey-6 font-14 mr5"}></i>
                         <span>动态</span>
                       </Link>
                     </li>
                   }
                   {
-                    item.menu_name === "setting" &&
+                    item.menu_name === "settings" &&
-                    <li className={pathname === "setting" ? "active" : ""}>
+                    <li className={pathname === "settings" ? "active" : ""}>
-                      <Link to={`/projects/${owner}/${projectsId}/setting`}>
+                      <Link to={`/${owner}/${projectsId}/settings`}>
-                        <i className={url && url.indexOf("/setting") > 0 ? "iconfont icon-cangku color-grey-3 mr5 font-14":"iconfont icon-cangku color-grey-6 font-14 mr5"}></i>
+                        <i className={url && url.indexOf("/settings") > 0 ? "iconfont icon-cangku color-grey-3 mr5 font-14":"iconfont icon-cangku color-grey-6 font-14 mr5"}></i>
                         <span>仓库设置</span>
                       </Link>
                     </li>

src/forge/Main/sub/Invite.jsx

@@ -1,26 +1,15 @@
 import React from 'react';
-import { Tooltip , message } from 'antd';
 import './sub.scss';
+import CopyTool from '../../Component/CopyTool';
 
 function Invite({code,className}) {
 
-  function jsCopy(id) {
-    const copyEle = document.querySelector(id); // 获取要复制的节点
-    const range = document.createRange(); // 创造range
-    window.getSelection().removeAllRanges(); //清除页面中已有的selection
-    range.selectNode(copyEle); // 选中需要复制的节点
-    window.getSelection().addRange(range); // 执行选中元素
-    document.execCommand("Copy"); // 执行copy操作
-    message.success('复制成功');
-  }
   return(
     <div className={className}>
       <span className="font-16 color-grey-6">邀请码</span>
       <div>
-        <span id="devitecode">{code}</span>
+        <input value={code} id="devitecode" style={{width:"62px",border:"none",cursor:"default"}} readOnly/>
-        <Tooltip title={<p className="edu-txt-center">可以通过邀请码邀请成员加入项目<br/>点击复制邀请码。</p>}  placement={"bottom"}>
+        <CopyTool timeOut={true} beforeText={<p className="edu-txt-center">可以通过邀请码邀请成员加入项目<br/>点击复制邀请码。</p>} className="ml8 font-16" inputId="devitecode"/>
-          <i className="iconfont icon-fuzhi2 font-16 color-blue ml8" onClick={()=>jsCopy("#devitecode")}></i>
-        </Tooltip>
       </div>
     </div>
   )

src/forge/Merge/Commits.jsx

@@ -16,10 +16,10 @@ function Commits({ commits , projectsId , owner }){
               <div className="prInfo">
                 <FlexAJ>
                   <AlignCenter>
-                    <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitKey" style={{marginLeft:0}}>{truncateCommitId(`${item.sha}`)}</Link>
+                    <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitKey" style={{marginLeft:0}}>{truncateCommitId(`${item.sha}`)}</Link>
                     <p className="ml15 font-16 color-grey-3 task-hide" style={{maxWidth:"700px"}}>{item.message}</p>
                   </AlignCenter>
-                  <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(item.sha)}`} className="color-blue">浏览代码</Link>
+                  <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(item.sha)}`} className="color-blue">浏览代码</Link>
                 </FlexAJ>
                 <AlignCenter className="mt15">
                   <User url={getImageUrl(`/${item.committer && item.committer.image_url}`)} name={`${item.committer && item.committer.name}`}></User><span>：提交于{item.time_from_now}</span>

src/forge/Merge/Files.jsx

@@ -47,7 +47,7 @@ function Files({data,history,owner,projectsId}){
                       <span>{item.name}</span>
                     </AlignCenter>
                     <span>
-                      <Button className="mr20" onClick={()=>{history.push(`/projects/${owner}/${projectsId}/tree/${truncateCommitId(item.sha)}/${item.name}`)}}>查看文件</Button>
+                      <Button className="mr20" onClick={()=>{history.push(`/${owner}/${projectsId}/tree/${truncateCommitId(item.sha)}/${item.name}`)}}>查看文件</Button>
                       <span className="color-green">+{item.addition}</span>
                       <span className="color-red ml20">-{item.deletion}</span>
                     </span>

src/forge/Merge/MergeDetail.js

@@ -228,7 +228,7 @@ class MergeDetail extends Component {
               <div>
                 {
                   data && data.issue.user_permission ?
-                    <Link to={`/projects/${owner}/${projectsId}/pulls/${mergeid}/updatemerge`} className="color-blue fr">编辑</Link>
+                    <Link to={`/${owner}/${projectsId}/pulls/${mergeid}/updatemerge`} className="color-blue fr">编辑</Link>
                     : ''
                 }
               </div>
@@ -248,8 +248,8 @@ class MergeDetail extends Component {
           <div className="detailHeader-wrapper">
             <div className="normal f-wrap-between">
               <ul className="headerMenu-wrapper">
-                <li className={url.indexOf("Messagecount") > 0 ? "active" : ""}><Link to={`/projects/${owner}/${projectsId}/pulls/${mergeid}/Messagecount`}>对话内容</Link></li>
+                <li className={url.indexOf("Messagecount") > 0 ? "active" : ""}><Link to={`/${owner}/${projectsId}/pulls/${mergeid}/Messagecount`}>对话内容</Link></li>
-                <li className={url.indexOf("MergeSubmit") > 0 ? "active" : ""}><Link to={`/projects/${owner}/${projectsId}/pulls/${mergeid}/MergeSubmit`}>代码提交</Link></li>
+                <li className={url.indexOf("MergeSubmit") > 0 ? "active" : ""}><Link to={`/${owner}/${projectsId}/pulls/${mergeid}/MergeSubmit`}>代码提交</Link></li>
               </ul>
             </div>
           </div>

src/forge/Merge/MergeItem.js

@@ -49,7 +49,7 @@ class MergeItem extends Component {
   };
 
   render() {
-    const { issues, project_name, project_author_name , user_admin_or_member} = this.props;
+    const { issues, project_name, project_author_name , user_admin_or_developer} = this.props;
     const { projectsId , owner } = this.props.match.params;
     const { current_user } = this.props;
     const renderList = () => {
@@ -62,7 +62,7 @@ class MergeItem extends Component {
                 <p className="mb15 df" style={{ alignItems: "center" }}>
                   <i className={`iconfont icon-hebingqingqiu1 font-14 mr3 i_${status}`}></i>
                   <Link
-                    to={`/projects/${owner}/${projectsId}/pulls/${item.pull_request_id}/Messagecount`}
+                    to={`/${owner}/${projectsId}/pulls/${item.pull_request_id}/Messagecount`}
                     className="hide-1 font-15 color-grey-3 fwb lineh-30 mr10"
                     style={{ maxWidth: "300px" }}
                   >
@@ -78,7 +78,7 @@ class MergeItem extends Component {
                 </p>
                 <p className="grid-item font-13">
                   <Link
-                    to={`/users/${item && item.author_login}`}
+                    to={`/${item && item.author_login}`}
                     className="show-user-link"
                   >
                     <img
@@ -91,7 +91,7 @@ class MergeItem extends Component {
                   </Link>
                   <AlignCenter>
                     <Link
-                      to={`/users/${item && item.author_login}`}
+                      to={`/${item && item.author_login}`}
                       className="show-user-link color-grey-8 ml5"
                     >
                       {item && item.author_name}
@@ -109,7 +109,7 @@ class MergeItem extends Component {
                         item.pull_request_head &&
                         <Tag className="pr-branch-tag">
                           <Link
-                            to={`/projects/${item.is_original ? item.fork_project_user : owner}/${ item.is_original ? item.fork_project_identifier : projectsId }/tree/${turnbar(item.pull_request_head)}`}
+                            to={`/${item.is_original ? item.fork_project_user : owner}/${ item.is_original ? item.fork_project_identifier : projectsId }/tree/${turnbar(item.pull_request_head)}`}
                             className="maxW200px hide-1 ver-middle"
                           >
                             {item.is_original
@@ -133,7 +133,7 @@ class MergeItem extends Component {
                         item.pull_request_base && 
                         <Tag className="pr-branch-tag">
                           <Link
-                            to={`/projects/${owner}/${projectsId}/tree/${turnbar(item.pull_request_base)}`}
+                            to={`/${owner}/${projectsId}/tree/${turnbar(item.pull_request_base)}`}
                             className="maxW200px hide-1 ver-middle"
                           >
                             {/* {item.is_fork ? item.pull_request_base : `${item.author_name}:${item.pull_request_base}`} */}
@@ -156,7 +156,7 @@ class MergeItem extends Component {
                 <li>
                   {item.assign_user_name ? (
                     <Link
-                      to={`/users/${item.assign_user_login}`}
+                      to={`/${item.assign_user_login}`}
                       className="show-user-link"
                     >
                       {item.assign_user_name}
@@ -175,7 +175,7 @@ class MergeItem extends Component {
                     {item.journals_count ? (
                       <Link
                         className="mr5 color-grey-8"
-                        to={`/projects/${owner}/${projectsId}/pulls/${item.pull_request_id}/Messagecount`}
+                        to={`/${owner}/${projectsId}/pulls/${item.pull_request_id}/Messagecount`}
                       >
                         <i className="iconfont icon-huifu1 font-15 mr5 ver-middle"></i>
                         {item.journals_count}
@@ -183,7 +183,7 @@ class MergeItem extends Component {
                     ) : (
                       ""
                     )}
-                    {user_admin_or_member && item.pull_request_status === 0 ? (
+                    {user_admin_or_developer && item.pull_request_status === 0 ? (
                       <div
                         className="milepostleft"
                         style={{
@@ -196,7 +196,7 @@ class MergeItem extends Component {
                       >
                         <div className="grid-item mr15 color-grey-9">
                           <Link
-                            to={`/projects/${owner}/${projectsId}/pulls/${item.pull_request_id}/updatemerge`}
+                            to={`/${owner}/${projectsId}/pulls/${item.pull_request_id}/updatemerge`}
                             className="color-grey-9"
                           >
                             <i className="iconfont icon-bianji3 font-14 mr5"></i>

src/forge/Merge/MergeSubmit.js

@@ -100,7 +100,7 @@ class MergeSubmit extends Component{
         width:"10%",
         render: (text,item) => (
           <span className="f-wrap-alignCenter">
-            <Link to={`/users/${item.login}`} className="show-user-link">
+            <Link to={`/${item.login}`} className="show-user-link">
                 <img src={getImageUrl(`/${item.image_url}`)} alt="" width="28px" height="28px" className="mr3 radius"/>
           <label className="hide-1" style={{maxWidth:"75px",'vertical-align':'middle'}}>{text}</label>
           </Link>
@@ -110,7 +110,7 @@ class MergeSubmit extends Component{
         title:"SHA",
         dataIndex: 'sha',
         render: (text) => (
-          <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${text}`)}`} className="commitKey">{text}</Link>
+          <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${text}`)}`} className="commitKey">{text}</Link>
         )
       },{
         title:"备注",

src/forge/Merge/MessageCount.js

@@ -361,7 +361,7 @@ class MessageCount extends Component {
                       <div className="mt15">
                         <Tag className="pr-branch-tag">
                           <Link
-                            to={`/projects/${data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}/${data.pull_request.is_original?data.project_identifier:projectsId}/tree/${turnbar(data.pull_request && data.pull_request.head)}`}
+                            to={`/${data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}/${data.pull_request.is_original?data.project_identifier:projectsId}/tree/${turnbar(data.pull_request && data.pull_request.head)}`}
                             className="ver-middle"
                           >
                             {data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}: {turnbar(data.pull_request && data.pull_request.head)}
@@ -376,7 +376,7 @@ class MessageCount extends Component {
                         </span>
                         <Tag className="pr-branch-tag">
                           <Link
-                            to={`/projects/${owner}/${projectsId}/tree/${data.pull_request.base}`}
+                            to={`/${owner}/${projectsId}/tree/${data.pull_request.base}`}
                             className="ver-middle"
                           >
                             {data.issue.project_author_name}:{data.pull_request.base}
@@ -386,14 +386,14 @@ class MessageCount extends Component {
                     }
 
                     <div className="mt15">
-                      <Link to={`/users/${data.issue.author_login}`} className="show-user-link">
+                      <Link to={`/${data.issue.author_login}`} className="show-user-link">
                         <img className="mr5" src={getImageUrl(`/${data.issue.author_picture}`)}
                           alt="" width="24" height="24" style={{borderRadius:"50%"}}
                         />
                       </Link>
                       <span className="ver-middle">
                         <span className="color-grey-8 mr5">由</span>
-                        <Link to={`/users/${data.issue.author_login}`} className="show-user-link color-blue">
+                        <Link to={`/${data.issue.author_login}`} className="show-user-link color-blue">
                           {data.issue.author_name}
                         </Link>
                         <span className="ml5 color-grey-8">
@@ -408,7 +408,7 @@ class MessageCount extends Component {
                           <span className="color-grey-8">审查人员：</span>
                           {data.issue.assign_user_name ? (
                             <Link
-                              to={`/users/${data.issue.assign_user_login}`}
+                              to={`/${data.issue.assign_user_login}`}
                               className="show-user-link color-blue"
                             >
                               {data.issue.assign_user_name}
@@ -448,7 +448,7 @@ class MessageCount extends Component {
                             type="green"
                             ghost
                             className="ml20"
-                            onClick={()=>{this.props.history.push(`/projects/${owner}/${projectsId}/pulls/${mergeId}/UpdateMerge`);}}
+                            onClick={()=>{this.props.history.push(`/${owner}/${projectsId}/pulls/${mergeId}/UpdateMerge`);}}
                           >
                             编辑
                           </Button>

src/forge/Merge/NewMerge.js

@@ -48,8 +48,10 @@ class NewMerge extends Component {
       this.compareProject(this.state.id,pull,"master");
     }
   }
+
   // 页面销毁取消监听 
   componentWillUnmount () {
+    console.log('----------destoyed---------');
     window.removeEventListener('popstate', this.handleBack, false);
   };
 
@@ -60,8 +62,11 @@ class NewMerge extends Component {
 
   //获取新建分支数据
   getmergelist = (projectsId) => {
-    this.setState({isSpin: true})
+    this.setState({isSpin: true});
-    const { owner } = this.props.match.params;
+    // const { owner } = this.props.match.params;
+    let owner =this.props.history.location.pathname.split('/')[1];
+    console.log('owner:'+owner);
+    console.log(this.props);
     const url = `/${owner}/${projectsId}/pulls/new.json`;
     axios
       .get(url)
@@ -186,7 +191,7 @@ class NewMerge extends Component {
     // this.ischeckmerge();
     let { id ,merge , pull } = this.state;
     if(type==="pull"){
-      this.props.history.push(`/projects/${owner}/${projectsId}/pulls/new/${pull}`)
+      this.props.history.push(`/${owner}/${projectsId}/pulls/new/${pull}`)
       this.compareProject(id,value,merge);
     }else{
       this.compareProject(id,pull,value);
@@ -208,7 +213,7 @@ class NewMerge extends Component {
         merge_user_login: is_fork_id ? projects_names[0].project_user_login : undefined
       }
     })
-    this.props.history.push(`/projects/${login}/${identifier}/pulls/new`);
+    this.props.history.push(`/${login}/${identifier}/pulls/new`);
     this.newMergelist(login,identifier);
   };
 
@@ -264,7 +269,9 @@ class NewMerge extends Component {
       show_message,
       default_message,
       merge_head,
-      projects_names,id,comparesData
+      projects_names,
+      id,
+      comparesData
     } = this.state;
     
     const renderBrances = (list, type) => {
@@ -298,6 +305,7 @@ class NewMerge extends Component {
       return <div dangerouslySetInnerHTML={{ __html: html }}></div>;
     };
     let { project } = this.props;
+
     return (
       <div>
         <div className="main">

src/forge/Merge/merge.js

@@ -4,10 +4,11 @@ import "./merge.css";
 import "../Order/order.css";
 import "../Order/index.scss";
 import NoneData from "./no_data";
-import OrderItem from "./MergeItem";
+import MergeItem from "./MergeItem";
 import './Index.scss';
 
 import axios from "axios";
+import CheckProfile from '../Component/ProfileModal/Profile';
 
 const Search = Input.Search;
 /**
@@ -212,7 +213,7 @@ class merge extends Component {
 
   checkOperation() {
     const { projectsId,owner } = this.props.match.params;
-    this.props.history.push(`/projects/${owner}/${projectsId}/pulls/new`);
+    this.props.history.push(`/${owner}/${projectsId}/pulls/new`);
   }
   render() {
     const { projectsId , owner } = this.props.match.params;
@@ -255,10 +256,10 @@ class merge extends Component {
             />
           </div>
           {
-            data && data.user_admin_or_member &&
+            data && data.user_admin_or_developer &&
-            <a className="topWrapper_btn ml10" onClick={() => this.checkOperation()}>
+            <CheckProfile {...this.props} className="topWrapper_btn ml10" sureFunc={() => this.checkOperation()}>
               +&nbsp;新建合并请求
-            </a>
+            </CheckProfile>
           }
         </div>
         <div className="f-wrap-between screenWrap">
@@ -387,7 +388,7 @@ class merge extends Component {
           <Spin spinning={isSpin}>
             {data && data.search_count && data.search_count > 0 ? (
               <div>
-                <OrderItem
+                <MergeItem
                   issues={issues}
                   search_count={search_count}
                   page={select_params.page}
@@ -396,8 +397,8 @@ class merge extends Component {
                   project_author_name={data.project_author_name}
                   {...this.props}
                   {...this.state}
-                  user_admin_or_member={data && data.user_admin_or_member}
+                  user_admin_or_developer={data && data.user_admin_or_developer}
-                ></OrderItem>
+                ></MergeItem>
               </div>
             ):""}
             {search_count > select_params.limit ? (

src/forge/Merge/merge_form.js

@@ -165,7 +165,7 @@ class MergeForm extends Component {
               this.setState({
                 isSpin: false,
               });
-              this.props.history.push(`/projects/${owner}/${projectsId}/pulls`);
+              this.props.history.push(`/${owner}/${projectsId}/pulls`);
               const { getDetail } = this.props;
               getDetail && getDetail();
             } else {
@@ -195,7 +195,7 @@ class MergeForm extends Component {
                 isSpin: false,
               });
               this.props.history.push(
-                `/projects/${owner}/${projectsId}/pulls/${mergeId}/Messagecount`
+                `/${owner}/${projectsId}/pulls/${mergeId}/Messagecount`
               );
             } else {
               this.setState({
@@ -287,7 +287,7 @@ class MergeForm extends Component {
                     type="default"
                     className="ml30"
                     onClick={()=>{
-                      this.props.history.push(merge_type === "new" ? `/projects/${owner}/${projectsId}/pulls` : `/projects/${owner}/${projectsId}/pulls/${mergeId}/detail`)
+                      this.props.history.push(merge_type === "new" ? `/${owner}/${projectsId}/pulls` : `/${owner}/${projectsId}/pulls/${mergeId}/detail`)
                     }}
                   >
                     <span className="plr10">取消</span>

src/forge/Merge/no_data.js

@@ -12,7 +12,7 @@ class Nodata extends Component{
           <h3>欢迎使用合并请求！</h3>
         
           <div className="color-grey-8">
-          合并请求可以帮助您与他人协作编写代码。在使用之前，请先创建一个 <Link className="color-blue" to={`/projects/${owner}/${projectsId}/pulls/new`}>合并请求</Link>
+          合并请求可以帮助您与他人协作编写代码。在使用之前，请先创建一个 <Link className="color-blue" to={`/${owner}/${projectsId}/pulls/new`}>合并请求</Link>
           </div>
         </div>
       </div>

src/forge/New/Index.js

@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import { Link } from 'react-router-dom';
-import { Input , Form , Select , Checkbox , Button , Spin , AutoComplete } from 'antd';
+import { Input , Form , Select , Checkbox , Button , Spin , AutoComplete, Modal } from 'antd';
 import { Base64 } from 'js-base64';
 
 import '../css/index.scss';
@@ -58,6 +58,8 @@ class Index extends Component {
     this.getGitignore();
     // 获取开源许可证
     this.getLicenses();
+    //判断是否为删除新建项目失败后返回，并执行对应逻辑
+    this.isDeleteProjectBack();
   }
   componentDidUpdate=(prevPros)=>{
     if(prevPros && this.props && !this.props.checkIfLogin()){
@@ -69,6 +71,7 @@ class Index extends Component {
   getOwner=()=>{
     const { OIdentifier } = this.props.match.params;
     const { user_id } = this.props && this.props.current_user;
+    
     const url = `/owners.json`;
     axios.get(url).then(result=>{
       if(result && result.data){
@@ -77,16 +80,13 @@ class Index extends Component {
           OwnerList: owner,
         })
         if(OIdentifier){
-          owner = owner.filter(item=>item.name === OIdentifier);
+          owner = owner.filter(item=>item.login === OIdentifier);
-          this.props.form.setFieldsValue({
-            user_id:OIdentifier
-          })
         }else if(user_id){
           owner = owner.filter(item=>item.id === user_id);
-          this.props.form.setFieldsValue({
-            user_id:owner && owner[0].name
-          })
         }
+        this.props.form.setFieldsValue({
+          user_id:owner && owner[0].name
+        })
         owner && this.setState({
           owners_id:owner[0].id,
           owners_name:owner[0].name
@@ -144,6 +144,31 @@ class Index extends Component {
     }).catch((error) => { })
   }
 
+  isDeleteProjectBack = () => {
+    let mirror_status = this.props.history.location.mirror_status;
+    if (mirror_status === 2 && sessionStorage.newProjectValue) {
+      Modal.warning({
+        title: '警告',
+        content: '镜像项目创建失败！请按操作规范重新创建项目！',
+      });
+      let newProjectValue = JSON.parse(sessionStorage.newProjectValue);
+      if (newProjectValue) {
+        this.setState({
+          project_language_id: newProjectValue.project_language_id,
+          project_category_id: newProjectValue.project_category_id,
+          license_id: newProjectValue.license_id,
+          ignore_id: newProjectValue.ignore_id
+        });
+        delete newProjectValue.project_language_id;
+        delete newProjectValue.project_category_id;
+        delete newProjectValue.license_id;
+        delete newProjectValue.ignore_id;
+        this.props.form.setFieldsValue(newProjectValue);
+      }
+
+    }
+  }
+
   // 设置option
   setOptionsList = (data, _head, name) => {
     if (data && data.length > 0) {
@@ -172,6 +197,8 @@ class Index extends Component {
         const { project_language_id, project_category_id, license_id, ignore_id , owners_id , owners_name } = this.state;
         const decoderPass = Base64.encode(values.password);
         const url = (projectsType && projectsType === "mirror") ? "/projects/migrate.json" : "/projects.json";
+        // 新建项目的时候，暂存数据，如果失败，返回的时候可以重新赋值
+        sessionStorage.newProjectValue=JSON.stringify({...values,project_language_id,project_category_id,license_id,ignore_id});
         axios.post(url, {
           ...values,
           auth_password:decoderPass,
@@ -182,17 +209,16 @@ class Index extends Component {
           user_id:owners_id
         }).then((result) => {
           if (result && result.data.id) {
-            this.setState({
+            projectsType && projectsType !== "mirror" && this.props.showNotification(`托管项目创建成功!`);
-              isSpin: false
+            this.props.history.push(`/${result.data.login}/${result.data.identifier}`);
-            })
-            this.props.showNotification(`${projectsType && projectsType === "mirror" ? "镜像" : "托管"}项目创建成功!`);
-            this.props.history.push(`/projects/${result.data.login}/${result.data.identifier}`);
           }
+          this.setState({
+            isSpin: false
+          })
         }).catch((error) => {
           this.setState({
             isSpin: false
           })
-          console.log(error);
         })
       } else {
         this.setState({
@@ -337,7 +363,9 @@ class Index extends Component {
                 {
                   projectsType && projectsType === "mirror" &&
                   <React.Fragment>
-                    <p className="mt10 mb10 color-grey-3 pointer" onClick={this.changeMirrorCheck}>需要授权验证<i className={mirrorCheck?"iconfont icon-xiajiantou font-13 ml10 color-grey-8":"iconfont icon-youjiantou font-13 ml10 color-grey-8"}></i></p>
+                    <p className="mt10 mb10 color-grey-3 pointer" onClick={this.changeMirrorCheck}>
+                      需要授权验证<i className={mirrorCheck?"iconfont icon-xiajiantou font-13 ml10 color-grey-8":"iconfont icon-youjiantou font-13 ml10 color-grey-8"}></i>
+                      <span className="ml20 font-12 color-red">如果源项目为公有仓库，禁止填写用户名密码。如果源项目为私有仓库，则必须填写正确的用户名和密码!</span></p>
                     {
                       mirrorCheck &&
                       <div className="df mb20" style={{alignItems:'center'}}>

src/forge/Newfile/UserSubmitComponent.js

@@ -86,7 +86,7 @@ class UserSubmitComponent extends Component {
               const { getTopCount } = this.props;
               getTopCount && getTopCount(values.branchname);
             }
-            let url = `/projects/${owner}/${projectsId}${values.branchname ? `/tree/${turnbar(values.branchname)}`: (branch ? `/tree/${turnbar(branch)}` : "")}`;
+            let url = `/${owner}/${projectsId}${values.branchname ? `/tree/${turnbar(values.branchname)}`: (branch ? `/tree/${turnbar(branch)}` : "")}`;
             this.props.history.push(url);
           }
         })
@@ -123,7 +123,7 @@ class UserSubmitComponent extends Component {
             this.setState({ isSpin: false });
             if (result.data && result.data.status === 1) {
               let b = currentBranch || branch;
-              let url = `/projects/${owner}/${projectsId}${(values.branchname ? `/tree/${turnbar(values.branchname)}` : (b ? `/tree/${turnbar(b)}`:""))}`;
+              let url = `/${owner}/${projectsId}${(values.branchname ? `/tree/${turnbar(values.branchname)}` : (b ? `/tree/${turnbar(b)}`:""))}`;
               this.props.history.push(url);
               this.props.showNotification("文件修改成功!");
             }
@@ -150,7 +150,7 @@ class UserSubmitComponent extends Component {
     return (
       <div>
         <span className="df" style={{ alignItems: "center" }}>
-          <Link to={`/users/${current_user && current_user.login}`} className="show-user-link" >
+          <Link to={`/${current_user && current_user.login}`} className="show-user-link" >
             <img
               src={getImageUrl(`/${current_user && current_user.image_url}`)}
               alt=""
@@ -248,7 +248,7 @@ class UserSubmitComponent extends Component {
             <Button
               type="primary grey"
               onClick={() => {
-                this.props.history.push(`/projects/${owner}/${projectsId}`);
+                this.props.history.push(`/${owner}/${projectsId}`);
               }}
               className="mr20"
             >

src/forge/Notice/Apply.jsx

@@ -63,11 +63,11 @@ function Apply(props) {
               {
                 list.map((i,k)=>{
                   return(
-                    <li>
+                    <li key={k}>
-                      <Link to={`/users/${i.user && i.user.login}`}><img src={getImageUrl(`/${i.user && i.user.image_url}`)} alt="" className="notifyImg"/></Link>
+                      <Link to={`/${i.user && i.user.login}`}><img src={getImageUrl(`/${i.user && i.user.image_url}`)} alt="" className="notifyImg"/></Link>
                       <div className="notifyFlex">
                         <p className="notifyInfos">
-                          <Link to={`/users/${i.user && i.user.login}`} className="font-15 mr20">{i.user && i.user.name}</Link>
+                          <Link to={`/${i.user && i.user.login}`} className="font-15 mr20">{i.user && i.user.name}</Link>
                           <span className="color-grey-9">{i.time_ago}</span>
                         </p>
                         <FlexAJ>

src/forge/Notice/Index.jsx

@@ -33,7 +33,7 @@ function Index(props){
 
   useEffect(()=>{
     if((username && current_user && (current_user.login !== username))){
-      props.history.push(`/users/${username}`);
+      props.history.push(`/${username}`);
     }
   },[current_user,username])
 
@@ -47,14 +47,14 @@ function Index(props){
 
   useEffect(()=>{
     if(pathname && username){
-      if(pathname === `/users/${username}/notice`){
+      if(pathname === `/${username}/notice`){
         setMenu("notify");
         changeNum(user.undo_messages);
       }
-      if(pathname === `/users/${username}/notice/undo`){
+      if(pathname === `/${username}/notice/undo`){
         setMenu("undo");
       }
-      if(pathname === `/users/${username}/notice/apply`){
+      if(pathname === `/${username}/notice/apply`){
         setMenu("apply");
       }
     }
@@ -70,9 +70,9 @@ function Index(props){
   function deleteEvent(type,count) {
     let c = count;
     if(type==="apply"){
-      setTransferCount(transferCount-count);
-    }else if(type==="undo"){
       setApplyCount(applyCount-count);
+    }else if(type==="undo"){
+      setTransferCount(transferCount-count);
     }else{
       setMessagesCount(0);
       c = messagesCount;
@@ -84,19 +84,19 @@ function Index(props){
     <div>
       <ul className="noticeMenu">
         <li className={menu === "notify" ? "active":""}>
-          <Link to={`/users/${username}/notice`} onClick={changeNum}>
+          <Link to={`/${username}/notice`} onClick={changeNum}>
             <span>通知</span>
             {messagesCount ? <span className="unNum">{messagesCount}</span>:""}
           </Link>
         </li>
         <li className={menu === "undo" ? "active":""}>
-          <Link to={`/users/${username}/notice/undo`}>
+          <Link to={`/${username}/notice/undo`}>
             <span>接收仓库</span>
             {transferCount ? <span className="unNum">{transferCount}</span>:""}
           </Link>
         </li>
         <li className={menu === "apply" ? "active":""}>
-          <Link to={`/users/${username}/notice/apply`}>
+          <Link to={`/${username}/notice/apply`}>
             <span>成员申请</span>
             {applyCount ? <span className="unNum">{applyCount}</span>:""}
           </Link>
@@ -104,19 +104,19 @@ function Index(props){
       </ul>
       <Switch>
         <Route
-          path="/users/:username/notice/apply"
+          path="/:username/notice/apply"
           render={(p) => {
             return <Apply {...props} {...p} deleteEvent={deleteEvent}/>;
           }}
         ></Route>
         <Route
-          path="/users/:username/notice/undo"
+          path="/:username/notice/undo"
           render={(p) => {
             return <UndoEvent {...props} {...p} deleteEvent={deleteEvent}/>;
           }}
         ></Route>
         <Route
-          path="/users/:username/notice"
+          path="/:username/notice"
           render={(p) => {
             return <Notify {...props} {...p} deleteEvent={deleteEvent}/>;
           }}

src/forge/Notice/Notify.jsx

@@ -44,13 +44,13 @@ function Notify(props){
     if(status){
       switch(status){
         case 'canceled':
-          return <p>取消转移【<Link to={`/projects/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】仓库</p>
+          return <p>取消转移【<Link to={`/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】仓库</p>
         case 'common':
-          return <p>正在将【<Link to={`/projects/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】仓库转移给【<Link to={`/users/${owner && owner.login}`}>{owner && owner.name}</Link>】</p>
+          return <p>正在将【<Link to={`/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】仓库转移给【<Link to={`/${owner && owner.login}`}>{owner && owner.name}</Link>】</p>
         case 'successed':
-          return <p>【<Link to={`/projects/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】仓库成功转移给【<Link to={`/users/${owner && owner.login}`}>{owner && owner.name}</Link>】</p>
+          return <p>【<Link to={`/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】仓库成功转移给【<Link to={`/${owner && owner.login}`}>{owner && owner.name}</Link>】</p>
         default:
-          return <p>拒绝转移【<Link to={`/projects/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】仓库</p>
+          return <p>拒绝转移【<Link to={`/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】仓库</p>
       }
     }else{
       return ""
@@ -62,9 +62,9 @@ function Notify(props){
     if(status){
       switch(status){
         case 'successed':
-          return <p>已通过你加入【<Link to={`/projects/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】项目的申请</p>
+          return <p>已通过你加入【<Link to={`/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】项目的申请</p>
         default:
-          return <p>已拒绝你加入【<Link to={`/projects/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】项目的申请</p>
+          return <p>已拒绝你加入【<Link to={`/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】项目的申请</p>
       }
     }else{
       return ""
@@ -80,12 +80,13 @@ function Notify(props){
             <ul className="notifyList">
               {
                 list.map((i,k)=>{
+                  console.log(i);
                   return(
-                    <li>
+                    <li i={k}>
-                      <Link to={`/users/${i.login}`}><img src={getImageUrl(`/${i.applied_user && i.applied_user.image_url}`)} alt="" className="notifyImg"/></Link>
+                      <Link to={`/${i.applied_user && i.applied_user.login}`}><img src={getImageUrl(`/${i.applied_user && i.applied_user.image_url}`)} alt="" className="notifyImg" /></Link>
                       <div className="notifyFlex">
                         <p className="notifyInfos">
-                          <Link to={`/users/${i.applied_user && i.applied_user.login}`} className="font-15 mr20">{i.applied_user && i.applied_user.name}</Link>
+                          <Link to={`/${i.applied_user && i.applied_user.login}`} className="font-15 mr20">{i.applied_user && i.applied_user.name}</Link>
                           <span className="color-grey-9">{i.time_ago}</span>
                         </p>
                         { i.applied_type === "AppliedProject" ? renderApplyStatus(i.status,i.applied):renderStatus(i.status,i.applied)}

src/forge/Notice/UndoEvent.jsx

@@ -53,7 +53,7 @@ function UndoEvent(props){
     Axios.post(url).then(result=>{
       if(result && result.data){
         getList();
-        props && props.deleteEvent("apply",1);
+        props && props.deleteEvent("undo",1);
       }
     }).catch(error=>{})
   }
@@ -68,16 +68,16 @@ function UndoEvent(props){
             {
               list.map((i,k)=>{
                 return(
-                  <li>
+                  <li key={k}>
-                    <Link to={`/users/${i.user && i.user.login}`}><img src={getImageUrl(`/${i.user && i.user.image_url}`)} alt="" className="notifyImg"/></Link>
+                    <Link to={`/${i.user && i.user.login}`}><img src={getImageUrl(`/${i.user && i.user.image_url}`)} alt="" className="notifyImg"/></Link>
                     <div className="notifyFlex">
                       <p className="notifyInfos">
-                        <Link to={`/users/${i.login}`} className="font-15 mr20">{i.user && i.user.name}</Link>
+                        <Link to={`/${i.user && i.user.login}`} className="font-15 mr20">{i.user && i.user.name}</Link>
                         <span className="color-grey-9">{i.time_ago}</span>
                       </p>
                       <FlexAJ>
-                        <p className="color-grey-6">请求将仓库【<Link to={`/projects/${i.project && i.project.owner && i.project.owner.login}/${i.project && i.project.identifier}`}>{i.project && i.project.name}</Link>】
+                        <p className="color-grey-6">请求将仓库【<Link to={`/${i.project && i.project.owner && i.project.owner.login}/${i.project && i.project.identifier}`}>{i.project && i.project.name}</Link>】
-                        转移给【<Link to={`/users/${i.owner && i.owner.login}`}>{i.owner && i.owner.name}</Link>】，是否接受？</p>
+                        转移给【<Link to={`/${i.owner && i.owner.login}`}>{i.owner && i.owner.name}</Link>】，是否接受？</p>
                         {
                           i.status === "common" &&
                           <span>

src/forge/Order/Detail.js

@@ -85,7 +85,7 @@ class Detail extends Component {
       })
       .then((result) => {
         if (result) {
-          this.props.history.push(`/projects/${owner}/${projectsId}/issues`);
+          this.props.history.push(`/${owner}/${projectsId}/issues`);
         }
       })
       .catch((error) => {
@@ -132,7 +132,7 @@ class Detail extends Component {
       .then((result) => {
         if (result) {
           this.props.history.push(
-            `/projects/${owner}/${projectsId}/issues/${result.data.issue_id}/copyetail`
+            `/${owner}/${projectsId}/issues/${result.data.issue_id}/copyetail`
           );
         }
       })
@@ -207,7 +207,7 @@ class Detail extends Component {
             <div className="background-f boder-4">
               <div className="grid-item border-1f pd20 ">
                 <Link
-                  to={`/users/${data && data.author_login}`}
+                  to={`/${data && data.author_login}`}
                   className="show-user-link"
                 >
                   <img
@@ -240,7 +240,7 @@ class Detail extends Component {
                   <div className="mt10">
                     <span className="color-grey-9 mr5">由</span>
                     <Link
-                      to={`/users/${data && data.author_login}`}
+                      to={`/${data && data.author_login}`}
                       className="show-user-link color-blue"
                     >
                       {data && data.author_name}
@@ -269,7 +269,7 @@ class Detail extends Component {
                         </Popconfirm>
 
                         <Link
-                          to={`/projects/${owner}/${projectsId}/issues/${orderId}/updatedetail`}
+                          to={`/${owner}/${projectsId}/issues/${orderId}/updatedetail`}
                           className="color-blue fr"
                         >
                           编辑

src/forge/Order/Milepost.js

@@ -4,6 +4,7 @@ import { Dropdown, Icon, Menu, Pagination, Typography, Popconfirm, Spin } from '
 import NoneData from '../Nodata';
 import axios from 'axios';
 import './order.css';
+import CheckProfile from '../Component/ProfileModal/Profile';
 
 const { Text } = Typography;
 
@@ -187,7 +188,7 @@ class Milepost extends Component {
               </ul>
               {
                 data && data.user_admin_or_member ?
-                  <Link to={`/projects/${owner}/${projectsId}/milestones/new`} className="topWrapper_btn">新的里程碑</Link>
+                  <CheckProfile {...this.props} className="topWrapper_btn" sureFunc={() => {this.props.history.push(`/${owner}/${projectsId}/milestones/new`)}}>新的里程碑</CheckProfile>
                   : ''
               }
             </div>
@@ -204,7 +205,7 @@ class Milepost extends Component {
                           <div className="milepostwidth">
                             <div className="grid-item width100">
                               <i className="iconfont icon-lubiaosignpost3 font-12 mr3"></i>
-                              <Link to={`/projects/${owner}/${projectsId}/milestones/${item.id}`} className="font-16">{item.name}</Link>
+                              <Link to={`/${owner}/${projectsId}/milestones/${item.id}`} className="font-16">{item.name}</Link>
                             </div>
                           </div>
                         </div>
@@ -228,7 +229,7 @@ class Milepost extends Component {
                             <div className="milepostleft">
                               <div className="grid-item ml15 color-grey-9">
                                 <i className="iconfont icon-bianji3 font-14 mr5"></i>
-                                <Link to={`/projects/${owner}/${projectsId}/milestones/${item.id}/edit`} className="color-grey-9">编辑</Link>
+                                <Link to={`/${owner}/${projectsId}/milestones/${item.id}/edit`} className="color-grey-9">编辑</Link>
                               </div>
                               <div className="grid-item ml15 color-grey-9">
                                 <i className={item.status === "closed" ? "iconfont icon-gouxuan font-14 mr5":"iconfont icon-yiguanbi1 font-14 mr5"}></i>

src/forge/Order/MilepostDetail.js

@@ -2,7 +2,8 @@ import React, { Component } from "react";
 import { Link } from 'react-router-dom';
 import { Dropdown, Menu, Icon, Pagination, Spin } from 'antd';
 import './order.css';
-import { FlexAJ } from '../Component/layout'
+import { FlexAJ } from '../Component/layout';
+import CheckProfile from '../Component/ProfileModal/Profile';
 
 import NoneData from '../Nodata';
 import OrderItem from './OrderItem';
@@ -113,7 +114,7 @@ class MilepostDetail extends Component {
         this.setState({
           data: result.data,
           issues: result.data.issues,
-          search_count: result.data.search_count,
+          search_count: params.status_type ==="1" ? result.data.open_issues_count : result.data.close_issues_count,
           isSpin: false
         })
       }
@@ -238,8 +239,8 @@ class MilepostDetail extends Component {
               <span className="font-weight-bold">{data && data.percent && data.percent.toFixed(2)}%完成 </span>
             </span>
             <div className="milepostdiv">
-              <Link to={`/projects/${owner}/${projectsId}/milestones/${meilid}/edit`} className="topWrapper_btn" style={{ marginRight: 15 }} >编辑里程碑</Link>
+              <Link to={`/${owner}/${projectsId}/milestones/${meilid}/edit`} className="topWrapper_btn" style={{ marginRight: 15 }} >编辑里程碑</Link>
-              <Link to={`/projects/${owner}/${projectsId}/issues/${meilid}/new`} className="topWrapper_btn">创建易修</Link>
+              <CheckProfile {...this.props} sureFunc={()=>{this.props.history.push(`/${owner}/${projectsId}/issues/${meilid}/new`)}} className="topWrapper_btn">创建易修</CheckProfile>
             </div>
           </FlexAJ>
         </div>

src/forge/Order/Milepostitem.js

@@ -31,7 +31,7 @@ class OrderItem extends Component {
                   <div className="milepostwidth">
                     <div className="grid-item width100">
                       <i className="iconfont icon-lubiaosignpost3 font-12 mr3"></i>
-                      <Link to={`/projects/${owner}/${projectsId}/milestones/${item.id}`} className="font-16">{item.name}</Link>
+                      <Link to={`/${owner}/${projectsId}/milestones/${item.id}`} className="font-16">{item.name}</Link>
                     </div>
                   </div>
                 </div>
@@ -65,7 +65,7 @@ class OrderItem extends Component {
                     <div className="milepostleft">
                       <div className="grid-item ml15 color-grey-9">
                         <i className="iconfont icon-bianji3 font-14 mr5"></i>
-                        <Link to={`/projects/${owner}/${projectsId}/milestones/${item.id}/edit`} className="color-grey-9">编辑</Link>
+                        <Link to={`/${owner}/${projectsId}/milestones/${item.id}/edit`} className="color-grey-9">编辑</Link>
                       </div>
                       <div className="grid-item ml15 color-grey-9">
                         <i className="iconfont icon-yiguanbi1 font-14 mr5"></i>

src/forge/Order/Nav.js

@@ -7,8 +7,8 @@ class Nav extends Component{
     const { projectsId , owner } = this.props.match.params;
     return(
       <p className="topWrapper_nav">
-        <NavLink activeClassName="active" className="issue-type-button" to={`/projects/${owner}/${projectsId}/issues/tags`}>标签</NavLink>
+        <NavLink activeClassName="active" className="issue-type-button" to={`/${owner}/${projectsId}/issues/tags`}>标签</NavLink>
-        <NavLink activeClassName="active" className="issue-type-button" to={`/projects/${owner}/${projectsId}/milestones`}>里程碑</NavLink>
+        <NavLink activeClassName="active" className="issue-type-button" to={`/${owner}/${projectsId}/milestones`}>里程碑</NavLink>
       </p>
     )
   }

src/forge/Order/OrderItem.js

@@ -44,6 +44,7 @@ class OrderItem extends Component {
   render() {
     const { item , checkbox , mile , user_admin_or_member } = this.props;
     const { projectsId , owner } = this.props.match.params;
+    const { orderid , isdisplay } = this.state;
     const { current_user } = this.props;
     return (
       item &&
@@ -51,7 +52,7 @@ class OrderItem extends Component {
         {current_user && current_user.login && checkbox}
         <div className="flex-1">
           <p className="mb10 df" style={{alignItems:"center"}}>
-            <Link to={`/projects/${owner}/${projectsId}/issues/${item.id}/detail`} target="_blank" title={item.name} className="hide-1 font-16 color-grey-3 lineh-30 mr10" style={{maxWidth:"370px"}}>{item.name}</Link>
+            <Link to={`/${owner}/${projectsId}/issues/${item.id}`} target="_blank" title={item.name} className="hide-1 font-16 color-grey-3 lineh-30 mr10" style={{maxWidth:"370px"}}>{item.name}</Link>
             {TagInfo(item.priority,"mr10")}
           </p>
           <p className="color-grey-6 font-12">
@@ -67,7 +68,7 @@ class OrderItem extends Component {
           <li>
             {
               item.author_name ?
-                <Link to={`/users/${item.author_login}`} className="show-user-link">
+                <Link to={`/${item.author_login}`} className="show-user-link">
                   {item.author_name}
                 </Link>
                 : "--"
@@ -76,7 +77,7 @@ class OrderItem extends Component {
           <li>
             {
               item.assign_user_name ?
-                <Link to={`/users/${item.assign_user_login}`} className="show-user-link">
+                <Link to={`/${item.assign_user_login}`} className="show-user-link">
                   {item.assign_user_name}
                 </Link>
                 : "--"
@@ -88,15 +89,24 @@ class OrderItem extends Component {
           <li style={{color:`${item.done_ratio === "100%"?"#28BD6C":"#F73030"}`}}>{item.done_ratio || "--"}</li>
           <li>
             <div className="milepostleft">
-              <Link to={`/projects/${owner}/${projectsId}/issues/${item.id}/detail`}><i className="iconfont icon-pinglun1 mr3 font-16"></i>{item.journals_count}</Link>
+              <Link to={`/${owner}/${projectsId}/issues/${item.id}`}><i className="iconfont icon-pinglun1 mr3 font-16"></i>{item.journals_count}</Link>
               {
                 user_admin_or_member ?
-                <div id="hoverBox" style={{ display: this.state.orderid === item.id && this.state.isdisplay ? 'flex' : 'none' }}>
+                <div style={{ display: orderid === item.id && isdisplay ? 'flex' : 'none' }}>
                   <div className="mr8 ml8 color-grey-9">
-                    <Link to={`/projects/${owner}/${projectsId}/issues/${item.id}/updatedetail`} className="color-grey-9"><i className="iconfont icon-bianji3 font-14 mr5"></i></Link>
+                    <Link to={`/${owner}/${projectsId}/issues/${item.id}/updatedetail`} className="color-grey-9">
+                      <i className="iconfont icon-bianji3 font-14 mr5"></i>
+                    </Link>
                   </div>
                   <div className="color-grey-9">
-                    <Popconfirm placement="bottom" overlayClassName="overlayBox" getPopupContainer={()=>document.getElementById("hoverBox")} title={'您确定要删除当前易修吗？'} okText="是" cancelText="否" onConfirm={() => this.deletedetail(item.id)}>
+                    <Popconfirm 
+                      placement="bottom" 
+                      overlayClassName={orderid === item.id && isdisplay ? "overlayBox" : "overlayBox hideOverlay" }
+                      title={'您确定要删除当前易修吗？'} 
+                      okText="是" 
+                      cancelText="否" 
+                      onConfirm={() => this.deletedetail(item.id)}
+                    >
                       <i className="iconfont icon-yiguanbi1 font-14"></i>
                     </Popconfirm>
                   </div>

src/forge/Order/UpdateMilepost.js

@@ -79,7 +79,7 @@ class UpdateMilepost extends Component {
         }).then(result => {
           if (result) {
             this.setState({ isSpin: false })
-            this.props.history.push(`/projects/${owner}/${projectsId}/milestones`);
+            this.props.history.push(`/${owner}/${projectsId}/milestones`);
 
           }
 

src/forge/Order/newMilepost.js

@@ -63,7 +63,7 @@ class NewMilepost extends Component {
         }).then(result => {
           if (result) {
             this.setState({ isSpin: false })
-            this.props.history.push(`/projects/${owner}/${projectsId}/milestones`);
+            this.props.history.push(`/${owner}/${projectsId}/milestones`);
             const { getDetail } = this.props;
             getDetail && getDetail();
           }

src/forge/Order/order.css

@@ -20,6 +20,9 @@
 .overlayBox{
   width: 230px;
 }
+.hideOverlay{
+  display: none;
+}
 .topmilepost {
   box-sizing: border-box;
   display: flex;

src/forge/Order/order.js

@@ -1,12 +1,12 @@
 import React, { Component } from "react";
 import { Input, Dropdown, Menu, Icon, Pagination, Spin, DatePicker, Checkbox } from "antd";
-import { Link } from 'react-router-dom';
 import "./order.css";
 import './index.scss';
 import moment from 'moment';
 
 import NoneData from "../Nodata";
 import OrderItem from "./OrderItem";
+import CheckProfile from '../Component/ProfileModal/Profile';
 
 import axios from "axios";
 
@@ -351,9 +351,9 @@ class order extends Component {
     if(data && data.user_admin_or_member){
       const { projectsId , owner } = this.props.match.params;
       return(
-        <Link className="topWrapper_btn ml10" target="_blank" to={`/projects/${owner}/${projectsId}/issues/new`}>
+        <CheckProfile {...this.props} className="topWrapper_btn ml10" sureFunc={()=>{window.open(`/${owner}/${projectsId}/issues/new`,'_blank')}}>
           +&nbsp;创建易修
-        </Link>
+        </CheckProfile>
       )
     }
   }

src/forge/Order/order_form.js

@@ -165,7 +165,7 @@ class order_form extends Component {
           }).then((result) => {
             if (result && result.data.id) {
               this.props.showNotification("任务创建成功！");
-              this.props.history.push(`/projects/${owner}/${projectsId}/issues/${result.data.id}/detail`);
+              this.props.history.push(`/${owner}/${projectsId}/issues/${result.data.id}`);
               this.setState({
                 description: "",
                 isSpin: false,
@@ -191,7 +191,7 @@ class order_form extends Component {
             ...values,
           }).then((result) => {
             if (result) {
-              this.props.history.push(`/projects/${owner}/${projectsId}/issues/${orderId}/detail`);
+              this.props.history.push(`/${owner}/${projectsId}/issues/${orderId}`);
               this.props.showNotification("任务更新成功！");
               const { getDetail } = this.props;
               getDetail && getDetail();
@@ -371,7 +371,7 @@ class order_form extends Component {
                     type="default"
                     className="ml30"
                     onClick={()=>
-                      this.props.history.push(form_type === "new" ? `/projects/${owner}/${projectsId || orderId}/issues` : `/projects/${owner}/${projectsId}/issues/${orderId}/detail`)}
+                      this.props.history.push(form_type === "new" ? `/${owner}/${projectsId || orderId}/issues` : `/${owner}/${projectsId}/issues/${orderId}`)}
                   >
                     <span className="plr10">取消</span>
                   </Button>

src/forge/SecuritySetting/Index.jsx

@@ -18,6 +18,10 @@ const SSHNew = Loadable({
   loader: () => import("./sub/New"),
   loading: Loading,
 });
+const Profile = Loadable({
+  loader: () => import("../users/Material/Index"),
+  loading: Loading,
+});
 const SSHIndex = Loadable({
   loader: () => import("./sub/SSH"),
   loading: Loading,
@@ -35,6 +39,10 @@ function Index(props){
               <img src={getImageUrl(`/${current_user && current_user.image_url}`)} alt=""/>
               <span>{current_user && current_user.username}</span>
             </div>
+            <ul className="securityUl">
+              <li>个人信息</li>
+              <li className={pathname.indexOf("/settings/profile")>-1 ?"active":""}><Link to={`/settings/profile`}><i className="iconfont icon-gerenziliao mr5 font-14"></i>基本资料</Link></li>
+            </ul>
             <ul className="securityUl">
               <li>安全设置</li>
               <li className={pathname.indexOf("/settings/SSH")>-1 ?"active":""}><Link to={`/settings/SSH`}><i className="iconfont icon-xuanzhongssh_icon mr5 font-14"></i>SSH密钥</Link></li>
@@ -49,6 +57,12 @@ function Index(props){
                     <SSHNew {...props} {...p}/>
                   )}
                 ></Route>
+                <Route
+                  path="/settings/profile"
+                  render={(p) => (
+                    <Profile {...props} {...p}/>
+                  )}
+                ></Route>
                 <Route
                   path="/settings/SSH"
                   render={(p) => (

src/forge/SecuritySetting/Index.scss

@@ -36,6 +36,8 @@
       .securityUl{
         padding:20px 16px;
         color: #333;
+        margin-bottom: 0px;
+        padding-bottom: 0px;
         li{
           margin-bottom: 10px;
           height: 27px;
@@ -122,50 +124,6 @@
     }
   }
 }
-.deleteBox{
-  .ant-modal-header{
-    background-color: rgba(223, 0, 2, 0.06);
-    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
-    }
-    .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;
-      }
-    }
-  }
-}
 .descModal{
   .ant-modal-title{
     text-align: left;

src/forge/SecuritySetting/sub/DeleteBox.jsx

@@ -1,17 +1,16 @@
 import React from 'react';
 import { AlignCenter } from '../../Component/layout';
-import { Modal , Button } from 'antd';
+import Modals from '../../Component/PublicModal/Index';
+import { Button } from 'antd';
 
 function DeleteBox({ visible , onCancel ,onSuccess }) {
   
   return(
-    <Modal
+    <Modals
       visible={visible}
       onCancel={onCancel}
-      title="删除SSH密钥"
+      title={"删除SSH密钥"}
-      width="600px"
+      btn={
-      className="deleteBox"
-      footer={
         <div>
           <Button size={'large'} onClick={onCancel}>取消</Button>
           <Button type={"danger"} size={"large"} onClick={onSuccess}>确认删除</Button>
@@ -19,10 +18,11 @@ function DeleteBox({ visible , onCancel ,onSuccess }) {
       }
     >
       <div className="desc">
-        <AlignCenter className="descMain"><i className="iconfont icon-jinggao1 mr10"></i>您确定要删除此 SSH 密钥吗？</AlignCenter>
+        <AlignCenter className="descMain">
-        <p>此操作将永久删除该SSH密钥，且不可恢复。如果您想再次使用该密钥，则需要您重新上传。</p>
+          <i className="iconfont icon-jinggao1 mr10 font-20 red"></i>您确定要删除此 SSH 密钥吗？</AlignCenter>
+          <p>此操作将永久删除该SSH密钥，且不可恢复。如果您想再次使用该密钥，则需要您重新上传。</p>
       </div>
-    </Modal>
+    </Modals>
   )
 }
 export default DeleteBox;

src/forge/Settings/Branch.js

@@ -88,7 +88,7 @@ export default ((props)=>{
 
   // 跳转
   function settingRule(protectBranch){
-    props.history.push(`/projects/${owner}/${projectsId}/setting/branch/${protectBranch}`);
+    props.history.push(`/${owner}/${projectsId}/settings/branches/${protectBranch}`);
   }
 
   // 翻页

src/forge/Settings/BranchRule.jsx

@@ -290,7 +290,7 @@ export default Form.create()(
             <Cancel
               className="ml30"
               onClick={() => {
-                history.push(`/projects/${owner}/${projectsId}/setting/branch`);
+                history.push(`/${owner}/${projectsId}/settings/branches`);
               }}
             >
               取消

src/forge/Settings/Collaborator.js

@@ -1,4 +1,4 @@
-import React, { useState } from "react";
+import React, { useState , useRef } from "react";
 import {WhiteBack} from '../Component/layout';
 import AddMember from '../Component/AddMember';
 import AddGroup from '../Component/AddGroup';
@@ -8,9 +8,11 @@ import Group from './CollaboratorGroup';
 function Collaborator(props){
   const [ nav , setNav] = useState("1");
   const [ newId , setNewId] = useState(undefined);
+  const [ addOperation , setAddOperation] = useState(true);
   const [ newGroupId , setNewGroupId] = useState(undefined);
   const {projectsId ,owner} = props.match.params;
 
+
   const author = props && props.projectDetail && props.projectDetail.author;
 
   function getID(id){
@@ -19,6 +21,7 @@ function Collaborator(props){
   function getGroupID(id){
     setNewGroupId(id);
   }
+
   
   return (
     <WhiteBack>
@@ -27,15 +30,17 @@ function Collaborator(props){
           author && author.type === "Organization" ?
           <span>
             <span style={{cursor:"pointer"}} className={nav === "1" ? "font-18 text-black color-blue":"font-18 text-black"} onClick={()=>{setNav("1");setNewId(undefined)}}>协作者管理</span>
-            <span style={{cursor:"pointer"}} className={nav === "2" ? "font-18 text-black ml30 color-blue":"font-18 text-black ml30"} onClick={()=>{setNav("2");setNewId(undefined)}}>团队管理</span>
+            <span style={{cursor:"pointer"}} className={nav === "2" ? "font-18 text-black ml30 color-blue":"font-18 text-black ml30"} onClick={()=>{setNav("2");setNewId(undefined);setNewGroupId(undefined)}}>团队管理</span>
           </span>
           :
           <span className="font-18 text-black">协作者管理</span>
         }
         {
-          nav === "1" ?
+          nav === "1" &&
           <AddMember getID={getID} login showNotification={props.showNotification}/>
-          :
+        }
+        {
+          (nav !== "1" && addOperation) &&
           <AddGroup getGroupID={getGroupID} organizeId={owner}/>
         }
       </div>
@@ -44,7 +49,7 @@ function Collaborator(props){
           nav === "1" ? 
           <Member newId={newId} projectsId={projectsId} owner={owner} project_id={props.project_id} author={props.projectDetail && props.projectDetail.author} showNotification={props.showNotification}/> 
           :
-          <Group owner={owner} projectsId={projectsId} newGroupId={newGroupId}/>
+          <Group setAddOperation={setAddOperation} owner={owner} projectsId={projectsId} newGroupId={newGroupId}/>
         }
       </div>
     </WhiteBack>

src/forge/Settings/CollaboratorGroup.jsx

@@ -10,7 +10,7 @@ const roles = {
   read: "报告者",
 };
 const limit = 15;
-function CollaboratorGroup({ newGroupId, owner, projectsId }) {
+function CollaboratorGroup({ newGroupId, owner, projectsId , setAddOperation }) {
   const [list, setList] = useState(undefined);
   const [isSpin, setIsSpin] = useState(true);
   const [page, setPage] = useState(1);
@@ -34,6 +34,7 @@ function CollaboratorGroup({ newGroupId, owner, projectsId }) {
           setList(result.data.teams);
           setTotal(result.data.total_count);
           setIsSpin(false);
+          setAddOperation(result.data.can_add);
         }
       })
       .catch((error) => {});
@@ -47,16 +48,15 @@ function CollaboratorGroup({ newGroupId, owner, projectsId }) {
   // 添加团队
   function addGroup(id) {
     const url = `/${owner}/${projectsId}/teams.json`;
-    axios
+    axios.post(url, {
-      .post(url, {
+      team_id: id,
-        team_id: id,
+    })
-      })
+    .then((result) => {
-      .then((result) => {
+      if (result && result.data) {
-        if (result && result.data) {
+        getData();
-          getData();
+      }
-        }
+    })
-      })
+    .catch((error) => {});
-      .catch((error) => {});
   }
 
   // 删除团队
@@ -77,7 +77,11 @@ function CollaboratorGroup({ newGroupId, owner, projectsId }) {
       title: "团队名",
       dataIndex: "name",
       render: (value, item) => {
-        return <Link to={`/organize/${owner}/group/${item.id}`}>{value}</Link>;
+        if(item.is_admin || item.is_member){
+          return <Link to={`/${owner}/teams/${item.id}`}>{value}</Link>;
+        }else{
+          return <span>{value}</span>;
+        }
       },
     },
     {

src/forge/Settings/CollaboratorMember.jsx

@@ -186,7 +186,7 @@ function CollaboratorMember({projectsId,owner,project_id,author,showNotification
       render: (text, item) => (
         <span className="f-wrap-alignCenter">
           <Link
-            to={`/users/${item.login}`}
+            to={`/${item.login}`}
             className="show-user-link"
           >
             <img
@@ -204,7 +204,7 @@ function CollaboratorMember({projectsId,owner,project_id,author,showNotification
       title: "用户名",
       dataIndex: "name",
       render: (text, item) => (
-        <Link to={`/users/${item.login}`} className="show-user-link">
+        <Link to={`/${item.login}`} className="show-user-link">
           {text}
         </Link>
       ),

src/forge/Settings/Index.js

@@ -49,25 +49,25 @@ class Index extends Component {
     const { projectsId , owner } = this.props.match.params;
     const { pathname } = this.props.history.location;
 
-    const flag = pathname === `/projects/${owner}/${projectsId}/setting`;
+    const flag = pathname === `/${owner}/${projectsId}/settings`;
     return (
       <Box className="ProjectListIndex">
         <Short>
           <ul className="list-l-Menu">
             <li className={flag ? "active" : ""}>
               <p>
-                <Link to={`/projects/${owner}/${projectsId}/setting`} className="w-100">
+                <Link to={`/${owner}/${projectsId}/settings`} className="w-100">
                   <i className="iconfont icon-huabanfuben font-18 mr10"></i>基本设置
                 </Link>
               </p>
             </li>
             <li
               className={
-                pathname.indexOf("setting/collaborator") > -1 ? "active" : ""
+                pathname.indexOf("settings/collaborators") > -1 ? "active" : ""
               }
             >
               <p>
-                <Link to={`/projects/${owner}/${projectsId}/setting/collaborator`} className="w-100">
+                <Link to={`/${owner}/${projectsId}/settings/collaborators`} className="w-100">
                   <i className="iconfont icon-chengyuan font-18 mr10"></i>
                   协作者管理
                 </Link>
@@ -75,11 +75,11 @@ class Index extends Component {
             </li>
             <li
               className={
-                pathname.indexOf("setting/webhooks") > -1 ? "active" : ""
+                pathname.indexOf("settings/webhooks") > -1 ? "active" : ""
               }
             >
               <p>
-                <Link to={`/projects/${owner}/${projectsId}/setting/webhooks`} className="w-100">
+                <Link to={`/${owner}/${projectsId}/settings/webhooks`} className="w-100">
                   <i className="iconfont icon-a-xuanzhongwebhookicon font-18 mr10 color-grey-9"></i>
                   Webhooks
                 </Link>
@@ -87,21 +87,21 @@ class Index extends Component {
             </li>
             <li
               className={
-                pathname.indexOf("setting/branch") > -1 ? "active" : ""
+                pathname.indexOf("settings/branch") > -1 ? "active" : ""
               }
             >
               <p>
-                <Link to={`/projects/${owner}/${projectsId}/setting/branch`} className="w-100">
+                <Link to={`/${owner}/${projectsId}/settings/branches`} className="w-100">
                 <i className="iconfont icon-fenzhi font-20 mr10"></i>
                   分支设置
                 </Link>
               </p>
             </li>
             <li
-              className={pathname.indexOf("setting/tags") > -1 ? "active" : ""}
+              className={pathname.indexOf("settings/labels") > -1 ? "active" : ""}
             >
               <p>
-                <Link to={`/projects/${owner}/${projectsId}/setting/tags`} className="w-100">
+                <Link to={`/${owner}/${projectsId}/settings/labels`} className="w-100">
                   <i className="iconfont icon-biaoqian3 font-18 mr10 color-grey-6"></i>
                   项目标签
                 </Link>
@@ -110,7 +110,7 @@ class Index extends Component {
 
             {/* <li
               className={
-                pathname.indexOf("setting/manage") > -1 ? "active" : ""
+                pathname.indexOf("settings/manage") > -1 ? "active" : ""
               }
             >
               <p>
@@ -127,64 +127,64 @@ class Index extends Component {
             <Switch {...this.props}>
               {/* webhooks */}
               <Route
-                path="/projects/:owner/:projectsId/setting/webhooks/new"
+                path="/:owner/:projectsId/settings/webhooks/new"
                 render={(props) => (
                   <WebhookNew {...this.props} {...props} {...this.state} />
                 )}
               ></Route>
               <Route
-                path="/projects/:owner/:projectsId/setting/webhooks/:id"
+                path="/:owner/:projectsId/settings/webhooks/:id"
                 render={(props) => (
                   <WebhookNew {...this.props} {...props} {...this.state} />
                 )}
               ></Route>
               <Route
-                path="/projects/:owner/:projectsId/setting/webhooks"
+                path="/:owner/:projectsId/settings/webhooks"
                 render={(props) => (
                   <Webhook {...this.props} {...props} {...this.state} />
                 )}
               ></Route>
               {/* 协作者 */}
               <Route
-                path="/projects/:owner/:projectsId/setting/collaborator"
+                path="/:owner/:projectsId/settings/collaborators"
                 render={(props) => (
                   <Collaborator {...this.props} {...props} {...this.state} />
                 )}
               ></Route>
               {/* 修改仓库信息 */}
               <Route
-                path="/projects/:owner/:projectsId/setting/tags"
+                path="/:owner/:projectsId/settings/labels"
                 render={(props) => (
                   <Tags {...this.props} {...props} {...this.state} />
                 )}
               ></Route>
               <Route
-                path="/projects/:owner/:projectsId/setting/branch/:branch"
+                path="/:owner/:projectsId/settings/branches/:branch"
                 render={(props) => (
                   <BranchNew {...this.props} {...props} {...this.state} />
                 )}
               ></Route>
               <Route
-                path="/projects/:owner/:projectsId/setting/branch"
+                path="/:owner/:projectsId/settings/branches"
                 render={(props) => (
                   <Branch {...this.props} {...props } {...this.state} />
                 )}
               ></Route>
               <Route
-                path="/projects/:owner/:projectsId/setting/manage/new"
+                path="/:owner/:projectsId/settings/manage/new"
                 render={(props) => (
                   <ManageNew {...this.props} {...props} {...this.state} />
                 )}
               ></Route>
               <Route
-                path="/projects/:owner/:projectsId/setting/manage"
+                path="/:owner/:projectsId/settings/manage"
                 render={(props) => (
                   <Manage {...this.props} {...props} {...this.state} />
                 )}
               ></Route>
               {/* 修改仓库信息 */}
               <Route
-                path="/projects/:owner/:projectsId/setting"
+                path="/:owner/:projectsId/settings"
                 render={(props) => (
                   <Setting {...this.props} {...props} {...this.state} />
                 )}