Merge branch 'develop'

样式
编辑合并请求-url地址错误
2021-05-08 16:53:26 +08:00 · 2021-05-08 16:53:16 +08:00 · 2021-05-08 14:36:12 +08:00 · 2021-05-08 14:24:02 +08:00 · 2021-05-07 17:33:41 +08:00 · 2021-05-07 16:37:21 +08:00
132 changed files with 2995 additions and 1153 deletions
--- a/package-lock.json
+++ b/package-lock.json
@ -1,35 +1,40 @@
 {
-  "name": "educoder",
+  "name": "forge",
  "version": "0.1.0",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
    "@ant-design/colors": {
      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/@ant-design/colors/-/colors-3.2.2.tgz",
-      "integrity": "sha512-YKgNbG2dlzqMhA9NtI3/pbY16m3Yl/EeWBRa+lB1X1YaYxHrxNexiQYCLTWO/uDvAjLFMEDU+zR901waBtMtjQ==",
+      "resolved": "https://registry.npm.taobao.org/@ant-design/colors/download/@ant-design/colors-3.2.2.tgz?cache=0&sync_timestamp=1612935637470&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40ant-design%2Fcolors%2Fdownload%2F%40ant-design%2Fcolors-3.2.2.tgz",
+      "integrity": "sha1-WtQ9YZ6RHzSI66wwPWBuZqhCOQM=",
      "requires": {
        "tinycolor2": "^1.4.1"
      }
    },
    "@ant-design/create-react-context": {
      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/@ant-design/create-react-context/-/create-react-context-0.2.5.tgz",
-      "integrity": "sha512-1rMAa4qgP2lfl/QBH9i78+Gjxtj9FTMpMyDGZsEBW5Kih72EuUo9958mV8PgpRkh4uwPSQ7vVZWXeyNZXVAFDg==",
+      "resolved": "https://registry.npm.taobao.org/@ant-design/create-react-context/download/@ant-design/create-react-context-0.2.5.tgz",
+      "integrity": "sha1-9fWpFjtHcgl3EoNzl60w4i55+Fg=",
      "requires": {
        "gud": "^1.0.0",
        "warning": "^4.0.3"
      }
    },
+    "@ant-design/css-animation": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npm.taobao.org/@ant-design/css-animation/download/@ant-design/css-animation-1.7.3.tgz?cache=0&sync_timestamp=1596106749762&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40ant-design%2Fcss-animation%2Fdownload%2F%40ant-design%2Fcss-animation-1.7.3.tgz",
+      "integrity": "sha1-YKHJcAFOhrKPlAUQ1p5QPkKPETY="
+    },
    "@ant-design/icons": {
      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@ant-design/icons/-/icons-2.1.1.tgz",
-      "integrity": "sha512-jCH+k2Vjlno4YWl6g535nHR09PwCEmTBKAG6VqF+rhkrSPRLfgpU2maagwbZPLjaHuU5Jd1DFQ2KJpQuI6uG8w=="
+      "resolved": "https://registry.npm.taobao.org/@ant-design/icons/download/@ant-design/icons-2.1.1.tgz",
+      "integrity": "sha1-e5wI3/1PXUHbZn2dvl4BB9C9mko="
    },
    "@ant-design/icons-react": {
      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@ant-design/icons-react/-/icons-react-2.0.1.tgz",
-      "integrity": "sha512-r1QfoltMuruJZqdiKcbPim3d8LNsVPB733U0gZEUSxBLuqilwsW28K2rCTWSMTjmFX7Mfpf+v/wdiFe/XCqThw==",
+      "resolved": "https://registry.npm.taobao.org/@ant-design/icons-react/download/@ant-design/icons-react-2.0.1.tgz",
+      "integrity": "sha1-F6JRNXGrMXrKKSfljOol3THlNvs=",
      "requires": {
        "@ant-design/colors": "^3.1.0",
        "babel-runtime": "^6.26.0"
@ -446,8 +451,8 @@
    },
    "@types/react-slick": {
      "version": "0.23.4",
-      "resolved": "https://registry.npmjs.org/@types/react-slick/-/react-slick-0.23.4.tgz",
-      "integrity": "sha512-vXoIy4GUfB7/YgqubR4H7RALo+pRdMYCeLgWwV3MPwl5pggTlEkFBTF19R7u+LJc85uMqC7RfsbkqPLMQ4ab+A==",
+      "resolved": "https://registry.npm.taobao.org/@types/react-slick/download/@types/react-slick-0.23.4.tgz",
+      "integrity": "sha1-yX4qnn49GTPGhZO46CdS+rHozlM=",
      "requires": {
        "@types/react": "*"
      }
@ -863,9 +868,9 @@
      }
    },
    "antd": {
-      "version": "3.26.16",
-      "resolved": "https://registry.npmjs.org/antd/-/antd-3.26.16.tgz",
-      "integrity": "sha512-EYRwlEf8FCPCVRk5yDcgjSZOC0exu+m75SwlSQU+Mh17f9wGhLeL2/DV7/Sra1r+BZlfiahFdkgrLY7UgMMBEQ==",
+      "version": "3.26.20",
+      "resolved": "https://registry.nlark.com/antd/download/antd-3.26.20.tgz",
+      "integrity": "sha1-8/Vw76qllQoUSULyHrKqqgiOlAc=",
      "requires": {
        "@ant-design/create-react-context": "^0.2.4",
        "@ant-design/icons": "~2.1.1",
@ -925,16 +930,16 @@
      "dependencies": {
        "raf": {
          "version": "3.4.1",
-          "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
-          "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
+          "resolved": "https://registry.npm.taobao.org/raf/download/raf-3.4.1.tgz",
+          "integrity": "sha1-B0LpmkplUvRF1z4+4DKK8P8e3jk=",
          "requires": {
            "performance-now": "^2.1.0"
          }
        },
        "rc-pagination": {
-          "version": "1.20.14",
-          "resolved": "https://registry.npmjs.org/rc-pagination/-/rc-pagination-1.20.14.tgz",
-          "integrity": "sha512-sNKwbFrxiqATqcIIShfrFs8BT03n4UUwTAMYae+JhHTmILQmXdvimEnZbVuWcno6G02DAJcLrFpmkn1h2tmEJw==",
+          "version": "1.20.15",
+          "resolved": "https://registry.npm.taobao.org/rc-pagination/download/rc-pagination-1.20.15.tgz",
+          "integrity": "sha1-zLTNDpvU5H9y8p6kMsA1C/ez2Ac=",
          "requires": {
            "babel-runtime": "6.x",
            "classnames": "^2.2.6",
@ -944,8 +949,8 @@
        },
        "rc-rate": {
          "version": "2.5.1",
-          "resolved": "https://registry.npmjs.org/rc-rate/-/rc-rate-2.5.1.tgz",
-          "integrity": "sha512-3iJkNJT8xlHklPCdeZtUZmJmRVUbr6AHRlfSsztfYTXVlHrv2TcPn3XkHsH+12j812WVB7gvilS2j3+ffjUHXg==",
+          "resolved": "https://registry.npm.taobao.org/rc-rate/download/rc-rate-2.5.1.tgz?cache=0&sync_timestamp=1605573559401&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-rate%2Fdownload%2Frc-rate-2.5.1.tgz",
+          "integrity": "sha1-Vfxf0j6p3MciULmoiYA0efSEKWE=",
          "requires": {
            "classnames": "^2.2.5",
            "prop-types": "^15.5.8",
@ -955,8 +960,8 @@
        },
        "rc-select": {
          "version": "9.2.3",
-          "resolved": "https://registry.npmjs.org/rc-select/-/rc-select-9.2.3.tgz",
-          "integrity": "sha512-WhswxOMWiNnkXRbxyrj0kiIvyCfo/BaRPaYbsDetSIAU2yEDwKHF798blCP5u86KLOBKBvtxWLFCkSsQw1so5w==",
+          "resolved": "https://registry.nlark.com/rc-select/download/rc-select-9.2.3.tgz?cache=0&sync_timestamp=1618886345948&other_urls=https%3A%2F%2Fregistry.nlark.com%2Frc-select%2Fdownload%2Frc-select-9.2.3.tgz",
+          "integrity": "sha1-ZDQOLW72TovDz8b0aP/ShiVYmsI=",
          "requires": {
            "babel-runtime": "^6.23.0",
            "classnames": "2.x",
@ -974,8 +979,8 @@
        },
        "rc-tree": {
          "version": "2.1.4",
-          "resolved": "https://registry.npmjs.org/rc-tree/-/rc-tree-2.1.4.tgz",
-          "integrity": "sha512-Xey794Iavgs8YldFlXcZLOhfcIhlX5Oz/yfKufknBXf2AlZCOkc7aHqSM9uTF7fBPtTGPhPxNEfOqHfY7b7xng==",
+          "resolved": "https://registry.npm.taobao.org/rc-tree/download/rc-tree-2.1.4.tgz?cache=0&sync_timestamp=1615350038621&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-tree%2Fdownload%2Frc-tree-2.1.4.tgz",
+          "integrity": "sha1-73WfPnmaIbQ8Hs+ceU6hwU5wtZs=",
          "requires": {
            "@ant-design/create-react-context": "^0.2.4",
            "classnames": "2.x",
@ -1083,8 +1088,8 @@
    },
    "array-tree-filter": {
      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-tree-filter/-/array-tree-filter-2.1.0.tgz",
-      "integrity": "sha512-4ROwICNlNw/Hqa9v+rk5h22KjmzB1JGTMVKP2AKJBOCgb0yL0ASf0+YvCcLNNwquOHNX48jkeZIJ3a+oOQqKcw=="
+      "resolved": "https://registry.npm.taobao.org/array-tree-filter/download/array-tree-filter-2.1.0.tgz",
+      "integrity": "sha1-hzrAD+yDdJ8lWsjdCDgUtPYykZA="
    },
    "array-union": {
      "version": "1.0.2",
@ -3760,8 +3765,8 @@
    },
    "copy-to-clipboard": {
      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.1.tgz",
-      "integrity": "sha512-i13qo6kIHTTpCm8/Wup+0b1mVWETvu2kIMzKoK8FpkLkFxlt0znUAHcMzox+T8sPlqtZXq3CulEjQHsYiGFJUw==",
+      "resolved": "https://registry.npm.taobao.org/copy-to-clipboard/download/copy-to-clipboard-3.3.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcopy-to-clipboard%2Fdownload%2Fcopy-to-clipboard-3.3.1.tgz",
+      "integrity": "sha1-EVqhqZmP+rYZb5MHatbaO5E2Yq4=",
      "requires": {
        "toggle-selection": "^1.0.6"
      }
@ -3888,11 +3893,6 @@
        "randomfill": "^1.0.3"
      }
    },
-    "crypto-js": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npm.taobao.org/crypto-js/download/crypto-js-4.0.0.tgz",
-      "integrity": "sha1-KQSrJnep0EKFai6i74DekuSjbcw="
-    },
    "crypto-random-string": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
@ -4852,7 +4852,7 @@
    },
    "dom-closest": {
      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/dom-closest/-/dom-closest-0.2.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/dom-closest/download/dom-closest-0.2.0.tgz",
      "integrity": "sha1-69n5HRvyLo1vR3h2u80+yQIWwM8=",
      "requires": {
        "dom-matches": ">=1.0.1"
@ -4896,7 +4896,7 @@
    },
    "dom-matches": {
      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/dom-matches/-/dom-matches-2.0.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/dom-matches/download/dom-matches-2.0.0.tgz",
      "integrity": "sha1-0nKLQWqHUzmA6wibhI0lPPI6dYw="
    },
    "dom-scroll-into-view": {
@ -5018,8 +5018,8 @@
    },
    "draft-js": {
      "version": "0.10.5",
-      "resolved": "https://registry.npmjs.org/draft-js/-/draft-js-0.10.5.tgz",
-      "integrity": "sha512-LE6jSCV9nkPhfVX2ggcRLA4FKs6zWq9ceuO/88BpXdNCS7mjRTgs0NsV6piUCJX9YxMsB9An33wnkMmU2sD2Zg==",
+      "resolved": "https://registry.npm.taobao.org/draft-js/download/draft-js-0.10.5.tgz",
+      "integrity": "sha1-v6m+sBj+BTPbsI1mdcNxprCPp0I=",
      "requires": {
        "fbjs": "^0.8.15",
        "immutable": "~3.7.4",
@ -5149,7 +5149,7 @@
    },
    "enquire.js": {
      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/enquire.js/-/enquire.js-2.1.6.tgz",
+      "resolved": "https://registry.npm.taobao.org/enquire.js/download/enquire.js-2.1.6.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fenquire.js%2Fdownload%2Fenquire.js-2.1.6.tgz",
      "integrity": "sha1-PoeAybi4NQhMP2DhZtvDwqPImBQ="
    },
    "entities": {
@ -5668,7 +5668,7 @@
    },
    "eventlistener": {
      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/eventlistener/-/eventlistener-0.0.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/eventlistener/download/eventlistener-0.0.1.tgz",
      "integrity": "sha1-7Suqu4UiJ68rz4iRUscsY8pTLrg="
    },
    "events": {
@ -7925,7 +7925,7 @@
    },
    "hammerjs": {
      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz",
+      "resolved": "https://registry.npm.taobao.org/hammerjs/download/hammerjs-2.0.8.tgz",
      "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE="
    },
    "handle-thing": {
@ -8766,7 +8766,7 @@
    },
    "immutable": {
      "version": "3.7.6",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.7.6.tgz",
+      "resolved": "https://registry.npm.taobao.org/immutable/download/immutable-3.7.6.tgz",
      "integrity": "sha1-E7TTyxK++hVIKib+Gy665kAHHks="
    },
    "import-fresh": {
@ -9180,9 +9180,9 @@
      }
    },
    "is-mobile": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/is-mobile/-/is-mobile-2.2.1.tgz",
-      "integrity": "sha512-6zELsfVFr326eq2CI53yvqq6YBanOxKBybwDT+MbMS2laBnK6Ez8m5XHSuTQQbnKRfpDzCod1CMWW5q3wZYMvA=="
+      "version": "2.2.2",
+      "resolved": "https://registry.nlark.com/is-mobile/download/is-mobile-2.2.2.tgz",
+      "integrity": "sha1-9snF1Q7gElTOBec5vdg18e1OmVQ="
    },
    "is-npm": {
      "version": "1.0.0",
@ -10354,7 +10354,7 @@
    },
    "lodash.throttle": {
      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/lodash.throttle/download/lodash.throttle-4.1.1.tgz",
      "integrity": "sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ="
    },
    "lodash.uniq": {
@ -11409,8 +11409,8 @@
    },
    "omit.js": {
      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/omit.js/-/omit.js-1.0.2.tgz",
-      "integrity": "sha512-/QPc6G2NS+8d4L/cQhbk6Yit1WTB6Us2g84A7A/1+w9d/eRGHyEqC5kkQtHVoHZ5NFWGG7tUGgrhVZwgZanKrQ==",
+      "resolved": "https://registry.npm.taobao.org/omit.js/download/omit.js-1.0.2.tgz",
+      "integrity": "sha1-kaFPDrqEBm36AVvzDkdMR/MLyFg=",
      "requires": {
        "babel-runtime": "^6.23.0"
      }
@ -14213,9 +14213,9 @@
      }
    },
    "rc-calendar": {
-      "version": "9.15.10",
-      "resolved": "https://registry.npmjs.org/rc-calendar/-/rc-calendar-9.15.10.tgz",
-      "integrity": "sha512-xh1A3rYejKskAvkjnd9BcHXFbBnAYsHMGHBdtoAkbwp43B6yEieNL0g0Tzz8s1gApDZV2j5vF1jJ9IIpPYFNLw==",
+      "version": "9.15.11",
+      "resolved": "https://registry.npm.taobao.org/rc-calendar/download/rc-calendar-9.15.11.tgz",
+      "integrity": "sha1-zh5eqOTXdDW+ZqjHfbEvHw+aNF8=",
      "requires": {
        "babel-runtime": "6.x",
        "classnames": "2.x",
@ -14228,8 +14228,8 @@
    },
    "rc-cascader": {
      "version": "0.17.5",
-      "resolved": "https://registry.npmjs.org/rc-cascader/-/rc-cascader-0.17.5.tgz",
-      "integrity": "sha512-WYMVcxU0+Lj+xLr4YYH0+yXODumvNXDcVEs5i7L1mtpWwYkubPV/zbQpn+jGKFCIW/hOhjkU4J1db8/P/UKE7A==",
+      "resolved": "https://registry.npm.taobao.org/rc-cascader/download/rc-cascader-0.17.5.tgz?cache=0&sync_timestamp=1610107054432&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-cascader%2Fdownload%2Frc-cascader-0.17.5.tgz",
+      "integrity": "sha1-T96R0jt2CMQgJjw47unAaH+A99w=",
      "requires": {
        "array-tree-filter": "^2.1.0",
        "prop-types": "^15.5.8",
@ -14242,8 +14242,8 @@
    },
    "rc-checkbox": {
      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/rc-checkbox/-/rc-checkbox-2.1.8.tgz",
-      "integrity": "sha512-6qOgh0/by0nVNASx6LZnhRTy17Etcgav+IrI7kL9V9kcDZ/g7K14JFlqrtJ3NjDq/Kyn+BPI1st1XvbkhfaJeg==",
+      "resolved": "https://registry.npm.taobao.org/rc-checkbox/download/rc-checkbox-2.1.8.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-checkbox%2Fdownload%2Frc-checkbox-2.1.8.tgz",
+      "integrity": "sha1-7t2e+cLzr1s7jlzeUlSqia0aiAo=",
      "requires": {
        "babel-runtime": "^6.23.0",
        "classnames": "2.x",
@ -14253,8 +14253,8 @@
    },
    "rc-collapse": {
      "version": "1.11.8",
-      "resolved": "https://registry.npmjs.org/rc-collapse/-/rc-collapse-1.11.8.tgz",
-      "integrity": "sha512-8EhfPyScTYljkbRuIoHniSwZagD5UPpZ3CToYgoNYWC85L2qCbPYF7+OaC713FOrIkp6NbfNqXsITNxmDAmxog==",
+      "resolved": "https://registry.npm.taobao.org/rc-collapse/download/rc-collapse-1.11.8.tgz?cache=0&sync_timestamp=1606217065785&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-collapse%2Fdownload%2Frc-collapse-1.11.8.tgz",
+      "integrity": "sha1-ZqQAidRpUZ6UJACasckn4hQEHYA=",
      "requires": {
        "classnames": "2.x",
        "css-animation": "1.x",
@ -14267,8 +14267,8 @@
    },
    "rc-dialog": {
      "version": "7.6.1",
-      "resolved": "https://registry.npmjs.org/rc-dialog/-/rc-dialog-7.6.1.tgz",
-      "integrity": "sha512-KUKf+2eZ4YL+lnXMG3hR4ZtIhC9glfH27NtTVz3gcoDIPAf3uUvaXVRNoDCiSi+OGKLyIb/b6EoidFh6nQC5Wg==",
+      "resolved": "https://registry.npm.taobao.org/rc-dialog/download/rc-dialog-7.6.1.tgz?cache=0&sync_timestamp=1614949683544&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-dialog%2Fdownload%2Frc-dialog-7.6.1.tgz",
+      "integrity": "sha1-EVRczAuUWTT6dgeXJuDYU+UtcF8=",
      "requires": {
        "babel-runtime": "6.x",
        "rc-animate": "2.x",
@ -14277,8 +14277,8 @@
    },
    "rc-drawer": {
      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/rc-drawer/-/rc-drawer-3.1.3.tgz",
-      "integrity": "sha512-2z+RdxmzXyZde/1OhVMfDR1e/GBswFeWSZ7FS3Fdd0qhgVdpV1wSzILzzxRaT481ItB5hOV+e8pZT07vdJE8kg==",
+      "resolved": "https://registry.npm.taobao.org/rc-drawer/download/rc-drawer-3.1.3.tgz?cache=0&sync_timestamp=1614159639291&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-drawer%2Fdownload%2Frc-drawer-3.1.3.tgz",
+      "integrity": "sha1-y8sE1MB/C2by7OEdhH9KG9gOoLc=",
      "requires": {
        "classnames": "^2.2.6",
        "rc-util": "^4.16.1",
@ -14287,8 +14287,8 @@
    },
    "rc-dropdown": {
      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/rc-dropdown/-/rc-dropdown-2.4.1.tgz",
-      "integrity": "sha512-p0XYn0wrOpAZ2fUGE6YJ6U8JBNc5ASijznZ6dkojdaEfQJAeZtV9KMEewhxkVlxGSbbdXe10ptjBlTEW9vEwEg==",
+      "resolved": "https://registry.npm.taobao.org/rc-dropdown/download/rc-dropdown-2.4.1.tgz?cache=0&sync_timestamp=1600332782526&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-dropdown%2Fdownload%2Frc-dropdown-2.4.1.tgz",
+      "integrity": "sha1-qu9us6UVLN2ZgolcKnjZtfBGzew=",
      "requires": {
        "babel-runtime": "^6.26.0",
        "classnames": "^2.2.6",
@ -14299,8 +14299,8 @@
    },
    "rc-editor-core": {
      "version": "0.8.10",
-      "resolved": "https://registry.npmjs.org/rc-editor-core/-/rc-editor-core-0.8.10.tgz",
-      "integrity": "sha512-T3aHpeMCIYA1sdAI7ynHHjXy5fqp83uPlD68ovZ0oClTSc3tbHmyCxXlA+Ti4YgmcpCYv7avF6a+TIbAka53kw==",
+      "resolved": "https://registry.npm.taobao.org/rc-editor-core/download/rc-editor-core-0.8.10.tgz",
+      "integrity": "sha1-byFbxd+cM/+p9sWzDKc6favoq3w=",
      "requires": {
        "babel-runtime": "^6.26.0",
        "classnames": "^2.2.5",
@ -14313,8 +14313,8 @@
    },
    "rc-editor-mention": {
      "version": "1.1.13",
-      "resolved": "https://registry.npmjs.org/rc-editor-mention/-/rc-editor-mention-1.1.13.tgz",
-      "integrity": "sha512-3AOmGir91Fi2ogfRRaXLtqlNuIwQpvla7oUnGHS1+3eo7b+fUp5IlKcagqtwUBB5oDNofoySXkLBxzWvSYNp/Q==",
+      "resolved": "https://registry.npm.taobao.org/rc-editor-mention/download/rc-editor-mention-1.1.13.tgz",
+      "integrity": "sha1-nxyrEGX4awFSOEAyF5DCqxKsXos=",
      "requires": {
        "babel-runtime": "^6.23.0",
        "classnames": "^2.2.5",
@ -14342,9 +14342,9 @@
      }
    },
    "rc-hammerjs": {
-      "version": "0.6.9",
-      "resolved": "https://registry.npmjs.org/rc-hammerjs/-/rc-hammerjs-0.6.9.tgz",
-      "integrity": "sha512-4llgWO3RgLyVbEqUdGsDfzUDqklRlQW5VEhE3x35IvhV+w//VPRG34SBavK3D2mD/UaLKaohgU41V4agiftC8g==",
+      "version": "0.6.10",
+      "resolved": "https://registry.npm.taobao.org/rc-hammerjs/download/rc-hammerjs-0.6.10.tgz",
+      "integrity": "sha1-GDGjvY8hmXAL/MWtayCjVjCuteA=",
      "requires": {
        "babel-runtime": "6.x",
        "hammerjs": "^2.0.8",
@ -14352,9 +14352,9 @@
      }
    },
    "rc-input-number": {
-      "version": "4.5.6",
-      "resolved": "https://registry.npmjs.org/rc-input-number/-/rc-input-number-4.5.6.tgz",
-      "integrity": "sha512-AXbL4gtQ1mSQnu6v/JtMv3UbGRCzLvQznmf0a7U/SAtZ8+dCEAqD4JpJhkjv73Wog53eRYhw4l7ApdXflc9ymg==",
+      "version": "4.5.9",
+      "resolved": "https://registry.nlark.com/rc-input-number/download/rc-input-number-4.5.9.tgz?cache=0&sync_timestamp=1619578110950&other_urls=https%3A%2F%2Fregistry.nlark.com%2Frc-input-number%2Fdownload%2Frc-input-number-4.5.9.tgz",
+      "integrity": "sha1-HL9zXiT+I8TrmkMBAxcguV8qPj0=",
      "requires": {
        "babel-runtime": "6.x",
        "classnames": "^2.2.0",
@ -14365,8 +14365,8 @@
    },
    "rc-mentions": {
      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/rc-mentions/-/rc-mentions-0.4.2.tgz",
-      "integrity": "sha512-DTZurQzacLXOfVuiHydGzqkq7cFMHXF18l2jZ9PhWUn2cqvOSY3W4osN0Pq29AOMOBpcxdZCzgc7Lb0r/bgkDw==",
+      "resolved": "https://registry.npm.taobao.org/rc-mentions/download/rc-mentions-0.4.2.tgz?cache=0&sync_timestamp=1610510822768&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-mentions%2Fdownload%2Frc-mentions-0.4.2.tgz",
+      "integrity": "sha1-wYq3Ae+55LdbOFGgwNLdaYZA4kY=",
      "requires": {
        "@ant-design/create-react-context": "^0.2.4",
        "classnames": "^2.2.6",
@ -14394,8 +14394,8 @@
    },
    "rc-notification": {
      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/rc-notification/-/rc-notification-3.3.1.tgz",
-      "integrity": "sha512-U5+f4BmBVfMSf3OHSLyRagsJ74yKwlrQAtbbL5ijoA0F2C60BufwnOcHG18tVprd7iaIjzZt1TKMmQSYSvgrig==",
+      "resolved": "https://registry.npm.taobao.org/rc-notification/download/rc-notification-3.3.1.tgz?cache=0&sync_timestamp=1614675471156&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-notification%2Fdownload%2Frc-notification-3.3.1.tgz",
+      "integrity": "sha1-C6o+cPjUCrAVzo+njCYMSQ/HvrQ=",
      "requires": {
        "babel-runtime": "6.x",
        "classnames": "2.x",
@ -14416,9 +14416,9 @@
      }
    },
    "rc-progress": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/rc-progress/-/rc-progress-2.5.2.tgz",
-      "integrity": "sha512-ajI+MJkbBz9zYDuE9GQsY5gsyqPF7HFioZEDZ9Fmc+ebNZoiSeSJsTJImPFCg0dW/5WiRGUy2F69SX1aPtSJgA==",
+      "version": "2.5.3",
+      "resolved": "https://registry.npm.taobao.org/rc-progress/download/rc-progress-2.5.3.tgz",
+      "integrity": "sha1-APAblb2+GFbTpfgiQgUZAui3qOc=",
      "requires": {
        "babel-runtime": "6.x",
        "prop-types": "^15.5.8"
@ -14435,8 +14435,8 @@
    },
    "rc-resize-observer": {
      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/rc-resize-observer/-/rc-resize-observer-0.1.3.tgz",
-      "integrity": "sha512-uzOQEwx83xdQSFOkOAM7x7GHIQKYnrDV4dWxtCxyG1BS1pkfJ4EvDeMfsvAJHSYkQXVBu+sgRHGbRtLG3qiuUg==",
+      "resolved": "https://registry.npm.taobao.org/rc-resize-observer/download/rc-resize-observer-0.1.3.tgz?cache=0&sync_timestamp=1608864858155&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-resize-observer%2Fdownload%2Frc-resize-observer-0.1.3.tgz",
+      "integrity": "sha1-CXGR+cOrGG7ZB7VTum71Zd8Rwkk=",
      "requires": {
        "classnames": "^2.2.1",
        "rc-util": "^4.13.0",
@ -14464,8 +14464,8 @@
    },
    "rc-slider": {
      "version": "8.7.1",
-      "resolved": "https://registry.npmjs.org/rc-slider/-/rc-slider-8.7.1.tgz",
-      "integrity": "sha512-WMT5mRFUEcrLWwTxsyS8jYmlaMsTVCZIGENLikHsNv+tE8ThU2lCoPfi/xFNUfJFNFSBFP3MwPez9ZsJmNp13g==",
+      "resolved": "https://registry.npm.taobao.org/rc-slider/download/rc-slider-8.7.1.tgz?cache=0&sync_timestamp=1616675519253&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-slider%2Fdownload%2Frc-slider-8.7.1.tgz",
+      "integrity": "sha1-ntBzYtyTSJo45lSyG4EirXD9PEI=",
      "requires": {
        "babel-runtime": "6.x",
        "classnames": "^2.2.5",
@ -14479,8 +14479,8 @@
    },
    "rc-steps": {
      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/rc-steps/-/rc-steps-3.5.0.tgz",
-      "integrity": "sha512-2Vkkrpa7PZbg7qPsqTNzVDov4u78cmxofjjnIHiGB9+9rqKS8oTLPzbW2uiWDr3Lk+yGwh8rbpGO1E6VAgBCOg==",
+      "resolved": "https://registry.npm.taobao.org/rc-steps/download/rc-steps-3.5.0.tgz",
+      "integrity": "sha1-NrKn8fSZB7DZA2OISxhiPK+ftgA=",
      "requires": {
        "babel-runtime": "^6.23.0",
        "classnames": "^2.2.3",
@ -14489,9 +14489,9 @@
      }
    },
    "rc-switch": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/rc-switch/-/rc-switch-1.9.0.tgz",
-      "integrity": "sha512-Isas+egaK6qSk64jaEw4GgPStY4umYDbT7ZY93bZF1Af+b/JEsKsJdNOU2qG3WI0Z6tXo2DDq0kJCv8Yhu0zww==",
+      "version": "1.9.2",
+      "resolved": "https://registry.npm.taobao.org/rc-switch/download/rc-switch-1.9.2.tgz?cache=0&sync_timestamp=1603791200779&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-switch%2Fdownload%2Frc-switch-1.9.2.tgz",
+      "integrity": "sha1-eSHHZkEf6aZCZRDDQpAi1rpN/eI=",
      "requires": {
        "classnames": "^2.2.1",
        "prop-types": "^15.5.6",
@ -14500,8 +14500,8 @@
    },
    "rc-table": {
      "version": "6.10.15",
-      "resolved": "https://registry.npmjs.org/rc-table/-/rc-table-6.10.15.tgz",
-      "integrity": "sha512-LAr0M/gqt+irOjvPNBLApmQ0CUHNOfKsEBhu1uIuB3OlN1ynA9z+sdoTQyNd9+8NSl0MYnQOOfhtLChAY7nU0A==",
+      "resolved": "https://registry.nlark.com/rc-table/download/rc-table-6.10.15.tgz",
+      "integrity": "sha1-GB9McMT9dPZX7o8jGW5+sIoDZco=",
      "requires": {
        "classnames": "^2.2.5",
        "component-classes": "^1.2.6",
@ -14515,8 +14515,8 @@
    },
    "rc-tabs": {
      "version": "9.7.0",
-      "resolved": "https://registry.npmjs.org/rc-tabs/-/rc-tabs-9.7.0.tgz",
-      "integrity": "sha512-kvmgp8/MfLzFZ06hWHignqomFQ5nF7BqKr5O1FfhE4VKsGrep52YSF/1MvS5oe0NPcI9XGNS2p751C5v6cYDpQ==",
+      "resolved": "https://registry.npm.taobao.org/rc-tabs/download/rc-tabs-9.7.0.tgz?cache=0&sync_timestamp=1608866453009&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-tabs%2Fdownload%2Frc-tabs-9.7.0.tgz",
+      "integrity": "sha1-rglpW+9ZY9bmTnvBBSHHbf3YRIs=",
      "requires": {
        "@ant-design/create-react-context": "^0.2.4",
        "babel-runtime": "6.x",
@ -14533,8 +14533,8 @@
      "dependencies": {
        "raf": {
          "version": "3.4.1",
-          "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
-          "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
+          "resolved": "https://registry.npm.taobao.org/raf/download/raf-3.4.1.tgz",
+          "integrity": "sha1-B0LpmkplUvRF1z4+4DKK8P8e3jk=",
          "requires": {
            "performance-now": "^2.1.0"
          }
@ -14543,8 +14543,8 @@
    },
    "rc-time-picker": {
      "version": "3.7.3",
-      "resolved": "https://registry.npmjs.org/rc-time-picker/-/rc-time-picker-3.7.3.tgz",
-      "integrity": "sha512-Lv1Mvzp9fRXhXEnRLO4nW6GLNxUkfAZ3RsiIBsWjGjXXvMNjdr4BX/ayElHAFK0DoJqOhm7c5tjmIYpEOwcUXg==",
+      "resolved": "https://registry.npm.taobao.org/rc-time-picker/download/rc-time-picker-3.7.3.tgz?cache=0&sync_timestamp=1576572941972&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-time-picker%2Fdownload%2Frc-time-picker-3.7.3.tgz",
+      "integrity": "sha1-ZajekECTJQrpyCsCpJBeD5leI+I=",
      "requires": {
        "classnames": "2.x",
        "moment": "2.x",
@ -14556,8 +14556,8 @@
      "dependencies": {
        "raf": {
          "version": "3.4.1",
-          "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
-          "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
+          "resolved": "https://registry.npm.taobao.org/raf/download/raf-3.4.1.tgz",
+          "integrity": "sha1-B0LpmkplUvRF1z4+4DKK8P8e3jk=",
          "requires": {
            "performance-now": "^2.1.0"
          }
@ -14566,8 +14566,8 @@
    },
    "rc-tooltip": {
      "version": "3.7.3",
-      "resolved": "https://registry.npmjs.org/rc-tooltip/-/rc-tooltip-3.7.3.tgz",
-      "integrity": "sha512-dE2ibukxxkrde7wH9W8ozHKUO4aQnPZ6qBHtrTH9LoO836PjDdiaWO73fgPB05VfJs9FbZdmGPVEbXCeOP99Ww==",
+      "resolved": "https://registry.npm.taobao.org/rc-tooltip/download/rc-tooltip-3.7.3.tgz?cache=0&sync_timestamp=1614588684791&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-tooltip%2Fdownload%2Frc-tooltip-3.7.3.tgz",
+      "integrity": "sha1-KArsavyqROjf8EgPuv+eh/wArsw=",
      "requires": {
        "babel-runtime": "6.x",
        "prop-types": "^15.5.8",
@ -14615,8 +14615,8 @@
    },
    "rc-tree-select": {
      "version": "2.9.4",
-      "resolved": "https://registry.npmjs.org/rc-tree-select/-/rc-tree-select-2.9.4.tgz",
-      "integrity": "sha512-0HQkXAN4XbfBW20CZYh3G+V+VMrjX42XRtDCpyv6PDUm5vikC0Ob682ZBCVS97Ww2a5Hf6Ajmu0ahWEdIEpwhg==",
+      "resolved": "https://registry.nlark.com/rc-tree-select/download/rc-tree-select-2.9.4.tgz",
+      "integrity": "sha1-aqeU4fDmXGbEBqoKKg50/QpVewk=",
      "requires": {
        "classnames": "^2.2.1",
        "dom-scroll-into-view": "^1.2.1",
@ -14633,8 +14633,8 @@
      "dependencies": {
        "rc-tree": {
          "version": "2.1.4",
-          "resolved": "https://registry.npmjs.org/rc-tree/-/rc-tree-2.1.4.tgz",
-          "integrity": "sha512-Xey794Iavgs8YldFlXcZLOhfcIhlX5Oz/yfKufknBXf2AlZCOkc7aHqSM9uTF7fBPtTGPhPxNEfOqHfY7b7xng==",
+          "resolved": "https://registry.npm.taobao.org/rc-tree/download/rc-tree-2.1.4.tgz?cache=0&sync_timestamp=1615350038621&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-tree%2Fdownload%2Frc-tree-2.1.4.tgz",
+          "integrity": "sha1-73WfPnmaIbQ8Hs+ceU6hwU5wtZs=",
          "requires": {
            "@ant-design/create-react-context": "^0.2.4",
            "classnames": "2.x",
@ -14647,8 +14647,8 @@
        },
        "rc-trigger": {
          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/rc-trigger/-/rc-trigger-3.0.0.tgz",
-          "integrity": "sha512-hQxbbJpo23E2QnYczfq3Ec5J5tVl2mUDhkqxrEsQAqk16HfADQg+iKNWzEYXyERSncdxfnzYuaBgy764mNRzTA==",
+          "resolved": "https://registry.nlark.com/rc-trigger/download/rc-trigger-3.0.0.tgz?cache=0&sync_timestamp=1619590696046&other_urls=https%3A%2F%2Fregistry.nlark.com%2Frc-trigger%2Fdownload%2Frc-trigger-3.0.0.tgz",
+          "integrity": "sha1-9tmx2oomsrLR2RKgaHbBpIb1mA8=",
          "requires": {
            "babel-runtime": "6.x",
            "classnames": "^2.2.6",
@ -14660,18 +14660,14 @@
          },
          "dependencies": {
            "rc-animate": {
-              "version": "3.0.0-rc.6",
-              "resolved": "https://registry.npmjs.org/rc-animate/-/rc-animate-3.0.0-rc.6.tgz",
-              "integrity": "sha512-oBLPpiT6Q4t6YvD/pkLcmofBP1p01TX0Otse8Q4+Mxt8J+VSDflLZGIgf62EwkvRwsQUkLPjZVFBsldnPKLzjg==",
+              "version": "3.1.1",
+              "resolved": "https://registry.npm.taobao.org/rc-animate/download/rc-animate-3.1.1.tgz?cache=0&sync_timestamp=1601018005635&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frc-animate%2Fdownload%2Frc-animate-3.1.1.tgz",
+              "integrity": "sha1-3v3YY/VoFsIiU05Nxo/t3s0IE4Y=",
              "requires": {
-                "babel-runtime": "6.x",
-                "classnames": "^2.2.5",
-                "component-classes": "^1.2.6",
-                "fbjs": "^0.8.16",
-                "prop-types": "15.x",
+                "@ant-design/css-animation": "^1.7.2",
+                "classnames": "^2.2.6",
                "raf": "^3.4.0",
-                "rc-util": "^4.5.0",
-                "react-lifecycles-compat": "^3.0.4"
+                "rc-util": "^4.15.3"
              }
            }
          }
@ -15110,9 +15106,9 @@
      }
    },
    "react-lazy-load": {
-      "version": "3.0.13",
-      "resolved": "https://registry.npmjs.org/react-lazy-load/-/react-lazy-load-3.0.13.tgz",
-      "integrity": "sha1-OwqS0zbUPT8Nc8vm81sXBQsIuCQ=",
+      "version": "3.1.13",
+      "resolved": "https://registry.npm.taobao.org/react-lazy-load/download/react-lazy-load-3.1.13.tgz?cache=0&sync_timestamp=1593654792284&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Freact-lazy-load%2Fdownload%2Freact-lazy-load-3.1.13.tgz",
+      "integrity": "sha1-I2lD92twhMyEWHFtljKhyYU+pc0=",
      "requires": {
        "eventlistener": "0.0.1",
        "lodash.debounce": "^4.0.0",
@ -15250,8 +15246,8 @@
    },
    "react-slick": {
      "version": "0.25.2",
-      "resolved": "https://registry.npmjs.org/react-slick/-/react-slick-0.25.2.tgz",
-      "integrity": "sha512-8MNH/NFX/R7zF6W/w+FS5VXNyDusF+XDW1OU0SzODEU7wqYB+ZTGAiNJ++zVNAVqCAHdyCybScaUB+FCZOmBBw==",
+      "resolved": "https://registry.nlark.com/react-slick/download/react-slick-0.25.2.tgz",
+      "integrity": "sha1-VjMbZ9R9i8/i3OtqyrHI/VvR9rw=",
      "requires": {
        "classnames": "^2.2.5",
        "enquire.js": "^2.1.6",
@ -16095,8 +16091,8 @@
    },
    "rmc-feedback": {
      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/rmc-feedback/-/rmc-feedback-2.0.0.tgz",
-      "integrity": "sha512-5PWOGOW7VXks/l3JzlOU9NIxRpuaSS8d9zA3UULUCuTKnpwBHNvv1jSJzxgbbCQeYzROWUpgKI4za3X4C/mKmQ==",
+      "resolved": "https://registry.npm.taobao.org/rmc-feedback/download/rmc-feedback-2.0.0.tgz",
+      "integrity": "sha1-y8bLOuY8emNe7w4l5PuvWsNm7qo=",
      "requires": {
        "babel-runtime": "6.x",
        "classnames": "^2.2.5"
@ -16679,8 +16675,8 @@
    },
    "shallow-equal": {
      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/shallow-equal/-/shallow-equal-1.2.1.tgz",
-      "integrity": "sha512-S4vJDjHHMBaiZuT9NPb616CSmLf618jawtv3sufLl6ivK8WocjAo58cXwbRV1cgqxH0Qbv+iUt6m05eqEa2IRA=="
+      "resolved": "https://registry.npm.taobao.org/shallow-equal/download/shallow-equal-1.2.1.tgz",
+      "integrity": "sha1-TBar+lYEOqINBQMk76aJQLDaedo="
    },
    "shallowequal": {
      "version": "1.1.0",
@ -20480,6 +20476,16 @@
      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
      "dev": true
    },
+    "xterm": {
+      "version": "4.8.1",
+      "resolved": "https://registry.npm.taobao.org/xterm/download/xterm-4.8.1.tgz",
+      "integrity": "sha1-FVoXKaQ+Gom0BlJOIsVjQznjnKE="
+    },
+    "xterm-addon-fit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npm.taobao.org/xterm-addon-fit/download/xterm-addon-fit-0.4.0.tgz",
+      "integrity": "sha1-BuDF0KaqrPsAnvVl76HIHpPZAZM="
+    },
    "y18n": {
      "version": "3.2.1",
      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
--- a/package.json
+++ b/package.json
@ -111,7 +111,9 @@
    "webpack-dev-server": "^3.10.3",
    "webpack-manifest-plugin": "^2.2.0",
    "whatwg-fetch": "2.0.3",
-    "wrap-md-editor": "^0.2.20"
+    "wrap-md-editor": "^0.2.20",
+    "xterm": "4.8.1",
+    "xterm-addon-fit": "0.4.0"
  },
  "scripts": {
    "start": "node --max_old_space_size=15360 scripts/start.js",
--- a/public/css/editormd.min.css
+++ b/public/css/editormd.min.css
--- a/public/css/edu-purge.css
+++ b/public/css/edu-purge.css
@ -2346,7 +2346,6 @@ input::-ms-clear {
 /*中间部分宽度固定为1200*/
 .newMain {
  margin: 0 auto;
-  padding-bottom: 110px;
  min-width: 1200px;
 }

@ -4108,21 +4107,6 @@ em.vertical-line {

 /* 右侧内容宽度变化的话，需要调整posi-search right的值*/

-/*底部*/
-.newFooter {
-  max-height: 110px;
-}
-
-.newFooter {
-  position: absolute;
-  bottom: 0;
-  width: 100%;
-  background: #323232;
-  clear: both;
-  min-width: 1200px;
-  z-index: 8;
-  left: 0px;
-}

 .footercon {
  border-bottom: 1px solid #47494d;
@ -6718,4 +6702,13 @@ ul.count_ul li:not(:last-child):after {
 }
 input.ant-input-lg::placeholder{
 font-size: 14px !important;
+}
+p{
+  margin-bottom: 0px!important;
+}
+.toprightNum{
+  position: absolute;
+  right: 0px;
+  top:4px;
+  color: #999;
 }
--- a/src/AppConfig.js
+++ b/src/AppConfig.js
@ -2,7 +2,7 @@ import axios from 'axios';
 import { requestProxy } from "./indexEduplus2RequestProxy";
 import { broadcastChannelOnmessage, isDev, queryString } from 'educoder';
 import { notification } from 'antd';
-import cookie from 'react-cookies';
+
 import './index.css';

 let message501 = false;
@ -11,10 +11,8 @@ broadcastChannelOnmessage('refreshPage', () => {
 })

 function locationurl(list) {
-  if (window.location.port === "3007") {
-
-  } else {
-    window.location.href = list
+  if (window.location.port !== "3007") {
+  window.location.href = list
  }
 }
 // TODO 开发期多个身份切换
@ -26,53 +24,22 @@ if (isDev) {
    parsed = queryString.parse(_search);
  }
  debugType = window.location.search.indexOf('debug=t') !== -1 ? 'teacher' :
-    window.location.search.indexOf('debug=s') !== -1 ? 'student' :
-      window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 'admin'
+  window.location.search.indexOf('debug=s') !== -1 ? 'student' :
+  window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 'admin'
 }                 
-function clearAllCookie() {
-  cookie.remove('_educoder_session', { path: '/' });
-  cookie.remove('autologin_trustie', { path: '/' });
-  setpostcookie()
-}
-clearAllCookie();
-function setpostcookie() {
-  const str = window.location.pathname;
-  if (str.indexOf("/wxcode") !== -1) {
-    cookie.remove('_educoder_session', { path: '/' });
-    cookie.remove('autologin_trustie', { path: '/' });
-    const _params = window.location.search;
-    if (_params) {
-      let _search = _params.split('?')[1];
-      let _educoder_sessions = _search.split('&')[0].split('=');
-      cookie.save('_educoder_session', _educoder_sessions[1], { domain: '.educoder.net', path: '/' });
-      let autologin_trusties = _search.split('&')[1].split('=');
-      cookie.save('autologin_trustie', autologin_trusties[1], { domain: '.educoder.net', path: '/' });
-    }
-  }
-}
-setpostcookie();
-
 window._debugType = debugType;
 export function initAxiosInterceptors(props) {
+  // 判断网络是否连接
  initOnlineOfflineListener();
-  var proxy = "http://localhost:3000";
-    proxy = "https://testforgeplus.trustie.net";

-  const requestMap = {};
-  window.setfalseInRequestMap = function (keyName) {
-    requestMap[keyName] = false;
-  }
+  var proxy = "https://testforgeplus.trustie.net";
  //响应前的设置
  axios.interceptors.request.use(
    config => {
-      setpostcookie()
-      clearAllCookie()
-
-      if (config.url.indexOf(proxy) !== -1) {
+      if(config.url.indexOf("http") !== -1) {
        return config
      }
-      requestProxy(config)
-
+      requestProxy(config);
      let url = `/api${config.url}`;

      if (`${config[0]}` !== `true`) {
@ -86,18 +53,12 @@ export function initAxiosInterceptors(props) {
        } else {
          config.url = url;
        }
-        setpostcookie();
-      }
-      if (config.url.indexOf('update_file') === -1) {
-        requestMap[config.url] = true;
-
-        window.setTimeout("setfalseInRequestMap('" + config.url + "')", 900)
      }
      return config;
    },
    err => {
      return Promise.reject(err);
-    });
+  });

  axios.interceptors.response.use(function (response) {
    if (response === undefined) {
@ -146,8 +107,6 @@ export function initAxiosInterceptors(props) {
        message501 = false
      }, 2000);
    }
-    requestMap[response.config.url] = false;
-    setpostcookie();
    return response;
  }, function (error) {
    return Promise.reject(error);
--- a/src/common/UrlTool.js
+++ b/src/common/UrlTool.js
@ -15,7 +15,7 @@ export function getImageUrl(path) {
 	if (isDev) {
 		return `${local}/${path}`
 	}
-	return `/${path}`;
+	return `${path}`;
 }

 export function getImage(path) {
@ -162,28 +162,28 @@ export function getmyUrl(geturl) {
 }

 export function getUploadActionUrl(path, goTest) {
-	return `${getUrl()}/api/attachments.json?debug=${window._debugType || 'admin'}`;
+	return `${getUrl()}/api/attachments.json${isDev ?`${isDev ?`?debug=${window._debugType || 'admin'}` : ""}` : ""}`;
 }

 export function getUploadLogoActionUrl() {
-	return `${getUrl()}/api/resumes/logo.json?debug=${window._debugType || 'admin'}`;
+	return `${getUrl()}/api/resumes/logo.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`;
 }

 export function getUploadActionUrltwo(id) {
-	return `${getUrlmys()}/api/shixuns/${id}/upload_data_sets.json?debug=${window._debugType || 'admin'}`
+	return `${getUrlmys()}/api/shixuns/${id}/upload_data_sets.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`
 }

 export function getUploadActionUrlthree() {
-	return `${getUrlmys()}/api/jupyters/import_with_tpm.json?debug=${window._debugType || 'admin'}`
+	return `${getUrlmys()}/api/jupyters/import_with_tpm.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`
 }

 export function getupload_git_file(id) {
-	return `${getUrlmys()}/api/shixuns/${id}/upload_git_file.json?debug=${window._debugType || 'admin'}`
+	return `${getUrlmys()}/api/shixuns/${id}/upload_git_file.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`
 }


 export function getUploadActionUrlOfAuth(id) {
-	return `${getUrl()}/api/users/accounts/${id}/auth_attachment.json?debug=${window._debugType || 'admin'}`
+	return `${getUrl()}/api/users/accounts/${id}/auth_attachment.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`
 }

 export function getRandomNumber(type) {
--- a/src/common/components/comment/CommentItem.js
+++ b/src/common/components/comment/CommentItem.js
@ -64,7 +64,7 @@ function CommentItem({
  const commentAvatar = (author) => (
    <img
      className="item-flex flex-image"
-      src={author.image_url ? getImageUrl(`images/${author.image_url}`) : 'https://b-ssl.duitang.com/uploads/item/201511/13/20151113110434_kyReJ.jpeg'}
+      src={author.image_url ? getImageUrl(`/${author.image_url}`) : 'https://b-ssl.duitang.com/uploads/item/201511/13/20151113110434_kyReJ.jpeg'}
      alt=""
    />
  );
--- a/src/forge/About/Index.jsx
+++ b/src/forge/About/Index.jsx
@ -69,7 +69,7 @@ function Index(props){
    <div className="aboutPanels">
      <div className="aboutContent">
        <AlignCenterBetween style={{padding:"14px 20px"}}>
-          <span className="font-16"><i className="iconfont icon-xiangmujianjie mr5 font-16 color-blue"></i>项目简介</span>
+          <span className="font-16"><i className="iconfont icon-xiangmujianjie mr5 font-16 color-blue"></i>项目概览</span>
          { editOpration && !edit && <a onClick={editContent} className="color-blue">编辑</a> }
        </AlignCenterBetween>
        {
@ -117,7 +117,7 @@ function Index(props){
            {content ? 
              <RenderHtml className="break_word_comments imageLayerParent" value={content} url={props.history.location}/>
              :
-              <div>暂无简介~</div>
+              <div>暂无概览~</div>
            }
            {attachments && attachments.length > 0 &&
              <Attachments
--- a/src/forge/Activity/ActivityItem.js
+++ b/src/forge/Activity/ActivityItem.js
@ -33,7 +33,7 @@ class ActivityItem extends Component {
          }
          <p className="itemLine mt10">
            <Link to={`/users/${item && item.user_login}`} className="show-user-link">
-              <img alt="" src={getImageUrl(`images/${item.user_avatar}`)} className="createImage" />
+              <img alt="" src={getImageUrl(`/${item.user_avatar}`)} className="createImage" />
              <span className="mr20">{item.user_name}</span>
            </Link>
            {item.created_at && <span className="color-grey-9">创建于<span className="ml2 color-grey-6">{item.created_at}</span></span>}
--- a/src/forge/Branch/Select.jsx
+++ b/src/forge/Branch/Select.jsx
@ -102,7 +102,7 @@ export default (({ projectsId , branch , owner , changeBranch , branchList , tag
    </div>
  );
  return(
-    <Popover placement="bottom" visible={flag} content={menu} onClick={()=>setFlag(!flag)} overlayClassName="branch-tagBox-list">
+    <Popover placement='bottomLeft' visible={flag} content={menu} onClick={()=>setFlag(!flag)} overlayClassName="branch-tagBox-list">
      <div className="branch-tagBox">
        {/* {nav === 0 ?"分支":"标签"} */}
        <span className="color-grey-9 mr3 ml8"><i className="iconfont icon-fenzhi2 font-18"></i></span>
--- a/src/forge/Component/AddMember.jsx
+++ b/src/forge/Component/AddMember.jsx
@ -42,7 +42,7 @@ function AddMember({getID,login}){
            className="user_img radius"
            width="28"
            height="28"
-            src={getImageUrl(`images/${item && item.image_url}`)}
+            src={getImageUrl(`/${item && item.image_url}`)}
            alt=""
          />
          <span className="ml10" style={{ "vertical-align": "middle" }}>
--- a/src/forge/Component/Cards.jsx
+++ b/src/forge/Component/Cards.jsx
@ -3,10 +3,10 @@ import { getImageUrl } from 'educoder';
 import { Link } from 'react-router-dom';
 import './Component.scss';

-function Cards({img , title, desc , rightBtn , src}){
+function Cards({img , title, desc , rightBtn , src , bottomInfos}){
  return(
    <div className="cards">
-      {img &&<div className="img"><img src={getImageUrl(`images/${img}`)} alt=""/></div>}
+      {img &&<div className="img"><img src={getImageUrl(`/${img}`)} alt=""/></div>}
      <div className="content">
        <p className="titles">
          <Link to={src}>{title}</Link>
@ -15,6 +15,7 @@ function Cards({img , title, desc , rightBtn , src}){
        <div className="desc">
          {desc}
        </div>
+        {bottomInfos}
      </div>
    </div>
  )
--- a/src/forge/Component/Component.scss
+++ b/src/forge/Component/Component.scss
@ -112,6 +112,9 @@ li.ant-menu-item{
  right:240px;
  z-index: 10000;
 }
+.laterest{
+  color: #05690d;
+}

@media screen and (max-width: 1800px){
  .handleBox{
@ -151,4 +154,42 @@ li.ant-menu-item{
  .ant-tree{
    margin:0px 20px!important;
  }
+}
+
+.menuPanels{
+  width: 240px;
+  height: 180px;
+  .ant-popover-content,.ant-popover-inner{
+    height: 100%;
+    width: 100%;
+  }
+}
+.halfs{
+  margin-top: 24px;
+  padding:24px 0px 0px 0px;
+  border-top: 1px solid #e8e8e8;
+  .attrPerson{
+    padding-bottom: 24px;
+  }
+}
+.menuinfos{
+  padding:15px 0px;
+  &>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;
+      color: #333;
+    }
+    & >span:last-child{
+      color: #666;
+    }
+    &:last-child{
+      border-right: none;
+    }
+  }
 }
--- a/src/forge/Component/Contributors.jsx
+++ b/src/forge/Component/Contributors.jsx
@ -1,21 +1,154 @@
-import React from 'react';
+import React, { useEffect, useState } from 'react';
 import { AlignCenter , FlexAJ  } from '../Component/layout';
 import { Link } from 'react-router-dom';
+import { Popover , Spin } from 'antd';
 import { getImageUrl } from 'educoder';
+import './Component.scss';
+import { getUser } from '../GetData/getData';
+import axios from 'axios';

 function Contributors({contributors,owner,projectsId}){
+  const [ menuList ,setMenuList ]= useState([]);
+  const [ list , setList ]= useState(undefined);
+  const [ total , setTotal ]= useState(0);
+  const [ menu , setMenu ] = useState("");
+  const [ login , setLogin ] = useState(undefined);
+  const [ isSpin , setIsSpin ] = useState(false);
+
+  useEffect(()=>{
+    if(contributors && contributors.total_count>0){
+      setTotal(contributors.total_count);
+      setList(contributors.list);
+    }
+  },[contributors])
+
+  useEffect(()=>{
+    if(login){
+      getUsers(login);
+    }else{
+      setMenu(undefined);
+    }
+  },[login])
+
+  async function getUsers(login){
+    setIsSpin(true);
+    let a = menuList && menuList.filter(i=>i.login === login);
+    if(a.length === 0){
+      let result = await getUser(login);
+      let arr = menuList;
+      arr.push({...result});
+      setMenuList(arr);
+      setMenusFunc(result);
+      setIsSpin(false);
+    }else{
+      setMenusFunc(a[0]);
+      setIsSpin(false);
+    }
+  }
+
+  function setMenusFunc(data){
+    if(data){
+      let ele = (
+        <Spin spinning={isSpin}>
+          <FlexAJ>
+            <AlignCenter>
+              <Link to={`/users/${data.login}`}><img src={getImageUrl(`/${data.image_url}`)} alt="" className="radius" width="38px" height="38px"/></Link>
+              <Link to={`/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)}
+              </div>
+            </AlignCenter>
+            :""
+          }
+          {
+            data.location && <AlignCenter className="font-12 pt4 pb4"><span>所在地址:</span><span className="ml5">{data.location}</span></AlignCenter>
+          }
+        </Spin>
+      )
+      setMenu(ele);
+    }
+  }
+
+  function FocusFunc(flag,login){
+    axios({
+      method: flag ? 'post' : 'delete',
+      url: `/watchers/${flag ? 'follow' : 'unfollow'}.json`,
+      params: {target_type: "user",id:login}
+    }).then(result => {
+      if (result && (result.data.status === 0 || result.data.status === 2)) {
+        let a = menuList && menuList.filter(i=>i.login === login);
+        if(a){
+          a[0].is_watch = flag;
+        }
+        setMenusFunc(a[0]);
+      }
+    })
+    .catch(error => {
+      console.log(error);
+    });
+  }
+
+  function renderArray(array){
+    let str = "";
+    for(var i = 0;i<array.length;i++){
+      str += array[i].name +"、";
+    }
+    let substr = str.substr(0,str.length-1);
+    return (<span title={substr}>{substr}</span>)
+  }
+
+  function setVisibleFunc(flag,l,index){
+    if(l !== login){
+      setLogin(l);
+    }
+    var lx = list.concat();
+    lx.map(i=>i.visible =false);
+    if(flag){
+      lx[index].visible = flag;
+    }
+    lx.splice();
+    setList(lx);
+  }
+
  return(
-    <div>
+    <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>
-      <div className="attrPerson">
+      <div className="attrPerson" onMouseLeave={()=>setVisibleFunc(false)}>
        {
-          contributors && contributors.total_count > 0 ?
-          contributors.list.map((item,key)=>{
+          total > 0 ?
+          list.map((item,key)=>{
            return(
-              <Link key={key} to={`/users/${item.login}`}><img src={getImageUrl(`images/${item.image_url}`)} alt=""/></Link>
+              <Popover content={menu} visible={item.visible} overlayClassName="menuPanels" placement="top">
+                <Link key={key} to={`/users/${item.login}`}>
+                  <img src={getImageUrl(`/${item.image_url}`)} alt="" onMouseOver={()=>setVisibleFunc(true,item.login,key)}/>
+                </Link>
+              </Popover>
            )
          })
          :""
--- a/src/forge/Component/EAccount.scss
+++ b/src/forge/Component/EAccount.scss
@ -0,0 +1,9 @@
+.ant-modal-mask{
+  z-index: 1001;
+}
+.ant-modal-wrap{
+  z-index: 1002;
+  .ant-form-explain{
+    position: absolute;
+  }
+}
--- a/src/forge/Component/EducoderAccount.jsx
+++ b/src/forge/Component/EducoderAccount.jsx
@ -0,0 +1,60 @@
+import React , {forwardRef, useEffect} from 'react';
+import { Modal , Form , Input , Button } from 'antd';
+import './EAccount.scss';
+
+function EducoderAccount({form , visible , onOk , email}){
+  const { getFieldDecorator, validateFields , setFieldsValue } = form;
+
+  useEffect(()=>{
+    if(email){
+      setFieldsValue({email})
+    }
+  },[email])
+
+  function onSure(){
+    validateFields((error,values)=>{
+      if(!error){
+        onOk(values);
+      }
+    })
+  }
+  const layout = {
+    labelCol: { span: 5 },
+    wrapperCol: { span: 18 },
+  };
+  return(
+    <Modal 
+      visible={visible}
+      title="提示"
+      width="500px"
+      closable={false}
+      footer={
+        <Button type="primary" onClick={onSure}>确定</Button>
+      }
+      centered
+    >
+      <div>
+        <p className="mb15 edu-txt-center" style={{maxWidth:"350px",margin:"0px auto"}}>
+        为确保您能正常使用平台功能，请确认以下信息:
+        </p>
+        <Form {...layout}>
+          <Form.Item label="邮箱">
+            {getFieldDecorator("email",{
+              rules:[{required:true,message:"请输入邮箱账号"}]
+            })(
+              <Input placeholder="请输入您的邮箱账号" width="220px"/>
+            )}
+          </Form.Item>
+          <Form.Item label="密码">
+            {getFieldDecorator("password",{
+              rules:[{required:true,message:"请输入邮箱密码"}]
+            })(
+              <Input.Password placeholder="请输入您的邮箱密码" width="220px"/>
+            )}
+          </Form.Item>
+        </Form>
+      </div>
+    </Modal>
+  )
+}
+export default Form.create()(forwardRef(EducoderAccount));
--- a/src/forge/Component/MemberCards.jsx
+++ b/src/forge/Component/MemberCards.jsx
@ -45,7 +45,7 @@ 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(`images/${img}`)} /></Link>
+      <Link to={`/users/${user && user.login}`}><Img src={getImageUrl(`/${img}`)} /></Link>
      <div className="m-infos">
        <Link to={`/users/${user && user.login}`}><Name>{name}</Name></Link>
        <Time><I className="iconfont icon-shijian"></I>加入时间:{time}</Time>
--- a/src/forge/Component/Releases.jsx
+++ b/src/forge/Component/Releases.jsx
@ -20,10 +20,13 @@ function Releases({owner,projectsId,releaseVersions}){
        releaseVersions && releaseVersions.total_count>0 ?
          releaseVersions.list.map((item,key)=>{
            return(
-            <AlignTop className="mt10">
+            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/8/update`}>{item.name}</Link></p>
+                <p className="font-16 color-grey-6">
+                  <Link to={`/projects/${owner}/${projectsId}/releases`}>{item.name}</Link>
+                  <span className="font-12 laterest ml5">最新</span>
+                </p>
                <p className="color-grey-9 font-13">{item.created_at}</p>
              </div>
            </AlignTop>
--- a/src/forge/Component/SearchUser.jsx
+++ b/src/forge/Component/SearchUser.jsx
@ -1,50 +1,54 @@
-import React , { useState } from 'react';
+import React , { useState , useEffect } from 'react';
 import { AutoComplete } from 'antd';
 import { getImageUrl } from "educoder";
 import axios from 'axios';

 const Option = AutoComplete.Option;

-export default ({ getUser })=>{
+export default ({ getUser , placeholder, width ,value })=>{
+  const [ source , setSource ] = useState(undefined);
  const [ searchKey , setSearchKey ] = useState(undefined);
-  const [ userDataSource , setUserDataSource ] = useState(undefined);
+
+  useEffect(()=>{
+    if(!value){
+      setSearchKey(undefined);
+    }
+  },[value])
+  
+  useEffect(()=>{
+    getUserList();
+  },[searchKey])

  function getUserList(e){
    const url = `/users/list.json`;
    axios.get(url, {
      params: {
-        search: e,
+        search: searchKey,
      },
-    })
-    .then((result) => {
+    }).then((result) => {
      if (result) {
-        setUserDataSource(result.data.users);
+        sourceOptions(result.data.users);
      }
    })
    .catch((error) => {
      console.log(error);
    });
  };
-  
-  function changeInputUser(value){
-    setSearchKey(value);
-    getUserList(value);
-  }

-  function selectInputUser(id, option){
-    setSearchKey(option.props.value);
-    getUserList(option.props.value);
-    getUser && getUser(id);
-  }
-  const source =
-    userDataSource && userDataSource.map((item, key) => {
+  function sourceOptions(userDataSource){
+    const s = userDataSource && userDataSource.map((item, key) => {
      return (
-        <Option key={key} value={`${item.login}`}>
+        <Option
+          key={key}
+          value={`${item.user_id}`}
+          login={`${item.login}`}
+          name={item.username}
+        >
          <img
            className="user_img radius"
            width="28"
            height="28"
-            src={getImageUrl(`images/${item && item.image_url}`)}
+            src={getImageUrl(`/${item && item.image_url}`)}
            alt=""
          />
          <span className="ml10" style={{ "vertical-align": "middle" }}>
@ -54,14 +58,31 @@ export default ({ getUser })=>{
        </Option>
      );
    });
+    setSource(s);
+  }
+
+  function changeInputUser(e){
+    setSearchKey(e);
+  };
+
+  // 选择用户
+  function selectInputUser(e, option){
+    setSearchKey(option.props.name);
+    getUser(option.props.login);
+  };
+
  return(
-    <AutoComplete
-      dataSource={source}
-      value={searchKey}
-      style={{ width: 300 }}
-      onChange={changeInputUser}
-      onSelect={selectInputUser}
-      placeholder="搜索需要添加的用户..."
-    />
+    <div className="addPanel">
+      <AutoComplete
+        getPopupContainer={trigger => trigger.parentNode}
+        dataSource={source}
+        value={searchKey}
+        style={{ width: width || 300 }}
+        onChange={changeInputUser}
+        onSelect={selectInputUser}
+        placeholder={placeholder || "搜索需要添加的用户..."}
+        allowClear
+      />
+    </div>
  )
 }
--- a/src/forge/Component/User.jsx
+++ b/src/forge/Component/User.jsx
@ -1,8 +1,8 @@
 import React from 'react';
 import styled from 'styled-components';
+import { Link } from 'react-router-dom';

-
-export default ({ url , name , column })=>{
+export default ({ url , name , column  , id , login })=>{
  const Img = styled.span`
    display:flex;
    ${column && "flex-direction: column;text-align:center;"}
@ -19,6 +19,14 @@ export default ({ url , name , column })=>{
    }
  `;
  return(
+    id?
+    <Link to={`/users/${login}`}>
+      <Img>
+        { url && <img src={url} alt=""/> }
+        <span>{name}</span>
+      </Img>
+    </Link>
+    :
    <Img>
      { url && <img src={url} alt=""/> }
      <span>{name}</span>
--- a/src/forge/DevOps/About.jsx
+++ b/src/forge/DevOps/About.jsx
@ -36,8 +36,7 @@ function About(props, ref) {
  const [ disabled, setDisabled ] = useState(false);
  const [ typeFlag, setTypeFlag] = useState(false);

-
-  const AuthorLogin = props.author && props.author.login;
+  const AuthorLogin = props.projectDetail && props.projectDetail.author && props.projectDetail.author.login;
  const CurrentLogin = props.current_user && props.current_user.login;
  useEffect(()=>{
    if(CurrentLogin === AuthorLogin){
@ -56,11 +55,6 @@ function About(props, ref) {
      setIsSpining(false);
      if(result && result.data ){
        setStep(result.data.step);
-        // setStep(0);
-        // setFieldsValue({...result.data.cloud_account});
-        // if(result.data.cloud_account){
-        //   setDisabled(true);
-        // }
      }
    }).catch(error=>{
      setIsSpining(false);
--- a/src/forge/DevOps/OpsDetailRightpanel.jsx
+++ b/src/forge/DevOps/OpsDetailRightpanel.jsx
@ -1,7 +1,8 @@
 import React, { useState, useEffect } from "react";
-import { Spin } from "antd";
+import { Spin , Menu } from "antd";
 import { FlexAJ, AlignCenter } from "../Component/layout";
 import axios from "axios";
+import CodeSSH from './ssh/Index';

 export default ({
  data,
@ -17,6 +18,8 @@ export default ({
  const [spining, setSpining] = useState(true);
  const [stage, setStage] = useState(undefined);
  const [step, setStep] = useState(undefined);
+  const [nav, setNav] = useState("0");
+
  useEffect(() => {
    setSpining(rightSpin);
  }, [rightSpin]);
@ -35,6 +38,7 @@ export default ({
          : p[0];

        setStep(sub);
+        setNav("0");
        if (sub && sub.status !== "skipped") {
          getStep(pre.number, sub.number);
        }
@ -65,43 +69,55 @@ export default ({
    }
  }
  return (
-    <Spin spinning={spining}>
-      <div className="rightMainContent">
-        {data && data.status !== "error" ? (
-          <div>
-            <FlexAJ className="items">
-              <span>{step && step.name}</span>
-              <AlignCenter>
-                {step && step.duration_time}
-                <i className="iconfont icon-sanjiaoxing-down"></i>
-              </AlignCenter>
-            </FlexAJ>
-            <div>
-              {coders && coders.length > 0 ? (
-                coders.map((item, key) => {
-                  return (
+    <React.Fragment>
+      {/* <Menu className="devopsNav" onClick={(e)=>{setNav(e.key)}} selectedKeys={[nav]} mode="horizontal">
+        <Menu.Item key={'0'} value="0">开发流水线</Menu.Item>
+        <Menu.Item key={'1'} value="1">命令行</Menu.Item>
+      </Menu> */}
+      {
+        nav === "0" &&
+        <Spin spinning={spining}>
+          <div className="rightMainContent">
+            {data && data.status !== "error" ? (
+              <div>
+                <FlexAJ className="items">
+                  <span>{step && step.name}</span>
+                  <AlignCenter>
+                    {step && step.duration_time}
+                    <i className="iconfont icon-sanjiaoxing-down"></i>
+                  </AlignCenter>
+                </FlexAJ>
+                <div>
+                  {coders && coders.length > 0 ? (
+                    coders.map((item, key) => {
+                      return (
+                        <div className="opsDetailOut">
+                          <span>{key + 1}</span>
+                          <p>{item.out}</p>
+                        </div>
+                      );
+                    })
+                  ) : empty ? (
                    <div className="opsDetailOut">
-                      <span>{key + 1}</span>
-                      <p>{item.out}</p>
+                      <span>1</span>
+                      <p>
+                        {stage && stage.name} – {step && step.name}: Skipped
+                      </p>
                    </div>
-                  );
-                })
-              ) : empty ? (
-                <div className="opsDetailOut">
-                  <span>1</span>
-                  <p>
-                    {stage && stage.name} – {step && step.name}: Skipped
-                  </p>
+                  ) : (
+                    ""
+                  )}
                </div>
-              ) : (
-                ""
-              )}
-            </div>
+              </div>
+            ) : (
+              <div style={{ color: "red" }}>error:{data && data.error}</div>
+            )}
          </div>
-        ) : (
-          <div style={{ color: "red" }}>error:{data && data.error}</div>
-        )}
-      </div>
-    </Spin>
+        </Spin>
+      }
+      {
+        nav === "1" && <CodeSSH />
+      }
+    </React.Fragment>
  );
 };
--- a/src/forge/DevOps/Structure.jsx
+++ b/src/forge/DevOps/Structure.jsx
@ -58,6 +58,7 @@ function Structure(props,ref){
          return {
            ...item,
            author:item.author && item.author.name,
+            image_url:item.author && item.author.image_url,
            message: {
              branch: item.branch_target,
              message: item.message,
@ -244,7 +245,7 @@ function Structure(props,ref){
              {meg.sha && <span className="color-orange">{meg.sha}</span>}
            </div>
            <AlignCenter>
-              <img style={{borderRadius:"50%",marginRight:"10px",width:"25px",height:"25px"}} src={`${current_user && getUrl(`/images/${current_user.image_url}`)}`} />
+              <img style={{borderRadius:"50%",marginRight:"10px",width:"25px",height:"25px"}} alt="" src={`${item.image_url && getUrl(`/images/${item.image_url}`)}`} />
              <div className="task-hide ml5" style={{ maxWidth: "300px" }}>
                {meg.message}
              </div>
--- a/src/forge/DevOps/ops.scss
+++ b/src/forge/DevOps/ops.scss
@ -194,6 +194,18 @@
      &.rightSection{
        width:100%;
        background-color: #081930;
+        .devopsNav{
+          background-color: #111c24;
+          border-bottom: none;
+          .ant-menu-item{
+            color: #ccc;
+            padding:0px;
+            margin:0px 20px!important;
+          }
+          .ant-menu-item.ant-menu-item-selected{
+            color: #1890ff;
+          }
+        }
        .rightMainContent{
          padding:24px 30px;
          height:100vh;
--- a/src/forge/DevOps/ssh/Index.jsx
+++ b/src/forge/DevOps/ssh/Index.jsx
@ -0,0 +1,42 @@
+import React, { useState, useEffect } from "react";
+import XmlPanel from "./XmlPanel";
+import mediator from "./mediator";
+import axios from "axios";
+
+// const defaulturl = `http://47.111.130.18:48088`;
+const defaultValue = {
+  host: "106.75.231.63",
+  port: "2021",
+  ws_url: "wss://pre-webssh.educoder.net/ws",
+  username: "root",
+  secret: "Dron_123123",
+};
+function Index() {
+  const [sshConfigData, setSshConfigData] = useState(undefined);
+
+  useEffect(() => {
+    if (!sshConfigData) {
+      init();
+    }
+    setTimeout(() => {
+      mediator.publish("create-socket", 1);
+    }, 300);
+  }, [sshConfigData]);
+
+  // 获取服务器连接信息
+  function init() {
+    const url = `/api/ci/pipelines/ssh_server.json`;
+    axios.get(url).then(result=>{
+      if(result && result.data){
+        setSshConfigData({...result.data})
+      }
+    }).catch(error=>{})
+  }
+  return (
+    <XmlPanel
+      sshConfigData={sshConfigData||{}}
+      sid={1}
+    />
+  );
+}
+export default Index;
--- a/src/forge/DevOps/ssh/XmlPanel.jsx
+++ b/src/forge/DevOps/ssh/XmlPanel.jsx
@ -0,0 +1,219 @@
+import React, { useRef, useEffect, useState } from 'react';
+import { Base64 } from 'js-base64';
+
+import { Terminal } from 'xterm';
+import 'xterm/css/xterm.css';
+import mediator from './mediator';
+import ResizeObserver from 'resize-observer-polyfill';
+
+function getColsAndRows(width, height, term) {
+  let w = term._core._renderService.dimensions.actualCellWidth || 9.5;
+  let h = term._core._renderService.dimensions.actualCellHeight || 18;
+  const rows = Math.floor(height / h);
+  const cols = Math.floor(width / w);
+  return [cols, rows];
+}
+
+function onLayout(term, el) {
+  const ro = new ResizeObserver(entries => {
+    console.log(entries);
+    for (let entry of entries) {
+      if (entry.target.offsetHeight > 0 || entry.target.offsetWidth > 0) {
+        const [cols, rows] = getColsAndRows(
+          entry.target.offsetWidth,
+          entry.target.offsetHeight,
+          term,
+        );
+        console.log('cols, rows', cols, rows);
+        term.resize(cols, rows);
+        mediator.publish('ssh-xterm-resize', {
+          columns: cols,
+          rows: rows,
+          width: entry.target.offsetWidth,
+          height: entry.target.offsetHeight,
+        });
+      }
+    }
+  });
+  ro.observe(el);
+  return ro;
+}
+
+const TimeTicket = 30000;
+
+//建立 websockt 来交互
+//根据容器大小计算行数和列数并做到自适应
+//socket 与 term 需要分开初始化 因为socket 可能重置连接
+//mediator 监听消息，如果和id匹配，则建立连接，重置，或关闭连接
+
+export default ({ sshConfigData, sid }) => {
+  const [term, setTerm] = useState(null);
+
+  const { ws_url, password, port, secret } = sshConfigData;
+  const el = useRef();
+  const socket = useRef();
+  const isFirstConnected = useRef(false);
+
+  //term init
+  useEffect(() => {
+    if (el.current && ws_url) {
+      const term = new Terminal({ fontSize: 16, rendererType: 'dom' });
+      term.open(el.current);
+
+      term.onData(data => {
+        if (socket.current) {
+          if (socket.current.readyState === 1) {
+            socket.current.send(JSON.stringify({ tp: 'client', data: data }));
+            mediator.publish('on-operating-ssh'); //有操作则自动延时
+          } else {
+            //断开连接后重连
+            // socket.current = null
+            // mediator.publish('create-socket', sid)
+          }
+        }
+      });
+      term.write('Connecting...');
+      setTerm(term);
+      const ro = onLayout(term, el.current);
+      return () => {
+        term.dispose();
+        ro.unobserve(el.current);
+      };
+    }
+  }, [ws_url, el.current]);
+
+  useEffect(() => {
+    if (term && ws_url) {
+      function createSocket() {
+        const socketInstance = new WebSocket(ws_url);
+        socket.current = socketInstance;
+
+        socketInstance.onopen = () => {
+          let container = term.element.parentElement;
+          if (container) {
+            let width = container.offsetWidth;
+            let height = container.offsetHeight;
+            console.log('init', {
+              tp: 'init',
+              data: {
+                ...sshConfigData,
+                secret: secret,
+                width,
+                height,
+                rows: term.rows,
+                columns: term.cols,
+              },
+            });
+            socketInstance.send(
+              JSON.stringify({
+                tp: 'init',
+                data: {
+                  ...sshConfigData,
+                  secret: secret,
+                  width,
+                  height,
+                  rows: term.rows,
+                  columns: term.cols,
+                },
+              }),
+            );
+          }
+          term.focus();
+        };
+        socketInstance.onerror = error => {
+          console.log(
+            '------in socket error----',
+            error,
+            socketInstance,
+            ws_url,
+          );
+          //连接报错后，重新请求资源
+          // mediator.publish('on-recreate-socket')
+        };
+        socketInstance.onmessage = event => {
+          if (!isFirstConnected.current) {
+            term.write('\r');
+            // term.focus()
+            setTimeout(() => {
+              // term.clear();
+            }, 1000);
+          }
+          isFirstConnected.current = true;
+          console.log('event:', event);
+
+          const data = Base64.decode(event.data.toString());
+          let w = term._core._renderService.dimensions.actualCellWidth || 9.5;
+
+          console.log('data:', data, w, term);
+          term.write(data);
+        };
+
+        socketInstance.onclose = evt => {
+          if (tid) {
+            clearInterval(tid);
+          }
+          term.write('\r\nconnection closed');
+        };
+      }
+
+      const tid = setInterval(() => {
+        if (socket.current) {
+          socket.current.send(JSON.stringify({ tp: 'h' }));
+        }
+      }, TimeTicket);
+
+      const unSubCreate = mediator.subscribe('create-socket', id => {
+        if (sid === id) {
+          if (socket.current && socket.current.readyState === 1) {
+            term.focus();
+          } else {
+            createSocket();
+          }
+          term.focus();
+        }
+      });
+
+      const unSubClose = mediator.subscribe('close-socket', id => {
+        if (sid === id) {
+          if (socket.current) {
+            socket.current.close();
+            isFirstConnected.current = false;
+            term.clear();
+          }
+          socket.current = null;
+        }
+      });
+
+      const unSubResize = mediator.subscribe('ssh-xterm-resize', option => {
+        if (socket.current && socket.current.readyState === 1) {
+          socket.current.send(
+            JSON.stringify({ tp: 'resize', data: { ...option } }),
+          );
+        }
+      });
+
+      const unSubAddTime = mediator.subscribe('ssh-add-connect-time', () => {
+        if (socket.current && socket.current.readyState === 1) {
+          socket.current.send(JSON.stringify({ tp: 'overtime' }));
+        }
+      });
+
+      return () => {
+        unSubClose();
+        unSubCreate();
+        unSubResize();
+        unSubAddTime();
+        if (socket.current) {
+          socket.current.close();
+          isFirstConnected.current = false;
+        }
+      };
+    }
+  }, [term, ws_url, port]);
+
+  return (
+    <div ref={el} className="xterm-panel" style={{height:"100%"}}>
+      {!ws_url ? <p style={{ color: '#fff' }}>正在连接命令行服务...</p> : null}
+    </div>
+  );
+};
--- a/src/forge/DevOps/ssh/mediator.jsx
+++ b/src/forge/DevOps/ssh/mediator.jsx
@ -0,0 +1,46 @@
+function Mediator(obj) {
+  const channels = {};
+
+  const mediator = {
+    subscribe: function(channel, cb) {
+      if (!channels[channel]) {
+        channels[channel] = [];
+      }
+      channels[channel].push(cb);
+      return this.unsubscribe.bind(null, channel, cb);
+    },
+
+    unsubscribe: function(channel, cb) {
+      let rs = channels[channel];
+      let index = -1;
+      if (rs) {
+        for (let i = 0; i < rs.length; i++) {
+          if (rs[i].name === cb.name) {
+            index = i;
+            break;
+          }
+        }
+        if (index >= 0) {
+          channels[channel].splice(index, 1);
+          return true;
+        }
+      }
+      return false;
+    },
+
+    publish: function(channel) {
+      if (!channels[channel]) {
+        return false;
+      }
+      const args = Array.prototype.slice.call(arguments, 1);
+      channels[channel].forEach(subscription => {
+        subscription.apply(null, args);
+      });
+      return this;
+    },
+  };
+
+  return obj ? Object.assign(obj, mediator) : mediator;
+}
+const mediator = new Mediator();
+export default mediator;
--- a/src/forge/Divert/DivertModal.jsx
+++ b/src/forge/Divert/DivertModal.jsx
@ -0,0 +1,174 @@
+import React ,{ forwardRef, useEffect, useState } from 'react';
+import { Modal , Form , Input , Radio , Select } from 'antd';
+import SearchUser from '../Component/SearchUser';
+import './Index.scss';
+import Axios from 'axios';
+
+const { Option } = Select;
+function DivertModal({form , visible , onSuccess , onCancel,owner,repo}){
+  const { getFieldDecorator, validateFields , setFieldsValue } = form;
+  const [ cate , setCate ] = useState(0);
+  const [ value , setValue ] = useState(undefined);
+  
+  const [ organizations , setOrganizations ] = useState(undefined);
+
+  useEffect(()=>{
+    setFieldsValue({goal:cate})
+  },[])
+
+  useEffect(()=>{
+    if(owner && repo && visible===true){
+      getTeam();
+    }
+    if(!visible){
+      setFieldsValue({
+        owner_name:undefined,
+        identifier:undefined
+      })
+      setValue(undefined)
+    }
+  },[repo,owner,visible])
+
+  function getTeam(){
+    const url = `/${owner}/${repo}/applied_transfer_projects/organizations.json`;
+    Axios.get(url).then(result=>{
+      if(result){
+        setOrganizations(result.data.organizations);
+      }
+    }).catch(error=>{})
+  }
+
+  // 确认转移
+  function onOk(){
+    validateFields((error,values)=>{
+      console.log(...values);
+      if(!error){
+        const url = `/${owner}/${repo}/applied_transfer_projects.json`;
+        Axios.post(url,{
+          ...values
+        }).then(result=>{
+          if(result){
+            onSuccess(result.data && result.data.owner);
+          }
+        }).catch(error=>{})
+      }
+    })
+    
+  }
+  function changeType(e){
+    setCate(e.target.value);
+    setFieldsValue({
+      owner_name:undefined
+    })
+  }
+
+  function checkIdentifier(rule, value, callback){
+    if(!value){
+      callback();
+    }
+    if (repo && value !== repo) {
+      callback("请输入当前项目的标识！");
+    }
+    callback();
+  }
+
+  const layout = {
+    labelCol: { span: 5 },
+    wrapperCol: { span: 18 },
+  };
+
+  function getUser(id){
+    setValue(id);
+    setFieldsValue({
+      owner_name:id
+    })
+  }
+  return(
+    <Modal 
+      width="620px"
+      visible={visible}
+      title="转移仓库"
+      onCancel={onCancel}
+      onOk={onOk}
+      okText="确认转移"
+      cancelText={"取消"}
+      centered
+    >
+      <div className="diverModal">
+        {
+          cate === 0 ?
+          <ul className="descUl">
+            <li>转移需对方确认接受，转移成功后你将被移出仓库，其他已有成员权限不变</li>
+            <li>转移成功后，仓库的地址将变更至目标用户的命名空间下</li>
+            <li>已有成员如需继续操作仓库，需更新本地仓库的remote，使之指向新的地址</li>
+          </ul>
+          :
+          <ul className="descUl">
+            <li>仓库仅可以转移到您已经加入的组织中，不可以转移到未加入的组织中</li>
+            <li>涉及到仓库改名操作，请提前做好仓库备份并且在转移后对本地仓库的remote进行修改</li>
+            <li>转移仓库到组织后，你和组织创建者/管理员同时拥有对该仓库的管理操作</li>
+          </ul>
+        }
+        <Form {...layout} colon={false} layout={"horizontal"}>
+          <Form.Item label="转移给:" style={{marginBottom:"0px"}}>
+            {getFieldDecorator("goal",{
+              rules:[]
+            })(
+              <Radio.Group onChange={changeType}>
+                <Radio value={0}>个人</Radio>
+                <Radio value={1}>组织</Radio>
+              </Radio.Group>
+            )}
+          </Form.Item>
+          {
+            cate === 0 && 
+            <Form.Item label=" ">
+              {getFieldDecorator("owner_name",{
+                rules:[{required:true,message:"请输入目标用户名"}]
+              })(
+                // <Input placeholder="请输入目标用户" autoComplete={"off"}/>
+                <SearchUser getUser={getUser} width={"100%"} placeholder="请输入目标用户" value={value}/>
+              )}
+            </Form.Item>
+          }
+          {
+            cate === 1 &&
+            <Form.Item label=" ">
+              {getFieldDecorator("owner_name",
+                {rules:[{required:true,message:"请选择目标组织"}]}
+              )(
+                <Select placeholder="请选择目标组织" getPopupContainer={trigger => trigger.parentNode}>
+                  {
+                    organizations && organizations.length > 0 ?
+                      organizations.map((i,k)=>{
+                        return(
+                          <Option value={i.name}>{i.nickname}</Option>
+                        )
+                      })
+                    :""
+                  }
+                </Select>
+              )}
+            </Form.Item>
+          }
+          
+          <Form.Item label="仓库名称:">
+            {getFieldDecorator("identifier",
+              {
+                rules:[
+                  {required:true,message:"请输入仓库名称"},
+                  {
+                    validator:checkIdentifier
+                  }
+                ]
+              }
+            )(
+              <Input placeholder="请输入仓库名称" autoComplete={"off"}/>
+            )}
+          </Form.Item>
+        </Form>
+      </div>
+    </Modal>
+  )
+}
+export default Form.create()(forwardRef(DivertModal));
--- a/src/forge/Divert/Index.scss
+++ b/src/forge/Divert/Index.scss
@ -0,0 +1,12 @@
+.diverModal{
+  .descUl{
+    background-color: #fffae6;
+    border-radius: 4px;
+    padding:10px 15px;
+    color: #efc16b;
+    border:1px solid #efc16b;
+  }
+  .ant-form-item-required::before{
+    content: "";
+  }
+}
--- a/src/forge/GetData/getData.jsx
+++ b/src/forge/GetData/getData.jsx
@ -14,4 +14,8 @@ export const getHooks = async (id,params)=>{
 // 获取子目录列表
 export const getSubEntries = async (owner,projectsId,params)=>{
  return (await axios.get(`/${owner}/${projectsId}/sub_entries.json`,{params})).data;
+}
+// 获取用户信息
+export const getUser = async (login)=>{
+  return (await axios.get(`/users/${login}/hovercard.json`)).data;
 }
--- a/src/forge/Head/Footer.jsx
+++ b/src/forge/Head/Footer.jsx
@ -0,0 +1,66 @@
+import React, { useEffect , useState } from 'react';
+import './header.scss';
+
+function Footer(){
+  const [ value , setValue ] = useState(undefined);
+
+  useEffect(()=>{
+    try {
+      var chromesettingArray = JSON.parse(localStorage.getItem('chromesetting'));
+      setValue(chromesettingArray.footer);
+    } catch (e) {
+    }
+  },[])
+
+  function showhtml(htmlString){
+    var html = {__html:htmlString};
+    return <div dangerouslySetInnerHTML={html}></div> ;
+  }
+
+  return(
+    <div>
+      <div style={{height:"483px"}}></div>
+      <div className="newFooter edu-txt-center">
+        {value && showhtml(value)}
+        {/* <div className="footerInfos">
+          <ul>
+            <li>社区</li>
+            <li><a href={`/`} target="_blank">网站首页</a></li>
+            <li><a href={`https://www.trustie.net/agreement`} target="_blank">服务协议</a></li>
+            <li><a href={`https://forum.trustie.net/forums/1168/detail`} target="_blank">帮助中心</a></li>
+            <li><a href={`https://forum.trustie.net/`} target="_blank">问吧交流</a></li>
+            <li><a href={`https://www.trustie.net/cooperation`} target="_blank">合作伙伴</a></li>
+          </ul>
+          <ul>
+            <li>支持与服务</li>
+            <li><a href={`https://forgeplus.trustie.net/docs/api`} target="_blank">API文档</a></li>
+            <li><a href={`https://forum.trustie.net/forums/1168/detail`} target="_blank">帮助中心</a></li>
+            <li><a href={`https://git-scm.com`} target="_blank">Git常用命令</a></li>
+            <li><a href={`https://forum.trustie.net/forums/3080/detail`} target="_blank">DevOps使用文档</a></li>
+            <li><a href={`https://forgeplus.trustie.net/projects/jasder/forgeplus/tree/master/CHANGELOG.md`} target="_blank">日志更新</a></li>
+          </ul>
+          <ul>
+            <li>合作伙伴</li>
+            <li><a href={`http://www.sei.pku.edu.cn`} target="_blank">北京大学</a></li>
+            <li><a href={`http://scse.buaa.edu.cn`} target="_blank">北京航空航天大学</a></li>
+            <li><a href={`https://www.nju.edu.cn`} target="_blank">南京大学</a></li>
+            <li><a href={`https://www.xtu.edu.cn`} target="_blank">湘潭大学</a></li>
+            <li><a href={`http://www.iscas.ac.cn`} target="_blank">ISCAS</a></li>
+            <li><a href={`https://www.ucloud.cn`} target="_blank">UCloud优刻得</a></li>
+            <li><a href={`http://www.inforbus.com`} target="_blank">中创软件</a></li>
+            <li><a href={`https://www.inspur.com`} target="_blank">浪潮集团</a></li>
+            <li><a href={`http://www.copu.org.cn`} target="_blank">中国开源软件推进联盟</a></li>
+            <li><a href={`https://www.sjtu.edu.cn`} target="_blank">上海交通大学</a></li>
+          </ul>
+          <ul>
+            <li>合作伙伴</li>
+            <li><span>热线：</span></li>
+            <li><span>QQ群：1071514693</span></li>
+          </ul>
+        </div>
+        <p className="footerCopy">© Copyright 2007~2021 国防科技大学Trustie团队 & IntelliDE <a href="https://beian.miit.gov.cn">湘ICP备 17009477号</a></p> */}
+      </div>
+    </div>
+  )
+}
+export default Footer;
--- a/src/forge/Head/Header.js
+++ b/src/forge/Head/Header.js
@ -2,16 +2,14 @@ import React, { Component } from 'react';
 import AccountProfile from "../../modules/user/AccountProfile";
 import { getImageUrl } from 'educoder'
 import axios from 'axios';
-import { Modal, Input, message, notification , Dropdown , Menu ,Divider } from 'antd';
+import { Modal, Input, message, notification , Dropdown , Menu } from 'antd';

 import LoginDialog from '../../modules/login/LoginDialog';
 import GotoQQgroup from '../../modal/GotoQQgroup'
-// import 'antd/lib/modal/style/index.css';
-// import 'antd/lib/checkbox/style/index.css';
-// import 'antd/lib/radio/style/index.css';
-// import 'antd/lib/input/style/index.css';
+
 import '../../modules/tpm/TPMIndex.css';
 import logo from '../../modules/tpm/images/logo.png';
+
 import './header.scss';
 const $ = window.$
 // TODO 这部分脚本从公共脚本中直接调用
@ -111,7 +109,7 @@ class NewHeader extends Component {
  }

  onGlobalSearch=(value,item)=>{
-    window.location.href=`${item && item.url}?value=` + value;
+    window.location.href=`${item}?value=` + value;
  }

  openNotification = (messge) => {
@ -577,8 +575,8 @@ class NewHeader extends Component {
      })
    }

-    let search_url = settings && settings.common && settings.common.length> 0 && settings.common.filter(item=>item.name==="搜索");
-    let notice_url = settings && settings.common && settings.common.length> 0 && settings.common.filter(item=>item.name==="通知");
+    let search_url = settings && settings.common && settings.common.search;
+    let notice_url = settings && settings.common && settings.common.notice;
    return (
      <div className="newHeaders" id="nHeader">
        <div className="headerContent">
@ -603,7 +601,7 @@ class NewHeader extends Component {
          <a href={settings && settings.new_course.default_url} className={"fl mr30"} style={{minWidth:"45px"}}>
            {
              settings && settings.nav_logo_url ?
-              <img alt="可控开源社区" className="logoimg" style={{ heigth: "40px" }} src={getImageUrl(settings.nav_logo_url)}></img>
+              <img alt="可控开源社区" className="logoimg" style={{ heigth: "40px" }} src={getImageUrl(`/${settings.nav_logo_url}`)}></img>
              :
              <img alt="可控开源社区" className="logoimg" style={{ heigth: "40px" }} src={logo}></img>
            }
@ -646,7 +644,7 @@ class NewHeader extends Component {
            }
          </div>
          <div className="head-right">
-            {search_url && search_url.length>0 ? this.SearchInput(openSearch,search_url[0]):""}
+            {search_url ? this.SearchInput(openSearch,search_url):""}
            {
              current_user && (current_user.main_site || current_user.login) && (settings && settings.add && settings.add.length>0)?
              <Dropdown overlay={this.addMenu(settings && settings.add)} placement="bottomRight">
@ -654,10 +652,10 @@ class NewHeader extends Component {
              </Dropdown>:""
            }
            
-            {this.props.user && this.props.user.login && (notice_url && notice_url.length>0) ?
+            {this.props.user && this.props.user.login && notice_url ?
              <div className="ml30 edu-menu-panel">
                {user && user.login &&
-                  <a href={`${notice_url[0].url}`} style={{ position: 'relative' }}>
+                  <a href={`${notice_url}`} style={{ position: 'relative' }}>
                    <i className="iconfont icon-xiaoxilingdang color-grey-6"></i>
                    <span className="newslight" style={{ display: this.props.Headertop === undefined ? "none" : this.props.Headertop.new_message === true ? "block" : "none" }}>
                    </span>
@ -696,15 +694,14 @@ class NewHeader extends Component {
            <span className="font-15 ml30">
              <a onClick={() => this.educoderlogin()} className="mr5 color-grey-6">登录</a>
              {
-                settings && settings.new_course && settings.new_course.register_url &&
-                <span><em className="vertical-line"></em><a className="ml5 color-grey-6" href={`${settings.new_course.register_url}`} target="_blank">注册</a></span>
+                settings && settings.common && settings.common.register &&
+                <span><em className="vertical-line"></em><a className="ml5 color-grey-6" href={`${settings.common.register}`} target="_blank">注册</a></span>
              }
            </span>
            :
            <div className="ml30 edu-menu-panel" style={{ height: "70px", lineHeight: "70px" }}>
              <a href={`/users/${this.props.current_user === undefined ? "" : this.props.current_user.login}/courses`}>
-                <img alt="头像" className="radius" height="34" id="nh_user_logo" name="avatar_image"
-                  src={getImageUrl(`images/` + user.image_url)} width="34">
+                <img alt="头像" className="radius" height="34" id="nh_user_logo" name="avatar_image" src={getImageUrl(`/${user.image_url}`)} width="34">
                </img>
              </a>
              <ul className="edu-menu-list" style={{ top: '60px', textAlign: 'center' }}>
--- a/src/forge/Head/header.scss
+++ b/src/forge/Head/header.scss
@ -5,6 +5,64 @@
  background:#fff;
  border-radius: 3px;
  .ant-menu-vertical > .ant-menu-item{
-    border:none
+    border:none;
+    height: 35px;
+    line-height: 35px;
+    margin:0px;
+  }
+  .ant-menu-vertical{
+    border:none;
+  }
+}
+
+.newFooter {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  background: #323232;
+  clear: both;
+  min-width: 1200px;
+  z-index: 8;
+  left: 0px;
+  p {
+    margin-top: 0;
+    margin-bottom:0px !important;
+  }
+  .footerInfos{
+    display: flex;
+    max-width: 1200px;
+    margin:0px auto;
+    justify-content: space-around;
+    padding:60px 0px;
+    & >ul{
+      padding:0px 40px;
+      box-sizing: border-box;
+      max-width: 25%;
+      text-align: left;
+      li{
+        color: #fff;
+        font-weight: 300;
+        &:first-child{
+          font-size: 17px;
+        }
+        &>a,&>span{
+          color: #bbb;
+        }
+        &>a:hover{
+          color: #4cacff;
+        }
+      }
+    }
+  }
+  .footerCopy{
+    color: #bbb;
+    border-top: 1px solid #4e4e4e;
+    padding:10px 0px;
+    a{
+      color: #bbb;
+      &:hover{
+        color: #4cacff;
+      }
+    }
  }
 }
--- a/src/forge/Index.js
+++ b/src/forge/Index.js
@ -6,7 +6,6 @@ import { withRouter } from "react-router";
 import { SnackbarHOC } from "educoder";
 import { CNotificationHOC } from "../modules/courses/common/CNotificationHOC";
 import { TPMIndexHOC } from "../modules/tpm/TPMIndexHOC";
-import Handbook from './Component/Handbook';
 import "./css/index.scss";

 import Loadable from "react-loadable";
@ -35,7 +34,6 @@ class Index extends Component {
  render() {
    return (
      <div className="newMain clearfix">
-        <Handbook />
        <Switch {...this.props}>
          <Route
            path="/projects/:projectsType/new/:OIdentifier"
--- a/src/forge/Main/CoderDepot.jsx
+++ b/src/forge/Main/CoderDepot.jsx
@ -1,6 +1,6 @@
 import React , { useEffect , useState } from 'react';
 import { WhiteBack , Box , LongWidth , ShortWidth , Gap , AlignCenter , FlexAJ  } from '../Component/layout';
-import { Dropdown , Menu , Divider , Spin } from 'antd';
+import { Dropdown , Menu , Divider , Spin, Button } from 'antd';
 import { getImageUrl } from "educoder";
 import { Link } from 'react-router-dom';
 import CloneAddress from '../Branch/CloneAddress';
@ -20,7 +20,9 @@ import DrawerPanel from '../Component/DrawerPanel';
 import UpdateDescModal from './sub/UpdateDescModal';
 import Nodata from '../Nodata';

-
+/**
+ * projectDetail.type:0是托管项目，1是镜像项目，2是同步镜像项目(为2时不支持在线创建、在线上传、在线修改、在线删除、创建合并请求等功能)
+ */
 function CoderDepot(props){
  const [ projectDetail , setProjectDetail ]= useState(undefined);
  const [ treeValue , setTreeValue ] = useState(undefined);
@ -42,17 +44,18 @@ function CoderDepot(props){
  const [ openModal , setOpenModal ] = useState(false);
  const [ desc , setDesc ] = useState(undefined);
  const [ website , setWebsite ] = useState(undefined);
+  const [ lesson_url , setLessonUrl ] = useState(undefined);

  const owner = props.match.params.owner;
  const projectsId = props.match.params.projectsId;
  const branchName = props.match.params.branchName;
  let pathname = props.history.location.pathname;
-
  useEffect(()=>{
    if(props.projectDetail){
      setProjectDetail(props.projectDetail);
      setDesc(props.projectDetail.description);
      setWebsite(props.projectDetail.website);
+      setLessonUrl(props.projectDetail.lesson_url);
    }
  },[props])

@ -65,17 +68,17 @@ function CoderDepot(props){
  },[treeValue])

  useEffect(()=>{
-    if (pathname){
+    if (pathname && projectDetail){
      if(pathname.indexOf(`/projects/${owner}/${projectsId}`) > -1 && pathname.indexOf(`/tree/${branchName}/`) > -1) {
        let url = pathname.split(`/tree/${branchName}/`)[1];
        setTreeValue(url);
        getFileInfo(url,branchName);
      }else{
        setTreeValue(undefined);
-        getDirInfo(branchName ||(projectDetail && projectDetail.default_branch));
+        getDirInfo(branchName ||projectDetail.default_branch);
      }
    } 
-  },[pathname])
+  },[pathname,projectDetail])

  // 获取主目录列表
  function getDirInfo(branch){
@ -92,8 +95,9 @@ function CoderDepot(props){
        setZip_url(result.data.zip_url);
        let c = result.data.last_commit
        setLastCommit(c && c.commit);
-        setLastCommitAuthor(c && (c.author || (c.commit && c.commit.author)));
+        setLastCommitAuthor(c && c.committer);
        setMainFlag(true);
+        setReadOnly(true);
      }
      setTimeout(function(){setIsSpin(false);},500);
    }).catch(error=>{setIsSpin(false);})
@ -133,8 +137,9 @@ function CoderDepot(props){
        }
        let c = result.data.last_commit
        setLastCommit(c && c.commit);
-        setLastCommitAuthor(c && (c.author || (c.commit && c.commit.author)));
+        setLastCommitAuthor(c && c.committer);
        setMainFlag(false);
+        setReadOnly(true);
      }
      setTimeout(function(){setIsSpin(false);},500)
    }).catch(error=>{setIsSpin(false);})
@ -214,20 +219,26 @@ function CoderDepot(props){
      </Menu>
    </div>
  )
-  function okUpdate(d,w){
+  // 确认修改简介、website、实践课程链接
+  function okUpdate(d,w,l){
    const url = `/${owner}/${projectsId}.json`;
    axios.put(url,{
-      description:d,website:w
+      description:d,website:w,lesson_url:l
    }).then(result=>{
      if(result && result.data && result.data.id){
        setDesc(result.data.description);
        setWebsite(result.data.website);
+        setLessonUrl(result.data.lesson_url);
      }
    })
  }
+
+  let n = fileInfo && fileInfo.name;
+  const mdFlag = n && n.substring(n.length-3,n.length) === ".md";
+  
  return(
    <WhiteBack>
-      <UpdateDescModal desc={desc} website={website} visible={openModal} onCancel={()=>setOpenModal(false)} onOk={okUpdate}/>
+      <UpdateDescModal desc={desc} website={website} lesson_url={lesson_url} visible={openModal} onCancel={()=>setOpenModal(false)} onOk={okUpdate}/>
      <Spin spinning={isSpin}>
        {
          (dirInfo || fileInfo) && 
@ -242,7 +253,10 @@ function CoderDepot(props){
              onClose={()=>setVisible(false)}
              list = {mainFlag ? dirInfo : undefined}
            />
-            <div className="drawerBtn" onClick={()=>setVisible(true)}><i className="iconfont icon-youjiantou"></i></div>
+            <div className="drawerBtn" onClick={()=>setVisible(true)}>
+              <i className="iconfont icon-youjiantou font-16"></i>
+              <span>目录</span>
+            </div>
          </React.Fragment>
        }
        <div style={{minHeight:"500px"}}>
@ -284,11 +298,21 @@ function CoderDepot(props){
                    </AlignCenter>
                    <AlignCenter>
                      <div className="mr20 addOptionBtn">
-                        <a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/pulls/new`)} >+ 合并请求</a>
+                        {
+                          projectDetail.type !== 2 && 
+                          <a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/pulls/new`)} >+ 合并请求</a>
+                        }
                        <a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/issues/new`)} >+ 任务</a>
                      </div>
-                      { type === "dir" && <Dropdown.Button overlay={fileMenu} className="mr20">文件</Dropdown.Button>}
-                      <Dropdown.Button overlay={downloadMenu} type={'primary'}>下载</Dropdown.Button>
+                      { type === "dir" && projectDetail.type !== 2 &&
+                        <Dropdown overlay={fileMenu} className="mr20" trigger={['click']}>
+                          <Button type="default">文件 <i className="iconfont icon-sanjiaoxing-down ml3 font-14 color-grey-9"></i></Button>
+                        </Dropdown>
+                      }
+                      
+                      <Dropdown overlay={downloadMenu} placement="bottomRight" trigger={['click']}>
+                        <Button type={'primary'}>下载 <i className="iconfont icon-sanjiaoxing-down ml3 font-14 color-white"></i></Button>
+                      </Dropdown>
                    </AlignCenter>
                  </FlexAJ>
                  {
@ -297,8 +321,8 @@ function CoderDepot(props){
                      {
                        lastCommit &&
                        <div className="listtablehead">
-                          <User url={getImageUrl(`images/${lastCommitAuthor && lastCommitAuthor.image_url}`)} name={lastCommitAuthor && lastCommitAuthor.name} />
-                          <div className={hideBtn && hide ? "ellipsistxt hide" :"ellipsistxt"}><p id="ptxt">{lastCommit && lastCommit.message}</p></div>
+                          <User url={getImageUrl(`/${lastCommitAuthor && lastCommitAuthor.image_url}`)} name={lastCommitAuthor && lastCommitAuthor.name} id={lastCommitAuthor && lastCommitAuthor.id} login={lastCommitAuthor && lastCommitAuthor.login}/>
+                          <div className={hideBtn && hide ? "ellipsistxt hide" :"ellipsistxt"}><pre id="ptxt">{lastCommit && lastCommit.message}</pre></div>
                          { hideBtn && <span className="ellipsis" onClick={()=>changeHide(hide)}><i className="iconfont icon-shenglvehao"></i></span> }

                          <span className="ml12 color-grey-9 mt3">{lastCommit && lastCommit.time_from_now}</span>
@ -335,8 +359,10 @@ function CoderDepot(props){
                            {...props}
                            detail={fileInfo}
                            readOnly={readOnly}
+                            md={mdFlag}
                            onEdit={onEdit}
                            currentBranch={branchName || (projectDetail && projectDetail.default_branch)}
+                            type={projectDetail.type}
                          ></CoderRootFileDetail>
                        }
                      </ul>
@ -347,7 +373,7 @@ function CoderDepot(props){
                    (dirInfo && dirInfo.length === 0) && (fileInfo && fileInfo.length === 0) ? <Nodata _html="暂未发现文件"/> :""
                  } 
                  {/* readme文件显示(显示文件详情时不显示readme文件) */}
-                  { dirInfo && (projectDetail && projectDetail.readme) ? <ReadMe ChangeFile={ChangeFile} readme={projectDetail && projectDetail.readme} operate={props && (props.isManager || props.isDeveloper)} history={props.history} /> :"" }
+                  { dirInfo && (projectDetail && projectDetail.readme) ? <ReadMe ChangeFile={ChangeFile} readme={projectDetail && projectDetail.readme} operate={props && (props.isManager || props.isDeveloper) && projectDetail.type !==2 } history={props.history} /> :"" }
                </div>
              </LongWidth>
              {
@ -358,12 +384,12 @@ function CoderDepot(props){
                      <FlexAJ className="font-18 color-grey-6 mb20" style={{lineHeight:"28px"}}>简介
                        {projectDetail.permission && (projectDetail.permission==="Admin" || projectDetail.permission==="Owner") && <i onClick={()=>setOpenModal(true)} className="iconfont icon-anquanshezhi color-grey-9 font-15"></i>}
                      </FlexAJ>
-                      {desc && <p className="font-14 color-grey-9 mb15 task-hide-2" style={{lineHeight:"22px",WebkitLineClamp:"4",textAlign:"justify"}}>{desc}</p>}
+                      {desc && <p className="font-14 color-grey-9 mb15 task-hide-2" style={{lineHeight:"22px",WebkitLineClamp:"4",textAlign:"justify",wordBreak:"break-all"}}>{desc}</p>}
                      {
                        website &&
                        <p className="color-grey-6 df">
                          <i className="iconfont icon-lianjie2 font-15 mr10 color-grey-9"></i>
-                          <span style={{wordBreak:"break-all",lineHeight:"20px",marginTop:"5px"}}>{website}</span>
+                          <a href={website} target="_blank" style={{wordBreak:"break-all",lineHeight:"20px",marginTop:"5px",textDecoration:"underline"}}>{website}</a>
                        </p>
                      }
                      <p>
@ -382,6 +408,14 @@ function CoderDepot(props){
                        </p>
                      }
                    </div>
+                    {
+                      lesson_url &&
+                      <div>
+                        <Divider />
+                        <p className="font-16 color-grey-6">实践课程</p>
+                        <a href={lesson_url} target="_blank" className="color-grey-6" style={{textDecoration:"underline"}}>{lesson_url}</a>
+                      </div>
+                    }
                    {/* 发布 */}
                    {
                      projectDetail && projectDetail.release_versions &&
@ -393,10 +427,7 @@ function CoderDepot(props){
                    {/* 贡献者 */}
                    {
                      projectDetail && projectDetail.contributors &&
-                      <React.Fragment>
-                        <Divider />
-                        <Contributors contributors={projectDetail && projectDetail.contributors} owner={owner} projectsId={projectsId}/>
-                      </React.Fragment>
+                      <Contributors contributors={projectDetail && projectDetail.contributors} owner={owner} projectsId={projectsId} />
                    }
                    {/* 语言 */}
                    { projectDetail && projectDetail.languages && 
--- a/src/forge/Main/CoderDepotReadme.jsx
+++ b/src/forge/Main/CoderDepotReadme.jsx
@ -1,13 +1,49 @@
-import React from 'react';
+import React, { useEffect, useState } from 'react';
 import RenderHtml from '../../components/render-html';
+import { Dropdown , Menu , Spin } from 'antd';
+import { Link } from 'react-router-dom';
+const $ = window.$;

 function CoderDepotReadme({ operate , history , readme , ChangeFile }){
+  const [ menuList ,setMenuList ] = useState(undefined);
+
+  useEffect(()=>{
+    if(readme && readme.content){
+      let path = history.location.pathname;
+      const items = $.map($("#readme").find("h1,h2,h3,h4,h5,h6"), function (el, _) {
+        const anchor = el.id;
+        const level = el.tagName.replace("H", "");
+        const href = `#${anchor}`;
+        return { href:`${path}${href}`,text:el.textContent , level:level }
+      });
+      setMenuList(items);
+    }
+  },[readme])
+
+  function menu(){
+    if(menuList && menuList.length > 0){
+      let hash = history.location.hash;
+      return(
+        <Menu className="menuslist">
+          {
+            menuList.map((item,key)=>{
+              return(
+                <Menu.Item key={item.id} className={decodeURI(hash).indexOf(item.text)>-1 ?"active":""}><Link to={`${item.href}`} style={{paddingLeft:`${item.level *10}px`}} title={item.text}>{item.text}</Link></Menu.Item>
+              )
+            })
+          }
+        </Menu>
+      )
+    }else{
+      return <Spin />
+    }
+  }
  return(
    <div className="commonBox" id="readme">
      <div className="commonBox-title">
-        <span className="mr10">
-          <i className="iconfont icon-wenjian1 font-16 color-grey-9 fl mt3"></i>
-        </span>
+        <Dropdown overlay={menu()}>
+          <i className="iconfont icon-zhangjie1 font-16 color-grey-3 mr10"></i>
+        </Dropdown>
        <span className="commonBox-title-read">README.md</span>
        {
          operate ?
--- a/src/forge/Main/CoderRootCommit.js
+++ b/src/forge/Main/CoderRootCommit.js
@ -74,6 +74,7 @@ class CoderRootCommit extends Component{
          array.push({
            name:item.author && item.author.name,
            login: item.author && item.author.login,
+            id: item.author && item.author.id,
            image_url:item.author && item.author.image_url,
            sha:item.sha,
            time_from_now:item.time_from_now,
@ -107,7 +108,7 @@ class CoderRootCommit extends Component{
    let branch = branchName || defaultBranch;
    return(
      <React.Fragment>
-        <div className={"main"}>
+        <div className={"main"}style={{padding:"0px",border:"none"}}>
          <div className="f-wrap-between">
            <SelectBranch 
              repo_id={projectDetail && projectDetail.repo_id} 
@ -136,10 +137,18 @@ class CoderRootCommit extends Component{
                          <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="flex1 ml20 font-16 color-grey-3">{item.message}</Link>
                        </p>
                        <p className="f-wrap-alignCenter mt15">
-                          <Link to={`/users/${item.login}`} className="show-user-link">
-                            {item.image_url?<img src={getImageUrl(`images/${item.image_url}`)} alt="" width="28px" height="28px" className="mr15 radius"/>:""}
-                            <label className="font-14 color-grey-6" style={{verticalAlign:'middle'}}>{item.name ?`${item.name}:`:""}提交于 {item.time_from_now}</label>
-                          </Link>
+                          {
+                            item.id ?
+                            <Link to={`/users/${item.login}`} className="show-user-link">
+                              {item.image_url?<img src={getImageUrl(`/${item.image_url}`)} alt="" width="28px" height="28px" className="mr15 radius"/>:""}
+                              <label className="font-14 color-grey-6" style={{verticalAlign:'middle'}}>{item.name ?`${item.name}:`:""}提交于 {item.time_from_now}</label>
+                            </Link>:
+                            <span className="show-user-link">
+                              {item.image_url?<img src={getImageUrl(`/${item.image_url}`)} alt="" width="28px" height="28px" className="mr15 radius"/>:""}
+                              <label className="font-14 color-grey-6" style={{verticalAlign:'middle'}}>{item.name ?`${item.name}:`:""}提交于 {item.time_from_now}</label>
+                            </span>
+                          }
+                          
                        </p> 
                      </div>
                    )
--- a/src/forge/Main/CoderRootFileDetail.js
+++ b/src/forge/Main/CoderRootFileDetail.js
@ -24,13 +24,25 @@ class CoderRootFileDetail extends Component {
  }

  componentDidMount = () => {
-    const { detail } = this.props;
+    const { detail , mdFlag } = this.props;
    this.setState({
      value: detail.content,
    });
    this.languages_total();
  };

+  componentDidUpdate=(prevProps)=>{
+    const { content } = this.props && this.props.detail;
+    const prevcontent = prevProps.detail && prevProps.detail.content;
+    if (content && prevcontent) {
+      if (prevcontent !== content){
+        this.setState({
+          description: content
+        });
+      }
+    }
+  }
+
  languages_total = () => {
    const { detail } = this.props;
    const file_name = detail.path.split("/").pop().split(".").pop();
@ -164,9 +176,10 @@ class CoderRootFileDetail extends Component {
      current_user,
      isManager,
      isDeveloper,
-      md,
      currentBranch,
-      platform
+      platform,
+      md,
+      type
    } = this.props;
    const { language, languages, description } = this.state;
    let flag = current_user && current_user.login && (isManager || isDeveloper);
@ -185,17 +198,18 @@ class CoderRootFileDetail extends Component {
                {readOnly ? (
                  <span>
                    {
-                      detail.direct_download ?
-                        ""
-                        :
+                      !detail.direct_download?
                        <span>
                          <a onClick={() => this.DownLoadFile(detail.download_url)} className="ml20">
                            <i className="iconfont icon-xiazai1 font-15 color-grey-6"></i>
                          </a>
-                          <a onClick={() => this.EditFile(false)} className="ml20">
-                            <i className="iconfont icon-bianji1 font-15 color-grey-6"></i>
-                          </a>
-                        </span>
+                          {
+                            type !==2  &&
+                            <a onClick={() => this.EditFile(false)} className="ml20">
+                              <i className="iconfont icon-bianji1 font-15 color-grey-6"></i>
+                            </a>
+                          }
+                        </span>:""
                    }
                  </span>
                ) : (
@ -226,18 +240,21 @@ class CoderRootFileDetail extends Component {
                      </button>
                    </React.Fragment>
                  )}
-
-                <Popconfirm
-                  title="确认删除这个文件？"
-                  className="ml20"
-                  okText="确定"
-                  cancelText="取消"
-                  onConfirm={this.deleteFile}
-                >
-                  <a>
-                    <i className="iconfont icon-shanchu font-15 color-grey-6"></i>
-                  </a>
-                </Popconfirm>
+                {
+                  type !==2 &&
+                  <Popconfirm
+                    title="确认删除这个文件？"
+                    className="ml20"
+                    okText="确定"
+                    cancelText="取消"
+                    onConfirm={this.deleteFile}
+                  >
+                    <a>
+                      <i className="iconfont icon-shanchu font-15 color-grey-6"></i>
+                    </a>
+                  </Popconfirm>
+                }
+                
              </div>
            )}
          </p>
@ -245,11 +262,7 @@ class CoderRootFileDetail extends Component {
        <div>
          {detail.image_type ? (
            <div className="edu-txt-center pt20 pb20">
-              <img
-                alt=""
-                src={detail.download_url}
-                style={{ maxWidth: "80%" }}
-              />
+              <img alt="" src={detail.download_url} style={{ maxWidth: "80%" }} />
            </div>
          ) : detail.direct_download ? (
            <div className="mt20 text-center">
@ -268,7 +281,7 @@ class CoderRootFileDetail extends Component {
                {...this.state}
                language={language ? language : "javascript"}
                filepath={`/${detail.path}`}
-                content={detail.content}
+                content={description}
                readOnly={readOnly}
                editorType="update"
                currentBranch={currentBranch}
--- a/src/forge/Main/CoderRootIndex.js
+++ b/src/forge/Main/CoderRootIndex.js
@ -13,10 +13,6 @@ const UploadFile = Loadable({
  loader: () => import('../Newfile/upload_file'),
  loading: Loading,
 })
-const CoderRootDirectory = Loadable({
-	loader: () => import('./CoderRootDirectory'),
-	loading: Loading,
-})
 const CoderRootCommit = Loadable({
 	loader: () => import('./CoderRootCommit'),
 	loading: Loading,
--- a/src/forge/Main/Detail.js
+++ b/src/forge/Main/Detail.js
@ -496,9 +496,11 @@ class Detail extends Component {
                    }
                  </span>
                  <span className="detail_tag_btn">
-                    <a className="detail_tag_btn_name" style={{cursor:platform?"pointer":"default"}} onClick={this.forkFunc}>
-                      <i className="iconfont icon-fork color-grey-9 mr3"></i>复刻 (Fork)
-                    </a>
+                    <Tooltip title="复刻是fork的中文名，即复制代码仓库" placement="bottom">
+                      <a className="detail_tag_btn_name" style={{cursor:platform?"pointer":"default"}} onClick={this.forkFunc}>
+                        <i className="iconfont icon-fork color-grey-9 mr3"></i>复刻
+                      </a>
+                    </Tooltip>
                    {
                      forked_count > 0 ?
                      platform ?
@ -516,6 +518,7 @@ class Detail extends Component {
            {
              firstSync ? "" :
              <DetailBanner 
+                history={this.props.history}
                list={bannerList}
                owner={owner}
                projectsId={projectsId}
--- a/src/forge/Main/Diff.jsx
+++ b/src/forge/Main/Diff.jsx
@ -65,7 +65,7 @@ export default ({ match , history }) => {
          <div className="f-wrap-between" style={{ alignItems: "center" }}>
            <ul className="df">
              <User
-                url={(committer && getImageUrl(`images/${committer.image_url}`))|| "https://dss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=3025493530,1989042357&fm=26&gp=0.jpg"}
+                url={(committer && getImageUrl(`/${committer.image_url}`))|| "https://dss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=3025493530,1989042357&fm=26&gp=0.jpg"}
                name={committer && committer.name}
              />
              {committer && committer.time_from_now && <li className="ml20 mt2">{committer.time_from_now}</li>}
--- a/src/forge/Main/Index.js
+++ b/src/forge/Main/Index.js
@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import { Link } from 'react-router-dom';
 import { Menu, Input , Spin, Pagination , Popover , Select } from 'antd';
-import { getUrl } from 'educoder';
+import { getImageUrl } from 'educoder';
 import '../css/index.scss'
 import './list.css';
 import './Index.scss';
@ -271,7 +271,7 @@ class Index extends Component {
                return(
                  <div onClick={()=>this.getoDetail(item.author && item.author.login,item.identifier)}>
                    <div className="mainInfo">
-                      <img src={getUrl(`/images/${item.author && item.author.image_url}`)} alt=""/>
+                      <img src={getImageUrl(`/${item.author && item.author.image_url}`)} alt=""/>
                      <p className="school">{item.name}</p>
                      <p className="name">{item.author && item.author.name}</p>
                    </div>
--- a/src/forge/Main/Index.scss
+++ b/src/forge/Main/Index.scss
@ -83,10 +83,10 @@
  }
  .addOptionBtn{
    height: 32px;
-    line-height: 32px;
+    line-height: 30px;
    display: flex;
    border:1px solid #d9d9d9;
-    border-radius: 4px;
+    border-radius: 2px;
    a{
      padding:0px 13px;
      color: rgba(0, 0, 0, 0.65);
@ -95,6 +95,9 @@
    & > a:first-child{
      border-right: 1px solid #d9d9d9;
    }
+    & > a:last-child{
+      border-right: none;
+    }
  }
  .infoCount{
    display: inline-block;
@ -220,8 +223,11 @@
    .listtablebody{
      li.listtablepath{
        a{color: #40a9ff;}
+        p{
+          margin-bottom: 0px!important;
+        }
      }
-      li{
+      & > li{
        height: 42px;
        display: flex;
        justify-content: space-between;
@ -254,23 +260,56 @@
 .drawerBtn{
  position: fixed;
  left: -13px;
-  border:1px solid #d9d9d9;
+  border:1px solid rgb(207,205,223);
  width: 34px;
  border-radius: 0px 12px 12px 0px;
-  text-align: right;
  height: 70px;
-  line-height: 70px;
  top:50%;
  margin-top: -35px;
  cursor: pointer;
+  display: flex;
+  flex-direction: column;
+  align-items: flex-end;
+  justify-content: center;
  &:hover{
    box-shadow: 1px 0px 7px rgba(0,0,0,0.1);
  }
+  span{
+    writing-mode: vertical-lr;
+    color: #202429;
+    width: 25px;
+  }
  i{
-    color: #d9d9d9;
+    color: #24292e;
+    height: 18px;
+    line-height: 18px;
+    width: 18px;
  }
 }
 .downMenu{
  box-shadow: 0px 0px 9px rgba(134, 134, 134,0.4);
  background-color: #fff;
+  .ant-menu-vertical .ant-menu-item:hover{
+    background-color: #e6f7ff;
+  }
+}
+
+.menuslist{
+  max-height: 200px;
+  overflow-y: auto;
+  padding:10px 15px;
+  border-radius: 4px;
+  .ant-dropdown-menu-item{
+    border-radius: 8px;
+    text-align: left!important;
+    a{
+      width: 350px;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
+  }
+  .ant-dropdown-menu-item.active{
+    background-color: #e6f7ff;
+  }
 }
--- a/src/forge/Main/IndexItem.js
+++ b/src/forge/Main/IndexItem.js
@ -1,6 +1,7 @@
 import React, { Component } from 'react';
 import { Tooltip } from 'antd';
 import { getImageUrl } from 'educoder';
+import { AlignCenter } from '../Component/layout';
 import { Link } from 'react-router-dom';
 import '../css/index.scss';
 import Nodata from '../Nodata';
@ -27,14 +28,16 @@ class IndexItem extends Component {
                  <img className="p-r-photo" alt="" src={item.author && item.author.image_url} ></img>
                </a>
                :
-                <Link to={`/users/${item.author.login}`} className="show-user-link">
-                  <img className="p-r-photo" alt="" src={getImageUrl(`${item.author && item.author.image_url}`)} ></img>
+                <Link to={item.author && (item.author.type === "Organization" ? `/organize/${item.author.login}`:`/users/${item.author.login}`)} className="show-user-link">
+                  <img className="p-r-photo" alt="" src={getImageUrl(`/${item.author && item.author.image_url}`)} ></img>
                </Link>
              }
              <div className="p-r-Infos">
                <div className="p-r-name">
-                  <Link to={`/projects/${item.author.login}/${item.identifier}`} className="hide-1 color-grey-3 font-18 task-hide " style={{ whiteSpace: "wrap", display: 'flex', width: 400 }}>
-                    {item.author.name}/{item.name}
+                  <AlignCenter>
+                    <Link to={`/projects/${item.author.login}/${item.identifier}`} className="color-grey-3 font-18 task-hide " style={{maxWidth: 490 }}>
+                      {item.author.name}/{item.name}
+                    </Link>
                    {
                      item.forked_from_project_id ?
                        <span className="ml5">
@ -52,7 +55,7 @@ class IndexItem extends Component {
                        <i className="iconfont icon-jingxiang font-18 color-green" />
                      </span>:""
                    }
-                  </Link>
+                  </AlignCenter>
                  <span className="p-r-tags">
                    <span className="pariseTag"><img src={img_parise} alt="" className="pariseImg" />赞 {item.praises_count}</span>
                    <span><i className="iconfont icon-fork mr3 font-16" style={{ color: "#1B8FFF" }} />fork {item.forked_count}</span>
--- a/src/forge/Main/list.css
+++ b/src/forge/Main/list.css
@ -281,7 +281,6 @@
  height:100%;
 }
 .files-md{
-  border:1px solid #eee;
  padding:20px;
 }
 /* 详情-代码 */
@ -437,9 +436,6 @@
  font-size: 16px;
  border-bottom: 1px solid #d9d9d9;
 }
-.branchUl{
-  padding:0px 30px;
-}
 .branchUl li{
  display: flex;
  flex-wrap: wrap;
--- a/src/forge/Main/sub/Contribute.jsx
+++ b/src/forge/Main/sub/Contribute.jsx
@ -50,7 +50,7 @@ function Contribute(props){
                list.map((item,key)=>{
                  return(
                    <AlignCenter>
-                      <img alt="" style={{borderRadius:"50%",marginRight:"10px"}} src={getImageUrl(`images/${item.image_url}`)} width="50px" height="50px"/>
+                      <img alt="" style={{borderRadius:"50%",marginRight:"10px"}} src={getImageUrl(`/${item.image_url}`)} width="50px" height="50px"/>
                      <div>
                        <Link to={`/users/${item.login}`} className="font-16">{item.name}</Link>
                        <p className="font-12 color-grey-9">提交{item.contributions}次</p>
--- a/src/forge/Main/sub/DetailBanner.jsx
+++ b/src/forge/Main/sub/DetailBanner.jsx
@ -1,11 +1,18 @@
 import React, { useEffect, useState } from 'react';
-import { Skeleton } from 'antd';
+import { Skeleton , Tooltip} from 'antd';
 import { Link } from 'react-router-dom';

-function DetailBanner({ list , owner , projectsId , isManager , url , pathname , state , urlFlag , projectDetail , platform ,open_devops }){
+function DetailBanner({ history,list , owner , projectsId , isManager , url , pathname , state , urlFlag , projectDetail , platform ,open_devops }){
  const [ menuName , setMenuName ] = useState(undefined);
  useEffect(()=>{
    if(list){
+      // 没有资源库banner但是通过连接进资源库页面时
+      if(pathname && pathname==="source"){
+        let a = list.filter(item=>item.menu_name === "resources");
+        if(a && a.length === 0){
+          history.push(`/projects/${owner}/${projectsId}`);
+        }
+      }
      setMenuName(list);
    }
  },[list]);
@ -39,11 +46,13 @@ function DetailBanner({ list , owner , projectsId , isManager , url , pathname ,
                  {
                    item.menu_name === "issues" &&
                    <li className={pathname==="issues" ? "active" : ""}>
-                      <Link to={{ pathname: `/projects/${owner}/${projectsId}/issues`, state }}>
-                        <i className={pathname==="issues" ? "iconfont icon-renwu color-grey-3 mr5 font-14":"iconfont icon-renwu color-grey-6 font-14 mr5"}></i>
-                        <span>易修 (Issue)</span>
-                        {projectDetail && projectDetail.issues_count ? <span className="num">{projectDetail.issues_count}</span> : ""}
-                      </Link>
+                      <Tooltip title="易修是Issue的中文名，即问题列表" placement="bottom">
+                        <Link to={{ pathname: `/projects/${owner}/${projectsId}/issues`, state }}>
+                          <i className={pathname==="issues" ? "iconfont icon-renwu color-grey-3 mr5 font-14":"iconfont icon-renwu color-grey-6 font-14 mr5"}></i>
+                          <span>易修</span>
+                          {projectDetail && projectDetail.issues_count ? <span className="num">{projectDetail.issues_count}</span> : ""}
+                        </Link>
+                      </Tooltip>
                    </li>
                  }
                  {
@ -66,8 +75,8 @@ function DetailBanner({ list , owner , projectsId , isManager , url , pathname ,
                    </li>
                    :""
                  }
-                  {
-                    item.menu_name === "source" &&
+                  {/* {
+                    item.menu_name === "resources" &&
                    <li className={pathname==="source" ? "active" : ""}>
                      <Link to={{ pathname: `/projects/${owner}/${projectsId}/source`, state }}>
                          <i className={pathname==="source" ? "iconfont icon-ziyuanpaihanghetuijian color-grey-3 mr5 font-14":"iconfont icon-ziyuanpaihanghetuijian color-grey-6 font-14 mr5"}></i>
@ -75,7 +84,7 @@ function DetailBanner({ list , owner , projectsId , isManager , url , pathname ,
                          {projectDetail && projectDetail.source_count ? <span className="num">{projectDetail.source_count}</span> :""}
                      </Link>
                    </li>
-                  }
+                  } */}
                  {
                    item.menu_name === "versions" &&
                    <li className={pathname==="milestones" ? "active" : ""}>
@ -95,19 +104,19 @@ function DetailBanner({ list , owner , projectsId , isManager , url , pathname ,
                      </Link>
                    </li>
                  }
+                  {
+                    item.menu_name === "setting" &&
+                    <li className={pathname === "setting" ? "active" : ""}>
+                      <Link to={`/projects/${owner}/${projectsId}/setting`}>
+                        <i className={url && url.indexOf("/setting") > 0 ? "iconfont icon-cangku color-grey-3 mr5 font-14":"iconfont icon-cangku color-grey-6 font-14 mr5"}></i>
+                        <span>仓库设置</span>
+                      </Link>
+                    </li>
+                  }
                </React.Fragment>
              )
            })
          }
-          {
-            isManager && platform ? 
-            <li className={pathname === "setting" ? "active" : ""}>
-              <Link to={`/projects/${owner}/${projectsId}/setting`}>
-                <i className={url && url.indexOf("/setting") > 0 ? "iconfont icon-cangku color-grey-3 mr5 font-14":"iconfont icon-cangku color-grey-6 font-14 mr5"}></i>
-                <span>仓库设置</span>
-              </Link>
-            </li>:""
-          }
        </ul>
        :
        <Skeleton paragraph={false} active={true}/>
--- a/src/forge/Main/sub/UpdateDescModal.jsx
+++ b/src/forge/Main/sub/UpdateDescModal.jsx
@ -2,13 +2,13 @@ import React , { forwardRef, useEffect } from 'react';
 import {Form , Modal , Input } from 'antd';
 import "./sub.scss";
 const { TextArea } = Input;
-function UpdateDescModal({form , visible , onCancel , onOk,desc,website}){
+function UpdateDescModal({form , visible , onCancel , onOk,desc,website,lesson_url}){
  const { getFieldDecorator, validateFields , setFieldsValue } = form;

  useEffect(()=>{
    if(desc || website){
      setFieldsValue({
-        website,desc
+        website,desc,lesson_url
      })
    }
  },[desc,website])
@ -17,7 +17,7 @@ function UpdateDescModal({form , visible , onCancel , onOk,desc,website}){
    validateFields((err,values)=>{
      if(!err){
        onCancel();
-        onOk(values.desc,values.website)
+        onOk(values.desc,values.website,values.lesson_url)
      }
    })
  }
@ -35,11 +35,11 @@ function UpdateDescModal({form , visible , onCancel , onOk,desc,website}){
      className={"descmodal"}
    >
      <Form>
-        <Form.Item label="仓库描述">
+        <Form.Item label="项目简介">
          {getFieldDecorator("desc",{
            rules:[]
          })(
-            <TextArea placeholder="仓库描述" rows={4} maxLength={200}/>
+            <TextArea placeholder="请输入项目简介" rows={4} maxLength={200}/>
          )}
        </Form.Item>
        <Form.Item label="website">
@ -49,6 +49,13 @@ function UpdateDescModal({form , visible , onCancel , onOk,desc,website}){
            <Input placeholder="website链接"/>
          )}
        </Form.Item>
+        <Form.Item label="实践课程">
+          {getFieldDecorator("lesson_url",{
+            rules:[]
+          })(
+            <Input placeholder="实践课程链接"/>
+          )}
+        </Form.Item>
      </Form>
    </Modal>
  )
--- a/src/forge/Merge/Commits.jsx
+++ b/src/forge/Merge/Commits.jsx
@ -22,7 +22,7 @@ function Commits({ commits , projectsId , owner }){
                  <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(item.sha)}`} className="color-blue">浏览代码</Link>
                </FlexAJ>
                <AlignCenter className="mt15">
-                  <User url={getImageUrl(`images/${item.committer && item.committer.image_url}`)} name={`${item.committer && item.committer.name}`}></User><span>：提交于{item.time_from_now}</span>
+                  <User url={getImageUrl(`/${item.committer && item.committer.image_url}`)} name={`${item.committer && item.committer.name}`}></User><span>：提交于{item.time_from_now}</span>
                </AlignCenter>
              </div>
            </div>
--- a/src/forge/Merge/MergeItem.js
+++ b/src/forge/Merge/MergeItem.js
@ -1,6 +1,7 @@
 import React, { Component } from "react";
 import { Link } from "react-router-dom";
-import { Popconfirm, Tag } from "antd";
+import { Tag } from "antd";
+import { AlignCenter } from '../Component/layout';
 import { getImageUrl } from "educoder";
 import "./merge.css";

@ -74,13 +75,13 @@ class MergeItem extends Component {
                  >
                    <img
                      className="radius"
-                      src={getImageUrl(`images/${item && item.avatar_url}`)}
+                      src={getImageUrl(`/${item && item.avatar_url}`)}
                      alt=""
                      width="24"
                      height="24"
                    />
                  </Link>
-                  <span>
+                  <AlignCenter>
                    <Link
                      to={`/users/${item && item.author_login}`}
                      className="show-user-link color-grey-8 ml5"
@ -124,7 +125,7 @@ class MergeItem extends Component {
                        </Link>
                      </Tag>
                    </span>
-                  </span>
+                  </AlignCenter>
                </p>
              </div>
              <ul
@ -177,7 +178,7 @@ class MergeItem extends Component {
                      >
                        <div className="grid-item mr15 color-grey-9">
                          <Link
-                            to={`/projects/${owner}/${projectsId}/merge/${item.pull_request_id}/updatemerge`}
+                            to={`/projects/${owner}/${projectsId}/pulls/${item.pull_request_id}/updatemerge`}
                            className="color-grey-9"
                          >
                            <i className="iconfont icon-bianji3 font-14 mr5"></i>
--- a/src/forge/Merge/MergeSubmit.js
+++ b/src/forge/Merge/MergeSubmit.js
@ -101,7 +101,7 @@ class MergeSubmit extends Component{
        render: (text,item) => (
          <span className="f-wrap-alignCenter">
            <Link to={`/users/${item.login}`} className="show-user-link">
-                <img src={getImageUrl(`images/${item.image_url}`)} alt="" width="28px" height="28px" className="mr3 radius"/>
+                <img src={getImageUrl(`/${item.image_url}`)} alt="" width="28px" height="28px" className="mr3 radius"/>
          <label className="hide-1" style={{maxWidth:"75px",'vertical-align':'middle'}}>{text}</label>
          </Link>
          </span>
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@ -331,26 +331,14 @@ class MessageCount extends Component {
                    }

                    <div className="mt15">
-                      <Link
-                        to={`/users/${data.issue.author_login}`}
-                        className="show-user-link"
-                      >
-                        <img
-                          className="mr5"
-                          src={getImageUrl(
-                            `images/${data.issue.author_picture}`
-                          )}
-                          alt=""
-                          width="24"
-                          height="24"
+                      <Link to={`/users/${data.issue.author_login}`} className="show-user-link">
+                        <img className="mr5" src={getImageUrl(`/${data.issue.author_picture}`)}
+                          alt="" width="24" height="24" style={{borderRadius:"50%"}}
                        />
                      </Link>
                      <span className="ver-middle">
                        <span className="color-grey-8 mr5">由</span>
-                        <Link
-                          to={`/users/${data.issue.author_login}`}
-                          className="show-user-link color-blue"
-                        >
+                        <Link to={`/users/${data.issue.author_login}`} className="show-user-link color-blue">
                          {data.issue.author_name}
                        </Link>
                        <span className="ml5 color-grey-8">
--- a/src/forge/Merge/NewMerge.js
+++ b/src/forge/Merge/NewMerge.js
@ -178,7 +178,7 @@ class NewMerge extends Component {
    let arr = projects_names && projects_names.filter(item=>item.id===value);
    let identifier = arr && arr[0].project_id;
    let login = arr && arr[0].project_user_login;
-    let is_fork_id = parseInt(value) !== parseInt(id)
+    let is_fork_id = parseInt(value) !== parseInt(id);
    this.setState({
      isSpin: true, 
      merge_head: is_fork_id,
--- a/src/forge/Merge/merge.css
+++ b/src/forge/Merge/merge.css
@ -168,6 +168,7 @@ form .ant-cascader-picker, form .ant-select {
 }
 .linesContent > p{
  flex:1;
+  word-break: break-all;
 }
 .linesContent .lines{
  display: flex;
--- a/src/forge/Merge/merge.js
+++ b/src/forge/Merge/merge.js
@ -253,24 +253,6 @@ class merge extends Component {
        </Menu.Item>
      </Menu>
    );
-
-    const Paginations = (
-      <React.Fragment>
-        {search_count > limit ? (
-          <div className="mt30 mb50 edu-txt-center">
-            <Pagination
-              simple
-              defaultCurrent={page}
-              total={search_count}
-              pageSize={limit}
-              onChange={this.ChangePage}
-            ></Pagination>
-          </div>
-        ) : (
-          ""
-        )}
-      </React.Fragment>
-    );
    return (
      <div className="main" style={{padding:"0px"}}>
        <div className="topWrapper" style={{borderBottom:"none",padding:"20px"}}>
@ -419,9 +401,21 @@ class merge extends Component {
                  {...this.props}
                  {...this.state}
                ></OrderItem>
-                {Paginations}
              </div>
            ):""}
+            {search_count > select_params.limit ? (
+              <div className="mt30 mb50 edu-txt-center">
+                <Pagination
+                  simple
+                  current={select_params.page}
+                  total={search_count}
+                  pageSize={select_params.limit}
+                  onChange={this.ChangePage}
+                ></Pagination>
+              </div>
+            ) : (
+              ""
+            )}
            { data && data.issues && data.issues.length === 0 ? <NoneData _html="暂时还没有相关数据!" projectsId={projectsId} owner={owner} /> :""}
          </Spin>
        </div>
--- a/src/forge/Merge/merge_form.js
+++ b/src/forge/Merge/merge_form.js
@ -34,17 +34,19 @@ class MergeForm extends Component {
    this.set_defatul();
  };
  componentDidUpdate=(prevPros)=>{
+    const { projectsId ,owner } = this.props.match.params;
+    const pId = prevPros.match.params.projectsId;
+    const oId = prevPros.match.params.owner;
+    if(pId !== projectsId || oId !== owner ){
+      // console.log("切换了项目分支···········");
+      this.get_default_selects();
+    }
    if(prevPros && this.props && !this.props.checkIfLogin()){
      this.props.history.push("/403")
      return
    }
  }
-  // check_is_login =() =>{
-  //   if(!this.props.checkIfLogin()){
-  //     this.props.history.push("/403")
-  //     return
-  //   }
-  // };
+  
  get_default_selects = () => {
    const { projectsId ,owner } = this.props.match.params;
    this.setState({ isSpin: true });
--- a/src/forge/New/Index.js
+++ b/src/forge/New/Index.js
@ -43,7 +43,8 @@ class Index extends Component {
      project_language_name: undefined,
      project_category_name: undefined,
      license_name: undefined,
-      ignore_name: undefined
+      ignore_name: undefined,
+      descNum:0
    }
  }
  componentDidMount = () => {
@ -254,6 +255,13 @@ class Index extends Component {
    }
  }

+  changeDesc=(e)=>{
+    let value = e.target.value;
+    this.setState({
+      descNum:value ? value.length :0
+    })
+  }
+
  render() {
    const { getFieldDecorator } = this.props.form;
    // 项目类型：deposit-托管项目，mirror-镜像项目
@ -273,7 +281,9 @@ class Index extends Component {
      license_list,
      ignore_list,

-      mirrorCheck
+      mirrorCheck,
+
+      descNum
    } = this.state;
    return (
      <div className="main back-white" style={{padding:"0px",border:"none"}}>
@ -361,21 +371,23 @@ class Index extends Component {
                      required: true, message: '请填写项目名称'
                    }],
                  })(
-                    <Input placeholder="例如：团队协作方法与研究" />
-                  )}
-                </Form.Item>
-
-                <Form.Item
-                  label="项目简介"
-                >
-                  {getFieldDecorator('description', {
-                    rules: [{
-                      required: true, message: '请填写项目简介'
-                    }],
-                  })(
-                    <Input.TextArea placeholder="项目的介绍" autoSize={{ minRows: 2, maxRows: 6 }} />
+                    <Input placeholder="例如：团队协作方法与研究" maxLength={50}/>
                  )}
                </Form.Item>
+                <div className="pr">
+                  <span className="toprightNum">{descNum}/200</span>
+                  <Form.Item
+                    label="项目简介"
+                  >
+                    {getFieldDecorator('description', {
+                      rules: [{
+                        required: true, message: '请填写项目简介'
+                      }],
+                    })(
+                      <Input.TextArea maxLength={200} placeholder="项目的介绍" autoSize={{ minRows: 2, maxRows: 6 }} onChange={this.changeDesc}/>
+                    )}
+                  </Form.Item>
+                </div>
                <Form.Item
                  label="仓库名称"
                >
@ -384,7 +396,7 @@ class Index extends Component {
                      required: true, message: '请填写仓库名称'
                    }],
                  })(
-                    <Input placeholder="仓库名称请使用与项目相关的英文关键字" />
+                    <Input placeholder="仓库名称请使用与项目相关的英文关键字" maxLength={100} />
                  )}
                </Form.Item>
                <Form.Item
--- a/src/forge/Newfile/UserSubmitComponent.js
+++ b/src/forge/Newfile/UserSubmitComponent.js
@ -117,7 +117,7 @@ class UserSubmitComponent extends Component {
        <span className="df" style={{ alignItems: "center" }}>
          <Link to={`/users/${current_user && current_user.login}`} className="show-user-link" >
            <img
-              src={getImageUrl(`images/${current_user && current_user.image_url}`)}
+              src={getImageUrl(`/${current_user && current_user.image_url}`)}
              alt=""
              className="screwImg"
            />
--- a/src/forge/Newfile/m_editor.js
+++ b/src/forge/Newfile/m_editor.js
@ -12,6 +12,13 @@ class m_editor extends Component {
      editorValue: this.props.content,
    };
  }
+  componentDidUpdate=(prevProps)=>{
+    if(prevProps && this.props && this.props.content !== prevProps.content){
+      this.setState({
+        editorValue:this.props.content
+      })
+    }
+  }
  changeEditor = (editorValue) => {
    this.setState({
      editorValue,
@ -44,7 +51,7 @@ class m_editor extends Component {
    return (
      <React.Fragment>
        <div>
-          <div className="branchTable">
+          <div className="branchTable" style={{border:"1px solid #eee"}}>
            <Editor
              height="400px"
              language={language ? language : "plaintext"}
@ -57,7 +64,7 @@ class m_editor extends Component {
            />
          </div>
            {!readOnly && (
-              <div style={{padding:"20px",marginTop:"20px",borderTop:"1px solid #d9d9d9"}}>
+              <div style={{marginTop:"20px"}}>
                <UserSubmitComponent
                  {...this.props}
                  {...this.state}
--- a/src/forge/Notice/Index.jsx
+++ b/src/forge/Notice/Index.jsx
@ -0,0 +1,88 @@
+import React, { useEffect, useState } from "react";
+import { Link } from 'react-router-dom';
+import './Index.scss';
+
+import Loadable from "react-loadable";
+import Loading from "../../Loading";
+import { Route, Switch } from "react-router-dom";
+
+const Notify = Loadable({
+  loader: () => import("./Notify"),
+  loading: Loading,
+});
+const UndoEvent = Loadable({
+  loader: () => import("./UndoEvent"),
+  loading: Loading,
+});
+function Index(props){
+  const username = props.match.params.username;
+  const pathname = props.history.location.pathname;
+  const user = props.user;
+  const undo_messages = props.undo_messages;
+
+  const [ menu , setMenu ] = useState("notify");
+  const [ messages , setMessages ] = useState(0);
+  const [ transferProjects , setTransferProjects ] = useState(0);
+
+  useEffect(()=>{
+    if(user){
+      setTransferProjects(user.undo_transfer_projects);
+    }
+    if(undo_messages){
+      setMessages(undo_messages);
+    }
+  },[user,undo_messages])
+
+  useEffect(()=>{
+    if(pathname && username){
+      if(pathname === `/users/${username}/notice`){
+        setMenu("notify");
+      }
+      if(pathname === `/users/${username}/notice/undo`){
+        setMenu("undo");
+      }
+    }
+  },[pathname])
+
+  function fetchUser(){
+    props && props.fetchUser();
+  }
+
+  function changeNum(){
+    fetchUser();
+  }
+
+  return (
+    <div>
+      <ul className="noticeMenu">
+        <li className={menu === "notify" ? "active":""}>
+          <Link to={`/users/${username}/notice`} onClick={changeNum}>
+            <span>通知</span>
+            {messages ? <span className="unNum">{messages}</span>:""}
+          </Link>
+        </li>
+        <li className={menu === "undo" ? "active":""}>
+          <Link to={`/users/${username}/notice/undo`}>
+            <span>接收仓库</span>
+            {transferProjects ? <span className="unNum">{transferProjects}</span>:""}
+          </Link>
+        </li>
+      </ul>
+      <Switch>
+        <Route
+          path="/users/:username/notice/undo"
+          render={(p) => {
+            return <UndoEvent {...props} {...p} fetchUser={fetchUser}/>;
+          }}
+        ></Route>
+        <Route
+          path="/users/:username/notice"
+          render={(p) => {
+            return <Notify {...props} {...p} fetchUser={fetchUser}/>;
+          }}
+        ></Route>
+      </Switch>
+  </div>
+  );
+}
+export default Index;
--- a/src/forge/Notice/Index.scss
+++ b/src/forge/Notice/Index.scss
@ -0,0 +1,72 @@
+.noticeMenu{
+  padding:0px 20px;
+  display: flex;
+  border-bottom: 1px solid #eee;
+  height: 54px;
+  line-height: 54px;
+  li{
+    font-size: 16px;
+    padding:0px;
+    margin:0px 30px 0px 20px!important;
+    height: 54px;
+    line-height: 54px;
+    position: relative;
+    transform: none;
+    a{
+      display: flex;
+      &>span{
+        position: relative;
+      }
+    }
+    &.active a span:first-child::after{
+      position: absolute;
+      bottom: 0px;
+      height: 2px;
+      left: 0px;
+      content: "";
+      background-color: #1890ff;
+      width: 100%;
+    }
+    .unNum{
+      color: #d38900;
+      font-size: 12px;
+      border-radius: 13px;
+      height: 16px;
+      line-height: 16px;
+      padding:0px 4px;
+      min-width: 23px;
+      text-align: center;
+      background-color: #ffe4b3;
+      margin-top: 19px;
+      margin-left: 10px;
+      display: block;
+    }
+  }
+}
+.notifyList{
+  padding:0px 20px;
+  min-height: 400px;
+  li{
+    display: flex;
+    border-bottom: 1px solid #eee;
+    padding:20px 0px;
+    .notifyImg{
+      width: 48px;
+      height: 48px;
+      border-radius: 50%;
+      margin-right: 15px;
+    }
+    .notifyFlex{
+      flex:1;
+      p{
+        margin:0px;
+      }
+      .notifyInfos{
+        margin-bottom: 8px;
+      }
+    }
+    &:last-child{
+      border-bottom: none;
+    }
+  }
+}
--- a/src/forge/Notice/Notify.jsx
+++ b/src/forge/Notice/Notify.jsx
@ -0,0 +1,91 @@
+import React, { useEffect, useState } from "react";
+import Nodata from '../Nodata';
+import {Pagination } from 'antd';
+import { Link } from 'react-router-dom';
+import { getImageUrl } from 'educoder';
+import Axios from "axios";
+
+const limit = 15;
+function Notify(props){
+  const username = props.match.params.username;
+  const [ list , setList ] = useState(undefined);
+  const [ page , setPage ] = useState(1);
+  const [ total , setTotal ] = useState(0);
+
+  useEffect(()=>{
+    if(username){
+      getList();
+    }
+  },[username,page])
+
+  function getList(){
+    const url = `/users/${username}/applied_messages.json`;
+    Axios.get(url,{
+      params:{
+        page,per_page:limit
+      }
+    }).then(result=>{
+      if(result){
+        setList(result.data.applied_messages);
+        setTotal(result.data.total_count);
+      }
+    }).catch(error=>{})
+  }
+
+  function renderStatus(status,applied){
+    let { project , owner} = applied
+    if(status){
+      switch(status){
+        case 'canceled':
+          return <p>取消转移【<Link to={`/projects/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】仓库</p>
+        case 'common':
+          return <p>正在将【<Link to={`/projects/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】仓库转移给【<Link to={`/users/${owner && owner.login}`}>{owner && owner.name}</Link>】</p>
+          case 'successed':
+          return <p>【<Link to={`/projects/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】仓库成功转移给【<Link to={`/users/${owner && owner.login}`}>{owner && owner.name}</Link>】</p>
+        default:
+          return <p>拒绝转移【<Link to={`/projects/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】仓库</p>
+      }
+
+    }else{
+      return ""
+    }
+  }
+
+  return(
+    <div>
+      {
+        list && list.length > 0 ? 
+        <div>
+          <ul className="notifyList">
+            {
+              list.map((i,k)=>{
+                return(
+                  <li>
+                    <Link to={`/users/${i.login}`}><img src={getImageUrl(`/${i.applied_user && i.applied_user.image_url}`)} alt="" className="notifyImg"/></Link>
+                    <div className="notifyFlex">
+                      <p className="notifyInfos">
+                        <Link to={`/users/${i.applied_user && i.applied_user.login}`} className="font-15 mr20">{i.applied_user && i.applied_user.name}</Link>
+                        <span className="color-grey-9">{i.time_ago}</span>
+                      </p>
+                      {renderStatus(i.status,i.applied)}
+                    </div>
+                  </li>
+                )
+              })
+            }
+          </ul>
+        </div>
+        :
+        ""
+      }
+      {list && list.length === 0 && <Nodata _html="暂无通知" />}
+      {
+        total > limit && 
+        <div className="edu-txt-center pt20 pb20">
+          <Pagination simple pageSize={limit} total={total} current={page} onChange={(p)=>{setPage(p)}}/>
+        </div>
+      }
+    </div>
+  )
+}
+export default Notify;
--- a/src/forge/Notice/UndoEvent.jsx
+++ b/src/forge/Notice/UndoEvent.jsx
@ -0,0 +1,118 @@
+import React, { useEffect, useState } from "react";
+import Nodata from '../Nodata';
+import { FlexAJ } from '../Component/layout';
+import { Pagination , Popconfirm } from 'antd';
+import { Link } from 'react-router-dom';
+import { getImageUrl } from 'educoder';
+import Axios from 'axios';
+
+const limit = 15;
+function UndoEvent(props){
+  const username = props.match.params.username;
+  const [ list , setList ] = useState(undefined);
+  const [ page , setPage ] = useState(1);
+  const [ total , setTotal ] = useState(0);
+
+  useEffect(()=>{
+    if(username){
+      getList();
+    }
+  },[username,page])
+
+  function getList(){
+    const url = `/users/${username}/applied_transfer_projects.json`;
+    Axios.get(url,{
+      params:{
+        page,per_page:limit
+      }
+    }).then(result=>{
+      if(result){
+        setList(result.data.applied_transfer_projects);
+        setTotal(result.data.total_count);
+      }
+    }).catch(error=>{})
+  }
+
+  // 接受
+  function acceptDivert(id){
+    const url =  `/users/${username}/applied_transfer_projects/${id}/accept.json`;
+    Axios.post(url).then(result=>{
+      if(result && result.data){
+        getList();
+        props && props.fetchUser();
+      }
+    }).catch(error=>{})
+  }
+
+  // 拒绝
+  function revertDivert(id){
+    const url =  `/users/${username}/applied_transfer_projects/${id}/refuse.json`;
+    Axios.post(url).then(result=>{
+      if(result && result.data){
+        getList();
+        props && props.fetchUser();
+      }
+    }).catch(error=>{})
+  }
+
+  return(
+    <div>
+      {
+        list && list.length > 0 ? 
+        <div>
+          <ul className="notifyList">
+            {
+              list.map((i,k)=>{
+                return(
+                  <li>
+                    <Link to={`/users/${i.user && i.user.login}`}><img src={getImageUrl(`/${i.user && i.user.image_url}`)} alt="" className="notifyImg"/></Link>
+                    <div className="notifyFlex">
+                      <p className="notifyInfos">
+                        <Link to={`/users/${i.login}`} className="font-15 mr20">{i.user && i.user.name}</Link>
+                        <span className="color-grey-9">{i.time_ago}</span>
+                      </p>
+                      <FlexAJ>
+                        <p className="color-grey-6">请求将仓库【<Link to={`/projects/${i.project && i.project.owner && i.project.owner.login}/${i.project && i.project.identifier}`}>{i.project && i.project.name}</Link>】
+                        转移给【<Link to={`/users/${i.owner && i.owner.login}`}>{i.owner && i.owner.name}</Link>】,是否接受？</p>
+                        {
+                          i.status === "common" &&
+                          <span>
+                            <Popconfirm title={`确定接受仓库${i.project && i.project.name}？`} okText="确定" cancelText="取消" onConfirm={()=>acceptDivert(i.id)}>
+                              <a className="color-blue">接受</a>
+                            </Popconfirm>
+                            <Popconfirm title={`确定拒绝接受仓库${i.project && i.project.name}？`} okText="确定" cancelText="取消" onConfirm={()=>revertDivert(i.id)}>
+                              <a className="color-red ml20">拒绝</a>
+                            </Popconfirm>
+                          </span>
+                        }
+                        {
+                          i.status === "canceled" && <span className="color-grey-9">对方已取消转移</span>
+                        }
+                        {
+                          i.status === "accepted" && <span className="color-grey-9">已接受</span>
+                        }
+                        {
+                          i.status === "refused" && <span className="color-grey-9">已拒绝</span>
+                        }
+                      </FlexAJ>
+                    </div>
+                  </li>
+                )
+              })
+            }
+          </ul>
+        </div>
+        :
+        ""
+      }
+      {list && list.length === 0 && <Nodata _html="暂无接收信息" />}
+      {
+        total > limit && 
+        <div className="edu-txt-center pt20 pb20">
+          <Pagination simple pageSize={limit} total={total} current={page} onChange={(p)=>{setPage(p)}}/>
+        </div>
+      }
+    </div>
+  )
+}
+export default UndoEvent;
--- a/src/forge/Order/Detail.js
+++ b/src/forge/Order/Detail.js
@ -212,7 +212,7 @@ class Detail extends Component {
                >
                  <img
                    className="user_img"
-                    src={getImageUrl(`images/${data && data.author_picture}`)}
+                    src={getImageUrl(`/${data && data.author_picture}`)}
                    alt=""
                    width="50"
                    height="50"
--- a/src/forge/Order/MilepostDetail.js
+++ b/src/forge/Order/MilepostDetail.js
@ -218,7 +218,7 @@ class MilepostDetail extends Component {
            </span>
            <div className="milepostdiv">
              <Link to={`/projects/${owner}/${projectsId}/milestones/${meilid}/edit`} className="topWrapper_btn" style={{ marginRight: 15 }} >编辑里程碑</Link>
-              <Link to={`/projects/${owner}/${projectsId}/issues/${meilid}/new`} className="topWrapper_btn">创建任务</Link>
+              <Link to={`/projects/${owner}/${projectsId}/issues/${meilid}/new`} className="topWrapper_btn">创建易修</Link>
            </div>
          </FlexAJ>
        </div>
--- a/src/forge/Order/order.js
+++ b/src/forge/Order/order.js
@ -352,12 +352,12 @@ class order extends Component {
    if (this.props.checkIfLogin()) {
      return(
        <Link className="topWrapper_btn ml10" target="_blank" to={`/projects/${owner}/${projectsId}/issues/new`}>
-          +&nbsp;创建任务
+          +&nbsp;创建易修
        </Link>
      )
    }else{
      return(
-        <a className="topWrapper_btn ml10" onClick={this.islogin}>+&nbsp;创建任务</a>
+        <a className="topWrapper_btn ml10" onClick={this.islogin}>+&nbsp;创建易修</a>
      )
    }
  }
@ -834,7 +834,7 @@ class order extends Component {
            )}
          {
            search_count > select_params.limit ?
-            <div className="mt30 mb10 edu-txt-center">
+            <div className="mt30 mb30 edu-txt-center">
              <Pagination
                simple
                defaultCurrent={select_params.page}
--- a/src/forge/Order/order_form.js
+++ b/src/forge/Order/order_form.js
@ -310,17 +310,17 @@ class order_form extends Component {
            <div className="list-right">
              <div className="pd20">
                <h3 className="mb15">
-                  {form_type === "new" ? "新建" :( form_type === "copy" ? "复制" : "编辑")}任务
+                  {form_type === "new" ? "新建" :( form_type === "copy" ? "复制" : "编辑")}易修
                </h3>
                <Form.Item>
                  {getFieldDecorator("subject", {
                    rules: [
                      {
                        required: true,
-                        message: "请填写任务标题",
+                        message: "请填写易修标题",
                      },
                    ]
-                  })(<Input placeholder="标题" size="large" />)}
+                  })(<Input placeholder="标题" size="large" maxLength={80}/>)}
                </Form.Item>
                <div className="quillContent">
                  <MDEditor
--- a/src/forge/Settings/Collaborator.js
+++ b/src/forge/Settings/Collaborator.js
@ -11,7 +11,7 @@ function Collaborator(props){
  const [ newGroupId , setNewGroupId] = useState(undefined);
  const {projectsId ,owner} = props.match.params;

-  const author = props.projectDetail && props.projectDetail.author;
+  const author = props && props.projectDetail && props.projectDetail.author;

  function getID(id){
    setNewId(id);
@ -26,8 +26,8 @@ function Collaborator(props){
        {
          author && author.type === "Organization" ?
          <span>
-            <span style={{cursor:"pointer"}} className={nav === "1" ? "font-18 text-black color-blue":"font-18 text-black"} onClick={()=>setNav("1")}>协作者管理</span>
-            <span style={{cursor:"pointer"}} className={nav === "2" ? "font-18 text-black ml30 color-blue":"font-18 text-black ml30"} onClick={()=>setNav("2")}>团队管理</span>
+            <span style={{cursor:"pointer"}} className={nav === "1" ? "font-18 text-black color-blue":"font-18 text-black"} onClick={()=>{setNav("1");setNewId(undefined)}}>协作者管理</span>
+            <span style={{cursor:"pointer"}} className={nav === "2" ? "font-18 text-black ml30 color-blue":"font-18 text-black ml30"} onClick={()=>{setNav("2");setNewId(undefined)}}>团队管理</span>
          </span>
          :
          <span className="font-18 text-black">协作者管理</span>
@ -42,7 +42,7 @@ function Collaborator(props){
      <div>
        {
          nav === "1" ? 
-          <Member newId={newId} projectsId={projectsId} owner={owner} project_id={props.project_id} author={props.author} showNotification={props.showNotification}/> 
+          <Member newId={newId} projectsId={projectsId} owner={owner} project_id={props.project_id} author={props.projectDetail && props.projectDetail.author} showNotification={props.showNotification}/> 
          :
          <Group owner={owner} projectsId={projectsId} newGroupId={newGroupId}/>
        }
--- a/src/forge/Settings/CollaboratorMember.jsx
+++ b/src/forge/Settings/CollaboratorMember.jsx
@ -20,8 +20,6 @@ function CollaboratorMember({projectsId,owner,project_id,author,showNotification
  const [ role , setRole ] = useState(undefined);
  const [ listData , setListData ] = useState(undefined);
  const [ total , setTotal ] = useState(0);
-
-
  useEffect(()=>{
    if(newId){
      addCollaborator(newId);
@ -188,7 +186,7 @@ function CollaboratorMember({projectsId,owner,project_id,author,showNotification
            className="show-user-link"
          >
            <img
-              src={getImageUrl(`images/${text}`)}
+              src={getImageUrl(`/${text}`)}
              alt=""
              width="32px"
              height="32px"
--- a/src/forge/Settings/Setting.js
+++ b/src/forge/Settings/Setting.js
@ -2,6 +2,8 @@ import React, { Component } from "react";
 import { Form, Input, Checkbox, Select , Spin } from "antd";
 import Title from '../Component/Title';
 import {WhiteBack} from '../Component/layout';
+import DivertModal from '../Divert/DivertModal';
+import { Link } from 'react-router-dom';
 import axios from "axios";
 import "./setting.scss";
 const { TextArea } = Input;
@ -13,6 +15,7 @@ const menu = [
  {name:"易修 (Issue)",index:"issues"},
  {name:"合并请求",index:"pulls"},
  {name:"工作流(beta版)",index:"devops"},
+  // {name:"资源库",index:"resources"},
  {name:"里程碑",index:"versions"},
  {name:"动态",index:"activity"},
 ]
@ -24,7 +27,9 @@ class Setting extends Component {
      LanguageList: undefined,
      private_check: undefined,
      loading:true,
-      project_units:['home',"activity","code"]
+      project_units:['home',"activity","code"],
+      divertVisible:false,
+      is_transfering:undefined,
    };
  }

@ -72,7 +77,9 @@ class Setting extends Component {
          this.setState({
            private_check: result.data.private,
            loading:false,
-            project_units:units
+            project_units:units,
+            transfer:result.data.transfer,
+            is_transfering:result.data.is_transfering,
          });
        }
      })
@ -185,12 +192,56 @@ class Setting extends Component {
    });
  };

+  // 转移仓库
+  DivertProject=()=>{
+    this.setState({
+      divertVisible:true
+    })
+  }
+   // 取消仓库转移
+  CancelDivertProject=()=>{
+    this.props.confirm({
+      content: "是否确认取消将此项目转移给他人？",
+      onOk: () => {
+        const { projectsId , owner } = this.props.match.params;
+        const url =  `/${owner}/${projectsId}/applied_transfer_projects/cancel.json`;
+        axios.post(url).then(result=>{
+          if(result && result.data){
+            this.setState({
+              is_transfering:false
+            })
+          }
+        }).catch(error=>{})
+      },
+    });
+    
+  }
+  // 确定转移仓库
+  onSuccess=(owner)=>{
+    this.setState({
+      is_transfering:true,
+      divertVisible:false,
+      transfer:owner
+    })
+  }
+
  render() {
    const { getFieldDecorator } = this.props.form;
+    const { projectsId , owner } = this.props.match.params;
+    const { projectDetail } = this.props;

-    const { CategoryList, LanguageList, private_check ,loading } = this.state;
+    const { CategoryList, LanguageList, private_check ,loading , divertVisible , is_transfering, transfer } = this.state;
+    let mirror = projectDetail && projectDetail.mirror;
+    let type = projectDetail && projectDetail.type;
    return (
      <div>
+        <DivertModal 
+          owner={owner}
+          repo={projectsId}
+          visible={divertVisible} 
+          onSuccess={this.onSuccess} 
+          onCancel={()=>{this.setState({divertVisible:false})}}
+        />
        <Spin spinning={loading}>
          <WhiteBack>
            <Title>基本设置</Title>
@ -220,12 +271,12 @@ class Setting extends Component {
                  )}
                </Form.Item>
              </div>
-              <Form.Item label="仓库描述">
+              <Form.Item label="项目简介">
                {getFieldDecorator("project_description", {
                  rules: [],
                })(
                  <TextArea
-                    placeholder="请输入仓库描述"
+                    placeholder="请输入项目简介"
                    style={{ height: "80px" }} maxLength={200}
                  />
                )}
@ -261,7 +312,7 @@ class Setting extends Component {
                          <Checkbox 
                            key={key} 
                            value={item.index} 
-                            disabled={item.index === "home" || item.index === "activity" || item.index === "code"}
+                            disabled={item.index === "home" || item.index === "activity" || item.index === "code" || (mirror && (type && type===2) && item.index === "pulls")}
                          >{item.name}</Checkbox>
                        )
                      })
@ -278,23 +329,48 @@ class Setting extends Component {
            {/* 镜像设置部分，暂无接口，先不显示 */}
            {/* <Mirror /> */}
          </WhiteBack>
-          <WhiteBack className="dangerousBox mb20">
-          <div>
-            <div className="dangerousTitle">危险操作区</div>
-            <div className="flex-a-center padding15-10">
+          {
+            projectDetail && projectDetail.permission && (projectDetail.permission === "Admin" || projectDetail.permission === "Owner")?
+            <WhiteBack className="dangerousBox mb20">
              <div>
-                <p className="font-bd font-16">删除本仓库</p>
-                <p className="mt10">
-                  删除仓库是永久性的,
-                  无法撤消，且删除后，与仓库关联的项目/任务/合并请求/版本发布等，均会被删除
-                </p>
+                <div className="dangerousTitle">危险操作区</div>
+                <div className="flex-a-center padding15-10" style={{borderBottom:"1px solid #f9edbe"}}>
+                  <div>
+                    <p className="font-bd font-16">转移仓库</p>
+                    <p className="mt10">
+                      {
+                        is_transfering ?
+                        <span>此仓库正在转移给【
+                          {transfer && <Link to={transfer.type="User"?`/users/${transfer.login}`:`/organize/${transfer.login}`}>{transfer.name}</Link>}
+                          】，请联系对方接收此仓库。</span>
+                        :
+                        `将此仓库转移给其他用户或组织`
+                      }
+                    </p>
+                  </div>
+                  {
+                    is_transfering ? 
+                    <a onClick={this.CancelDivertProject} className="red_deleteBtn">取消转移</a>
+                    :
+                    <a onClick={this.DivertProject} className="red_deleteBtn">转移</a>
+                  }
+                </div>
+                <div className="flex-a-center padding15-10">
+                  <div>
+                    <p className="font-bd font-16">删除本仓库</p>
+                    <p className="mt10">
+                      删除仓库是永久性的,
+                      无法撤消，且删除后，与仓库关联的项目/任务/合并请求/版本发布等，均会被删除
+                    </p>
+                  </div>
+                  <a onClick={this.deleteProject} className="red_deleteBtn">
+                    删除本仓库
+                  </a>
+                </div>
              </div>
-              <a onClick={this.deleteProject} className="red_deleteBtn">
-                删除本仓库
-              </a>
-            </div>
-          </div>
-        </WhiteBack>
+            </WhiteBack>
+            :""
+          }
        </Spin>
      </div>
    );
--- a/src/forge/Source/AddTag.jsx
+++ b/src/forge/Source/AddTag.jsx
@ -0,0 +1,47 @@
+import React , { forwardRef, useEffect } from 'react';
+import { Modal , Form , Input } from 'antd';
+
+function AddTag({form , visible , onCancel ,onOk}){
+  const { getFieldDecorator, validateFields , setFieldsValue } = form;
+
+  useEffect(()=>{
+    setFieldsValue({tagName:undefined})
+  },[visible])
+
+  function submit(){
+    validateFields((error,values)=>{
+      if(!error){
+        onOk(values);
+      }
+    })
+  }
+  const layout = {
+    labelCol: { span: 5 },
+    wrapperCol: { span: 18 },
+  };
+  return(
+    <Modal 
+      title={"新增标签"}
+      closable={false}
+      visible={visible}
+      onCancel={onCancel}
+      onOk={submit}
+      cancelText="取消"
+      okText="确定"
+      width="400px"
+      centered
+    >
+      <Form {...layout}>
+        <Form.Item label="标签名">
+          {getFieldDecorator("tagName",{
+            rules:[{required:true,message:"请输入标签名"}]
+          })(
+            <Input placeholder="请输入标签名" width="200px" autoComplete="off" />
+          )}
+        </Form.Item>
+      </Form>
+    </Modal>
+  )
+  
+}
+export default Form.create()(forwardRef(AddTag));
--- a/src/forge/Source/Index.jsx
+++ b/src/forge/Source/Index.jsx
@ -1,16 +1,286 @@
-import React from 'react';
+import React, { useEffect, useState } from 'react';
 import './Index.scss';
-import { Blueback , FlexAJ } from '../Component/layout';
+import { AlignCenter, Blueback , FlexAJ } from '../Component/layout';
+import { Dropdown, Input , Menu , Pagination, Spin , Popconfirm, Button } from 'antd';
+import { Link } from 'react-router-dom';
+import UploadSource from './UploadSource';
+import AddTag from './AddTag';
+import { getImageUrl } from 'educoder';
+import Nodata from '../Nodata';
+import axios from 'axios';

+const { Search } = Input;
+const sort = [
+  "按上传时间排序",
+  "按下载次数排序"
+]
+const limit = 15;
+const https = 'https://testfiles.trustie.net';
 function Index(props){
+  const [ sortValue , setSortValue ] = useState(0);
+  const [ page , setPage ] = useState(1);
+  const [ total , setTotal ] = useState(0);
+  const [ search , setSearch ] = useState(undefined);
+  const [ data , setData ] = useState(undefined);
+  const [ isSpin , setIsSpin ] = useState(true);
+  const [ error , setError ] = useState(false);
+  const [ attachments , setAttachments ] = useState(undefined);
+  
+  const [ id , setId ] = useState(undefined);
+
+  const [ visible , setVisible ] = useState(false);
+  const [ addVisible , setAddVisible ] = useState(false);
+  
+  const repo_id = props.projectDetail && props.projectDetail.repo_id;
+  const owner = props.match.params.owner;
+  const current_user = props.current_user;
+
+  useEffect(()=>{
+    if(owner && repo_id){
+      setIsSpin(true);
+      getData();
+    }
+  },[repo_id,owner,search,sortValue,page])
+
+  function getData(){
+    const url = https +`/api/project/achievement/`;
+    axios.get(url,{
+      params:{
+        projectId:repo_id,
+        curPage:page,
+        pageSize:limit,
+        name:search,
+        sort:sortValue+1,
+      }
+    }).then(result=>{
+      if(result && result.data){
+        setData(result.data.data.rows);
+        setTotal(result.data.data.total);
+        setIsSpin(false);
+        setError(false);
+      }
+    }).catch(error=>{setIsSpin(false);setError(true);})
+  }
+
+  // 搜索
+  function onSearch(value){
+    setSearch(value);
+  }
+
+  // 切换排序方式
+  function changeSort(e,index){
+    setSortValue(index);
+  }
+
+
+  const menu=(
+    <Menu>
+      {
+        sort && sort.map((item,key)=>{
+          return(
+            <Menu.Item onClick={(e)=>changeSort(e,key)} value={key} className={key=== sortValue ?"color-blue":""}>{item}</Menu.Item>     
+          )
+        })
+      }
+    </Menu>
+  )
+
+  function listmenu(id,attachments,isPublic){
+    return(
+      <Menu>
+        <Menu.Item onClick={()=>{setId(id);setVisible(true);setAttachments(attachments)}}>更新版本</Menu.Item>
+        <Menu.Item onClick={()=>changeStatus(id,isPublic===1?0:1)}>{isPublic === 1 ? "设为私有":"设为公开"}</Menu.Item>
+        <Menu.Item onClick={()=>deleteSourceFunc(id)}>删除资源</Menu.Item>
+      </Menu>
+    )
+  }
+  // 更细私有状态
+  function changeStatus(id,isPublic){
+    const url = https+`/api/project/achievement/updateStatus`;
+    axios.put(url,{
+      id,status:isPublic
+    }).then(result=>{
+      if(result && result.data){
+        props.showNotification(`资源${isPublic === 1 ? "设为公开":"设为私有"}成功！`);
+        setIsSpin(true);
+        getData();
+      }
+    }).catch({})
+  }
+
+  // 删除资源方法
+  function deleteSourceFunc(id){
+    props.confirm({
+      content: "是否确认删除所选资源文件？",
+      onOk: () => {
+        const url = https + `/api/project/achievement/${id}`;
+        axios.delete(url).then(result=>{
+          if(result && result.data && result.data.code === "1"){
+            props.showNotification("资源删除成功");
+            setIsSpin(true);
+            getData();
+          }
+        })
+      }
+    })
+    
+  }
+    
+
+  // 上传资源成功
+  function onOk(){
+    setVisible(false);
+    setIsSpin(true);
+    getData();
+  }
+
+  //  确认删除标签
+  function removeTagFunc(id,tag){
+    const url = https + `/api/project/achievement/deleteTag`;
+    axios.delete(url,{
+      params:{id,tagName:tag}
+    }).then(result=>{
+      if(result && result.data){
+        props.showNotification("标签删除成功");
+        setIsSpin(true);
+        getData();
+      }
+    }).then(error=>{})
+  }
+
+  function addPanel(id){
+    setAddVisible(true);
+    setId(id);
+  }
+
+  function onCancelAdd(){
+    setId(undefined);
+    setAddVisible(false);
+  }
+
+  // 添加标签
+  function sureAddTag(values){
+    const url = https+`/api/project/achievement/addTag?id=`+id+`&tagName=`+values.tagName;
+    axios.put(url).then(result=>{
+      if(result){
+        setId(undefined);
+        setAddVisible(false);
+        setIsSpin(true);
+        getData();
+      }
+    })
+  }
+
  return(
    <div className="sourcePanel">
+      <AddTag 
+        visible={addVisible}
+        onCancel={onCancelAdd}
+        onOk={sureAddTag}
+      />
+      <UploadSource 
+        visible={visible} 
+        onCancel={()=>setVisible(false)} 
+        onOk={onOk} 
+        showNotification={props.showNotification}
+        owner={owner}
+        projectsId={repo_id}
+        id={id}
+        attachments={attachments}
+      />
      <div className="headtitle">
        <FlexAJ>
-          <span className="font-18">资源库</span>
-          <Blueback>上传资源</Blueback>
+          <span className="font-18">资源库{total ? <span>({total})</span>:""}</span>
+          { current_user && current_user.login && (props.projectDetail && props.projectDetail.permission) ?
+            <Blueback onClick={()=>{setId(undefined);setVisible(true);}}>上传资源</Blueback>:""
+          }
        </FlexAJ>
      </div>
+      <FlexAJ className="subHeadtitle">
+        <Search 
+          placeholder="在项目内搜索资源" 
+          onSearch={onSearch} 
+          allowClear 
+          enterButton="搜索"
+          width="220px"
+        />
+        <Dropdown overlay={menu} placement="bottomRight">
+          <span className="color-grey-9">{sort[sortValue]}<i className="iconfont icon-sanjiaoxing-down font-16 color-grey-9 ml3"></i></span>
+        </Dropdown>
+      </FlexAJ>
+      <Spin spinning={isSpin}>
+        <div className="bodycontent">
+        {
+          data && data.length> 0 &&
+          <ul className="bodycontentul">
+            {
+              data.map((item,key)=>{
+                return(
+                  <li>
+                    <Link to= {`/users/${item.login}`} className="infoImg"><img src={getImageUrl(`/${item.imageUrl}`)} alt="" /></Link>
+                    <div style={{flex:'1',width:"0"}}>
+                      <FlexAJ>
+                        <AlignCenter>
+                          <a href={https+`/busiAttachments/download/${item.attachId}`} download className="infoname">{item.fileName}</a>
+                          <a href={https + `/busiAttachments/view/${item.attachId}`}><i className="iconfont icon-shenqinggongkai font-15 ml10 color-grey-9"></i></a>
+                          {item.isPublic === 0 && <span className="privateTip">私有</span>}
+                        </AlignCenter>
+                        { current_user && current_user.login && 
+                          <Dropdown overlay={()=>listmenu(item.id,item.attachments,item.isPublic)} placement={'bottomRight'}>
+                            <i className="iconfont icon-gengduo1 color-grey-6"></i>
+                          </Dropdown>
+                        }
+                      </FlexAJ>
+                      <p className="infos">
+                        <span>上传时间：<span>{item.uploadTime}</span></span>
+                        <span>文件大小：<span>{item.fileSize}</span></span>
+                        <span>下载：<span>{item.download}</span></span>
+                      </p>
+                      <p className="infodesc task-hide-2">{item.remark}</p>
+                      <div className="infotag">
+                        {
+                          item.tags && item.tags.length>0 && item.tags.map((i,k)=>{
+                            return(
+                              <span>{i}
+                                {
+                                  current_user && (current_user.login === item.login) ?
+                                  <Popconfirm title="确定要删除当前标签？" onConfirm={()=>removeTagFunc(item.id,i)} okText="是" cancelText="否">
+                                    <i className="iconfont icon-guanbi font-12 ml2"></i>
+                                  </Popconfirm>:""
+                                }
+                              </span>
+                            )
+                          })
+                        }
+                        {
+                          current_user && (current_user.login === item.login) &&
+                          <a className="color-blue font-12" onClick={()=>addPanel(item.id)} style={{height:"20px",lineHeight:"20px"}}>+新增标签</a>
+                        }
+                      </div>
+                    </div>
+                  </li>
+                )
+              })
+            }
+          </ul>
+        }
+        {
+          ((data && data.length === 0) || error) && <Nodata _html="暂无数据"/>
+        }
+        {
+          total > limit && 
+          <div className="pt20 pb20 edu-txt-center">
+            <Pagination 
+              simple
+              current={page}
+              pageSize={limit}
+              total={total}
+              onChange={(p)=>{setPage(p)}}
+            />
+          </div>
+        }
+      </div>
+      </Spin>
    </div>
  )
 }
--- a/src/forge/Source/Index.scss
+++ b/src/forge/Source/Index.scss
@ -8,4 +8,102 @@
    padding:15px 20px;
    border-bottom: 1px solid #eee;
  }
+  .subHeadtitle{
+    padding:15px 20px;
+    border-bottom: 1px solid #eee;
+    .ant-input-group-wrapper{
+      width:320px;
+      .ant-btn.ant-input-search-button{
+        margin: 0px;
+        margin-top: -1px;
+      }
+    }
+  }
+  .bodycontent{
+    padding:0px 20px;
+    min-height: 500px;
+    & > ul.bodycontentul > li{
+      display: flex;
+      border-bottom: 1px solid #eee;
+      padding:20px 0px;
+      align-items: flex-start;
+      &:last-child{
+        border-bottom: none;
+      }
+      .infoImg{
+        img{
+          width: 50px;
+          height: 50px;
+          border-radius: 50%;
+        }
+        margin-right: 15px;        
+      }
+      .infoname{
+        font-size: 16px;
+      }
+      .privateTip{
+        display: block;
+        font-size: 12px;
+        margin-left: 10px;
+        background-color: orange;
+        height: 18px;
+        line-height: 18px;
+        padding:0px 3px;
+        color: #fff;
+      }
+      .infos{
+        & > span{
+          margin-right: 20px;
+          color: #999;
+          & >span{
+            color: #666;
+          }
+        }
+      }
+      .infodesc{
+        color: #666;
+        line-height: 20px;
+        margin:5px 0px!important;
+      }
+      .infotag{
+        display: flex;
+        flex-wrap: wrap;
+        span{
+          display: block;
+          padding:0px 4px;
+          height: 20px;
+          line-height: 20px;
+          font-size: 12px;
+          margin-right: 10px;
+          border: 1px solid #f8df8c;
+          background: #fffce6;
+          color: #0d90c3;
+          border-radius: 2px;
+          cursor: pointer;
+        }
+      }
+    }
+  }
+}
+.versionTable{
+  .currentTip{
+    display: block;
+    padding:0px 3px;
+    border-radius: 2px;
+    border:1px solid #68c7ec;
+    font-size: 12px;
+    color: #68c7ec;
+    height: 18px;
+    line-height: 18px;
+    margin-left: 5px;
+  }
+  .ant-table-body{
+    margin:0px!important;
+    thead{
+      background-color: #eee;
+    }
+    thead >tr >th,tbody > tr > td{
+      padding:4px 5px!important;
+    }
+  }
 }
--- a/src/forge/Source/Upload.jsx
+++ b/src/forge/Source/Upload.jsx
@ -0,0 +1,82 @@
+import React, { useEffect, useState } from "react";
+import { Upload, Button } from 'antd';
+import { appendFileSizeToUploadFileAll } from 'educoder';
+
+import axios from 'axios';
+function Uploads({ className , size , actionUrl,fileList,showNotification , load}) {
+  const [ files , setFiles ] = useState(undefined);
+
+  useEffect(()=>{
+    if(fileList){
+      init();
+    }
+  },[fileList]);
+
+  function init(){
+    let f = appendFileSizeToUploadFileAll(fileList);
+    setFiles(f);
+  }
+  function onAttachmentRemove(file){
+    if (!file.percent || file.percent === 100) {
+      deleteAttachment(file);
+      return false;
+    }
+  }
+  function deleteAttachment(file){
+    let id = file.response && file.response.data && file.response.data.id;
+    const url = actionUrl + `/busiAttachments/${id}`;
+    axios.delete(url).then((response) => {
+      if (response.data) {
+        if (response.data.code === "1") {
+          let nf = files.filter(item=>item.response.data.id !== id);
+          setFiles(nf);
+          fileIdList(nf);
+        } else {
+          showNotification(response.data.message)
+        }
+      }
+    }).catch(function (error) {
+      console.log(error);
+    });
+  }
+
+
+  function handleChange (info) {
+    if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
+      let fileList = info.fileList;
+      let len = info.fileList && info.fileList.length;
+      setFiles(appendFileSizeToUploadFileAll([fileList[len-1]]));
+      fileIdList(fileList[len-1]);
+    }
+  }
+
+  function fileIdList (fileList) {
+    let data = fileList.response && fileList.response.data;
+    fileList && load && load(data && data.id,data && data.fileName);
+  }
+
+  function beforeUpload(file){
+    const isLt100M = file.size / 1024 / 1024 < size;
+    if (!isLt100M) {
+      showNotification(`文件大小必须小于${size}MB!`);
+    }
+    return isLt100M;
+  }
+
+  const upload = {
+    name: 'file',
+    fileList: files,
+    action: actionUrl+`/busiAttachments/upload`,
+    onChange:handleChange,
+    onRemove:onAttachmentRemove,
+    beforeUpload:beforeUpload,
+    maxCount:1
+  };
+  return (
+    <Upload {...upload} className={className}>
+      <Button type={"default"}>上传文件</Button>
+      <span className="ml10 color-grey-9">(你可以上传小于<span className="color-red">{size}MB</span>的文件)</span>
+    </Upload>
+  )
+}
+export default Uploads;
--- a/src/forge/Source/UploadSource.jsx
+++ b/src/forge/Source/UploadSource.jsx
@ -0,0 +1,150 @@
+import React , { forwardRef, useEffect, useState } from 'react';
+import { Modal , Form , Checkbox , Input , Table } from 'antd';
+import Upload from './Upload';
+import { AlignCenter } from '../Component/layout';
+import axios from 'axios';
+const { TextArea } = Input;
+
+const https = 'https://testfiles.trustie.net';
+function UploadSource({ form , visible , onCancel , onOk , showNotification , attachments , id ,owner,projectsId}){
+  const [ tableData , setTableData ] = useState(undefined);
+  const [ fileId , setFilesId ] = useState(undefined);
+  const [ fileName , setFileName ] = useState(undefined);
+  const { getFieldDecorator, validateFields , setFieldsValue } = form;
+
+  useEffect(()=>{
+    if(id && attachments){
+      setTableData(attachments);
+    }
+  },[id,attachments])
+  // 上传附件后得到的文件id数组
+  function UploadFunc(id,name){
+    setFilesId(id);
+    setFileName(name);
+  }
+
+  const columns = [
+    {
+      dataIndex:"fileName",
+      key:"fileName",
+      title:"资源名称",
+      width:"42%",
+      ellipsis:true,
+      render:(value,item,key)=>{
+        return <AlignCenter>
+          <div className="task-hide" style={{maxWidth:key===0 ? "240px":"100%"}}>{value}</div>
+          { key === 0 && <span className="currentTip">当前版本</span> }
+        </AlignCenter>
+      }
+    },
+    {
+      dataIndex:"downloads",
+      key:"downloads",
+      title:"下载数",
+      width:"14%",
+      className:"edu-txt-center"
+    },
+    {
+      dataIndex:"fileSizeString",
+      key:"fileSizeString",
+      title:"文件大小",
+      width:"16%",
+      className:"edu-txt-center"
+    },
+    {
+      dataIndex:"createdAt",
+      key:"createdAt",
+      title:"上传时间",
+    }
+  ]
+
+  // 确定
+  function submit(){
+    if(fileId){
+      validateFields((error,values)=>{
+        if(!error){
+          postInfo(values);
+        }
+      })
+    }else{
+      showNotification("请先上传文件！");
+    }
+  }
+
+  function postInfo(values){
+    const url = https+`/api/project/achievement/`;
+    if(id){
+      // 修改
+      axios.put(url,{
+        id,fileName,fileId:`${fileId}`,
+        remark:values.remark
+      }).then(result=>{
+        if(result && result.data){
+          onOk();
+        }
+      }).catch(error=>{})
+    }else{
+      // 上传
+      axios.post(url,{
+        fileId:`${fileId}`,
+        fileName,
+        login:owner,
+        projectId:projectsId,
+        ...values
+      }).then(result=>{
+        if(result && result.data){
+          onOk();
+        }
+      }).catch(error=>{})
+    }
+    
+  }
+  return(
+    <Modal 
+      title={id?"更新资源版本":"上传资源"}
+      closable={false}
+      visible={visible}
+      onCancel={onCancel}
+      onOk={submit}
+      cancelText="取消"
+      okText="确定"
+      width="600px"
+      centered
+    >
+      <div>
+        <Form>
+          {id && <Table className="versionTable mb20" columns={columns} dataSource={tableData} pagination={false} size={"small"}/> }
+          <Form.Item style={{display:id?"none":"block"}}>
+            {getFieldDecorator("tagNames",{
+              rules:[]
+            })(
+              <Checkbox.Group>
+                <Checkbox value="软件版本">软件版本</Checkbox>
+                <Checkbox value="文档">文档</Checkbox>
+                <Checkbox value="代码">代码</Checkbox>
+                <Checkbox value="媒体">媒体</Checkbox>
+                <Checkbox value="论文">论文</Checkbox>
+                <Checkbox value="其它">其它</Checkbox>
+              </Checkbox.Group>
+            )}
+          </Form.Item>
+          <Upload 
+            className="commentStyle"
+            load={UploadFunc}
+            size={100}
+            showNotification={showNotification}
+            actionUrl= {https}
+          />
+          <Form.Item className="mt20">
+            {getFieldDecorator("remark",{
+              rules:[]
+            })(
+              <TextArea rows={4} placeholder="请输入资源描述" />
+            )}
+          </Form.Item>
+        </Form>
+      </div>
+    </Modal>
+  )
+}
+export default Form.create()(forwardRef(UploadSource));;
--- a/src/forge/Team/Group/GroupDetailMember.jsx
+++ b/src/forge/Team/Group/GroupDetailMember.jsx
@ -10,6 +10,7 @@ export default (({ data , current_user , successFunc }) => {
        data.map((item, key) => {
          return (
            <Cards
+              user={item.user}
              img={item.user.image_url}
              name={item.user.name}
              time={item.created_at}
--- a/src/forge/Team/Group/GroupDetailProject.jsx
+++ b/src/forge/Team/Group/GroupDetailProject.jsx
@ -30,8 +30,8 @@ export default (({projects}) => {
        projects.map((item, key) => {
        return (
          <Div>
-            <Imgs src={item.project && getImageUrl(`images/${item.project.owner_image_url}`)}/>
-            <Link to={`/projects/${item.project.owner_name}/${item.project.identifier}`}>{item.project.name}</Link>
+            <Imgs src={item.project && getImageUrl(`/${item.project.owner_image_url}`)}/>
+            <Link to={`/projects/${item.project.owner_login}/${item.project.identifier}`}>{item.project.name}</Link>
          </Div>
        )
        })
--- a/src/forge/Team/Group/GroupDetails.jsx
+++ b/src/forge/Team/Group/GroupDetails.jsx
@ -84,11 +84,12 @@ export default ((props) => {

  // 移除成员
  function removeUser(username) {
-    const url = `/organizations/${OIdentifier}/teams/${groupId}/team_users/${username}.json`;
    if (username) {
+      const url = `/organizations/${OIdentifier}/teams/${groupId}/team_users/quit.json`;
      axios.delete(url).then((result) => {
        if (result && result.data) {
-          
+          props.showNotification(`已成功退出团队！`); 
+          props.history.push(`/organize/${OIdentifier}`);
        }
      }).catch((error) => { });
    }
@ -101,7 +102,7 @@ export default ((props) => {
          group ?
            <div>
              <AlignCenterBetween>
-                <span className="color-grey-3">{group.name}</span>
+                <span className="color-grey-3 task-hide">{group.nickname}</span>
                {group.is_member && !group.is_admin ?
                  <Popconfirm
                    title="确认离开团队吗？"
--- a/src/forge/Team/Group/GroupForm.jsx
+++ b/src/forge/Team/Group/GroupForm.jsx
@ -24,6 +24,7 @@ export default Form.create()(
    const [check_box, setCheckBox] = useState(false);
    const [switch_box, setSwtichBox] = useState([]);
    const [onwers, setOnwers] = useState(false);
+    const [ descNum , setDescNum ] = useState(0);
    const [switch_box_code, setSwtichBoxCode] = useState(false);
    const [switch_box_pull, setSwtichBoxPull] = useState(false);
    const [switch_box_issue, setSwtichBoxIssue] = useState(false);
@ -39,6 +40,7 @@ export default Form.create()(
        setFieldsValue({
          ...GroupDetail
        })
+        setDescNum(GroupDetail.description ? GroupDetail.description.length : 0);
      }
    }, [GroupDetail])

@ -137,26 +139,53 @@ export default Form.create()(
        history.push(`/organize/${OIdentifier}`);
      }
    }
+
+
+    function checkname(rule, value, callback){
+      if(!value){
+        callback();
+      }
+      if(value && !value.match(/^[a-zA-Z][a-zA-Z\d]{3,14}$/)){
+        callback("只能使用英文字母和数字，以字母开头，长度为4到15个字符");
+      }
+      callback();
+    }
    return (
      <Spin spinning={isSpin}>
-        <WhiteBack className="mb30" style={{border:"1px solid #eee"}}>
+        <WhiteBack className="mb30" style={{border:groupId?"none":"1px solid #eee"}}>
          <Banner>{groupId ? "基本设置" : "新建团队"}</Banner>
          <Div>
            <Form>
              {helper(
-                '团队名称：',
+                '团队标识：',
                "name",
-                [{ required: true, message: "请输入团队名称" }],
-                <Input placeholder="请输入团队名称" disabled={onwers}/>, true
+                [
+                  { required: true, message: "请输入团队标识" },
+                  {
+                    validator:checkname
+                  }
+                ],
+                <Input placeholder="请输入团队标识" disabled={onwers}/>, true
              )}
              {helper(
-                <span className="mb5">团队描述：<span className="color-grey-8">(描述团队的目的或作用)</span></span>,
-                "description",
-                [],
-                <TextArea
-                  placeholder="请输入团队描述"
-                />
+                '团队名称：',
+                "nickname",
+                [{ required: true, message: "请输入团队名称" }],
+                <Input placeholder="请输入团队名称"/>, true
              )}
+              <div className="pr">
+                <span className="toprightNum">{descNum}/200</span>
+                {helper(
+                  <span className="mb5">团队描述：<span className="color-grey-8">(描述团队的目的或作用)</span></span>,
+                  "description",
+                  [],
+                  <TextArea
+                    placeholder="请输入团队描述"
+                    maxLength={200}
+                    onChange={(e)=>{setDescNum(e.target.value ? e.target.value.length :0)}}
+                  />
+                )}
+              </div>
              
              {helper(
                '项目权限：',
--- a/src/forge/Team/Group/Setting/GroupMemberSetting.jsx
+++ b/src/forge/Team/Group/Setting/GroupMemberSetting.jsx
@ -76,7 +76,7 @@ export default ((props) => {
      width: "7%",
      render: (value, item) => {
        return (
-          <Img src={getImageUrl(`images/${item.user.image_url}`)}></Img>
+          <Img src={getImageUrl(`/${item.user.image_url}`)}></Img>
        )
      }
    },
--- a/src/forge/Team/Group/Setting/GroupProjectSetting.jsx
+++ b/src/forge/Team/Group/Setting/GroupProjectSetting.jsx
@ -180,7 +180,7 @@ function GroupProjectSetting(props) {
                }
              >
                <List.Item.Meta
-                  title={<a href={`/projects/${item.project.owner_name}/${item.project.name}`}>{item.project.owner_name}/{item.project.name}</a>}
+                  title={<a href={`/projects/${item.project.owner_login}/${item.project.identifier}`}>{item.project.owner_name}/{item.project.name}</a>}
                />
              </List.Item>
            )}
--- a/src/forge/Team/Index.scss
+++ b/src/forge/Team/Index.scss
@ -277,6 +277,7 @@
  display: flex;
  align-items: flex-start;
  .g-sub-left{
+    width: 0;
    &>div{
      border:1px solid #eee;
    }
--- a/src/forge/Team/ListItem.jsx
+++ b/src/forge/Team/ListItem.jsx
@ -7,7 +7,7 @@ function ListItem({item,key,OIdentifier}) {
    <div className="team_project" key={key}>
      <p className="t_p_title">
        <span className="flex1">
-          <Link to={`/projects/${OIdentifier}/${item.identifier}`} className="name">{item.identifier}</Link>
+          <Link to={`/projects/${OIdentifier}/${item.identifier}`} className="name">{item.name}</Link>
          { item.forked_from_project_id && <i className="iconfont icon-fork font-18 color-orange ml8" /> }
          {
            item.type && item.type !== 0 ? 
--- a/src/forge/Team/New.jsx
+++ b/src/forge/Team/New.jsx
@ -1,15 +1,17 @@
 import React,{ forwardRef , useCallback , useEffect, useState } from 'react';
 import './Index.scss';
-import { Form , Input , Radio , Checkbox , Button, InputNumber } from "antd";
+import { Form , Input , Radio , Checkbox , Button } from "antd";
 import UploadImage from './Component/UploadImage';
 import axios from 'axios';
-
+const port = window.location.port;
+const hostname = window.location.hostname;
 export default Form.create()(
  forwardRef(({ form , showNotification , history })=>{
    const [ image , setImage ] = useState(undefined);
    const [ imageFlag , setImageFlag] = useState(false);
-    const { getFieldDecorator, validateFields , setFieldsValue } = form;
+    const [ descNum ,setDescNum ] = useState(0);

+    const { getFieldDecorator, validateFields , setFieldsValue } = form;
    const radioStyle = {
      display: 'block',
      height: '30px',
@ -60,33 +62,62 @@ export default Form.create()(
      })
    },[])

+    function checkname(rule, value, callback){
+      if(!value){
+        callback();
+      }
+      if(value && !value.match(/^[a-zA-Z][a-zA-Z0-9_-]{3,19}$/)){
+        callback("只能使用以字母开头，包含字母、数字、下划线、横杠等，长度4到20个字符");
+      }
+      callback();
+    }
+
    return(
-        <div className="main">
+        <div className="main" style={{padding:"0px",border:"none"}}>
          <div className="teamBox">
            <p className="teamBox-title">新建组织</p>
            <Form className="teamBox-form">
              {helper(
-                <span>组织名称：<span className="color-grey-8">(组织名称应该简单明了)</span></span>,
+                <span>组织账号：</span>,
                "name",
-                [{ required: true, message: "请输入组织名称" }],
+                [
+                  { required: true, message: "请输入组织账号" },
+                  {
+                    validator:checkname
+                  }
+                ],
                <Input
-                  placeholder="请输入组织名称"
+                  addonBefore={`https://`+ port ? `${hostname}:${port}/organize`:`${hostname}/organize`}
+                  placeholder="组织账号" maxLength={100}
                />
              )}
              {helper(
-                '组织描述',
-                "description",
-                [{ required: true, message: "请输入组织描述" }],
-                <Input.TextArea 
-                  autoSize={{ minRows: 3, maxRows: 5 }}
-                  placeholder="请输入组织描述"
+                <span>组织名称：</span>,
+                "nickname",
+                [{ required: true, message: "请输入组织名称" }],
+                <Input
+                  placeholder="请输入组织名称" maxLength={100}
                />
              )}
+              <div className="pr">
+                <span className="toprightNum">{descNum}/200</span>
+                {helper(
+                  '组织描述',
+                  "description",
+                  [{ required: true, message: "请输入组织描述" }],
+                  <Input.TextArea 
+                    autoSize={{ minRows: 3, maxRows: 5 }}
+                    placeholder="请输入组织描述" maxLength={200} 
+                    onChange={(e)=>{setDescNum(e.target.value ? e.target.value.length :0)}}
+                  />
+                )}
+              </div>
+              
              {helper(
                '所在地区',
                "location",
                [],
-                <Input placeholder="请输入地址"/>,false
+                <Input placeholder="请输入地址" maxLength={50}/>,false
              )}
              {helper(
                '可见性',
--- a/src/forge/Team/RightBox.jsx
+++ b/src/forge/Team/RightBox.jsx
@ -72,7 +72,7 @@ function RightBox({ OIdentifier , history , admin }) {
            memberData.organization_users.map((item,key)=>{
              return(
                <div className="teammembers" key={key}>
-                  <Link to={`/users/${item.user && item.user.login}`}><Img src={getImageUrl(`images/${item.user && item.user.image_url}`)} alt="" className="m-img"/></Link>
+                  <Link to={`/users/${item.user && item.user.login}`}><Img src={getImageUrl(`/${item.user && item.user.image_url}`)} alt="" className="m-img"/></Link>
                  <div>
                    <Link to={`/users/${item.user && item.user.login}`}><ListName>{item.user && item.user.name}</ListName></Link>
                    <Align><i className="iconfont icon-shijian color-green mr3 font-13"></i><Span>加入时间：{item.created_at}</Span></Align>
--- a/src/forge/Team/Setting/TeamSettingCommon.jsx
+++ b/src/forge/Team/Setting/TeamSettingCommon.jsx
@ -25,6 +25,7 @@ export default Form.create()(
    const [ password , setPassword ] = useState(undefined);
    const [ passwordFlag , setPasswordFlag ] = useState(false);
    const [ visible , setVisible ] = useState(false);
+    const [ descNum , setDescNum ] = useState(0);
    const { getFieldDecorator , validateFields , setFieldsValue } = form;

    useEffect(()=>{
@ -33,6 +34,7 @@ export default Form.create()(
          ...organizeDetail
        })
        setImage(organizeDetail.avatar_url);
+        setDescNum(organizeDetail.description ? organizeDetail.description.length : 0);
      }
    },[organizeDetail])

@ -95,6 +97,15 @@ export default Form.create()(
      })
      setVisible(false);
    }
+    function checkname(rule, value, callback){
+      if(!value){
+        callback();
+      }
+      if(value && !value.match(/^[a-zA-Z][a-zA-Z0-9_-]{3,19}$/)){
+        callback("只能使用以字母开头，包含字母、数字、下划线、横杠等，长度4到20个字符");
+      }
+      callback();
+    }
    return(
      <div>
        <WhiteBack>
@ -102,17 +113,35 @@ export default Form.create()(
          <Div>
            <Form>
              {helper(
-                "组织名称：",
+                "组织账号：",
                "name",
-                [{ required: true, message: "请输入组织名称" }],
-                <Input placeholder="请输入组织名称" />,true
+                [
+                  { required: true, message: "请输入组织账号" },
+                  {
+                    validator:checkname
+                  }
+                ],
+                <Input placeholder="请输入组织账号" maxLength={100} disabled/>,true
              )}
              {helper(
-                "组织描述：",
-                "description",
-                [],
-                <TextArea placeholder="请输入组织名称" />
+                "组织名称：",
+                "nickname",
+                [{ required: true, message: "请输入组织名称" }],
+                <Input placeholder="请输入组织名称" maxLength={100}/>,true
              )}
+              <div className="pr">
+                <span className="toprightNum">{descNum}/200</span>
+                {helper(
+                  "组织描述：",
+                  "description",
+                  [],
+                  <TextArea 
+                    placeholder="请输入组织名称" 
+                    maxLength={200}
+                    onChange={(e)=>{setDescNum(e.target.value ? e.target.value.length :0)}}
+                  />
+                )}
+              </div>
              {helper(
                "官方网站：",
                "website",
@ -149,7 +178,7 @@ export default Form.create()(
                <Input value="-1" style={{width:"350px"}}/>
              )}
              <p>选择头像:</p>
-              <UploadImage url={getImageUrl(`images/${image}`)} getImage={getImage}/>
+              <UploadImage url={getImageUrl(`/${image}`)} getImage={getImage}/>
              <Button type={"primary"} onClick={updateDetail}>更新仓库设置</Button>
            </Form>
          </Div>
--- a/src/forge/Team/Setting/TeamSettingMember.jsx
+++ b/src/forge/Team/Setting/TeamSettingMember.jsx
@ -64,7 +64,7 @@ export default (({organizeDetail})=>{
      width:"5%",
      render:(value)=>{
        return(
-          value && <Link to={`/users/${value && value.login}`}><Img src={getImageUrl('images/'+value.image_url)}></Img> </Link>
+          value && <Link to={`/users/${value && value.login}`}><Img src={getImageUrl('/'+value.image_url)}></Img> </Link>
        )
      }
    },
--- a/src/forge/Team/Sub/Detail.jsx
+++ b/src/forge/Team/Sub/Detail.jsx
@ -78,15 +78,14 @@ function Detail(props){
        detail &&
        <Cards
          src={`/organize/${detail.name}`}
-          title={detail.name}
+          title={detail.nickname}
          desc={!buttonflag && detail.description}
          img={detail.avatar_url}
          rightBtn={
            <React.Fragment>
-              {flag && !buttonflag && detail.is_admin ? <AlignCenter className="color-blue">
-                <Link to={`/organize/${OIdentifier}/setting`} className="color-blue">设置</Link>
-                <i className="iconfont icon-shezhi2 ml3"></i>
-              </AlignCenter> :""}
+              {flag && !buttonflag && detail.is_admin ? 
+                <Link to={`/organize/${OIdentifier}/setting`} className="color-blue ml10 font-14">设置<i className="iconfont icon-shezhi2 ml3 fr"></i></Link>
+              :""}
              {buttonflag && 
                <span className="subNavs">
                  <Link to={`/organize/${OIdentifier}/member`} className={pathname ===`/organize/${OIdentifier}/member` ? "active":""}><span>组织成员</span>{detail.num_users && <lable>{detail.num_users}</lable>}</Link>
@ -95,6 +94,18 @@ function Detail(props){
              }
            </React.Fragment>
          }
+          bottomInfos={
+            !buttonflag && <div>
+              {
+                detail.location && 
+                <span className="color-grey-6"><i className="iconfont icon-weizhi mr3 font-16 color-grey-6"></i>{detail.location}</span>
+              }
+              {
+                detail.website && 
+                <a href={detail.website} target="_blank" className="ml20 color-grey-6"><i className="iconfont icon-lianjie mr3 font-14"></i>{detail.website}</a>
+              }
+            </div>
+          }
        />
      }
      <Switch {...props}>
--- a/src/forge/Team/Sub/SubDetail.jsx
+++ b/src/forge/Team/Sub/SubDetail.jsx
@ -56,7 +56,7 @@ export default ((props)=>{
        detail && 
        <Cards
          src={`/organize/${OIdentifier}/group/${groupId}`}
-          title={detail.name}
+          title={detail.nickname||detail.name}
          rightBtn={
            flag && <span className="subNavs">
              <Link to={`/organize/${OIdentifier}/member`} className={pathname ===`/organize/${OIdentifier}/member` ? "active":""}><span>组织成员</span>{detail.num_users && <lable>{detail.num_users}</lable>}</Link>
--- a/src/forge/Team/TeamGroupItems.jsx
+++ b/src/forge/Team/TeamGroupItems.jsx
@ -75,7 +75,7 @@ function TeamGroupItems({organizeDetail,limit, count , history}){
                return(
                <div key={key}>
                  <p className="g-head">
-                    <Link to={`/organize/${organizeDetail.name}/group/${item.id}`} className="color-grey-3 font-16">{item.name}</Link>
+                    <Link to={`/organize/${organizeDetail.name}/group/${item.id}`} className="color-grey-3 font-16">{item.nickname}</Link>
                    <span>
                      { item.is_admin && item.authorize!=="owner" && <Popconfirm title={`确定解散团队${item.name}?`} okText="是" cancelText="否" onConfirm={()=>disMissGroup(item.id)}><a className="color-red">解散团队</a></Popconfirm>}
                      { item.is_member && <LeaveTeam className="ml15" teamID={item.id} onOk={outTeam}/>}
@ -86,7 +86,7 @@ function TeamGroupItems({organizeDetail,limit, count , history}){
                    {
                      item.users && item.users.map((i,k)=>{
                        return( 
-                          k < count ? <Link to={`/users/${i.login}`}><ImgContent title={i.name} key={k} src={getImageUrl(`images/${i.image_url}`)}/></Link> 
+                          k < count ? <Link to={`/users/${i.login}`}><ImgContent title={i.name} key={k} src={getImageUrl(`/${i.image_url}`)}/></Link> 
                          : 
                          k === count ? 
                          <Link to={`/organize/${organizeDetail && organizeDetail.name}/group/${item.id}`} className="moreMember" title="查看更多" ><i className="iconfont icon-zhunbeizhong"></i></Link>
@ -105,7 +105,7 @@ function TeamGroupItems({organizeDetail,limit, count , history}){
            }
          </div>
        }
-        { list && list.length > 0 && <Nodata _html="暂无数据"/> }
+        { list && list.length === 0 && <Nodata _html="暂无数据"/> }
        {
          total > limit && 
          <div className="mt20 pb20 edu-txt-center">
--- a/src/forge/Upload/Index.js
+++ b/src/forge/Upload/Index.js
@ -1,6 +1,7 @@
 import React, { Component } from "react";
-import { Upload, Button, Icon } from 'antd';
+import { Upload, Icon , Button } from 'antd';
 import { getUploadActionUrl, appendFileSizeToUploadFileAll } from 'educoder';
+import { AlignCenter } from '../Component/layout';

 import axios from 'axios';
 const { Dragger } = Upload;
@ -28,22 +29,12 @@ class Index extends Component {

  onAttachmentRemove = (file) => {
    if (!file.percent || file.percent === 100) {
-      // this.props.confirm({
-      // 	content: '是否确认删除?',
-      // 	onOk: () => {
-      // 		this.deleteAttachment(file)
-      // 	},
-      // 	onCancel() {
-      // 		console.log('Cancel');
-      // 	},
-      // });
      this.deleteAttachment(file)
      return false;
    }
  }

  deleteAttachment = (file) => {
-
    const url = `/attachments/${file.response ? file.response.id : file.uid}.json`
    axios.delete(url, {
    }).then((response) => {
@ -82,7 +73,7 @@ class Index extends Component {
  fileIdList = (fileList) => {
    let array = [];
    fileList && fileList.length > 0 && fileList.map((item) => {
-      return array.push(item.response && item.response.id);
+      return array.push(item.response && (item.response.id || (item.response.data && item.response.data.id)));
    })
    array && this.props.load && this.props.load(array);
  }
@ -98,21 +89,27 @@ class Index extends Component {

  render() {
    //判断是否已经提交，如已提交评论则上一条评论数据清除
-    const { isComplete, icon } = this.props;
+    const { isComplete, icon , btn , className , size , actionUrl } = this.props;
    const { fileList } = this.state;

    let list = isComplete === true ? fileList : undefined;
    const upload = {
      name: 'file',
      fileList: list,
-      action: `${getUploadActionUrl()}`,
+      action: actionUrl || `${getUploadActionUrl()}`,
      onChange: this.handleChange,
      onRemove: this.onAttachmentRemove,
      beforeUpload: this.beforeUpload
    };

    return (
-      <Dragger {...upload} className={this.props.className}>
+      btn ? 
+      <Upload {...upload} className={className}>
+        <Button type={"default"}>上传文件</Button>
+        <span className="ml10 color-grey-9">(你可以上传小于<span className="color-red">{size}MB</span>的文件)</span>
+      </Upload>
+      :
+      <Dragger {...upload} className={className}>
        {icon || <Icon type="inbox" />}
        <p className="ant-upload-text font-14">拖动文件或<span className="color-blue">点击此处上传</span></p>
      </Dragger>
--- a/src/forge/UsersList/focus_button.js
+++ b/src/forge/UsersList/focus_button.js
@ -5,6 +5,7 @@ import "./list.css";

 function FocusButton({is_watch , fontClass, starText, is_block , id , successFunc}){
  const [ isSpin , setIsSpin ] = useState(false);
+  const [ watchFlag , setWatchFlag ] = useState(is_watch);
  // 关注和取消关注
  function focusFunc(flag){
    setIsSpin(true);
@ -18,6 +19,7 @@ function FocusButton({is_watch , fontClass, starText, is_block , id , successFun
    }).then((result) => {
      if (result && result.data.status === 0) {
        successFunc && successFunc();
+        setWatchFlag(!watchFlag);
      }
      setIsSpin(false);
    })
@ -25,8 +27,8 @@ function FocusButton({is_watch , fontClass, starText, is_block , id , successFun
  };

  return (
-    <Button type={is_watch ? "default" : "primary"} ghost={!is_watch} block={is_block} loading={isSpin} onClick={() => focusFunc(is_watch)}>
-      {is_watch ? (
+    <Button type={watchFlag ? "default" : "primary"} ghost={!watchFlag} block={is_block} loading={isSpin} onClick={() => focusFunc(watchFlag)}>
+      {watchFlag ? (
        <span className="">
          <i className="iconfont icon-shixing font-15 text-yellow mr-4"></i>
          <span className={fontClass || "font-12"}>已关注</span>
--- a/src/forge/UsersList/fork_users.js
+++ b/src/forge/UsersList/fork_users.js
@ -88,7 +88,7 @@ class ForkUsers extends Component {
                >
                  <img
                    className="avatar-60"
-                    src={getImageUrl(`images/${item.image_url}`)}
+                    src={getImageUrl(`/${item.image_url}`)}
                    alt=""
                  />
                </Link>
--- a/src/forge/UsersList/user_list.js
+++ b/src/forge/UsersList/user_list.js
@ -18,7 +18,7 @@ class UserList extends Component {
                >
                  <img
                    className="avatar-60"
-                    src={getImageUrl(`images/${item.image_url}`)}
+                    src={getImageUrl(`/${item.image_url}`)}
                    alt=""
                  />
                </a>
--- a/src/forge/Version/version.js
+++ b/src/forge/Version/version.js
@ -103,8 +103,8 @@ class version extends Component {
    const { data , releases , isSpin } = this.state

    return (
-      <div className="main" style={{paddingTop:"0px"}}>
-        <div className="topWrapper">
+      <div className="main" style={{padding:"0px"}}>
+        <div className="topWrapper" style={{padding:"15px 20px"}}>
          <span className="font-18 color-grey-3">版本发布</span>
          {
            data && data.user_permission ?
@ -113,7 +113,7 @@ class version extends Component {
          }
        </div>
        <div className="releasesVersion">
-          <Spin spinning={isSpin}><div style={{minHeight:"300px"}}>{this.renderList(releases)}</div></Spin>
+          <Spin spinning={isSpin}><div>{this.renderList(releases)}</div></Spin>
        </div>
      </div>
    )
--- a/src/forge/comments/children_comments.js
+++ b/src/forge/comments/children_comments.js
@ -118,7 +118,7 @@ class children_comments extends Component {
          >
            <img
              className="radius"
-              src={getImageUrl(`images/${item && item.user_picture}`)}
+              src={getImageUrl(`/${item && item.user_picture}`)}
              alt=""
              width="30"
              height="30"
--- a/src/forge/comments/children_journals.js
+++ b/src/forge/comments/children_journals.js
@ -82,7 +82,7 @@ class children_journals extends Component {
          >
            <img
              className="radius"
-              src={getImageUrl(`images/${item && item.user_picture}`)}
+              src={getImageUrl(`/${item && item.user_picture}`)}
              alt=""
              width="30"
              height="30"
--- a/src/forge/comments/comments.js
+++ b/src/forge/comments/comments.js
@ -310,7 +310,7 @@ class comments extends Component {
            <img
              className="radius"
              src={getImageUrl(
-                `images/${current_user && current_user.image_url}`
+                `/${current_user && current_user.image_url}`
              )}
              alt=""
              width="30"
@ -375,7 +375,7 @@ class comments extends Component {
            >
              <img
                className="radius"
-                src={getImageUrl(`images/${item && item.user_picture}`)}
+                src={getImageUrl(`/${item && item.user_picture}`)}
                alt=""
                width="30"
                height="30"
@ -471,7 +471,7 @@ class comments extends Component {
                    className="radius"
                    src={
                      current_user && current_user.image_url
-                        ? getImageUrl(`images/${current_user.image_url}`)
+                        ? getImageUrl(`/${current_user.image_url}`)
                        : "images/avatars/User/b"
                    }
                    alt=""
@ -528,7 +528,7 @@ class comments extends Component {
                          className="radius"
                          src={
                            current_user && current_user.image_url
-                              ? getImageUrl(`images/${current_user.image_url}`)
+                              ? getImageUrl(`/${current_user.image_url}`)
                              : "images/avatars/User/b"
                          }
                          alt=""
--- a/src/forge/users/Index.jsx
+++ b/src/forge/users/Index.jsx
@ -6,7 +6,6 @@ import { withRouter } from "react-router";
 import { SnackbarHOC } from "educoder";
 import { CNotificationHOC } from "../../modules/courses/common/CNotificationHOC";
 import { TPMIndexHOC } from "../../modules/tpm/TPMIndexHOC";
-import Handbook from '../Component/Handbook';
 const Infos = Loadable({
  loader: () => import("./Infos"),
  loading: Loading,
@ -15,7 +14,6 @@ export default withRouter(
  (CNotificationHOC()(SnackbarHOC()(TPMIndexHOC((props)=>{
    return(
      <div>
-        <Handbook />
        <Switch>
          <Route
            path="/users/:username"
--- a/src/forge/users/Index.scss
+++ b/src/forge/users/Index.scss
@ -29,7 +29,7 @@ $flex:flex;
  & > div{
    margin-bottom: 20px;
    display: $flex;
-    align-items: flex-start;
+    align-items: center;
    padding:20px 25px;
    background-color:rgba(250,250,250,1);
    .imgBox{
@ -52,6 +52,11 @@ $flex:flex;
    font-size: 12px;
    color: #888;
    margin-top: 3px;
+    margin-bottom: 0px;
+  }
+  .teamdesc{
+    word-break: break-all;
+    line-height: 20px;
  }
 }
 .infosType{
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
caishi	705bfb07bd	Merge branch 'develop'	2021-05-08 16:53:26 +08:00
caishi	202081bbeb	样式	2021-05-08 16:53:16 +08:00
caishi	d783d998fc	编辑合并请求-url地址错误	2021-05-08 14:36:12 +08:00
caishi	af8872176c	编辑合并请求-url地址错误	2021-05-08 14:24:02 +08:00
caishi	037a79de67	detail+同步镜像type=2的才不需要合并请求	2021-05-07 17:33:41 +08:00
caishi	51925542b8	Merge branch 'develop' # Conflicts: # public/css/edu-purge.css	2021-05-07 16:37:21 +08:00
caishi	a408d435f3	统一项目简介、项目概览	2021-05-07 16:26:50 +08:00
caishi	016f7f1a7e	去掉Markdown代码块的间隔色、编号等+issue	2021-05-07 16:00:57 +08:00
caishi	ff06efe109	merge develop	2021-05-06 17:15:43 +08:00
caishi	c33561c212	新建项目-maxlength	2021-05-06 17:14:42 +08:00
caishi	2deb6f8f9d	设置所有标签的marginbottom为0	2021-05-06 17:14:30 +08:00
caishi	63d69a955e	代码库-提交描述未换行	2021-05-06 17:14:19 +08:00
caishi	e7eceb5b23	issue-字符限制	2021-05-06 17:12:42 +08:00
caishi	c28ae9adb3	Revert "设置所有标签的marginbottom为0" This reverts commit `227b686046`.	2021-05-06 15:15:02 +08:00
caishi	870fbaa2a9	新建项目-maxlength	2021-05-06 14:59:54 +08:00
caishi	227b686046	设置所有标签的marginbottom为0	2021-05-06 10:56:09 +08:00
caishi	582f7a39b3	代码库-提交描述未换行	2021-05-06 10:14:06 +08:00
caishi	ac4b7542e2	撤销隐藏-资源库	2021-04-28 20:22:54 +08:00
caishi	3a3a0251aa	Merge branch 'undo' into develop # Conflicts: # src/forge/Component/SearchUser.jsx	2021-04-28 20:17:59 +08:00
caishi	2fcb645d42	04-28休假期修改issue --需合并至其它分支（合并请求相关）	2021-04-28 20:17:30 +08:00
caishi	93a53e2c7f	转移项目-bug	2021-04-27 18:44:40 +08:00
caishi	79d8f4e5ad	清空弹窗里的内容	2021-04-27 18:27:56 +08:00
caishi	ae34240bfb	通知-跳转	2021-04-27 17:46:05 +08:00
caishi	4d652d238d	不能修改组织账号	2021-04-27 17:25:00 +08:00
caishi	efaf0c29b5	不能修改组织账号	2021-04-27 17:24:48 +08:00
caishi	81ad2358f5	不能修改组织账号	2021-04-27 17:23:58 +08:00
caishi	605d5a047d	merge undo	2021-04-27 17:15:07 +08:00
caishi	1474f5d3fe	转移项目-bug和修改需求	2021-04-27 17:12:00 +08:00
caishi	8d509f1473	组织地址、website的问题，可合并至develop	2021-04-27 17:11:37 +08:00
caishi	4ba63fd8fa	项目转移-转移权限	2021-04-27 13:50:05 +08:00
caishi	e10f9893e0	组织团队-无数据显示错误	2021-04-27 09:46:39 +08:00
caishi	63d7045444	组织团队-无数据显示错误	2021-04-27 09:46:29 +08:00
caishi	6da4dbc165	组织团队-无数据显示错误	2021-04-27 09:45:14 +08:00
caishi	c0ddd6eaee	组织-项目列表显示name	2021-04-26 17:20:54 +08:00
caishi	f65f4c273a	组织基本设置-正则和新建的页面不一致	2021-04-26 16:32:12 +08:00
caishi	0cdb491433	组织基本设置-正则和新建的页面不一致	2021-04-26 16:32:03 +08:00
caishi	ac47ba1b29	组织基本设置-正则和新建的页面不一致	2021-04-26 16:31:26 +08:00
caishi	2bd6f9cb1e	组织-新增地址和网址的显示	2021-04-26 16:17:21 +08:00
caishi	0636e0a925	转移项目-修改1	2021-04-26 16:17:04 +08:00
caishi	631b05dfd6	代码库编辑文件-切换到其它目录后要重新将编辑状态改为显示状态	2021-04-26 15:00:31 +08:00
caishi	4e48b0b363	项目转移--整体数据绑定	2021-04-26 14:59:19 +08:00
caishi	1af504825c	代码库编辑文件-切换到其它目录后要重新将编辑状态改为显示状态	2021-04-25 18:00:05 +08:00
caishi	fb41baacc1	代码库编辑文件-切换到其它目录后要重新将编辑状态改为显示状态	2021-04-25 17:46:38 +08:00
caishi	09065383c1	转移项目-前端页面已画完	2021-04-25 17:38:47 +08:00
caishi	e94cf68cc5	样式覆盖	2021-04-23 18:04:49 +08:00
caishi	c32e215b27	样式覆盖	2021-04-23 18:04:07 +08:00
caishi	5fa2fd99b9	Merge branch 'develop'	2021-04-23 14:51:04 +08:00
caishi	2f6597355c	+上关注后不需要提示	2021-04-23 14:50:52 +08:00
caishi	20ab8a6683	Merge branch 'develop'	2021-04-23 14:47:50 +08:00
caishi	1eb3c20af4	+上贡献者悬浮框里增加的跳转链接不要新开页	2021-04-23 14:47:32 +08:00
caishi	afb599f5be	贡献者-悬浮内容增加跳转链接	2021-04-23 14:46:11 +08:00
caishi	a7f709a663	Merge branch 'develop'	2021-04-23 14:16:30 +08:00
caishi	d6d6df806d	imageUrl + /	2021-04-23 14:14:06 +08:00
caishi	6cc97bd039	个人中心关注-关注或者取消关注未更新状态	2021-04-23 11:49:56 +08:00
caishi	037150a63c	贡献者-悬浮卡片-测试版1	2021-04-23 11:15:14 +08:00
caishi	63c2cfed70	Merge branch 'develop'	2021-04-22 10:58:30 +08:00
caishi	52dc63362b	发布评论者头像路径错误	2021-04-22 10:58:11 +08:00
caishi	29e3f0d59d	新建组织-组织账号正则	2021-04-21 16:55:10 +08:00
caishi	233e6a8226	底部样式+新建组织账号正则	2021-04-21 16:54:47 +08:00
caishi	80cd6fbae0	md文件要用Markdown渲染	2021-04-20 15:33:21 +08:00
caishi	8fa31edaae	md文件要用Markdown渲染	2021-04-20 15:31:49 +08:00
caishi	49d3db6746	合并请求-提出申请者头像显示问题	2021-04-20 11:18:44 +08:00
caishi	ffbb5ba34e	合并请求-提出申请者头像显示问题	2021-04-20 11:17:54 +08:00
caishi	bc11ec68e3	注释	2021-04-20 10:57:46 +08:00
caishi	2d2deec224	Merge branch 'develop'	2021-04-20 10:56:50 +08:00
caishi	a67cabbfb4	团队项目-团队项目管理-显示的name和跳转的login	2021-04-20 10:54:20 +08:00
caishi	ceb1915939	切换左侧目录，选择不同的文件时，文件详情没有更新	2021-04-20 10:30:47 +08:00
caishi	4c65e1981e	all-默认头像（首字母加背景颜色）	2021-04-20 09:36:49 +08:00
caishi	09598d0e2c	个人主页头像url	2021-04-19 19:54:57 +08:00
caishi	e09490d424	上线后的getImageURL也不用在前面加/ + 一些小样式修改	2021-04-19 18:19:21 +08:00
caishi	a42a670146	头像url--接口会返回所有带images的字段值，所以前端不用加固定的内容了	2021-04-19 17:52:01 +08:00
caishi	b8d40259e5	readme-文件增加一个目录下拉icon	2021-04-19 16:58:30 +08:00
caishi	487a2f0495	组织团队-新增一个团队标识	2021-04-19 11:53:19 +08:00
caishi	ab34369642	新建团队板块无边框	2021-04-19 10:54:02 +08:00
caishi	f12228aa51	组织详情显示nickname	2021-04-19 10:35:20 +08:00
caishi	5477c41f78	资源库不需要按引用次数排序	2021-04-14 10:31:33 +08:00
caishi	dc05f9ce35	组织-项目-切换协作者管理和团队管理时会重复调用增加成员接口	2021-04-13 17:12:37 +08:00
caishi	b601582d15	资源库数量显示错误	2021-04-13 11:14:04 +08:00
caishi	832b18e7f5	组织-团队列表的头像login为undefined	2021-04-13 11:06:09 +08:00
caishi	8c58f77afb	去掉右侧悬浮手册按钮	2021-04-09 14:18:44 +08:00
caishi	2c363965dd	去掉悬浮手册按钮	2021-04-09 13:58:58 +08:00
caishi	60a7f39c16	forge项目暂时不显示命令行功能	2021-04-09 11:45:04 +08:00
caishi	9811276a7c	ssh-3(前端固定参数已调通)	2021-04-09 10:12:39 +08:00
caishi	a27c74b9aa	ssh-2	2021-04-08 18:14:19 +08:00
caishi	80cae93045	ssh-初步	2021-04-08 17:44:31 +08:00
caishi	78aba67917	项目详情右侧增加实践课程链接的显示	2021-04-08 15:37:01 +08:00
caishi	43223c7787	为2时不支持在线创建、在线上传、在线修改、在线删除、创建合并请求等功能	2021-04-08 14:21:35 +08:00
caishi	961587921a	projectDetail.type:0是托管项目，1是镜像项目，2是同步镜像项目(为2时不能上传新建文件、下载zip等)	2021-04-08 10:07:55 +08:00
caishi	2f595d750a	entries接口传的branch值为undefined	2021-04-07 18:44:20 +08:00
caishi	bcaec7a2db	新增组织账号，组织名称增加新的check条件	2021-04-06 18:40:01 +08:00
caishi	70ea6259ae	仓库设置页面增加资源库配置项	2021-04-06 17:34:37 +08:00
caishi	5d6953f2b3	资源库模块测试版第一次上线	2021-04-06 17:17:01 +08:00
caishi	c8eda704e5	列表的type字段为头像跳转到个人中心或者组织的判断依据	2021-04-06 11:45:03 +08:00
caishi	5d6b95ab8f	资源库部分接口调试	2021-04-06 11:36:38 +08:00
caishi	426ea3fece	合并请求分页	2021-04-02 18:55:26 +08:00
caishi	ab052ebace	第三方登录-修改邮箱和密码	2021-04-02 18:40:59 +08:00
caishi	648c6e235b	第三方账号密码重置	2021-04-02 17:39:13 +08:00
caishi	96253f3f58	列表接口、上传资源	2021-04-02 17:31:15 +08:00
caishi	101478d924	协作者管理删除按钮没显示	2021-04-02 14:08:59 +08:00
caishi	dccbd6735d	构建列表里的提交信息，作者头像错误	2021-04-02 11:57:48 +08:00
caishi	a0ebba839e	tips	2021-04-01 19:03:56 +08:00
caishi	171f14bd2a	noticeurl	2021-04-01 16:25:53 +08:00
caishi	c3e09f2672	第三方登录-educoder	2021-04-01 15:35:45 +08:00
caishi	6296434527	清理appconfig文件资源库所有页面排版、数据未绑	2021-04-01 14:41:13 +08:00
caishi	e2dbda3083	工作流author	2021-03-31 17:12:31 +08:00
caishi	02f382e6fb	登录框中的找回密码、注册的url	2021-03-31 11:15:41 +08:00
caishi	b568aef34e	issue	2021-03-30 15:01:25 +08:00
caishi	2c83221376	按钮	2021-03-30 11:50:25 +08:00
caishi	6a4fe4d277	左侧抽屉	2021-03-30 10:26:02 +08:00