Merge branch 'master' of https://git.trustie.net/jasder/forgeplus-react

# Conflicts: # src/forge/Main/sub/UpdateDescModal.jsx
代码style
2021-08-09 10:37:23 +08:00 · 2021-08-09 10:36:15 +08:00 · 2021-08-06 17:07:54 +08:00 · 2021-08-05 10:48:43 +08:00 · 2021-08-05 10:47:22 +08:00 · 2021-08-04 14:42:08 +08:00
200 changed files with 1450 additions and 4482 deletions
--- a/config/webpack.config.prod.js
+++ b/config/webpack.config.prod.js
@ -19,8 +19,7 @@ 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.NODE_ENV !== "production";
+const shouldUseSourceMap = process.env.GENERATE_SOURCEMAP !== "false";
 const env = getClientEnvironment(publicPath);

 // This is the production configuration.
@ -55,8 +54,7 @@ module.exports = {
  },
  bail: true,
  mode: "production",
-  // devtool: false, //测试版
-  devtool: shouldUseSourceMap?'source-map':false,
+  devtool: false, //测试版
  entry: [require.resolve("./polyfills"), paths.appIndexJs],
  output: {
    path: paths.appBuild,
--- a/package-lock.json
+++ b/package-lock.json
@ -1273,7 +1273,7 @@
    },
    "babel-cli": {
      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-cli/-/babel-cli-6.26.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/babel-cli/download/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.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
+          "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",
          "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
          "dev": true,
          "optional": true,
@ -1314,7 +1314,7 @@
        },
        "source-map": {
          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "resolved": "https://registry.npm.taobao.org/source-map/download/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.npmjs.org/babel-helper-bindify-decorators/-/babel-helper-bindify-decorators-6.24.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/babel-helper-bindify-decorators/download/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.npmjs.org/babel-helper-explode-class/-/babel-helper-explode-class-6.24.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/babel-helper-explode-class/download/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.npmjs.org/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/babel-plugin-syntax-async-generators/download/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.npmjs.org/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/babel-plugin-syntax-decorators/download/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.npmjs.org/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/babel-plugin-transform-async-generator-functions/download/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.npmjs.org/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.24.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/babel-plugin-transform-decorators/download/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.npmjs.org/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/babel-plugin-transform-runtime/download/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.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/babel-polyfill/download/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.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
+          "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",
          "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg="
        }
      }
@ -2131,7 +2131,7 @@
    },
    "babel-preset-es2015": {
      "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/babel-preset-es2015/download/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.npmjs.org/babel-preset-react/-/babel-preset-react-6.24.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/babel-preset-react/download/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.npmjs.org/babel-preset-stage-2/-/babel-preset-stage-2-6.24.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/babel-preset-stage-2/download/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.npmjs.org/babel-preset-stage-3/-/babel-preset-stage-3-6.24.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/babel-preset-stage-3/download/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.npmjs.org/code-prettify/-/code-prettify-0.1.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/code-prettify/download/code-prettify-0.1.0.tgz",
      "integrity": "sha1-RocMyMGlDQm61TmzOpg9vUqjSx4="
    },
    "codemirror": {
@ -4885,7 +4885,7 @@
    },
    "dom-closest": {
      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/dom-closest/-/dom-closest-0.2.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/dom-closest/download/dom-closest-0.2.0.tgz",
      "integrity": "sha1-69n5HRvyLo1vR3h2u80+yQIWwM8=",
      "requires": {
        "dom-matches": ">=1.0.1"
@ -4929,7 +4929,7 @@
    },
    "dom-matches": {
      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/dom-matches/-/dom-matches-2.0.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/dom-matches/download/dom-matches-2.0.0.tgz",
      "integrity": "sha1-0nKLQWqHUzmA6wibhI0lPPI6dYw="
    },
    "dom-scroll-into-view": {
@ -5187,7 +5187,7 @@
    },
    "enquire.js": {
      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/enquire.js/-/enquire.js-2.1.6.tgz",
+      "resolved": "https://registry.npm.taobao.org/enquire.js/download/enquire.js-2.1.6.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fenquire.js%2Fdownload%2Fenquire.js-2.1.6.tgz",
      "integrity": "sha1-PoeAybi4NQhMP2DhZtvDwqPImBQ="
    },
    "entities": {
@ -5706,7 +5706,7 @@
    },
    "eventlistener": {
      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/eventlistener/-/eventlistener-0.0.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/eventlistener/download/eventlistener-0.0.1.tgz",
      "integrity": "sha1-7Suqu4UiJ68rz4iRUscsY8pTLrg="
    },
    "events": {
@ -8040,7 +8040,7 @@
    },
    "hammerjs": {
      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz",
+      "resolved": "https://registry.npm.taobao.org/hammerjs/download/hammerjs-2.0.8.tgz",
      "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE="
    },
    "handle-thing": {
@ -8881,7 +8881,7 @@
    },
    "immutable": {
      "version": "3.7.6",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.7.6.tgz",
+      "resolved": "https://registry.npm.taobao.org/immutable/download/immutable-3.7.6.tgz",
      "integrity": "sha1-E7TTyxK++hVIKib+Gy665kAHHks="
    },
    "import-fresh": {
@ -10486,7 +10486,7 @@
    },
    "lodash.throttle": {
      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/lodash.throttle/download/lodash.throttle-4.1.1.tgz",
      "integrity": "sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ="
    },
    "lodash.uniq": {
@ -11673,7 +11673,7 @@
    },
    "output-file-sync": {
      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/output-file-sync/-/output-file-sync-1.1.2.tgz",
+      "resolved": "https://registry.npm.taobao.org/output-file-sync/download/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.npmjs.org/user-home/-/user-home-1.1.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/user-home/download/user-home-1.1.1.tgz",
      "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=",
      "dev": true
    },
@ -19157,7 +19157,7 @@
    },
    "v8flags": {
      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz",
+      "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",
      "integrity": "sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=",
      "dev": true,
      "requires": {
--- a/package.json
+++ b/package.json
@ -193,6 +193,7 @@
    "babel-core": "^6.26.0",
    "babel-plugin-import": "^1.13.0",
    "babel-plugin-transform-runtime": "^6.23.0",
+    "babel-polyfill": "^6.26.0",
    "babel-preset-es2015": "^6.24.1",
    "babel-preset-react": "^6.24.1",
    "babel-preset-stage-2": "^6.24.1",
--- a/public/css/iconfont.css
+++ b/public/css/iconfont.css
@ -1,8 +1,8 @@
@font-face {
  font-family: "iconfont"; /* Project id 2340181 */
-  src: url('iconfont.woff2?t=1630632852475') format('woff2'),
-       url('iconfont.woff?t=1630632852475') format('woff'),
-       url('iconfont.ttf?t=1630632852475') format('truetype');
+  src: url('iconfont.woff2?t=1627870211301') format('woff2'),
+       url('iconfont.woff?t=1627870211301') format('woff'),
+       url('iconfont.ttf?t=1627870211301') format('truetype');
 }

 .iconfont {
@ -13,246 +13,6 @@
  -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";
 }
@ -289,10 +49,22 @@
  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";
 }
@ -309,6 +81,18 @@
  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";
 }
@ -317,14 +101,26 @@
  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";
 }
@ -333,10 +129,26 @@
  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";
 }
@ -349,10 +161,22 @@
  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";
 }
--- a/public/css/iconfont.js
+++ b/public/css/iconfont.js
--- a/public/css/iconfont.json
+++ b/public/css/iconfont.json
@ -5,426 +5,6 @@
  "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",
@ -488,6 +68,20 @@
      "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",
@ -495,6 +89,13 @@
      "unicode": "e8a1",
      "unicode_decimal": 59553
    },
+    {
+      "icon_id": "23144159",
+      "name": "选中响应icon",
+      "font_class": "xuanzhongxiangyingicon",
+      "unicode": "e8a2",
+      "unicode_decimal": 59554
+    },
    {
      "icon_id": "23144160",
      "name": "选中分支icon",
@ -523,6 +124,27 @@
      "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",
@ -537,6 +159,13 @@
      "unicode": "e88d",
      "unicode_decimal": 59533
    },
+    {
+      "icon_id": "23046311",
+      "name": "新增页面_鼠标点击icon",
+      "font_class": "xinzengyemian_shubiaodianjiicon",
+      "unicode": "e88e",
+      "unicode_decimal": 59534
+    },
    {
      "icon_id": "23046244",
      "name": "导入模版_icon",
@ -544,6 +173,13 @@
      "unicode": "e86f",
      "unicode_decimal": 59503
    },
+    {
+      "icon_id": "23046247",
+      "name": "导出_悬浮",
+      "font_class": "daochu_xuanfu",
+      "unicode": "e870",
+      "unicode_decimal": 59504
+    },
    {
      "icon_id": "23046252",
      "name": "错误",
@ -551,6 +187,13 @@
      "unicode": "e872",
      "unicode_decimal": 59506
    },
+    {
+      "icon_id": "23046254",
+      "name": "成功",
+      "font_class": "chenggong1",
+      "unicode": "e873",
+      "unicode_decimal": 59507
+    },
    {
      "icon_id": "23046255",
      "name": "更多_icon",
@ -565,6 +208,13 @@
      "unicode": "e875",
      "unicode_decimal": 59509
    },
+    {
+      "icon_id": "23046262",
+      "name": "复制_icon",
+      "font_class": "fuzhi_icon",
+      "unicode": "e876",
+      "unicode_decimal": 59510
+    },
    {
      "icon_id": "23046268",
      "name": "删除icon",
@ -572,6 +222,27 @@
      "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",
@ -593,6 +264,13 @@
      "unicode": "e87e",
      "unicode_decimal": 59518
    },
+    {
+      "icon_id": "23046277",
+      "name": "文件夹_icon",
+      "font_class": "wenjianjia_icon",
+      "unicode": "e87f",
+      "unicode_decimal": 59519
+    },
    {
      "icon_id": "23046278",
      "name": "下拉按钮",
@ -600,6 +278,20 @@
      "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",
--- a/public/css/iconfont.ttf
+++ b/public/css/iconfont.ttf
--- a/public/css/iconfont.woff
+++ b/public/css/iconfont.woff
--- a/public/css/iconfont.woff2
+++ b/public/css/iconfont.woff2
--- a/src/App.js
+++ b/src/App.js
@ -3,7 +3,7 @@ import './App.css';
 import { ConfigProvider } from 'antd'
 import zhCN from 'antd/lib/locale-provider/zh_CN';
 import {
-	// BrowserRouter as Router,
+	BrowserRouter as Router,
 	Route,
 	Switch
 } from 'react-router-dom';
@ -19,7 +19,7 @@ import moment from 'moment'
 import { MuiThemeProvider, createMuiTheme } from 'material-ui/styles';
 import SiderBar from './forge/Component/SiderBar'

-import { SnackbarHOC } from 'educoder';
+import { SnackbarHOC } from 'educoder'
 import { initAxiosInterceptors } from './AppConfig'
 import { Provider } from 'react-redux';
 import configureStore from './redux/stores/configureStore';
@ -39,11 +39,6 @@ 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'),
@ -87,24 +82,11 @@ 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"),
-	loading: Loading,
-});
-
-const CreateMerge = Loadable({
-  loader: () => import('./forge/Merge/NewMerge'),
+  loader: () => import("./forge/Index"),
  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);
@ -114,51 +96,6 @@ 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,
-			});
 		}
 	}

@ -178,19 +115,13 @@ 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({
@ -261,139 +192,87 @@ class App extends Component {
 	};

 	render() {
-		const { mygetHelmetapi, pathType} = this.state;
+		const { mygetHelmetapi } = 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 />
-						{/* <Router> */}
-						<Switch>
-							{/* wiki预览 */}
-							<Route path="/:owner/:projectsId/wiki/preview/:projectName/:projectId" render={
-								(props) => {
-									return (<WikiPreview {...this.props} {...props} {...this.state} />)
-								}
-							} />
-
-							{/* 项目PR */}
-							<Route path="/:owner/:projectsId/pulls/new"
-								render={
-									(props) => (<ProjectDetail {...this.props} {...props} {...this.state} />)
-								}
-							></Route>
-
-							{/*项目*/}
-							<Route
-								path={"/:owner/:projectId/devops/:opsId/detail"}
-								render={
-									(props) => {
-										return (<OpsDetail {...this.props} {...props} {...this.state} />)
-									}
-								}>
-							</Route>
-							<Route
-								path={"/settings"}
-								render={
-									(props) => {
-										return (<Security {...this.props} {...props} {...this.state} />)
-									}
-								}>
-							</Route>
-
-							<Route
-								path="/register"
-								render={
-									(props) => {
-										return (<EducoderLogin {...this.props} {...props} {...this.state} />)
-									}
-								}
-							/>
-							{/*403*/}
-							<Route path="/403" component={Shixunauthority} />
-
-							<Route path="/500" component={http500} />
-
-							{/*404*/}
-							<Route path="/nopage" component={Shixunnopage} />
-
-							{/* 查询 */}
-							<Route path="/search" component={Search} />
-
-							<Route exact path="/explore"
-								render={
-									(props) => (
-											<ProjectIndex {...this.props} {...props} />
-									)
-								}
-							/>
-
-
-							{/* 组织 */}
-							<Route path={"/organize"}
-								render={
-									(props) => {
-										return (<OrganizeIndex {...props} {...this.props} {...this.state} />)
-									}
-								}>
-							</Route>
-							
-							{/*新建项目等*/}
-							<Route
-								path={"/projects"}
-								render={
-									(props) => {
-										return (<Projects {...this.props} {...props} {...this.state} />)
-									}
-								}>
-							</Route>
-
-							{/* 判断为用户/组织，并进入对应页面 */}
-							{
-								pathType === 'User' ?
-									<Route exact path="/:username"
-										render={
-											(props) => {
-												return (<InfosIndex {...this.props} {...this.state} />)
-											}
+						<SiderBar/>
+						<Router>
+							<Switch>
+								{/*项目*/}
+								<Route
+									path={"/projects/:owner/:projectId/devops/:opsId/detail"}
+									render={
+										(props) => {
+											return (<OpsDetail {...this.props} {...props} {...this.state} />)
+										}
+									}>
+								</Route>
+								<Route
+									path={"/settings"}
+									render={
+										(props) => {
+											return (<Security {...this.props} {...props} {...this.state} />)
+										}
+									}>
+								</Route>
+								{/*项目*/}
+								<Route
+									path={"/projects"}
+									render={
+										(props) => {
+											return (<Projects {...this.props} {...props} {...this.state} />)
+										}
+									}>
+								</Route>
+								<Route
+									path="/register"
+									render={
+										(props) => {
+											return (<EducoderLogin {...this.props} {...props} {...this.state} />)
 										}
-									/> : 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} />)
 									}
+								/>
+								{/*403*/}
+								<Route path="/403" component={Shixunauthority} />
+
+								<Route path="/500" component={http500} />
+								<Route path={"/organize"}
+									render={
+										(props) => {
+											return (<OrganizeIndex {...props} {...this.props} {...this.state} />)
+										}
+									}>
+								</Route>
+								{/*404*/}
+								<Route path="/nopage" component={Shixunnopage} />
+
+								{/* 查询 */}
+								<Route path="/search" component={Search} />
+
+								{/* 个人主页 */}
+								<Route path="/users/:username"
+									render={
+										(props) => {
+											return (<InfosIndex {...this.props} {...this.state} />)
+										}
 								}></Route>
-
-
-							<Route component={Shixunnopage} />
-						</Switch>
-						{/* </Router> */}
+								<Route exact path="/"
+									render={
+										(props) => (
+											personal && personal.length > 0 ?
+											<InfosIndex {...this.props} {...props} />
+											:
+											<ProjectIndex {...this.props} {...props} />
+										)
+									}
+								/>
+								<Route component={Shixunnopage} />
+							</Switch>
+						</Router>
 					</MuiThemeProvider>
 				</ConfigProvider>
 			</Provider>
--- a/src/AppConfig.js
+++ b/src/AppConfig.js
@ -85,10 +85,7 @@ export function initAxiosInterceptors(props) {
    }

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

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

 						}}>	{
--- a/src/common/DateUtil.js
+++ b/src/common/DateUtil.js
@ -1,5 +1,4 @@
 import moment  from "moment";
-import { number } from "prop-types";

 // 处理整点 半点
 // 取传入时间往后的第一个半点
@ -98,41 +97,3 @@ 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 "刚刚";
-}
--- a/src/common/educoder.js
+++ b/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 ,timeAgo} from './DateUtil'
+export { handleDateString, getNextHalfHourOfMoment, formatDuring, formatSeconds } from './DateUtil'

 export { configShareForIndex, configShareForPaths, configShareForShixuns, configShareForCourses, configShareForCustom } from './util/ShareUtil'

--- a/src/context/TPIContextProvider.js
+++ b/src/context/TPIContextProvider.js
@ -435,11 +435,11 @@ class TPIContextProvider extends Component {
 		image_url: "avatars/User/1"
 		login: "innov"
 		name: "Coder"
-		user_url: "/innov"
+		user_url: "/users/innov"
 		 */
 		let user = resData.user;
 		user.username = resData.user.name;
-		user.user_url = `/${resData.user.login}`;
+		user.user_url = `/users/${resData.user.login}`;
 		// user.image_url = resData.image_url;
 		user.is_teacher = resData.is_teacher;
 		resData.user = user;
--- a/src/forge/Activity/ActivityItem.js
+++ b/src/forge/Activity/ActivityItem.js
@ -14,25 +14,25 @@ class ActivityItem extends Component {
          {/* 如果是版本发布 */}
          {item.trend_type === "VersionRelease" ?
          <p className="itemLine">
-            <Link to={`/${owner}/${projectsId}/releases`} className="color-blue font-16">{item.name}</Link>
+            <Link to={`/projects/${owner}/${projectsId}/version`} 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={`/${owner}/${projectsId}/issues/${item.trend_id}`} className="color-blue font-16">{item.name}</Link>
+              <Link to={`/projects/${owner}/${projectsId}/issues/${item.trend_id}/detail`} className="color-blue font-16">{item.name}</Link>
              <span className="activity_type">{item.trend_type}</span>
            </p >
            :
            // 如果是合并请求
            <p className="itemLine">
-              <Link to={`/${owner}/${projectsId}/pulls/${item.trend_id}/Messagecount`} className="color-blue font-16">{item.name}</Link>
+              <Link to={`/projects/${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={`/${item && item.user_login}`} className="show-user-link">
+            <Link to={`/users/${item && item.user_login}`} className="show-user-link">
              <img alt="" src={getImageUrl(`/${item.user_avatar}`)} className="createImage" />
              <span className="mr20">{item.user_name}</span>
            </Link>
--- a/src/forge/Branch/CloneAddress.js
+++ b/src/forge/Branch/CloneAddress.js
@ -1,10 +1,16 @@
 import React, { useState } from 'react';
-import { Menu } from 'antd';
+import { Dropdown, Menu, Tooltip } 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"}}>
@ -14,7 +20,9 @@ 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} />
-          <CopyTool inputId="copy_rep_content" className="copytool"/>
+          <Tooltip title="复制链接">
+            <span className="color-blue" onClick={jsCopy}><i className="iconfont icon-fuzhi"></i></span>
+          </Tooltip>
        </div>
      </div>
      <Menu className="edu-txt-center">
--- a/src/forge/Branch/branch.scss
+++ b/src/forge/Branch/branch.scss
@ -102,7 +102,4 @@
      border-color:transparent ;
    }
  }
-}
-.copytool{
-  margin:0px 10px;
 }
--- a/src/forge/Component/AddGroup.jsx
+++ b/src/forge/Component/AddGroup.jsx
@ -55,7 +55,6 @@ function AddGroup({organizeId,getGroupID}){

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

  return(
--- a/src/forge/Component/Contributors.jsx
+++ b/src/forge/Component/Contributors.jsx
@ -52,8 +52,8 @@ function Contributors({contributors,owner,projectsId}){
        <Spin spinning={isSpin}>
          <FlexAJ>
            <AlignCenter>
-              <Link to={`/${data.login}`}><img src={getImageUrl(`/${data.image_url}`)} alt="" className="radius" width="38px" height="38px"/></Link>
-              <Link to={`/${data.login}`} className="ml10">{data.name}</Link>
+              <Link to={`/users/${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>
            </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={`/${owner}/${projectsId}/contribute`}>全部</Link>
+        <Link className="font-12 color-grey-9" to={`/projects/${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={`/${item.login}`}>
+                <Link key={key} to={`/users/${item.login}`}>
                  <img src={getImageUrl(`/${item.image_url}`)} alt="" onMouseOver={()=>setVisibleFunc(true,item.login,key)}/>
                </Link>
              </Popover>
--- a/src/forge/Component/CopyTool.jsx
+++ b/src/forge/Component/CopyTool.jsx
@ -1,50 +0,0 @@
-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);
--- a/src/forge/Component/DeleteModal/Index.jsx
+++ b/src/forge/Component/DeleteModal/Index.jsx
@ -1,7 +1,7 @@
 import React from 'react';
 import { AlignCenter } from '../layout';
-import { Button } from 'antd';
-import Modals from '../PublicModal/Index';
+import { Modal , Button } from 'antd';
+import './Index.scss';

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

--- a/src/forge/Component/EAccount.scss
+++ b/src/forge/Component/EAccount.scss
@ -1,6 +1,6 @@
 .ant-modal-mask{
-  z-index: 1031;
+  z-index: 1001;
 }
 .ant-modal-wrap{
-  z-index: 1032;
+  z-index: 1002;
 }
--- a/src/forge/Component/MemberCards.jsx
+++ b/src/forge/Component/MemberCards.jsx
@ -45,15 +45,15 @@ const Div = styled.div`{
 export default (({ user , img, name, time, focusStatus, is_current_user, login , successFunc }) => {
  return (
    <Div>
-      <Link to={`/${user && user.login}`}><Img src={getImageUrl(`/${img}`)} /></Link>
+      <Link to={`/users/${user && user.login}`}><Img src={getImageUrl(`/${img}`)} /></Link>
      <div className="m-infos">
-        <Link to={`/${user && user.login}`}><Name>{name}</Name></Link>
+        <Link to={`/users/${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} notReset={true}/>
+          <FocusButton is_watch={focusStatus} id={login} successFunc={successFunc}/>
        }
      </div>
    </Div>
--- a/src/forge/Component/ProfileModal/Index.jsx
+++ b/src/forge/Component/ProfileModal/Index.jsx
@ -1,72 +0,0 @@
-import React , { useEffect , useState } from 'react';
-import Modals from '../PublicModal/Index';
-import { Button } from 'antd';
-import axios from 'axios';
-
-import ProfileImg from './images/profile.png';
-import './Index.scss';
-
-function ProfileModal({visible,onCancel,history}) {
-  const [ modalVis , setModalVis ] = useState(visible);
-  const [ addMemberCheck , setAddMemberCheck ] = useState(false);
-
-  useEffect(()=>{
-    axios.interceptors.response.use((response) => {
-      if (response && (response.data.status === 411 || response.data.status === 412)) {
-        setModalVis(true);
-        if(response.data.status === 412){
-          setAddMemberCheck(true);
-        }
-      }
-      return response;
-      }, (error) => {
-    });
-  },[])
-
-  useEffect(()=>{
-    setModalVis(visible);
-  },[visible])
-  
-  function onOk(){
-    onCancel();
-    setModalVis(false);
-    setTimeout(function(){
-      window.open(`/settings/profile`,"_blank");
-    },200)
-  }
-
-  function onNo() {
-    onCancel();
-    setModalVis(false);
-  }
-
-  return(
-    <Modals 
-      title="完善资料" 
-      onCancel={onNo} 
-      visible={modalVis}
-      btn={
-        addMemberCheck?
-        <div>
-          <Button type={'primary'} size={"large"} onClick={onNo}>好的</Button>
-        </div>
-        :
-        <div>
-          <Button size={"large"} onClick={onNo}>暂不补充</Button>
-          <Button type={'primary'} size={"large"} onClick={onOk}>好的</Button>
-        </div>
-      }  
-    >
-      <div className="contents">
-        <img src={ProfileImg} alt=""/> 
-        {
-          addMemberCheck ?
-          <p>目标用户个人资料不完整，需提醒目标用户补充资料后以进行后续操作</p>
-          :
-          <p>您目前的个人资料不完整，需要补充资料以进行后续操作。是否前往补充个人信息？</p>
-        }
-      </div>
-    </Modals>
-  )
-}
-export default ProfileModal;
--- a/src/forge/Component/ProfileModal/Index.scss
+++ b/src/forge/Component/ProfileModal/Index.scss
@ -1,18 +0,0 @@
-.contents{
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin:10px auto 0px;
-  img{
-    margin-right: 13px;
-    width: 44px;
-  }
-  p{
-    line-height: 29px;
-    max-width: 327px;
-    font-size: 16px!important;
-  }
-}
-.font-44{
-  font-size: 44px!important;
-}
--- a/src/forge/Component/ProfileModal/Profile.jsx
+++ b/src/forge/Component/ProfileModal/Profile.jsx
@ -1,17 +0,0 @@
-import React from 'react';
-
-function Profile({children,sureFunc,showCompeleteDialog , completeProfile, className}) {
-
-  function checkProfile() {
-    if(!completeProfile){
-      showCompeleteDialog && showCompeleteDialog();
-    }else{
-      sureFunc();
-    }
-  }
-
-  return(
-    <a className={className} onClick={checkProfile}>{children}</a>
-  )
-}
-export default Profile;
--- a/src/forge/Component/ProfileModal/images/profile.png
+++ b/src/forge/Component/ProfileModal/images/profile.png
--- a/src/forge/Component/PublicModal/Index.jsx
+++ b/src/forge/Component/PublicModal/Index.jsx
@ -1,20 +0,0 @@
-import React from 'react';
-import { Modal } from 'antd';
-import './Index.scss';
-
-function Modals({title,children,btn,onCancel,visible}) {
-  return(
-    <Modal
-      visible={visible}
-      onCancel={onCancel}
-      title={title}
-      width={"520px"}
-      footer={btn}
-      centered={true}
-      wrapClassName={"deleteBox"}
-    >
-      {children}
-    </Modal>
-  )
-}
-export default Modals;
--- a/src/forge/Component/PublicModal/Index.scss
+++ b/src/forge/Component/PublicModal/Index.scss
@ -1,75 +0,0 @@
-.deleteBox{
-  z-index: 1033;
-  .ant-modal-close-x{
-    font-size: 17px!important;
-  }
-  .ant-modal-header{
-    background-color: #f8f8f8;
-    padding:10px 30px;
-    .ant-modal-title{
-      text-align: left;
-      font-size: 16px;
-      font-weight: bold;
-    }
-  }
-  .ant-modal-close{
-    top:0px !important;
-    font-size: 24px !important;
-  }
-  .ant-modal-body{
-    padding:30px 50px;
-    p{
-      font-size: 14px;
-      line-height: 26px;
-      color:#666;
-      word-break: break-all;
-    }
-    .desc{
-      .descMain{
-        align-items: center;
-        justify-content: center;
-        font-size: 20px;
-        margin-bottom: 10px;
-        i.red{
-          color:#DF0002;
-        }
-      }
-    }
-  }
-  .ant-modal-footer{
-    border-top: none;
-    text-align: center;
-    padding-bottom: 40px;
-    button,a{
-      width: 96px;
-      height: 32px;
-      margin:0px 20px;
-      font-weight: 400;
-      font-size: 14px;
-      &.ant-btn{
-        border-color: #D0D0D0;
-        color: #666;
-        &:hover,&:active,&:focus{
-          background: #f3f4f6;
-        }
-      }
-      &.ant-btn-danger{
-        background-color: #fff;
-        color: #DF0002;
-        border-color: #D0D0D0;
-        &:hover,&:active,&:focus{
-          border-color: #DF0002;
-          background-color: #fff;
-        }
-      }
-      &.ant-btn.ant-btn-primary{
-        background-color: #466AFF;
-        color: #fff;
-        border-color: #466AFF;
-        &:hover,&:focus,&:active{
-          background-color: rgba(70,106,255,0.85);
-        }
-      }
-    }
-  }
-}
--- a/src/forge/Component/Releases.jsx
+++ b/src/forge/Component/Releases.jsx
@ -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={`/${owner}/${projectsId}/releases`}>全部</Link>
+          <Link className="font-12 color-grey-9" to={`/projects/${owner}/${projectsId}/releases`}>全部</Link>
          : 
-          baseOperate && <Link className="font-12 color-blue" to={`/${owner}/${projectsId}/releases/new`}>新建</Link>
+          baseOperate && <Link className="font-12 color-blue" to={`/projects/${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={`/${owner}/${projectsId}/releases`}>{item.name}</Link>
+                  <Link to={`/projects/${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>
--- a/src/forge/Component/User.jsx
+++ b/src/forge/Component/User.jsx
@ -20,7 +20,7 @@ export default ({ url , name , column  , id , login })=>{
  `;
  return(
    id?
-    <Link to={`/${login}`}>
+    <Link to={`/users/${login}`}>
      <Img>
        { url && <img src={url} alt=""/> }
        <span>{name}</span>
--- a/src/forge/DevOps/About.jsx
+++ b/src/forge/DevOps/About.jsx
@ -149,7 +149,7 @@ function About(props, ref) {
    axios.post(url).then(result=>{
      setIsSpining(false);
      if(result && result.data.status === 0){
-        props.history.push(`/${owner}/${projectsId}/devops`);
+        props.history.push(`/projects/${owner}/${projectsId}/devops/dispose`);
        // 需要将顶部的open_devops修改
        let { changeOpenDevops } = props;
        changeOpenDevops && changeOpenDevops(true);
--- a/src/forge/DevOps/Dispose.jsx
+++ b/src/forge/DevOps/Dispose.jsx
@ -96,7 +96,7 @@ function Dispose(props){
          setVisible(false);
          if(result && result.data){
            props.showNotification("流水线新增成功，请进行工作流配置！");
-            props.history.push(`/${owner}/${projectsId}/devops/${result.data.id}`);
+            props.history.push(`/projects/${owner}/${projectsId}/devops/dispose/${result.data.id}`);
          }else{
            props.showNotification("流水线新增失败，请稍后再试！");
          }
@ -134,12 +134,12 @@ function Dispose(props){

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

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

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

  function clickRows(event,e){
-    props.history.push(`/${owner}/${projectsId}/devops/${e.number}/detail`);
+    props.history.push(`/projects/${owner}/${projectsId}/devops/${e.number}/detail`);
  }
  const column = [
    {
@ -290,7 +290,7 @@ function Structure(props,ref){
      <Banner>
        <FlexAJ>
          <span>构建列表</span>
-          <Link to={`/${owner}/${projectsId}/devops`} className="font-15 color-grey-9">返回</Link>
+          <Link to={`/projects/${owner}/${projectsId}/devops/dispose`} className="font-15 color-grey-9">返回</Link>
        </FlexAJ>
      </Banner>
      <Div>
--- a/src/forge/DevOps/disposePipeline.jsx
+++ b/src/forge/DevOps/disposePipeline.jsx
@ -275,7 +275,7 @@ function disposePipeline(props){
      ...params
    }).then(result=>{
      if(result){
-        props.history.push(`/${owner}/${projectsId}/devops`);
+        props.history.push(`/projects/${owner}/${projectsId}/devops/dispose`);
      }
      setLoading(false);
    }).catch(error=>{
--- a/src/forge/DevOps/opsDetail.jsx
+++ b/src/forge/DevOps/opsDetail.jsx
@ -48,7 +48,7 @@ export default (props) => {
      axios.post(url).then((result) => {
        if (result && result.data) {
          props.showNotification("工作流正在重新构建！");
-          props.history.push(`/${owner}/${projectId}/devops/${result.data.number}/detail`);
+          props.history.push(`/projects/${owner}/${projectId}/devops/${result.data.number}/detail`);
        }
      })
      .catch((error) => {
@ -87,7 +87,7 @@ export default (props) => {
          </AlignCenter>
          <Link
            style={{ color: "#ddd" }}
-            to={`/${owner}/${projectId}/devops`}
+            to={`/projects/${owner}/${projectId}/devops/dispose`}
          >
            <i className="iconfont icon-yiguanbi font-15 mr5"></i>退出
          </Link>
--- a/src/forge/Divert/DivertModal.jsx
+++ b/src/forge/Divert/DivertModal.jsx
@ -41,19 +41,15 @@ function DivertModal({form , visible , onSuccess , onCancel,owner,repo}){
  // 确认转移
  function onOk(){
    validateFields((error,values)=>{
+      console.log(...values);
      if(!error){
        const url = `/${owner}/${repo}/applied_transfer_projects.json`;
        Axios.post(url,{
          ...values
        }).then(result=>{
          if(result){
-            if(result.data.status === 0){
-              onSuccess(result.data && result.data.owner);
-            }else{
-              onSuccess();
-            }
+            onSuccess(result.data && result.data.owner);
          }
-
        }).catch(error=>{})
      }
    })
@ -108,7 +104,7 @@ function DivertModal({form , visible , onSuccess , onCancel,owner,repo}){
          </ul>
          :
          <ul className="descUl">
-            <li>仓库仅可以转移到您具有管理权限的组织中</li>
+            <li>仓库仅可以转移到您已经加入的组织中，不可以转移到未加入的组织中</li>
            <li>涉及到仓库改名操作，请提前做好仓库备份并且在转移后对本地仓库的remote进行修改</li>
            <li>转移仓库到组织后，你和组织创建者/管理员同时拥有对该仓库的管理操作</li>
          </ul>
--- a/src/forge/Head/AddProjectModal.jsx
+++ b/src/forge/Head/AddProjectModal.jsx
@ -1,7 +1,6 @@
 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)=>{
@ -78,7 +77,7 @@ export default Form.create()(
            </Form.Item>
          </Form>
        </Modal>
-        <CheckProfile {...props} sureFunc={()=>setVisible(true)}>加入项目</CheckProfile>
+        <a onClick={()=>setVisible(true)}>加入项目</a>
      </React.Fragment>
    )
  })
--- a/src/forge/Head/Header.js
+++ b/src/forge/Head/Header.js
@ -10,7 +10,6 @@ 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.$
@ -223,15 +222,6 @@ class NewHeader extends Component {
      }
    }
  }
-  
-  checkProfile=(url)=>{
-    const { showCompeleteDialog , completeProfile } = this.props;
-    if(!completeProfile){
-      showCompeleteDialog && showCompeleteDialog();
-    }else{
-      window.location.href(url);
-    }
-  }

  addMenu=(list)=>{
    return(
@ -241,16 +231,11 @@ class NewHeader extends Component {
          {
            list.map((item,key)=>{
              return(
-                (item.name !=="加入课堂" && item.name !=="加入开发项目") && 
-                <Menu.Item key={item.name+key}>
-                  <CheckProfile {...this.props} sureFunc={()=>{window.location.href=item.url}}>{item.name}</CheckProfile>
-                </Menu.Item>
+                (item.name !=="加入课堂" && item.name !=="加入开发项目") && <Menu.Item key={item.name+key}><a href={item.url}>{item.name}</a></Menu.Item>
              )
            })
          }
-          <Menu.Item>
-            <AddProjectModal {...this.props} showNotification={this.props.showNotification}/>
-          </Menu.Item>
+          <Menu.Item><AddProjectModal showNotification={this.props.showNotification}/></Menu.Item>
        </Menu>
      </div>
    )
@ -260,7 +245,7 @@ class NewHeader extends Component {
    return(
      <Menu className="currentMenu">
        <Menu.Item>
-          <span className="currentName" title={current_user && current_user.username}>{current_user && current_user.username}</span>
+          <span title={current_user && current_user.username}>{current_user && current_user.username}</span>
        </Menu.Item>
          {
            personal && personal.length > 0 && personal.map((item,key)=>{
@ -269,7 +254,7 @@ class NewHeader extends Component {
              )
            })
          }
-          <li><Link to={`/settings/profile`}>设置</Link></li>
+          <li><Link to={`/settings/SSH`}>设置</Link></li>
        <Menu.Item><a onClick={() => this.educoderloginysl()}>退出</a></Menu.Item>
      </Menu>
    )
@ -362,7 +347,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">
@ -400,16 +385,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, user_login + "/courses")
+                          new_link = new_link.replace(/courses/g, "users/" + user_login + "/courses")
                        } else if (new_link.indexOf("contests") > -1) {
-                          new_link = new_link.replace(/contests/g, user_login + "/contests")
+                          new_link = new_link.replace(/contests/g, "users/" + user_login + "/contests")
                        }
                      } else {
                        is_hidden = true
                      }
                    }
                    if (user_login && (new_link && new_link.indexOf("homes") > -1)) {
-                      new_link = new_link.replace(/homes/g, user_login + "/user_activities")
+                      new_link = new_link.replace(/homes/g, "users/" + user_login + "/user_activities")
                    }
                    
                    var waiLian = (new_link && str.filter(item=>new_link.indexOf(item)>-1) );
@ -427,7 +412,7 @@ class NewHeader extends Component {
          </div>
          <div className="head-right">
            {/* {search_url ? this.SearchInput(openSearch,search_url):""} */}
-            { search_url && <HeadSearch {...this.props}/>}
+            <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">
@ -457,7 +442,7 @@ class NewHeader extends Component {
            </span>
            :
            <Dropdown placement={`bottomRight`} overlay={this.renderMenu(settings && settings.personal)}>
-              <a href={`/${this.props.current_user  && this.props.current_user.login}`}>
+              <a href={`/users/${this.props.current_user  && this.props.current_user.login}`}>
                <img alt="头像" src={getImageUrl(`/${user.image_url}`)} className="currentImg"></img>
              </a>
            </Dropdown>
--- a/src/forge/Head/header.scss
+++ b/src/forge/Head/header.scss
@ -30,13 +30,6 @@
  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;
--- a/src/forge/Index.js
+++ b/src/forge/Index.js
@ -12,9 +12,8 @@ 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({
@ -22,23 +21,21 @@ const ProjectIndex = Loadable({
  loading: Loading,
 });

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

 class Index extends Component {

-  componentDidUpdate = () => {
-    this.props.history.listen(() => {
+  componentDidUpdate=()=>{
+    this.props.history.listen(()=>{
      if (document.body.scrollTop || document.documentElement.scrollTop > 0) {
        window.scrollTo(0, 0)
      }
    })
  }
  render() {
-    
    return (
      <div className="newMain clearfix">
        <Switch {...this.props}>
@ -55,24 +52,23 @@ class Index extends Component {
            )}
          ></Route>
          <Route
-            path="/projects/mirror/new"
+            path="/projects/new"
            render={(props) => (
              <ProjectNew {...this.props} {...props} />
            )}
          ></Route>
-          {/* <Route
-            path="/:owner/:projectsId"
+          <Route
+            path="/projects/:owner/:projectsId"
            render={(props) => (
              <ProjectDetail {...this.props} {...props} />
            )}
-          ></Route> */}
+          ></Route>
          <Route
-            path="/explore"
+            path="/projects"
            render={(props) => (
              <ProjectIndex {...this.props} {...props} />
            )}
          ></Route>
-
          <Route
            path="/"
            render={(props) => (
@ -90,10 +86,3 @@ export default withRouter(
    parentSelector: ".newMain",
  })(CNotificationHOC()(SnackbarHOC()(TPMIndexHOC(Index))))
 );
-
-// export default withRouter(
-//   ImageLayerOfCommentHOC({
-//     imgSelector: ".imageLayerParent img, .imageLayerParent .imageTarget",
-//     parentSelector: ".newMain",
-//   })(Index)
-// );
--- a/src/forge/Main/CoderDepot.jsx
+++ b/src/forge/Main/CoderDepot.jsx
@ -20,7 +20,6 @@ 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时不支持在线创建、在线上传、在线修改、在线删除、创建合并请求等功能)
 */
@ -113,7 +112,7 @@ function CoderDepot(props){
  useEffect(()=>{
    if (projectsId && owner && defaultBranch){
      let b = turnbar(branchName) ;
-      if(pathname.indexOf(`/${owner}/${projectsId}`) > -1 && pathname.indexOf(`/tree/${b}/`) > -1) {
+      if(pathname.indexOf(`/projects/${owner}/${projectsId}`) > -1 && pathname.indexOf(`/tree/${b}/`) > -1) {
        let url = pathname.split(`/tree/${b}/`)[1];
        setTreeValue(url);
        getFileInfo(url,branchName);
@ -148,7 +147,6 @@ 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);})
@ -200,7 +198,7 @@ function CoderDepot(props){
  // 切换分支或者标签
  function changeBranch(value){
    let checkvalue = turnbar(value);
-    let url = `/${owner}/${projectsId}${value && `/tree/${checkvalue}`}${treeValue ? `/${treeValue}`:""}`;
+    let url = `/projects/${owner}/${projectsId}${value && `/tree/${checkvalue}`}${treeValue ? `/${treeValue}`:""}`;
    props.history.push(url);
  }
    
@ -210,12 +208,8 @@ function CoderDepot(props){
    let checkvalue = turnbar(b);
    return (
    <Menu>
-      <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.Item><a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/${checkvalue}/uploadfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>上传文件</a></Menu.Item>
+      <Menu.Item><a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/${checkvalue}/newfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>新建文件</a></Menu.Item>
    </Menu>
    )
  }
@ -234,12 +228,12 @@ function CoderDepot(props){
    setTreeValue(undefined);
    let branch = branchName || defaultBranch;
    let checkvalue = turnbar(branch);
-    props.history.push(`/${owner}/${projectsId}/tree/${checkvalue}`);
+    props.history.push(`/projects/${owner}/${projectsId}/tree/${checkvalue}`);
  };
  // 子目录路径返回链接
  function returnUlr(url){
    let enBranch = turnbar(branchName);
-    props.history.push(`/${owner}/${projectsId}/tree${enBranch?`/${enBranch}`:""}/${url}`);
+    props.history.push(`/projects/${owner}/${projectsId}/tree${enBranch?`/${enBranch}`:""}/${url}`);
  }
  // 点击跳转到子目录
  function goToSubRoot(path,type,filename){
@ -247,7 +241,7 @@ function CoderDepot(props){
      let enBranch = branchName || defaultBranch;
      let checkvalue = turnbar(enBranch);
      setType(type);
-      props.history.push(`/${owner}/${projectsId}${`/tree/${checkvalue}`}${path?`/${path}`:""}`);
+      props.history.push(`/projects/${owner}/${projectsId}${`/tree/${checkvalue}`}${path?`/${path}`:""}`);
    }
  }

@ -259,7 +253,7 @@ function CoderDepot(props){
    //点击直接跳转页面 加载一次路由
    let enBranch = branchName || defaultBranch;
    let checkvalue = turnbar(enBranch);
-    props.history.push(`/${owner}/${projectsId}/tree/${checkvalue}/${path}`);
+    props.history.push(`/projects/${owner}/${projectsId}/tree/${checkvalue}/${path}`);
    setType("file");
    setEditReadme(true);
  };
@ -351,13 +345,13 @@ function CoderDepot(props){
                        }
                      </div>
                      <AlignCenter className="mr20">
-                        <Link to={`/${owner}/${projectsId}/branches`} className="color-grey-9">
+                        <Link to={`/projects/${owner}/${projectsId}/branchs`} 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={`/${owner}/${projectsId}/tags`} className="color-grey-9">
+                        <Link to={`/projects/${owner}/${projectsId}/tag`} 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>
@ -369,11 +363,11 @@ function CoderDepot(props){
                        <div className="mr20 addOptionBtn">
                          {
                            projectDetail.type !== 2 && pullsFlag &&
-                            <CheckProfile {...props} sureFunc={()=>urlLink(`/${owner}/${projectsId}/pulls/new`)} >+ 合并请求</CheckProfile>
+                            <a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/pulls/new`)} >+ 合并请求</a>
                          }
                          {
                            issuesFlag &&
-                            <CheckProfile {...props} sureFunc={()=>urlLink(`/${owner}/${projectsId}/issues/new`)} >+ 任务</CheckProfile>
+                            <a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/issues/new`)} >+ 任务</a>
                          }
                        </div>
                      }
@ -389,7 +383,7 @@ function CoderDepot(props){
                    </AlignCenter>
                  </FlexAJ>
                  {
-                    (dirInfo && dirInfo.length>0) || fileInfo ?
+                    dirInfo || fileInfo ?
                    <div className="listtable">
                      {
                        lastCommit &&
@ -401,7 +395,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={`/${owner}/${projectsId}/commits/branch/${turnbar(branchName || defaultBranch)}`} className="ml12 color-grey-9">
+                          { commitCount ? <Link to={`/projects/${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>
@ -447,7 +441,7 @@ function CoderDepot(props){
                    : ""
                  }
                  {
-                    (dirInfo && dirInfo.length === 0) && !fileInfo ? <Nodata _html="暂未发现文件"/> :""
+                    (dirInfo && dirInfo.length === 0) && (fileInfo && fileInfo.length === 0) ? <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} /> :"" }
@ -459,10 +453,7 @@ 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" || projectDetail.permission==="Manager") && 
-                          <i onClick={()=>setOpenModal(true)} className="iconfont icon-anquanshezhi color-grey-9 font-15"></i>
-                        }
+                        {projectDetail.permission && (projectDetail.permission==="Admin" || projectDetail.permission==="Owner") && <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>}
                      {
@ -520,11 +511,11 @@ function CoderDepot(props){
                    }
                    {/* 贡献者 */}
                    {
-                      projectDetail && projectDetail.contributors && projectDetail.contributors.length >0 && 
+                      projectDetail && projectDetail.contributors &&
                      <Contributors contributors={projectDetail && projectDetail.contributors} owner={owner} projectsId={projectsId} />
                    }
                    {/* 语言 */}
-                    { projectDetail && projectDetail.languages && projectDetail.languages.length >0 &&
+                    { projectDetail && projectDetail.languages && 
                      <React.Fragment>
                        <Divider />
                        <LanguagePower languages={projectDetail.languages}/>
--- a/src/forge/Main/CoderDepotCatalogue.jsx
+++ b/src/forge/Main/CoderDepotCatalogue.jsx
@ -17,7 +17,7 @@ function CoderDepotCatalogue({item , goToSubRoot , owner , projectsId }){
        </a>
      </span>
      <span title="init project">
-        <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.commit && item.commit.sha}`)}`} title={item.commit && item.commit.message}>
+        <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.commit && item.commit.sha}`)}`} title={item.commit && item.commit.message}>
          {item.commit && item.commit.message}
        </Link>
      </span>
--- a/src/forge/Main/CoderRootBranch.js
+++ b/src/forge/Main/CoderRootBranch.js
@ -38,9 +38,9 @@ export default ((props)=>{
              return(
                <li key={key}>
                  <div>
-                    <Link to={`/${owner}/${projectsId}/tree/${turnbar(item.name)}`} className="color-blue font-15" style={{"maxWidth":"100px"}}>{item.name}</Link>
+                    <Link to={`/projects/${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={`/${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={`/projects/${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={`/${owner}/${projectsId}/pulls/new/${item.name}`} className="mr20 color-blue mr30">创建合并请求</Link>
+                      <Link to={`/projects/${owner}/${projectsId}/pulls/new/${item.name}`} className="mr20 color-blue mr30">创建合并请求</Link>
                    }
                    <Dropdown overlay={menu(item.zip_url,item.tar_url)} trigger={['click']} placement="bottomRight" className="color-green-file">
                      <a className="ant-dropdown-link">
--- a/src/forge/Main/CoderRootCommit.js
+++ b/src/forge/Main/CoderRootCommit.js
@ -101,7 +101,7 @@ class CoderRootCommit extends Component{
  // 切换分支 search:tag为根据标签搜索
  changeBranch=(value)=>{
    const { projectsId , owner } = this.props.match.params;
-    this.props.history.push(`/${owner}/${projectsId}/commits/branch/${value}`);
+    this.props.history.push(`/projects/${owner}/${projectsId}/commits/branch/${value}`);
  }

  ChangePage=(page)=>{
@ -141,13 +141,13 @@ class CoderRootCommit extends Component{
                    return(
                      <div key={k}>
                        <AlignTop>
-                          <Link to={`/${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="commitDesc">{item.message}</Link>
+                          <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitKey" style={{marginLeft:0,marginTop:"3px"}}>{truncateCommitId(`${item.sha}`)}</Link>
+                          <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitDesc">{item.message}</Link>
                        </AlignTop>
                        <p className="f-wrap-alignCenter mt15">
                          {
                            item.id ?
-                            <Link to={`/${item.login}`} className="show-user-link">
+                            <Link to={`/users/${item.login}`} className="show-user-link">
                              {item.image_url?<img src={getImageUrl(`/${item.image_url}`)} alt="" width="28px" height="28px" className="mr15 radius"/>:""}
                              <label className="font-14 color-grey-6" style={{verticalAlign:'middle'}}>{item.name ?`${item.name}:`:""}提交于 {item.time_from_now}</label>
                            </Link>:
--- a/src/forge/Main/CoderRootFileDetail.js
+++ b/src/forge/Main/CoderRootFileDetail.js
@ -149,7 +149,7 @@ class CoderRootFileDetail extends Component {
      .then((result) => {
        if (result) {
          this.props.showNotification("删除成功!");
-          this.props.history.push(`/${owner}/${projectsId}`);
+          this.props.history.push(`/projects/${owner}/${projectsId}`);
        }
      })
      .catch((error) => {
--- a/src/forge/Main/CoderRootIndex.js
+++ b/src/forge/Main/CoderRootIndex.js
@ -87,57 +87,57 @@ class CoderRootIndex extends Component{
        <Top {...this.props} {...this.state}/>
        <Switch {...this.props}>
          {/* 新建文件 */}
-          <Route path="/:owner/:projectsId/:branch/newfile/:path"
+          <Route path="/projects/:owner/:projectsId/:branch/newfile/:path"
            render={
              (props) => (<FileNew {...this.props} {...props} {...this.state} />)
            }
          ></Route>
-          <Route path="/:owner/:projectsId/:branch/uploadfile"
+          <Route path="/projects/:owner/:projectsId/:branch/uploadfile"
            render={
              (props) => (<UploadFile {...this.props} {...props} {...this.state} />)
            }
          ></Route>
-          <Route path="/:owner/:projectsId/:branch/newfile"
+          <Route path="/projects/:owner/:projectsId/:branch/newfile"
            render={
              (props) => (<FileNew {...this.props} {...props} {...this.state} getTopCount={this.getTopCount} />)
            }
          ></Route>
-          <Route path="/:owner/:projectsId/commits/branch/:branchName"
+          <Route path="/projects/:owner/:projectsId/commits/branch/:branchName"
            render={
              () => (<CoderRootCommit {...this.props} {...this.state} commit_class="main" getTopCount={this.getTopCount}  />)
            }
          ></Route>
-          <Route path="/:owner/:projectsId/commits/:sha"
+          <Route path="/projects/:owner/:projectsId/commits/:sha"
            render={
              (props) => (<Diff {...this.props} {...props} {...this.state}/>)
            }
          ></Route>
-          <Route path="/:owner/:projectsId/commits"
+          <Route path="/projects/:owner/:projectsId/commits"
            render={
              () => (<CoderRootCommit {...this.props} {...this.state} commit_class="main" getTopCount={this.getTopCount}  />)
            }
          ></Route>
-          <Route path="/:owner/:projectsId/releases/:versionId/update"
+          <Route path="/projects/:owner/:projectsId/releases/:versionId/update"
            render={
              (props) => (<CoderRootVersionUpdate {...this.props} {...this.state} {...props} />)
            }
          ></Route>
-          <Route path="/:owner/:projectsId/releases/new"
+          <Route path="/projects/:owner/:projectsId/releases/new"
            render={
              () => (<CoderRootVersionNew {...this.props} {...this.state} />)
            }
          ></Route>
-          <Route path="/:owner/:projectsId/releases"
+          <Route path="/projects/:owner/:projectsId/releases"
            render={
              () => (<CoderRootVersion {...this.props} {...this.state} />)
            }
          ></Route>
-          <Route path="/:owner/:projectsId/tags"
+          <Route path="/projects/:owner/:projectsId/tag"
            render={
              () => (<CoderRootTag {...this.props} {...this.state} />)
            }
          ></Route>
-          <Route path="/:owner/:projectsId/branches"
+          <Route path="/projects/:owner/:projectsId/branchs"
            render={
              () => (<CoderRootBranch {...this.props} {...this.state} />)
            }
--- a/src/forge/Main/CoderRootTag.js
+++ b/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={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.id}`)}`} className="commitKey" style={{ "marginLeft": 0 }}>{truncateCommitId(`${item.id}`)}</Link>
+                          <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.id}`)}`} className="commitKey" style={{ "marginLeft": 0 }}>{truncateCommitId(`${item.id}`)}</Link>
                        </span>
                        <span className="ul_tbody_forth">
                          <a href={item.tarball_url} style={{ color: "#4CC1DA" }} className="mr30"><i className="iconfont icon-TAR font-18 mr5"></i>TAR</a>
--- a/src/forge/Main/Detail.js
+++ b/src/forge/Main/Detail.js
@ -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'),
-  loading: Loading,
+	loader: () => import('./CoderRootCommit'),
+	loading: Loading,
 })
 const CoderDepot = Loadable({
-  loader: () => import('./CoderDepot'),
-  loading: Loading,
+	loader: () => import('./CoderDepot'),
+	loading: Loading,
 })

 const TrendsIndex = Loadable({
@ -127,40 +127,30 @@ 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 !== `/${owner}/${projectsId}`) {
-    let url = pathname.split(`/${owner}/${projectsId}`)[1] || '';
-    if (url.indexOf("/about") > -1) {
-      name = "about"
-    } else if (url.indexOf("/issues") > -1 || url.indexOf("Milepost") > 0) {
+  if(pathname && pathname !== `/projects/${owner}/${projectsId}`){
+    let url = pathname.split(`/projects/${owner}/${projectsId}`)[1];
+    if(url.indexOf("/about")>-1){
+      name="about"
+    }else if(url.indexOf("/issues")>-1 ||url.indexOf("Milepost") > 0){
      name = "issues";
-    } else if (url.indexOf("/pulls") > -1) {
-      name = "pulls"
-    } else if (url.indexOf("/milestones") > -1) {
-      name = "milestones"
-    } else if (url.indexOf("/activity") > -1) {
-      name = "activity"
-    } else if (url.indexOf("/settings") > -1) {
-      name = "settings"
-    } else if (url.indexOf(`/devops`) > -1) {
-      name = "devops"
-    } else if (url.indexOf(`/source`) > -1) {
-      name = "source"
-    } else if (url.indexOf(`/wiki`) > -1) {
-      name = "wiki"
+    }else if(url.indexOf("/pulls")>-1){
+      name="pulls"
+    }else if(url.indexOf("/milestones")>-1){
+      name="milestones"
+    }else if(url.indexOf("/activity")>-1){
+      name="activity"
+    }else if(url.indexOf("/setting")>-1){
+      name="setting"
+    }else if(url.indexOf(`/devops`)>-1){
+      name="devops"
+    }else if(url.indexOf(`/source`)>-1){
+      name="source"
    }
  }
  return name;
@ -183,15 +173,15 @@ class Detail extends Component {
      branchs: undefined,
      branchList: undefined,
      project: null,
-      firstSync: false,
-      secondSync: false,
-      open_devops: false,
-      forkSpin: false,
+      firstSync:false,
+      secondSync:false,
+      open_devops:false,
+      forkSpin:false,
      // 默认分支
-      defaultBranch: undefined,
+      defaultBranch:undefined,

      // 非本平台项目
-      platform: false
+      platform:false
    }
  }

@ -208,38 +198,36 @@ 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,
-          platform: result.data.platform && result.data.platform !== 'educoder'
+          open_devops:result.data.open_devops,
+          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,
-              firstSync: false
+              secondSync:true,
+              firsrtSync:false
            })
-          } else {
+          }else{
            this.setState({
-              firstSync: true,
-              secondSync: false
+              firstSync:true,
+              secondSync:false
            })
          }
-        } else if (result.data.mirror_status === 2) {
-          this.deleteProjectBack();
-        } else {
+        }else{
          this.getDetail();
          this.setState({
-            firstSync: false,
-            secondSync: false
+            firsrtSync:false,
+            secondSync:false
          })
        }
      }
@ -247,9 +235,9 @@ class Detail extends Component {
  }

  // 工作流激活后修改状态
-  changeOpenDevops = (flag) => {
+  changeOpenDevops=(flag)=>{
    this.setState({
-      open_devops: flag
+      open_devops:flag
    })
  }
  canvasChannel = () => {
@ -259,7 +247,7 @@ class Detail extends Component {
    var cable = actioncable.createConsumer(`wss://${name}/cable`);
    this.canvasChannel1 = cable.subscriptions.create({
      channel: `MirrorProjectChannel`,
-      id: project && project.id
+      id: project && project.identifier
    }, {
      connected: () => {
        console.log("###### channel connected! ######");
@ -267,41 +255,16 @@ 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) => {
@ -318,29 +281,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() {
-    const { projectsId, owner } = this.props.match.params;
+  getBanner(){
+    const { projectsId , owner } = this.props.match.params;
    const url = `/${owner}/${projectsId}/menu_list.json`;
-    axios.get(url).then(result => {
-      if (result) {
+    axios.get(url).then(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({
@ -355,15 +318,15 @@ class Detail extends Component {
        this.setWatchersCount(result.data.watchers_count, result.data.watched);
      }
    })
-      .catch(error => {
-        console.log(error);
-      });
+    .catch(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',
@ -373,9 +336,9 @@ class Detail extends Component {
        this.setPraisesCount(result.data.praises_count, result.data.praised)
      }
    })
-      .catch(error => {
-        console.log(error);
-      });
+    .catch(error => {
+      console.log(error);
+    });
  }

  setWatchersCount = (count, is_watched) => {
@ -395,24 +358,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(`/${current_user && current_user.login}/${result.data.identifier}`);
+        this.props.history.push(`/projects/${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
      })
    })
  }
@ -420,8 +383,8 @@ class Detail extends Component {
  // 同步镜像
  synchronismMirror = () => {
    const { platform } = this.state;
-    if (!platform) return;
-    const { projectsId, owner } = this.props.match.params;
+    if(!platform)return;
+    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) {
@ -435,345 +398,326 @@ 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={`/${fork_info.fork_project_user_login}`} className="show-user-link color-grey-6 ml5">{fork_info.fork_project_user_name}</Link>
+        <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>
        <span> / </span>
-        <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>
+        <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>
      </div> : ""
  }
-
+  

  render() {
-    const { projectDetail, watchers_count, praises_count,
-      forked_count, firstSync, secondSync,
-      isManager, watched, praised,
-      project, open_devops, platform, defaultBranch, bannerList, forkSpin } = this.state;
+    const { projectDetail, watchers_count, praises_count, 
+      forked_count, firstSync , secondSync , 
+      isManager, watched, praised, 
+      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.login}`}>{project.author.name}</Link>
+                      <Link to={`${project.author.type ==="Organization" ? "/organize":'/users'}/${project.author.login}`}>{project.author.name}</Link>
                    }
                    <span className="ml5 mr5">/</span>
-                    <Link to={`/${owner}/${projectsId}`} className="projectN mt6">{projectDetail && projectDetail.name}</Link>
+                    <Link to={`/projects/${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 ?
-                      <span className="color-grey-9">镜像自 <a className="color-grey-6" target="_blank" href={projectDetail.mirror_url}>{projectDetail.mirror_url}</a></span>
-                      : ""
+                    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>
+                    :""
                  }
                </div>
              </div>
              <div>
                {
-                  firstSync ? "" :
-                    <span className="df">
+                  firstSync ? "":
+                  <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>
                      {
-                        ((current_user && current_user.admin) || isManager) && (projectDetail && projectDetail.type && projectDetail.type === 2) ?
-                          <a className="synchronism ml30" onClick={this.synchronismMirror}>同步镜像</a> : ""
+                        watchers_count > 0 ?
+                        platform ?
+                        <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 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>
+                    </Button>
+                    <Button className="detail_tag_btn">
+                      <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: `/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>
-                        {
-                          watchers_count > 0 ?
-                            platform ?
-                              <Link className="detail_tag_btn_count" style={{ color: `${watched ? "#2878FF" : "#666"}` }} to={platform ? { pathname: `/${owner}/${projectsId}/following`, state } : ""}>
-                                {watchers_count}
-                              </Link>
-                              :
-                              <span className="detail_tag_btn_count">{watchers_count}</span>
-                            : ""
-                        }
-                      </Button>
-                      <Button className="detail_tag_btn">
-                        <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>
+                      </Tooltip>
+                      {
+                        forked_count > 0 ?
+                        platform ?
+                        <Link className="detail_tag_btn_count" to={{ pathname: `/projects/${owner}/${projectsId}/fork_users`, state }}>
+                          {forked_count}
+                        </Link>
+                        :
+                        <span className="detail_tag_btn_count">{forked_count}</span>
+                        :""
+                      }
+                    </Button>
+                  </span>
                }
              </div>
            </AlignTop>
            {
              firstSync ? "" :
-                <DetailBanner
-                  history={this.props.history}
-                  list={bannerList}
-                  owner={owner}
-                  projectsId={projectsId}
-                  pathname={pathname}
-                  state={state}
-                  projectDetail={projectDetail}
-                  open_devops={open_devops}
-                  platform={platform}
-                  urlFlag={urlFlag}
-                  isManager={isManager}
-                />
+              <DetailBanner 
+                history={this.props.history}
+                list={bannerList}
+                owner={owner}
+                projectsId={projectsId}
+                pathname={pathname}
+                state={state}
+                projectDetail={projectDetail}
+                open_devops={open_devops}
+                platform={platform}
+                urlFlag={urlFlag}
+                isManager={isManager}
+              />
            }
          </div>
        </div>
        {
          firstSync ?
-            <Content className="spincontent">
-              <Spin className="spinstyle" tip={project && `正在从 ${project.mirror_url} 迁移`} size="large" />
-            </Content>
-            :
-            <Spin spinning={secondSync} className="spinstyle" tip="正在同步镜像" size="large">
-              <Switch {...this.props}>
-                {/* 资源 */}
-                <Route path="/:owner/:projectsId/source"
-                  render={
-                    () => (<Source {...this.props} {...this.state} {...common} />)
-                  }
-                ></Route>
-                {/* 主页 */}
-                <Route path="/:owner/:projectsId/about"
-                  render={
-                    () => (<DevAbout {...this.props} {...this.state} {...common} />)
-                  }
-                ></Route>
-                {/* wiki新增文件 */}
-                <Route path="/:owner/:projectsId/wiki/add"
-                  render={
-                    () => (<WikiEdit {...this.props} {...this.state} {...common} />)
-                  }
-                ></Route>
-                {/* wiki编辑文件 */}
-                <Route path="/:owner/:projectsId/wiki/edit/:wikiName"
-                  render={
-                    () => (<WikiEdit {...this.props} {...this.state} {...common} />)
-                  }
-                ></Route>
-                {/* wiki */}
-                <Route path="/:owner/:projectsId/wiki"
-                  render={
-                    () => (<Wiki {...this.props} {...this.state} {...common} />)
-                  }
-                ></Route>
-                {/* 工作流 */}
-                <Route path="/:owner/:projectsId/devops"
-                  render={
-                    () => (<DevIndex {...this.props} {...this.state} {...common} />)
-                  }
-                ></Route>
-                {/* 标签列表 */}
-                <Route path="/:owner/:projectsId/issues/tags"
-                  render={
-                    (props) => (<TagList {...this.props} {...props} {...this.state} {...common} />)
-                  }
-                ></Route>
-                {/* 仓库设置 */}
-                <Route path="/:owner/:projectsId/settings"
-                  render={
-                    (props) => (<Setting {...this.props} {...props} {...this.state} {...common} />)
-                  }
-                ></Route>
-               
-                {/*修改里程碑*/}
-                <Route path="/:owner/:projectsId/milestones/:meilid/edit"
-                  render={
-                    (props) => (<OrderupdateMilepost {...this.props} {...props} {...this.state} {...common} />)
-                  }
-                ></Route>
-                {/* 新建里程碑 */}
-                <Route path="/:owner/:projectsId/milestones/new"
-                  render={
-                    (props) => (<OrdernewMilepost {...this.props} {...props} {...this.state} {...common} />)
-                  }
-                ></Route>
-                {/*里程碑详情*/}
-                <Route path="/:owner/:projectsId/milestones/:meilid"
-                  render={
-                    (props) => (<MilepostDetail {...this.props} {...props} {...this.state} {...common} />)
-                  }
-                ></Route>
-                {/* 里程碑 */}
-                <Route path="/:owner/:projectsId/milestones"
-                  render={
-                    (props) => (<OrderMilepost {...this.props} {...props} {...this.state} {...common} />)
-                  }
-                ></Route>
-                {/* 里程碑页面新建任务 */}
-                <Route path="/:owner/:projectsId/issues/:milepostId/new"
-                  render={
-                    (props) => (<OrderNew {...this.props} {...props} {...this.state} {...common} />)
-                  }
-                ></Route>
-                {/* 新建任务 */}
-                <Route path="/:owner/:projectsId/issues/new"
-                  render={
-                    (props) => (<OrderNew {...this.props} {...props} {...this.state} {...common} />)
-                  }
-                ></Route>
-                {/* 修改详情 */}
-                <Route path="/:owner/:projectsId/issues/:orderId/updatedetail"
-                  render={
-                    (props) => (<OrderupdateDetail  {...this.props} {...props} {...this.state} {...common} />)
-                  }
-                ></Route>
-                {/* 复制详情 */}
-                <Route path="/:owner/:projectsId/issues/:orderId/copyetail"
-                  render={
-                    (props) => (<OrdercopyDetail  {...this.props} {...props} {...this.state} {...common} />)
-                  }
-                ></Route>
-                 {/* 任务详情 */}
-                 <Route path="/:owner/:projectsId/issues/:orderId"
-                  render={
-                    (props) => (<OrderDetail {...this.props} {...this.state} {...props} {...common} />)
-                  }
-                ></Route>
-                {/* 动态 */}
-                <Route path="/:owner/:projectsId/activity"
-                  render={
-                    (props) => (<TrendsIndex {...this.props} {...props} {...this.state} {...common} />)
-                  }
-                ></Route>
-                {/* 代码Index */}
-                <Route path="/:owner/:projectsId/issues"
-                  render={
-                    (props) => (<OrderIndex {...this.props} {...props} {...this.state} {...common} />)
-                  }
-                ></Route>
-                {/* 新建合并请求 */}
-                <Route path="/:owner/:projectsId/pulls/new/:branch"
-                  render={
-                    (props) => (<CreateMerge {...this.props} {...props} {...this.state} {...common} is_fork={true} />)
-                  }
-                ></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>
+          <Content className="spincontent">
+            <Spin className="spinstyle" tip={project && `正在从 ${project.mirror_url} 迁移`} size="large" />
+          </Content>
+          :
+          <Spin spinning={secondSync} className="spinstyle" tip="正在同步镜像" size="large">
+            <Switch {...this.props}>
+              {/* 资源 */}
+              <Route path="/projects/:owner/:projectsId/source"
+                render={
+                  () => (<Source {...this.props} {...this.state} {...common} />)
+                }
+              ></Route>
+              {/* 主页 */}
+              <Route path="/projects/:owner/:projectsId/about"
+                render={
+                  () => (<DevAbout {...this.props} {...this.state} {...common} />)
+                }
+              ></Route>
+              {/* 工作流 */}
+              <Route path="/projects/:owner/:projectsId/devops"
+                render={
+                  () => (<DevIndex {...this.props} {...this.state} {...common} />)
+                }
+              ></Route>
+              {/* 标签列表 */}
+              <Route path="/projects/:owner/:projectsId/issues/tags"
+                render={
+                  (props) => (<TagList {...this.props} {...props} {...this.state} {...common} />)
+                }
+              ></Route>
+              {/* 仓库设置 */}
+              <Route path="/projects/:owner/:projectsId/setting"
+                render={
+                  (props) => (<Setting {...this.props} {...props} {...this.state} {...common} />)
+                }
+              ></Route>
+              {/* 任务详情 */}
+              <Route path="/projects/:owner/:projectsId/issues/:orderId/detail"
+                render={
+                  (props) => (<OrderDetail {...this.props} {...this.state} {...props} {...common} />)
+                }
+              ></Route>
+              {/*修改里程碑*/}
+              <Route path="/projects/:owner/:projectsId/milestones/:meilid/edit"
+                render={
+                  (props) => (<OrderupdateMilepost {...this.props} {...props} {...this.state} {...common} />)
+                }
+              ></Route>
+              {/* 新建里程碑 */}
+              <Route path="/projects/:owner/:projectsId/milestones/new"
+                render={
+                  (props) => (<OrdernewMilepost {...this.props} {...props} {...this.state} {...common} />)
+                }
+              ></Route>
+              {/*里程碑详情*/}
+              <Route path="/projects/:owner/:projectsId/milestones/:meilid"
+                render={
+                  (props) => (<MilepostDetail {...this.props} {...props} {...this.state} {...common} />)
+                }
+              ></Route>
+              {/* 里程碑 */}
+              <Route path="/projects/:owner/:projectsId/milestones"
+                render={
+                  (props) => (<OrderMilepost {...this.props} {...props} {...this.state} {...common} />)
+                }
+              ></Route>
+              {/* 里程碑页面新建任务 */}
+              <Route path="/projects/:owner/:projectsId/issues/:milepostId/new"
+                render={
+                  (props) => (<OrderNew {...this.props} {...props} {...this.state} {...common} />)
+                }
+              ></Route>
+              {/* 新建任务 */}
+              <Route path="/projects/:owner/:projectsId/issues/new"
+                render={
+                  (props) => (<OrderNew {...this.props} {...props} {...this.state} {...common} />)
+                }
+              ></Route>
+              {/* 修改详情 */}
+              <Route path="/projects/:owner/:projectsId/issues/:orderId/updatedetail"
+                render={
+                  (props) => (<OrderupdateDetail  {...this.props} {...props} {...this.state} {...common} />)
+                }
+              ></Route>
+              {/* 复制详情 */}
+              <Route path="/projects/:owner/:projectsId/issues/:orderId/copyetail"
+                render={
+                  (props) => (<OrdercopyDetail  {...this.props} {...props} {...this.state} {...common} />)
+                }
+              ></Route>
+              {/* 动态 */}
+              <Route path="/projects/:owner/:projectsId/activity"
+                render={
+                  (props) => (<TrendsIndex {...this.props} {...props} {...this.state} {...common} />)
+                }
+              ></Route>
+              {/* 代码Index */}
+              <Route path="/projects/:owner/:projectsId/issues"
+                render={
+                  (props) => (<OrderIndex {...this.props} {...props} {...this.state} {...common} />)
+                }
+              ></Route>
+              {/* 新建合并请求 */}
+              <Route path="/projects/:owner/:projectsId/pulls/new/:branch"
+                render={
+                  (props) => (<CreateMerge {...this.props} {...props} {...this.state} {...common} is_fork={true} />)
+                }
+              ></Route>
+              <Route path="/projects/:owner/:projectsId/pulls/new"
+                render={
+                  (props) => (<CreateMerge {...this.props} {...props} {...this.state} {...common} is_fork={true} />)
+                }
+              ></Route>
+              <Route path="/projects/:owner/:projectsId/pulls/:mergeId/UpdateMerge"
+                render={
+                  (props) => (<UpdateMerge {...this.props} {...props} {...this.state} {...common} />)
+                }
+              ></Route>
+              <Route path="/projects/:owner/:projectsId/pulls/:mergeId/Messagecount"
+                render={
+                  (props) => (<MessageCount {...this.props} {...props} {...this.state} {...common} />)
+                }
+              ></Route>
+              <Route path="/projects/:owner/:projectsId/pulls/:mergeId/MergeSubmit"
+                render={
+                  (props) => (<MessageCount {...this.props} {...props} {...this.state} {...common} />)
+                }
+              ></Route>

-                <Route path="/:owner/:projectsId/pulls"
-                  render={
-                    (props) => (<MergeIndexDetail {...this.props} {...props} {...this.state} {...common} />)
-                  }
-                ></Route>
-                <Route path="/:owner/:projectsId/following"
-                  render={
-                    (props) => (<WatchUsers {...this.props} {...props} {...this.state} {...common} />)
-                  }
-                ></Route>
-                <Route path="/:owner/:projectsId/stargazers"
-                  render={
-                    (props) => (<PraiseUsers {...this.props} {...props} {...this.state} {...common} />)
-                  }
-                ></Route>
-                <Route path="/:owner/:projectsId/members"
-                  render={
-                    (props) => (<ForkUsers {...this.props} {...props} {...this.state} {...common} />)
-                  }
-                ></Route>
-                {/* 贡献者列表 */}
-                <Route path="/:owner/:projectsId/contribute"
-                  render={
-                    () => (<Contribute {...this.props} {...this.state} {...common} />)
-                  }
-                ></Route>
+              <Route path="/projects/:owner/:projectsId/pulls"
+                render={
+                  (props) => (<MergeIndexDetail {...this.props} {...props} {...this.state} {...common} />)
+                }
+              ></Route>
+              <Route path="/projects/:owner/:projectsId/watchers"
+                render={
+                  (props) => (<WatchUsers {...this.props} {...props} {...this.state} {...common} />)
+                }
+              ></Route>
+              <Route path="/projects/:owner/:projectsId/stargazers"
+                render={
+                  (props) => (<PraiseUsers {...this.props} {...props} {...this.state} {...common} />)
+                }
+              ></Route>
+              <Route path="/projects/:owner/:projectsId/fork_users"
+                render={
+                  (props) => (<ForkUsers {...this.props} {...props} {...this.state} {...common} />)
+                }
+              ></Route>
+              {/* 贡献者列表 */}
+              <Route path="/projects/:owner/:projectsId/contribute"
+                render={
+                  () => (<Contribute {...this.props} {...this.state} {...common} />)
+                }
+              ></Route>

-                {/* 代码库----详情页面 */}
-                <Route path="/:owner/:projectsId/commits/branch/:branchName"
-                  render={
-                    (props) => (<CoderRootCommit {...this.props} {...props} {...this.state} {...common} />)
-                  }
-                ></Route>
-                <Route path="/:owner/:projectsId/tree/:branchName"
-                  render={
-                    (props) => (<CoderDepot {...this.props} {...props} {...this.state} {...common} />)
-                  }
-                ></Route>
-                <Route path="/:owner/:projectsId/:subIndex"
-                  render={
-                    (props) => (<CoderRootIndex {...this.props} {...props} {...this.state} {...common} />)
-                  }
-                ></Route>
-                <Route path="/:owner/:projectsId"
-                  render={
-                    (props) => (<CoderDepot {...this.props} {...props} {...this.state} {...common} />)
-                  }
-                ></Route>
-              </Switch>
-            </Spin>
+              {/* 代码库----详情页面 */}
+              <Route path="/projects/:owner/:projectsId/commits/branch/:branchName"
+                render={
+                  (props) => (<CoderRootCommit {...this.props} {...props} {...this.state} {...common}/>)
+                }
+              ></Route>
+              <Route path="/projects/:owner/:projectsId/tree/:branchName"
+                render={
+                  (props) => (<CoderDepot {...this.props} {...props} {...this.state} {...common}/>)
+                }
+              ></Route>
+              <Route path="/projects/:owner/:projectsId/:subIndex"
+                render={
+                  (props) => (<CoderRootIndex {...this.props} {...props} {...this.state} {...common}/>)
+                }
+              ></Route>
+              <Route path="/projects/:owner/:projectsId"
+                render={
+                  (props) => (<CoderDepot {...this.props} {...props} {...this.state} {...common}/>)
+                }
+              ></Route>
+            </Switch>
+          </Spin>
        }
      </div>
    )
--- a/src/forge/Main/DetailAdaptor.js
+++ b/src/forge/Main/DetailAdaptor.js
@ -1,28 +0,0 @@
-import React from 'react';
-import { Route, Switch } from "react-router-dom";
-import { withRouter } from "react-router";
-import Loadable from "react-loadable";
-import Loading from "../../Loading";
-import { SnackbarHOC } from "educoder";
-import { CNotificationHOC } from "../../modules/courses/common/CNotificationHOC";
-import { TPMIndexHOC } from "../../modules/tpm/TPMIndexHOC";
-
-// forge项目详情
-const ProjectDetail = Loadable({
-  loader: () => import("../Main/Detail"),
-  loading: Loading,
-});
-export default withRouter(
-  (CNotificationHOC()(SnackbarHOC()(TPMIndexHOC((props) => {
-    return (
-      <Switch>
-        <Route
-          path="/:owner/:projectsId"
-          render={(p) => (
-            <ProjectDetail  {...props} {...p} />
-          )}
-        ></Route>
-      </Switch>
-    )
-  }))))
-)
--- a/src/forge/Main/DetailTop.js
+++ b/src/forge/Main/DetailTop.js
@ -12,19 +12,19 @@ class DetailTop extends Component {
        {
          platform ?
          <React.Fragment>
-            <Link to={`/${owner}/${projectsId}/commits`} className={pathname.indexOf("/commits") > 0 ? "active" : ""}>
+            <Link to={`/projects/${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={`/${owner}/${projectsId}/branches`} className={pathname.indexOf("/branches") > 0 ? "active" : ""}>
+            <Link to={`/projects/${owner}/${projectsId}/branchs`} className={pathname.indexOf("/branchs") > 0 ? "active" : ""}>
              <i className="iconfont icon-fenzhi1 font-18 mr3"></i>
              <span>{(coderCount && coderCount.branches_count) || 0}</span>个分支
            </Link>
-            <Link to={`/${owner}/${projectsId}/tags`} className={pathname.indexOf("/tags") > 0 ? "active" : ""}>
+            <Link to={`/projects/${owner}/${projectsId}/tag`} className={pathname.indexOf("/tag") > 0 ? "active" : ""}>
              <i className="iconfont icon-biaoqian3 font-18 mr3"></i>
              <span>{(coderCount && coderCount.tags_count) || 0}</span>个标签
            </Link>
-            <Link to={`/${owner}/${projectsId}/releases`} className={pathname.indexOf("/releases") > 0 ? "active" : ""}>
+            <Link to={`/projects/${owner}/${projectsId}/releases`} className={pathname.indexOf("/releases") > 0 ? "active" : ""}>
              <i className="iconfont icon-fahangban font-18 mr3"></i>
              <span>{(coderCount && coderCount.version_releasesed_count) || 0}</span>个发行版
            </Link>
--- a/src/forge/Main/Diff.jsx
+++ b/src/forge/Main/Diff.jsx
@ -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(`/${owner}/${projectsId}/tree/${truncateCommitId(sha)}`)}} className="ml30">浏览代码</Button>
+              <Button type="primary" onClick={()=>{history.push(`/projects/${owner}/${projectsId}/tree/${truncateCommitId(sha)}`)}} className="ml30">浏览代码</Button>
            </div>
          </div>
          <div className="f-wrap-between" style={{ alignItems: "center" }}>
--- a/src/forge/Main/Index.js
+++ b/src/forge/Main/Index.js
@ -1,4 +1,5 @@
 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';
@ -12,8 +13,6 @@ 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 {
@ -229,7 +228,7 @@ class Index extends Component {
  }

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

  // 选择语言类别
@ -256,12 +255,8 @@ class Index extends Component {
  newItem = ()=>{
    return(
      <Menu>
-        <Menu.Item key="created_mirror">
-          <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.Item key="created_mirror"><Link to={`/projects/mirror/new`}>新建镜像项目</Link></Menu.Item>
+        <Menu.Item key="created_deposit"><Link to={`/projects/deposit/new`}>新建托管项目</Link></Menu.Item>
      </Menu>
    )
  }
--- a/src/forge/Main/IndexItem.js
+++ b/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.login}`} className="show-user-link">
+                <Link to={item.author && (item.author.type === "Organization" ? `/organize/${item.author.login}`:`/users/${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={`/${item.author.login}/${item.identifier}`} title={`${item.author.name}/${item.name}`} className="color-grey-3 font-18 task-hide " style={{maxWidth: 470 }}>
+                    <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 }}>
                      {item.author.name}/{item.name}
                    </Link>
                    { !item.is_public && <span className="privateTag">私有</span> }
--- a/src/forge/Main/sub/Contribute.jsx
+++ b/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={`/${item.login}`} className="font-16">{item.name}</Link>
+                        <Link to={`/users/${item.login}`} className="font-16">{item.name}</Link>
                        <p className="font-12 color-grey-9">提交{item.contributions}次</p>
                      </div>
                    </AlignCenter>
--- a/src/forge/Main/sub/DetailBanner.jsx
+++ b/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(`/${owner}/${projectsId}`);
+          history.push(`/projects/${owner}/${projectsId}`);
        }
      }
      setMenuName(list);
@ -22,13 +22,13 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
        menuName && projectDetail ? 
        <ul className="headerMenu-wrapper">
          {
-           Array.isArray(menuName)&& menuName.map((item,key)=>{
+            menuName.map((item,key)=>{
              return(
-                <React.Fragment key={item.menu_name}>
+                <React.Fragment>
                  {
                    item.menu_name === "home" &&
                    <li className={pathname==="about" ? "active" : ""}>
-                      <Link to={{ pathname: `/${owner}/${projectsId}/about`, state }}>
+                      <Link to={{ pathname: `/projects/${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: `/${owner}/${projectsId}`, state }}>
+                      <Link to={{ pathname: `/projects/${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: `/${owner}/${projectsId}/issues`, state }}>
+                        <Link to={{ pathname: `/projects/${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,47 +58,37 @@ 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: `/${owner}/${projectsId}/pulls`, state }}>
+                      <Link to={{ pathname: `/projects/${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: `/${owner}/${projectsId}/devops${open_devops ? `/dispose`:""}`, state }}> */}
-                      <Link to={{ pathname: `/${owner}/${projectsId}/devops`, state:{...state,open_devops} }}>
+                      <Link to={{ pathname: `/projects/${owner}/${projectsId}/devops${open_devops ? `/dispose`:""}`, state }}>
                        <i className="iconfont icon-gongzuoliu font-13 mr8"></i>工作流(beta版)
                        {projectDetail && projectDetail.ops_count ? <span>{projectDetail.ops_count}</span> : ""} 
                      </Link>
                    </li>
                    :""
                  }
-                  {
-                    // item.menu_name === "resources" &&
-                    // <li className={pathname==="source" ? "active" : ""}>
-                    //   <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>
-                    //       <span>资源库</span>
-                    //       {projectDetail && projectDetail.source_count ? <span className="num">{projectDetail.source_count}</span> :""}
-                    //   </Link>
-                    // </li>
-                  }
+                  {/* {
+                    item.menu_name === "resources" &&
+                    <li className={pathname==="source" ? "active" : ""}>
+                      <Link to={{ pathname: `/projects/${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>
+                          <span>资源库</span>
+                          {projectDetail && projectDetail.source_count ? <span className="num">{projectDetail.source_count}</span> :""}
+                      </Link>
+                    </li>
+                  } */}
                  {
                    item.menu_name === "versions" &&
                    <li className={pathname==="milestones" ? "active" : ""}>
-                      <Link to={{ pathname: `/${owner}/${projectsId}/milestones`, state }}>
+                      <Link to={{ pathname: `/projects/${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> :""}
@ -108,17 +98,17 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
                  {
                    item.menu_name === "activity" &&
                     <li className={pathname==="activity" ? "active" : ""}>
-                      <Link to={{ pathname: `/${owner}/${projectsId}/activity`, state }}>
+                      <Link to={{ pathname: `/projects/${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 === "settings" &&
-                    <li className={pathname === "settings" ? "active" : ""}>
-                      <Link to={`/${owner}/${projectsId}/settings`}>
-                        <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>
+                    item.menu_name === "setting" &&
+                    <li className={pathname === "setting" ? "active" : ""}>
+                      <Link to={`/projects/${owner}/${projectsId}/setting`}>
+                        <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>
                        <span>仓库设置</span>
                      </Link>
                    </li>
--- a/src/forge/Main/sub/Invite.jsx
+++ b/src/forge/Main/sub/Invite.jsx
@ -1,15 +1,26 @@
 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>
-        <input value={code} id="devitecode" style={{width:"62px",border:"none",cursor:"default"}} readOnly/>
-        <CopyTool timeOut={true} beforeText={<p className="edu-txt-center">可以通过邀请码邀请成员加入项目<br/>点击复制邀请码。</p>} className="ml8 font-16" inputId="devitecode"/>
+        <span id="devitecode">{code}</span>
+        <Tooltip title={<p className="edu-txt-center">可以通过邀请码邀请成员加入项目<br/>点击复制邀请码。</p>}  placement={"bottom"}>
+          <i className="iconfont icon-fuzhi2 font-16 color-blue ml8" onClick={()=>jsCopy("#devitecode")}></i>
+        </Tooltip>
      </div>
    </div>
  )
--- a/src/forge/Main/sub/UpdateDescModal.jsx
+++ b/src/forge/Main/sub/UpdateDescModal.jsx
@ -53,7 +53,7 @@ function UpdateDescModal({form , visible , onCancel , onOk,desc,website,lesson_u
          {getFieldDecorator("lesson_url",{
            rules:[]
          })(
-            <Input placeholder="实践课程链接"/>
+            <Input placeholder="实践课程链接" />
          )}
        </Form.Item>
      </Form>
--- a/src/forge/Merge/Commits.jsx
+++ b/src/forge/Merge/Commits.jsx
@ -16,10 +16,10 @@ function Commits({ commits , projectsId , owner }){
              <div className="prInfo">
                <FlexAJ>
                  <AlignCenter>
-                    <Link to={`/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitKey" style={{marginLeft:0}}>{truncateCommitId(`${item.sha}`)}</Link>
+                    <Link to={`/projects/${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={`/${owner}/${projectsId}/commits/${truncateCommitId(item.sha)}`} className="color-blue">浏览代码</Link>
+                  <Link to={`/projects/${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>
--- a/src/forge/Merge/Files.jsx
+++ b/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(`/${owner}/${projectsId}/tree/${truncateCommitId(item.sha)}/${item.name}`)}}>查看文件</Button>
+                      <Button className="mr20" onClick={()=>{history.push(`/projects/${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>
--- a/src/forge/Merge/MergeDetail.js
+++ b/src/forge/Merge/MergeDetail.js
@ -228,7 +228,7 @@ class MergeDetail extends Component {
              <div>
                {
                  data && data.issue.user_permission ?
-                    <Link to={`/${owner}/${projectsId}/pulls/${mergeid}/updatemerge`} className="color-blue fr">编辑</Link>
+                    <Link to={`/projects/${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={`/${owner}/${projectsId}/pulls/${mergeid}/Messagecount`}>对话内容</Link></li>
-                <li className={url.indexOf("MergeSubmit") > 0 ? "active" : ""}><Link to={`/${owner}/${projectsId}/pulls/${mergeid}/MergeSubmit`}>代码提交</Link></li>
+                <li className={url.indexOf("Messagecount") > 0 ? "active" : ""}><Link to={`/projects/${owner}/${projectsId}/pulls/${mergeid}/Messagecount`}>对话内容</Link></li>
+                <li className={url.indexOf("MergeSubmit") > 0 ? "active" : ""}><Link to={`/projects/${owner}/${projectsId}/pulls/${mergeid}/MergeSubmit`}>代码提交</Link></li>
              </ul>
            </div>
          </div>
--- a/src/forge/Merge/MergeItem.js
+++ b/src/forge/Merge/MergeItem.js
@ -49,7 +49,7 @@ class MergeItem extends Component {
  };

  render() {
-    const { issues, project_name, project_author_name , user_admin_or_developer} = this.props;
+    const { issues, project_name, project_author_name , user_admin_or_member} = 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={`/${owner}/${projectsId}/pulls/${item.pull_request_id}/Messagecount`}
+                    to={`/projects/${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={`/${item && item.author_login}`}
+                    to={`/users/${item && item.author_login}`}
                    className="show-user-link"
                  >
                    <img
@ -91,7 +91,7 @@ class MergeItem extends Component {
                  </Link>
                  <AlignCenter>
                    <Link
-                      to={`/${item && item.author_login}`}
+                      to={`/users/${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={`/${item.is_original ? item.fork_project_user : owner}/${ item.is_original ? item.fork_project_identifier : projectsId }/tree/${turnbar(item.pull_request_head)}`}
+                            to={`/projects/${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={`/${owner}/${projectsId}/tree/${turnbar(item.pull_request_base)}`}
+                            to={`/projects/${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={`/${item.assign_user_login}`}
+                      to={`/users/${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={`/${owner}/${projectsId}/pulls/${item.pull_request_id}/Messagecount`}
+                        to={`/projects/${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_developer && item.pull_request_status === 0 ? (
+                    {user_admin_or_member && 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={`/${owner}/${projectsId}/pulls/${item.pull_request_id}/updatemerge`}
+                            to={`/projects/${owner}/${projectsId}/pulls/${item.pull_request_id}/updatemerge`}
                            className="color-grey-9"
                          >
                            <i className="iconfont icon-bianji3 font-14 mr5"></i>
--- a/src/forge/Merge/MergeSubmit.js
+++ b/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={`/${item.login}`} className="show-user-link">
+            <Link to={`/users/${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={`/${owner}/${projectsId}/commits/${truncateCommitId(`${text}`)}`} className="commitKey">{text}</Link>
+          <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${text}`)}`} className="commitKey">{text}</Link>
        )
      },{
        title:"备注",
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@ -361,7 +361,7 @@ class MessageCount extends Component {
                      <div className="mt15">
                        <Tag className="pr-branch-tag">
                          <Link
-                            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)}`}
+                            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)}`}
                            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={`/${owner}/${projectsId}/tree/${data.pull_request.base}`}
+                            to={`/projects/${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={`/${data.issue.author_login}`} className="show-user-link">
+                      <Link to={`/users/${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={`/${data.issue.author_login}`} className="show-user-link color-blue">
+                        <Link to={`/users/${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={`/${data.issue.assign_user_login}`}
+                              to={`/users/${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(`/${owner}/${projectsId}/pulls/${mergeId}/UpdateMerge`);}}
+                            onClick={()=>{this.props.history.push(`/projects/${owner}/${projectsId}/pulls/${mergeId}/UpdateMerge`);}}
                          >
                            编辑
                          </Button>
--- a/src/forge/Merge/NewMerge.js
+++ b/src/forge/Merge/NewMerge.js
@ -48,10 +48,8 @@ class NewMerge extends Component {
      this.compareProject(this.state.id,pull,"master");
    }
  }
-
  // 页面销毁取消监听 
  componentWillUnmount () {
-    console.log('----------destoyed---------');
    window.removeEventListener('popstate', this.handleBack, false);
  };

@ -62,11 +60,8 @@ class NewMerge extends Component {

  //获取新建分支数据
  getmergelist = (projectsId) => {
-    this.setState({isSpin: true});
-    // const { owner } = this.props.match.params;
-    let owner =this.props.history.location.pathname.split('/')[1];
-    console.log('owner:'+owner);
-    console.log(this.props);
+    this.setState({isSpin: true})
+    const { owner } = this.props.match.params;
    const url = `/${owner}/${projectsId}/pulls/new.json`;
    axios
      .get(url)
@ -191,7 +186,7 @@ class NewMerge extends Component {
    // this.ischeckmerge();
    let { id ,merge , pull } = this.state;
    if(type==="pull"){
-      this.props.history.push(`/${owner}/${projectsId}/pulls/new/${pull}`)
+      this.props.history.push(`/projects/${owner}/${projectsId}/pulls/new/${pull}`)
      this.compareProject(id,value,merge);
    }else{
      this.compareProject(id,pull,value);
@ -213,7 +208,7 @@ class NewMerge extends Component {
        merge_user_login: is_fork_id ? projects_names[0].project_user_login : undefined
      }
    })
-    this.props.history.push(`/${login}/${identifier}/pulls/new`);
+    this.props.history.push(`/projects/${login}/${identifier}/pulls/new`);
    this.newMergelist(login,identifier);
  };

@ -269,9 +264,7 @@ class NewMerge extends Component {
      show_message,
      default_message,
      merge_head,
-      projects_names,
-      id,
-      comparesData
+      projects_names,id,comparesData
    } = this.state;
    
    const renderBrances = (list, type) => {
@ -305,7 +298,6 @@ class NewMerge extends Component {
      return <div dangerouslySetInnerHTML={{ __html: html }}></div>;
    };
    let { project } = this.props;
-
    return (
      <div>
        <div className="main">
--- a/src/forge/Merge/merge.js
+++ b/src/forge/Merge/merge.js
@ -4,11 +4,10 @@ import "./merge.css";
 import "../Order/order.css";
 import "../Order/index.scss";
 import NoneData from "./no_data";
-import MergeItem from "./MergeItem";
+import OrderItem from "./MergeItem";
 import './Index.scss';

 import axios from "axios";
-import CheckProfile from '../Component/ProfileModal/Profile';

 const Search = Input.Search;
 /**
@ -213,7 +212,7 @@ class merge extends Component {

  checkOperation() {
    const { projectsId,owner } = this.props.match.params;
-    this.props.history.push(`/${owner}/${projectsId}/pulls/new`);
+    this.props.history.push(`/projects/${owner}/${projectsId}/pulls/new`);
  }
  render() {
    const { projectsId , owner } = this.props.match.params;
@ -256,10 +255,10 @@ class merge extends Component {
            />
          </div>
          {
-            data && data.user_admin_or_developer &&
-            <CheckProfile {...this.props} className="topWrapper_btn ml10" sureFunc={() => this.checkOperation()}>
+            data && data.user_admin_or_member &&
+            <a className="topWrapper_btn ml10" onClick={() => this.checkOperation()}>
              +&nbsp;新建合并请求
-            </CheckProfile>
+            </a>
          }
        </div>
        <div className="f-wrap-between screenWrap">
@ -388,7 +387,7 @@ class merge extends Component {
          <Spin spinning={isSpin}>
            {data && data.search_count && data.search_count > 0 ? (
              <div>
-                <MergeItem
+                <OrderItem
                  issues={issues}
                  search_count={search_count}
                  page={select_params.page}
@ -397,8 +396,8 @@ class merge extends Component {
                  project_author_name={data.project_author_name}
                  {...this.props}
                  {...this.state}
-                  user_admin_or_developer={data && data.user_admin_or_developer}
-                ></MergeItem>
+                  user_admin_or_member={data && data.user_admin_or_member}
+                ></OrderItem>
              </div>
            ):""}
            {search_count > select_params.limit ? (
--- a/src/forge/Merge/merge_form.js
+++ b/src/forge/Merge/merge_form.js
@ -165,7 +165,7 @@ class MergeForm extends Component {
              this.setState({
                isSpin: false,
              });
-              this.props.history.push(`/${owner}/${projectsId}/pulls`);
+              this.props.history.push(`/projects/${owner}/${projectsId}/pulls`);
              const { getDetail } = this.props;
              getDetail && getDetail();
            } else {
@ -195,7 +195,7 @@ class MergeForm extends Component {
                isSpin: false,
              });
              this.props.history.push(
-                `/${owner}/${projectsId}/pulls/${mergeId}/Messagecount`
+                `/projects/${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" ? `/${owner}/${projectsId}/pulls` : `/${owner}/${projectsId}/pulls/${mergeId}/detail`)
+                      this.props.history.push(merge_type === "new" ? `/projects/${owner}/${projectsId}/pulls` : `/projects/${owner}/${projectsId}/pulls/${mergeId}/detail`)
                    }}
                  >
                    <span className="plr10">取消</span>
--- a/src/forge/Merge/no_data.js
+++ b/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={`/${owner}/${projectsId}/pulls/new`}>合并请求</Link>
+          合并请求可以帮助您与他人协作编写代码。在使用之前，请先创建一个 <Link className="color-blue" to={`/projects/${owner}/${projectsId}/pulls/new`}>合并请求</Link>
          </div>
        </div>
      </div>
--- a/src/forge/New/Index.js
+++ b/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, Modal } from 'antd';
+import { Input , Form , Select , Checkbox , Button , Spin , AutoComplete } from 'antd';
 import { Base64 } from 'js-base64';

 import '../css/index.scss';
@ -58,8 +58,6 @@ class Index extends Component {
    this.getGitignore();
    // 获取开源许可证
    this.getLicenses();
-    //判断是否为删除新建项目失败后返回，并执行对应逻辑
-    this.isDeleteProjectBack();
  }
  componentDidUpdate=(prevPros)=>{
    if(prevPros && this.props && !this.props.checkIfLogin()){
@ -71,7 +69,6 @@ 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){
@ -80,13 +77,16 @@ class Index extends Component {
          OwnerList: owner,
        })
        if(OIdentifier){
-          owner = owner.filter(item=>item.login === OIdentifier);
+          owner = owner.filter(item=>item.name === 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,31 +144,6 @@ 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) {
@ -197,8 +172,6 @@ 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,
@ -209,16 +182,17 @@ class Index extends Component {
          user_id:owners_id
        }).then((result) => {
          if (result && result.data.id) {
-            projectsType && projectsType !== "mirror" && this.props.showNotification(`托管项目创建成功!`);
-            this.props.history.push(`/${result.data.login}/${result.data.identifier}`);
+            this.setState({
+              isSpin: false
+            })
+            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({
@ -363,9 +337,7 @@ 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>
-                      <span className="ml20 font-12 color-red">如果源项目为公有仓库，禁止填写用户名密码。如果源项目为私有仓库，则必须填写正确的用户名和密码!</span></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></p>
                    {
                      mirrorCheck &&
                      <div className="df mb20" style={{alignItems:'center'}}>
--- a/src/forge/Newfile/UserSubmitComponent.js
+++ b/src/forge/Newfile/UserSubmitComponent.js
@ -86,7 +86,7 @@ class UserSubmitComponent extends Component {
              const { getTopCount } = this.props;
              getTopCount && getTopCount(values.branchname);
            }
-            let url = `/${owner}/${projectsId}${values.branchname ? `/tree/${turnbar(values.branchname)}`: (branch ? `/tree/${turnbar(branch)}` : "")}`;
+            let url = `/projects/${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 = `/${owner}/${projectsId}${(values.branchname ? `/tree/${turnbar(values.branchname)}` : (b ? `/tree/${turnbar(b)}`:""))}`;
+              let url = `/projects/${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={`/${current_user && current_user.login}`} className="show-user-link" >
+          <Link to={`/users/${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(`/${owner}/${projectsId}`);
+                this.props.history.push(`/projects/${owner}/${projectsId}`);
              }}
              className="mr20"
            >
--- a/src/forge/Notice/Apply.jsx
+++ b/src/forge/Notice/Apply.jsx
@ -63,11 +63,11 @@ function Apply(props) {
              {
                list.map((i,k)=>{
                  return(
-                    <li key={k}>
-                      <Link to={`/${i.user && i.user.login}`}><img src={getImageUrl(`/${i.user && i.user.image_url}`)} alt="" className="notifyImg"/></Link>
+                    <li>
+                      <Link to={`/users/${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={`/${i.user && i.user.login}`} className="font-15 mr20">{i.user && i.user.name}</Link>
+                          <Link to={`/users/${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>
--- a/src/forge/Notice/Index.jsx
+++ b/src/forge/Notice/Index.jsx
@ -33,7 +33,7 @@ function Index(props){

  useEffect(()=>{
    if((username && current_user && (current_user.login !== username))){
-      props.history.push(`/${username}`);
+      props.history.push(`/users/${username}`);
    }
  },[current_user,username])

@ -47,14 +47,14 @@ function Index(props){

  useEffect(()=>{
    if(pathname && username){
-      if(pathname === `/${username}/notice`){
+      if(pathname === `/users/${username}/notice`){
        setMenu("notify");
        changeNum(user.undo_messages);
      }
-      if(pathname === `/${username}/notice/undo`){
+      if(pathname === `/users/${username}/notice/undo`){
        setMenu("undo");
      }
-      if(pathname === `/${username}/notice/apply`){
+      if(pathname === `/users/${username}/notice/apply`){
        setMenu("apply");
      }
    }
@ -70,9 +70,9 @@ function Index(props){
  function deleteEvent(type,count) {
    let c = count;
    if(type==="apply"){
-      setApplyCount(applyCount-count);
-    }else if(type==="undo"){
      setTransferCount(transferCount-count);
+    }else if(type==="undo"){
+      setApplyCount(applyCount-count);
    }else{
      setMessagesCount(0);
      c = messagesCount;
@ -84,19 +84,19 @@ function Index(props){
    <div>
      <ul className="noticeMenu">
        <li className={menu === "notify" ? "active":""}>
-          <Link to={`/${username}/notice`} onClick={changeNum}>
+          <Link to={`/users/${username}/notice`} onClick={changeNum}>
            <span>通知</span>
            {messagesCount ? <span className="unNum">{messagesCount}</span>:""}
          </Link>
        </li>
        <li className={menu === "undo" ? "active":""}>
-          <Link to={`/${username}/notice/undo`}>
+          <Link to={`/users/${username}/notice/undo`}>
            <span>接收仓库</span>
            {transferCount ? <span className="unNum">{transferCount}</span>:""}
          </Link>
        </li>
        <li className={menu === "apply" ? "active":""}>
-          <Link to={`/${username}/notice/apply`}>
+          <Link to={`/users/${username}/notice/apply`}>
            <span>成员申请</span>
            {applyCount ? <span className="unNum">{applyCount}</span>:""}
          </Link>
@ -104,19 +104,19 @@ function Index(props){
      </ul>
      <Switch>
        <Route
-          path="/:username/notice/apply"
+          path="/users/:username/notice/apply"
          render={(p) => {
            return <Apply {...props} {...p} deleteEvent={deleteEvent}/>;
          }}
        ></Route>
        <Route
-          path="/:username/notice/undo"
+          path="/users/:username/notice/undo"
          render={(p) => {
            return <UndoEvent {...props} {...p} deleteEvent={deleteEvent}/>;
          }}
        ></Route>
        <Route
-          path="/:username/notice"
+          path="/users/:username/notice"
          render={(p) => {
            return <Notify {...props} {...p} deleteEvent={deleteEvent}/>;
          }}
--- a/src/forge/Notice/Notify.jsx
+++ b/src/forge/Notice/Notify.jsx
@ -44,13 +44,13 @@ function Notify(props){
    if(status){
      switch(status){
        case 'canceled':
-          return <p>取消转移【<Link to={`/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】仓库</p>
+          return <p>取消转移【<Link to={`/projects/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】仓库</p>
        case 'common':
-          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>
+          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>
        case 'successed':
-          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>
+          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>
        default:
-          return <p>拒绝转移【<Link to={`/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】仓库</p>
+          return <p>拒绝转移【<Link to={`/projects/${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={`/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】项目的申请</p>
+          return <p>已通过你加入【<Link to={`/projects/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】项目的申请</p>
        default:
-          return <p>已拒绝你加入【<Link to={`/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】项目的申请</p>
+          return <p>已拒绝你加入【<Link to={`/projects/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】项目的申请</p>
      }
    }else{
      return ""
@ -80,13 +80,12 @@ function Notify(props){
            <ul className="notifyList">
              {
                list.map((i,k)=>{
-                  console.log(i);
                  return(
-                    <li i={k}>
-                      <Link to={`/${i.applied_user && i.applied_user.login}`}><img src={getImageUrl(`/${i.applied_user && i.applied_user.image_url}`)} alt="" className="notifyImg" /></Link>
+                    <li>
+                      <Link to={`/users/${i.login}`}><img src={getImageUrl(`/${i.applied_user && i.applied_user.image_url}`)} alt="" className="notifyImg"/></Link>
                      <div className="notifyFlex">
                        <p className="notifyInfos">
-                          <Link to={`/${i.applied_user && i.applied_user.login}`} className="font-15 mr20">{i.applied_user && i.applied_user.name}</Link>
+                          <Link to={`/users/${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)}
--- a/src/forge/Notice/UndoEvent.jsx
+++ b/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("undo",1);
+        props && props.deleteEvent("apply",1);
      }
    }).catch(error=>{})
  }
@ -68,16 +68,16 @@ function UndoEvent(props){
            {
              list.map((i,k)=>{
                return(
-                  <li key={k}>
-                    <Link to={`/${i.user && i.user.login}`}><img src={getImageUrl(`/${i.user && i.user.image_url}`)} alt="" className="notifyImg"/></Link>
+                  <li>
+                    <Link to={`/users/${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={`/${i.user && i.user.login}`} className="font-15 mr20">{i.user && i.user.name}</Link>
+                        <Link to={`/users/${i.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={`/${i.project && i.project.owner && i.project.owner.login}/${i.project && i.project.identifier}`}>{i.project && i.project.name}</Link>】
-                        转移给【<Link to={`/${i.owner && i.owner.login}`}>{i.owner && i.owner.name}</Link>】，是否接受？</p>
+                        <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>】
+                        转移给【<Link to={`/users/${i.owner && i.owner.login}`}>{i.owner && i.owner.name}</Link>】，是否接受？</p>
                        {
                          i.status === "common" &&
                          <span>
--- a/src/forge/Order/Detail.js
+++ b/src/forge/Order/Detail.js
@ -85,7 +85,7 @@ class Detail extends Component {
      })
      .then((result) => {
        if (result) {
-          this.props.history.push(`/${owner}/${projectsId}/issues`);
+          this.props.history.push(`/projects/${owner}/${projectsId}/issues`);
        }
      })
      .catch((error) => {
@ -132,7 +132,7 @@ class Detail extends Component {
      .then((result) => {
        if (result) {
          this.props.history.push(
-            `/${owner}/${projectsId}/issues/${result.data.issue_id}/copyetail`
+            `/projects/${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={`/${data && data.author_login}`}
+                  to={`/users/${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={`/${data && data.author_login}`}
+                      to={`/users/${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={`/${owner}/${projectsId}/issues/${orderId}/updatedetail`}
+                          to={`/projects/${owner}/${projectsId}/issues/${orderId}/updatedetail`}
                          className="color-blue fr"
                        >
                          编辑
--- a/src/forge/Order/Milepost.js
+++ b/src/forge/Order/Milepost.js
@ -4,7 +4,6 @@ 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;

@ -188,7 +187,7 @@ class Milepost extends Component {
              </ul>
              {
                data && data.user_admin_or_member ?
-                  <CheckProfile {...this.props} className="topWrapper_btn" sureFunc={() => {this.props.history.push(`/${owner}/${projectsId}/milestones/new`)}}>新的里程碑</CheckProfile>
+                  <Link to={`/projects/${owner}/${projectsId}/milestones/new`} className="topWrapper_btn">新的里程碑</Link>
                  : ''
              }
            </div>
@ -205,7 +204,7 @@ class Milepost extends Component {
                          <div className="milepostwidth">
                            <div className="grid-item width100">
                              <i className="iconfont icon-lubiaosignpost3 font-12 mr3"></i>
-                              <Link to={`/${owner}/${projectsId}/milestones/${item.id}`} className="font-16">{item.name}</Link>
+                              <Link to={`/projects/${owner}/${projectsId}/milestones/${item.id}`} className="font-16">{item.name}</Link>
                            </div>
                          </div>
                        </div>
@ -229,7 +228,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={`/${owner}/${projectsId}/milestones/${item.id}/edit`} className="color-grey-9">编辑</Link>
+                                <Link to={`/projects/${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>
--- a/src/forge/Order/MilepostDetail.js
+++ b/src/forge/Order/MilepostDetail.js
@ -2,8 +2,7 @@ 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 CheckProfile from '../Component/ProfileModal/Profile';
+import { FlexAJ } from '../Component/layout'

 import NoneData from '../Nodata';
 import OrderItem from './OrderItem';
@ -114,7 +113,7 @@ class MilepostDetail extends Component {
        this.setState({
          data: result.data,
          issues: result.data.issues,
-          search_count: params.status_type ==="1" ? result.data.open_issues_count : result.data.close_issues_count,
+          search_count: result.data.search_count,
          isSpin: false
        })
      }
@ -239,8 +238,8 @@ class MilepostDetail extends Component {
              <span className="font-weight-bold">{data && data.percent && data.percent.toFixed(2)}%完成 </span>
            </span>
            <div className="milepostdiv">
-              <Link to={`/${owner}/${projectsId}/milestones/${meilid}/edit`} className="topWrapper_btn" style={{ marginRight: 15 }} >编辑里程碑</Link>
-              <CheckProfile {...this.props} sureFunc={()=>{this.props.history.push(`/${owner}/${projectsId}/issues/${meilid}/new`)}} className="topWrapper_btn">创建易修</CheckProfile>
+              <Link to={`/projects/${owner}/${projectsId}/milestones/${meilid}/edit`} className="topWrapper_btn" style={{ marginRight: 15 }} >编辑里程碑</Link>
+              <Link to={`/projects/${owner}/${projectsId}/issues/${meilid}/new`} className="topWrapper_btn">创建易修</Link>
            </div>
          </FlexAJ>
        </div>
--- a/src/forge/Order/Milepostitem.js
+++ b/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={`/${owner}/${projectsId}/milestones/${item.id}`} className="font-16">{item.name}</Link>
+                      <Link to={`/projects/${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={`/${owner}/${projectsId}/milestones/${item.id}/edit`} className="color-grey-9">编辑</Link>
+                        <Link to={`/projects/${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>
--- a/src/forge/Order/Nav.js
+++ b/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={`/${owner}/${projectsId}/issues/tags`}>标签</NavLink>
-        <NavLink activeClassName="active" className="issue-type-button" to={`/${owner}/${projectsId}/milestones`}>里程碑</NavLink>
+        <NavLink activeClassName="active" className="issue-type-button" to={`/projects/${owner}/${projectsId}/issues/tags`}>标签</NavLink>
+        <NavLink activeClassName="active" className="issue-type-button" to={`/projects/${owner}/${projectsId}/milestones`}>里程碑</NavLink>
      </p>
    )
  }
--- a/src/forge/Order/OrderItem.js
+++ b/src/forge/Order/OrderItem.js
@ -44,7 +44,6 @@ 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 &&
@ -52,7 +51,7 @@ class OrderItem extends Component {
        {current_user && current_user.login && checkbox}
        <div className="flex-1">
          <p className="mb10 df" style={{alignItems:"center"}}>
-            <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>
+            <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>
            {TagInfo(item.priority,"mr10")}
          </p>
          <p className="color-grey-6 font-12">
@ -68,7 +67,7 @@ class OrderItem extends Component {
          <li>
            {
              item.author_name ?
-                <Link to={`/${item.author_login}`} className="show-user-link">
+                <Link to={`/users/${item.author_login}`} className="show-user-link">
                  {item.author_name}
                </Link>
                : "--"
@ -77,7 +76,7 @@ class OrderItem extends Component {
          <li>
            {
              item.assign_user_name ?
-                <Link to={`/${item.assign_user_login}`} className="show-user-link">
+                <Link to={`/users/${item.assign_user_login}`} className="show-user-link">
                  {item.assign_user_name}
                </Link>
                : "--"
@ -89,24 +88,15 @@ class OrderItem extends Component {
          <li style={{color:`${item.done_ratio === "100%"?"#28BD6C":"#F73030"}`}}>{item.done_ratio || "--"}</li>
          <li>
            <div className="milepostleft">
-              <Link to={`/${owner}/${projectsId}/issues/${item.id}`}><i className="iconfont icon-pinglun1 mr3 font-16"></i>{item.journals_count}</Link>
+              <Link to={`/projects/${owner}/${projectsId}/issues/${item.id}/detail`}><i className="iconfont icon-pinglun1 mr3 font-16"></i>{item.journals_count}</Link>
              {
                user_admin_or_member ?
-                <div style={{ display: orderid === item.id && isdisplay ? 'flex' : 'none' }}>
+                <div id="hoverBox" style={{ display: this.state.orderid === item.id && this.state.isdisplay ? 'flex' : 'none' }}>
                  <div className="mr8 ml8 color-grey-9">
-                    <Link to={`/${owner}/${projectsId}/issues/${item.id}/updatedetail`} className="color-grey-9">
-                      <i className="iconfont icon-bianji3 font-14 mr5"></i>
-                    </Link>
+                    <Link to={`/projects/${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={orderid === item.id && isdisplay ? "overlayBox" : "overlayBox hideOverlay" }
-                      title={'您确定要删除当前易修吗？'} 
-                      okText="是" 
-                      cancelText="否" 
-                      onConfirm={() => this.deletedetail(item.id)}
-                    >
+                    <Popconfirm placement="bottom" overlayClassName="overlayBox" getPopupContainer={()=>document.getElementById("hoverBox")} title={'您确定要删除当前易修吗？'} okText="是" cancelText="否" onConfirm={() => this.deletedetail(item.id)}>
                      <i className="iconfont icon-yiguanbi1 font-14"></i>
                    </Popconfirm>
                  </div>
--- a/src/forge/Order/UpdateMilepost.js
+++ b/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(`/${owner}/${projectsId}/milestones`);
+            this.props.history.push(`/projects/${owner}/${projectsId}/milestones`);

          }

--- a/src/forge/Order/newMilepost.js
+++ b/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(`/${owner}/${projectsId}/milestones`);
+            this.props.history.push(`/projects/${owner}/${projectsId}/milestones`);
            const { getDetail } = this.props;
            getDetail && getDetail();
          }
--- a/src/forge/Order/order.css
+++ b/src/forge/Order/order.css
@ -20,9 +20,6 @@
 .overlayBox{
  width: 230px;
 }
-.hideOverlay{
-  display: none;
-}
 .topmilepost {
  box-sizing: border-box;
  display: flex;
--- a/src/forge/Order/order.js
+++ b/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(
-        <CheckProfile {...this.props} className="topWrapper_btn ml10" sureFunc={()=>{window.open(`/${owner}/${projectsId}/issues/new`,'_blank')}}>
+        <Link className="topWrapper_btn ml10" target="_blank" to={`/projects/${owner}/${projectsId}/issues/new`}>
          +&nbsp;创建易修
-        </CheckProfile>
+        </Link>
      )
    }
  }
--- a/src/forge/Order/order_form.js
+++ b/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(`/${owner}/${projectsId}/issues/${result.data.id}`);
+              this.props.history.push(`/projects/${owner}/${projectsId}/issues/${result.data.id}/detail`);
              this.setState({
                description: "",
                isSpin: false,
@ -191,7 +191,7 @@ class order_form extends Component {
            ...values,
          }).then((result) => {
            if (result) {
-              this.props.history.push(`/${owner}/${projectsId}/issues/${orderId}`);
+              this.props.history.push(`/projects/${owner}/${projectsId}/issues/${orderId}/detail`);
              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" ? `/${owner}/${projectsId || orderId}/issues` : `/${owner}/${projectsId}/issues/${orderId}`)}
+                      this.props.history.push(form_type === "new" ? `/projects/${owner}/${projectsId || orderId}/issues` : `/projects/${owner}/${projectsId}/issues/${orderId}/detail`)}
                  >
                    <span className="plr10">取消</span>
                  </Button>
--- a/src/forge/SecuritySetting/Index.jsx
+++ b/src/forge/SecuritySetting/Index.jsx
@ -18,10 +18,6 @@ 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,
@ -39,10 +35,6 @@ 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>
@ -57,12 +49,6 @@ function Index(props){
                    <SSHNew {...props} {...p}/>
                  )}
                ></Route>
-                <Route
-                  path="/settings/profile"
-                  render={(p) => (
-                    <Profile {...props} {...p}/>
-                  )}
-                ></Route>
                <Route
                  path="/settings/SSH"
                  render={(p) => (
--- a/src/forge/SecuritySetting/Index.scss
+++ b/src/forge/SecuritySetting/Index.scss
@ -36,8 +36,6 @@
      .securityUl{
        padding:20px 16px;
        color: #333;
-        margin-bottom: 0px;
-        padding-bottom: 0px;
        li{
          margin-bottom: 10px;
          height: 27px;
@ -124,6 +122,50 @@
    }
  }
 }
+.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;
--- a/src/forge/SecuritySetting/sub/DeleteBox.jsx
+++ b/src/forge/SecuritySetting/sub/DeleteBox.jsx
@ -1,16 +1,17 @@
 import React from 'react';
 import { AlignCenter } from '../../Component/layout';
-import Modals from '../../Component/PublicModal/Index';
-import { Button } from 'antd';
+import { Modal , Button } from 'antd';

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

  // 跳转
  function settingRule(protectBranch){
-    props.history.push(`/${owner}/${projectsId}/settings/branches/${protectBranch}`);
+    props.history.push(`/projects/${owner}/${projectsId}/setting/branch/${protectBranch}`);
  }

  // 翻页
--- a/src/forge/Settings/BranchRule.jsx
+++ b/src/forge/Settings/BranchRule.jsx
@ -290,7 +290,7 @@ export default Form.create()(
            <Cancel
              className="ml30"
              onClick={() => {
-                history.push(`/${owner}/${projectsId}/settings/branches`);
+                history.push(`/projects/${owner}/${projectsId}/setting/branch`);
              }}
            >
              取消
--- a/src/forge/Settings/Collaborator.js
+++ b/src/forge/Settings/Collaborator.js
@ -1,4 +1,4 @@
-import React, { useState , useRef } from "react";
+import React, { useState } from "react";
 import {WhiteBack} from '../Component/layout';
 import AddMember from '../Component/AddMember';
 import AddGroup from '../Component/AddGroup';
@ -8,11 +8,9 @@ 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){
@ -21,7 +19,6 @@ function Collaborator(props){
  function getGroupID(id){
    setNewGroupId(id);
  }
-
  
  return (
    <WhiteBack>
@ -30,17 +27,15 @@ 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);setNewGroupId(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>
          :
          <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>
@ -49,7 +44,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 setAddOperation={setAddOperation} owner={owner} projectsId={projectsId} newGroupId={newGroupId}/>
+          <Group owner={owner} projectsId={projectsId} newGroupId={newGroupId}/>
        }
      </div>
    </WhiteBack>
--- a/src/forge/Settings/CollaboratorGroup.jsx
+++ b/src/forge/Settings/CollaboratorGroup.jsx
@ -10,7 +10,7 @@ const roles = {
  read: "报告者",
 };
 const limit = 15;
-function CollaboratorGroup({ newGroupId, owner, projectsId , setAddOperation }) {
+function CollaboratorGroup({ newGroupId, owner, projectsId }) {
  const [list, setList] = useState(undefined);
  const [isSpin, setIsSpin] = useState(true);
  const [page, setPage] = useState(1);
@ -34,7 +34,6 @@ function CollaboratorGroup({ newGroupId, owner, projectsId , setAddOperation })
          setList(result.data.teams);
          setTotal(result.data.total_count);
          setIsSpin(false);
-          setAddOperation(result.data.can_add);
        }
      })
      .catch((error) => {});
@ -48,15 +47,16 @@ function CollaboratorGroup({ newGroupId, owner, projectsId , setAddOperation })
  // 添加团队
  function addGroup(id) {
    const url = `/${owner}/${projectsId}/teams.json`;
-    axios.post(url, {
-      team_id: id,
-    })
-    .then((result) => {
-      if (result && result.data) {
-        getData();
-      }
-    })
-    .catch((error) => {});
+    axios
+      .post(url, {
+        team_id: id,
+      })
+      .then((result) => {
+        if (result && result.data) {
+          getData();
+        }
+      })
+      .catch((error) => {});
  }

  // 删除团队
@ -77,11 +77,7 @@ function CollaboratorGroup({ newGroupId, owner, projectsId , setAddOperation })
      title: "团队名",
      dataIndex: "name",
      render: (value, item) => {
-        if(item.is_admin || item.is_member){
-          return <Link to={`/${owner}/teams/${item.id}`}>{value}</Link>;
-        }else{
-          return <span>{value}</span>;
-        }
+        return <Link to={`/organize/${owner}/group/${item.id}`}>{value}</Link>;
      },
    },
    {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
caishi	00402ef13d	Merge branch 'master' of https://git.trustie.net/jasder/forgeplus-react # Conflicts: # src/forge/Main/sub/UpdateDescModal.jsx	2021-08-09 10:37:23 +08:00
caishi	8f2df90555	代码style	2021-08-09 10:36:15 +08:00
caishi	7530d3f9c4	Merge branch 'develop'	2021-08-06 17:07:54 +08:00
hc1913847458	b7869e5203	Merge branch 'develop' of https://git.trustie.net/jasder/forgeplus-react	2021-08-05 10:48:43 +08:00
hc1913847458	b238bb51ca	限制字符	2021-08-05 10:47:22 +08:00
hc1913847458	ad7ab189b1	限制字符	2021-08-04 14:42:08 +08:00
caishi	c9802c26a4	Merge branch 'develop'	2021-08-02 10:35:49 +08:00
caishi	4ec840f252	Merge branch 'develop'	2021-07-30 20:13:49 +08:00
caishi	44a8f806e0	Merge branch 'develop'	2021-07-30 17:44:17 +08:00
caishi	9408ad7dcb	Merge branch 'develop'	2021-07-30 17:03:19 +08:00
caishi	810ea37bed	Merge branch 'develop'	2021-07-26 09:38:44 +08:00
caishi	6679fe8a48	Merge branch 'develop'	2021-07-22 17:44:30 +08:00
caishi	d31b932efe	Merge branch 'develop'	2021-07-21 10:10:53 +08:00
caishi	07852b204c	Merge branch 'develop'	2021-07-05 20:35:59 +08:00
caishi	934ac61b77	Merge branch 'develop'	2021-07-02 18:19:02 +08:00
caishi	95091d0e08	Merge branch 'develop'	2021-07-02 15:37:43 +08:00
caishi	e31ff9bdf3	Merge branch 'develop'	2021-07-01 17:00:43 +08:00
caishi	eba6ed0876	搜索的接口改用正式版对应的服务器地址	2021-06-28 10:44:42 +08:00
caishi	db682ace86	Merge branch 'develop'	2021-06-25 18:34:19 +08:00
caishi	777dbd0f43	Merge branch 'develop'	2021-06-25 18:21:48 +08:00
caishi	b44b6530e5	Merge branch 'develop'	2021-06-25 09:14:50 +08:00
caishi	b808bcee99	Merge branch 'develop'	2021-06-18 16:56:18 +08:00
caishi	c0f7c489fb	Merge branch 'develop'	2021-06-11 18:11:43 +08:00
caishi	bc64cbb415	Merge branch 'develop'	2021-06-08 14:56:20 +08:00
caishi	fa169b27cd	Merge branch 'develop'	2021-05-26 16:48:35 +08:00
caishi	3e0814344f	Merge branch 'develop'	2021-05-25 11:25:04 +08:00
caishi	eb58f91dbf	Merge branch 'develop'	2021-05-21 19:21:32 +08:00
caishi	513255428c	Merge branch 'develop' # Conflicts: # package-lock.json	2021-05-14 17:04:57 +08:00
caishi	8baf2cb49c	install babel-polyfill	2021-05-08 17:28:14 +08:00
caishi	705bfb07bd	Merge branch 'develop'	2021-05-08 16:53:26 +08:00
caishi	d783d998fc	编辑合并请求-url地址错误	2021-05-08 14:36:12 +08:00
caishi	51925542b8	Merge branch 'develop' # Conflicts: # public/css/edu-purge.css	2021-05-07 16:37:21 +08:00
caishi	ff06efe109	merge develop	2021-05-06 17:15:43 +08:00
caishi	c33561c212	新建项目-maxlength	2021-05-06 17:14:42 +08:00
caishi	2deb6f8f9d	设置所有标签的marginbottom为0	2021-05-06 17:14:30 +08:00
caishi	63d69a955e	代码库-提交描述未换行	2021-05-06 17:14:19 +08:00
caishi	4d652d238d	不能修改组织账号	2021-04-27 17:25:00 +08:00
caishi	6da4dbc165	组织团队-无数据显示错误	2021-04-27 09:45:14 +08:00
caishi	f65f4c273a	组织基本设置-正则和新建的页面不一致	2021-04-26 16:32:12 +08:00
caishi	1af504825c	代码库编辑文件-切换到其它目录后要重新将编辑状态改为显示状态	2021-04-25 18:00:05 +08:00
caishi	e94cf68cc5	样式覆盖	2021-04-23 18:04:49 +08:00
caishi	5fa2fd99b9	Merge branch 'develop'	2021-04-23 14:51:04 +08:00
caishi	20ab8a6683	Merge branch 'develop'	2021-04-23 14:47:50 +08:00
caishi	a7f709a663	Merge branch 'develop'	2021-04-23 14:16:30 +08:00
caishi	63c2cfed70	Merge branch 'develop'	2021-04-22 10:58:30 +08:00
caishi	80cd6fbae0	md文件要用Markdown渲染	2021-04-20 15:33:21 +08:00
caishi	49d3db6746	合并请求-提出申请者头像显示问题	2021-04-20 11:18:44 +08:00
caishi	bc11ec68e3	注释	2021-04-20 10:57:46 +08:00
caishi	2d2deec224	Merge branch 'develop'	2021-04-20 10:56:50 +08:00
caishi	8c58f77afb	去掉右侧悬浮手册按钮	2021-04-09 14:18:44 +08:00