Merge pull request '关于我们' (#285) from durian/forgeplus-react:about_us into feature_aboutus

# Conflicts:
#	src/forge/Main/tag/Index.jsx

.vscode/settings.json

@@ -0,0 +1,2 @@
+{
+}

config/webpack.config.prod.js

@@ -19,7 +19,8 @@ const getClientEnvironment = require("./env");
 
 let publicPath = "/react/build/";
 const publicUrl = publicPath.slice(0, -1);
-const shouldUseSourceMap = process.env.GENERATE_SOURCEMAP !== "false";
+// const shouldUseSourceMap = process.env.GENERATE_SOURCEMAP !== "false";
+const shouldUseSourceMap = process.env.NODE_ENV !== "production";
 const env = getClientEnvironment(publicPath);
 
 // This is the production configuration.
@@ -54,7 +55,8 @@ module.exports = {
   },
   bail: true,
   mode: "production",
-  devtool: false, //测试版
+  // devtool: false, //测试版
+  devtool: shouldUseSourceMap?'source-map':false,
   entry: [require.resolve("./polyfills"), paths.appIndexJs],
   output: {
     path: paths.appBuild,

package-lock.json

@@ -1273,7 +1273,7 @@
     },
     "babel-cli": {
       "version": "6.26.0",
-      "resolved": "https://registry.npm.taobao.org/babel-cli/download/babel-cli-6.26.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-cli/-/babel-cli-6.26.0.tgz",
       "integrity": "sha1-UCq1SHTX24itALiHoGODzgPQAvE=",
       "dev": true,
       "requires": {
@@ -1296,7 +1296,7 @@
       "dependencies": {
         "chokidar": {
           "version": "1.7.0",
-          "resolved": "https://registry.npm.taobao.org/chokidar/download/chokidar-1.7.0.tgz?cache=0&sync_timestamp=1602585438968&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fchokidar%2Fdownload%2Fchokidar-1.7.0.tgz",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
           "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
           "dev": true,
           "optional": true,
@@ -1314,7 +1314,7 @@
         },
         "source-map": {
           "version": "0.5.7",
-          "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
           "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
           "dev": true
         }
@@ -1413,7 +1413,7 @@
     },
     "babel-helper-bindify-decorators": {
       "version": "6.24.1",
-      "resolved": "https://registry.npm.taobao.org/babel-helper-bindify-decorators/download/babel-helper-bindify-decorators-6.24.1.tgz",
+      "resolved": "https://registry.npmjs.org/babel-helper-bindify-decorators/-/babel-helper-bindify-decorators-6.24.1.tgz",
       "integrity": "sha1-FMGeXxQte0fxmlJDHlKxzLxAozA=",
       "dev": true,
       "requires": {
@@ -1476,7 +1476,7 @@
     },
     "babel-helper-explode-class": {
       "version": "6.24.1",
-      "resolved": "https://registry.npm.taobao.org/babel-helper-explode-class/download/babel-helper-explode-class-6.24.1.tgz",
+      "resolved": "https://registry.npmjs.org/babel-helper-explode-class/-/babel-helper-explode-class-6.24.1.tgz",
       "integrity": "sha1-fcKjkQ3uAHBW4eMdZAztPVTqqes=",
       "dev": true,
       "requires": {
@@ -1676,7 +1676,7 @@
     },
     "babel-plugin-syntax-async-generators": {
       "version": "6.13.0",
-      "resolved": "https://registry.npm.taobao.org/babel-plugin-syntax-async-generators/download/babel-plugin-syntax-async-generators-6.13.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz",
       "integrity": "sha1-a8lj67FuzLrmuStZbrfzXDQqi5o=",
       "dev": true
     },
@@ -1687,7 +1687,7 @@
     },
     "babel-plugin-syntax-decorators": {
       "version": "6.13.0",
-      "resolved": "https://registry.npm.taobao.org/babel-plugin-syntax-decorators/download/babel-plugin-syntax-decorators-6.13.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz",
       "integrity": "sha1-MSVjtNvePMgGzuPkFszurd0RrAs=",
       "dev": true
     },
@@ -1723,7 +1723,7 @@
     },
     "babel-plugin-transform-async-generator-functions": {
       "version": "6.24.1",
-      "resolved": "https://registry.npm.taobao.org/babel-plugin-transform-async-generator-functions/download/babel-plugin-transform-async-generator-functions-6.24.1.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz",
       "integrity": "sha1-8FiQAUX9PpkHpt3yjaWfIVJYpds=",
       "dev": true,
       "requires": {
@@ -1755,7 +1755,7 @@
     },
     "babel-plugin-transform-decorators": {
       "version": "6.24.1",
-      "resolved": "https://registry.npm.taobao.org/babel-plugin-transform-decorators/download/babel-plugin-transform-decorators-6.24.1.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.24.1.tgz",
       "integrity": "sha1-eIAT2PjGtSIr33s0Q5Df13Vp4k0=",
       "dev": true,
       "requires": {
@@ -2060,7 +2060,7 @@
     },
     "babel-plugin-transform-runtime": {
       "version": "6.23.0",
-      "resolved": "https://registry.npm.taobao.org/babel-plugin-transform-runtime/download/babel-plugin-transform-runtime-6.23.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz",
       "integrity": "sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=",
       "requires": {
         "babel-runtime": "^6.22.0"
@@ -2077,7 +2077,7 @@
     },
     "babel-polyfill": {
       "version": "6.26.0",
-      "resolved": "https://registry.npm.taobao.org/babel-polyfill/download/babel-polyfill-6.26.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz",
       "integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=",
       "requires": {
         "babel-runtime": "^6.26.0",
@@ -2087,7 +2087,7 @@
       "dependencies": {
         "regenerator-runtime": {
           "version": "0.10.5",
-          "resolved": "https://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.10.5.tgz?cache=0&sync_timestamp=1595456367497&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregenerator-runtime%2Fdownload%2Fregenerator-runtime-0.10.5.tgz",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz",
           "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg="
         }
       }
@@ -2131,7 +2131,7 @@
     },
     "babel-preset-es2015": {
       "version": "6.24.1",
-      "resolved": "https://registry.npm.taobao.org/babel-preset-es2015/download/babel-preset-es2015-6.24.1.tgz",
+      "resolved": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz",
       "integrity": "sha1-1EBQ1rwsn+6nAqrzjXJ6AhBTiTk=",
       "dev": true,
       "requires": {
@@ -2179,7 +2179,7 @@
     },
     "babel-preset-react": {
       "version": "6.24.1",
-      "resolved": "https://registry.npm.taobao.org/babel-preset-react/download/babel-preset-react-6.24.1.tgz",
+      "resolved": "https://registry.npmjs.org/babel-preset-react/-/babel-preset-react-6.24.1.tgz",
       "integrity": "sha1-umnfrqRfw+xjm2pOzqbhdwLJE4A=",
       "requires": {
         "babel-plugin-syntax-jsx": "^6.3.13",
@@ -2212,7 +2212,7 @@
     },
     "babel-preset-stage-2": {
       "version": "6.24.1",
-      "resolved": "https://registry.npm.taobao.org/babel-preset-stage-2/download/babel-preset-stage-2-6.24.1.tgz",
+      "resolved": "https://registry.npmjs.org/babel-preset-stage-2/-/babel-preset-stage-2-6.24.1.tgz",
       "integrity": "sha1-2eKWD7PXEYfw5k7sYrwHdnIZvcE=",
       "dev": true,
       "requires": {
@@ -2224,7 +2224,7 @@
     },
     "babel-preset-stage-3": {
       "version": "6.24.1",
-      "resolved": "https://registry.npm.taobao.org/babel-preset-stage-3/download/babel-preset-stage-3-6.24.1.tgz",
+      "resolved": "https://registry.npmjs.org/babel-preset-stage-3/-/babel-preset-stage-3-6.24.1.tgz",
       "integrity": "sha1-g2raCp56f6N8sTj7kyb4eTSkg5U=",
       "dev": true,
       "requires": {
@@ -3425,9 +3425,9 @@
       "integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw=="
     },
     "clipboard": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.6.tgz",
-      "integrity": "sha512-g5zbiixBRk/wyKakSwCKd7vQXDjFnAMGHoEyBogG/bw9kTD9GvdAvaoRR1ALcEzt3pVKxZR0pViekPMIS0QyGg==",
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.8.tgz",
+      "integrity": "sha512-Y6WO0unAIQp5bLmk1zdThRhgJt/x3ks6f30s3oE3H1mgIEU33XyQjEf8gsf6DxC7NPX8Y1SsNWjUjL/ywLnnbQ==",
       "requires": {
         "good-listener": "^1.2.2",
         "select": "^1.1.2",
@@ -3507,7 +3507,7 @@
     },
     "code-prettify": {
       "version": "0.1.0",
-      "resolved": "https://registry.npm.taobao.org/code-prettify/download/code-prettify-0.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/code-prettify/-/code-prettify-0.1.0.tgz",
       "integrity": "sha1-RocMyMGlDQm61TmzOpg9vUqjSx4="
     },
     "codemirror": {
@@ -3811,6 +3811,11 @@
         "require-from-string": "^1.1.0"
       }
     },
+    "countup.js": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/countup.js/-/countup.js-2.0.8.tgz",
+      "integrity": "sha512-pW3xwwD+hB+xmtI16xFcuLS0D5hSQqPQWkZOdgpKQyzxCquDNo2VCFPkRw12vmvdpnicXVTcjmYiakG6biwINg=="
+    },
     "create-ecdh": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
@@ -3875,6 +3880,52 @@
         "warning": "^4.0.3"
       }
     },
+    "cross-env": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",
+      "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==",
+      "requires": {
+        "cross-spawn": "^7.0.1"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+          "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+          "requires": {
+            "path-key": "^3.1.0",
+            "shebang-command": "^2.0.0",
+            "which": "^2.0.1"
+          }
+        },
+        "path-key": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
+        },
+        "shebang-command": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+          "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+          "requires": {
+            "shebang-regex": "^3.0.0"
+          }
+        },
+        "shebang-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
+        },
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
+      }
+    },
     "cross-fetch": {
       "version": "3.1.4",
       "resolved": "https://registry.nlark.com/cross-fetch/download/cross-fetch-3.1.4.tgz",
@@ -7240,8 +7291,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "optional": true
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
         },
         "aproba": {
           "version": "1.2.0",
@@ -7262,14 +7312,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-          "optional": true
+          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
         },
         "brace-expansion": {
           "version": "1.1.11",
           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
           "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -7284,20 +7332,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-          "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-          "optional": true
+          "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
         },
         "concat-map": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-          "optional": true
+          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
         },
         "console-control-strings": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-          "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-          "optional": true
+          "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -7414,8 +7459,7 @@
         "inherits": {
           "version": "2.0.4",
           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-          "optional": true
+          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
         },
         "ini": {
           "version": "1.3.5",
@@ -7427,7 +7471,6 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -7442,7 +7485,6 @@
           "version": "3.0.4",
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
           "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -7450,14 +7492,12 @@
         "minimist": {
           "version": "1.2.5",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
-          "optional": true
+          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
         },
         "minipass": {
           "version": "2.9.0",
           "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
           "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -7476,7 +7516,6 @@
           "version": "0.5.3",
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz",
           "integrity": "sha512-P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg==",
-          "optional": true,
           "requires": {
             "minimist": "^1.2.5"
           }
@@ -7538,8 +7577,7 @@
         "npm-normalize-package-bin": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz",
-          "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==",
-          "optional": true
+          "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA=="
         },
         "npm-packlist": {
           "version": "1.4.8",
@@ -7567,8 +7605,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-          "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-          "optional": true
+          "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
         },
         "object-assign": {
           "version": "4.1.1",
@@ -7580,7 +7617,6 @@
           "version": "1.4.0",
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -7658,8 +7694,7 @@
         "safe-buffer": {
           "version": "5.1.2",
           "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "optional": true
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -7695,7 +7730,6 @@
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -7715,7 +7749,6 @@
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -7759,14 +7792,12 @@
         "wrappy": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-          "optional": true
+          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
         },
         "yallist": {
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-          "optional": true
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
         }
       }
     },
@@ -11673,7 +11704,7 @@
     },
     "output-file-sync": {
       "version": "1.1.2",
-      "resolved": "https://registry.npm.taobao.org/output-file-sync/download/output-file-sync-1.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/output-file-sync/-/output-file-sync-1.1.2.tgz",
       "integrity": "sha1-0KM+7+YaIF+suQCS6CZZjVJFznY=",
       "dev": true,
       "requires": {
@@ -14931,6 +14962,14 @@
         "object-assign": "^4.1.1"
       }
     },
+    "react-countup": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/react-countup/-/react-countup-6.1.0.tgz",
+      "integrity": "sha512-0tN65l4ksaNa4rm8ZKshpGxbIHQ4RAh8TGaKYp06EZ7nZw+haXpW3dQTVDhTey9+10jDkJgdzyXKDmC96c1M8g==",
+      "requires": {
+        "countup.js": "^2.0.8"
+      }
+    },
     "react-datepicker": {
       "version": "2.14.1",
       "resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-2.14.1.tgz",
@@ -16586,6 +16625,11 @@
         }
       }
     },
+    "save-dev": {
+      "version": "0.0.1-security",
+      "resolved": "https://registry.npmjs.org/save-dev/-/save-dev-0.0.1-security.tgz",
+      "integrity": "sha512-k6knZTDNK8PKKbIqnvxiOveJinuw2LcQjqDoaorZWP9M5AR2EPsnpDeSbeoZZ0pHr5ze1uoaKdK8NBGQrJ34Uw=="
+    },
     "sax": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
@@ -19100,7 +19144,7 @@
     },
     "user-home": {
       "version": "1.1.1",
-      "resolved": "https://registry.npm.taobao.org/user-home/download/user-home-1.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
       "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=",
       "dev": true
     },
@@ -19157,7 +19201,7 @@
     },
     "v8flags": {
       "version": "2.1.1",
-      "resolved": "https://registry.npm.taobao.org/v8flags/download/v8flags-2.1.1.tgz?cache=0&sync_timestamp=1590964281452&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fv8flags%2Fdownload%2Fv8flags-2.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz",
       "integrity": "sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=",
       "dev": true,
       "requires": {

package.json

@@ -22,10 +22,11 @@
     "case-sensitive-paths-webpack-plugin": "2.1.1",
     "chalk": "1.1.3",
     "classnames": "^2.2.5",
-    "clipboard": "^2.0.6",
+    "clipboard": "^2.0.8",
     "code-prettify": "^0.1.0",
     "codemirror": "^5.53.0",
     "connected-react-router": "4.4.1",
+    "cross-env": "^7.0.3",
     "css-loader": "^3.5.2",
     "dompurify": "^2.0.15",
     "dotenv": "4.0.0",
@@ -83,6 +84,7 @@
     "react-color": "^2.18.0",
     "react-content-loader": "^3.1.1",
     "react-cookies": "^0.1.1",
+    "react-countup": "^6.1.0",
     "react-datepicker": "^2.14.1",
     "react-dev-utils": "^9.2.0-next.80",
     "react-dom": "^16.13.1",
@@ -103,6 +105,7 @@
     "redux-thunk": "2.3.0",
     "rsuite": "^4.3.4",
     "sass-loader": "7.3.1",
+    "save-dev": "0.0.1-security",
     "scroll-into-view": "^1.14.2",
     "showdown": "^1.9.1",
     "showdown-katex": "^0.8.0",
@@ -122,8 +125,8 @@
   },
   "scripts": {
     "start": "node --max_old_space_size=15360 scripts/start.js",
-    "build": "NODE_ENV=production node --max_old_space_size=15360 scripts/build.js",
-    "test-build": "NODE_ENV=testBuild node --max_old_space_size=15360 scripts/build.js",
+    "build": "cross-env NODE_ENV=production node --max_old_space_size=15360 scripts/build.js",
+    "test-build": "cross-env NODE_ENV=testBuild node --max_old_space_size=15360 scripts/build.js",
     "pre-build": "NODE_ENV=preBuild node --max_old_space_size=15360 scripts/build.js",
     "gen_stats": "NODE_ENV=production webpack --profile --config=./config/webpack.config.prod.js --json > stats.json",
     "ana": "webpack-bundle-analyzer ./stats.json",
@@ -193,6 +196,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",

public/css/edu-common.css

@@ -114,14 +114,6 @@ a:visited {
   color: #898989;
 }
 
-a:hover {
-  color: #FF7500;
-}
-
-a:hover.fa {
-  color: #FF7500;
-}
-
 input,
 textarea,
 select {

public/css/edu-main.css

@@ -97,10 +97,6 @@ a:visited {
   color: #05101a;
 }
 
-a:hover {
-  color: #459be5;
-}
-
 ol,
 ul,
 li {

public/css/edu-purge.css

@@ -1,3 +1,4 @@
+@charset "utf-8";
 /* 头部 */
 .header {
   width: 100%;
@@ -1271,7 +1272,7 @@ html body {
   font-size: 14px;
   line-height: 2.0;
   background: #fafafa;
-  font-family: "微软雅黑", "宋体";
+  font-family: "Microsoft YaHei", "SimSun";
   color: #05101a;
   height: 100%;
   position: relative;
@@ -1307,6 +1308,7 @@ td,
 span {
   margin: 0;
   padding: 0;
+  margin-bottom: 0px!important;
 }
 
 table,
@@ -1363,10 +1365,6 @@ a:visited {
   color: #05101a;
 }
 
-a:hover {
-  color: #459be5;
-}
-
 ol,
 ul,
 li {
@@ -1473,7 +1471,7 @@ a.edu-txt-w80,
 
 /*隐藏*/
 .none {
-  display: none
+  display: none!important;
 }
 
 .block {
@@ -1522,7 +1520,15 @@ a.edu-txt-w80,
 .font-16 {
   font-size: 16px !important;
 }
-
+.weight400{
+  font-weight: 400;
+}
+.weight500{
+  font-weight: 500;
+}
+.weight{
+  font-weight: bold;
+}
 .font-17 {
   font-size: 17px !important;
 }
@@ -1542,6 +1548,9 @@ a.edu-txt-w80,
 .font-25 {
   font-size: 25px !important;
 }
+.font-26 {
+  font-size: 26px !important;
+}
 
 .font-24 {
   font-size: 24px !important;
@@ -1563,6 +1572,9 @@ a.edu-txt-w80,
   font-size: 36px !important;
 }
 
+.font-40 {
+  font-size: 40px !important;
+}
 .font-50 {
   font-size: 50px !important;
 }
@@ -1748,6 +1760,14 @@ a.decoration {
   margin-bottom: 10px;
 }
 
+.mb12 {
+  margin-bottom: 12px;
+}
+
+.mb13 {
+  margin-bottom: 13px;
+}
+
 .mb14 {
   margin-bottom: 14px;
 }
@@ -2436,7 +2456,11 @@ a.hoverLine:hover{
 
 
 .color-grey-9 {
-  color: #999999 !important;
+  color: #999 !important;
+}
+
+a:hover{
+  color: #466AFF !important;
 }
 
 .color-grey-98 {
@@ -2471,33 +2495,23 @@ a.hoverLine:hover{
 a.color-grey-name:hover,
 a.color-dark:hover,
 a.color-grey-6:hover,
-a.color-grey-3:hover {
-  color: #4cacff !important;
-}
-
-a.color-grey-9:hover,
-a.color-grey-8:hover,
-a.color-grey-c:hover {
-  color: #111C24 !important;
+a.color-grey-3:hover,a.color-ooo:hover {
+  color: #2A61FF !important;
 }
 
 /*蓝色*/
 .color-blue {
-  color: #4CACFF !important;
+  color: #2A61FF !important;
+}
+.color-blue-file {
+  color: #4598FA!important;
 }
 /* 绿色 */
-.color-green-file{
-  color: #28BD6C;
-}
 /*主*/
 .color-blue_4C {
   color: #4CACFF !important;
 }
 
-a.color-blue:hover,
-a.color-blue_4C:hover {
-  color: #459BE6 !important;
-}
 
 /*橙色*/
 .color-orange {

public/css/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2340181 */
-  src: url('iconfont.woff2?t=1627870211301') format('woff2'),
-       url('iconfont.woff?t=1627870211301') format('woff'),
-       url('iconfont.ttf?t=1627870211301') format('truetype');
+  src: url('iconfont.woff2?t=1632964996877') format('woff2'),
+       url('iconfont.woff?t=1632964996877') format('woff'),
+       url('iconfont.ttf?t=1632964996877') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,322 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-wenjian7:before {
+  content: "\e8e0";
+}
+
+.icon-xiangyoujiantou:before {
+  content: "\e8de";
+}
+
+.icon-xiangzuojiantou:before {
+  content: "\e8df";
+}
+
+.icon-a-liulanicon2x:before {
+  content: "\e8dd";
+}
+
+.icon-wenjianicon:before {
+  content: "\e8dc";
+}
+
+.icon-a-yuanquan2x:before {
+  content: "\e8db";
+}
+
+.icon-xiangmubiaoqian:before {
+  content: "\e8da";
+}
+
+.icon-icon:before {
+  content: "\e8ce";
+}
+
+.icon-tar:before {
+  content: "\e8cf";
+}
+
+.icon-a-fuzhi2:before {
+  content: "\e8d0";
+}
+
+.icon-fujian1:before {
+  content: "\e8d1";
+}
+
+.icon-a-bianji1:before {
+  content: "\e8d2";
+}
+
+.icon-banbenicon:before {
+  content: "\e8d3";
+}
+
+.icon-shanchuicon2:before {
+  content: "\e8d4";
+}
+
+.icon-a-lajitong_icon3x:before {
+  content: "\e8d5";
+}
+
+.icon-xialaanniu2:before {
+  content: "\e8d6";
+}
+
+.icon-xiazai-icon:before {
+  content: "\e8d7";
+}
+
+.icon-master_icon1:before {
+  content: "\e8d8";
+}
+
+.icon-shangchuanicon:before {
+  content: "\e8d9";
+}
+
+.icon-gerenziliao1:before {
+  content: "\e8c7";
+}
+
+.icon-lichengbeiicon:before {
+  content: "\e885";
+}
+
+.icon-cangkushezhiicon:before {
+  content: "\e889";
+}
+
+.icon-dongtaiicon:before {
+  content: "\e88a";
+}
+
+.icon-gongzuoliuicon:before {
+  content: "\e88b";
+}
+
+.icon-yixiuicon1:before {
+  content: "\e89b";
+}
+
+.icon-a-wikiicon1:before {
+  content: "\e8c6";
+}
+
+.icon-daimakuicon1:before {
+  content: "\e8c5";
+}
+
+.icon-wodetongzhi:before {
+  content: "\e8c8";
+}
+
+.icon-tongzhiguanli:before {
+  content: "\e8c9";
+}
+
+.icon-xuanzhong3:before {
+  content: "\e8ca";
+}
+
+.icon-xitongtongzhiicon:before {
+  content: "\e8cb";
+}
+
+.icon-xiaoxi2:before {
+  content: "\e8cc";
+}
+
+.icon-sshmiyue:before {
+  content: "\e8cd";
+}
+
+.icon-gerenziliao:before {
+  content: "\e8c4";
+}
+
+.icon-xinshouzhiyin:before {
+  content: "\e8e4";
+}
+
+.icon-xinjianxiangmu:before {
+  content: "\e8e6";
+}
+
+.icon-jiaruketang1:before {
+  content: "\e8e9";
+}
+
+.icon-xiangmugonggao:before {
+  content: "\e8c2";
+}
+
+.icon-chengguo:before {
+  content: "\e8c3";
+}
+
+.icon-chengjiaogonggao:before {
+  content: "\e8c0";
+}
+
+.icon-jishuzichan:before {
+  content: "\e8c1";
+}
+
+.icon-feibiaogonggao:before {
+  content: "\e8bc";
+}
+
+.icon-zhongbiaogonggao:before {
+  content: "\e8bd";
+}
+
+.icon-gengzhenggonggao:before {
+  content: "\e8be";
+}
+
+.icon-zhaobiaogonggao:before {
+  content: "\e8bf";
+}
+
+.icon-wenjian6:before {
+  content: "\e8ba";
+}
+
+.icon-wenjianjia4:before {
+  content: "\e8bb";
+}
+
+.icon-quxiaoguanzhu:before {
+  content: "\e89a";
+}
+
+.icon-dianzan_icon:before {
+  content: "\e8a2";
+}
+
+.icon-wenjian5:before {
+  content: "\e896";
+}
+
+.icon-wenjianjia3:before {
+  content: "\e8a9";
+}
+
+.icon-fuzhiicon:before {
+  content: "\e886";
+}
+
+.icon-zhuye-fill:before {
+  content: "\e876";
+}
+
+.icon-daimakuicon:before {
+  content: "\e884";
+}
+
+.icon-xinjian2:before {
+  content: "\e8b0";
+}
+
+.icon-xieyiicon:before {
+  content: "\e870";
+}
+
+.icon-neicunicon:before {
+  content: "\e891";
+}
+
+.icon-zishuwenjian_icon:before {
+  content: "\e8a6";
+}
+
+.icon-biaoqianicon:before {
+  content: "\e882";
+}
+
+.icon-a-bianji:before {
+  content: "\e883";
+}
+
+.icon-lianjieicon:before {
+  content: "\e887";
+}
+
+.icon-hebingqingqiuicon:before {
+  content: "\e888";
+}
+
+.icon-morendianzan_icon:before {
+  content: "\e88e";
+}
+
+.icon-muluicon:before {
+  content: "\e894";
+}
+
+.icon-a-shezhi:before {
+  content: "\e899";
+}
+
+.icon-tijiaoicon:before {
+  content: "\e89e";
+}
+
+.icon-morenguanzhu_ICON:before {
+  content: "\e89f";
+}
+
+.icon-xialaanniu1:before {
+  content: "\e8a4";
+}
+
+.icon-zuohuaicon:before {
+  content: "\e8b5";
+}
+
+.icon-master_icon:before {
+  content: "\e8b6";
+}
+
+.icon-morenfuke_icon:before {
+  content: "\e8b7";
+}
+
+.icon-a-wikiicon:before {
+  content: "\e8b8";
+}
+
+.icon-yixiuicon:before {
+  content: "\e8b9";
+}
+
+.icon-suofang:before {
+  content: "\e87f";
+}
+
+.icon-fangdaicon:before {
+  content: "\e881";
+}
+
+.icon-sousuo_icon1:before {
+  content: "\e873";
+}
+
+.icon-huanying_icon:before {
+  content: "\e878";
+}
+
+.icon-wenjianjia2:before {
+  content: "\e879";
+}
+
+.icon-shanchuicon1:before {
+  content: "\e87a";
+}
+
 .icon-qingqiuicon:before {
   content: "\e871";
 }
@@ -49,22 +365,10 @@
   content: "\e898";
 }
 
-.icon-xialaanniu_icon:before {
-  content: "\e89a";
-}
-
-.icon-weixuanzhongqingqiuicon:before {
-  content: "\e89b";
-}
-
 .icon-xiezuozheguanliicon:before {
   content: "\e8a1";
 }
 
-.icon-xuanzhongxiangyingicon:before {
-  content: "\e8a2";
-}
-
 .icon-xuanzhongfenzhiicon:before {
   content: "\e8a3";
 }
@@ -81,18 +385,6 @@
   content: "\e8af";
 }
 
-.icon-xinzengmulu_xuantingicon:before {
-  content: "\e884";
-}
-
-.icon-xinzengyemian_morenicon:before {
-  content: "\e885";
-}
-
-.icon-zhankai_morenicon:before {
-  content: "\e889";
-}
-
 .icon-shanchu_tc_icon:before {
   content: "\e88c";
 }
@@ -101,26 +393,14 @@
   content: "\e88d";
 }
 
-.icon-xinzengyemian_shubiaodianjiicon:before {
-  content: "\e88e";
-}
-
 .icon-daorumoban_icon:before {
   content: "\e86f";
 }
 
-.icon-daochu_xuanfu:before {
-  content: "\e870";
-}
-
 .icon-cuowu:before {
   content: "\e872";
 }
 
-.icon-chenggong1:before {
-  content: "\e873";
-}
-
 .icon-gengduo_icon:before {
   content: "\e874";
 }
@@ -129,26 +409,10 @@
   content: "\e875";
 }
 
-.icon-fuzhi_icon:before {
-  content: "\e876";
-}
-
 .icon-shanchuicon:before {
   content: "\e877";
 }
 
-.icon-a-lajitong_icon3x:before {
-  content: "\e878";
-}
-
-.icon-shouqi_morenicon:before {
-  content: "\e879";
-}
-
-.icon-huanying_icon:before {
-  content: "\e87a";
-}
-
 .icon-sousuo_shanchuicon:before {
   content: "\e87b";
 }
@@ -161,22 +425,10 @@
   content: "\e87e";
 }
 
-.icon-wenjianjia_icon:before {
-  content: "\e87f";
-}
-
 .icon-xialaanniu:before {
   content: "\e880";
 }
 
-.icon-xinzengmulu_morenicon:before {
-  content: "\e882";
-}
-
-.icon-xinzengmulu_shubiaodianjiicon:before {
-  content: "\e883";
-}
-
 .icon-erciqueren_icon:before {
   content: "\e867";
 }

public/css/iconfont.json

@@ -5,6 +5,559 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "24656750",
+      "name": "文件",
+      "font_class": "wenjian7",
+      "unicode": "e8e0",
+      "unicode_decimal": 59616
+    },
+    {
+      "icon_id": "630094",
+      "name": "向右箭头",
+      "font_class": "xiangyoujiantou",
+      "unicode": "e8de",
+      "unicode_decimal": 59614
+    },
+    {
+      "icon_id": "630095",
+      "name": "向左箭头",
+      "font_class": "xiangzuojiantou",
+      "unicode": "e8df",
+      "unicode_decimal": 59615
+    },
+    {
+      "icon_id": "24600282",
+      "name": "浏览icon@2x",
+      "font_class": "a-liulanicon2x",
+      "unicode": "e8dd",
+      "unicode_decimal": 59613
+    },
+    {
+      "icon_id": "24567893",
+      "name": "文件icon",
+      "font_class": "wenjianicon",
+      "unicode": "e8dc",
+      "unicode_decimal": 59612
+    },
+    {
+      "icon_id": "24527422",
+      "name": "圆圈@2x",
+      "font_class": "a-yuanquan2x",
+      "unicode": "e8db",
+      "unicode_decimal": 59611
+    },
+    {
+      "icon_id": "24378423",
+      "name": "项目标签",
+      "font_class": "xiangmubiaoqian",
+      "unicode": "e8da",
+      "unicode_decimal": 59610
+    },
+    {
+      "icon_id": "24368060",
+      "name": "icon",
+      "font_class": "icon",
+      "unicode": "e8ce",
+      "unicode_decimal": 59598
+    },
+    {
+      "icon_id": "24368061",
+      "name": "tar",
+      "font_class": "tar",
+      "unicode": "e8cf",
+      "unicode_decimal": 59599
+    },
+    {
+      "icon_id": "24289113",
+      "name": "复制 (2)",
+      "font_class": "a-fuzhi2",
+      "unicode": "e8d0",
+      "unicode_decimal": 59600
+    },
+    {
+      "icon_id": "24289114",
+      "name": "附件",
+      "font_class": "fujian1",
+      "unicode": "e8d1",
+      "unicode_decimal": 59601
+    },
+    {
+      "icon_id": "24289115",
+      "name": "编 辑",
+      "font_class": "a-bianji1",
+      "unicode": "e8d2",
+      "unicode_decimal": 59602
+    },
+    {
+      "icon_id": "24289116",
+      "name": "版本icon",
+      "font_class": "banbenicon",
+      "unicode": "e8d3",
+      "unicode_decimal": 59603
+    },
+    {
+      "icon_id": "24289117",
+      "name": "删除icon",
+      "font_class": "shanchuicon2",
+      "unicode": "e8d4",
+      "unicode_decimal": 59604
+    },
+    {
+      "icon_id": "24289118",
+      "name": "垃圾桶_icon@3x",
+      "font_class": "a-lajitong_icon3x",
+      "unicode": "e8d5",
+      "unicode_decimal": 59605
+    },
+    {
+      "icon_id": "24289119",
+      "name": "下拉按钮",
+      "font_class": "xialaanniu2",
+      "unicode": "e8d6",
+      "unicode_decimal": 59606
+    },
+    {
+      "icon_id": "24289120",
+      "name": "下载-icon",
+      "font_class": "xiazai-icon",
+      "unicode": "e8d7",
+      "unicode_decimal": 59607
+    },
+    {
+      "icon_id": "24289121",
+      "name": "master_icon",
+      "font_class": "master_icon1",
+      "unicode": "e8d8",
+      "unicode_decimal": 59608
+    },
+    {
+      "icon_id": "24289122",
+      "name": "上传icon",
+      "font_class": "shangchuanicon",
+      "unicode": "e8d9",
+      "unicode_decimal": 59609
+    },
+    {
+      "icon_id": "24059956",
+      "name": "个人资料",
+      "font_class": "gerenziliao1",
+      "unicode": "e8c7",
+      "unicode_decimal": 59591
+    },
+    {
+      "icon_id": "24059409",
+      "name": "里程碑icon",
+      "font_class": "lichengbeiicon",
+      "unicode": "e885",
+      "unicode_decimal": 59525
+    },
+    {
+      "icon_id": "24059410",
+      "name": "仓库设置icon",
+      "font_class": "cangkushezhiicon",
+      "unicode": "e889",
+      "unicode_decimal": 59529
+    },
+    {
+      "icon_id": "24059411",
+      "name": "动态icon",
+      "font_class": "dongtaiicon",
+      "unicode": "e88a",
+      "unicode_decimal": 59530
+    },
+    {
+      "icon_id": "24059412",
+      "name": "工作流icon",
+      "font_class": "gongzuoliuicon",
+      "unicode": "e88b",
+      "unicode_decimal": 59531
+    },
+    {
+      "icon_id": "24059413",
+      "name": "易修icon",
+      "font_class": "yixiuicon1",
+      "unicode": "e89b",
+      "unicode_decimal": 59547
+    },
+    {
+      "icon_id": "24059414",
+      "name": "wiki icon",
+      "font_class": "a-wikiicon1",
+      "unicode": "e8c6",
+      "unicode_decimal": 59590
+    },
+    {
+      "icon_id": "24047186",
+      "name": "代码库icon",
+      "font_class": "daimakuicon1",
+      "unicode": "e8c5",
+      "unicode_decimal": 59589
+    },
+    {
+      "icon_id": "24047189",
+      "name": "我的通知",
+      "font_class": "wodetongzhi",
+      "unicode": "e8c8",
+      "unicode_decimal": 59592
+    },
+    {
+      "icon_id": "24047190",
+      "name": "通知管理",
+      "font_class": "tongzhiguanli",
+      "unicode": "e8c9",
+      "unicode_decimal": 59593
+    },
+    {
+      "icon_id": "24047191",
+      "name": "选中",
+      "font_class": "xuanzhong3",
+      "unicode": "e8ca",
+      "unicode_decimal": 59594
+    },
+    {
+      "icon_id": "24047192",
+      "name": "系统通知icon",
+      "font_class": "xitongtongzhiicon",
+      "unicode": "e8cb",
+      "unicode_decimal": 59595
+    },
+    {
+      "icon_id": "24047193",
+      "name": "消息",
+      "font_class": "xiaoxi2",
+      "unicode": "e8cc",
+      "unicode_decimal": 59596
+    },
+    {
+      "icon_id": "24047194",
+      "name": "ssh密钥",
+      "font_class": "sshmiyue",
+      "unicode": "e8cd",
+      "unicode_decimal": 59597
+    },
+    {
+      "icon_id": "24014152",
+      "name": "个人资料",
+      "font_class": "gerenziliao",
+      "unicode": "e8c4",
+      "unicode_decimal": 59588
+    },
+    {
+      "icon_id": "23655968",
+      "name": "新手指引",
+      "font_class": "xinshouzhiyin",
+      "unicode": "e8e4",
+      "unicode_decimal": 59620
+    },
+    {
+      "icon_id": "23655969",
+      "name": "新建项目",
+      "font_class": "xinjianxiangmu",
+      "unicode": "e8e6",
+      "unicode_decimal": 59622
+    },
+    {
+      "icon_id": "23658111",
+      "name": "加入课堂",
+      "font_class": "jiaruketang1",
+      "unicode": "e8e9",
+      "unicode_decimal": 59625
+    },
+    {
+      "icon_id": "23791639",
+      "name": "项目公告",
+      "font_class": "xiangmugonggao",
+      "unicode": "e8c2",
+      "unicode_decimal": 59586
+    },
+    {
+      "icon_id": "23791640",
+      "name": "成果",
+      "font_class": "chengguo",
+      "unicode": "e8c3",
+      "unicode_decimal": 59587
+    },
+    {
+      "icon_id": "23791410",
+      "name": "成交公告",
+      "font_class": "chengjiaogonggao",
+      "unicode": "e8c0",
+      "unicode_decimal": 59584
+    },
+    {
+      "icon_id": "23791411",
+      "name": "技术资产",
+      "font_class": "jishuzichan",
+      "unicode": "e8c1",
+      "unicode_decimal": 59585
+    },
+    {
+      "icon_id": "23790928",
+      "name": "废标公告",
+      "font_class": "feibiaogonggao",
+      "unicode": "e8bc",
+      "unicode_decimal": 59580
+    },
+    {
+      "icon_id": "23790929",
+      "name": "中标公告",
+      "font_class": "zhongbiaogonggao",
+      "unicode": "e8bd",
+      "unicode_decimal": 59581
+    },
+    {
+      "icon_id": "23790930",
+      "name": "更正公告",
+      "font_class": "gengzhenggonggao",
+      "unicode": "e8be",
+      "unicode_decimal": 59582
+    },
+    {
+      "icon_id": "23790931",
+      "name": "招标公告",
+      "font_class": "zhaobiaogonggao",
+      "unicode": "e8bf",
+      "unicode_decimal": 59583
+    },
+    {
+      "icon_id": "23732532",
+      "name": "文件",
+      "font_class": "wenjian6",
+      "unicode": "e8ba",
+      "unicode_decimal": 59578
+    },
+    {
+      "icon_id": "23732533",
+      "name": "文件夹",
+      "font_class": "wenjianjia4",
+      "unicode": "e8bb",
+      "unicode_decimal": 59579
+    },
+    {
+      "icon_id": "23642443",
+      "name": "取消关注",
+      "font_class": "quxiaoguanzhu",
+      "unicode": "e89a",
+      "unicode_decimal": 59546
+    },
+    {
+      "icon_id": "23642444",
+      "name": "点赞_icon",
+      "font_class": "dianzan_icon",
+      "unicode": "e8a2",
+      "unicode_decimal": 59554
+    },
+    {
+      "icon_id": "23639530",
+      "name": "文件",
+      "font_class": "wenjian5",
+      "unicode": "e896",
+      "unicode_decimal": 59542
+    },
+    {
+      "icon_id": "23639533",
+      "name": "文件夹",
+      "font_class": "wenjianjia3",
+      "unicode": "e8a9",
+      "unicode_decimal": 59561
+    },
+    {
+      "icon_id": "23639440",
+      "name": "复制icon",
+      "font_class": "fuzhiicon",
+      "unicode": "e886",
+      "unicode_decimal": 59526
+    },
+    {
+      "icon_id": "23639422",
+      "name": "主页-fill",
+      "font_class": "zhuye-fill",
+      "unicode": "e876",
+      "unicode_decimal": 59510
+    },
+    {
+      "icon_id": "23639423",
+      "name": "代码库icon",
+      "font_class": "daimakuicon",
+      "unicode": "e884",
+      "unicode_decimal": 59524
+    },
+    {
+      "icon_id": "23572260",
+      "name": "新建",
+      "font_class": "xinjian2",
+      "unicode": "e8b0",
+      "unicode_decimal": 59568
+    },
+    {
+      "icon_id": "23567674",
+      "name": "协议icon",
+      "font_class": "xieyiicon",
+      "unicode": "e870",
+      "unicode_decimal": 59504
+    },
+    {
+      "icon_id": "23567675",
+      "name": "内存icon",
+      "font_class": "neicunicon",
+      "unicode": "e891",
+      "unicode_decimal": 59537
+    },
+    {
+      "icon_id": "23567676",
+      "name": "自述文件_icon",
+      "font_class": "zishuwenjian_icon",
+      "unicode": "e8a6",
+      "unicode_decimal": 59558
+    },
+    {
+      "icon_id": "23472253",
+      "name": "标签icon",
+      "font_class": "biaoqianicon",
+      "unicode": "e882",
+      "unicode_decimal": 59522
+    },
+    {
+      "icon_id": "23472254",
+      "name": "编 辑",
+      "font_class": "a-bianji",
+      "unicode": "e883",
+      "unicode_decimal": 59523
+    },
+    {
+      "icon_id": "23472258",
+      "name": "链接icon",
+      "font_class": "lianjieicon",
+      "unicode": "e887",
+      "unicode_decimal": 59527
+    },
+    {
+      "icon_id": "23472259",
+      "name": "合并请求icon",
+      "font_class": "hebingqingqiuicon",
+      "unicode": "e888",
+      "unicode_decimal": 59528
+    },
+    {
+      "icon_id": "23472263",
+      "name": "默认点赞_icon",
+      "font_class": "morendianzan_icon",
+      "unicode": "e88e",
+      "unicode_decimal": 59534
+    },
+    {
+      "icon_id": "23472265",
+      "name": "目录icon",
+      "font_class": "muluicon",
+      "unicode": "e894",
+      "unicode_decimal": 59540
+    },
+    {
+      "icon_id": "23472267",
+      "name": "设 置",
+      "font_class": "a-shezhi",
+      "unicode": "e899",
+      "unicode_decimal": 59545
+    },
+    {
+      "icon_id": "23472269",
+      "name": "提交icon",
+      "font_class": "tijiaoicon",
+      "unicode": "e89e",
+      "unicode_decimal": 59550
+    },
+    {
+      "icon_id": "23472270",
+      "name": "默认关注_ICON",
+      "font_class": "morenguanzhu_ICON",
+      "unicode": "e89f",
+      "unicode_decimal": 59551
+    },
+    {
+      "icon_id": "23472272",
+      "name": "下拉按钮",
+      "font_class": "xialaanniu1",
+      "unicode": "e8a4",
+      "unicode_decimal": 59556
+    },
+    {
+      "icon_id": "23472276",
+      "name": "左滑icon",
+      "font_class": "zuohuaicon",
+      "unicode": "e8b5",
+      "unicode_decimal": 59573
+    },
+    {
+      "icon_id": "23472277",
+      "name": "master_icon",
+      "font_class": "master_icon",
+      "unicode": "e8b6",
+      "unicode_decimal": 59574
+    },
+    {
+      "icon_id": "23472278",
+      "name": "默认复刻_icon",
+      "font_class": "morenfuke_icon",
+      "unicode": "e8b7",
+      "unicode_decimal": 59575
+    },
+    {
+      "icon_id": "23472279",
+      "name": "wiki icon",
+      "font_class": "a-wikiicon",
+      "unicode": "e8b8",
+      "unicode_decimal": 59576
+    },
+    {
+      "icon_id": "23472280",
+      "name": "易修icon",
+      "font_class": "yixiuicon",
+      "unicode": "e8b9",
+      "unicode_decimal": 59577
+    },
+    {
+      "icon_id": "23436350",
+      "name": "缩放",
+      "font_class": "suofang",
+      "unicode": "e87f",
+      "unicode_decimal": 59519
+    },
+    {
+      "icon_id": "23436351",
+      "name": "放大icon",
+      "font_class": "fangdaicon",
+      "unicode": "e881",
+      "unicode_decimal": 59521
+    },
+    {
+      "icon_id": "23384231",
+      "name": "搜索_icon",
+      "font_class": "sousuo_icon1",
+      "unicode": "e873",
+      "unicode_decimal": 59507
+    },
+    {
+      "icon_id": "23384232",
+      "name": "欢迎_icon",
+      "font_class": "huanying_icon",
+      "unicode": "e878",
+      "unicode_decimal": 59512
+    },
+    {
+      "icon_id": "23384233",
+      "name": "文件夹",
+      "font_class": "wenjianjia2",
+      "unicode": "e879",
+      "unicode_decimal": 59513
+    },
+    {
+      "icon_id": "23384234",
+      "name": "删除icon",
+      "font_class": "shanchuicon1",
+      "unicode": "e87a",
+      "unicode_decimal": 59514
+    },
     {
       "icon_id": "23261798",
       "name": "请求icon",
@@ -68,20 +621,6 @@
       "unicode": "e898",
       "unicode_decimal": 59544
     },
-    {
-      "icon_id": "23144154",
-      "name": "下拉按钮_icon",
-      "font_class": "xialaanniu_icon",
-      "unicode": "e89a",
-      "unicode_decimal": 59546
-    },
-    {
-      "icon_id": "23144155",
-      "name": "未选中请求icon",
-      "font_class": "weixuanzhongqingqiuicon",
-      "unicode": "e89b",
-      "unicode_decimal": 59547
-    },
     {
       "icon_id": "23144158",
       "name": "协作者管理icon",
@@ -89,13 +628,6 @@
       "unicode": "e8a1",
       "unicode_decimal": 59553
     },
-    {
-      "icon_id": "23144159",
-      "name": "选中响应icon",
-      "font_class": "xuanzhongxiangyingicon",
-      "unicode": "e8a2",
-      "unicode_decimal": 59554
-    },
     {
       "icon_id": "23144160",
       "name": "选中分支icon",
@@ -124,27 +656,6 @@
       "unicode": "e8af",
       "unicode_decimal": 59567
     },
-    {
-      "icon_id": "23046282",
-      "name": "新增目录_悬停icon",
-      "font_class": "xinzengmulu_xuantingicon",
-      "unicode": "e884",
-      "unicode_decimal": 59524
-    },
-    {
-      "icon_id": "23046283",
-      "name": "新增页面_默认icon",
-      "font_class": "xinzengyemian_morenicon",
-      "unicode": "e885",
-      "unicode_decimal": 59525
-    },
-    {
-      "icon_id": "23046287",
-      "name": "展开_默认icon",
-      "font_class": "zhankai_morenicon",
-      "unicode": "e889",
-      "unicode_decimal": 59529
-    },
     {
       "icon_id": "23046290",
       "name": "shanchu_tc_icon",
@@ -159,13 +670,6 @@
       "unicode": "e88d",
       "unicode_decimal": 59533
     },
-    {
-      "icon_id": "23046311",
-      "name": "新增页面_鼠标点击icon",
-      "font_class": "xinzengyemian_shubiaodianjiicon",
-      "unicode": "e88e",
-      "unicode_decimal": 59534
-    },
     {
       "icon_id": "23046244",
       "name": "导入模版_icon",
@@ -173,13 +677,6 @@
       "unicode": "e86f",
       "unicode_decimal": 59503
     },
-    {
-      "icon_id": "23046247",
-      "name": "导出_悬浮",
-      "font_class": "daochu_xuanfu",
-      "unicode": "e870",
-      "unicode_decimal": 59504
-    },
     {
       "icon_id": "23046252",
       "name": "错误",
@@ -187,13 +684,6 @@
       "unicode": "e872",
       "unicode_decimal": 59506
     },
-    {
-      "icon_id": "23046254",
-      "name": "成功",
-      "font_class": "chenggong1",
-      "unicode": "e873",
-      "unicode_decimal": 59507
-    },
     {
       "icon_id": "23046255",
       "name": "更多_icon",
@@ -208,13 +698,6 @@
       "unicode": "e875",
       "unicode_decimal": 59509
     },
-    {
-      "icon_id": "23046262",
-      "name": "复制_icon",
-      "font_class": "fuzhi_icon",
-      "unicode": "e876",
-      "unicode_decimal": 59510
-    },
     {
       "icon_id": "23046268",
       "name": "删除icon",
@@ -222,27 +705,6 @@
       "unicode": "e877",
       "unicode_decimal": 59511
     },
-    {
-      "icon_id": "23046269",
-      "name": "垃圾桶_icon@3x",
-      "font_class": "a-lajitong_icon3x",
-      "unicode": "e878",
-      "unicode_decimal": 59512
-    },
-    {
-      "icon_id": "23046270",
-      "name": "收起_默认icon",
-      "font_class": "shouqi_morenicon",
-      "unicode": "e879",
-      "unicode_decimal": 59513
-    },
-    {
-      "icon_id": "23046271",
-      "name": "欢迎_icon",
-      "font_class": "huanying_icon",
-      "unicode": "e87a",
-      "unicode_decimal": 59514
-    },
     {
       "icon_id": "23046273",
       "name": "搜索_删除icon",
@@ -264,13 +726,6 @@
       "unicode": "e87e",
       "unicode_decimal": 59518
     },
-    {
-      "icon_id": "23046277",
-      "name": "文件夹_icon",
-      "font_class": "wenjianjia_icon",
-      "unicode": "e87f",
-      "unicode_decimal": 59519
-    },
     {
       "icon_id": "23046278",
       "name": "下拉按钮",
@@ -278,20 +733,6 @@
       "unicode": "e880",
       "unicode_decimal": 59520
     },
-    {
-      "icon_id": "23046280",
-      "name": "新增目录_默认icon",
-      "font_class": "xinzengmulu_morenicon",
-      "unicode": "e882",
-      "unicode_decimal": 59522
-    },
-    {
-      "icon_id": "23046281",
-      "name": "新增目录_鼠标点击icon",
-      "font_class": "xinzengmulu_shubiaodianjiicon",
-      "unicode": "e883",
-      "unicode_decimal": 59523
-    },
     {
       "icon_id": "22906287",
       "name": "二次确认_icon",

public/js/editormd/editormd.min.js

@@ -3319,9 +3319,9 @@
                     text = text.replace(emailReg, function ($1, $2, $3, $4) {
                         return $1.replace(/@/g, "_#_@_#_");
                     });
-
+                    // " + editormd.urls.atLinkBase + "" + $2 + "
                     text = text.replace(atLinkReg, function ($1, $2) {
-                        return "<a href=\"" + editormd.urls.atLinkBase + "" + $2 + "\" title=\"&#64;" + $2 + "\" class=\"at-link\">" + $1 + "</a>";
+                        return "<span title=\"&#64;" + $2 + "\" class=\"at-link\"> " + $1 + " </span>";
                     }).replace(/_#_&#64;_#_/g, "@");
                 }
 

src/App.js

@@ -3,7 +3,7 @@ import './App.css';
 import { ConfigProvider } from 'antd'
 import zhCN from 'antd/lib/locale-provider/zh_CN';
 import {
-	BrowserRouter as Router,
+	// BrowserRouter as Router,
 	Route,
 	Switch
 } from 'react-router-dom';
@@ -19,7 +19,7 @@ import moment from 'moment'
 import { MuiThemeProvider, createMuiTheme } from 'material-ui/styles';
 import SiderBar from './forge/Component/SiderBar'
 
-import { SnackbarHOC } from 'educoder'
+import { SnackbarHOC } from 'educoder';
 import { initAxiosInterceptors } from './AppConfig'
 import { Provider } from 'react-redux';
 import configureStore from './redux/stores/configureStore';
@@ -39,6 +39,11 @@ const Projects = Loadable({
 	loader: () => import('./forge/Index'),
 	loading: Loading,
 })
+// forge项目详情
+const ProjectDetail = Loadable({
+  loader: () => import("./forge/Main/DetailAdaptor"),
+  loading: Loading,
+});
 //forge安全设置
 const Security = Loadable({
 	loader: () => import('./forge/SecuritySetting/Index'),
@@ -82,11 +87,29 @@ 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,
+	loader: () => import("./forge/Index"),
+	loading: Loading,
 });
+
+const AboutUs = Loadable({
+	loader: () => import("./forge/AboutUs/AboutUs"),
+	loading: Loading,
+})
+
+// const CreateMerge = Loadable({
+//   loader: () => import('./forge/Merge/NewMerge'),
+//   loading: Loading,
+// })
+
+// 此处仅维护前端可能的一级路由，不用进行项目或者组织判断的字段。
+const keyWord = ["explore", "settings", "setting", "mulan", "wiki", "issues", "setting", "trending", "code", "projects", "pulls", "mine", "login", "register", "email", "export", "nopage", "404", "403", "500", "501", "search", "organize", "aboutus"];
+
 class App extends Component {
 	constructor(props) {
 		super(props);
@@ -96,6 +119,51 @@ class App extends Component {
 			mydisplay: false,
 			occupation: 0,
 			mygetHelmetapi: null,
+			pathType: null,
+			pathName: null,
+		}
+	}
+
+	UNSAFE_componentWillMount() {
+		initAxiosInterceptors(this.props);
+		let pathname = window.location.pathname ? window.location.pathname.split('/')[1] : '';
+		pathname && this.getPathnameType(pathname);
+
+		// 添加路由监听，决定组织还是个人
+		this.unlisten = this.props.history.listen((location) => {
+			let newPathname = location.pathname.split('/')[1];
+			if (this.state.pathName !== newPathname) {
+				// this.setState({ pathType: '' });
+				newPathname && this.getPathnameType(newPathname);
+			}
+		});
+	}
+
+	shouldComponentUpdate(nextProps, nextState) {
+		// (!keyWord.includes(this.props.location.pathname.split('/')[1])) &&
+		if (nextProps.location.pathname.split('/')[1] !== this.props.location.pathname.split('/')[1] && nextState.pathType === this.state.pathType) {
+			return false;
+		} else {
+			return true;
+		}
+	}
+
+	getPathnameType = (pathname) => {
+		if (!keyWord.includes(pathname)) {
+			let url = `/owners/${pathname}.json`;
+			axios.get(url).then((response) => {
+				if (response && response.status === 200) {
+					this.setState({
+						pathType: response.data.type || '404',
+						pathName: pathname,
+					})
+				}
+			});
+		}else{
+			this.setState({
+				pathType: pathname,
+				pathName: pathname,
+			});
 		}
 	}
 
@@ -115,13 +183,19 @@ class App extends Component {
 
 	componentDidMount() {
 		document.title = "loading...";
-		initAxiosInterceptors(this.props);
+
 		this.getAppdata();
 
 		window.addEventListener('error', (event) => {
 			const msg = `${event.type}: ${event.message}`;
 		});
+
 	}
+
+	componentWillUnmount() {
+		this.unlisten && this.unlisten(); // 执行解绑
+	}
+
 	//修改登录方法
 	Modifyloginvalue = () => {
 		this.setState({
@@ -192,87 +266,144 @@ class App extends Component {
 	};
 
 	render() {
-		const { mygetHelmetapi } = this.state;
+		const { mygetHelmetapi, pathType} = this.state;
 		let personal = mygetHelmetapi && mygetHelmetapi.personal;
 		return (
 			<Provider store={store}>
 				<ConfigProvider locale={zhCN}>
 					<MuiThemeProvider theme={theme}>
 						<LoginDialog {...this.props} {...this.state} Modifyloginvalue={() => this.Modifyloginvalue()}></LoginDialog>
-						<SiderBar/>
-						<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} />)
-										}
+						<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/compare"
+								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} />)
 									}
-								/>
-								{/*403*/}
-								<Route path="/403" component={Shixunauthority} />
+								}>
+							</Route>
+							<Route
+								path={"/settings"}
+								render={
+									(props) => {
+										return (<Security {...this.props} {...props} {...this.state} />)
+									}
+								}>
+							</Route>
 
-								<Route path="/500" component={http500} />
-								<Route path={"/organize"}
-									render={
-										(props) => {
-											return (<OrganizeIndex {...props} {...this.props} {...this.state} />)
-										}
-									}>
-								</Route>
-								{/*404*/}
-								<Route path="/nopage" component={Shixunnopage} />
+							<Route
+								path="/register"
+								render={
+									(props) => {
+										return (<EducoderLogin {...this.props} {...props} {...this.state} />)
+									}
+								}
+							/>
+							{/*403*/}
+							<Route path="/403" component={Shixunauthority} />
 
-								{/* 查询 */}
-								<Route path="/search" component={Search} />
+							<Route path="/500" component={http500} />
 
-								{/* 个人主页 */}
-								<Route path="/users/:username"
-									render={
-										(props) => {
-											return (<InfosIndex {...this.props} {...this.state} />)
-										}
-								}></Route>
-								<Route exact path="/"
-									render={
-										(props) => (
-											personal && personal.length > 0 ?
-											<InfosIndex {...this.props} {...props} />
-											:
+							{/*404*/}
+							<Route path="/nopage" component={Shixunnopage} />
+
+							{/* 查询 */}
+							<Route path="/search" component={Search} />
+
+							<Route exact path="/explore"
+								render={
+									(props) => (
 											<ProjectIndex {...this.props} {...props} />
-										)
+									)
+								}
+							/>
+
+							{/* 关于我们 */}
+							<Route
+								path = "/aboutus"
+								render = {(props)=><AboutUs {...this.props} {...props}/>}
+							></Route>
+
+							{/* 组织 */}
+							<Route path={"/organize"}
+								render={
+									(props) => {
+										return (<OrganizeIndex {...props} {...this.props} {...this.state} />)
 									}
-								/>
-								<Route component={Shixunnopage} />
-							</Switch>
-						</Router>
+								}>
+							</Route>
+							
+							{/*新建项目等*/}
+							<Route
+								path={"/projects"}
+								render={
+									(props) => {
+										return (<Projects {...this.props} {...props} {...this.state} />)
+									}
+								}>
+							</Route>
+
+							{/* 判断为用户/组织，并进入对应页面 */}
+							{
+								pathType === 'User' ?
+									<Route exact path="/:username"
+										render={
+											(props) => {
+												return (<InfosIndex {...this.props} {...this.state} />)
+											}
+										}
+									/> : pathType === 'Organization' ? <Route path={"/:OIdentifier"}
+										render={
+											(props) => {
+												return (<OrganizeIndex {...props} {...this.props} {...this.state} />)
+											}
+										}>
+									</Route> : pathType === '404' ? <Route component={Shixunnopage} />:
+										<Route exact path="/"
+											render={
+												(props) => (
+													personal && personal.length > 0 ?
+														<InfosIndex {...this.props} {...props} />
+														:
+														<ProjectIndex {...this.props} {...props} />
+												)
+											}
+										/>
+								// <Route path="/" component={Loading} />
+								// <Route path="/" component={Shixunnopage} /> 
+							}
+
+
+
+							{/* 个人主页 */}
+							<Route path="/:username"
+								render={
+									(props) => {
+										return (<InfosIndex {...this.props} {...this.state} />)
+									}
+								}></Route>
+
+
+							<Route component={Shixunnopage} />
+						</Switch>
+						{/* </Router> */}
 					</MuiThemeProvider>
 				</ConfigProvider>
 			</Provider>

src/AppConfig.js

@@ -85,7 +85,10 @@ export function initAxiosInterceptors(props) {
     }
 
     if (response.data.status === 404) {
-      locationurl('/nopage');
+      let responseURL = response.request ? response.request.responseURL:'';
+      if (responseURL.indexOf('/api/users/') === -1 && responseURL.indexOf('/api/organizations/') === -1 ) {
+        locationurl('/nopage');
+      }
     }
 
     if (response.data.status === 500) {

src/college/College.js

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

src/college/colleagecss/colleage.css

@@ -218,7 +218,7 @@ a:hover {
 }
 
 .color-blue {
-  color: #4CACFF;
+  color: #2A61FF;
 }
 
 .color-huang {

src/common/DateUtil.js

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

src/common/TextUtil.js

@@ -69,7 +69,7 @@ export function appendFileSizeToUploadFile(item) {
 }
 export function appendFileSizeToUploadFileAll(fileList) {
     return fileList.map(item => {
-        if (item.name.indexOf(uploadNameSizeSeperator) == -1) {
+        if (item.name.indexOf(uploadNameSizeSeperator) === -1) {
             return Object.assign({}, item, { name: `${item.name}${uploadNameSizeSeperator}${bytesToSize(item.size)}` })
         }
         return item

src/common/UrlTool.js

@@ -18,6 +18,23 @@ export function getImageUrl(path) {
 	return `${path}`;
 }
 
+export function numFormat(num, digits){
+	let d = digits || 1;
+  var si = [
+    { value: 1, symbol: "" },
+    { value: 1E3, symbol: "k" },
+    { value: 1E4, symbol: "W" }
+  ];
+  var rx = /\.0+$|(\.[0-9]*[1-9])0+$/;
+  var i;
+  for (i = si.length - 1; i > 0; i--) {
+    if (num >= si[i].value) {
+      break;
+    }
+  }
+  return (num / si[i].value).toFixed(d).replace(rx, "$1") + si[i].symbol;
+}
+
 export function getImage(path) {
 	// https://www.educoder.net
 	// https://testbdweb.trustie.net

src/common/educoder.js

@@ -3,7 +3,7 @@
 // export { default as OrderStateUtil } from          '../routes/Order/components/OrderStateUtil';
 
 export {
-	getUploadLogoActionUrl as getUploadLogoActionUrl,
+	getUploadLogoActionUrl as getUploadLogoActionUrl,numFormat as numFormat,
 	getImageUrl as getImageUrl,getImage as getImage, getmyUrl as getmyUrl, getRandomNumber as getRandomNumber, getUrl as getUrl, publicSearchs as publicSearchs, getRandomcode as getRandomcode, getUrlmys as getUrlmys, getUrl2 as getUrl2, setImagesUrl as setImagesUrl
 	, getUploadActionUrl as getUploadActionUrl, getUploadActionUrltwo as getUploadActionUrltwo, getUploadActionUrlthree as getUploadActionUrlthree, getUploadActionUrlOfAuth as getUploadActionUrlOfAuth
 	, getTaskUrlById as getTaskUrlById, TEST_HOST, htmlEncode as htmlEncode, getupload_git_file as getupload_git_file, getcdnImageUrl as getcdnImageUrl
@@ -27,7 +27,7 @@ export {
 	markdownToHTML, uploadNameSizeSeperator, appendFileSizeToUploadFile, appendFileSizeToUploadFileAll, isImageExtension,
 	downloadFile, sortDirections, validateLength, mdJSONParse, exportMdtoHtml
 } from './TextUtil'
-export { handleDateString, getNextHalfHourOfMoment, formatDuring, formatSeconds } from './DateUtil'
+export { handleDateString, getNextHalfHourOfMoment, formatDuring, formatSeconds ,timeAgo} from './DateUtil'
 
 export { configShareForIndex, configShareForPaths, configShareForShixuns, configShareForCourses, configShareForCustom } from './util/ShareUtil'
 

src/context/TPIContextProvider.js

@@ -435,11 +435,11 @@ class TPIContextProvider extends Component {
 		image_url: "avatars/User/1"
 		login: "innov"
 		name: "Coder"
-		user_url: "/users/innov"
+		user_url: "/innov"
 		 */
 		let user = resData.user;
 		user.username = resData.user.name;
-		user.user_url = `/users/${resData.user.login}`;
+		user.user_url = `/${resData.user.login}`;
 		// user.image_url = resData.image_url;
 		user.is_teacher = resData.is_teacher;
 		resData.user = user;

src/forge/AboutUs/AboutUs.jsx

@@ -0,0 +1,306 @@
+import React , { useEffect , useState } from 'react';
+import { TPMIndexHOC} from '../../modules/tpm/TPMIndexHOC';
+import { Timeline, Carousel } from 'antd';
+import CountUp from 'react-countup';
+import './AboutUs.scss';
+import subititle from './image/subtitle.png';
+import achievements from './image/achievements.png';
+import earth from './image/earth.png';
+import computer from './image/computer.png';
+import position from './image/position.png';
+import quan1 from './image/quan1.png';
+import quan2 from './image/quan2.png';
+import fun1 from './image/fun1.png';
+import fun2 from './image/fun2.png';
+import fun3 from './image/fun3.png';
+import fun4 from './image/fun4.png';
+import fun5 from './image/fun5.png';
+import img1 from './image/img1.png';
+import img2 from './image/img2.png';
+import img3 from './image/img3.png';
+import img4 from './image/img4.png';
+import img5 from './image/img5.png';
+import img6 from './image/img6.png';
+import img7 from './image/img7.png';
+import img8 from './image/img8.png';
+import img9 from './image/img9.png';
+import img10 from './image/img10.png';
+import img11 from './image/img11.png';
+import img12 from './image/img12.png';
+import img13 from './image/img13.png';
+import img14 from './image/img14.png';
+import img15 from './image/img15.png';
+import img16 from './image/img16.png';
+import img17 from './image/img17.png';
+import img18 from './image/img18.png';
+import img19 from './image/img19.png';
+import img20 from './image/img20.png';
+
+function AboutUs(){
+  const countUpProps = {
+    redraw: true,
+    start: 0,
+    duration: 2,
+    suffix: "+"
+  };
+  const [selectTitle, setSelectTitle] = useState(1);
+  //用于刷新组件
+  const [flush, setFlush] = useState(false);
+  useEffect(()=>{
+    window.addEventListener('scroll', scrollListener);
+  },[])
+
+  function scrollListener(e){
+    const top = e.srcElement.scrollingElement.scrollTop;
+    //回到顶部时导航栏选中【关于我们】
+    top < 555 && setSelectTitle(1);
+    if (top > 2800 && top< 4000){
+      setFlush(true);
+    }else{
+      setFlush(false);
+    }
+  }
+
+  return(
+    <div className="aboutUs_body">
+      <div className="aboutUs_head df">
+        <p className="head_title">GitLink 确实开源</p>
+        <p className="head_cont font-20 mt36">新一代开源创新服务平台，让您的创意在这里释放</p>
+      </div>
+      <div className="aboutUs_title df">
+        <a className={selectTitle === 1 ? "active" : ""} href="#value1" onClick={() => setSelectTitle(1)}>关于我们</a>
+        <a className={selectTitle === 2 ? "active" : ""} href="#value2" onClick={() => setSelectTitle(2)}>平台统计</a>
+        <a className={selectTitle === 3 ? "active" : ""} href="#value3" onClick={() => setSelectTitle(3)}>加入我们</a>
+        <a className={selectTitle === 4 ? "active" : ""} href="#value4" onClick={() => setSelectTitle(4)}>合作单位</a>
+      </div>
+      <div className="aboutUs">
+        <a id="value1" className="mao"></a>
+        {/* 关于我们 */}
+        <div className="about_us">
+          <div className="au_bg">
+            <div className="au_title">关于我们</div>
+            {/* 简介 */}
+            <div className="au_cont subt df">
+              <div className="cont1_introduction">
+                <p className="subtitle">简介</p>
+                <div className="font-16">GitLink（确实开源）是CCF官方指定的开源创新服务平台，旨在以“为开源创新服务”为使命，以“成为开源创新的汇聚地”为愿景，秉承“创新、开放、协作、共享”的价值观，致力于为大规模开源开放协同创新助力赋能，打造创新成果孵化和新工科人才培养的开源创新生态！</div>
+              </div>
+              <img src={subititle} className="subtitleImg"></img>
+            </div>
+          </div>
+          {/* 确实开源   一脉传承 */}
+          <div className="au_cont inherit pl30">
+            <p className="subtitle">确实开源&nbsp;&nbsp;一脉传承</p>
+            <div>本世纪以来，随着软件创新需求和应用规模的飞速增长，软件开发队伍、开发资源、可信评估呈现出规模化、开放化、持续化的新特点，软件开发活动面临协同难、复用难、评估难的制约，经典的工程化软件开发方法面临严峻挑战，严重影响了软件开发效率和质量的提升。在此背景下，国防科技大学联合国内多所知名高校、科研机构和软件企业，围绕开源创新开展了持续性探索，构建形成了以Trustie（确实）为代表的一系列开源创新服务基础设施。自2006年以来，Trustie经过三个阶段的演化发展，于2021年迎来全面升级：在计算机学会（CCF）的带领指导下，共同推进产学研用深度融合，共筑新一代开源创新服务平台GitLink！</div>
+            <div className="inherit_items">
+              <img src={quan1} className="quan1Img"/>
+              <img src={quan2} className="quan2Img"/>
+              <Timeline>
+                <Timeline.Item dot={<i className="iconfont icon-a-yuanquan2x font-20"></i>}>
+                  <div className="timeline_cont">
+                    <p>Trustie 1.0阶段（2006年-2014年）</p>
+                    <div>国防科技大学、北京大学、北京航空航天大学、中国科学院软件研究所等单位合作开展了基于网络的软件开发群体化方法与技术研究，揭示了以大众化协同开发、开放式资源共享、持续性可信评估为核心的互联网大规模协同机理，与软件开发工程化方法相结合，系统地提出了基于网络的软件开发群体化方法，并于2008年发布了可信的国家软件资源共享与协同生产环境（简称“Trustie v1.0”，中文简称“确实”），重点解决大规模软件协同开发、可信评估、运行监控和持续演化等问题。</div>
+                  </div>
+                </Timeline.Item>
+                <Timeline.Item dot={<i className="iconfont icon-a-yuanquan2x"></i>}>
+                  <div className="timeline_cont">
+                    <p>Trustie 2.0阶段（2014年-2020年）</p>
+                    <div>在科技部项目的持续资助下，国防科技大学联合国内多所知名高校、科研机构和软件企业，致力于系统研究新型软件开发方法，为开源生态建设提供方法指导和实践指南，支撑科教领域原始创新成果的开源孵化和开源人才培养，并于2014年发布了面向软件创新和教育的开源社区Trustie v2.0，重点探索协作开发社区、知识分享社区、应用服务社区等“大外围”软件涉众的联接，以及基于开源大数据的智能化开发等技术。</div>
+                  </div>
+                </Timeline.Item>
+                <Timeline.Item dot={<i className="iconfont icon-a-yuanquan2x"></i>}>
+                  <div className="timeline_cont">
+                    <p>Trustie 3.0阶段 (2020年至今)</p>
+                    <div>Trustie在已有的技术积累基础上，进一步联合国内高等院校、科研机构、产业企业和开源组织等，在计算机学会（CCF）的带领指导下，共同推进产学研用深度融合，致力于联接互联网海量群智资源，探索开源创新成果开放与共享、开源生态协作与共建的新模式和新方法，升级形成了新一代开源创新服务平台GitLink，力图破解软件开发群智范式背后的本质机理，建立面向“大外围”开放创新的群智激发与汇聚关键机制，实现面向大规模软件涉众的稳态群智激发与汇聚。</div>
+                  </div>
+                </Timeline.Item>
+              </Timeline>
+            </div>
+          </div>
+
+          {/* 特色功能  确实给力 */}
+          <div className="feature_function_bg">
+            <div className="au_cont">
+              <p className="au_title">特色功能&nbsp;&nbsp;确实给力</p>
+              <table><tr>
+                <td>
+                  <div className="feat_func_cont">
+                    <div className="feat_fun_img"><img src={fun1} /></div>
+                    <div>
+                      <p>分布式协作开发</p>
+                      <div>支持在线文件编辑、&nbsp;&nbsp;<br />分支管理、贡献统计、<br />仓库复刻、合并请求&nbsp;&nbsp;&nbsp;</div>
+                    </div>
+                  </div>
+                </td>
+                <td>
+                  <div className="feat_func_cont">
+                    <div className="feat_fun_img"><img src={fun2} /></div>
+                    <div>
+                      <p>一站式过程管理</p>
+                      <div>支持易修、里程碑、&nbsp;&nbsp;&nbsp;<br />通知提醒、标签归档、Wiki文档、组织管理&nbsp;&nbsp;&nbsp;</div>
+                    </div>
+                  </div>
+                </td>
+                <td>
+                  <div className="feat_func_cont">
+                    <div className="feat_fun_img"><img src={fun3} /></div>
+                    <div>
+                      <p>高效流水线运维</p>
+                      <div>提供轻量级工作流引擎<br />并支持自定义配置、&nbsp;&nbsp;&nbsp;<br/>静态扫描、制品构建&nbsp;&nbsp;&nbsp;</div>
+                    </div>
+                  </div>
+                </td>
+                <td>
+                  <div className="feat_func_cont">
+                    <div className="feat_fun_img"><img src={fun4} /></div>
+                    <div>
+                      <p>多层次代码分析</p>
+                      <div>支持代码溯源分析、&nbsp;&nbsp;&nbsp;<br />许可证风险分析、开源漏洞检测和加固建议&nbsp;&nbsp;&nbsp;</div>
+                    </div>
+                  </div>
+                </td>
+                <td>
+                  <div className="feat_func_cont">
+                    <div className="feat_fun_img"><img src={fun5} /></div>
+                    <div>
+                      <p>多维度用户画像</p>
+                      <div>支持开发活动统计、&nbsp;&nbsp;&nbsp;<br />贡献日历、能力建模、<br />角色与专业定位分析&nbsp;&nbsp;&nbsp;</div>
+                    </div>
+                  </div>
+                </td>
+              </tr></table>
+            </div>
+          </div>
+
+          {/* 成果作用，确实有效 */}
+          <div className="au_cont df pl30">
+            <img src={achievements} className="achievementsImg"></img>
+            <div className="cont1_achievements">
+              <p className="subtitle ml0">成果作用&nbsp;&nbsp;确实有效</p>
+              <div>GitLink（确实开源）为我国创新型软件产业发展提供了关键技术支撑和实践指南，为各类开源创新活动以及我国军地开源社区建设提供了有效支撑，为推动开源创新发展和创新人才培养发挥了重要作用。<br/>通过10多年的发展，GitLink平台显著提升了大型软件企业软件生产能力，支持了我国航空、航天、国防等多个关键领域的可信软件生产，为包括新一代人工智能启智社区、ARM绿色计算社区、科技部云计算与大数据木兰社区、科技委可控开源创造行动红山社区等的建设提供关键技术支撑，为我国关键领域开源社区生态建设发挥了重要作用！</div>
+            </div>
+          </div>
+        </div>
+
+        {/* 平台统计 */}
+        <div className="about_us statistics">
+          <a id="value2" className="mao"></a>
+          <div className="au_title">平台统计</div>
+          <p>联接海量群智资源，汇聚优秀开源组织，孵化优质创新成果</p>
+          <img src={earth} className="earthImg"/>
+          <div className="statistics_cont df">
+            <div>
+              <CountUp {...countUpProps} start={0} end={50000} />
+              <p>开发者</p>
+            </div>
+            <div>
+              <CountUp {...countUpProps} end={1000} />
+              <p>组织</p>
+            </div>
+            <div>
+              <CountUp {...countUpProps} end={1400000} />
+              <p>仓库</p>
+            </div>
+          </div>
+        </div>
+
+        {/* 加入我们 */}
+        <div className="join_us_bg">
+          <a id="value3" className="mao"></a>
+          <div className="au_cont">
+            <div className="au_title">加入我们</div>
+            <p className="subtitle">探索你的未来</p>
+            <p>GitLink团队在寻找新的小伙伴，期待着您的加入，让我们一起为开源创新贡献力量！</p>
+            <img src={computer} className="joinUsImg"/>
+            {/* 轮播图 */}
+            <Carousel autoplay easing="none">
+              <div className="df">
+                <div className="position">
+                  <p className="df"><img src={position} /><span className="ml10">前端开发工程师</span></p>
+                  <div>
+                    1、全日制本科及以上学历，5年以上Web前端开发经验，熟练使用Gulp、Webpack等构建工具；<br />
+                    2、熟练掌握VUE或React编程；有前端模块化、组件化、自动化开发经验者优先；<br />
+                    3、精通jQuery、Ajax、Json等技术，对VUE，NodeJs等技术有所涉及；<br />
+                    4、熟悉前端开发技术(HTML5、JS、JSON、XHTML、CSS3、ES6)，了解各项技术的相关标准，并严格按照标准进行开发。<br />
+                  </div>
+                </div>
+                <div className="position right">
+                  <p className="df"><img src={position} /><span className="ml10">后端开发工程师</span></p>
+                  <div>
+                    1、全日制本科及以上学历，计算机、软件工程相关专业者优先；<br />
+                    2、3年以上Java开发相关经验，扎实的Java编程基础，参与过1个以上大/中型高并发、高性能系统架构设计、开发和调优；<br />
+                    3、熟练掌握Spring、SpringBoot、Spring MVC、MyBatis等开源框架，掌握MVC框架模式及BS架构；<br />
+                    4、精通SQL，熟练使用MySQL、Oracle等数据库，并具有一定的SQL优化能力；熟悉Redis、MongoDB等常用NoSQL解决方案，了解各自的优缺点以及使用场景者优先。<br />
+                  </div>
+                </div>
+              </div>
+              <div className="df">
+                <div className="position">
+                  <p className="df"><img src={position} /><span className="ml10">软件测试工程师</span></p>
+                  <div>
+                    1、熟悉主流开发技术框架，具备软件工程的基本知识；<br />
+                    2、熟练掌握各种测试理论和测试技术，精通测试过程设计和用例设计方法；<br />
+                    3、熟悉性能测试、自动化测试、安全测试其中一种或多种测试工具；（LoadRunner、Jmeter、Selenium、QTP、Robot、Firebug、AppScan，PyCharm等），熟练运用工具从事过相关测试工作；<br />
+                    4、熟悉掌握一种编程语言（Java/Python/C++等）；<br />
+                    5、熟悉Oracle/MySQL数据库，并能熟练编写SQL语句，熟练常用Linux命令；<br />
+                    6、有整体质量意识，测试管理经验。<br />
+                  </div>
+                </div>
+                <div className="position right">
+                  <p className="df"><img src={position} /><span className="ml10">产品经理</span></p>
+                  <div>
+                    1、计算机或相关专业本科以上学历；3年以上工作经验；<br />
+                    2、熟悉开源软件项目的管理流程，了解软件需求的调研方法，具备需求分析能力；<br />
+                    3、能以专业的方式向客户提供技术咨询，良好的方案设计能力和文字功底；<br />
+                    4、具备良好的交流、沟通和表达能力，良好的方案演示和介绍技巧；<br />
+                    5、了解互联网产品的基本思路及基础方法论，能够基于数据提出产品优化策略；<br />
+                    6、承受较强的工作压力，强烈的团队合作意识与工作责任心；<br />
+                    7、有良好人际交往能力，工作积极主动，自信心强，有较强的学习能力。<br />
+                  </div>
+                </div>
+              </div>
+            </Carousel>
+            <p className="delivery">简历投递邮箱：zengyt#csxjy.com.cn 曾先生  (用@符号替换#)</p>
+          </div>
+        </div>
+
+        {/* 合作单位 */}
+        <div className="unit">
+          <a id="value4" className="mao"></a>
+          <div className="au_title">合作单位</div>
+          <table>
+            <tr>
+              <td><a href="https://www.nudt.edu.cn/" target="_blank"><img src={img6}></img></a></td>
+              <td><a href="https://www.pku.edu.cn/" target="_blank"><img src={img7}></img></a></td>
+              <td><a href="https://www.buaa.edu.cn/" target="_blank"><img src={img8}></img></a></td>
+              <td><a href="https://www.nju.edu.cn/" target="_blank"><img src={img10}></img></a></td>
+              <td><a href="http://www.iscas.ac.cn/" target="_blank"><img src={img9}></img></a></td>
+            </tr>
+            <tr>
+              <td><a href="https://www.ccf.org.cn/" target="_blank"><img src={img1}></img></a></td>
+              <td><a href="https://www.hnjmrh.gov.cn/newweb/service/detail/305/" target="_blank"><img src={img2}></img></a></td>
+              <td><a href="https://www.zhejianglab.com/" target="_blank"><img src={img3}></img></a></td>
+              <td><a href="http://www.zjusdgyy.com/product/wuxi_545.html" target="_blank"><img src={img4}></img></a></td>
+              <td><a href="http://www.cec.com.cn/" target="_blank"><img src={img5}></img></a></td>
+            </tr>
+            <tr>
+              <td><a href="https://www.openi.org.cn/" target="_blank"><img src={img11}></img></a></td>
+              <td><a href="https://www.mulanos.cn/" target="_blank"><img src={img12}></img></a></td>
+              <td><a href="https://osredm.com/" target="_blank"><img src={img13}></img></a></td>
+              <td><a href="http://www.copu.org.cn/" target="_blank"><img src={img14}></img></a></td>
+              <td><a href="https://www.opengcc.org" target="_blank"><img src={img15}></img></a></td>
+            </tr>
+            <tr>
+              <td><a href="https://www.educoder.net/" target="_blank"><img src={img16}></img></a></td>
+              <td><a href="https://www.didiglobal.com/" target="_blank"><img src={img17}></img></a></td>
+              <td><a href="https://www.tencent.com/" target="_blank"><img src={img18}></img></a></td>
+              <td><a href="https://www.inspur.com/" target="_blank"><img src={img19}></img></a></td>
+              <td><a href="https://www.ucloud.cn/" target="_blank"><img src={img20}></img></a></td>
+            </tr>
+          </table>
+        </div>
+      </div>
+    </div>  
+  )
+}
+export default TPMIndexHOC(AboutUs);

src/forge/AboutUs/AboutUs.scss

@@ -0,0 +1,335 @@
+.aboutUs_body{
+  font-size: 16px;
+  color: #182332;
+  font-family: PingFangSC-Regular, PingFang SC;
+  & table{
+    text-align: center;
+    margin: 0 auto;
+  }
+  & .df{
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
+  }
+  & .join_us_bg, .feature_function_bg, .feat_fun_img, .aboutUs_head{
+    background-size: cover;
+    background-repeat: no-repeat;
+    background-position: center;
+  }
+  & .mao{
+    position: relative;
+    top: -70px;
+  }
+}
+.aboutUs_head.df{
+  flex-direction: column;
+  justify-content: center;
+  height: 500px;
+  line-height: 500px;
+  background-image: url('./image/banner.png');
+  & p{
+    text-align: center;
+  }
+  & .head_title{
+    line-height: 50px;
+    font-size: 48px;
+    font-weight: 600;
+    background-image: -webkit-linear-gradient(bottom,#4CDBF5,#5AACFF);
+    -webkit-background-clip: text;
+    -webkit-text-fill-color: transparent;
+  }
+  & .head_cont{
+    line-height: 39px;
+    color: #FFFFFF;
+    opacity: 0.9;
+  }
+}
+.aboutUs_title{
+  width: 800px;
+  height: 62px;
+  margin: 0 auto;
+  &>table{
+    width: 800px;
+    font-weight: 400;
+  }
+  & a.active{
+    color: #466AFF;
+    height: 62px;
+    line-height: 62px;
+    border-bottom: 2px solid;
+  }
+}
+.aboutUs{
+  & .au_title{
+    font-size: 38px;
+    font-weight: 500;
+    color: #1E1E1E;
+    text-align: center;
+    padding-top: 50px;
+    // line-height: 53px;
+  }
+  & .subtitle{
+    font-size: 20px;
+    font-weight: bold;
+    color: #000000;
+    margin-bottom: 23px !important;
+  }
+}
+.about_us{
+  // 关于我们
+  & .au_cont.df{
+    justify-content: space-between;
+  }
+  & .au_bg{ background: linear-gradient(180deg, #F3F9FF 0%, rgba(255, 255, 255, 0) 100%);}
+  & .cont1_introduction{
+    width: 472px;
+    &>div{
+      line-height: 34px;
+    }
+  }
+  & .cont1_achievements{
+    width: 581px;
+    & .subtitle.ml0{margin-left: 0;}
+    &>div{
+      font-size: 15px;
+      line-height: 36px;
+    }
+  }
+  & .subtitleImg{
+    width: 650px;
+    height: 330px;
+  }
+  & .achievementsImg{
+    width: 507px;
+    height: 384px;
+  }
+  //时间轴
+  & .inherit_items{
+    position: relative;
+    & .quan1Img{
+      width: 140px;
+      height: 167px;
+      position: absolute;
+      left: -290px;
+      top: 90px;
+    }
+    & .quan2Img{
+      width: 100px;
+      height: 120px;
+      position: absolute;
+      right: -170px;
+      bottom: 80px;
+    }
+  }
+  .inherit{
+    & .icon-a-yuanquan2x{
+      color: #466aff;
+    }
+    & .ant-timeline-item-tail{
+      border-left: 2px solid rgba(108, 134, 172, 0.42);
+      height: calc(100% - -30px);
+    }
+    & .ant-timeline-item:last-child .ant-timeline-item-tail{
+      display: block;
+      height: calc(100% - 18px);
+    }
+    & .ant-timeline-item-content{
+      margin: 0 0 -15px 18px;
+    }
+  }
+  .timeline_cont{
+    margin-left: 35px;
+    &>p{
+      font-size: 20px;
+      font-weight: 500;
+      color: #466AFF;
+      margin: 45px 0 30px !important;
+    }
+    &>div{
+      width: 980px;
+      padding: 20px 35px;
+      background: #F5F7FA;
+      font-size: 15px;
+      font-weight: 400;
+      color: #182332;
+      line-height: 33px;
+      &:after,&:before{
+        content: "";
+        position: absolute; 
+        left: 21px; 
+        top: 100px;
+        border-top: 10px solid transparent; 
+        border-bottom: 10px solid transparent; 
+        border-right: 14px solid #F5F7FA;
+      }
+    }
+  }
+  //特色功能  确实给力
+  & .feature_function_bg{
+    position: relative;
+    height: 630px;
+    background-image: url(./image/funBg.png);
+    & .au_cont p.au_title{
+      font-size: 30px;
+      padding: 50px 0 70px;
+      color: #FFFFFF;
+      opacity: 0.9;
+    }
+    & table{
+      position: relative;
+      background: none;
+      width: 1200px;}
+    & .funBg2 {
+      width: 1600px;
+      left: 50%;
+      margin-left: -800px;
+      position: absolute;
+      bottom: -15px;
+    }
+  }
+    
+  & .feat_func_cont{
+    width: 200px;
+    & .feat_fun_img{
+      height: 205px;
+      line-height: 205px;
+      background-image: url('./image/funBg3.png');
+      &:hover{background-image: url('./image/funBg4.png');}
+    }
+    & img{ width: 175px;}
+    & p{
+      font-size: 18px;
+      font-weight: 500;
+      color: #FFFFFF;
+      line-height: 28px;
+      background-image: -webkit-linear-gradient(bottom,#4FFDFF,#0183FF);
+      -webkit-background-clip: text;
+      -webkit-text-fill-color: transparent;
+    }
+    & div>div{
+      margin: 10px auto;
+      width: 142px;
+      font-size: 14px;
+      line-height: 28px;
+      color: #FFFFFF;
+      opacity: 0.76;
+    }
+  }
+
+  // 平台统计
+  &.statistics{
+    text-align: center;
+    background: linear-gradient(180deg, #ECF3FF 0%, #FFFFFF 100%);
+    height: 640px;
+    overflow: hidden;
+    position: relative;
+    & .statistics_cont{
+      width: 1014px;
+      height: 203px;
+      background: #FFFFFF;
+      opacity: 0.83;
+      position: absolute;
+      top: 230px;
+      left: 50%;
+      margin-left: -500px;
+      & span{
+        font-size: 48px;
+        font-weight: bold;
+        color: #1338D1;
+      }
+      & p{
+        width: 111px;
+        height: 38px;
+        line-height: 38px;
+        border: 1px solid #182332;
+        margin: 0 auto;
+        font-size: 22px;
+        color: #1E1E1E;
+      }
+    }
+    & .earthImg{
+      width: 1500px;
+      margin-top: -120px;
+      animation: moving 60s linear infinite;
+    }
+    @keyframes moving {
+      0% { transform: rotate(0deg);}
+      50% { transform: rotate(180deg);}
+      100% { transform: rotate(360deg);}
+    }
+  }
+}
+// 加入我们
+.join_us_bg{
+  height: 710px;
+  margin-top: 40px;
+  background-image: url(./image/joinUs.png);
+  & .au_cont{position: relative;}
+  & .joinUsImg{
+    width: 260px;
+    height: 265px;
+    position: absolute;
+    top: 27px;
+    right: 10px;
+  }
+  & .df{
+    display: flex !important;
+    margin-top: 30px;
+  }
+  & .position{
+    width: 540px;
+    &.right{ margin-right: -30px;}
+    & p{
+      justify-content: flex-start;
+      height: 60px;
+      background: #253DA0;
+      line-height: 60px;
+      padding-left: 20px;
+      & img{width: 30px;}
+      & span{
+        font-weight: 500;
+        color: #FFFFFF;
+        line-height: 22px;
+      }
+    }
+    & div{
+      height: 306px;
+      font-size: 14px;
+      line-height: 34px;
+      padding: 20px;
+      background: #FFFFFF;}
+  }
+  & .ant-carousel .slick-dots-bottom{bottom: -30px;}
+  & .ant-carousel .slick-dots li button{
+    width: 12px;
+    height: 12px;
+    border-radius: 10px;
+    background: #466AFF;
+  }
+  & .delivery{
+    height: 60px;
+    line-height: 60px;
+    margin-left: 35px;
+  }
+}
+//合作单位
+.unit{
+  margin-bottom: 60px;
+  & table{
+    width: 1200px;
+    height: 550px;
+    margin-top: 15px;
+  }
+  & img{ 
+    width: 224px;
+    box-shadow: 0px 1px 8px 1px rgba(0, 0, 0, 0.06);
+    border-radius: 6px;
+    border: 2px solid #FFFFFF;
+    &:hover{ border: 1px solid #466AFF;}
+  }
+}
+.au_cont{
+  width: 1200px;
+  margin: 50px auto;
+  &.pl30 .subtitle{ margin-left: -30px;}
+}

src/forge/Activity/Activity.js

@@ -10,6 +10,10 @@ import ActivityItem from './ActivityItem';
 import axios from 'axios';
 const LIMIT = 15;
 const ARRAY = [
+  {
+    id:"",
+    name:'全部'
+  },
   {
     id:1,
     name:'1天'
@@ -32,10 +36,15 @@ class Activity extends Component{
   constructor(props){
     super(props);
     this.state={
-      time:'30',
+      time:undefined,
       type:undefined,
       state:undefined,
       page:1,
+      pr_count:undefined,
+      new_pr_count:undefined,
+      close_issues_count:undefined,
+      open_issues_count:undefined,
+      pr_all_count:undefined,issues_count:undefined,
 
       data:undefined,
       project_trends:undefined,
@@ -63,8 +72,15 @@ class Activity extends Component{
         this.setState({
           data:result.data,
           project_trends:result.data.project_trends,
-          isSpin:false
+          isSpin:false,
+          pr_count:result.data.pr_count,
+          new_pr_count:result.data.new_pr_count,
+          close_issues_count:result.data.close_issues_count,
+          open_issues_count:result.data.open_issues_count,
+          pr_all_count:result.data.pr_all_count,
+          issues_count:result.data.issues_count,
         })
+        window.scrollTo(0,0);
       }
     }).catch(error=>{
       console.log(error);
@@ -74,19 +90,19 @@ class Activity extends Component{
   // 切换周期
   changeTime=(e)=>{
     this.setState({
-      time:e.key,
+      time:e.key ==="item_0"?undefined:e.key,
       isSpin:true
     })
     const { type,status,page } = this.state;
-    this.getInfo(e.key,type,status,page);
+    this.getInfo(e.key ==="item_0"?undefined:e.key,type,status,page);
   }
    //筛选
    changeTrends=(type,status)=>{
     this.setState({
-      type,status
+      type,status,page:1
     })
-    const {time,page}=this.state;
-    this.getInfo(time,type,status,page);
+    const {time}=this.state;
+    this.getInfo(time,type,status,1);
    }
   // 分页
   ChangePage=(page)=>{
@@ -108,12 +124,14 @@ class Activity extends Component{
     </Menu>
   )
   render(){
-    const { time , data , page , project_trends , isSpin } = this.state;
+    const { time , data , page , project_trends , isSpin , pr_count , new_pr_count , close_issues_count , open_issues_count , pr_all_count ,issues_count } = this.state;
+    let name = time ? ARRAY.filter(item=>item.id === parseInt(time)) :[{name:"全部"}];
 
-    let name = time && ARRAY.filter(item=>item.id === parseInt(time)) ;
-    const second_per = (parseInt(data && data.close_issues_count)/parseInt(data && data.issues_count)*100)+'%';
-    const third_per = (parseInt(data && data.close_issues_count)/parseInt(data && data.issues_count)*100)+'%';
-    const fourth_per = (parseInt(data && data.open_issues_count)/parseInt(data && data.issues_count)*100)+'%';
+    const first_per = pr_all_count > 0 ? `${parseFloat(pr_count/pr_all_count).toFixed(2)*100}%` :"50%";
+    const second_per =pr_all_count > 0 ? `${parseFloat(new_pr_count/pr_all_count).toFixed(2)*100}%` :"50%";
+    const third_per =issues_count > 0 ?`${parseFloat(close_issues_count/issues_count).toFixed(2)*100}%` :"50%";
+    const fourth_per =issues_count > 0 ?`${parseFloat(open_issues_count/issues_count).toFixed(2)*100}%` :"50%";
+    
     return(
       <div className="main">
         
@@ -122,7 +140,7 @@ class Activity extends Component{
           <div className="orderInfo">
             <div>
               <div className="percentLine prPercent">
-                <p className="percent_purple" style={{width:'100%'}}></p>
+                <p className="percent_purple" style={{width:first_per}}></p>
                 <p className="percent_green resetStyle" style={{width:`${second_per}`}}></p>
               </div>
               <span>{data && data.pr_all_count}合并请求</span>
@@ -132,25 +150,25 @@ class Activity extends Component{
                 <p className="percent_red" style={{width:`${third_per}`}}></p>
                 <p className="percent_green" style={{width:`${fourth_per}`}}></p>
               </div>
-              <span>{data && data.issues_count}任务</span>
+              <span>{data && data.issues_count}易修</span>
             </div>
           </div>
           <ul className="percentBox">
             <li>
               <span className="purple">{data && data.pr_count}</span>
-              <span className="change" onClick={()=>this.changeTrends("PullRequest","close")}>已处理的合并请求</span>
+              <span className="change" onClick={()=>this.changeTrends("PullRequest","delay")}>已处理的合并请求</span>
             </li>
             <li>
               <span className="green">{data && data.new_pr_count}</span>
-              <span className="change" onClick={()=>this.changeTrends("PullRequest","create")}>未处理的合并请求</span>
+              <span className="change" onClick={()=>this.changeTrends("PullRequest","not_delay")}>未处理的合并请求</span>
             </li>
             <li>
               <span className="red">{data && data.close_issues_count}</span>
-              <span className="change" onClick={()=>this.changeTrends("Issue","close")}>已关闭的任务</span>
+              <span className="change" onClick={()=>this.changeTrends("Issue","delay")}>已关闭的易修</span>
             </li>
             <li>
               <span className="green">{data && data.open_issues_count}</span>
-              <span className="change" onClick={()=>this.changeTrends("Issue","create")}>未处理的任务</span>
+              <span className="change" onClick={()=>this.changeTrends("Issue","not_delay")}>未处理的易修</span>
             </li>
           </ul>
         </div>

src/forge/Activity/ActivityItem.js

@@ -14,25 +14,25 @@ class ActivityItem extends Component {
           {/* 如果是版本发布 */}
           {item.trend_type === "VersionRelease" ?
           <p className="itemLine">
-            <Link to={`/projects/${owner}/${projectsId}/version`} className="color-blue font-16">{item.name}</Link>
+            <Link to={`/${owner}/${projectsId}/releases`} className="color-blue font-16">{item.name}</Link>
             <span className="activity_type">{item.trend_type}</span>
           </p >
           :
           // 如果是任务
           item.trend_type === "Issue" ?
             <p className="itemLine">
-              <Link to={`/projects/${owner}/${projectsId}/issues/${item.trend_id}/detail`} className="color-blue font-16">{item.name}</Link>
+              <Link to={`/${owner}/${projectsId}/issues/${item.trend_id}`} className="color-blue font-16">{item.name}</Link>
               <span className="activity_type">{item.trend_type}</span>
             </p >
             :
             // 如果是合并请求
             <p className="itemLine">
-              <Link to={`/projects/${owner}/${projectsId}/pulls/${item.trend_id}/Messagecount`} className="color-blue font-16">{item.name}</Link>
+              <Link to={`/${owner}/${projectsId}/pulls/${item.trend_id}`} className="color-blue font-16">{item.name}</Link>
               <span className="activity_type">{item.trend_type}</span>
             </p >
           }
           <p className="itemLine mt10">
-            <Link to={`/users/${item && item.user_login}`} className="show-user-link">
+            <Link to={`/${item && item.user_login}`} className="show-user-link">
               <img alt="" src={getImageUrl(`/${item.user_avatar}`)} className="createImage" />
               <span className="mr20">{item.user_name}</span>
             </Link>

src/forge/Branch/CloneAddress.js

@@ -1,28 +1,20 @@
 import React, { useState } from 'react';
-import { Dropdown, Menu, Tooltip } from 'antd';
+import { Menu } from 'antd';
 import "./branch.scss";
+import CopyTool from '../Component/CopyTool';
 
 function CloneAddress({http_url , ssh_url , zip_url , tar_url}) {
   const [ key , setKey ] = useState("HTTP");
-  // 点击按钮复制功能
-  function jsCopy(){
-    var e = document.getElementById("copy_rep_content");
-    e.select();
-    document.execCommand("Copy");
-  }
-
   return (
     <div className="downMenu">
-      <div style={{padding:"10px 20px 20px 20px",borderBottom:"1px solid #eee"}}>
+      <div style={{borderBottom:"1px solid #eee"}}>
         <Menu className="urlMenu" selectedKeys={[key]} mode={"horizontal"}>
           <Menu.Item key="HTTP" onClick={(e)=>{setKey(e.key)}}>HTTP</Menu.Item>
           <Menu.Item key="SSH" onClick={(e)=>{setKey(e.key)}}>SSH</Menu.Item>
         </Menu>
         <div className="gitAddressClone">
           <input type="text" id="copy_rep_content" value={key==="HTTP" ? http_url:ssh_url} />
-          <Tooltip title="复制链接">
-            <span className="color-blue" onClick={jsCopy}><i className="iconfont icon-fuzhi"></i></span>
-          </Tooltip>
+          <CopyTool inputId="copy_rep_content" className="copytool"/>
         </div>
       </div>
       <Menu className="edu-txt-center">

src/forge/Branch/Select.jsx

@@ -1,116 +1,65 @@
-import React , { useState , useEffect } from 'react';
-import { Popover , Input , Spin } from 'antd';
+import React , { useState , useEffect , useRef } from 'react';
+import { Dropdown} from 'antd';
 import './branch.scss';
-import { getBranch , getTag } from '../GetData/getData';
-
+import SelectOverlay from './SelectOverlay';
+import { findDOMNode } from 'react-dom';
 
 export default (({ projectsId , branch , owner , changeBranch , branchList , tagflag = true })=>{
   const [ showValue , setShowValue ] = useState(branch);
-  const [ inputValue , setInputValue] = useState(undefined);
-  const [ nav , setNav ] = useState(0);
-  const [ isSpin , setIsSpin ] = useState(true);
-  const [ flag , setFlag ] = useState(false);
+  const [ visible , setVisible ] = useState(false);
 
-  const [ data , setData ] = useState(undefined);
-  const [ datas , setDatas ] = useState(undefined);
+  const refFa = useRef(null);
+  const refBox = useRef(null);
+
+  useEffect(() => {
+    document.addEventListener('click', clickMe , false);
+  }, [])
+
+  const clickMe = ({ target }) => {
+    // 查找父组件
+    const faComponent = findDOMNode(refFa.current);
+    const boxComponent = findDOMNode(refBox.current);
+
+    if (faComponent && boxComponent) {
+      const isChild = faComponent.contains(target);
+      const isBox = boxComponent.contains(target);
+      if(!isChild && !isBox){
+        setVisible(false);
+      }
+    }
+  }
 
   useEffect(()=>{
     setShowValue(branch);
   },[branch])
 
-  useEffect(()=>{
-    document.body.addEventListener('click', e => {
-      let name = e.target.className;
-      let turn = name === "ant-input OptionsInput" || name === "navli active"|| name === "navli" || name === "padding10 bor-bottom-greyE";
-      if(turn){
-        return;
-      }else{
-        setFlag(false);
-      }
-    })
-  })
-
-  useEffect(()=>{
-    if(branchList){
-      setData(branchList);
-      setDatas(branchList);
-      setIsSpin(false);
-    }
-  },[branchList])
-
-
-  async function getBranchs(id,owner){
-    let result = await getBranch(id,owner);
-    setData(result);
-    setDatas(result);
-    setIsSpin(false);
+  function ChangeB(params) {
+    setVisible(false);
+    changeBranch(params);
   }
-  async function getTags(id,owner){
-    let result = await getTag(id,owner);
-    setData(result);
-    setDatas(result);
-    setIsSpin(false);
-  }
-
-  function changeInputValue(e){
-    setInputValue(e.target.value);
-    let filter = e.target.value ? data && data.length>0 && data.filter(item=>item.name.indexOf(e.target.value)>-1) : data;
-    setDatas(filter);
-  }
-
-  function changeNav(nav){
-    setNav(nav);
-    setIsSpin(true);
-    if(nav === 0){
-      getBranchs(projectsId,owner);
-    }else{
-      getTags(projectsId,owner);
-    }
-  }
-  function chooseitem(value){
-    // setShowValue(value);
-    changeBranch(value);
-  }
-
 
   const menu = (
-    <div>
-      <div className="padding10 bor-bottom-greyE">
-        <Input 
-          placeholder="请输入分支或标签名称搜索" 
-          autocomplete="off" className="OptionsInput" value={inputValue} 
-          onChange={changeInputValue} style={{width:"220px"}}
-        />
-        <ul className="navUl">
-          <li className={nav === 0?"navli active":"navli"} onClick={()=>changeNav(0)}><i className="iconfont icon-fenzhi1 font-14 mr3"></i>分支列表</li>
-          { tagflag && <li className={nav === 1?"navli active":"navli"} onClick={()=>changeNav(1)}><i className="iconfont icon-biaoqian3 font-14 mr3"></i>标签列表</li> }
-        </ul>
-      </div>
-      <Spin spinning={isSpin}>
-        <ul className="OptionsUl" id="ul-btn">
-          {
-            datas && datas.length>0 ?
-            datas.map((item,key)=>{
-              return(
-                <li key={key} onClick={()=>chooseitem(item.name)}><a className="task-hide ulALink">{item.name}</a></li>
-              )
-            }):
-            <p className="listTips">暂无{inputValue}{nav === 0 ?"分支":"标签"}~</p>
-          }
-        </ul>
-      </Spin>
+    <div ref={refFa}>
+      <SelectOverlay 
+        visible={visible}
+        changeBranch={ChangeB} 
+        tagflag={tagflag} 
+        projectsId={projectsId}
+        owner={owner}
+        branchList={branchList}
+      />
     </div>
   );
   return(
-    <Popover placement='bottomLeft' visible={flag} content={menu} onClick={()=>setFlag(!flag)} overlayClassName="branch-tagBox-list">
-      <div className="branch-tagBox">
+    <Dropdown placement='bottomLeft' visible={visible} overlay={menu} overlayClassName="branch-tagBox-list" trigger={['click']} >
+      <div className="branch-tagBox" ref={refBox} onClick={()=>setVisible(visible ? false : true)}>
         {/* {nav === 0 ?"分支":"标签"} */}
         <span className="color-grey-9 mr3 ml8"><i className="iconfont icon-fenzhi2 font-18"></i></span>
-        <a className="ant-dropdown-link">
+        <span className="ant-dropdown-link task-hide" style={{fontWeight:"500",minWidth:"45px",maxWidth:"270px"}}>
           {showValue}
-        </a>
-        <i className="showtag iconfont icon-xiajiantou font-14 color-grey-9 mr8" />
+        </span>
+        <i className="showtag iconfont icon-sanjiaoxing-down font-15 color-grey-9 mr5 ml5 mt1" />
       </div>
-    </Popover>
+    </Dropdown>
   )
 })

src/forge/Branch/SelectOverlay.jsx

@@ -0,0 +1,90 @@
+import React , { useState , useEffect } from 'react';
+import { Input , Spin , Menu } from 'antd';
+import { getBranch , getTag } from '../GetData/getData';
+
+function SelectOverlay({ changeBranch , tagflag , projectsId , owner , visible }) {
+  const [ inputValue , setInputValue] = useState(undefined);
+  const [ nav , setNav ] = useState(0);
+  const [ isSpin , setIsSpin ] = useState(true);
+
+  const [ data , setData ] = useState(undefined);
+  const [ datas , setDatas ] = useState(undefined);
+  const [ keys ,setKeys] = useState("branch");
+
+  useEffect(()=>{
+    if(visible){
+      setKeys("branch");
+      getBranchs(projectsId,owner);
+      setIsSpin(true);
+    }
+  },[visible])
+
+  async function getBranchs(id,owner){
+    let result = await getBranch(id,owner);
+    setData(result);
+    setDatas(result);
+    setIsSpin(false);
+  }
+  async function getTags(id,owner){
+    let result = await getTag(id,owner);
+    setData(result);
+    setDatas(result);
+    setIsSpin(false);
+  }
+  function chooseitem(value){
+    changeBranch(value);
+  }
+  function changeInputValue(e){
+    setInputValue(e.target.value);
+    let filter = e.target.value ? data && data.length>0 && data.filter(item=>item.name.indexOf(e.target.value)>-1) : data;
+    setDatas(filter);
+  }
+
+  function changeNav(e){
+    setKeys(e.key);
+    setIsSpin(true);
+    if(e.key === "branch"){
+      getBranchs(projectsId,owner);
+      setNav(0);
+    }else{
+      getTags(projectsId,owner);
+      setNav(1);
+    }
+  }
+
+  return(
+    <div className="overlayBranch">
+      <div className="padding15" style={{paddingBottom:"0px"}}>
+        <Input 
+          prefix={<i className="iconfont icon-sousuo_icon1 font-14"></i>}
+          placeholder={`请输入分支${tagflag ? "或标签" :""}名称搜索`}
+          autocomplete="off" className="OptionsInput" 
+          value={inputValue} 
+          onChange={changeInputValue}
+        />
+      </div>
+      <Menu mode="horizontal" className="navUl" selectedKeys={[keys]} onClick={changeNav}>
+        <Menu.Item key={"branch"}>分支</Menu.Item>
+        { tagflag && <Menu.Item key={"tag"}>标签</Menu.Item> }
+      </Menu>
+      <Spin spinning={isSpin}>
+        <ul className="OptionsUl" id="ul-btn">
+          {
+            datas && datas.length>0 &&
+            datas.map((item,key)=>{
+              return(
+                <li key={key} onClick={()=>chooseitem(item.name)}><a className="task-hide ulALink">{item.name}</a></li>
+              )
+            })
+           
+          }
+          {
+            datas && datas.length === 0 &&
+            <p className="listTips">暂无{inputValue}{nav === 0 ?"分支":"标签"}~</p>
+          }
+        </ul>
+      </Spin>
+    </div>
+  )
+}
+export default SelectOverlay;

src/forge/Branch/branch.scss

@@ -23,14 +23,16 @@
   max-height: 300px;
 }
 .OptionsUl{
+  min-height: 50px;
   max-height: 220px;
   overflow-y: auto;
 }
 .OptionsUl li{
-  height: 35px;
-  line-height: 35px;
+  height: 30px;
+  line-height: 30px;
   cursor: pointer;
-  padding:0px 10px;
+  padding:0px 20px;
+  margin:5px 0px;
 }
 .OptionsUl li:hover{
    background-color: #F0F0F0;
@@ -45,38 +47,56 @@
   width: 100%;
 }
 .branch-tagBox{
-  border:1px solid #eee;
+  border:1px solid #D0D0D0;
   border-radius: 3px;
-  height: 40px;
+  height: 32px;
   display: flex;
   align-items: center;
   cursor: pointer;
-  min-width: 140px;
+  min-width: 104px;
 }
-.branch-tagBox-list .ant-popover-arrow{
-  display: none;
+.branch-tagBox:hover{
+  background-color: #F3F4F6;
 }
-.branch-tagBox-list.ant-popover.ant-popover-placement-bottom{
-  padding-top:0px;
+.branch-tagBox-list{
+  background: #FFFFFF;
+  box-shadow: 0px 4px 8px 2px rgba(212, 212, 212, 0.5);
+  border-radius: 4px;
+  .ant-popover-arrow{
+    display: none;
+  }
+  &.ant-popover.ant-popover-placement-bottom{
+    padding-top:0px;
+  }
+  .branch-tagBox .ant-dropdown-link{
+    display: block;
+    flex:1;
+    max-width: 105px;
+  }
+  .ant-popover-inner-content{
+    padding:0px;
+  }
 }
-.branch-tagBox .ant-dropdown-link{
-  display: block;
-  flex:1;
-}
-.branch-tagBox-list .ant-popover-inner-content{
-  padding:0px;
-}
-.navUl{
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-top: 5px;
-}
-.navUl li{
-  cursor: pointer;
-}
-.navUl li.active{
-  color:#5091FF;
+.overlayBranch{
+  width: 325px;
+  .navUl{
+    margin-top: 8px;
+    height: 30px;
+    line-height: 30px;
+    li{
+      height: 30px;
+      line-height: 30px;
+      padding:0px 5px;
+      margin-left: 20px!important;
+      &.ant-menu-item-selected{
+        border-color:#466aff!important;
+        color:#466aff!important;
+      }
+      &.ant-menu-item-active{
+        border-color:transparent ;
+      }
+    }
+  }
 }
 .listTips{
   padding:20px 0px;
@@ -86,6 +106,7 @@
 .urlMenu{
   line-height: 30px;
   margin-bottom: 10px;
+  padding:15px 20px 0px 20px;
   border-bottom: none;
   li.ant-menu-item{
     height: 30px;
@@ -96,10 +117,13 @@
       color: #333;
     }
     &.ant-menu-item-selected{
-      border-color:#1890ff!important;
+      border-color:#466aff!important;
     }
     &.ant-menu-item-active{
       border-color:transparent ;
     }
   }
+}
+.copytool{
+  margin:0px 10px;
 }

src/forge/Component/AddGroup.jsx

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

src/forge/Component/Component.scss

@@ -113,7 +113,14 @@ li.ant-menu-item{
   z-index: 10000;
 }
 .laterest{
-  color: #05690d;
+  background-color: #EF3131;
+  color: #fff;
+  font-size: 12px;
+  margin-left: 10px;
+  padding:0px 5px;
+  border-radius: 2px;
+  height: 18px;
+  line-height: 18px;
 }
 
 @media screen and (max-width: 1800px){
@@ -155,41 +162,112 @@ li.ant-menu-item{
     margin:0px 20px!important;
   }
 }
-
+.hoverA{
+  display:flex;
+  align-items: center;
+  max-width: 78px;
+  &:hover a{
+    color:#2A61FF !important ;
+  }
+}
 .menuPanels{
-  width: 240px;
-  height: 180px;
+  width: 295px;
+  .leftline{
+    position: relative;
+    color: #666;
+    height: 16px;
+    margin-left: 14px;
+    font-size: 12px;
+    &::before{
+      position: absolute;
+      left: -7px;
+      top:3px;
+      height: 12px;
+      width: 1px;
+      background-color: #999;
+      content: "";
+    }
+  }
+  .ant-btn{
+    height: 36px;
+    line-height: 34px;
+    width: 83px;
+    text-align: center;
+    padding:0px ;
+    font-weight: 500;
+    font-size: 14px;
+    &.currentBtn{
+      cursor: default;
+      color: #333;
+      &:hover{
+        color: #333;
+        border-color: #d0d0d0;
+      }
+    }
+  }
+  .ant-btn-default{
+    color: #333;
+    border-color: #d0d0d0;
+    &:hover{
+      background: #F3F4F6;
+    }
+  }
+  .ant-btn{
+    width: 102px;
+    height: 32px;
+    line-height: 30px;
+  }
+  .ant-btn-primary{
+    color: #fff;
+    background-color: #466AFF;
+    border:none;
+    &:hover{
+      background-color: rgba(70,106,255,0.85);
+    }
+  }
+  .focusPanelHeadInfo{
+    padding:14px 16px;
+    border-bottom: 1px solid #eee;
+  }
   .ant-popover-content,.ant-popover-inner{
     height: 100%;
     width: 100%;
   }
+  .ant-popover-inner-content{
+    padding:0px;
+  }
 }
 .halfs{
   margin-top: 24px;
   padding:24px 0px 0px 0px;
   border-top: 1px solid #e8e8e8;
-  .attrPerson{
-    padding-bottom: 24px;
-  }
+}
+.aboutSubTitle{
+  display: flex;
+  align-items: center;
+}
+.menuMaininfos{
+  padding:10px 16px 14px;
+  border-bottom: 1px solid #eee;
 }
 .menuinfos{
-  padding:15px 0px;
+  padding:10px 20px 16px;
   &>a{
     display: flex;
     flex-direction: column;
     align-items: center;
-    border-right: 1px solid #eee;
     flex: 1;
     & >span:first-child{
-      font-size: 18px;
-      font-weight: 400;
+      font-size: 16px;
+      font-weight: 500;
       color: #333;
+      line-height: 22px;
     }
     & >span:last-child{
       color: #666;
-    }
-    &:last-child{
-      border-right: none;
+      font-weight: 400;
+      line-height: 20px;
+      margin-top: 6px;
     }
   }
 }

src/forge/Component/Contributors.jsx

@@ -1,13 +1,13 @@
 import React, { useEffect, useState } from 'react';
 import { AlignCenter , FlexAJ  } from '../Component/layout';
 import { Link } from 'react-router-dom';
-import { Popover , Spin } from 'antd';
+import { Popover , Spin , Button } from 'antd';
 import { getImageUrl } from 'educoder';
 import './Component.scss';
 import { getUser } from '../GetData/getData';
 import axios from 'axios';
 
-function Contributors({contributors,owner,projectsId}){
+function Contributors({contributors,owner,projectsId,currentLogin}){
   const [ menuList ,setMenuList ]= useState([]);
   const [ list , setList ]= useState(undefined);
   const [ total , setTotal ]= useState(0);
@@ -46,46 +46,60 @@ function Contributors({contributors,owner,projectsId}){
     }
   }
 
+  function renderOrganize(list) {
+    let str = "";
+    list.map(i=>{
+      str = str+i.name + "、";
+    })
+    return str && str.substr(0,str.length - 1);
+  }
+
   function setMenusFunc(data){
     if(data){
       let ele = (
         <Spin spinning={isSpin}>
-          <FlexAJ>
+          <FlexAJ className="menuMaininfos">
             <AlignCenter>
-              <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>
-            }
-          </FlexAJ>
-          <AlignCenter className="menuinfos">
-            <a href={data.projects_url}>
-              <span>{data.projects_count}</span>
-              <span>项目数</span>
-            </a>
-            <a href={data.followers_url}>
-              <span>{data.followers_count}</span>
-              <span>粉丝数</span>
-            </a>
-            <a href={data.following_url}>
-              <span>{data.following_count}</span>
-              <span>关注数</span>
-            </a>
-          </AlignCenter>
-          {
-            data.organizations && data.organizations.length > 0 ?
-            <AlignCenter className="font-12 pt4 pb4">
-              <span>所属组织：</span>
-              <div className="task-hide flex1">
-                {renderArray(data.organizations)}
+              <Link to={`/${data.login}`}><img src={getImageUrl(`/${data.image_url}`)} alt="" className="radius" width="38px" height="38px"/></Link>
+             
+              <div className="ml10">
+                <Link to={`/${data.login}`}>{data.name}</Link>
+                { data.location && <span className="leftline">{data.location}</span> }
+                {
+                  data.organizations && data.organizations.length>0&&
+                  <p className="task-hide" style={{maxWidth:"215px"}}>
+                    所属组织：{renderOrganize(data.organizations)}
+                  </p>
+                }
               </div>
             </AlignCenter>
-            :""
-          }
-          {
-            data.location && <AlignCenter className="font-12 pt4 pb4"><span>所在地址:</span><span className="ml5">{data.location}</span></AlignCenter>
-          }
+          </FlexAJ>
+          <AlignCenter className="menuinfos">
+            <Link to={`/${data.login}/projects`}>
+              <span>{data.projects_count}</span>
+              <span>项目数</span>
+            </Link>
+            <Link to={`/${data.login}/followers`}>
+              <span>{data.followers_count}</span>
+              <span>粉丝数</span>
+            </Link>
+            <Link to={`/${data.login}/following`}>
+              <span>{data.following_count}</span>
+              <span>关注数</span>
+            </Link>
+          </AlignCenter>
+          <div className={"pb20"} style={{display:"flex",justifyContent:'center'}}>
+            {
+              currentLogin && (currentLogin === data.login)
+              ?
+              <Button className="currentBtn">当前用户</Button>
+              :
+              data.is_watch ? 
+              <Button type={"default"} onClick={()=>FocusFunc(false,data.login)}>已关注</Button>
+              :
+              <Button type={"primary"} onClick={()=>FocusFunc(true,data.login)}>关注TA</Button>
+            }
+          </div>
         </Spin>
       )
       setMenu(ele);
@@ -135,17 +149,17 @@ function Contributors({contributors,owner,projectsId}){
 
   return(
     <div className="halfs">
-      <FlexAJ>
-        <AlignCenter><span className="font-16 color-grey-6">贡献者</span>{ contributors && contributors.total_count > 0 && <span className="infoCount">{contributors.total_count}</span>}</AlignCenter>
-        <Link className="font-12 color-grey-9" to={`/projects/${owner}/${projectsId}/contribute`}>全部</Link>
-      </FlexAJ>
+      <Link to={`/${owner}/${projectsId}/contribute`} className="font-16 color-ooo hoverA">
+        <span>贡献者</span>
+        { contributors && contributors.total_count > 0 && <span className="infoCount">{contributors.total_count}</span>}
+      </Link>
       <div className="attrPerson" onMouseLeave={()=>setVisibleFunc(false)}>
         {
           total > 0 ?
           list.map((item,key)=>{
             return(
               <Popover content={menu} visible={item.visible} overlayClassName="menuPanels" placement="top">
-                <Link key={key} to={`/users/${item.login}`}>
+                <Link key={key} to={`/${item.login}`}>
                   <img src={getImageUrl(`/${item.image_url}`)} alt="" onMouseOver={()=>setVisibleFunc(true,item.login,key)}/>
                 </Link>
               </Popover>

src/forge/Component/CopyTool.jsx

@@ -0,0 +1,51 @@
+import React, { useState, useCallback, memo } from 'react';
+import { Tooltip } from 'antd';
+
+CopyTool.defaultProps = {
+  beforeText: '复制链接',     //浮动过去显示的文字
+  afterText: '复制成功',  //点击后显示的文字
+  className: '',         //传给svg的class
+  inputId: 'copyText',    //要复制的文本的ID
+  timeOut:true, //复制后将浮动的文字改为beforeText
+};
+
+
+function CopyTool({ beforeText, afterText, className , inputId , timeOut }) {
+  const [title, setTitle] = useState(() => {
+    return beforeText;
+  });
+
+  // 复制链接
+  const copyUrl = useCallback(() => {
+    const copyEle = document.querySelector(`#${inputId}`); // 获取要复制的节点
+    if (!copyEle) {
+      console.error("您的CopyTool未设置正确的inputId");
+      return;
+    }
+    copyEle.select(); // 执行选中元素
+    if (document.execCommand('copy')) {
+      document.execCommand('copy');
+    }
+    document.getSelection().removeAllRanges();
+    
+    setTitle(afterText);
+    if(timeOut){
+      setTimeout(function(){
+        setTitle(beforeText);
+      },1500)
+    }
+  }, []);
+
+  return (
+    <Tooltip
+      placement="top"
+      title={title}
+      onVisibleChange={() => { setTitle(beforeText) }}
+    >
+      <i className={`iconfont icon-fuzhiicon ${className}`} style={{ color: '#466aff' }} onClick={copyUrl}></i>
+    </Tooltip>
+  );
+}
+
+
+export default memo(CopyTool);

src/forge/Component/DeleteModal/Index.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { AlignCenter } from '../layout';
-import { Modal , Button } from 'antd';
-import './Index.scss';
+import { Button } from 'antd';
+import Modals from '../PublicModal/Index';
 
 function DeleteBox({ 
   visible , 
@@ -12,24 +12,22 @@ function DeleteBox({
   content
 }) {
   return(
-    <Modal
-      visible={visible}
-      onCancel={onCancel}
-      title={title}
-      width="600px"
-      className="deleteBox"
-      footer={
+    <Modals 
+      title={title} 
+      btn={
         <div>
           <Button size={'large'} onClick={onCancel}>取消</Button>
           <Button type={"danger"} size={"large"} onClick={onSuccess}>确认删除</Button>
         </div>
-      }
+      } 
+      onCancel={onCancel} 
+      visible={visible}
     >
       <div className="desc">
         <AlignCenter className="descMain"><i className="iconfont icon-shanchu_tc_icon mr10"></i>{content}</AlignCenter>
-        <p>{subTitle}</p>
+      <p>{subTitle}</p>
       </div>
-    </Modal>
+    </Modals>
   )
 }
 export default DeleteBox;

src/forge/Component/DeleteModal/Index.scss

@@ -1,45 +0,0 @@
-.deleteBox{
-  .ant-modal-header{
-    background-color: #f8f8f8;
-    border-bottom: none;
-    .ant-modal-title{
-      text-align: left;
-      font-size: 20px;
-    }
-  }
-  .ant-modal-body{
-    padding:30px 50px;
-    p{
-      font-size: 16px;
-      line-height: 26px;
-      color:#666;
-      word-break: break-all;
-    }
-    .desc{
-      .descMain{
-        align-items: center;
-        justify-content: center;
-        font-size: 20px;
-        margin-bottom: 10px;
-        i{
-          font-size: 38px!important;
-          color:#DF0002
-        }
-      }
-    }
-  }
-  .ant-modal-footer{
-    border-top: none;
-    text-align: center;
-    padding-bottom: 40px;
-    button{
-      width: 120px;
-      margin:0px 20px;
-      &.ant-btn-danger{
-        background-color: #fff;
-        color: #DF0002;
-        border-color: #D0D0D0;
-      }
-    }
-  }
-}

src/forge/Component/DrawerPanel.jsx

@@ -78,7 +78,7 @@ function DrawerPanel({visible,onClose,branch,owner,projectsId,history, name , li
     if(dataref.type==="file"){
       onClose();
       let value = turnbar(branch);
-      history.push(`/projects/${owner}/${projectsId}/tree/${value}/${dataref.path}`);
+      history.push(`/${owner}/${projectsId}/tree/${value}/${dataref.path}`);
     }
   }
 

src/forge/Component/EAccount.scss

@@ -1,6 +1,6 @@
 .ant-modal-mask{
-  z-index: 1001;
+  z-index: 1031;
 }
 .ant-modal-wrap{
-  z-index: 1002;
+  z-index: 1032;
 }

src/forge/Component/LanguagePower.jsx

@@ -25,7 +25,7 @@ function LanguagePower({languages}){
     }
   return(
     <div>
-      <p className="font-16 color-grey-6">开发语言</p>
+      <p className="font-16 color-ooo aboutSubTitle">开发语言</p>
       <div className="progress">
         {
           array && array.map((item,key)=>{

src/forge/Component/MemberCards.jsx

@@ -45,15 +45,15 @@ const Div = styled.div`{
 export default (({ user , img, name, time, focusStatus, is_current_user, login , successFunc }) => {
   return (
     <Div>
-      <Link to={`/users/${user && user.login}`}><Img src={getImageUrl(`/${img}`)} /></Link>
+      <Link to={`/${user && user.login}`}><Img src={getImageUrl(`/${img}`)} /></Link>
       <div className="m-infos">
-        <Link to={`/users/${user && user.login}`}><Name>{name}</Name></Link>
+        <Link to={`/${user && user.login}`}><Name>{name}</Name></Link>
         <Time><I className="iconfont icon-shijian"></I>加入时间:{time}</Time>
         {
           is_current_user ?
           <Button type="default">当前用户</Button>
           : 
-          <FocusButton is_watch={focusStatus} id={login} successFunc={successFunc}/>
+          <FocusButton is_watch={focusStatus} id={login} successFunc={successFunc} notReset={true}/>
         }
       </div>
     </Div>

src/forge/Component/ModalFun/index.jsx

@@ -0,0 +1,125 @@
+/* eslint-disable react/jsx-no-duplicate-props */
+import React, { useState } from 'react';
+import * as ReactDOM from 'react-dom';
+import { Modal, Button } from 'antd';
+import './index.scss';
+
+// 函数式调用删除、通知等模态框
+
+InitModal.defaultProps = {
+  okText: '确认',     //确定按钮的文字
+  cancelText: '取消',  //取消按钮的文字
+  className: '',         //传入的模态框类名
+  inputId: 'copyText',    //要复制的文本的ID
+  onCancel:()=>{},        //取消的回调
+  onOk:()=>{},            //确认的回调
+  title:'提示',            //模态框名字
+  contentTitle:'',        //内容标题
+  content:'',             //详细内容
+  afterClose:()=>{},      //关闭模态框以后的回调
+};
+
+// 使用函数调用删除组件
+export default function DelModal(props) {
+  renderModal({ ...props, type: 'delete' })
+}
+
+// 使用函数调用选择模态框组件
+export function Confirm(props) {
+  renderModal({ ...props, type: 'confirm' })
+}
+
+function renderModal(props) {
+  const { type, afterClose } = props;
+  const div = document.createElement('div');
+  document.body.appendChild(div);
+
+  function destroy() {
+    afterClose && afterClose();
+    const unmountResult = ReactDOM.unmountComponentAtNode(div);
+    if (unmountResult && div.parentNode) {
+      div.parentNode.removeChild(div);
+    }
+  }
+
+  function modalType(type) {
+    if (type === 'delete') {
+      return <InitModal
+        title="删除"
+        contentTitle="确定要删除吗？"
+        okText="确认删除"
+        {...props}
+
+        afterClose={destroy}
+        contentTitle={<React.Fragment>
+          <i className="red-circle iconfont icon-shanchu_tc_icon mr3"></i>
+          {props.contentTitle}
+        </React.Fragment>}
+      />
+    } else if (type === 'confirm') {
+      return <InitModal title="选择" afterClose={destroy} {...props} />
+    } else {
+      return <InitModal title="选择" afterClose={destroy} {...props} />
+    }
+  }
+
+  function render() {
+    setTimeout(() => {
+      ReactDOM.render(
+        modalType(type),
+        div,
+      );
+    });
+  }
+  render();
+}
+
+// 选择模态框组件
+function InitModal({
+  onCancel,
+  onOk,
+  title,
+  contentTitle,
+  content,
+  okText,
+  cancelText,
+  afterClose,
+  className,
+}) {
+
+  const [visible, setVisible] = useState(true);
+
+  function onCancelModal() {
+    setVisible(false);
+    onCancel && onCancel()
+  }
+
+  function onSuccess() {
+    setVisible(false);
+    onOk && onOk();
+  }
+
+  return (
+    <Modal
+      visible={visible}
+      onCancel={onCancelModal}
+      afterClose={afterClose}
+      title={title}
+      className={`myself-modal ${className}`}
+      centered
+      footer={[
+        <Button type="default" key="back" onClick={onCancelModal}>
+          {cancelText}
+        </Button>,
+        <Button className="foot-submit" key="submit" onClick={onSuccess}>
+          {okText}
+        </Button>,
+      ]}
+    >
+      <div>
+        {contentTitle && <p className="content-title">{contentTitle}</p>}
+        <p className="content-descibe">{content}</p>
+      </div>
+    </Modal>
+  )
+}

src/forge/Component/ModalFun/index.scss

@@ -0,0 +1,63 @@
+.myself-modal {
+  .ant-modal-header {
+    padding: 9px 24px;
+    background: #f8f8f8;
+    border-bottom: 1px solid #eee;
+  }
+  .ant-modal-title {
+    text-align: left;
+  }
+  .ant-modal-close {
+    top: 0px !important;
+  }
+  .ant-modal-close-x {
+    font-size: 24px;
+  }
+  .ant-modal-body {
+    text-align: center;
+  }
+  .content-title {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin: 2rem 0 1rem !important;
+    font-size: 16px;
+    color: #333;
+    letter-spacing: 0;
+    line-height: 29px;
+    font-weight: 400;
+  }
+  .red-circle {
+    align-self: flex-start;
+    color: #ca0002;
+    font-size: 1.5rem !important;
+  }
+  .content-descibe {
+    font-size: 14px;
+    color: #666;
+    line-height: 33px;
+    font-weight: 400;
+  }
+  .ant-modal-footer {
+    padding: 2rem 0;
+    text-align: center;
+    border: 0;
+    .ant-btn {
+      width: 6rem;
+    }
+  }
+  .foot-submit {
+    margin-left: 3rem;
+    color: #df0002;
+    &:hover {
+      border-color: #df0002;
+    }
+  }
+  .ant-btn-default:hover,
+  .ant-btn-default:active,
+  .ant-btn-default:focus {
+    background: #f3f4f6;
+    color: #333;
+    border-color: #d0d0d0;
+  }
+}

src/forge/Component/NoticeModal/Index.scss

@@ -0,0 +1,90 @@
+.systemBox{
+  .ant-modal-body{
+    padding:1px 0px 0px 0px;
+    .sysBox{
+      background-image: url('./bg.png');
+      background-repeat: no-repeat;
+      background-size: 100% 334px;
+      margin-top: -55px;
+    }
+    .sysnoticeBox{
+      width: 100%;
+      padding:80px 0px 34px;
+      display: flex;
+      flex-direction: column;
+      width: 780px;
+      margin: 0px auto;
+      p.ntitle{
+        height: 33px;
+        font-size: 24px;
+        font-weight: 500;
+        color: #31FFF7;
+        line-height: 33px;
+        text-align: center;
+      }
+      p.nSubtitle{
+        height: 25px;
+        line-height: 25px;
+        font-size: 18px;
+        font-weight: 500;
+        color: #FFFFFF;
+        margin-top: 60px;
+        padding-left: 20px;
+      }
+      .markdown-body{
+        box-shadow: 0px 0px 17px rgba(0,0,0,0.2);
+        border-radius: 4px;
+        margin-top: 17px!important;
+      }
+      .nContent{
+        padding:20px 34px;
+        background-color: #fff;
+        line-height: 30px;
+        font-size: 15px;
+        font-weight: 400;
+        color: #333;
+        .realmName{
+          margin-top: 20px;
+          display: flex;
+          ul{
+            width: 50%;
+            padding-left: 0px!important;
+            li{
+              font-size: 15px;
+              font-weight: 500;
+              line-height: 32px;
+              text-align: left;
+              color: #000;
+              list-style-type: none!important;
+              &:first-child{
+                color: #E65714;
+              }
+            }
+          }
+        }
+        .nSubdesc{
+          font-size: 15px;
+          font-weight: 400;
+          color: #000000;
+          line-height: 31px;
+          margin-top: 20px;
+        }
+        .nInfo{
+          font-size: 14px;
+          font-weight: 400;
+          color: #333333;
+          text-align: right;
+          margin-top: 25px;
+          p{
+            height: 20px;
+            line-height: 20px;
+          }
+        }
+      }
+      .nBtn{
+        text-align: center;
+        margin-top: 33px;
+      }
+    }
+  }
+}

src/forge/Component/NoticeModal/SystemNotice.jsx

@@ -0,0 +1,76 @@
+import React , { useEffect , useState } from 'react';
+import { Modal , Button } from 'antd';
+import './Index.scss';
+import '../../css/index.scss';
+import RenderHtml from '../../../components/render-html';
+import cookie from 'react-cookies';
+
+function SystemNotice({system_notification,history}){
+  const [ visible , setVisible ] = useState(false);
+
+  useEffect(()=>{
+    if(system_notification && !cookie.load('notice_stage')){
+      setVisible(true);
+    }
+  },[system_notification,history.location])
+
+  function sureContinue() {
+    cookie.remove('notice_stage');
+
+    let inFifteenMinutes = new Date(new Date().getTime() + 24 * 3600 * 1000);//一天
+    // let inFifteenMinutes = new Date(new Date().getTime() + 60 * 1000);//一分钟
+    cookie.save('notice_stage', true,{ expires: inFifteenMinutes,path:"/" });
+
+    setVisible(false);
+  }
+
+  return (
+    <Modal
+      visible = {visible}
+      width="1000px"
+      footer={false}
+      title={false}
+      centered={true}
+      closable={false}
+      wrapClassName={'systemBox'}
+    >
+      <div className="sysBox">
+        <div className="sysnoticeBox">
+          <p className="ntitle">{system_notification && system_notification.subject}</p>
+          <p className="nSubtitle">{system_notification && system_notification.sub_subject}</p>
+          {/* <div className="nContent">
+            <div className="nMaindesc">
+            为了给用户提供更加稳定、优质的服务，我们即将对平台门户首页、平台名称、平台域名进行一次全面升级与变更。原平台名称：Trustie（中文名：确实）将于2021年10月xx日统一更改为Gitlink（中文名：确实开源）。届时平台域名将统一进行更换，更换规则如下
+            </div>
+            <div className="realmName">
+              <ul>
+                <li>原域名：</li>
+                <li>官网顶级域名https://www.trustie.net</li>
+                <li>版本库子域名https://forgeplus.trustie.net</li>
+                <li>论坛子域名https://forum.trustie.net/forums</li>
+              </ul>
+              <ul>
+                <li>更换后域名：</li>
+                <li>官网顶级域名https://www.gitlink.org.cn</li>
+                <li>版本库子域名https://www.git.gitlink.org.cn</li>
+                <li>论坛子域名https://forum.gitlink.org.cn</li>
+              </ul>
+            </div>
+            <div className="nSubdesc">
+            自2021年10月xx日起，旧域名将停止访问。因平台名称与域名变更给您带来的不便，我们深表歉意!非常感谢您一直以来对本平台的信任与支持，我们将一如既往地为您提供优质的服务。 特此通知!
+            </div>
+            <div className="nInfo">
+              <p>Gitlink运营团队</p>
+              <p>2021年10月xx日</p>
+            </div>
+          </div> */}
+          <RenderHtml className="break_word_comments imageLayerParent" value={system_notification && system_notification.content} url={history.location}/>
+          <div className="nBtn">
+            <Button type="primary" className="btnblue" onClick={sureContinue}>确认并继续</Button>
+          </div>
+        </div>
+      </div>
+    </Modal>
+  )
+}
+export default SystemNotice;

src/forge/Component/ProfileModal/Index.jsx

@@ -0,0 +1,72 @@
+import React , { useEffect , useState } from 'react';
+import Modals from '../PublicModal/Index';
+import { Button } from 'antd';
+import axios from 'axios';
+
+import ProfileImg from './images/profile.png';
+import './Index.scss';
+
+function ProfileModal({visible,onCancel,history}) {
+  const [ modalVis , setModalVis ] = useState(visible);
+  const [ addMemberCheck , setAddMemberCheck ] = useState(false);
+
+  useEffect(()=>{
+    axios.interceptors.response.use((response) => {
+      if (response && (response.data.status === 411 || response.data.status === 412)) {
+        setModalVis(true);
+        if(response.data.status === 412){
+          setAddMemberCheck(true);
+        }
+      }
+      return response;
+      }, (error) => {
+    });
+  },[])
+
+  useEffect(()=>{
+    setModalVis(visible);
+  },[visible])
+  
+  function onOk(){
+    onCancel();
+    setModalVis(false);
+    setTimeout(function(){
+      window.open(`/settings/profile`,"_blank");
+    },200)
+  }
+
+  function onNo() {
+    onCancel();
+    setModalVis(false);
+  }
+
+  return(
+    <Modals 
+      title="完善资料" 
+      onCancel={onNo} 
+      visible={modalVis}
+      btn={
+        addMemberCheck?
+        <div>
+          <Button type={'primary'} size={"large"} onClick={onNo}>好的</Button>
+        </div>
+        :
+        <div>
+          <Button size={"large"} onClick={onNo}>暂不补充</Button>
+          <Button type={'primary'} size={"large"} onClick={onOk}>好的</Button>
+        </div>
+      }  
+    >
+      <div className="contents">
+        <img src={ProfileImg} alt=""/> 
+        {
+          addMemberCheck ?
+          <p>目标用户个人资料不完整，需提醒目标用户补充资料后以进行后续操作</p>
+          :
+          <p>您目前的个人资料不完整，需要补充资料以进行后续操作。是否前往补充个人信息？</p>
+        }
+      </div>
+    </Modals>
+  )
+}
+export default ProfileModal;

src/forge/Component/ProfileModal/Index.scss

@@ -0,0 +1,18 @@
+.contents{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin:10px auto 0px;
+  img{
+    margin-right: 13px;
+    width: 44px;
+  }
+  p{
+    line-height: 29px;
+    max-width: 327px;
+    font-size: 16px!important;
+  }
+}
+.font-44{
+  font-size: 44px!important;
+}

src/forge/Component/ProfileModal/Profile.jsx

@@ -0,0 +1,17 @@
+import React from 'react';
+
+function Profile({children,sureFunc,showCompeleteDialog , completeProfile, className}) {
+
+  function checkProfile() {
+    if(!completeProfile){
+      showCompeleteDialog && showCompeleteDialog();
+    }else{
+      sureFunc();
+    }
+  }
+
+  return(
+    <a className={className} onClick={checkProfile}>{children}</a>
+  )
+}
+export default Profile;

src/forge/Component/PublicModal/Index.jsx

@@ -0,0 +1,20 @@
+import React from 'react';
+import { Modal } from 'antd';
+import './Index.scss';
+
+function Modals({title,children,btn,onCancel,visible}) {
+  return(
+    <Modal
+      visible={visible}
+      onCancel={onCancel}
+      title={title}
+      width={"520px"}
+      footer={btn}
+      centered={true}
+      wrapClassName={"deleteBox"}
+    >
+      {children}
+    </Modal>
+  )
+}
+export default Modals;

src/forge/Component/PublicModal/Index.scss

@@ -0,0 +1,75 @@
+.deleteBox{
+  z-index: 1033;
+  .ant-modal-close-x{
+    font-size: 17px!important;
+  }
+  .ant-modal-header{
+    background-color: #f8f8f8;
+    padding:10px 30px;
+    .ant-modal-title{
+      text-align: left;
+      font-size: 16px;
+      font-weight: bold;
+    }
+  }
+  .ant-modal-close{
+    top:0px !important;
+    font-size: 24px !important;
+  }
+  .ant-modal-body{
+    padding:30px 50px;
+    p{
+      font-size: 14px;
+      line-height: 26px;
+      color:#666;
+      word-break: break-all;
+    }
+    .desc{
+      .descMain{
+        align-items: center;
+        justify-content: center;
+        font-size: 20px;
+        margin-bottom: 10px;
+        i.red{
+          color:#DF0002;
+        }
+      }
+    }
+  }
+  .ant-modal-footer{
+    border-top: none;
+    text-align: center;
+    padding-bottom: 40px;
+    button,a{
+      width: 96px;
+      height: 32px;
+      margin:0px 20px;
+      font-weight: 400;
+      font-size: 14px;
+      &.ant-btn{
+        border-color: #D0D0D0;
+        color: #666;
+        &:hover,&:active,&:focus{
+          background: #f3f4f6;
+        }
+      }
+      &.ant-btn-danger{
+        background-color: #fff;
+        color: #DF0002;
+        border-color: #D0D0D0;
+        &:hover,&:active,&:focus{
+          border-color: #DF0002;
+          background-color: #fff;
+        }
+      }
+      &.ant-btn.ant-btn-primary{
+        background-color: #466AFF;
+        color: #fff;
+        border-color: #466AFF;
+        &:hover,&:focus,&:active{
+          background-color: rgba(70,106,255,0.85);
+        }
+      }
+    }
+  }
+}

src/forge/Component/Releases.jsx

@@ -1,38 +1,35 @@
 import React from 'react';
-import { AlignCenter , AlignTop , FlexAJ  } from '../Component/layout';
+import { AlignTop } from '../Component/layout';
 import { Link } from 'react-router-dom';
 
-function Releases({owner,projectsId,releaseVersions , baseOperate , projectType}){
-  
+function Releases({ owner, projectsId, releaseVersions, distribution }) {
   return(
     <div>
-      <FlexAJ>
-        <AlignCenter><span className="font-16 color-grey-6">发行版</span>
-          { releaseVersions && releaseVersions.total_count > 0 && <span className="infoCount">{releaseVersions.total_count}</span>}
-        </AlignCenter>
-        { (releaseVersions && releaseVersions.total_count > 0) || projectType ===2 ? 
-          <Link className="font-12 color-grey-9" to={`/projects/${owner}/${projectsId}/releases`}>全部</Link>
-          : 
-          baseOperate && <Link className="font-12 color-blue" to={`/projects/${owner}/${projectsId}/releases/new`}>新建</Link>
-        }
-      </FlexAJ>
+      <Link to={`/${owner}/${projectsId}/releases`} className="font-16 color-ooo hoverA">
+        <span>发行版</span>
+      { releaseVersions && releaseVersions.total_count > 0 && <span className="infoCount">{releaseVersions.total_count}</span>}
+      </Link>
       {
         releaseVersions && releaseVersions.total_count>0 ?
           releaseVersions.list.map((item,key)=>{
             return(
             key === 0 &&<AlignTop className="mt10">
-              <i className="iconfont icon-biaoqian3 color-grey-6 font-18 mr10"></i>
               <div>
-                <p className="font-16 color-grey-6">
-                  <Link to={`/projects/${owner}/${projectsId}/releases`}>{item.name}</Link>
+                <p className="font-16 color-grey-6" style={{display:'flex',alignItems:'center'}}>
+                  {/* 如果是点击最新则发行版列表页只展示最新的一个 */}
+                  <Link to={{pathname:`/${owner}/${projectsId}/releases`,query:{turnFromNew:true}}} style={{maxWidth:'200px',overflow: 'hidden',whiteSpace: 'nowrap',textOverflow:'ellipsis'}}>{item.name}</Link>
                   <span className="font-12 laterest ml5">最新</span>
                 </p>
-                <p className="color-grey-9 font-13">{item.created_at}</p>
+                <p className="color-grey-3 font-12">{item.created_at}</p>
               </div>
             </AlignTop>
             )
           })
-        :""
+        :
+        <div className="mt8">
+          您暂未发布任何版本
+          {distribution && <Link className="color-blue ml20" to={{pathname:`/${owner}/${projectsId}/releases/new`,state:{stable:true}}}>创建新版本</Link>}
+        </div>
       }
       
     </div>

src/forge/Component/Sort.jsx

@@ -2,9 +2,9 @@ import React from 'react';
 import {Popover} from 'antd';
 import './Component.scss';
 
-export default (({menu , children})=>{
+export default (({menu , children, overlayClassName})=>{
   return(
-    <Popover content={menu} trigger={['click']} placement='bottom'>
+    <Popover content={menu} trigger={['click']} placement='bottom' overlayClassName={overlayClassName}>
       {children}
     </Popover>
   )

src/forge/Component/User.jsx

@@ -5,6 +5,7 @@ import { Link } from 'react-router-dom';
 export default ({ url , name , column  , id , login })=>{
   const Img = styled.span`
     display:flex;
+    font-weight: bold;
     ${column && "flex-direction: column;text-align:center;"}
     align-items: center;
     & img{
@@ -20,7 +21,7 @@ export default ({ url , name , column  , id , login })=>{
   `;
   return(
     id?
-    <Link to={`/users/${login}`}>
+    <Link to={`/${login}`}>
       <Img>
         { url && <img src={url} alt=""/> }
         <span>{name}</span>

src/forge/DevOps/About.jsx

@@ -149,7 +149,7 @@ function About(props, ref) {
     axios.post(url).then(result=>{
       setIsSpining(false);
       if(result && result.data.status === 0){
-        props.history.push(`/projects/${owner}/${projectsId}/devops/dispose`);
+        props.history.push(`/${owner}/${projectsId}/devops`);
         // 需要将顶部的open_devops修改
         let { changeOpenDevops } = props;
         changeOpenDevops && changeOpenDevops(true);

src/forge/DevOps/Dispose.jsx

@@ -96,7 +96,7 @@ function Dispose(props){
           setVisible(false);
           if(result && result.data){
             props.showNotification("流水线新增成功，请进行工作流配置！");
-            props.history.push(`/projects/${owner}/${projectsId}/devops/dispose/${result.data.id}`);
+            props.history.push(`/${owner}/${projectsId}/devops/${result.data.id}`);
           }else{
             props.showNotification("流水线新增失败，请稍后再试！");
           }
@@ -134,12 +134,12 @@ function Dispose(props){
 
   // 模板管理
   function toModalManage(){
-    props.history.push(`/projects/${owner}/${projectsId}/devops/mould`);
+    props.history.push(`/${owner}/${projectsId}/devops/mould`);
   }
 
   // 参数管理
   function toparameter(){
-    props.history.push(`/projects/${owner}/${projectsId}/devops/params`);
+    props.history.push(`/${owner}/${projectsId}/devops/params`);
   }
 
   const operate = current_user && (permission && permission !== "Reporter");

src/forge/DevOps/Dispose/List.jsx

@@ -73,7 +73,7 @@ function List({ list, operate , projectsId , owner , showModal , deleteFunc }){
       render:(value,item)=>{
         let v = turnbar(item.branch);
         return(
-          <Link to={`/projects/${owner}/${projectsId}/tree/${v}/${value}`} className="color-blue">{value}</Link>
+          <Link to={`/${owner}/${projectsId}/tree/${v}/${value}`} className="color-blue">{value}</Link>
         )
       }
     },
@@ -117,7 +117,7 @@ function List({ list, operate , projectsId , owner , showModal , deleteFunc }){
         return(
           <span>
             { operate ? 
-              <Link to={`/projects/${owner}/${projectsId}/devops/dispose/${item.id}`} className="mr10 color-grey-6">
+              <Link to={`/${owner}/${projectsId}/devops/${item.id}`} className="mr10 color-grey-6">
               <i className="iconfont icon-zaibianji font-13 mr3"></i>编辑</Link> :""
             }
             { operate ? 
@@ -125,7 +125,7 @@ function List({ list, operate , projectsId , owner , showModal , deleteFunc }){
                 <a className="mr10 color-grey-6"><i className="iconfont icon-lajitong font-13 mr3"></i>删除</a>
               </Popconfirm>:""
             }
-            <Link to={`/projects/${owner}/${projectsId}/devops/list/${item.branch}`} className="color-grey-6"><i className="iconfont icon-yunhang font-13 mr3"></i>查看运行记录</Link>
+            <Link to={`/${owner}/${projectsId}/devops/list/${item.branch}`} className="color-grey-6"><i className="iconfont icon-yunhang font-13 mr3"></i>查看运行记录</Link>
           </span>
         )
       }

src/forge/DevOps/Dispose/PipelineName.jsx

@@ -51,7 +51,7 @@ function PipelineName({visible,onCancel,onOk,value ,branchList}){
             })
           }
         </Select>
-        <Select mode="multiple" allowClear value={eventValue} dropdownClassName="chooseCon" style={{width:"180px",marginLeft:"10px"}} onChange={(e)=>{console.log(e);setEventValue(e)}}>
+        <Select mode="multiple" allowClear value={eventValue} dropdownClassName="chooseCon" style={{width:"180px",marginLeft:"10px"}} onChange={(e)=>{setEventValue(e)}}>
           {
             EVENT.map((item,key)=>{
               return(

src/forge/DevOps/Index.jsx

@@ -36,39 +36,37 @@ export default ((props)=>{
   return(
     <WhiteBack className="opsPanel">
       <Switch {...props}>
-        <Route path="/projects/:owner/:projectsId/devops/dispose/:disposeId"
-          render={
-            (p) => (<New {...props} {...p}/>)
-          }
-        ></Route>
-        <Route path="/projects/:owner/:projectsId/devops/params"
+        
+        <Route path="/:owner/:projectsId/devops/params"
           render={
             (p) => (<Params {...props} {...p}/>)
           }
         ></Route>
-        <Route path="/projects/:owner/:projectsId/devops/mould"
+        <Route path="/:owner/:projectsId/devops/mould"
           render={
             (p) => (<Mould {...props} {...p}/>)
           }
         ></Route>
-        <Route path="/projects/:owner/:projectsId/devops/dispose/new"
+        <Route path="/:owner/:projectsId/devops/new"
           render={
             (p) => (<New {...props} {...p}/>)
           }
         ></Route>
-        <Route path="/projects/:owner/:projectsId/devops/dispose"
-          render={
-            (p) => (<Dispose {...props} {...p}/>)
-          }
-        ></Route>
-        <Route path="/projects/:owner/:projectsId/devops/list/:branch"
+        
+        <Route path="/:owner/:projectsId/devops/list/:branch"
           render={
             (p) => (<Stucture {...props} {...p}/>)
           }
         ></Route>
-        <Route path="/projects/:owner/:projectsId/devops"
+        <Route path="/:owner/:projectsId/devops/:disposeId"
           render={
-            (p) => (<About {...props} {...p}/>)
+            (p) => (<New {...props} {...p}/>)
+          }
+        ></Route>
+        {/* 原本的两种合为一个 */}
+        <Route path="/:owner/:projectsId/devops"
+          render={
+            (p) =>{return( p.location.state.open_devops?<Dispose {...props} {...p}/>:<About {...props} {...p}/>)}
           }
         ></Route>
       </Switch>

src/forge/DevOps/Infos.jsx

@@ -26,7 +26,7 @@ export default ((props)=>{
   return(
     <div className="disposePanel">
       <Banner>
-        { permission !=="Reporter" && <Link to={`/projects/${owner}/${props.match.params.projectsId}/devops/dispose`}>工作流配置</Link>}
+        { permission !=="Reporter" && <Link to={`/${owner}/${props.match.params.projectsId}/devops`}>工作流配置</Link>}
       </Banner>
       <Div>
         <Dispost {...props}/>

src/forge/DevOps/Manage/Params.jsx

@@ -104,7 +104,7 @@ function Params(props){
       <Banner>
         <FlexAJ>
           <span className="font-18">工作流 - 参数管理</span>
-          <Link to={`/projects/${owner}/${projectsId}/devops/dispose`} className="font-14 color-grey-9 ml20">返回</Link>
+          <Link to={`/${owner}/${projectsId}/devops`} className="font-14 color-grey-9 ml20">返回</Link>
         </FlexAJ>
       </Banner>
       <Div className="disposeList">