修改websocket问题

change request url
修改指向路径
2021-08-25 11:52:52 +08:00 · 2021-08-20 09:06:57 +08:00 · 2021-08-20 09:01:40 +08:00 · 2021-08-19 21:54:56 +08:00 · 2021-08-19 21:23:48 +08:00 · 2021-08-19 17:44:13 +08:00
190 changed files with 10386 additions and 3913 deletions
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "forge",
-  "version": "0.1.0",
+  "version": "3.0.0",
  "private": true,
  "dependencies": {
    "@monaco-editor/react": "^2.3.0",
@ -14,6 +14,7 @@
    "babel-jest": "20.0.3",
    "babel-loader": "7.1.2",
    "babel-plugin-syntax-dynamic-import": "^6.18.0",
+    "babel-polyfill": "^6.26.0",
    "babel-preset-react-app": "^3.1.1",
    "babel-runtime": "6.26.0",
    "bizcharts": "^3.5.8",
@ -29,7 +30,8 @@
    "dompurify": "^2.0.15",
    "dotenv": "4.0.0",
    "dotenv-expand": "4.2.0",
-    "echarts": "^4.7.0",
+    "echarts": "^4.9.0",
+    "echarts-wordcloud": "^2.0.0",
    "editor.md": "^1.5.0",
    "eslint": "4.10.0",
    "eslint-config-react-app": "^2.1.0",
@ -46,6 +48,7 @@
    "install": "^0.12.2",
    "jest": "20.0.4",
    "js-base64": "^2.5.2",
+    "js2wordcloud": "^1.1.12",
    "katex": "^0.11.1",
    "lodash": "^4.17.15",
    "loglevel": "^1.6.8",
@ -62,7 +65,7 @@
    "postcss-loader": "2.0.8",
    "promise": "8.0.1",
    "prop-types": "^15.6.1",
-    "qrcode.react": "^1.0.0",
+    "qrcode.react": "^1.0.1",
    "qs": "^6.9.3",
    "quill": "^1.3.7",
    "quill-delta-to-html": "^0.11.0",
@ -92,6 +95,7 @@
    "react-resizable": "^1.10.1",
    "react-router": "^4.2.0",
    "react-router-dom": "^4.2.2",
+    "react-slick": "^0.28.1",
    "react-split-pane": "^0.1.91",
    "react-url-query": "^1.5.0",
    "react-zmage": "^0.8.5-beta.31",
@ -102,6 +106,7 @@
    "scroll-into-view": "^1.14.2",
    "showdown": "^1.9.1",
    "showdown-katex": "^0.8.0",
+    "slick-carousel": "^1.8.1",
    "store": "^2.0.12",
    "style-loader": "0.19.0",
    "styled-components": "^4.4.1",
@ -198,6 +203,7 @@
    "node-sass": "^4.12.0",
    "optimize-css-assets-webpack-plugin": "^5.0.3",
    "purgecss": "^2.1.2",
+    "react-json-view": "^1.21.3",
    "reqwest": "^2.0.5",
    "resize-observer-polyfill": "^1.5.1",
    "terser-webpack-plugin": "^2.3.5",
--- a/public/css/editormd.min.css
+++ b/public/css/editormd.min.css
--- a/public/css/edu-all.css
+++ b/public/css/edu-all.css
@ -38,78 +38,6 @@
  box-sizing: border-box;
 }

-.head-nav ul#header-nav li {
-  float: left;
-  height: 60px;
-  line-height: 60px;
-  margin-right: 30px;
-  cursor: pointer;
-  position: relative;
-  font-size: 16px
-}
-
-.head-nav ul#header-nav li a {
-  display: block;
-  height: 100%;
-  width: 100%;
-  color: #fff
-}
-
-.head-nav ul#header-nav li a:hover {
-  color: #cccccc;
-}
-
-.head-nav ul#header-nav li:last-child {
-  margin-right: 0px
-}
-
-.head-nav ul#header-nav li.active a {
-  color: #459be5 !important;
-}
-
-.head-nav ul#header-nav li.active p {
-  color: #459be5 !important;
-}
-
-.head-nav ul#header-nav li p:hover {
-  color: #cccccc;
-}
-
-.head-nav ul#header-nav li p {
-  display: block;
-  height: 100%;
-  width: 100%;
-  color: #fff
-}
-
-.head-nav ul#header-nav li.active div ul li a {
-  color: #000 !important;
-}
-
-.head-nav ul#header-nav li.active div ul li a:hover {
-  color: #FFF !important;
-}
-
-.head-nav ul#header-nav li.active ul li a {
-  color: #000 !important;
-}
-
-.head-nav ul#header-nav li.active ul li a:hover {
-  color: #FFF !important;
-}
-
-.head-nav ul#header-nav li.active:after {
-  content: '';
-  position: absolute;
-  left: 0px;
-  top: auto;
-  bottom: 10px;
-  right: auto;
-  height: 2px;
-  width: 14px;
-  background-color: #459be5;
-}
-
 .nav-img {
  position: absolute;
  top: 2px;
--- a/public/css/edu-purge.css
+++ b/public/css/edu-purge.css
@ -1753,7 +1753,7 @@ a.decoration {
 }

 .mb15 {
-  margin-bottom: 15px;
+  margin-bottom: 15px!important;
 }

 .mb16 {
@ -2424,10 +2424,16 @@ input::-ms-clear {
 .color-grey-c {
  color: #ccc !important;
 }
-
+a.hoverLine:hover{
+  text-decoration: underline;
+}
 .color-grey-cd {
  color: #cdcdcd !important;
 }
+.color-grey-d {
+  color: #ddd;
+}
+

 .color-grey-9 {
  color: #999999 !important;
@ -3409,7 +3415,7 @@ a.user_bluebg_btn {
 }

 .cdefault {
-  cursor: default
+  cursor: default!important;
 }


@ -3584,42 +3590,6 @@ a.user_bluebg_btn {
  margin-right: 5px;
 }

-/*-------------------个人主页：右侧提示区域--------------------------*/
-.-task-sidebar {
-  position: fixed;
-  width: 40px;
-  height: 180px;
-  right: 0;
-  bottom: 80px;
-  z-index: 10;
-}
-
-.-task-sidebar div {
-  height: 40px;
-  line-height: 40px;
-  box-sizing: border-box;
-  width: 40px;
-  background: #4CACFF;
-  color: #fff;
-  font-size: 20px;
-  text-align: center;
-  margin-bottom: 5px;
-  border-radius: 4px;
-}
-
-.-task-sidebar div i {
-  color: #fff;
-}
-
-.-task-sidebar div i:hover {
-  color: #fff !important;
-}
-
-.gotop {
-  background-color: rgba(208, 207, 207, 0.5) !important;
-  padding: 0px !important;
-}
-

 /***** loading ******/
 /*****载入中******/
@ -3944,11 +3914,21 @@ html>body #ajax-indicator {
  max-height: 340px;
 }/*头部导航条样式---2018-03-19--by-cs*/

+.privateTag{
+  display: block;
+  padding:0px 6px;
+  border-radius: 12px;
+  border:1px solid #2FC25B;
+  height: 18px;
+  line-height: 18px;
+  font-size: 12px;
+  margin-left: 10px;
+  color: #2FC25B;
+}
 .head-nav {
  text-align: center;
  height: 70px;
  box-sizing: border-box;
-  min-width: 780px;
  overflow: hidden;
  text-overflow: ellipsis;
  white-space: nowrap;
@ -3970,7 +3950,7 @@ html>body #ajax-indicator {
  cursor: pointer;
  position: relative;
  font-size: 16px;
-  padding:0px 20px;
+  padding-right:40px;
 }

 .head-nav ul#header-nav li a {
@ -6702,4 +6682,19 @@ 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;
+}
+.ant-input, .ant-input .ant-input-suffix{
+  background-color: #fff!important;
+}
+.has-error .ant-input{
+  background-color: #FEF1F0!important;
 }
--- a/public/css/iconfont.css
+++ b/public/css/iconfont.css
--- a/public/css/iconfont.eot
+++ b/public/css/iconfont.eot
--- a/public/css/iconfont.js
+++ b/public/css/iconfont.js
--- a/public/css/iconfont.json
+++ b/public/css/iconfont.json
@ -5,6 +5,629 @@
  "css_prefix_text": "icon-",
  "description": "",
  "glyphs": [
+    {
+      "icon_id": "23572260",
+      "name": "新建",
+      "font_class": "xinjian2",
+      "unicode": "e8b0",
+      "unicode_decimal": 59568
+    },
+    {
+      "icon_id": "23567674",
+      "name": "协议icon",
+      "font_class": "xieyiicon",
+      "unicode": "e870",
+      "unicode_decimal": 59504
+    },
+    {
+      "icon_id": "23567675",
+      "name": "内存icon",
+      "font_class": "neicunicon",
+      "unicode": "e891",
+      "unicode_decimal": 59537
+    },
+    {
+      "icon_id": "23567676",
+      "name": "自述文件_icon",
+      "font_class": "zishuwenjian_icon",
+      "unicode": "e8a6",
+      "unicode_decimal": 59558
+    },
+    {
+      "icon_id": "23492900",
+      "name": "点赞_icon",
+      "font_class": "dianzan_icon",
+      "unicode": "e8ba",
+      "unicode_decimal": 59578
+    },
+    {
+      "icon_id": "23492901",
+      "name": "取消关注",
+      "font_class": "quxiaoguanzhu",
+      "unicode": "e8bb",
+      "unicode_decimal": 59579
+    },
+    {
+      "icon_id": "23473151",
+      "name": "代码库icon",
+      "font_class": "daimakuicon",
+      "unicode": "e8a9",
+      "unicode_decimal": 59561
+    },
+    {
+      "icon_id": "23473104",
+      "name": "主页icon",
+      "font_class": "zhuyeicon",
+      "unicode": "e884",
+      "unicode_decimal": 59524
+    },
+    {
+      "icon_id": "23472253",
+      "name": "标签icon",
+      "font_class": "biaoqianicon",
+      "unicode": "e882",
+      "unicode_decimal": 59522
+    },
+    {
+      "icon_id": "23472254",
+      "name": "编 辑",
+      "font_class": "a-bianji",
+      "unicode": "e883",
+      "unicode_decimal": 59523
+    },
+    {
+      "icon_id": "23472256",
+      "name": "仓库设置icon",
+      "font_class": "cangkushezhiicon",
+      "unicode": "e885",
+      "unicode_decimal": 59525
+    },
+    {
+      "icon_id": "23472257",
+      "name": "复制icon",
+      "font_class": "fuzhiicon",
+      "unicode": "e886",
+      "unicode_decimal": 59526
+    },
+    {
+      "icon_id": "23472258",
+      "name": "链接icon",
+      "font_class": "lianjieicon",
+      "unicode": "e887",
+      "unicode_decimal": 59527
+    },
+    {
+      "icon_id": "23472259",
+      "name": "合并请求icon",
+      "font_class": "hebingqingqiuicon",
+      "unicode": "e888",
+      "unicode_decimal": 59528
+    },
+    {
+      "icon_id": "23472260",
+      "name": "里程碑icon",
+      "font_class": "lichengbeiicon",
+      "unicode": "e889",
+      "unicode_decimal": 59529
+    },
+    {
+      "icon_id": "23472261",
+      "name": "工作流icon",
+      "font_class": "gongzuoliuicon",
+      "unicode": "e88a",
+      "unicode_decimal": 59530
+    },
+    {
+      "icon_id": "23472262",
+      "name": "动态icon",
+      "font_class": "dongtaiicon",
+      "unicode": "e88b",
+      "unicode_decimal": 59531
+    },
+    {
+      "icon_id": "23472263",
+      "name": "默认点赞_icon",
+      "font_class": "morendianzan_icon",
+      "unicode": "e88e",
+      "unicode_decimal": 59534
+    },
+    {
+      "icon_id": "23472265",
+      "name": "目录icon",
+      "font_class": "muluicon",
+      "unicode": "e894",
+      "unicode_decimal": 59540
+    },
+    {
+      "icon_id": "23472267",
+      "name": "设 置",
+      "font_class": "a-shezhi",
+      "unicode": "e899",
+      "unicode_decimal": 59545
+    },
+    {
+      "icon_id": "23472268",
+      "name": "文件",
+      "font_class": "wenjian5",
+      "unicode": "e89a",
+      "unicode_decimal": 59546
+    },
+    {
+      "icon_id": "23472269",
+      "name": "提交icon",
+      "font_class": "tijiaoicon",
+      "unicode": "e89e",
+      "unicode_decimal": 59550
+    },
+    {
+      "icon_id": "23472270",
+      "name": "默认关注_ICON",
+      "font_class": "morenguanzhu_ICON",
+      "unicode": "e89f",
+      "unicode_decimal": 59551
+    },
+    {
+      "icon_id": "23472271",
+      "name": "文件夹",
+      "font_class": "wenjianjia3",
+      "unicode": "e8a2",
+      "unicode_decimal": 59554
+    },
+    {
+      "icon_id": "23472272",
+      "name": "下拉按钮",
+      "font_class": "xialaanniu1",
+      "unicode": "e8a4",
+      "unicode_decimal": 59556
+    },
+    {
+      "icon_id": "23472276",
+      "name": "左滑icon",
+      "font_class": "zuohuaicon",
+      "unicode": "e8b5",
+      "unicode_decimal": 59573
+    },
+    {
+      "icon_id": "23472277",
+      "name": "master_icon",
+      "font_class": "master_icon",
+      "unicode": "e8b6",
+      "unicode_decimal": 59574
+    },
+    {
+      "icon_id": "23472278",
+      "name": "默认复刻_icon",
+      "font_class": "morenfuke_icon",
+      "unicode": "e8b7",
+      "unicode_decimal": 59575
+    },
+    {
+      "icon_id": "23472279",
+      "name": "wiki icon",
+      "font_class": "a-wikiicon",
+      "unicode": "e8b8",
+      "unicode_decimal": 59576
+    },
+    {
+      "icon_id": "23472280",
+      "name": "易修icon",
+      "font_class": "yixiuicon",
+      "unicode": "e8b9",
+      "unicode_decimal": 59577
+    },
+    {
+      "icon_id": "23436350",
+      "name": "缩放",
+      "font_class": "suofang",
+      "unicode": "e87f",
+      "unicode_decimal": 59519
+    },
+    {
+      "icon_id": "23436351",
+      "name": "放大icon",
+      "font_class": "fangdaicon",
+      "unicode": "e881",
+      "unicode_decimal": 59521
+    },
+    {
+      "icon_id": "23384231",
+      "name": "搜索_icon",
+      "font_class": "sousuo_icon1",
+      "unicode": "e873",
+      "unicode_decimal": 59507
+    },
+    {
+      "icon_id": "23384232",
+      "name": "欢迎_icon",
+      "font_class": "huanying_icon",
+      "unicode": "e878",
+      "unicode_decimal": 59512
+    },
+    {
+      "icon_id": "23384233",
+      "name": "文件夹",
+      "font_class": "wenjianjia2",
+      "unicode": "e879",
+      "unicode_decimal": 59513
+    },
+    {
+      "icon_id": "23384234",
+      "name": "删除icon",
+      "font_class": "shanchuicon1",
+      "unicode": "e87a",
+      "unicode_decimal": 59514
+    },
+    {
+      "icon_id": "23261798",
+      "name": "请求icon",
+      "font_class": "qingqiuicon",
+      "unicode": "e871",
+      "unicode_decimal": 59505
+    },
+    {
+      "icon_id": "23261799",
+      "name": "响应icon",
+      "font_class": "xiangyingicon",
+      "unicode": "e87c",
+      "unicode_decimal": 59516
+    },
+    {
+      "icon_id": "23144143",
+      "name": "多选选中",
+      "font_class": "duoxuanxuanzhong",
+      "unicode": "e88f",
+      "unicode_decimal": 59535
+    },
+    {
+      "icon_id": "23144144",
+      "name": "错误icon",
+      "font_class": "cuowuicon",
+      "unicode": "e890",
+      "unicode_decimal": 59536
+    },
+    {
+      "icon_id": "23144146",
+      "name": "成功icon",
+      "font_class": "chenggongicon",
+      "unicode": "e892",
+      "unicode_decimal": 59538
+    },
+    {
+      "icon_id": "23144147",
+      "name": "未选中响应icon",
+      "font_class": "weixuanzhongxiangyingicon",
+      "unicode": "e893",
+      "unicode_decimal": 59539
+    },
+    {
+      "icon_id": "23144149",
+      "name": "必填icon",
+      "font_class": "bitianicon",
+      "unicode": "e895",
+      "unicode_decimal": 59541
+    },
+    {
+      "icon_id": "23144151",
+      "name": "未选中项目标签icon",
+      "font_class": "weixuanzhongxiangmubiaoqianicon",
+      "unicode": "e897",
+      "unicode_decimal": 59543
+    },
+    {
+      "icon_id": "23144152",
+      "name": "列表icon",
+      "font_class": "liebiaoicon",
+      "unicode": "e898",
+      "unicode_decimal": 59544
+    },
+    {
+      "icon_id": "23144155",
+      "name": "未选中请求icon",
+      "font_class": "weixuanzhongqingqiuicon",
+      "unicode": "e89b",
+      "unicode_decimal": 59547
+    },
+    {
+      "icon_id": "23144158",
+      "name": "协作者管理icon",
+      "font_class": "xiezuozheguanliicon",
+      "unicode": "e8a1",
+      "unicode_decimal": 59553
+    },
+    {
+      "icon_id": "23144160",
+      "name": "选中分支icon",
+      "font_class": "xuanzhongfenzhiicon",
+      "unicode": "e8a3",
+      "unicode_decimal": 59555
+    },
+    {
+      "icon_id": "23144162",
+      "name": "选中基本设置icon",
+      "font_class": "xuanzhongjibenshezhiicon",
+      "unicode": "e8a5",
+      "unicode_decimal": 59557
+    },
+    {
+      "icon_id": "23144165",
+      "name": "选中项目标签icon",
+      "font_class": "xuanzhongxiangmubiaoqianicon",
+      "unicode": "e8aa",
+      "unicode_decimal": 59562
+    },
+    {
+      "icon_id": "23144167",
+      "name": "选中webhook icon",
+      "font_class": "a-xuanzhongwebhookicon",
+      "unicode": "e8af",
+      "unicode_decimal": 59567
+    },
+    {
+      "icon_id": "23046290",
+      "name": "shanchu_tc_icon",
+      "font_class": "shanchu_tc_icon",
+      "unicode": "e88c",
+      "unicode_decimal": 59532
+    },
+    {
+      "icon_id": "23046293",
+      "name": "wiki_icon",
+      "font_class": "wiki_icon",
+      "unicode": "e88d",
+      "unicode_decimal": 59533
+    },
+    {
+      "icon_id": "23046244",
+      "name": "导入模版_icon",
+      "font_class": "daorumoban_icon",
+      "unicode": "e86f",
+      "unicode_decimal": 59503
+    },
+    {
+      "icon_id": "23046252",
+      "name": "错误",
+      "font_class": "cuowu",
+      "unicode": "e872",
+      "unicode_decimal": 59506
+    },
+    {
+      "icon_id": "23046255",
+      "name": "更多_icon",
+      "font_class": "gengduo_icon",
+      "unicode": "e874",
+      "unicode_decimal": 59508
+    },
+    {
+      "icon_id": "23046258",
+      "name": "复层关闭_icon",
+      "font_class": "fucengguanbi_icon",
+      "unicode": "e875",
+      "unicode_decimal": 59509
+    },
+    {
+      "icon_id": "23046262",
+      "name": "复制_icon",
+      "font_class": "fuzhi_icon",
+      "unicode": "e876",
+      "unicode_decimal": 59510
+    },
+    {
+      "icon_id": "23046268",
+      "name": "删除icon",
+      "font_class": "shanchuicon",
+      "unicode": "e877",
+      "unicode_decimal": 59511
+    },
+    {
+      "icon_id": "23046273",
+      "name": "搜索_删除icon",
+      "font_class": "sousuo_shanchuicon",
+      "unicode": "e87b",
+      "unicode_decimal": 59515
+    },
+    {
+      "icon_id": "23046275",
+      "name": "搜索_icon",
+      "font_class": "sousuo_icon",
+      "unicode": "e87d",
+      "unicode_decimal": 59517
+    },
+    {
+      "icon_id": "23046276",
+      "name": "文档预览_icon",
+      "font_class": "wendangyulan_icon",
+      "unicode": "e87e",
+      "unicode_decimal": 59518
+    },
+    {
+      "icon_id": "23046278",
+      "name": "下拉按钮",
+      "font_class": "xialaanniu",
+      "unicode": "e880",
+      "unicode_decimal": 59520
+    },
+    {
+      "icon_id": "22906287",
+      "name": "二次确认_icon",
+      "font_class": "erciqueren_icon",
+      "unicode": "e867",
+      "unicode_decimal": 59495
+    },
+    {
+      "icon_id": "22906288",
+      "name": "选中ssh_icon",
+      "font_class": "xuanzhongssh_icon",
+      "unicode": "e868",
+      "unicode_decimal": 59496
+    },
+    {
+      "icon_id": "22906289",
+      "name": "未选中安全设置_icon",
+      "font_class": "weixuanzhonganquanshezhi_icon",
+      "unicode": "e869",
+      "unicode_decimal": 59497
+    },
+    {
+      "icon_id": "22906290",
+      "name": "未选中ssh_icon",
+      "font_class": "weixuanzhongssh_icon",
+      "unicode": "e86a",
+      "unicode_decimal": 59498
+    },
+    {
+      "icon_id": "22906291",
+      "name": "选中安全设置_icon",
+      "font_class": "xuanzhonganquanshezhi_icon",
+      "unicode": "e86b",
+      "unicode_decimal": 59499
+    },
+    {
+      "icon_id": "22906292",
+      "name": "删除_icon",
+      "font_class": "shanchu_icon",
+      "unicode": "e86c",
+      "unicode_decimal": 59500
+    },
+    {
+      "icon_id": "22906293",
+      "name": "列表ssh_icon",
+      "font_class": "liebiaossh_icon",
+      "unicode": "e86e",
+      "unicode_decimal": 59502
+    },
+    {
+      "icon_id": "17575494",
+      "name": "file-submodule",
+      "font_class": "file-submodule",
+      "unicode": "e866",
+      "unicode_decimal": 59494
+    },
+    {
+      "icon_id": "7539612",
+      "name": "nv",
+      "font_class": "nv1",
+      "unicode": "e864",
+      "unicode_decimal": 59492
+    },
+    {
+      "icon_id": "7539613",
+      "name": "nan",
+      "font_class": "nan1",
+      "unicode": "e865",
+      "unicode_decimal": 59493
+    },
+    {
+      "icon_id": "21936935",
+      "name": "邮箱",
+      "font_class": "youxiang",
+      "unicode": "e8b2",
+      "unicode_decimal": 59570
+    },
+    {
+      "icon_id": "21936924",
+      "name": "单位",
+      "font_class": "danwei",
+      "unicode": "e8a7",
+      "unicode_decimal": 59559
+    },
+    {
+      "icon_id": "21936925",
+      "name": "待办事项",
+      "font_class": "daibanshixiang",
+      "unicode": "e8a8",
+      "unicode_decimal": 59560
+    },
+    {
+      "icon_id": "21936928",
+      "name": "概览",
+      "font_class": "gailan",
+      "unicode": "e8ab",
+      "unicode_decimal": 59563
+    },
+    {
+      "icon_id": "21936929",
+      "name": "男",
+      "font_class": "nan",
+      "unicode": "e8ac",
+      "unicode_decimal": 59564
+    },
+    {
+      "icon_id": "21936930",
+      "name": "女",
+      "font_class": "nv",
+      "unicode": "e8ad",
+      "unicode_decimal": 59565
+    },
+    {
+      "icon_id": "21936931",
+      "name": "工作流",
+      "font_class": "gongzuoliu1",
+      "unicode": "e8ae",
+      "unicode_decimal": 59566
+    },
+    {
+      "icon_id": "21936934",
+      "name": "数据统计",
+      "font_class": "shujutongji",
+      "unicode": "e8b1",
+      "unicode_decimal": 59569
+    },
+    {
+      "icon_id": "21936936",
+      "name": "项目",
+      "font_class": "xiangmu",
+      "unicode": "e8b3",
+      "unicode_decimal": 59571
+    },
+    {
+      "icon_id": "21936937",
+      "name": "组织",
+      "font_class": "zuzhi",
+      "unicode": "e8b4",
+      "unicode_decimal": 59572
+    },
+    {
+      "icon_id": "14835599",
+      "name": "右箭头",
+      "font_class": "arrowRight",
+      "unicode": "e863",
+      "unicode_decimal": 59491
+    },
+    {
+      "icon_id": "21151489",
+      "name": "箭头镂空-左",
+      "font_class": "jiantouloukong-zuo",
+      "unicode": "e861",
+      "unicode_decimal": 59489
+    },
+    {
+      "icon_id": "21151557",
+      "name": "箭头镂空-右",
+      "font_class": "jiantouloukong-you",
+      "unicode": "e862",
+      "unicode_decimal": 59490
+    },
+    {
+      "icon_id": "21568989",
+      "name": "分享",
+      "font_class": "fenxiang1",
+      "unicode": "e89c",
+      "unicode_decimal": 59548
+    },
+    {
+      "icon_id": "21568990",
+      "name": "回到顶部",
+      "font_class": "huidaodingbu1",
+      "unicode": "e89d",
+      "unicode_decimal": 59549
+    },
+    {
+      "icon_id": "21568993",
+      "name": "帮助",
+      "font_class": "bangzhu",
+      "unicode": "e8a0",
+      "unicode_decimal": 59552
+    },
    {
      "icon_id": "991344",
      "name": "提交",
@ -4236,7 +4859,7 @@
    {
      "icon_id": "1004630",
      "name": "点赞2",
-      "font_class": "dianzan1",
+      "font_class": "dianzaned",
      "unicode": "e639",
      "unicode_decimal": 58937
    },
--- a/public/css/iconfont.svg
+++ b/public/css/iconfont.svg
--- a/public/css/iconfont.ttf
+++ b/public/css/iconfont.ttf
--- a/public/css/iconfont.woff
+++ b/public/css/iconfont.woff
--- a/public/css/iconfont.woff2
+++ b/public/css/iconfont.woff2
--- a/public/favicon.ico
+++ b/public/favicon.ico
--- a/public/index.html
+++ b/public/index.html
@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="zh-CN" class="notranslate translated-ltr" translate="no">
 <head>
  <meta charset="utf-8">
  <meta name=”Keywords” Content=”trustie,trustieforge,forge,确实让创建更美好,协同开发平台″>
--- a/src/App.css
+++ b/src/App.css
@ -60,12 +60,13 @@ body {
 .ant-progress-textno {
  color: #f5222d;
 }
-
+.CodeMirror pre.CodeMirror-line{
+  font-size: 16px!important;
+}
 /* md多空格 */
 .markdown-body p {
  margin:10px 0px!important;
  font-size: 16px !important;
-  line-height: 2 !important;
  white-space: pre-wrap;
 }

@ -87,6 +88,10 @@ body {
  border-left: 1px solid rgb(221, 221, 221);
  /* 某些情况下，被cm盖住了 */
  z-index: 99;
+  padding:8px 8px 50px;
+}
+.editormd-preview .markdown-body{
+  padding:0px !important;
 }

 /* 图片点击放大的场景，隐藏图片链接 */
--- a/src/App.js
+++ b/src/App.js
@ -17,8 +17,7 @@ import marked from './common/marked';
 import moment from 'moment'

 import { MuiThemeProvider, createMuiTheme } from 'material-ui/styles';
-
-import history from './history';
+import SiderBar from './forge/Component/SiderBar'

 import { SnackbarHOC } from 'educoder'
 import { initAxiosInterceptors } from './AppConfig'
@ -40,6 +39,11 @@ const Projects = Loadable({
 	loader: () => import('./forge/Index'),
 	loading: Loading,
 })
+//forge安全设置
+const Security = Loadable({
+	loader: () => import('./forge/SecuritySetting/Index'),
+	loading: Loading,
+})
 //forge项目-devOps详情
 const OpsDetail = Loadable({
 	loader: () => import('./forge/DevOps/opsDetail'),
@ -74,7 +78,19 @@ const EducoderLogin = Loadable({
 	loader: () => import('./modules/login/EducoderLogin'),
 	loading: Loading,
 })
+const Search = Loadable({
+	loader: () => import('./modules/search/'),
+	loading: Loading,
+})
+const WikiPreview = Loadable({
+	loader: () => import('./forge/Wiki/Preview'),
+	loading: Loading,
+})

+const ProjectIndex = Loadable({
+	loader: () => import("./forge/Index"),
+	loading: Loading,
+});
 class App extends Component {
 	constructor(props) {
 		super(props);
@ -100,36 +116,9 @@ class App extends Component {
 			Addcoursestypes: false
 		})
 	};
-	ModalCancelsy = () => {
-		this.setState({
-			mydisplay: false,
-		})
-		window.location.href = "/";
-	};
-	ModalshowCancelsy = () => {
-		this.setState({
-			mydisplay: true,
-		})
-	};

-	disableVideoContextMenu = () => {
-		window.$("body").on("mousedown", "video", function (event) {
-			if (event.which === 3) {
-				window.$('video').bind('contextmenu', function () { return false; });
-			} else {
-				window.$('video').unbind('contextmenu');
-			}
-		});
-	}
 	componentDidMount() {
 		document.title = "loading...";
-		this.disableVideoContextMenu();
-		history.listen(() => {
-			this.forceUpdate()
-			const $ = window.$
-			$("html").animate({ scrollTop: $('html').scrollTop() - 0 })
-		});
-
 		initAxiosInterceptors(this.props);
 		this.getAppdata();

@ -207,13 +196,23 @@ class App extends Component {
 	};

 	render() {
+		const { mygetHelmetapi } = this.state;
+		let personal = mygetHelmetapi && mygetHelmetapi.personal;
 		return (
 			<Provider store={store}>
 				<ConfigProvider locale={zhCN}>
 					<MuiThemeProvider theme={theme}>
 						<LoginDialog {...this.props} {...this.state} Modifyloginvalue={() => this.Modifyloginvalue()}></LoginDialog>
+						<SiderBar />
 						<Router>
 							<Switch>
+								{/* wiki预览 */}
+								<Route path="/projects/:owner/:projectsId/wiki/preview/:projectName/:projectId" render={
+									(props) => {
+										return (<WikiPreview {...this.props} {...props} {...this.state} />)
+									}
+								} />
+
 								{/*项目*/}
 								<Route
 									path={"/projects/:owner/:projectId/devops/:opsId/detail"}
@ -223,6 +222,14 @@ class App extends Component {
 										}
 									}>
 								</Route>
+								<Route
+									path={"/settings"}
+									render={
+										(props) => {
+											return (<Security {...this.props} {...props} {...this.state} />)
+										}
+									}>
+								</Route>
 								{/*项目*/}
 								<Route
 									path={"/projects"}
@ -253,17 +260,25 @@ class App extends Component {
 								</Route>
 								{/*404*/}
 								<Route path="/nopage" component={Shixunnopage} />
+
+								{/* 查询 */}
+								<Route path="/search" component={Search} />
+
+
 								{/* 个人主页 */}
 								<Route path="/users/:username"
 									render={
 										(props) => {
 											return (<InfosIndex {...this.props} {...this.state} />)
 										}
-								}></Route>
+									}></Route>
 								<Route exact path="/"
 									render={
 										(props) => (
-											<Projects {...this.props} {...props} {...this.state}></Projects>
+											personal && personal.length > 0 ?
+												<InfosIndex {...this.props} {...props} />
+												:
+												<ProjectIndex {...this.props} {...props} />
 										)
 									}
 								/>
--- a/src/AppConfig.js
+++ b/src/AppConfig.js
@ -58,7 +58,7 @@ export function initAxiosInterceptors(props) {
    },
    err => {
      return Promise.reject(err);
-    });
+  });

  axios.interceptors.response.use(function (response) {
    if (response === undefined) {
--- a/src/Loading.js
+++ b/src/Loading.js
@ -9,20 +9,7 @@ class Loading extends Component {
 	}

 	render() {
-		return (
-			<div className="App" style={{ minHeight: '800px', width: "100%" }}>
-				<style>
-					{
-						`
-						 .margintop{
-						   margin-top:20%;
-						 }
-						`
-					}
-				</style>
-				<Spin size="large" className={"margintop"} />
-			</div>
-		);
+		return ""
 	}
 }

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

 // 处理整点 半点
 // 取传入时间往后的第一个半点
@ -97,3 +98,40 @@ export function formatDuring(mss){
 	}
  return days + "天" + hours + "小时" + minutes + "分";
 }
+
+/*
+  返回：多久以前
+  backDate：以前的某个日期
+*/
+export function timeAgo(backDate) {
+  try {
+    moment(backDate);
+  } catch (e) {
+    return;
+  }
+  if(typeof backDate ==='number'){
+    backDate=backDate*1000
+  }else{
+    backDate= moment(backDate);
+  }
+  let time = new Date() - backDate;
+  var days = Math.floor(time / (1000 * 60 * 60 * 24));
+  var hours = Math.floor((time % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60));
+  var minutes = Math.floor((time % (1000 * 60 * 60)) / (1000 * 60));
+  var seconds = Math.floor((time % (1000 * 60 * 60)) / 1000);
+  if (time <= 0) {
+    return "刚刚";
+  }
+  if (days) {
+    return days + "天前";
+  }
+  if (hours) {
+    return hours + "小时前";
+  }
+  if (minutes) {
+    return minutes + "分前";
+  }
+  if (seconds) {
+    return seconds + "秒前";
+  }
+}
--- a/src/common/educoder.js
+++ b/src/common/educoder.js
@ -27,7 +27,7 @@ export {
 	markdownToHTML, uploadNameSizeSeperator, appendFileSizeToUploadFile, appendFileSizeToUploadFileAll, isImageExtension,
 	downloadFile, sortDirections, validateLength, mdJSONParse, exportMdtoHtml
 } from './TextUtil'
-export { handleDateString, getNextHalfHourOfMoment, formatDuring, formatSeconds } from './DateUtil'
+export { handleDateString, getNextHalfHourOfMoment, formatDuring, formatSeconds ,timeAgo} from './DateUtil'

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

--- a/src/components/render-html.jsx
+++ b/src/components/render-html.jsx
@ -46,18 +46,18 @@ export default ({
        let id = decodeURIComponent(u.split("#")[1]);
        let ele = document.getElementById(id);
        if(ele){
-          window.scrollTo(0, ele.offsetTop + 220);
+          window.scrollTo(0, ele.offsetTop + 120);
        }
      }
    }
-  },[url])
+  },[url,html])

  const el = useRef();
  function onAncherHandler(e) {
-    let target = e.target
+    let target = e.target;
    if (target.tagName.toUpperCase() === 'A') {
-      let ancher = target.getAttribute('href')
-      if (ancher.startsWith('#')) {
+      let ancher = target.getAttribute('href');
+      if (ancher && ancher.startsWith('#')) {
        e.preventDefault()
        let viewEl = document.getElementById(ancher.replace('#', ''))
        if (viewEl) {
--- 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/Activity.js
+++ b/src/forge/Activity/Activity.js
@ -1,7 +1,7 @@
 import React , { Component } from 'react';
 import { Dropdown , Menu , Icon , Pagination , Spin } from 'antd';
 import '../css/index.scss';
-import '../Branch/branch.css';
+import '../Branch/branch.scss';
 import './activity.css';
 import NoneData from '../Nodata';

--- a/src/forge/Branch/CloneAddress.js
+++ b/src/forge/Branch/CloneAddress.js
@ -1,39 +1,35 @@
-import React, { Component } from 'react';
-import { Dropdown, Icon, Tooltip } from 'antd';
-import "./branch.css";
+import React, { useState } from 'react';
+import { Dropdown, Menu, Tooltip } from 'antd';
+import "./branch.scss";

-class CloneAddress extends Component {
+function CloneAddress({http_url , ssh_url , zip_url , tar_url}) {
+  const [ key , setKey ] = useState("HTTP");
  // 点击按钮复制功能
-  jsCopy = () => {
+  function jsCopy(){
    var e = document.getElementById("copy_rep_content");
    e.select();
    document.execCommand("Copy");
  }

-  render() {
-    const { http_url, downloadUrl } = this.props;
-    return (
-      <div className="gitAddressClone">
-        {/* <p className="addressTips"><span>版本库地址已变更，请基于新地址提交代码</span></p> */}
-        {
-          http_url && <span>HTTP</span>
-        }
-        <input type="text" id="copy_rep_content" value={http_url} />
-        <Tooltip title="复制链接">
-          <span className="color-blue" onClick={() => this.jsCopy()}><i className="iconfont icon-fuzhi"></i></span>
-        </Tooltip>
-        {
-          downloadUrl &&
-          <span>
-            <Dropdown overlay={downloadUrl} trigger={['click']} placement="bottomRight">
-              <a className="ant-dropdown-link">
-                <Icon type="cloud-download" className="font-18 fl color-blue" />
-              </a>
-            </Dropdown>
-          </span>
-        }
+  return (
+    <div className="downMenu">
+      <div style={{padding:"10px 20px 20px 20px",borderBottom:"1px solid #eee"}}>
+        <Menu className="urlMenu" selectedKeys={[key]} mode={"horizontal"}>
+          <Menu.Item key="HTTP" onClick={(e)=>{setKey(e.key)}}>HTTP</Menu.Item>
+          <Menu.Item key="SSH" onClick={(e)=>{setKey(e.key)}}>SSH</Menu.Item>
+        </Menu>
+        <div className="gitAddressClone">
+          <input type="text" id="copy_rep_content" value={key==="HTTP" ? http_url:ssh_url} />
+          <Tooltip title="复制链接">
+            <span className="color-blue" onClick={jsCopy}><i className="iconfont icon-fuzhi"></i></span>
+          </Tooltip>
+        </div>
      </div>
-    )
-  }
+      <Menu className="edu-txt-center">
+        <Menu.Item><a href={zip_url}>下载 ZIP</a></Menu.Item>
+        <Menu.Item><a href={tar_url}>下载 TAR.GZ</a></Menu.Item>
+      </Menu>
+    </div>
+  )
 }
 export default CloneAddress;
--- a/src/forge/Branch/Select.jsx
+++ b/src/forge/Branch/Select.jsx
@ -1,6 +1,6 @@
 import React , { useState , useEffect } from 'react';
 import { Popover , Input , Spin } from 'antd';
-import './branch.css';
+import './branch.scss';
 import { getBranch , getTag } from '../GetData/getData';


--- a/src/forge/Branch/branch.scss
+++ b/src/forge/Branch/branch.scss
@ -81,4 +81,25 @@
 .listTips{
  padding:20px 0px;
  text-align: center;
+}
+
+.urlMenu{
+  line-height: 30px;
+  margin-bottom: 10px;
+  border-bottom: none;
+  li.ant-menu-item{
+    height: 30px;
+    line-height: 30px;
+    padding:0px 5px;
+    margin-right: 20px!important;
+    &.ant-menu-item-selected,&.ant-menu-item-active{
+      color: #333;
+    }
+    &.ant-menu-item-selected{
+      border-color:#1890ff!important;
+    }
+    &.ant-menu-item-active{
+      border-color:transparent ;
+    }
+  }
 }
--- a/src/forge/Component/AddMember.jsx
+++ b/src/forge/Component/AddMember.jsx
@ -4,7 +4,7 @@ import axios from 'axios';
 import { getImageUrl } from 'educoder';

 const { Option } = AutoComplete;
-function AddMember({getID,login}){
+function AddMember({getID,login,showNotification}){
  const [ id , setID ] = useState(undefined);
  const [ source , setSource ] = useState(undefined);
  const [ searchKey , setSearchKey ] = useState(undefined);
@ -45,7 +45,7 @@ function AddMember({getID,login}){
            src={getImageUrl(`/${item && item.image_url}`)}
            alt=""
          />
-          <span className="ml10" style={{ "vertical-align": "middle" }}>
+          <span className="ml10" style={{ verticalAlign: "middle" }}>
            {item.username}
            <span className="color-grey ml10">({item.login})</span>
          </span>
@ -66,7 +66,12 @@ function AddMember({getID,login}){
  };

  function addCollaborator(){
-    getID && getID(id);
+    if(source && source.length>0){
+      getID && getID(id);
+      setSearchKey(undefined);
+    }else{
+      showNotification("请选择存在的用户!");
+    }
  }

  return(
--- a/src/forge/Component/Cards.jsx
+++ b/src/forge/Component/Cards.jsx
@ -3,7 +3,7 @@ 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(`/${img}`)} alt=""/></div>}
@ -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
@ -192,4 +192,172 @@ li.ant-menu-item{
      border-right: none;
    }
  }
-}
+}
+
+/*-------------------个人主页：右侧提示区域--------------------------*/
+.-task-sidebar {
+  position: fixed;
+  width: 40px;
+  right: 0;
+  bottom: 80px;
+  z-index: 10;
+}
+
+@media screen and (max-width: 1920px){
+  .-task-sidebar{
+    right:220px;
+  }
+}
+@media screen and (max-width: 1750px){
+  .-task-sidebar{
+    right:160px;
+  }
+}
+@media screen and (max-width: 1650px){
+  .-task-sidebar{
+    right:115px;
+  }
+}
+@media screen and (max-width: 1550px){
+  .-task-sidebar{
+    right:90px;
+  }
+}
+@media screen and (max-width: 1450px){
+  .-task-sidebar{
+    right:45px;
+  }
+}
+@media screen and (max-width: 1200px){
+  .-task-sidebar{
+    right:0px;
+    display: none;
+  }
+}
+.-task-sidebar>div {
+  height: 40px;
+  line-height: 40px;
+  box-sizing: border-box;
+  width: 40px;
+  color: #999;
+  font-size: 20px;
+  text-align: center;
+  margin-bottom: 20px;
+  border-radius: 50%;
+  background: #FFFFFF;
+  box-shadow: 0px 0px 10px 1px #F1F1F1;
+}
+
+.-task-sidebar>div i {
+  color: #999;
+}
+
+.-task-sidebar>div:hover i {
+  color: #fff !important;
+}
+.-task-sidebar>div:hover{
+  background: #1890FF;
+  box-shadow: 0px 0px 10px 2px #B6D0FC;
+}
+.helpBox{
+  width: 260px;
+  z-index: 103;
+  &.shareContent{
+    width: 200px;
+  }
+  .ant-popover-inner-content{
+    padding:0px;
+  }
+  p.titlecontent{
+    font-size: 18px;
+    color: #333;
+    line-height: 20px;
+    padding:15px 20px;
+  }
+  .faqUl{
+    padding:0px 20px 10px;
+    max-height: 230px;
+    overflow-y: auto;
+    li{
+      background: #F5F5F5;
+      border-radius: 20px;
+      padding:0px 20px;
+      color: #333;
+      height: 34px;
+      line-height: 34px;
+      margin-bottom: 10px;
+      a{
+        display: block;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+      }
+      &:hover{
+        background-color: #D1E9FF;
+        a{
+          color: #333!important;
+        }
+      }
+    }
+  }
+  .shareUl{
+    padding:10px 0px;
+    display: flex;
+    align-items: center;
+    .titlecontent{
+      margin-right: 20px;
+    }
+    li > i{
+      font-size: 32px!important;
+    }
+  }
+}
+
+
+
+.-task-desc {
+  background: #494949;
+  width: 90px;
+  line-height: 36px;
+  text-align: center;
+  position: absolute;
+  color: #fff;
+  font-size: 13px;
+  z-index: 999999;
+  opacity: 0;
+}
+
+.-task-desc div {
+  position: absolute;
+  top: 10px;
+  right: -7px;
+  height: 13px;
+}
+
+.-task-desc div img {
+  float: left
+}
+
+.-task-sidebar .scan_ewm {
+  position: absolute !important;
+  right: 45px !important;
+  bottom: 0px !important;
+  background-color: #494949 !important;
+  -webkit-box-sizing: border-box !important;
+  box-sizing: border-box !important;
+  font-size: 14px !important;
+  line-height: 16px !important;
+  display: none;
+  height: 213px !important;
+}
+
+.trangle_right {
+  position: absolute;
+  right: -5px;
+  bottom: 15px;
+  width: 0;
+  height: 0px;
+  border-top: 6px solid transparent;
+  border-left: 5px solid #494949;
+  border-bottom: 6px solid transparent
+}
--- a/src/forge/Component/DeleteModal/Index.jsx
+++ b/src/forge/Component/DeleteModal/Index.jsx
@ -0,0 +1,35 @@
+import React from 'react';
+import { AlignCenter } from '../layout';
+import { Modal , Button } from 'antd';
+import './Index.scss';
+
+function DeleteBox({ 
+  visible , 
+  onCancel ,
+  onSuccess ,
+  title ,
+  subTitle,
+  content
+}) {
+  return(
+    <Modal
+      visible={visible}
+      onCancel={onCancel}
+      title={title}
+      width="600px"
+      className="deleteBox"
+      footer={
+        <div>
+          <Button size={'large'} onClick={onCancel}>取消</Button>
+          <Button type={"danger"} size={"large"} onClick={onSuccess}>确认删除</Button>
+        </div>
+      }
+    >
+      <div className="desc">
+        <AlignCenter className="descMain"><i className="iconfont icon-shanchu_tc_icon mr10"></i>{content}</AlignCenter>
+        <p>{subTitle}</p>
+      </div>
+    </Modal>
+  )
+}
+export default DeleteBox;
--- a/src/forge/Component/DeleteModal/Index.scss
+++ b/src/forge/Component/DeleteModal/Index.scss
@ -0,0 +1,45 @@
+.deleteBox{
+  .ant-modal-header{
+    background-color: #f8f8f8;
+    border-bottom: none;
+    .ant-modal-title{
+      text-align: left;
+      font-size: 20px;
+    }
+  }
+  .ant-modal-body{
+    padding:30px 50px;
+    p{
+      font-size: 16px;
+      line-height: 26px;
+      color:#666;
+      word-break: break-all;
+    }
+    .desc{
+      .descMain{
+        align-items: center;
+        justify-content: center;
+        font-size: 20px;
+        margin-bottom: 10px;
+        i{
+          font-size: 38px!important;
+          color:#DF0002
+        }
+      }
+    }
+  }
+  .ant-modal-footer{
+    border-top: none;
+    text-align: center;
+    padding-bottom: 40px;
+    button{
+      width: 120px;
+      margin:0px 20px;
+      &.ant-btn-danger{
+        background-color: #fff;
+        color: #DF0002;
+        border-color: #D0D0D0;
+      }
+    }
+  }
+}
--- a/src/forge/Component/DrawerPanel.jsx
+++ b/src/forge/Component/DrawerPanel.jsx
@ -4,6 +4,12 @@ import './Component.scss';
 import axios from 'axios';
 const { TreeNode , DirectoryTree } = Tree;

+function turnbar(str){
+  if(str && str.length>0 && str.indexOf("/")>-1){
+    return str.replaceAll('/','%2F');
+  }
+  return str;
+}
 function DrawerPanel({visible,onClose,branch,owner,projectsId,history, name , list}){
  const [ treeData , setTreeData ] = useState(undefined);
  const [ isSpin , setIsSpin ] = useState(true);
@ -71,7 +77,8 @@ function DrawerPanel({visible,onClose,branch,owner,projectsId,history, name , li
    let dataref = event.node.props.dataRef;
    if(dataref.type==="file"){
      onClose();
-      history.push(`/projects/${owner}/${projectsId}/tree/${branch}/${dataref.path}`);
+      let value = turnbar(branch);
+      history.push(`/projects/${owner}/${projectsId}/tree/${value}/${dataref.path}`);
    }
  }

--- a/src/forge/Component/EAccount.scss
+++ b/src/forge/Component/EAccount.scss
@ -1,9 +1,6 @@
 .ant-modal-mask{
-  z-index: 10000;
+  z-index: 1001;
 }
 .ant-modal-wrap{
-  z-index: 10001;
-  .ant-form-explain{
-    position: absolute;
-  }
+  z-index: 1002;
 }
--- a/src/forge/Component/HeadSearch.jsx
+++ b/src/forge/Component/HeadSearch.jsx
@ -0,0 +1,41 @@
+import React, { useState } from "react";
+import { Input ,notification} from "antd";
+
+const { Search } = Input;
+export default ({history}) => {
+  const [openSearch, setOpenSearch] = useState(false);
+
+  function onGlobalSearch(value) {
+    history.push('/search?value=' + value);
+    // window.location.href = `search?value=` + value;
+    // history.push({
+    //   pathname:'/search',
+    //   state:value
+    // })
+  }
+  return (
+    <React.Fragment>
+      {
+        openSearch ?
+          <div
+            onBlur={() => {
+              setTimeout(() => {
+                setOpenSearch(false)
+              }, 500)
+            }}
+          >
+            <Search placeholder="请输入搜索关键字"
+              className={`search-input mr20`}
+              onSearch={onGlobalSearch}
+              autoFocus={true}
+              style={{width:'260px'}}
+            />
+          </div>
+          :
+          <i className="iconfont icon-sousuo font-18 color-grey-6 ml30" onClick={() => {
+            setOpenSearch(true)
+          }} />
+      }
+    </React.Fragment>
+  )
+};
--- a/src/forge/Component/Monaco.jsx
+++ b/src/forge/Component/Monaco.jsx
@ -0,0 +1,62 @@
+import React, {useEffect, useRef, useState} from 'react';
+import * as monaco from 'monaco-editor/esm/vs/editor/editor.api.js';
+import './Component.scss';
+
+function Monaco(props) {
+  const {
+    style = { // dom节点样式
+      height: '400px',
+    },
+    value = '', // 代码文本
+    onChange = () => { // 改变的事件
+    },
+    fontSize = 14, // 代码字体大小
+    monacoOptions = {
+      scrollBeyondLastLine: false,
+      lineNumbers: "off",
+      wordWrap: true,
+      overviewRulerBorder: true,
+      lineHeight: 24,
+      readOnly:true
+    }, // monaco 自定义属性
+    language = 'html', // 语言 支持 js ts sql css json html等
+  } = props;
+  const editOrRef = useRef();
+  const ThisEditor = useRef();
+  useEffect(() => {
+    ThisEditor.current = monaco.editor.create(editOrRef.current, {
+      value: value || '',
+      language,
+      theme: "vs-grey",
+      fontSize: fontSize + 'px',
+      minimap: { // 关闭代码缩略图
+        enabled: false,
+      },
+      ...monacoOptions,
+    });
+ 
+    ThisEditor.current.onDidChangeModelContent((e) => {
+      let newValue = ThisEditor.current.getValue();
+      onChange(newValue);
+    });
+    return () => {
+      ThisEditor.current.dispose();
+      ThisEditor.current = undefined; // 清除编辑器对象
+    }
+  }, []);
+  useEffect(() => {
+    if (ThisEditor.current) {
+      ThisEditor.current.updateOptions({
+        fontSize: fontSize + 'px',
+      })
+    }
+  }, [fontSize]);
+ 
+  return (
+    <div style={style} ref={editOrRef}>
+ 
+    </div>
+  );
+}
+ 
+export default Monaco;
--- a/src/forge/Component/Releases.jsx
+++ b/src/forge/Component/Releases.jsx
@ -2,7 +2,7 @@ import React from 'react';
 import { AlignCenter , AlignTop , FlexAJ  } from '../Component/layout';
 import { Link } from 'react-router-dom';

-function Releases({owner,projectsId,releaseVersions}){
+function Releases({owner,projectsId,releaseVersions , baseOperate , projectType}){
  
  return(
    <div>
@ -10,10 +10,10 @@ function Releases({owner,projectsId,releaseVersions}){
        <AlignCenter><span className="font-16 color-grey-6">发行版</span>
          { releaseVersions && releaseVersions.total_count > 0 && <span className="infoCount">{releaseVersions.total_count}</span>}
        </AlignCenter>
-        { releaseVersions && releaseVersions.total_count > 0 ? 
+        { (releaseVersions && releaseVersions.total_count > 0) || projectType ===2 ? 
          <Link className="font-12 color-grey-9" to={`/projects/${owner}/${projectsId}/releases`}>全部</Link>
          : 
-          <Link className="font-12 color-blue" to={`/projects/${owner}/${projectsId}/releases/new`}>新建</Link>
+          baseOperate && <Link className="font-12 color-blue" to={`/projects/${owner}/${projectsId}/releases/new`}>新建</Link>
        }
      </FlexAJ>
      {
@ -24,7 +24,7 @@ function Releases({owner,projectsId,releaseVersions}){
              <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>
+                  <Link to={`/projects/${owner}/${projectsId}/releases`}>{item.name}</Link>
                  <span className="font-12 laterest ml5">最新</span>
                </p>
                <p className="color-grey-9 font-13">{item.created_at}</p>
--- a/src/forge/Component/SearchUser.jsx
+++ b/src/forge/Component/SearchUser.jsx
@ -1,45 +1,49 @@
-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"
@ -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/SiderBar.js
+++ b/src/forge/Component/SiderBar.js
@ -0,0 +1,91 @@
+import React, { useEffect, useState } from 'react';
+import { Popover , Tooltip } from 'antd';
+import './Component.scss';
+import axios from 'axios';
+import ShareModal from './SiderBarShareModal';
+
+const $ = window.$;
+
+$(window).scroll(function () {
+  if ($(".gotop").length > 0) {
+    if ($(document).scrollTop() > 0) {
+      $(".-task-sidebar .gotop").show();
+      $(".gotop").click(function () {
+        $("html,body").scrollTop(0);
+      });
+    }
+    if ($(document).scrollTop() === 0) {
+      $(".-task-sidebar .gotop").hide();
+    }
+  }
+});
+
+function SiderBar() {
+  const [ data , setData ] = useState([]);
+  const [ visible , setVisible ] = useState(false);
+
+  useEffect(()=>{
+    getFAQ();
+  },[])
+
+  function getFAQ(){
+    const url = `/faqs.json`;
+    axios.get(url).then(result=>{
+      if(result && result.data){
+        setData(result.data);
+      }
+    }).catch(error=>{})
+  }
+  function content(list){
+    return <div>
+      <p className="titlecontent">帮助</p>
+      <ul className="faqUl">
+        {
+          list && list.map((i,k)=>{
+            return(
+              <li key={i.question+k}><a href={`${i.url}`} title={i.question} target="_blank">{i.question}</a></li>
+            )
+          })
+        }
+      </ul>
+    </div>
+  }
+
+  function shareContent(){
+    return <div>
+      <ul className="shareUl">
+        <p className="titlecontent">分享到</p>
+        <li onClick={()=>setVisible(true)}><i className="iconfont icon-weixin2" style={{color:"#62b900"}}></i></li>
+      </ul>
+    </div>
+  }
+  return (
+    <div className={"-task-sidebar"} >
+      <ShareModal visible={visible} urlValue={window.location.href} onCancel={()=>setVisible(false)}/>
+      {
+        data && data.length > 0 && (data[0] && data[0].question) ? 
+        <Popover content={content(data)} overlayClassName="helpBox" placement={"left"}>
+          <div className="feedback">
+            <i className="iconfont icon-bangzhu font-22"></i>
+          </div>
+        </Popover>
+        :""
+      }
+      {/* <div className="scan pr" title="微信扫一扫">
+        <span className="inline erweima"><i className="iconfont icon-erweima color-white font-22 fl"></i></span>
+      </div>*/}
+      <Popover content={shareContent()} overlayClassName="helpBox shareContent" placement={"left"}>
+        <div className="consult">
+          <i className="iconfont icon-fenxiang1"></i>
+        </div> 
+      </Popover>
+      <div className="gotop">
+        <Tooltip title="返回顶部" placement={"right"}>
+          <a><i className="iconfont icon-huidaodingbu1"></i></a>
+        </Tooltip>
+      </div>
+    </div>
+  )
+}
+
+export default SiderBar;
--- a/src/forge/Component/SiderBarShareModal.jsx
+++ b/src/forge/Component/SiderBarShareModal.jsx
@ -0,0 +1,27 @@
+import React from 'react';
+import { Modal } from 'antd';
+import QRCode  from 'qrcode.react';
+
+function SiderBarShareModal({visible,urlValue,onCancel}) {
+  return(
+    <Modal
+      title={"分享到微信"}
+      visible={visible}
+      width="500px"
+      closable={true}
+      footer={false}
+      onCancel={onCancel}
+    >
+      <div style={{textAlign:"center"}}>
+        {urlValue &&<QRCode
+          value={urlValue}
+          size={200}
+          fgColor="#000000"
+          style={{margin:"20px"}}
+        />}
+        <p>打开微信“扫一扫”,点击右上角菜单，即可将网页分享至朋友圈</p>
+      </div>
+    </Modal>
+  )
+}
+export default SiderBarShareModal;
--- a/src/forge/Component/layout.jsx
+++ b/src/forge/Component/layout.jsx
@ -28,6 +28,11 @@ export const AlignTop = styled.div`{
  display:flex;
  align-items: flex-start;
 }`
+export const AlignAJBottom = styled.div`{
+  display:flex;
+  justify-content: space-between;
+  align-items: flex-end;
+}`
 // 左右结构
 export const Box = styled.div`{
  display:flex;
--- a/src/forge/DevOps/Dispose/List.jsx
+++ b/src/forge/DevOps/Dispose/List.jsx
@ -10,6 +10,12 @@ import { Link } from 'react-router-dom';
 //   killed:"已撤销",
 //   pending:"准备中"
 // }
+function turnbar(str){
+  if(str && str.length>0 && str.indexOf("/")>-1){
+    return str.replaceAll('/','%2F');
+  }
+  return str;
+}
 function renderTableStatus(status) {
  switch (status) {
    case "running":
@ -65,8 +71,9 @@ function List({ list, operate , projectsId , owner , showModal , deleteFunc }){
      width:"15%",
      ellipsis:true,
      render:(value,item)=>{
+        let v = turnbar(item.branch);
        return(
-          <Link to={`/projects/${owner}/${projectsId}/tree/${item.branch}/${value}`} className="color-blue">{value}</Link>
+          <Link to={`/projects/${owner}/${projectsId}/tree/${v}/${value}`} className="color-blue">{value}</Link>
        )
      }
    },
--- a/src/forge/DevOps/Dispose/PipelineName.jsx
+++ b/src/forge/DevOps/Dispose/PipelineName.jsx
@ -42,7 +42,7 @@ function PipelineName({visible,onCancel,onOk,value ,branchList}){
      </div>
      <div className="choosenList mt20">
        <span>触发条件:</span>
-        <Select value={branchValue} style={{width:"150px"}} onChange={(e)=>setBranchValue(e)}>
+        <Select value={branchValue} style={{width:"150px"}} dropdownClassName="chooseCon" onChange={(e)=>setBranchValue(e)}>
          {
            branchList && branchList.length>0 && branchList.map((item,key)=>{
              return(
@ -51,7 +51,7 @@ function PipelineName({visible,onCancel,onOk,value ,branchList}){
            })
          }
        </Select>
-        <Select mode="multiple" allowClear value={eventValue} style={{width:"180px",marginLeft:"10px"}} onChange={(e)=>{console.log(e);setEventValue(e)}}>
+        <Select mode="multiple" allowClear value={eventValue} dropdownClassName="chooseCon" style={{width:"180px",marginLeft:"10px"}} onChange={(e)=>{console.log(e);setEventValue(e)}}>
          {
            EVENT.map((item,key)=>{
              return(
--- a/src/forge/DevOps/Structure.jsx
+++ b/src/forge/DevOps/Structure.jsx
@ -2,7 +2,7 @@ import React, { useState, useEffect , useImperativeHandle ,forwardRef } from "re
 import { FlexAJ, AlignCenter , Banner } from "../Component/layout";
 import { Table, Pagination, Popconfirm } from "antd";
 import { truncateCommitId } from "../common/util";
-import {getUrl} from 'educoder';
+import { getImageUrl } from 'educoder';
 import axios from "axios";
 import { Link } from 'react-router-dom';

@ -245,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"}} alt="" src={`${item.image_url && getUrl(`/images/${item.image_url}`)}`} />
+              <img style={{borderRadius:"50%",marginRight:"10px",width:"25px",height:"25px"}} alt="" src={`${item.image_url && getImageUrl(`/${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
@ -391,6 +391,9 @@
    }
  }
 }
+.chooseCon.ant-select-dropdown{
+  z-index: 100001;
+}

 .choosenList{
  display: flex;
--- a/src/forge/Divert/DivertModal.jsx
+++ b/src/forge/Divert/DivertModal.jsx
@ -0,0 +1,175 @@
+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="仓库标识:" style={{marginBottom:"0px"}}>
+            {getFieldDecorator("identifier",
+              {
+                rules:[
+                  {required:true,message:"请输入仓库标识！"},
+                  {
+                    validator:checkIdentifier
+                  }
+                ]
+              }
+            )(
+              <Input placeholder="请输入仓库标识" autoComplete={"off"}/>
+            )}
+          </Form.Item>
+          <span className="color-grey-9" style={{marginLeft:"120px"}}>请输入当前项目的标识：<span className="ml5 mr5 color-grey-3">{repo}</span>进行确认！</span>
+        </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/Head/AddProjectModal.jsx
+++ b/src/forge/Head/AddProjectModal.jsx
@ -0,0 +1,84 @@
+import React, { useState , forwardRef, useEffect } from 'react';
+import { Form , Modal , Input , Radio } from 'antd';
+import Axios from 'axios';
+
+export default Form.create()(
+  forwardRef((props)=>{
+    const { getFieldDecorator, validateFields , setFieldsValue } = props && props.form;
+    const [ visible , setVisible ] = useState(false);
+
+    useEffect(()=>{
+      if(!visible){
+        setFieldsValue({
+          code:undefined,
+          role:"developer"
+        })
+      }
+    },[visible])
+
+    function onOk() {
+      validateFields((error,values)=>{
+        if(!error){
+          const url = `/applied_projects.json`;
+          Axios.post(url,{
+            applied_project:{
+              ...values
+            }
+          }).then(result=>{
+            if(result && result.data){
+              setVisible(false);
+              props.showNotification("申请加入项目成功，等待审核!");
+            }
+          }).catch(error=>{})
+        }
+      })
+    }
+    function checkValue(rule, value, callback){
+      if(!value){
+        callback();
+      }
+      if(value.length < 6 || value.length > 6){
+        callback("请输入6位数的邀请码");
+      }
+      callback();
+    }       
+
+    return(
+      <React.Fragment>
+        <Modal
+          title="加入项目"
+          width="480px"
+          visible={visible}
+          centered={true}
+          onOk={onOk}
+          onCancel={()=>setVisible(false)}
+        >
+          <Form layout={'inline'} className="inviteForm">
+            <Form.Item label="项目邀请码">
+              {getFieldDecorator("code",{
+                rules:[
+                  {required:true,message:"请输入6位项目邀请码"},
+                  {validator:checkValue}
+                ]
+              })(
+                <Input placeholder="请输入6位项目邀请码" autoComplete={"off"} maxLength="6" style={{width:"300px"}}/>
+              )}
+            </Form.Item>
+            <Form.Item label="选择角色">
+              {getFieldDecorator("role",{
+                rules:[{required:true,message:"请选择角色"}]
+              })(
+                <Radio.Group defaultValue={"developer"}>
+                  <Radio value="manager">管理员</Radio>
+                  <Radio value="developer">开发者</Radio>
+                  <Radio value="reporter">报告者</Radio>
+                </Radio.Group>
+              )}
+            </Form.Item>
+          </Form>
+        </Modal>
+        <a onClick={()=>setVisible(true)}>加入项目</a>
+      </React.Fragment>
+    )
+  })
+)
--- a/src/forge/Head/Footer.jsx
+++ b/src/forge/Head/Footer.jsx
@ -19,7 +19,7 @@ function Footer(){

  return(
    <div>
-      <div style={{height:"483px"}}></div>
+      <div style={{height:"497px"}}></div>
      <div className="newFooter edu-txt-center">
        {value && showhtml(value)}
        {/* <div className="footerInfos">
--- a/src/forge/Head/Header.js
+++ b/src/forge/Head/Header.js
@ -2,16 +2,15 @@ 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 { Input , notification , Dropdown , Menu } from 'antd';
+import { Link } from 'react-router-dom';

 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 HeadSearch from '../Component/HeadSearch';
+
+import AddProjectModal from './AddProjectModal';
 import '../../modules/tpm/TPMIndex.css';
-import logo from '../../modules/tpm/images/logo.png';
+
 import './header.scss';
 const $ = window.$
 // TODO 这部分脚本从公共脚本中直接调用
@ -35,11 +34,9 @@ class NewHeader extends Component {
      Checkboxteachertype: false,
      Checkboxteachingtype: false,
      code_notice: false,
-      checked_notice: false,
      RadioGroupvalue: undefined,
      submitapplications: false,
      isRender: false,
-      showSearchOpentype: false,
      showTrial: false,
      setevaluatinghides: false,
      occupation: 0,
@ -47,13 +44,11 @@ class NewHeader extends Component {
      headtypesonClickbool: false,
      headtypess: "/",
      settings: null,
-      goshowqqgtounp: false,
      visiblemyss: false,
      openSearch:false,
    }
  }
  componentDidMount() {
-    // this.getAppdata();
    this.geturlsdata();
    window._header_componentHandler = this;

@ -84,36 +79,6 @@ class NewHeader extends Component {
    } catch (e) {}
  }

-  SearchInput = (open,item)=>{
-    if(open){
-      return(
-        <div
-          onBlur={() => {
-            setTimeout(() => {
-              this.setState({
-                openSearch:false
-              })
-            }, 300)
-          }}
-        >
-          <Search placeholder="实践课程/教学课堂/实践项目/交流问答"
-            className={`search-input mr20`}
-            onSearch={(value)=>this.onGlobalSearch(value,item)}
-            autoFocus={true}
-          />
-        </div>
-      )
-    }else{
-      return <i className="iconfont icon-sousuo font-18 color-grey-6 ml30" onClick={() => {
-        this.setState({openSearch:true})
-      }} />
-    }
-  }
-
-  onGlobalSearch=(value,item)=>{
-    window.location.href=`${item}?value=` + value;
-  }
-
  openNotification = (messge) => {
    notification.open({
      message: "提示",
@ -122,8 +87,6 @@ class NewHeader extends Component {
    });
  };

-
-
  componentWillReceiveProps(newProps, oldProps) {
    this.setState({
      user: newProps.user
@ -132,158 +95,7 @@ class NewHeader extends Component {
      old_url = newProps.Headertop.old_url
    }
  }
-  getCookie = (key) => {
-    var arr, reg = RegExp('(^| )' + key + '=([^;]+)(;|$)');
-    if (arr === document.cookie.match(reg))
-      return decodeURIComponent(arr[2]);
-    else
-      return null;
-  }

-  delCookie = (name) => {
-    var exp = new Date();
-    exp.setTime(exp.getTime() - 1);
-    var cval = this.getCookie(name);
-    if (cval != null) {
-      document.cookie = name + "=" + cval + ";expires=" + exp.toGMTString();
-    }
-  }
-  onLogout = () => {
-    const url = `/accounts/logout.json`
-    this.delCookie("autologin_trustie")
-    axios.get(url, {
-    }).then((response) => {
-      if (response.data.status === 1) {
-        this.setState({
-          user: undefined
-        })
-        window.location.href = "/login"
-        message.success('退出成功');
-      }
-    });
-  }
-
-  tojoinclass = () => {
-    let { user } = this.state;
-    if (user === undefined) {
-      this.setState({
-        isRender: true
-      })
-      return
-    }
-    if (user && user.login === "") {
-      this.setState({
-        isRender: true
-      })
-      return;
-    }
-    if (user && user.profile_completed === false) {
-      this.setState({
-        AccountProfiletype: true
-      })
-      return;
-    }
-    this.setState({
-      Addcoursestypes: true,
-    })
-  }
-
-  tojoinitem = () => {
-    if (this.props.user && this.props.user.email === undefined || this.props.user && this.props.user.email === null || this.props.user && this.props.user.email === "") {
-      this.openNotification("请先绑定邮箱，谢谢");
-      return
-    }
-    let { user } = this.state;
-    if (user === undefined) {
-      this.setState({
-        isRender: true
-      })
-      return
-    }
-    if (user && user.login === "") {
-      this.setState({
-        isRender: true
-      })
-      return;
-    }
-
-    if (user && user.profile_completed === false) {
-      this.setState({
-        AccountProfiletype: true
-      })
-      return;
-    }
-
-    this.setState({
-      tojoinitemtype: true
-    })
-  }
-
-
-  submitstatevalue = (sum, value, data) => {
-    this.setState({
-      Addcoursestypes: false,
-      tojoinitemtype: false,
-      tojoinclasstitle: undefined,
-      rolearr: ["", ""],
-      Checkboxteacherchecked: false,
-      Checkboxstudentchecked: false,
-      Checkboxteachingchecked: false,
-      Checkboxteachertype: false,
-      Checkboxteachingtype: false,
-      code_notice: false,
-      checked_notice: false,
-      submitapplicationssum: sum,
-      submitapplications: true,
-      submitapplicationsvalue: value,
-      submitapplicationsvaluedata: data,
-      RadioGroupvalue: undefined
-    })
-  }
-
-  onChangeRadioGroup = (e) => {
-    this.setState({
-      RadioGroupvalue: e.target.value,
-    });
-  }
-
-  submitsubmitapplications = () => {
-    let {
-      submitapplicationssum,
-      submitapplicationsvaluedata
-    } = this.state;
-    this.setState({
-      submitapplications: false,
-      RadioGroupvalue: undefined
-    })
-    if (submitapplicationssum === 0) {
-      if (submitapplicationsvaluedata !== undefined) {
-        window.location.href = "/courses/" + submitapplicationsvaluedata;
-      }
-    } else if (submitapplicationssum === 1) {
-      if (submitapplicationsvaluedata !== undefined) {
-        window.location.href = "/projects/" + submitapplicationsvaluedata;
-      }
-    }
-  }
-
-  hidesubmitapplications = () => {
-    this.setState({
-      Addcoursestypes: false,
-      tojoinitemtype: false,
-      tojoinclasstitle: undefined,
-      rolearr: ["", ""],
-      Checkboxteacherchecked: false,
-      Checkboxstudentchecked: false,
-      Checkboxteachingchecked: false,
-      Checkboxteachertype: false,
-      Checkboxteachingtype: false,
-      code_notice: false,
-      checked_notice: false,
-      submitapplications: false,
-      RadioGroupvalue: undefined
-    })
-  }
  educoderlogin = () => {
    //登录账号
    this.setState({
@ -321,30 +133,11 @@ class NewHeader extends Component {
    })
  };

-
-  hidetojoinclass = () => {
-    this.setState({
-      tojoinclasstype: false,
-      tojoinitemtype: false,
-      tojoinclasstitle: undefined,
-      rolearr: ["", ""],
-      Checkboxteacherchecked: false,
-      Checkboxstudentchecked: false,
-      Checkboxteachingchecked: false,
-      Checkboxteachertype: false,
-      Checkboxteachingtype: false,
-      code_notice: false,
-      checked_notice: false,
-      RadioGroupvalue: undefined
-    })
-  }
-
  // 关闭
  cancelModulationModels = () => {
    this.setState({ isRenders: false })
  }

-
  setevaluatinghides = () => {
    this.setState({
      setevaluatinghides: true
@ -404,39 +197,13 @@ class NewHeader extends Component {
    })
  }

-  getAppdata = () => {
-    try {
-      var chromesettingArray = JSON.parse(localStorage.getItem('chromesetting'));
-      var chromesettingresponseArray = JSON.parse(localStorage.getItem('chromesettingresponse'));
-      this.setState({
-        settings: chromesettingArray
-      });
-      if (chromesettingArray.tab_logo_url) {
-        this.gettablogourldata(chromesettingresponseArray);
-      } else {
-        this.gettablogourlnull();
-      }
-    } catch (e) {
-      this.geturlsdata();
-    }
-  };
-
  geturlsdata = () => {
    let url = "/setting.json";
    axios.get(url).then((response) => {
      if (response && response.data) {
        this.setState({ settings: response.data.setting });
-        // localStorage.setItem('chromesetting', JSON.stringify(response.data.setting));
-        // localStorage.setItem('chromesettingresponse', JSON.stringify(response));
-        try {
-          if (response.data.setting.tab_logo_url) {
-            this.gettablogourldata(response);
-          } else {
-            this.gettablogourlnull();
-          }
-        } catch (e) {
-          this.gettablogourlnull();
-        }
+        localStorage.setItem('chromesetting', JSON.stringify(response.data.setting));
+        localStorage.setItem('chromesettingresponse', JSON.stringify(response));
      } else {
        this.gettablogourlnull();
      }
@ -456,14 +223,6 @@ class NewHeader extends Component {
    }
  }

-
-  // 处理弹框
-  setgoshowqqgtounp = (bool) => {
-    this.setState({
-      goshowqqgtounp: bool
-    })
-  }
-
  addMenu=(list)=>{
    return(
      list && list.length >0 && 
@ -472,34 +231,45 @@ class NewHeader extends Component {
          {
            list.map((item,key)=>{
              return(
-                (item.name !=="加入课堂" && item.name !=="加入开发项目") && <Menu.Item><a href={item.url}>{item.name}</a></Menu.Item>
+                (item.name !=="加入课堂" && item.name !=="加入开发项目") && <Menu.Item key={item.name+key}><a href={item.url}>{item.name}</a></Menu.Item>
              )
            })
          }
+          <Menu.Item><AddProjectModal showNotification={this.props.showNotification}/></Menu.Item>
        </Menu>
      </div>
    )
  }
+  renderMenu=(personal)=>{
+    const { current_user } = this.props;
+    return(
+      <Menu className="currentMenu">
+        <Menu.Item>
+          <span title={current_user && current_user.username}>{current_user && current_user.username}</span>
+        </Menu.Item>
+          {
+            personal && personal.length > 0 && personal.map((item,key)=>{
+              return(
+                <li key={key}><a href={item.url} target="_blank">{item.name}</a></li>
+              )
+            })
+          }
+          <li><Link to={`/settings/SSH`}>设置</Link></li>
+        <Menu.Item><a onClick={() => this.educoderloginysl()}>退出</a></Menu.Item>
+      </Menu>
+    )
+  }

  render() {
    const { match} = this.props;
    let current_user = this.props.user;
-    let { Addcoursestypes,
-      tojoinitemtype,
-      tojoinclasstitle,
-      code_notice,
-      checked_notice,
+    let {
      AccountProfiletype,
-      submitapplications,
-      submitapplicationsvalue,
      user,
      isRender,
-      showSearchOpentype,
      headtypesonClickbool,
      headtypess,
      settings,
-      goshowqqgtounp,
-      openSearch,
    } = this.state;
    /*用户名称  用户头像url*/
    let activeIndex = false;
@ -557,7 +327,7 @@ class NewHeader extends Component {
      let shixun = "/shixuns";
      let paths = "/paths";
      let courses = "/courses";
-      this.props.mygetHelmetapi.navbar.map((item, key) => {
+      this.props.mygetHelmetapi && this.props.mygetHelmetapi.navbar && this.props.mygetHelmetapi.navbar.map((item, key) => {
        var reg = RegExp(item.link);
        if (shixun.match(reg)) {
          if (item.hidden === true) {
@ -577,7 +347,7 @@ class NewHeader extends Component {
      })
    }

-    let search_url = settings && settings.common && settings.common.search;
+    // let search_url = settings && settings.common && settings.common.search;
    let notice_url = settings && settings.common && settings.common.notice;
    return (
      <div className="newHeaders" id="nHeader">
@ -595,19 +365,14 @@ class NewHeader extends Component {
              {...this.props}
              {...this.state}
            /> : ""}
-          {
-            goshowqqgtounp === true ?
-            <GotoQQgroup {...this.state} {...this.props} setgoshowqqgtounp={(bool) => this.setgoshowqqgtounp(bool)}></GotoQQgroup>
-            :""
-          }
-          <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>
+              <a href={settings && settings.new_course.default_url} className={"fl mr50"} style={{minWidth:"45px"}}>
+                <img alt="可控开源社区" className="logoimg" style={{ heigth: "40px" }} src={getImageUrl(`/${settings.nav_logo_url}`)}></img>
+              </a>
              :
-              <img alt="可控开源社区" className="logoimg" style={{ heigth: "40px" }} src={logo}></img>
+              ""
            }
-          </a>
          <div className="head-nav pr" id={"head-navpre1"}>
            {
              settings && settings.navbar && settings.navbar.length > 0 ?
@ -646,7 +411,8 @@ class NewHeader extends Component {
            }
          </div>
          <div className="head-right">
-            {search_url ? this.SearchInput(openSearch,search_url):""}
+            {/* {search_url ? this.SearchInput(openSearch,search_url):""} */}
+            <HeadSearch {...this.props}/>
            {
              current_user && (current_user.main_site || current_user.login) && (settings && settings.add && settings.add.length>0)?
              <Dropdown overlay={this.addMenu(settings && settings.add)} placement="bottomRight">
@ -665,32 +431,6 @@ class NewHeader extends Component {
                }
              </div>:""
            }
-            <Modal
-              keyboard={false}
-              title="提示"
-              visible={submitapplications}
-              closable={false}
-              footer={null}
-            >
-              <div className="task_popup_con ml30">
-                <div className="mr15">
-                  <ul>
-                    <div className="task-popup-content">
-                      <p className="task-popup-text-center font-16">
-                        {submitapplicationsvalue}
-                      </p>
-                    </div>
-                    <li className="clearfix mt10 edu-txt-center">
-                      <a className="task-btn mr10"
-                        onClick={this.hidesubmitapplications}>取消</a>
-                      <a
-                        className="task-btn task-btn-orange ml20"
-                        onClick={this.submitsubmitapplications}>确定</a>
-                    </li>
-                  </ul>
-                </div>
-              </div>
-            </Modal>
          </div>
          {!user || (user && !user.login)  ?
            <span className="font-15 ml30">
@ -701,25 +441,11 @@ class NewHeader extends Component {
              }
            </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(`/${user.image_url}`)} width="34">
-                </img>
+            <Dropdown placement={`bottomRight`} overlay={this.renderMenu(settings && settings.personal)}>
+              <a href={`/users/${this.props.current_user  && this.props.current_user.login}`}>
+                <img alt="头像" src={getImageUrl(`/${user.image_url}`)} className="currentImg"></img>
              </a>
-              <ul className="edu-menu-list" style={{ top: '60px', textAlign: 'center' }}>
-                <li className="bor-bottom-greyE" style={{cursor:"default",background:"#fff"}}>{this.props.current_user.username}</li>
-                {
-                  settings && settings.personal && settings.personal.length > 0 && settings.personal.map((item,key)=>{
-                    return(
-                      <li key={key}><a href={item.url} target="_blank">{item.name}</a></li>
-                    )
-                  })
-                }
-                <li className="bor-top-greyE">
-                  <a onClick={() => this.educoderloginysl()}>退出</a>
-                </li>
-              </ul>
-            </div>
+            </Dropdown>
          }
        </div>
      </div>
--- a/src/forge/Head/header.scss
+++ b/src/forge/Head/header.scss
@ -1,11 +1,62 @@

 .dropdownFlex{
  display:flex;
-  padding:5px;
  background:#fff;
  border-radius: 3px;
  .ant-menu-vertical > .ant-menu-item{
-    border:none
+    border:none;
+    height: 35px;
+    line-height: 35px;
+    margin:0px;
+    &.ant-menu-item-selected{
+      background-color: #fff;
+      a{color: rgba(0, 0, 0, 0.65)!important;}
+    }
+    &.ant-menu-item-active{
+      a{color: #4cacff!important;}
+    }
+  }
+  .ant-menu-vertical{
+    border:none;
+  }
+}
+.currentImg{
+  width: 34px;
+  height: 34px;
+  border-radius: 50%;
+  margin-left: 30px;
+}
+.currentMenu{
+  width: 120px;
+  text-align: center;
+  padding:0px;
+  li{
+    height: 40px;
+    line-height: 40px;
+    padding:0px!important;
+    cursor: default;
+    &:hover{
+      background-color: #fff;
+    }
+    &:first-child{
+      border-bottom: 1px solid #eee;
+    }
+    &:last-child{
+      border-top: 1px solid #eee;
+      a{
+        border-radius: 0px 0px 4px 4px;
+      }
+    }
+    a{
+      padding:0px;
+      margin:0px;
+      display: block;
+      color: #666;
+      &:hover{
+        color: #fff;
+        background: #4CACFF;
+      }
+    }
  }
 }

@ -59,4 +110,13 @@
      }
    }
  }
+}
+.inviteForm{
+  .ant-form-item{
+    margin-right: 0px;
+  }
+  .ant-form-item-label{
+    width: 110px;
+    text-align: right;
+  }
 }
--- a/src/forge/Index.js
+++ b/src/forge/Index.js
@ -26,11 +26,15 @@ const ProjectDetail = Loadable({
  loading: Loading,
 });

-const Infos = Loadable({
-  loader: () => import("./users/Infos"),
-  loading: Loading,
-});
 class Index extends Component {
+
+  componentDidUpdate=()=>{
+    this.props.history.listen(()=>{
+      if (document.body.scrollTop || document.documentElement.scrollTop > 0) {
+        window.scrollTo(0, 0)
+      }
+    })
+  }
  render() {
    return (
      <div className="newMain clearfix">
@ -66,12 +70,8 @@ class Index extends Component {
            )}
          ></Route>
          <Route
-            exact
            path="/"
            render={(props) => (
-              this.props.current_user && this.props.current_user.login ?
-              <Infos {...this.props} {...props} />
-              :
              <ProjectIndex {...this.props} {...props} />
            )}
          ></Route>
--- a/src/forge/Main/CoderDepot.jsx
+++ b/src/forge/Main/CoderDepot.jsx
@ -19,12 +19,27 @@ import LanguagePower from '../Component/LanguagePower';
 import DrawerPanel from '../Component/DrawerPanel';
 import UpdateDescModal from './sub/UpdateDescModal';
 import Nodata from '../Nodata';
-
+import Invite from './sub/Invite';
 /**
 * projectDetail.type:0是托管项目，1是镜像项目，2是同步镜像项目(为2时不支持在线创建、在线上传、在线修改、在线删除、创建合并请求等功能)
 */
+
+function turnbar(str){
+  if(str && str.length>0 && str.indexOf("/")>-1){
+    return str.replaceAll('/','%2F');
+  }
+  return str;
+}
+function returnbar(str){
+  if(str && str.length>0 && str.indexOf("%2F")>-1){
+    return str.replaceAll('%2F','/');
+  }
+  return str;
+}
+
 function CoderDepot(props){
  const [ projectDetail , setProjectDetail ]= useState(undefined);
+  const [ inviteCode , setInviteCode ] = useState(undefined);
  const [ treeValue , setTreeValue ] = useState(undefined);
  const [ treeValuePath , setTreeValuePath ] = useState(undefined);
  const [ lastCommit,setLastCommit ] = useState(undefined);
@ -45,19 +60,45 @@ function CoderDepot(props){
  const [ desc , setDesc ] = useState(undefined);
  const [ website , setWebsite ] = useState(undefined);
  const [ lesson_url , setLessonUrl ] = useState(undefined);
+  const [ readme , setReadme ] = useState(undefined);
+  const [ defaultBranch , setDefaultBranch ] = useState(undefined);
+  const [ editReadme , setEditReadme ] = useState(false);
+  const [ pullsFlag , setPullsFlag ] = useState(true);
+  const [ issuesFlag , setIssuesFlag ] = useState(true);

  const owner = props.match.params.owner;
  const projectsId = props.match.params.projectsId;
-  const branchName = props.match.params.branchName;
+  let branchName = props.match.params.branchName;
+  branchName = returnbar(branchName);
+  const details = props.projectDetail;
  let pathname = props.history.location.pathname;
+  
+  const { bannerList } = props;
+
  useEffect(()=>{
-    if(props.projectDetail){
-      setProjectDetail(props.projectDetail);
-      setDesc(props.projectDetail.description);
-      setWebsite(props.projectDetail.website);
-      setLessonUrl(props.projectDetail.lesson_url);
+    if(bannerList && bannerList.length>0){
+      let a = bannerList.filter(i=>i.menu_name === "pulls");
+      let i = bannerList.filter(i=>i.menu_name === "issues");
+      if(a && a.length === 0){
+        setPullsFlag(false);
+      }
+      if(i && i.length === 0){
+        setIssuesFlag(false);
+      }
    }
-  },[props])
+  },[bannerList])
+
+
+  useEffect(()=>{
+    if(details){
+      setProjectDetail(details);
+      setDesc(details.description);
+      setWebsite(details.website);
+      setLessonUrl(details.lesson_url);
+      setDefaultBranch(details.default_branch);
+      setInviteCode(details.invite_code);
+    }
+  },[details])

  useEffect(()=>{
    if(treeValue){
@ -67,23 +108,28 @@ function CoderDepot(props){
    }
  },[treeValue])

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

  // 获取主目录列表
  function getDirInfo(branch){
    setIsSpin(true);
    const url = `/${owner}/${projectsId}/entries.json`;
+
    axios.get(url, { 
      params: { ref: branch } 
    }).then((result) => {
@ -97,6 +143,10 @@ function CoderDepot(props){
        setLastCommit(c && c.commit);
        setLastCommitAuthor(c && c.committer);
        setMainFlag(true);
+        setReadOnly(true);
+        setReadme(result.data.readme);
+        setEditReadme(false);
+        setHide(true);
      }
      setTimeout(function(){setIsSpin(false);},500);
    }).catch(error=>{setIsSpin(false);})
@ -108,7 +158,7 @@ function CoderDepot(props){
      let ele = document.getElementById("ptxt");
      if(ele){
        let h = ele.offsetHeight;
-        if( h > 18 ) setHideBtn(true)
+        if( h > 18 ) setHideBtn(true);
      }
    }
  },[projectDetail,lastCommit])
@ -138,6 +188,8 @@ function CoderDepot(props){
        setLastCommit(c && c.commit);
        setLastCommitAuthor(c && c.committer);
        setMainFlag(false);
+        setReadOnly(!editReadme);
+        setHide(true);
      }
      setTimeout(function(){setIsSpin(false);},500)
    }).catch(error=>{setIsSpin(false);})
@ -145,17 +197,22 @@ function CoderDepot(props){

  // 切换分支或者标签
  function changeBranch(value){
-    let url = `/projects/${owner}/${projectsId}${value && `/tree/${value}`}${treeValue ? `/${treeValue}`:""}`;
+    let checkvalue = turnbar(value);
+    let url = `/projects/${owner}/${projectsId}${value && `/tree/${checkvalue}`}${treeValue ? `/${treeValue}`:""}`;
    props.history.push(url);
  }
    
  // 文件相关的下拉项
-  const fileMenu =(
+  function fileMenu(){
+    let b = branchName || defaultBranch;
+    let checkvalue = turnbar(b);
+    return (
    <Menu>
-      <Menu.Item><a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/${branchName || (projectDetail && projectDetail.default_branch)}/uploadfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>上传文件</a></Menu.Item>
-      <Menu.Item><a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/${branchName || (projectDetail && projectDetail.default_branch)}/newfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>新建文件</a></Menu.Item>
+      <Menu.Item><a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/${checkvalue}/uploadfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>上传文件</a></Menu.Item>
+      <Menu.Item><a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/${checkvalue}/newfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>新建文件</a></Menu.Item>
    </Menu>
-  )
+    )
+  }

  function getPathUrl(array,index){
    if(array && array.length>0 && index){
@ -169,27 +226,36 @@ function CoderDepot(props){
  // 页面地址返回到主目录
  function returnMain(){
    setTreeValue(undefined);
-    let branch = branchName || (projectDetail && projectDetail.default_branch);
-    props.history.push(`/projects/${owner}/${projectsId}/tree/${branch}`);
+    let branch = branchName || defaultBranch;
+    let checkvalue = turnbar(branch);
+    props.history.push(`/projects/${owner}/${projectsId}/tree/${checkvalue}`);
  };
  // 子目录路径返回链接
  function returnUlr(url){
-    props.history.push(`/projects/${owner}/${projectsId}/tree${branchName?`/${branchName}`:""}/${url}`);
+    let enBranch = turnbar(branchName);
+    props.history.push(`/projects/${owner}/${projectsId}/tree${enBranch?`/${enBranch}`:""}/${url}`);
  }
  // 点击跳转到子目录
  function goToSubRoot(path,type,filename){
-    setType(type);
-    props.history.push(`/projects/${owner}/${projectsId}${`/tree/${branchName || (projectDetail && projectDetail.default_branch)}`}${path?`/${path}`:""}`);
+    if(type!=="submodule"){
+      let enBranch = branchName || defaultBranch;
+      let checkvalue = turnbar(enBranch);
+      setType(type);
+      props.history.push(`/projects/${owner}/${projectsId}${`/tree/${checkvalue}`}${path?`/${path}`:""}`);
+    }
  }

  function onEdit(readOnly){
    setReadOnly(readOnly);
+    setEditReadme(false);
  }
  function ChangeFile(path, readOnly){
    //点击直接跳转页面 加载一次路由
-    props.history.push(`/projects/${owner}/${projectsId}/tree/${branchName || (projectDetail && projectDetail.default_branch)}/${path}`);
+    let enBranch = branchName || defaultBranch;
+    let checkvalue = turnbar(enBranch);
+    props.history.push(`/projects/${owner}/${projectsId}/tree/${checkvalue}/${path}`);
    setType("file");
-    setReadOnly(readOnly);
+    setEditReadme(true);
  };

  function changeHide(hide){
@ -205,17 +271,12 @@ function CoderDepot(props){
  }

  const downloadMenu = (
-    <div className="downMenu">
-      <div style={{padding:"20px",borderBottom:"1px solid #eee"}}>
-        <CloneAddress 
-          http_url={projectDetail && projectDetail.clone_url}
-          showNotification={props.showNotification}/>
-      </div>
-      <Menu className="edu-txt-center">
-        <Menu.Item><a href={zip_url}>下载 ZIP</a></Menu.Item>
-        <Menu.Item><a href={tar_url}>下载 TAR.GZ</a></Menu.Item>
-      </Menu>
-    </div>
+    <CloneAddress 
+      http_url={projectDetail && projectDetail.clone_url}
+      ssh_url = {projectDetail && projectDetail.ssh_url}
+      zip_url={zip_url}
+      tar_url={tar_url}
+      showNotification={props.showNotification}/>
  )
  // 确认修改简介、website、实践课程链接
  function okUpdate(d,w,l){
@ -230,10 +291,12 @@ function CoderDepot(props){
      }
    })
  }
-
  let n = fileInfo && fileInfo.name;
  const mdFlag = n && n.substring(n.length-3,n.length) === ".md";
-  
+
+  const { current_user } = props;
+  const baseOperate = projectDetail && projectDetail.permission && projectDetail.permission !=="Reporter";
+  const fileOperate = type === "dir" && projectDetail && projectDetail.type !== 2 && ((projectDetail.permission && projectDetail.permission !=="Reporter") || (current_user && current_user.admin));
  return(
    <WhiteBack>
      <UpdateDescModal desc={desc} website={website} lesson_url={lesson_url} visible={openModal} onCancel={()=>setOpenModal(false)} onOk={okUpdate}/>
@ -246,7 +309,7 @@ function CoderDepot(props){
              owner={owner} 
              projectsId={projectsId} 
              name={projectDetail && projectDetail.name}
-              branch={branchName || (projectDetail && projectDetail.default_branch)} 
+              branch={branchName || defaultBranch} 
              visible={visible} 
              onClose={()=>setVisible(false)}
              list = {mainFlag ? dirInfo : undefined}
@ -271,14 +334,14 @@ function CoderDepot(props){
                          <SelectBranch
                            repo_id={projectDetail && projectDetail.repo_id}
                            projectsId={projectsId}
-                            branch={branchName || (projectDetail && projectDetail.default_branch)}
+                            branch={branchName || defaultBranch}
                            changeBranch={changeBranch}
                            owner={owner}
                            history={props.history}
                            branchList={projectDetail && projectDetail.branches && projectDetail.branches.list}
                          ></SelectBranch>
                          :
-                          <span>分支：<span className="color-grey-6">{branchName || (projectDetail && projectDetail.default_branch)}</span></span>
+                          <span>分支：<span className="color-grey-6">{branchName || defaultBranch}</span></span>
                        }
                      </div>
                      <AlignCenter className="mr20">
@ -295,20 +358,26 @@ function CoderDepot(props){
                      </AlignCenter>
                    </AlignCenter>
                    <AlignCenter>
-                      <div className="mr20 addOptionBtn">
-                        {
-                          projectDetail.type !== 2 && 
-                          <a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/pulls/new`)} >+ 合并请求</a>
-                        }
-                        <a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/issues/new`)} >+ 任务</a>
-                      </div>
-                      { type === "dir" && projectDetail.type !== 2 &&
-                        <Dropdown overlay={fileMenu} className="mr20">
+                      {
+                        baseOperate && ((projectDetail.type !== 2 && pullsFlag) || issuesFlag )&&
+                        <div className="mr20 addOptionBtn">
+                          {
+                            projectDetail.type !== 2 && pullsFlag &&
+                            <a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/pulls/new`)} >+ 合并请求</a>
+                          }
+                          {
+                            issuesFlag &&
+                            <a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/issues/new`)} >+ 任务</a>
+                          }
+                        </div>
+                      }
+                      { fileOperate &&
+                        <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">
+                      <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>
@ -320,11 +389,15 @@ function CoderDepot(props){
                        lastCommit &&
                        <div className="listtablehead">
                          <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"}><p id="ptxt">{lastCommit && lastCommit.message}</p></div>
+                          <div className={hideBtn && hide ? "ellipsistxt hidetxt" :"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>
-                          { commitCount ? <Link to={`/projects/${owner}/${projectsId}/commits`} className="ml12 color-grey-9"><i className="iconfont icon-tijiao mr3 font-17 color-grey-9"></i>{commitCount}次提交</Link>:"" }
+                          { commitCount ? <Link to={`/projects/${owner}/${projectsId}/commits/branch/${turnbar(branchName || defaultBranch)}`} className="ml12 color-grey-9">
+                            <i className="iconfont icon-tijiao mr3 font-17 color-grey-9"></i>{commitCount}次提交
+                          </Link>:"" }
                        </div>
                      }
                      <ul className="listtablebody">
@ -359,7 +432,7 @@ function CoderDepot(props){
                            readOnly={readOnly}
                            md={mdFlag}
                            onEdit={onEdit}
-                            currentBranch={branchName || (projectDetail && projectDetail.default_branch)}
+                            currentBranch={branchName || defaultBranch}
                            type={projectDetail.type}
                          ></CoderRootFileDetail>
                        }
@ -371,7 +444,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) && projectDetail.type !==2 } history={props.history} /> :"" }
+                  { dirInfo && (readme && readme.content) ? <ReadMe ChangeFile={ChangeFile} readme={readme} operate={props && (props.isManager || props.isDeveloper) && projectDetail.type !==2 } history={props.history} /> :"" }
                </div>
              </LongWidth>
              {
@ -387,7 +460,7 @@ function CoderDepot(props){
                        website &&
                        <p className="color-grey-6 df">
                          <i className="iconfont icon-lianjie2 font-15 mr10 color-grey-9"></i>
-                          <a href={website} target="_blank" style={{wordBreak:"break-all",lineHeight:"20px",marginTop:"5px",textDecoration:"underline"}}>{website}</a>
+                          <a href={website} className="color-grey-6" target="_blank" style={{wordBreak:"break-all",lineHeight:"20px",marginTop:"5px",textDecoration:"underline"}}>{website}</a>
                        </p>
                      }
                      <p>
@ -395,23 +468,30 @@ function CoderDepot(props){
                        <a href="#readme" className="color-grey-6">README.md</a>
                      </p>
                      <p className="color-grey-6">
-                        <i className="iconfont icon-dataBase font-15 mr10 color-grey-9"></i>
+                        <i className="iconfont icon-dataBase font-15 mr10 color-grey-6"></i>
                        <span>{projectDetail && projectDetail.size}</span>
                      </p>
                      {
                        projectDetail && projectDetail.license_name &&
                        <p className="color-grey-6">
-                          <i className="iconfont icon-tianping font-16 mr10 color-grey-9"></i>
+                          <i className="iconfont icon-tianping font-16 mr10 color-grey-3"></i>
                          <span>{projectDetail.license_name}</span>
                        </p>
                      }
                    </div>
+                    {
+                      inviteCode && 
+                      <div>
+                        <Divider />
+                        <Invite code={inviteCode} className={"detailsCode"}/>
+                      </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>
+                        <a href={lesson_url} target="_blank" className="color-grey-6" style={{textDecoration:"underline",wordBreak:"break-all"}}>{lesson_url}</a>
                      </div>
                    }
                    {/* 发布 */}
@ -419,7 +499,14 @@ function CoderDepot(props){
                      projectDetail && projectDetail.release_versions &&
                      <React.Fragment>
                        <Divider />
-                        <Releases owner={owner} projectsId={projectsId} releaseVersions={projectDetail.release_versions} history={props.history}/>
+                        <Releases 
+                          owner={owner} 
+                          projectsId={projectsId} 
+                          releaseVersions={projectDetail.release_versions} 
+                          history={props.history}
+                          baseOperate={baseOperate}
+                          projectType={projectDetail.type}
+                        />
                      </React.Fragment>
                    }
                    {/* 贡献者 */}
--- a/src/forge/Main/CoderDepotCatalogue.jsx
+++ b/src/forge/Main/CoderDepotCatalogue.jsx
@ -2,12 +2,18 @@ import React from 'react';
 import { Link } from 'react-router-dom';
 import { truncateCommitId } from '../common/util';

+const typeIco = {
+  "submodule":"icon-file-submodule font-17",
+  "file":'icon-wenjia font-15',
+  "dir":"icon-wenjianjia1 font-15"
+}
+
 function CoderDepotCatalogue({item , goToSubRoot , owner , projectsId }){
  return(
    <li>
      <span>
-        <a onClick={()=>goToSubRoot(item.path,item.type,item.name)}>
-          <i className={item.type === 'dir' ? "iconfont icon-wenjianjia1 color-green-file font-15 mr5":"iconfont icon-wenjia color-green-file font-15 mr5"}></i>{item.name}
+        <a onClick={()=>goToSubRoot(item.path,item.type,item.name)} className={item.type === "submodule" && "submoduleStyle"}>
+          <i className={`iconfont ${typeIco[`${item.type}`]} color-green-file mr5`}></i>{item.name}
        </a>
      </span>
      <span title="init project">
--- a/src/forge/Main/CoderDepotReadme.jsx
+++ b/src/forge/Main/CoderDepotReadme.jsx
@ -1,25 +1,33 @@
 import React, { useEffect, useState } from 'react';
 import RenderHtml from '../../components/render-html';
+import { AlignCenter } from '../Component/layout';
 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);
+  const [ content ,setContent ] = 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);
+      setContent(readme.content);
+    }else{
+      setContent(undefined);
    }
  },[readme])

+  useEffect(()=>{
+    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);
+  },[content])
+
  function menu(){
    if(menuList && menuList.length > 0){
      let hash = history.location.hash;
@ -40,11 +48,16 @@ function CoderDepotReadme({ operate , history , readme , ChangeFile }){
  }
  return(
    <div className="commonBox" id="readme">
-      <div className="commonBox-title">
-        <Dropdown overlay={menu()}>
-          <i className="iconfont icon-zhangjie1 font-16 color-grey-3 mr10"></i>
-        </Dropdown>
-        <span className="commonBox-title-read">README.md</span>
+      <div className="commonBox-title boxTitle">
+        <AlignCenter>
+          <Dropdown overlay={menu()}>
+            <span className="catelogue">
+              <i className="iconfont icon-zhangjie1 font-14 mr5"></i>
+              <span>目录</span>
+            </span>
+          </Dropdown>
+          <span className="commonBox-title-read">README.md</span>
+        </AlignCenter>
        {
          operate ?
            <a className="ml20 pull-right" onClick={() =>ChangeFile(readme && readme.path, false)}>
@ -53,9 +66,12 @@ function CoderDepotReadme({ operate , history , readme , ChangeFile }){
          :""
        }
      </div>
-      <div className="commonBox-info">
-        <RenderHtml className="break_word_comments imageLayerParent" value={readme && readme.content} url={history.location}/>
-      </div>
+      {
+        content && 
+        <div className="commonBox-info">
+          <RenderHtml className="break_word_comments imageLayerParent" value={content} url={history.location}/>
+        </div>
+      }
    </div>
  )
 }
--- a/src/forge/Main/CoderRootBranch.js
+++ b/src/forge/Main/CoderRootBranch.js
@ -6,12 +6,18 @@ import { getBranch } from '../GetData/getData';
 import Nodata from '../Nodata';
 import './list.css';

+function turnbar(str){
+  if(str && str.length>0 && str.indexOf("/")>-1){
+    return str.replaceAll('/','%2F');
+  }
+  return str;
+}
 export default ((props)=>{
  const [ data , setData ] =useState(undefined);
  const [ isSpin , setIsSpin ] =useState(true);

  const { projectsId , owner } = props.match.params;
-
+  const { isManager , isDeveloper , projectDetail } = props;
  useEffect(()=>{
    getBranchs(projectsId, owner);
  },[projectsId])
@ -32,7 +38,7 @@ export default ((props)=>{
              return(
                <li key={key}>
                  <div>
-                    <Link to={`/projects/${owner}/${projectsId}/tree/${item.name}`} className="color-blue font-15" style={{"maxWidth":"100px"}}>{item.name}</Link>
+                    <Link to={`/projects/${owner}/${projectsId}/tree/${turnbar(item.name)}`} className="color-blue font-15" style={{"maxWidth":"100px"}}>{item.name}</Link>
                    <p className="f-wrap-alignCenter mt15">
                      <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.last_commit.sha}`)}`} className="mr5 commitKey" style={{marginLeft:0}}>{item.last_commit && truncateCommitId(item.last_commit.sha)}</Link>
                      <span className="color-grey-3 hide-1 messages leftPoint">{item.last_commit && item.last_commit.message}</span>
@ -40,7 +46,10 @@ export default ((props)=>{
                    </p>
                  </div>
                  <span>
-                    <Link to={`/projects/${owner}/${projectsId}/pulls/new`} className="mr20 color-blue mr30">创建合并请求</Link>
+                    {
+                      (isManager || isDeveloper) && (projectDetail && projectDetail.type!==2) &&
+                      <Link to={`/projects/${owner}/${projectsId}/pulls/new/${item.name}`} className="mr20 color-blue mr30">创建合并请求</Link>
+                    }
                    <Dropdown overlay={menu(item.zip_url,item.tar_url)} trigger={['click']} placement="bottomRight" className="color-green-file">
                      <a className="ant-dropdown-link">
                        <Tooltip title={`下载分支${item.name}`}><Icon type="cloud-download" className="font-18"/></Tooltip>
@ -64,6 +73,7 @@ export default ((props)=>{
      <Menu.Item key={'1'}><a href={tar_url}>TAR.GZ</a></Menu.Item>
    </Menu>
  )
+
  return(
    <React.Fragment>
      <div className="main">
--- a/src/forge/Main/CoderRootCommit.js
+++ b/src/forge/Main/CoderRootCommit.js
@ -2,12 +2,19 @@ import React , { Component } from 'react';
 import { Spin , Pagination } from 'antd';
 import { getImageUrl } from 'educoder';
 import { truncateCommitId } from '../common/util';
+import { AlignTop } from '../Component/layout';
 import SelectBranch from '../Branch/Select';
 import Nodata from '../Nodata';

 import axios from 'axios';
 import {Link} from "react-router-dom";

+function returnbar(str){
+  if(str && str.length>0 && str.indexOf("%2F")>-1){
+    return str.replaceAll('%2F','/');
+  }
+  return str;
+}
 class CoderRootCommit extends Component{
  constructor(props){
    super(props)
@ -56,11 +63,12 @@ class CoderRootCommit extends Component{
    this.setState({
      isSpining:true
    })
+    console.log(returnbar(branch));
    const { projectsId , owner } = this.props.match.params;
    const url = `/${owner}/${projectsId}/commits.json`;
    axios.get(url,{
      params:{
-        sha:branch,
+        sha:returnbar(branch),
        page,
        limit
      }
@ -105,10 +113,10 @@ class CoderRootCommit extends Component{
    const { commitDatas , dataCount , limit , page , isSpining , branchList } = this.state;
    const { projectDetail, commit_class , defaultBranch } = this.props;
    const { projectsId , owner , branchName } = this.props.match.params;
-    let branch = branchName || defaultBranch;
+    let branch = returnbar(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} 
@ -132,10 +140,10 @@ class CoderRootCommit extends Component{
                  commitDatas && commitDatas.length > 0 && commitDatas.map((item,k)=>{
                    return(
                      <div key={k}>
-                        <p className="f-wrap-alignCenter">
-                          <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitKey" style={{marginLeft:0}}>{truncateCommitId(`${item.sha}`)}</Link>
-                          <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="flex1 ml20 font-16 color-grey-3">{item.message}</Link>
-                        </p>
+                        <AlignTop>
+                          <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitKey" style={{marginLeft:0,marginTop:"3px"}}>{truncateCommitId(`${item.sha}`)}</Link>
+                          <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitDesc">{item.message}</Link>
+                        </AlignTop>
                        <p className="f-wrap-alignCenter mt15">
                          {
                            item.id ?
--- a/src/forge/Main/CoderRootFileDetail.js
+++ b/src/forge/Main/CoderRootFileDetail.js
@ -285,6 +285,7 @@ class CoderRootFileDetail extends Component {
                readOnly={readOnly}
                editorType="update"
                currentBranch={currentBranch}
+                descName={detail && `Update ${detail.name}`}
              ></Meditor>
            )}
        </div>
--- a/src/forge/Main/CoderRootIndex.js
+++ b/src/forge/Main/CoderRootIndex.js
@ -102,6 +102,11 @@ class CoderRootIndex extends Component{
              (props) => (<FileNew {...this.props} {...props} {...this.state} getTopCount={this.getTopCount} />)
            }
          ></Route>
+          <Route path="/projects/:owner/:projectsId/commits/branch/:branchName"
+            render={
+              () => (<CoderRootCommit {...this.props} {...this.state} commit_class="main" getTopCount={this.getTopCount}  />)
+            }
+          ></Route>
          <Route path="/projects/:owner/:projectsId/commits/:sha"
            render={
              (props) => (<Diff {...this.props} {...props} {...this.state}/>)
--- a/src/forge/Main/CoderRootTag.js
+++ b/src/forge/Main/CoderRootTag.js
@ -26,7 +26,7 @@ export default (( props, { projectDetail }) => {
  }, [owner, projectsId]);

  return (
-    <div className="main">
+    <div className="main" style={{padding:"0px",border:"none"}}>
      <Spin spinning={isSpin}>
        <div style={{minHeight:"400px"}}>
          {
--- a/src/forge/Main/Detail.js
+++ b/src/forge/Main/Detail.js
@ -1,7 +1,7 @@
 import React, { Component } from 'react';
-import { Spin, Tooltip } from 'antd';
+import { Spin, Tooltip, Button } from 'antd';
 import { Link, Route, Switch } from 'react-router-dom';
-import { Content } from '../Component/layout';
+import { Content, AlignTop } from '../Component/layout';
 import DetailBanner from './sub/DetailBanner';
 import '../css/index.scss'
 import './list.css';
@ -103,12 +103,12 @@ const Contribute = Loadable({
 })

 const CoderRootCommit = Loadable({
-	loader: () => import('./CoderRootCommit'),
-	loading: Loading,
+  loader: () => import('./CoderRootCommit'),
+  loading: Loading,
 })
 const CoderDepot = Loadable({
-	loader: () => import('./CoderDepot'),
-	loading: Loading,
+  loader: () => import('./CoderDepot'),
+  loading: Loading,
 })

 const TrendsIndex = Loadable({
@ -127,30 +127,40 @@ const Source = Loadable({
 const DevIndex = Loadable({
  loader: () => import('../DevOps/Index'),
  loading: Loading,
-})
+});
+const Wiki = Loadable({
+  loader: () => import('../Wiki/Index'),
+  loading: Loading,
+});
+const WikiEdit = Loadable({
+  loader: () => import('../Wiki/EditWiki'),
+  loading: Loading,
+});
 /**
 * permission：Manager:管理员，Reporter：报告人员(只有读取权限)，Developer：开发人员（除不能设置仓库信息外）
 */
-function checkPathname(projectsId,owner,pathname){
+function checkPathname(projectsId, owner, pathname) {
  let name = "";
-  if(pathname && pathname !== `/projects/${owner}/${projectsId}`){
+  if (pathname && pathname !== `/projects/${owner}/${projectsId}`) {
    let url = pathname.split(`/projects/${owner}/${projectsId}`)[1];
-    if(url.indexOf("/about")>-1){
-      name="about"
-    }else if(url.indexOf("/issues")>-1 ||url.indexOf("Milepost") > 0){
+    if (url.indexOf("/about") > -1) {
+      name = "about"
+    } else if (url.indexOf("/issues") > -1 || url.indexOf("Milepost") > 0) {
      name = "issues";
-    }else if(url.indexOf("/pulls")>-1){
-      name="pulls"
-    }else if(url.indexOf("/milestones")>-1){
-      name="milestones"
-    }else if(url.indexOf("/activity")>-1){
-      name="activity"
-    }else if(url.indexOf("/setting")>-1){
-      name="setting"
-    }else if(url.indexOf(`/devops`)>-1){
-      name="devops"
-    }else if(url.indexOf(`/source`)>-1){
-      name="source"
+    } else if (url.indexOf("/pulls") > -1) {
+      name = "pulls"
+    } else if (url.indexOf("/milestones") > -1) {
+      name = "milestones"
+    } else if (url.indexOf("/activity") > -1) {
+      name = "activity"
+    } else if (url.indexOf("/setting") > -1) {
+      name = "setting"
+    } else if (url.indexOf(`/devops`) > -1) {
+      name = "devops"
+    } else if (url.indexOf(`/source`) > -1) {
+      name = "source"
+    } else if (url.indexOf(`/wiki`) > -1) {
+      name = "wiki"
    }
  }
  return name;
@ -173,14 +183,15 @@ class Detail extends Component {
      branchs: undefined,
      branchList: undefined,
      project: null,
-      firstSync:false,
-      secondSync:false,
-      open_devops:false,
+      firstSync: false,
+      secondSync: false,
+      open_devops: false,
+      forkSpin: false,
      // 默认分支
-      defaultBranch:undefined,
+      defaultBranch: undefined,

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

@ -197,36 +208,38 @@ class Detail extends Component {
  }

  getProject = (num) => {
-    const { projectsId , owner } = this.props.match.params;
+    const { projectsId, owner } = this.props.match.params;
    const url = `/${owner}/${projectsId}/simple.json`;
    axios.get(url).then((result) => {
      if (result && result.data) {
        this.setState({
          project: result.data,
-          open_devops:result.data.open_devops,
-          platform:result.data.platform && result.data.platform !== 'educoder'
+          open_devops: result.data.open_devops,
+          platform: result.data.platform && result.data.platform !== 'educoder'
        })

        if (result.data.type !== 0 && result.data.mirror_status === 1) {
          console.log("--------start channel --------");
          // 是镜像项目，且未完成迁移
          this.canvasChannel();
-          if(num){
+          if (num) {
            this.setState({
-              secondSync:true,
-              firsrtSync:false
+              secondSync: true,
+              firstSync: false
            })
-          }else{
+          } else {
            this.setState({
-              firstSync:true,
-              secondSync:false
+              firstSync: true,
+              secondSync: false
            })
          }
-        }else{
+        } else if (result.data.mirror_status === 2) {
+          this.deleteProjectBack();
+        } else {
          this.getDetail();
          this.setState({
-            firsrtSync:false,
-            secondSync:false
+            firstSync: false,
+            secondSync: false
          })
        }
      }
@ -234,9 +247,9 @@ class Detail extends Component {
  }

  // 工作流激活后修改状态
-  changeOpenDevops=(flag)=>{
+  changeOpenDevops = (flag) => {
    this.setState({
-      open_devops:flag
+      open_devops: flag
    })
  }
  canvasChannel = () => {
@ -246,7 +259,7 @@ class Detail extends Component {
    var cable = actioncable.createConsumer(`wss://${name}/cable`);
    this.canvasChannel1 = cable.subscriptions.create({
      channel: `MirrorProjectChannel`,
-      id: project && project.identifier
+      id: project && project.id
    }, {
      connected: () => {
        console.log("###### channel connected! ######");
@ -254,16 +267,41 @@ class Detail extends Component {
      disconnected: () => { },
      received: data => {
        console.log(`###### ---received data--- ######`);
+        console.log(data);
        if (data) {
+          if ( data.project && data.project.mirror_status === 2) {
+            this.deleteProjectBack();
+          }
          this.getDetail();
+          this.setState({
+            firstSync: false,
+            secondSync: false
+          });
          cable.subscriptions.consumer.disconnect();
        }
      }
    })
  }

+  deleteProjectBack = () => {
+    const { history } = this.props;
+    const { projectsId, owner } = this.props.match.params;
+    axios.delete(`/${owner}/${projectsId}.json`).then(res => {
+      let hash = '/projects/mirror/new';
+      if (res && res.data) {
+        history.push({
+          pathname: hash,
+          mirror_status: 2
+        });
+      }
+      else {
+        window.location.hash = hash;
+      }
+    });
+  }
+
  getDetail = () => {
-    const { projectsId , owner } = this.props.match.params;
+    const { projectsId, owner } = this.props.match.params;
    this.getBanner();
    const url = `/${owner}/${projectsId}/detail.json`;
    axios.get(url).then((result) => {
@ -280,29 +318,29 @@ class Detail extends Component {
          watchers_count: result.data.watchers_count,
          praises_count: result.data.praises_count,
          forked_count: result.data.forked_count,
-          defaultBranch:result.data.default_branch
+          defaultBranch: result.data.default_branch
        })
      }
    }).catch((error) => { })
  }

  // 获取动态导航栏菜单
-  getBanner(){
-    const { projectsId , owner } = this.props.match.params;
+  getBanner() {
+    const { projectsId, owner } = this.props.match.params;
    const url = `/${owner}/${projectsId}/menu_list.json`;
-    axios.get(url).then(result=>{
-      if(result){
+    axios.get(url).then(result => {
+      if (result) {
        this.setState({
-          bannerList:result.data
+          bannerList: result.data
        })
      }
-    }).catch(error=>{})
+    }).catch(error => { })
  }

  // 关注和取消关注
  focusFunc = (flag) => {
    const { platform } = this.state;
-    if(!platform)return;
+    if (!platform) return;

    const { project_id } = this.state;
    axios({
@ -317,15 +355,15 @@ class Detail extends Component {
        this.setWatchersCount(result.data.watchers_count, result.data.watched);
      }
    })
-    .catch(error => {
-      console.log(error);
-    });
+      .catch(error => {
+        console.log(error);
+      });
  }

  // 点赞和取消点赞
  pariseFunc = (flag) => {
    const { platform } = this.state;
-    if(!platform)return;
+    if (!platform) return;
    const { project_id } = this.state;
    axios({
      method: flag ? 'delete' : 'post',
@ -335,9 +373,9 @@ class Detail extends Component {
        this.setPraisesCount(result.data.praises_count, result.data.praised)
      }
    })
-    .catch(error => {
-      console.log(error);
-    });
+      .catch(error => {
+        console.log(error);
+      });
  }

  setWatchersCount = (count, is_watched) => {
@ -357,25 +395,33 @@ class Detail extends Component {
  // fork项目
  forkFunc = () => {
    const { platform } = this.state;
-    if(!platform)return;
+    if (!platform) return;
+    this.setState({
+      forkSpin: true
+    })
    const { current_user } = this.props
-    const { projectsId , owner } = this.props.match.params;
+    const { projectsId, owner } = this.props.match.params;
    const url = `/${owner}/${projectsId}/forks.json`;
    axios.post(url).then(result => {
      if (result && result.data.status === 0) {
        this.props.history.push(`/projects/${current_user && current_user.login}/${result.data.identifier}`);
        this.props.showNotification(result.data.message);
      }
+      this.setState({
+        forkSpin: false
+      })
    }).catch(error => {
-      console.log(error);
+      this.setState({
+        forkSpin: false
+      })
    })
  }

  // 同步镜像
  synchronismMirror = () => {
    const { platform } = this.state;
-    if(!platform)return;
-    const { projectsId , owner } = this.props.match.params;
+    if (!platform) return;
+    const { projectsId, owner } = this.props.match.params;
    const url = `/${owner}/${projectsId}/sync_mirror.json`;
    axios.post(url).then(result => {
      if (result && result.data && result.data.status === 0) {
@ -389,326 +435,344 @@ class Detail extends Component {
    })
  }

-  
+  textFunc = (forked_from_project_id, fork_info) => {
+    let type = fork_info && fork_info.fork_project_user_type;
+    return forked_from_project_id && fork_info ?
+      <div className="color-grey-9 df">
+        <span>复刻自</span>
+        <Link to={`${type === "Organization" ? "/organize" : '/users'}/${fork_info.fork_project_user_login}`} className="show-user-link color-grey-6 ml5">{fork_info.fork_project_user_name}</Link>
+        <span> / </span>
+        <Link to={`/projects/${fork_info.fork_project_user_login}/${fork_info.fork_project_identifier}`} className="color-grey-6 task-hide flex1" style={{ maxWidth: "400px" }} title={fork_info.fork_form_name}>{fork_info.fork_form_name}</Link>
+      </div> : ""
+  }
+

  render() {
-    const { projectDetail, watchers_count, praises_count, 
-      forked_count, firstSync , secondSync , 
-      isManager, watched, praised, 
-      project , open_devops , platform , defaultBranch , bannerList } = this.state;
+    const { projectDetail, watchers_count, praises_count,
+      forked_count, firstSync, secondSync,
+      isManager, watched, praised,
+      project, open_devops, platform, defaultBranch, bannerList, forkSpin } = this.state;
    const url = this.props.history.location.pathname;
    const urlArr = url.split("/");
    const urlFlag = (urlArr.length === 3);

-    const { projectsId , owner } = this.props.match.params;
-    let pathname = checkPathname(projectsId,owner,url);
+    const { projectsId, owner } = this.props.match.params;
+    const { current_user } = this.props;
+    let pathname = checkPathname(projectsId, owner, url);

    const { state } = this.props.history.location;
-    
-    const text = (
-      projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ?
-        <React.Fragment>
-          <span>forked from </span>
-          <Link to={`/users/${projectDetail.fork_info.fork_project_user_login}`} className="show-user-link color-grey-ccc">{projectDetail.fork_info.fork_project_user_name}</Link>
-          <span> / </span>
-          <Link to={`/projects/${projectDetail.fork_info.fork_project_user_login}/${projectDetail.fork_info.fork_project_identifier}`} className="color-grey-ccc">{projectDetail.fork_info.fork_form_name}</Link>
-        </React.Fragment> : ""
-    );
-    
+
    const common = {
      getDetail: this.getDetail,
-      changeOpenDevops:this.changeOpenDevops,
+      changeOpenDevops: this.changeOpenDevops,
      defaultBranch
    }
    return (
      <div>
        <div className="detailHeader-wrapper">
          <div className="normal">
-            <div className="f-wrap-between pb15" style={{ position: "relative" }}>
-              <p className="font-22 df flex-1 lineH2 mt15" style={{ alignItems: "center" }}>
-                {project && project.author &&
-                  <Link to={`${project.author.type ==="Organization" ? "/organize":'/users'}/${project.author.login}`} className="show-user-link">
-                    {project.author.name}
-                  </Link>
-                }
-                <span className="ml5 mr5">/</span>
-                <span className="hide-1 flex-1 df">
-                  <Link to={`/projects/${owner}/${projectsId}`} className="font-22">{project && project.name}</Link>
+            <AlignTop style={{ padding: "20px 0px 10px", justifyContent: "space-between" }}>
+              <div>
+                <AlignTop>
+                  <div className="projectallName">
+                    {project && project.author &&
+                      <Link to={`${project.author.type === "Organization" ? "/organize" : '/users'}/${project.author.login}`}>{project.author.name}</Link>
+                    }
+                    <span className="ml5 mr5">/</span>
+                    <Link to={`/projects/${owner}/${projectsId}`} className="projectN mt6">{projectDetail && projectDetail.name}</Link>
+                  </div>
+                  {projectDetail && projectDetail.private && <span className="privateTag mt6">私有</span>}
+                </AlignTop>
+                <div className="mt8">
                  {
                    projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ?
-                      <Tooltip placement={'right'} title={text}>
-                        <Link to={`/projects/${projectDetail.fork_info.fork_project_user_login}/${projectDetail.fork_info.fork_project_identifier}`}
-                          className="ml10" >
-                          <i className="iconfont icon-fork font-18 fl mt6" style={{ color: "#8D90E3" }}></i>
-                        </Link>
-                      </Tooltip> : ""
+                      this.textFunc(projectDetail.forked_from_project_id, projectDetail.fork_info)
+                      : ""
                  }
                  {
-                    projectDetail && projectDetail.type && projectDetail.type !== 0 ? 
-                    projectDetail.type === 2 ?
-                    <Tooltip title={"镜像自: " + projectDetail.mirror_url} className="ml5" placement={'right'}>
-                      <i className="iconfont icon-banbenku font-18 mt6" style={{ color: "#8D90E3" }}/>
-                    </Tooltip>
-                    :
-                    <Tooltip title={"镜像自: " + projectDetail.mirror_url} className="ml5" placement={'right'}>
-                      <i className="iconfont icon-jingxiang font-18 color-green mt6" />
-                    </Tooltip>
-                    :""
+                    projectDetail && projectDetail.type && projectDetail.type !== 0 ?
+                      <span className="color-grey-9">镜像自 <a className="color-grey-6" target="_blank" href={projectDetail.mirror_url}>{projectDetail.mirror_url}</a></span>
+                      : ""
                  }
-                </span>
-              </p>
-              {
-                firstSync ? "":
-                <span className="df mt25">
-                  {
-                    projectDetail && projectDetail.type && projectDetail.type === 2 ?
-                      <a className="synchronism ml30" onClick={this.synchronismMirror}>同步镜像</a> : ""
-                  }
-                  <span className="detail_tag_btn">
-                    <a className="detail_tag_btn_name" style={{cursor:platform?"pointer":"default"}} onClick={() => this.focusFunc(watched)}>
-                      <i className={watched ? "iconfont icon-shixing color-orange font-16 mr3":"iconfont icon-kongxing color-grey-9 font-16 mr3"}></i>
-                      <span>{watched ? '取消关注' : '关注'}</span>
-                    </a>
-                    {
-                      watchers_count > 0 ?
-                      platform ?
-                      <Link className="detail_tag_btn_count" style={{color:`${watched?"#2878FF":"#666"}`}} to={platform?{ pathname: `/projects/${owner}/${projectsId}/watchers`, state }:""}>
-                        {watchers_count}
-                      </Link>
-                      :
-                      <span className="detail_tag_btn_count">{watchers_count}</span>
-                      :""
-                    }
-                  </span>
-                  <span className="detail_tag_btn">
-                    <a className="detail_tag_btn_name" style={{cursor:platform?"pointer":"default"}} onClick={() => this.pariseFunc(praised)}>
-                      <i className={praised ? "iconfont icon-weibiaoti105 color-orange font-14 mr3":"iconfont icon-guanzhu color-grey-9 font-14 mr3"}></i>
-                      <span>{praised ? '取消点赞' : '点赞'}</span>
-                    </a>
-                    {
-                      praises_count > 0 ?
-                      platform ?
-                      <Link className="detail_tag_btn_count" style={{color:`${praised?"#2878FF":"#666"}`}} to={{ pathname: `/projects/${owner}/${projectsId}/stargazers`, state }}>
-                        {praises_count}
-                      </Link>:
-                      <span className="detail_tag_btn_count">{praises_count}</span>
-                      :""
-                    }
-                  </span>
-                  <span className="detail_tag_btn">
-                    <Tooltip title="复刻是fork的中文名，即复制代码仓库" placement="bottom">
-                      <a className="detail_tag_btn_name" style={{cursor:platform?"pointer":"default"}} onClick={this.forkFunc}>
-                        <i className="iconfont icon-fork color-grey-9 mr3"></i>复刻
-                      </a>
-                    </Tooltip>
-                    {
-                      forked_count > 0 ?
-                      platform ?
-                      <Link className="detail_tag_btn_count" to={{ pathname: `/projects/${owner}/${projectsId}/fork_users`, state }}>
-                        {forked_count}
-                      </Link>
-                      :
-                      <span className="detail_tag_btn_count">{forked_count}</span>
-                      :""
-                    }
-                  </span>
-                </span>
-              }
-            </div>
+                </div>
+              </div>
+              <div>
+                {
+                  firstSync ? "" :
+                    <span className="df">
+                      {
+                        ((current_user && current_user.admin) || isManager) && (projectDetail && projectDetail.type && projectDetail.type === 2) ?
+                          <a className="synchronism ml30" onClick={this.synchronismMirror}>同步镜像</a> : ""
+                      }
+                      <Button className="detail_tag_btn">
+                        <a className="detail_tag_btn_name" style={{ cursor: platform ? "pointer" : "default" }} onClick={() => this.focusFunc(watched)}>
+                          <i className={watched ? "iconfont icon-shixing color-orange font-16 mr3" : "iconfont icon-kongxing color-grey-9 font-16 mr3"}></i>
+                          <span>{watched ? '取消关注' : '关注'}</span>
+                        </a>
+                        {
+                          watchers_count > 0 ?
+                            platform ?
+                              <Link className="detail_tag_btn_count" style={{ color: `${watched ? "#2878FF" : "#666"}` }} to={platform ? { pathname: `/projects/${owner}/${projectsId}/watchers`, state } : ""}>
+                                {watchers_count}
+                              </Link>
+                              :
+                              <span className="detail_tag_btn_count">{watchers_count}</span>
+                            : ""
+                        }
+                      </Button>
+                      <Button className="detail_tag_btn">
+                        <a className="detail_tag_btn_name" style={{ cursor: platform ? "pointer" : "default" }} onClick={() => this.pariseFunc(praised)}>
+                          <i className={praised ? "iconfont icon-weibiaoti105 color-orange font-14 mr3" : "iconfont icon-guanzhu color-grey-9 font-14 mr3"}></i>
+                          <span>{praised ? '取消点赞' : '点赞'}</span>
+                        </a>
+                        {
+                          praises_count > 0 ?
+                            platform ?
+                              <Link className="detail_tag_btn_count" style={{ color: `${praised ? "#2878FF" : "#666"}` }} to={{ pathname: `/projects/${owner}/${projectsId}/stargazers`, state }}>
+                                {praises_count}
+                              </Link> :
+                              <span className="detail_tag_btn_count">{praises_count}</span>
+                            : ""
+                        }
+                      </Button>
+                      <Button className="detail_tag_btn" loading={forkSpin}>
+                        <Tooltip title="复刻是fork的中文名，即复制代码仓库" placement="bottom">
+                          <a className="detail_tag_btn_name" style={{ cursor: platform ? "pointer" : "default" }} onClick={this.forkFunc}>
+                            <i className="iconfont icon-fork color-grey-9 mr3"></i>复刻
+                          </a>
+                        </Tooltip>
+                        {
+                          forked_count > 0 ?
+                            platform ?
+                              <Link className="detail_tag_btn_count" to={{ pathname: `/projects/${owner}/${projectsId}/fork_users`, state }}>
+                                {forked_count}
+                              </Link>
+                              :
+                              <span className="detail_tag_btn_count">{forked_count}</span>
+                            : ""
+                        }
+                      </Button>
+                    </span>
+                }
+              </div>
+            </AlignTop>
            {
              firstSync ? "" :
-              <DetailBanner 
-                history={this.props.history}
-                list={bannerList}
-                owner={owner}
-                projectsId={projectsId}
-                pathname={pathname}
-                state={state}
-                projectDetail={projectDetail}
-                open_devops={open_devops}
-                platform={platform}
-                urlFlag={urlFlag}
-                isManager={isManager}
-              />
+                <DetailBanner
+                  history={this.props.history}
+                  list={bannerList}
+                  owner={owner}
+                  projectsId={projectsId}
+                  pathname={pathname}
+                  state={state}
+                  projectDetail={projectDetail}
+                  open_devops={open_devops}
+                  platform={platform}
+                  urlFlag={urlFlag}
+                  isManager={isManager}
+                />
            }
          </div>
        </div>
        {
          firstSync ?
-          <Content className="spincontent">
-            <Spin className="spinstyle" tip={project && `正在从 ${project.mirror_url} 迁移`} size="large" />
-          </Content>
-          :
-          <Spin spinning={secondSync} className="spinstyle" tip="正在同步镜像" size="large">
-            <Switch {...this.props}>
-              {/* 资源 */}
-              <Route path="/projects/:owner/:projectsId/source"
-                render={
-                  () => (<Source {...this.props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* 主页 */}
-              <Route path="/projects/:owner/:projectsId/about"
-                render={
-                  () => (<DevAbout {...this.props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* 工作流 */}
-              <Route path="/projects/:owner/:projectsId/devops"
-                render={
-                  () => (<DevIndex {...this.props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* 标签列表 */}
-              <Route path="/projects/:owner/:projectsId/issues/tags"
-                render={
-                  (props) => (<TagList {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* 仓库设置 */}
-              <Route path="/projects/:owner/:projectsId/setting"
-                render={
-                  (props) => (<Setting {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* 任务详情 */}
-              <Route path="/projects/:owner/:projectsId/issues/:orderId/detail"
-                render={
-                  (props) => (<OrderDetail {...this.props} {...this.state} {...props} {...common} />)
-                }
-              ></Route>
-              {/*修改里程碑*/}
-              <Route path="/projects/:owner/:projectsId/milestones/:meilid/edit"
-                render={
-                  (props) => (<OrderupdateMilepost {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* 新建里程碑 */}
-              <Route path="/projects/:owner/:projectsId/milestones/new"
-                render={
-                  (props) => (<OrdernewMilepost {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/*里程碑详情*/}
-              <Route path="/projects/:owner/:projectsId/milestones/:meilid"
-                render={
-                  (props) => (<MilepostDetail {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* 里程碑 */}
-              <Route path="/projects/:owner/:projectsId/milestones"
-                render={
-                  (props) => (<OrderMilepost {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* 里程碑页面新建任务 */}
-              <Route path="/projects/:owner/:projectsId/issues/:milepostId/new"
-                render={
-                  (props) => (<OrderNew {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* 新建任务 */}
-              <Route path="/projects/:owner/:projectsId/issues/new"
-                render={
-                  (props) => (<OrderNew {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* 修改详情 */}
-              <Route path="/projects/:owner/:projectsId/issues/:orderId/updatedetail"
-                render={
-                  (props) => (<OrderupdateDetail  {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* 复制详情 */}
-              <Route path="/projects/:owner/:projectsId/issues/:orderId/copyetail"
-                render={
-                  (props) => (<OrdercopyDetail  {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* 动态 */}
-              <Route path="/projects/:owner/:projectsId/activity"
-                render={
-                  (props) => (<TrendsIndex {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* 代码Index */}
-              <Route path="/projects/:owner/:projectsId/issues"
-                render={
-                  (props) => (<OrderIndex {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              {/* 新建合并请求 */}
-              <Route path="/projects/:owner/:projectsId/pulls/new"
-                render={
-                  (props) => (<CreateMerge {...this.props} {...props} {...this.state} {...common} is_fork={true} />)
-                }
-              ></Route>
-              <Route path="/projects/:owner/:projectsId/pulls/:mergeId/UpdateMerge"
-                render={
-                  (props) => (<UpdateMerge {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              <Route path="/projects/:owner/:projectsId/pulls/:mergeId/Messagecount"
-                render={
-                  (props) => (<MessageCount {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
-              <Route path="/projects/:owner/:projectsId/pulls/:mergeId/MergeSubmit"
-                render={
-                  (props) => (<MessageCount {...this.props} {...props} {...this.state} {...common} />)
-                }
-              ></Route>
+            <Content className="spincontent">
+              <Spin className="spinstyle" tip={project && `正在从 ${project.mirror_url} 迁移`} size="large" />
+            </Content>
+            :
+            <Spin spinning={secondSync} className="spinstyle" tip="正在同步镜像" size="large">
+              <Switch {...this.props}>
+                {/* 资源 */}
+                <Route path="/projects/:owner/:projectsId/source"
+                  render={
+                    () => (<Source {...this.props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* 主页 */}
+                <Route path="/projects/:owner/:projectsId/about"
+                  render={
+                    () => (<DevAbout {...this.props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* wiki新增文件 */}
+                <Route path="/projects/:owner/:projectsId/wiki/add"
+                  render={
+                    () => (<WikiEdit {...this.props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* wiki编辑文件 */}
+                <Route path="/projects/:owner/:projectsId/wiki/edit/:wikiName"
+                  render={
+                    () => (<WikiEdit {...this.props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* wiki */}
+                <Route path="/projects/:owner/:projectsId/wiki"
+                  render={
+                    () => (<Wiki {...this.props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* 工作流 */}
+                <Route path="/projects/:owner/:projectsId/devops"
+                  render={
+                    () => (<DevIndex {...this.props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* 标签列表 */}
+                <Route path="/projects/:owner/:projectsId/issues/tags"
+                  render={
+                    (props) => (<TagList {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* 仓库设置 */}
+                <Route path="/projects/:owner/:projectsId/setting"
+                  render={
+                    (props) => (<Setting {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* 任务详情 */}
+                <Route path="/projects/:owner/:projectsId/issues/:orderId/detail"
+                  render={
+                    (props) => (<OrderDetail {...this.props} {...this.state} {...props} {...common} />)
+                  }
+                ></Route>
+                {/*修改里程碑*/}
+                <Route path="/projects/:owner/:projectsId/milestones/:meilid/edit"
+                  render={
+                    (props) => (<OrderupdateMilepost {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* 新建里程碑 */}
+                <Route path="/projects/:owner/:projectsId/milestones/new"
+                  render={
+                    (props) => (<OrdernewMilepost {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/*里程碑详情*/}
+                <Route path="/projects/:owner/:projectsId/milestones/:meilid"
+                  render={
+                    (props) => (<MilepostDetail {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* 里程碑 */}
+                <Route path="/projects/:owner/:projectsId/milestones"
+                  render={
+                    (props) => (<OrderMilepost {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* 里程碑页面新建任务 */}
+                <Route path="/projects/:owner/:projectsId/issues/:milepostId/new"
+                  render={
+                    (props) => (<OrderNew {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* 新建任务 */}
+                <Route path="/projects/:owner/:projectsId/issues/new"
+                  render={
+                    (props) => (<OrderNew {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* 修改详情 */}
+                <Route path="/projects/:owner/:projectsId/issues/:orderId/updatedetail"
+                  render={
+                    (props) => (<OrderupdateDetail  {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* 复制详情 */}
+                <Route path="/projects/:owner/:projectsId/issues/:orderId/copyetail"
+                  render={
+                    (props) => (<OrdercopyDetail  {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* 动态 */}
+                <Route path="/projects/:owner/:projectsId/activity"
+                  render={
+                    (props) => (<TrendsIndex {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* 代码Index */}
+                <Route path="/projects/:owner/:projectsId/issues"
+                  render={
+                    (props) => (<OrderIndex {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                {/* 新建合并请求 */}
+                <Route path="/projects/:owner/:projectsId/pulls/new/:branch"
+                  render={
+                    (props) => (<CreateMerge {...this.props} {...props} {...this.state} {...common} is_fork={true} />)
+                  }
+                ></Route>
+                <Route path="/projects/:owner/:projectsId/pulls/new"
+                  render={
+                    (props) => (<CreateMerge {...this.props} {...props} {...this.state} {...common} is_fork={true} />)
+                  }
+                ></Route>
+                <Route path="/projects/:owner/:projectsId/pulls/:mergeId/UpdateMerge"
+                  render={
+                    (props) => (<UpdateMerge {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                <Route path="/projects/:owner/:projectsId/pulls/:mergeId/Messagecount"
+                  render={
+                    (props) => (<MessageCount {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                <Route path="/projects/:owner/:projectsId/pulls/:mergeId/MergeSubmit"
+                  render={
+                    (props) => (<MessageCount {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>

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

-              {/* 代码库----详情页面 */}
-              <Route path="/projects/:owner/:projectsId/commits/branch/:branchName"
-                render={
-                  (props) => (<CoderRootCommit {...this.props} {...props} {...this.state} {...common}/>)
-                }
-              ></Route>
-              <Route path="/projects/:owner/:projectsId/tree/:branchName"
-                render={
-                  (props) => (<CoderDepot {...this.props} {...props} {...this.state} {...common}/>)
-                }
-              ></Route>
-              <Route path="/projects/:owner/:projectsId/:subIndex"
-                render={
-                  (props) => (<CoderRootIndex {...this.props} {...props} {...this.state} {...common}/>)
-                }
-              ></Route>
-              <Route path="/projects/:owner/:projectsId"
-                render={
-                  (props) => (<CoderDepot {...this.props} {...props} {...this.state} {...common}/>)
-                }
-              ></Route>
-            </Switch>
-          </Spin>
+                {/* 代码库----详情页面 */}
+                <Route path="/projects/:owner/:projectsId/commits/branch/:branchName"
+                  render={
+                    (props) => (<CoderRootCommit {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                <Route path="/projects/:owner/:projectsId/tree/:branchName"
+                  render={
+                    (props) => (<CoderDepot {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                <Route path="/projects/:owner/:projectsId/:subIndex"
+                  render={
+                    (props) => (<CoderRootIndex {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+                <Route path="/projects/:owner/:projectsId"
+                  render={
+                    (props) => (<CoderDepot {...this.props} {...props} {...this.state} {...common} />)
+                  }
+                ></Route>
+              </Switch>
+            </Spin>
        }
      </div>
    )
--- a/src/forge/Main/Diff.jsx
+++ b/src/forge/Main/Diff.jsx
@ -51,7 +51,7 @@ export default ({ match , history }) => {
    }
  }, [projectsId , owner, sha]);
  return (
-    <div className="main">
+    <div className="main" style={{padding:"0px",border:"none"}}>
      <Spin spinning={isSpin}>
        <Infos>
          <div className="commitinfos">
--- a/src/forge/Main/Index.js
+++ b/src/forge/Main/Index.js
@ -1,7 +1,10 @@
 import React, { Component } from 'react';
 import { Link } from 'react-router-dom';
 import { Menu, Input , Spin, Pagination , Popover , Select } from 'antd';
+import Slider from "react-slick";
 import { getImageUrl } from 'educoder';
+import "slick-carousel/slick/slick.css";
+import "slick-carousel/slick/slick-theme.css";
 import '../css/index.scss'
 import './list.css';
 import './Index.scss';
@ -30,6 +33,8 @@ class Index extends Component {
      categoryList: undefined,
      recommendList:undefined,

+      recommendOriList:undefined,
+
      languageList:undefined,
      languageId:undefined
    }
@ -47,6 +52,8 @@ class Index extends Component {
    this.getRecommand();

    this.getLanguage();
+
+    // this.getRecommandOri();
  }

  // 获取语言列表
@ -72,6 +79,17 @@ class Index extends Component {
    }).catch(error=>{})
  }

+  getRecommandOri=()=>{
+    const url = `/organizations/recommend.json`;
+    axios.get(url).then(result=>{
+      if(result){
+        this.setState({
+          recommendOriList:result.data.organizations
+        })
+      }
+    }).catch(error=>{})
+  }
+
  // 获取列表
  getListData = (page, limit, search, sort, project_type, category_id,languageId) => {
    const { current_user } = this.props;
@ -256,22 +274,56 @@ class Index extends Component {
    const { current_user } = this.props;

    const { projectsList , recommendList , languageList , languageId , 
-      isSpin, total, search, limit, page, typeList, categoryList } = this.state;
+      isSpin, total, search, limit, page, typeList, categoryList , recommendOriList } = this.state;
+
+      const setting={
+        dots: true,
+        infinite: true,
+        speed: 500,
+        slidesToShow: 5,
+        slidesToScroll: 5,
+        autoplay:false,
+        arrows:false,
+        adaptiveHeight:true
+      }
+      const settings={
+        dots: true,
+        infinite: true,
+        speed: 500,
+        slidesToShow: 6,
+        slidesToScroll: 6,
+        autoplay:false,
+        arrows:false,
+        adaptiveHeight:true
+      }

    return (
      <div>
        <p className="t_project_banner">
          <img src={banner} width="100%" alt=""/>
        </p>
+        {/* {
+          recommendOriList && recommendOriList.length>0?
+            <Slider {...settings} className="recommandOri">
+              {
+                recommendOriList.map((i,k)=>{
+                  return(
+                    <li><Link to={''}><img src={getImageUrl(`/${i.avatar_url}`)} alt={i.name} title={i.name} width="80px"/></Link></li>
+                  )
+                })
+              }
+            </Slider>
+          :""
+        } */}
        {
          recommendList && recommendList.length>0 &&
-          <div className="recommandProjects">
+          <Slider {...setting} className={recommendList.length>5 ? "recommandProjects":"recommandProjects mb20"}>
            {
              recommendList.map((item,key)=>{
                return(
-                  <div onClick={()=>this.getoDetail(item.author && item.author.login,item.identifier)}>
+                  <div className="items" onClick={()=>this.getoDetail(item.author && item.author.login,item.identifier)}>
                    <div className="mainInfo">
-                      <img src={getImageUrl(`/${item.author && item.author.image_url}`)} alt=""/>
+                      <img src={getImageUrl(`/${item.author && item.author.image_url}`)} width="50px" height="50px"alt=""/>
                      <p className="school">{item.name}</p>
                      <p className="name">{item.author && item.author.name}</p>
                    </div>
@ -283,9 +335,8 @@ class Index extends Component {
                )
              })
            }
-          </div>
+          </Slider>
        }
-        
        <div className="ProjectListIndex">
          <div className="list-left">
            <ul className="list-l-Menu">
--- a/src/forge/Main/Index.scss
+++ b/src/forge/Main/Index.scss
@ -1,57 +1,53 @@
+.recommandOri.slick-slider{
+  width: 1300px;
+  margin:20px auto 40px;
+  .slick-track{
+    margin-left: 0px;
+  }
+  .slick-slide{
+    li > a{
+
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+  }
+}
 /* recommandProjects */
-.recommandProjects{
-  display: flex;
-  max-width: 1200px;
-  margin:20px auto;
-}
-.recommandProjects >div{
-  background-color: #fff;
-  border-radius: 10px;
-  width: 220px;
-  margin-right: 25px;
-  cursor: pointer;
-  border: 1px solid #eee;
-  &:last-child{
-    margin-right: 0px;
+.recommandProjects.slick-slider{
+  width: 1230px;
+  margin:20px auto 40px;
+  .slick-track{
+    margin-left: 0px;
  }
-}
-.recommandProjects > div:hover{
-  box-shadow: 0px 2px 20px 0px rgba(0, 0, 0, 0.1);
-}
-.recommandProjects > div .mainInfo{
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  justify-content: center;
-  min-height: 160px;
-  border-bottom: 1px solid #eee;
-  padding:20px;
-  box-sizing: border-box;
-  img{
-    height: 50px;
-    width:50px;
-    border-radius: 50%;
+  .slick-arrow.slick-prev,.slick-arrow.slick-next{
+    &:before{
+      color: #999;
+    }
+    li.slick-active button:before{
+      color: #999;
+    }
  }
-  .name{
-    font-size: 13px;
-    color: #666;
-    height: 18px;
-    line-height: 18px;
-    margin-top:12px;
+  .slick-dots{
+    bottom: -29px;
+    li button:before{
+      color: #909090;
+    }
  }
-  .school{
-    margin-top:12px;
-    color: #333;
-    font-size: 16px;
-    height: 22px;
-    line-height: 22px;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-    max-width:100%;
+  .slick-slide{
+    padding:0px 15px;
+    box-sizing: border-box;
+    & > div{
+      background-color: #fff;
+      border-radius: 10px;
+      width: 100%;
+      cursor: pointer;
+      border: 1px solid #eee;
+      &:hover{
+        box-shadow: 0px 2px 20px 0px rgba(0, 0, 0, 0.1);
+      }
+    }
  }
-}
-.recommandProjects{
  .baseInfo{
    padding:18px 15px;
    display: flex;
@ -72,8 +68,40 @@
      text-align: right;
    }
  }
+  .mainInfo{
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    min-height: 160px;
+    border-bottom: 1px solid #eee;
+    padding:20px;
+    box-sizing: border-box;
+    img{
+      height: 50px;
+      width:50px;
+      border-radius: 50%;
+    }
+    .name{
+      font-size: 13px;
+      color: #666;
+      height: 18px;
+      line-height: 18px;
+      margin-top:12px;
+    }
+    .school{
+      margin-top:12px;
+      color: #333;
+      font-size: 16px;
+      height: 22px;
+      line-height: 22px;
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      max-width:100%;
+    }
+  }
 }
-
 // coderDepot
 .Panels{
  max-width: 1200px;
@ -132,9 +160,7 @@
    height: 7px;
    margin-top: 12px;
    span{
-      border-left: 1px solid #fff;
      &:first-child{
-        border-left: none;
        border-radius: 10px 0px 0px 10px;
      }
      &:last-child{
@ -180,27 +206,33 @@
      border-radius: 4px 4px 0px 0px;
      background-color: #FAFBFC;
      .ellipsistxt{
+        margin-top: 6px;
+        #ptxt{
+          margin-bottom: 0px;
+          word-break: break-all;
+          overflow: unset;
+          white-space:pre-wrap; /* css3.0 */ 
+          white-space:-moz-pre-wrap; /* Firefox */ 
+          white-space:-pre-wrap; /* Opera 4-6 */ 
+          white-space:-o-pre-wrap; /* Opera 7 */ 
+          word-wrap:break-word;
+        }
        margin-left: 13px;
        line-height:18px;
-        margin-top:6px;
        flex:1;
        width: 0;
        color: #666;
-        &>p{
-          word-break:break-all;
-        }
-        &.hide{
+        &.hidetxt{
          height: 18px;
          overflow: hidden;
          position: relative;
          padding-right:8px;
-        }
-        &.hide::after{
-          position: absolute;
-          right: 0px;
-          bottom: 0px;
-          content:"...";
-
+          &::after{
+            position: absolute;
+            right: 0px;
+            bottom: 0px;
+            content:"...";
+          }
        }
      }
      .ellipsis{
@ -223,8 +255,11 @@
    .listtablebody{
      li.listtablepath{
        a{color: #40a9ff;}
+        p{
+          margin-bottom: 0px!important;
+        }
      }
-      li{
+      & > li{
        height: 42px;
        display: flex;
        justify-content: space-between;
@ -284,6 +319,7 @@
  }
 }
 .downMenu{
+  width: 330px;
  box-shadow: 0px 0px 9px rgba(134, 134, 134,0.4);
  background-color: #fff;
  .ant-menu-vertical .ant-menu-item:hover{
@ -298,7 +334,7 @@
  border-radius: 4px;
  .ant-dropdown-menu-item{
    border-radius: 8px;
-    text-align: left;
+    text-align: left!important;
    a{
      width: 350px;
      overflow: hidden;
@ -309,4 +345,29 @@
  .ant-dropdown-menu-item.active{
    background-color: #e6f7ff;
  }
+}
+.catelogue{
+  border:1px solid rgb(211, 211, 211);
+  font-size: 15px;
+  font-weight: normal;
+  border-radius: 5px;
+  margin-right: 10px;
+  padding:0px 10px;
+  height: 30px;
+  line-height: 30px;
+  color: #666!important;
+  display: flex;
+  align-items: center;
+  span{
+    margin-top: 1px;
+  }
+}
+.submoduleStyle{
+  cursor: default;
+  i{
+    cursor: default;
+  }
+  &:hover{
+    color: #05101a;
+  }
 }
--- 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';
@ -17,7 +18,7 @@ class IndexItem extends Component {
  render() {
    const { projects } = this.props;
    return (
-      <div className="project-list minH-670">
+      <div className="project-list minH-670" style={{padding:"0px 20px"}}>
        { projects && projects.length > 0 ? projects.map((item, key) => {
          return (
            <div className="p-r-Item" key={key}>
@ -33,8 +34,11 @@ class IndexItem extends Component {
              }
              <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}`} title={`${item.author.name}/${item.name}`} className="color-grey-3 font-18 task-hide " style={{maxWidth: 470 }}>
+                      {item.author.name}/{item.name}
+                    </Link>
+                    { !item.is_public && <span className="privateTag">私有</span> }
                    {
                      item.forked_from_project_id ?
                        <span className="ml5">
@ -43,27 +47,37 @@ class IndexItem extends Component {
                        : ""
                    }
                    {
-                      item.type && item.type !== 0 ? 
-                      item.type === 2 ?
+                      item.type && item.type === 2 ?
                      <Tooltip title="该项目是一个镜像" className="ml5">
                        <i className="iconfont icon-banbenku font-18 color-green" />
-                      </Tooltip>:
+                      </Tooltip>:""
+                    }
+                    {
+                      item.type && item.type === 1 ?
                      <span className="ml5">
                        <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>
+                    {
+                      item.praises_count && item.praises_count>0 ?
+                      <span className="pariseTag">
+                        <img src={img_parise} alt="" className="pariseImg" />赞 {item.praises_count}
+                      </span>:""
+                    }
+                    {
+                      item.forked_count && item.forked_count>0 ?
+                      <span>
+                        <i className="iconfont icon-fork mr3 font-16" style={{ color: "#1B8FFF" }} />fork {item.forked_count}
+                      </span>:""
+                    }
                  </span>
                </div>
                <p className="break_word task-hide-2 mt10" style={{ maxHeight: "44px",lineHeight:"22px" }}>{item.description}</p>

                <div className="p-r-about">
                  <span className="p-r-detail">
-                    {/* <span><label>浏览量：</label>{item.visits}</span> */}
-                    {/* {item.category && item.category.id && <span>{item.category.name}</span>} */}
                    {item.last_update_time ? <span><label>更新于</label>{item.time_ago}</span> : ""}
                    {item.language && item.language.id ? <span className="color-grey-3">{item.language.name}</span> : ""}
                  </span>
--- a/src/forge/Main/NullData.js
+++ b/src/forge/Main/NullData.js
@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import "../Branch/branch.css"
+import "../Branch/branch.scss"



--- a/src/forge/Main/list.css
+++ b/src/forge/Main/list.css
@ -91,6 +91,7 @@
  display: flex;
  border-bottom:1px solid rgba(238,238,238,1);
  padding:22px 0px;
+  justify-content: flex-start;
 }
 .boxShandow{
  box-shadow:0px 2px 20px 10px rgba(0,0,0,0.03);
@ -100,6 +101,7 @@
  height: 60px;
  border-radius: 50%;
  margin-right: 22px;
+  margin-top: 8px;
 }
 .p-r-Infos{
  flex: 1;
@ -108,6 +110,7 @@
 .p-r-name{
  display: flex;
  justify-content: space-between;
+  align-items: center;
 }
 .p-r-name > p{
  flex: 1;
@ -261,7 +264,10 @@
  border:1px solid #f1f1f1;
  display: flex;
  align-items: center;
-  margin-left: 30px
+  margin-left: 30px;
+  padding:0px;
+  background-color: transparent;
+  box-shadow: none;
 }
 .ant-tooltip {
  max-width: fit-content!important;
@ -561,6 +567,10 @@
  border-bottom: 1px solid #d9d9d9;
  border-radius: 4px 4px 0px 0px;
 }
+.commonBox .commonBox-title.boxTitle{
+  display: flex;
+  justify-content: space-between;
+}
 .synchronism{
  display: block;
  height: 26px;
--- a/src/forge/Main/sub/Contribute.jsx
+++ b/src/forge/Main/sub/Contribute.jsx
@ -42,7 +42,7 @@ function Contribute(props){
    <WhiteBack>
      <Spin spinning={isSpin}>
        <div className="boxPanel">
-          <p className="font-18 mb20">贡献者列表</p>
+          <p className="font-18 padding10-20" style={{borderBottom:"1px solid #eee"}}>贡献者列表</p>
          {
            list && list.length > 0 ?
            <div className="contrbuteList">
--- a/src/forge/Main/sub/DetailBanner.jsx
+++ b/src/forge/Main/sub/DetailBanner.jsx
@ -22,9 +22,9 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
        menuName && projectDetail ? 
        <ul className="headerMenu-wrapper">
          {
-            menuName.map((item,key)=>{
+           Array.isArray(menuName)&& menuName.map((item,key)=>{
              return(
-                <React.Fragment>
+                <React.Fragment key={item.menu_name}>
                  {
                    item.menu_name === "home" &&
                    <li className={pathname==="about" ? "active" : ""}>
@ -65,6 +65,15 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
                      </Link>
                    </li>:""
                  }
+                  {
+                    item.menu_name === "wiki" &&
+                    <li className={pathname === "wiki" ? "active" : ""}>
+                      <Link to={{ pathname: `/projects/${owner}/${projectsId}/wiki`, state }}>
+                        <i className={pathname==="wiki" ? "iconfont icon-wiki_icon color-grey-3 mr5 font-14":"iconfont icon-wiki_icon color-grey-6 font-14 mr5"}></i>
+                        <span>Wiki</span>
+                      </Link>
+                    </li>
+                  }
                  {
                    item.menu_name === "devops" && platform ? 
                    <li className={pathname==="devops" ? "active" : ""}>
--- a/src/forge/Main/sub/Invite.jsx
+++ b/src/forge/Main/sub/Invite.jsx
@ -0,0 +1,28 @@
+import React from 'react';
+import { Tooltip , message } from 'antd';
+import './sub.scss';
+
+function Invite({code,className}) {
+
+  function jsCopy(id) {
+    const copyEle = document.querySelector(id); // 获取要复制的节点
+    const range = document.createRange(); // 创造range
+    window.getSelection().removeAllRanges(); //清除页面中已有的selection
+    range.selectNode(copyEle); // 选中需要复制的节点
+    window.getSelection().addRange(range); // 执行选中元素
+    document.execCommand("Copy"); // 执行copy操作
+    message.success('复制成功');
+  }
+  return(
+    <div className={className}>
+      <span className="font-16 color-grey-6">邀请码</span>
+      <div>
+        <span id="devitecode">{code}</span>
+        <Tooltip title={<p className="edu-txt-center">可以通过邀请码邀请成员加入项目<br/>点击复制邀请码。</p>}  placement={"bottom"}>
+          <i className="iconfont icon-fuzhi2 font-16 color-blue ml8" onClick={()=>jsCopy("#devitecode")}></i>
+        </Tooltip>
+      </div>
+    </div>
+  )
+}
+export default Invite;
--- a/src/forge/Main/sub/UpdateDescModal.jsx
+++ b/src/forge/Main/sub/UpdateDescModal.jsx
@ -35,11 +35,11 @@ function UpdateDescModal({form , visible , onCancel , onOk,desc,website,lesson_u
      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">
--- a/src/forge/Main/sub/sub.scss
+++ b/src/forge/Main/sub/sub.scss
@ -1,11 +1,13 @@
 .boxPanel{
  width: 1200px;
-  margin:0px auto;
-  padding:20px 0px;
+  margin:20px auto;
+  border-radius: 4px;
+  border:1px solid #eee;
  min-height: 500px;
  .contrbuteList{
    display: flex;
    flex-wrap: wrap;
+    padding:20px;
    & > div{
      width: 20%;
    }
@ -20,4 +22,9 @@
    height: 20px;
    line-height: 20px;
  }
+}
+
+.detailsCode{
+  display: flex;
+  justify-content: space-between;
 }
--- a/src/forge/Merge/Index.scss
+++ b/src/forge/Merge/Index.scss
@ -0,0 +1,21 @@
+.i_open{
+  color: #28BD6C!important;
+}
+.i_merged{
+  color: #4C9ED3!important;
+}
+.i_closed{
+  color: #FA6400!important;
+}
+.pr_tags_open{
+  border:1px solid #28BD6C;
+  color: #28BD6C;
+}
+.pr_tags_merged{
+  border:1px solid #4C9ED3;
+  color: #4C9ED3;
+}
+.pr_tags_closed{
+  border:1px solid #FA6400;
+  color: #FA6400;
+}
--- a/src/forge/Merge/MergeItem.js
+++ b/src/forge/Merge/MergeItem.js
@ -5,6 +5,12 @@ import { AlignCenter } from '../Component/layout';
 import { getImageUrl } from "educoder";
 import "./merge.css";

+function turnbar(str){
+  if(str && str.length>0 && str.indexOf("/")>-1){
+    return str.replaceAll('/','%2F');
+  }
+  return str;
+}
 class MergeItem extends Component {
  constructor(props) {
    super(props);
@ -43,16 +49,18 @@ class MergeItem extends Component {
  };

  render() {
-    const { issues, project_name, project_author_name } = this.props;
+    const { issues, project_name, project_author_name , user_admin_or_member} = this.props;
    const { projectsId , owner } = this.props.match.params;
    const { current_user } = this.props;
    const renderList = () => {
      if (issues && issues.length > 0) {
        return issues.map((item, key) => {
+          let status = item.pull_request_staus;
          return (
            <div className="issueItem">
              <div className="flex-1">
                <p className="mb15 df" style={{ alignItems: "center" }}>
+                  <i className={`iconfont icon-hebingqingqiu1 font-14 mr3 i_${status}`}></i>
                  <Link
                    to={`/projects/${owner}/${projectsId}/pulls/${item.pull_request_id}/Messagecount`}
                    className="hide-1 font-15 color-grey-3 fwb lineh-30 mr10"
@ -60,10 +68,10 @@ class MergeItem extends Component {
                  >
                    {item.name}
                  </Link>
-                  <Tag className={`pr_tags_${item.pull_request_staus}`}>
-                    {item.pull_request_staus === "merged"
+                  <Tag className={`pr_tags_${status}`}>
+                    {status === "merged"
                      ? "已合并"
-                      : item.pull_request_staus === "closed"
+                      : status === "closed"
                      ? "已拒绝"
                      : "开启的"}
                  </Tag>
@ -97,33 +105,43 @@ class MergeItem extends Component {
                    </span>
                    <span className="color-grey-8">{item.pr_time}</span>
                    <span className="ml15">
-                      <Tag className="pr-branch-tag">
-                        <Link
-                          to={`/projects/${item.is_original ? item.fork_project_user : owner}/${ item.is_original ? item.fork_project_identifier : projectsId }/tree/${item.pull_request_head}`}
-                          className="maxW200px hide-1 ver-middle"
-                        >
-                          {item.is_original
-                            ? item.fork_project_user
-                            : project_author_name}
-                          :{item.pull_request_head}
-                        </Link>
-                      </Tag>
-                      <span className="mr8 ver-middle">
-                        <i
-                          className={
-                            "iconfont icon-youjiang color-grey-c font-16"
-                          }
-                        ></i>
-                      </span>
-                      <Tag className="pr-branch-tag">
-                        <Link
-                          to={`/projects/${owner}/${projectsId}/tree/${item.pull_request_base}`}
-                          className="maxW200px hide-1 ver-middle"
-                        >
-                          {/* {item.is_fork ? item.pull_request_base : `${item.author_name}:${item.pull_request_base}`} */}
-                          {project_author_name}:{item.pull_request_base}
-                        </Link>
-                      </Tag>
+                      {
+                        item.pull_request_head &&
+                        <Tag className="pr-branch-tag">
+                          <Link
+                            to={`/projects/${item.is_original ? item.fork_project_user : owner}/${ item.is_original ? item.fork_project_identifier : projectsId }/tree/${turnbar(item.pull_request_head)}`}
+                            className="maxW200px hide-1 ver-middle"
+                          >
+                            {item.is_original
+                              ? item.fork_project_user
+                              : project_author_name}
+                            :{item.pull_request_head}
+                          </Link>
+                        </Tag>
+                      }
+                      {
+                        item.pull_request_base && 
+                        <span className="mr8 ver-middle">
+                          <i
+                            className={
+                              "iconfont icon-youjiang color-grey-c font-16"
+                            }
+                          ></i>
+                        </span>
+                      }
+                      {
+                        item.pull_request_base && 
+                        <Tag className="pr-branch-tag">
+                          <Link
+                            to={`/projects/${owner}/${projectsId}/tree/${turnbar(item.pull_request_base)}`}
+                            className="maxW200px hide-1 ver-middle"
+                          >
+                            {/* {item.is_fork ? item.pull_request_base : `${item.author_name}:${item.pull_request_base}`} */}
+                            {project_author_name}:{item.pull_request_base}
+                          </Link>
+                        </Tag>
+                      }
+                      
                    </span>
                  </AlignCenter>
                </p>
@ -165,7 +183,7 @@ class MergeItem extends Component {
                    ) : (
                      ""
                    )}
-                    {current_user && current_user.login ? (
+                    {user_admin_or_member && item.pull_request_status === 0 ? (
                      <div
                        className="milepostleft"
                        style={{
@ -178,7 +196,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/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@ -24,6 +24,12 @@ import MergeFooter from "./merge_footer";
 const Option = Select.Option;
 const TextArea = Input.TextArea;

+function turnbar(str){
+  if(str && str.length>0 && str.indexOf("/")>-1){
+    return str.replaceAll('/','%2F');
+  }
+  return str;
+}
 class MessageCount extends Component {
  constructor(props) {
    super(props);
@ -41,6 +47,7 @@ class MessageCount extends Component {
      edit_spin: false,
      pr_status: undefined,
      pull_request:undefined,
+      conflict_files:[],

      copyVisible:false,
    };
@ -75,7 +82,8 @@ class MessageCount extends Component {
            data: result.data,
            SpinFlag: false,
            pr_status: result.data.pull_request && result.data.pull_request.status,
-            pull_request:result.data.pull_request
+            pull_request:result.data.pull_request,
+            conflict_files:result.data.conflict_files
          });
        } else {
          this.setState({ SpinFlag: false });
@ -102,6 +110,8 @@ class MessageCount extends Component {
            isSpin: false,
            pr_status: 2,
          });
+          const { getDetail } = this.props;
+          getDetail && getDetail();
        } else {
          this.setState({
            isSpin: false,
@ -138,6 +148,8 @@ class MessageCount extends Component {
            SpinMerge: false,
            pr_status: 1,
          });
+          const { getDetail } = this.props;
+          getDetail && getDetail();
        } else {
          this.setState({ SpinMerge: false });
        }
@ -241,6 +253,49 @@ class MessageCount extends Component {
    )
  }

+  // 点击按钮复制功能
+  jsCopy = () => {
+    const copyEle = document.querySelector('#descContent') // 获取要复制的节点
+    const range = document.createRange(); // 创造range
+    window.getSelection().removeAllRanges(); //清除页面中已有的selection
+    range.selectNode(copyEle); // 选中需要复制的节点
+    window.getSelection().addRange(range); // 执行选中元素
+    document.execCommand("Copy"); // 执行copy操作
+  }
+
+  mergeabledMes=()=>{
+    return(
+      <div className="clearfix">
+        <p className="fl">该分支存在冲突，无法自动合并，你可以尝试通过如下命令手动合并</p>
+        <i className="iconfont icon-fuzhi font-16 fr" onClick={()=>this.jsCopy()}></i>
+      </div>
+    )
+  }
+  mergeabledDesc=(base,head,conflict_files)=>{
+    return(
+      <div>
+        <ul id="descContent">
+          <li>git fetch origin</li>
+          <li>git checkout -b {`${base}`} origin/{`${base}`}</li>
+          <li>git merge {`${head}`}</li>
+        </ul>
+        {
+          conflict_files && conflict_files.length>0 && 
+          <div>
+            <p className="mt10 font-16 pt10" style={{borderTop:"1px solid #f9d7d5"}}>如下文件有代码冲突：</p>
+            <p>
+              {
+                conflict_files.map((i,k)=>{
+                  return <p>{i}</p>
+                })
+              }
+            </p>
+          </div>
+        }
+      </div>
+    )
+  }
+
  render() {
    const { projectsId, mergeId , owner } = this.props.match.params;
    
@ -252,7 +307,8 @@ class MessageCount extends Component {
      ismesrge,
      SpinFlag,
      copyVisible,
-      pull_request
+      pull_request,
+      conflict_files
    } = this.state;
    const { current_user, projectDetail } = this.props;
    const menu = (
@ -305,10 +361,10 @@ class MessageCount extends Component {
                      <div className="mt15">
                        <Tag className="pr-branch-tag">
                          <Link
-                            to={`/projects/${owner}/${data.pull_request.is_original?data.project_identifier:projectsId}/tree/${data.pull_request.head}`}
+                            to={`/projects/${data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}/${data.pull_request.is_original?data.project_identifier:projectsId}/tree/${turnbar(data.pull_request && data.pull_request.head)}`}
                            className="ver-middle"
                          >
-                            {data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}:{data.pull_request.head}
+                            {data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}: {turnbar(data.pull_request && data.pull_request.head)}
                          </Link>
                        </Tag>
                        <span className="mr8 ver-middle">
@ -323,7 +379,6 @@ class MessageCount extends Component {
                            to={`/projects/${owner}/${projectsId}/tree/${data.pull_request.base}`}
                            className="ver-middle"
                          >
-                            {/* {data.pull_request.is_fork ? data.pull_request.base : `${data.pull_request.pull_request_user}:${data.pull_request.base}`} */}
                            {data.issue.project_author_name}:{data.pull_request.base}
                          </Link>
                        </Tag>
@ -388,12 +443,6 @@ class MessageCount extends Component {
                  </div>
                  <div className="ml10">
                    <div className="mt15 text-right" style={{display:"flex",justifyContent:"flex-end"}}>
-                      {/* <span className="composeButton">
-                        <Dropdown overlay={this.copyItem()} visible={copyVisible} onClick={(e)=>this.setCopyVisible(e)}>
-                          <span>复制</span>
-                        </Dropdown>
-                        <span>下载为<i className="iconfont icon-sanjiaoxing-down color-blue"></i></span>
-                      </span> */}
                      {operate && (
                          <Button
                            type="green"
@ -440,35 +489,40 @@ class MessageCount extends Component {
                    type="success"
                  />
                )}
-                {pr_status === 0 && projectDetail && projectDetail.permission !=="Reporter" && (
+                {operate && (
                  <Spin spinning={SpinFlag}>
                    <div
                      style={{
                        display:
                          this.state.mergekey === "rebase"
-                            ? this.state.buttonshow === "none"
-                              ? "block"
-                              : "none"
-                            : !ismesrge
-                            ? "block"
-                            : "none",
+                            ? this.state.buttonshow === "none" ? "block" : "none"
+                            : !ismesrge ? "block" : "none",
                      }}
                    >
-                      <p className="mb15">
-                        <Dropdown.Button
-                          overlay={menu}
-                          type="primary"
-                          onClick={this.submitmerge}
-                          icon={<Icon type="caret-down" />}
-                        >
-                          {this.state.mergename}
-                        </Dropdown.Button>
-                      </p>
-                      <Alert
-                        message="该合并请求可以进行自动合并操作"
-                        type="success"
-                        showIcon
-                      />
+                      <Dropdown.Button
+                        overlay={menu}
+                        type="primary"
+                        onClick={this.submitmerge}
+                        className="mb15"
+                        icon={<Icon type="caret-down" />}
+                        disabled={!pull_request || (pull_request && !pull_request.mergeable) }
+                      >
+                        {this.state.mergename}
+                      </Dropdown.Button>
+                      {pull_request && pull_request.mergeable
+                        ?
+                        <Alert
+                          message="该合并请求可以进行自动合并操作"
+                          type="success"
+                          showIcon
+                        />:
+                        <Alert
+                          message={this.mergeabledMes()}
+                          type="error"
+                          description={this.mergeabledDesc(pull_request.base,pull_request.head,conflict_files)}
+                          showIcon
+                        />
+                      }
                    </div>
                    <div>
                      <div
--- a/src/forge/Merge/NewMerge.js
+++ b/src/forge/Merge/NewMerge.js
@ -9,13 +9,14 @@ const Option = Select.Option;
 class NewMerge extends Component {
  constructor(props) {
    super(props);
+    const { branch } = this.props.match.params;
    this.state = {
      data: undefined,
      branches: undefined,
      merge_branches: undefined,
      merge_projects: undefined,
      merge: "master",
-      pull: "master",
+      pull: branch,
      id: undefined,
      is_fork: false,
      projects_names: undefined,
@ -41,9 +42,10 @@ class NewMerge extends Component {

  componentDidUpdate=(preProps)=>{
    const { project } = this.props;
+    const { pull } = this.state;
    let oldProject = preProps.project;
    if(project && oldProject && (oldProject.id !== project.id)){
-      this.compareProject(this.state.id,"master","master");
+      this.compareProject(this.state.id,pull,"master");
    }
  }
  // 页面销毁取消监听 
@ -77,7 +79,8 @@ class NewMerge extends Component {
          this.set_default_pull(result.data.branches);
          this.set_default_merge(result.data.merge_projects);
        }
-        this.compareProject(result.data.id,"master","master");
+        const { pull } = this.state;
+        this.compareProject(result.data.id,pull||"master","master");
        this.setState({isSpin: false})
      })
      .catch((error) => {
@ -104,6 +107,18 @@ class NewMerge extends Component {
      }
      axios.get(url).then(result=>{
        if(result){
+          if (result.data.status === 0) {
+            this.setState({
+              isSpin: false,
+              show_message: false,
+            });
+          } else {
+            this.setState({
+              isSpin: false,
+              show_message: true,
+              default_message: result.data.message,
+            });
+          }
          this.setState({
            comparesData:result.data
          })
@ -113,16 +128,19 @@ class NewMerge extends Component {
  }

  set_default_pull = (branches) => {
-    if(branches && branches.length>0){
-      let default_pull = branches.filter((e) => e.name === "master")
-      if (default_pull.length > 0){
-        this.setState({
-          pull:default_pull[0].name
-        })
-      }else{
-        this.setState({
-          pull:"master"
-        })
+    const { branch } = this.props.match.params;
+    if(!branch){
+      if(branches && branches.length>0){
+        let default_pull = branches.filter((e) => e.name === "master")
+        if (default_pull.length > 0){
+          this.setState({
+            pull:default_pull[0].name
+          })
+        }else{
+          this.setState({
+            pull:"master"
+          })
+        }
      }
    }
  }
@ -139,7 +157,7 @@ class NewMerge extends Component {
          merge:"master"
        })
      }
-      this.ischeckmerge();
+      // this.ischeckmerge();
    }
  }

@ -163,10 +181,12 @@ class NewMerge extends Component {
  };

  selectBrach = (type, value) => {
+    const { projectsId , owner } = this.props.match.params;
    this.state[type] = value;
-    this.ischeckmerge();
+    // this.ischeckmerge();
    let { id ,merge , pull } = this.state;
    if(type==="pull"){
+      this.props.history.push(`/projects/${owner}/${projectsId}/pulls/new/${pull}`)
      this.compareProject(id,value,merge);
    }else{
      this.compareProject(id,pull,value);
@ -178,7 +198,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,
@ -193,7 +213,6 @@ class NewMerge extends Component {
  };

  //判断2分支是否可以合并
-
  ischeckmerge = () => {
    this.setState({ isSpin: true });
    const { projectsId , owner } = this.props.match.params;
--- 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
@ -5,6 +5,7 @@ import "../Order/order.css";
 import "../Order/index.scss";
 import NoneData from "./no_data";
 import OrderItem from "./MergeItem";
+import './Index.scss';

 import axios from "axios";

@ -37,7 +38,7 @@ class merge extends Component {
      // page: 1,
      search_count: undefined,
      issue_type: undefined,
-      status_type: undefined,
+      status_type: "1",
      //设置选择高亮
      openselect: 1,
      closeselect: undefined,
@ -47,7 +48,7 @@ class merge extends Component {
      paix: "排序",
      priority_ids: "优先级",
      select_params: {
-        status_type: undefined, //开启中和关闭中，默认为开启中的
+        status_type: "1", //开启中和关闭中，默认为开启中的
        assigned_to_id: undefined, // 指派人
        fixed_version_id: undefined,
        priority_id: undefined,
@ -154,18 +155,14 @@ class merge extends Component {

  renderMenu = (array, name, id) => {
    return (
-      <Menu>
+      <Menu className="orderCondition">
        <Menu.Item key={"all"} onClick={(e) => this.getOption(e, id, name)}>
          {name}
        </Menu.Item>
-        {array &&
-          array.length > 0 &&
-          array.map((item, key) => {
+        {array && array.length > 0 && array.map((item, key) => {
            return (
-              <Menu.Item
-                key={item.id}
-                onClick={(e) => this.getOption(e, id, item.name)}
-              >
+              ((!item.permission) || (item.permission && item.permission !== "Reporter")) &&
+              <Menu.Item key={item.id} onClick={(e) => this.getOption(e, id, item.name)}>
                {item.name}
              </Menu.Item>
            );
@ -206,23 +203,16 @@ class merge extends Component {
      paix: "排序",
      priority_ids: "优先级",
    });
-    this.state.select_params = {
-      status_type: type,
-      search: undefined,
-      page: 1,
-      limit: 15,
-    };
+    this.state.select_params.status_type = type;
+    this.state.select_params.page=1;
+    this.state.select_params.limit=15;
+    
    this.getIssueList();
  };

-  islogin() {
+  checkOperation() {
    const { projectsId,owner } = this.props.match.params;
-    if (this.props.checkIfLogin() === false) {
-      this.props.showLoginDialog();
-      return;
-    } else {
-      this.props.history.push(`/projects/${owner}/${projectsId}/pulls/new`);
-    }
+    this.props.history.push(`/projects/${owner}/${projectsId}/pulls/new`);
  }
  render() {
    const { projectsId , owner } = this.props.match.params;
@ -264,9 +254,12 @@ class merge extends Component {
              style={{ width: 300 }}
            />
          </div>
-          <a className="topWrapper_btn ml10" onClick={() => this.islogin()}>
-            +&nbsp;新建合并请求
-          </a>
+          {
+            data && data.user_admin_or_member &&
+            <a className="topWrapper_btn ml10" onClick={() => this.checkOperation()}>
+              +&nbsp;新建合并请求
+            </a>
+          }
        </div>
        <div className="f-wrap-between screenWrap">
          <div className="df">
@ -282,6 +275,7 @@ class merge extends Component {
                className={status_type === "1" ? "active" : ""}
                onClick={() => this.openorder("1")}
              >
+                <i className="iconfont icon-hebingqingqiu1 font-14 mr3 i_open"></i>
                <label>开启的</label>
                <span>{data && data.open_count}</span>
              </li>
@ -289,6 +283,7 @@ class merge extends Component {
                className={status_type === "11" ? "active" : ""}
                onClick={() => this.openorder("11")}
              >
+                <i className="iconfont icon-hebingqingqiu1 font-14 mr3 i_merged"></i>
                <label>已合并</label>
                <span>{data && data.merged_issues_size}</span>
              </li>
@ -296,6 +291,7 @@ class merge extends Component {
                className={status_type === "2" ? "active" : ""}
                onClick={() => this.openorder("2")}
              >
+                <i className="iconfont icon-hebingqingqiu1 font-14 mr3 i_closed"></i>
                <label>已拒绝</label>
                <span>{data && data.close_count}</span>
              </li>
@ -400,6 +396,7 @@ class merge extends Component {
                  project_author_name={data.project_author_name}
                  {...this.props}
                  {...this.state}
+                  user_admin_or_member={data && data.user_admin_or_member}
                ></OrderItem>
              </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 });
@ -262,7 +264,7 @@ class MergeForm extends Component {
                      },
                    ],
                    initialValue: title,
-                  })(<Input placeholder="标题" />)}
+                  })(<Input placeholder="标题" maxLength={50} />)}
                </Form.Item>
                <MDEditor
                  placeholder={"请输入合并请求的描述..."}
@ -344,19 +346,21 @@ class MergeForm extends Component {
                      </Select>
                    )}
                  </Form.Item>
-                  <Form.Item name="checkbox-group" label="其他">
-                    <Checkbox.Group>
-                      <div>
-                        <Checkbox value="A">必须审查代码</Checkbox>
-                      </div>
-                      <div>
-                        <Checkbox value="B">合并后删除提交分支</Checkbox>
-                      </div>
-                      <div>
-                        <Checkbox value="C">合并后关闭提到的任务</Checkbox>
-                      </div>
-                    </Checkbox.Group>
-                  </Form.Item>
+                  {/* <Form.Item label="其他">
+                    {getFieldDecorator("checkbox-group")(
+                      <Checkbox.Group>
+                        <div>
+                          <Checkbox value="A">必须审查代码</Checkbox>
+                        </div>
+                        <div>
+                          <Checkbox value="B">合并后删除提交分支</Checkbox>
+                        </div>
+                        <div>
+                          <Checkbox value="C">合并后关闭提到的任务</Checkbox>
+                        </div>
+                      </Checkbox.Group>
+                    )}
+                  </Form.Item> */}
                </div>
              </div>
            </div>
--- a/src/forge/New/Index.js
+++ b/src/forge/New/Index.js
@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import { Link } from 'react-router-dom';
-import { Input , Form , Select , Checkbox , Button , Spin , AutoComplete } from 'antd';
+import { Input , Form , Select , Checkbox , Button , Spin , AutoComplete, Modal } from 'antd';
 import { Base64 } from 'js-base64';

 import '../css/index.scss';
@ -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 = () => {
@ -57,6 +58,8 @@ class Index extends Component {
    this.getGitignore();
    // 获取开源许可证
    this.getLicenses();
+    //判断是否为删除新建项目失败后返回，并执行对应逻辑
+    this.isDeleteProjectBack();
  }
  componentDidUpdate=(prevPros)=>{
    if(prevPros && this.props && !this.props.checkIfLogin()){
@ -67,24 +70,30 @@ class Index extends Component {

  getOwner=()=>{
    const { OIdentifier } = this.props.match.params;
+    const { user_id } = this.props && this.props.current_user;
    const url = `/owners.json`;
    axios.get(url).then(result=>{
      if(result && result.data){
        let owner = result.data.owners;
+        this.setState({
+          OwnerList: owner,
+        })
        if(OIdentifier){
          owner = owner.filter(item=>item.name === OIdentifier);
          this.props.form.setFieldsValue({
            user_id:OIdentifier
          })
-          owner && this.setState({
-            owners_id:owner[0].id,
-            owners_name:owner[0].name
+        }else if(user_id){
+          owner = owner.filter(item=>item.id === user_id);
+          this.props.form.setFieldsValue({
+            user_id:owner && owner[0].name
          })
        }
-        this.setOptionsList(owner, 'owners');
-        this.setState({
-          OwnerList: owner,
+        owner && this.setState({
+          owners_id:owner[0].id,
+          owners_name:owner[0].name
        })
+        this.setOptionsList(owner, 'owners');
      }
    }).catch(error=>{})
  }
@ -137,6 +146,31 @@ class Index extends Component {
    }).catch((error) => { })
  }

+  isDeleteProjectBack = () => {
+    let mirror_status = this.props.history.location.mirror_status;
+    if (mirror_status === 2 && sessionStorage.newProjectValue) {
+      Modal.warning({
+        title: '警告',
+        content: '镜像项目创建失败！请按操作规范重新创建项目！',
+      });
+      let newProjectValue = JSON.parse(sessionStorage.newProjectValue);
+      if (newProjectValue) {
+        this.setState({
+          project_language_id: newProjectValue.project_language_id,
+          project_category_id: newProjectValue.project_category_id,
+          license_id: newProjectValue.license_id,
+          ignore_id: newProjectValue.ignore_id
+        });
+        delete newProjectValue.project_language_id;
+        delete newProjectValue.project_category_id;
+        delete newProjectValue.license_id;
+        delete newProjectValue.ignore_id;
+        this.props.form.setFieldsValue(newProjectValue);
+      }
+
+    }
+  }
+
  // 设置option
  setOptionsList = (data, _head, name) => {
    if (data && data.length > 0) {
@ -165,6 +199,8 @@ class Index extends Component {
        const { project_language_id, project_category_id, license_id, ignore_id , owners_id , owners_name } = this.state;
        const decoderPass = Base64.encode(values.password);
        const url = (projectsType && projectsType === "mirror") ? "/projects/migrate.json" : "/projects.json";
+        // 新建项目的时候，暂存数据，如果失败，返回的时候可以重新赋值
+        sessionStorage.newProjectValue=JSON.stringify({...values,project_language_id,project_category_id,license_id,ignore_id});
        axios.post(url, {
          ...values,
          auth_password:decoderPass,
@ -174,14 +210,12 @@ class Index extends Component {
          ignore_id,
          user_id:owners_id
        }).then((result) => {
-          if (result) {
-            if (result.data.id) {
-              this.setState({
-                isSpin: false
-              })
-              this.props.showNotification(`${projectsType && projectsType === "mirror" ? "镜像" : "托管"}项目创建成功!`);
-              this.props.history.push(`/projects/${owners_name}/${result.data.identifier}`);
-            }
+          if (result && result.data.id) {
+            this.setState({
+              isSpin: false
+            })
+            projectsType && projectsType !== "mirror" && this.props.showNotification(`托管项目创建成功!`);
+            this.props.history.push(`/projects/${result.data.login}/${result.data.identifier}`);
          }
        }).catch((error) => {
          this.setState({
@ -254,6 +288,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 +314,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"}}>
@ -323,7 +366,9 @@ class Index extends Component {
                {
                  projectsType && projectsType === "mirror" &&
                  <React.Fragment>
-                    <p className="mt10 mb10 color-grey-3 pointer" onClick={this.changeMirrorCheck}>需要授权验证<i className={mirrorCheck?"iconfont icon-xiajiantou font-13 ml10 color-grey-8":"iconfont icon-youjiantou font-13 ml10 color-grey-8"}></i></p>
+                    <p className="mt10 mb10 color-grey-3 pointer" onClick={this.changeMirrorCheck}>
+                      需要授权验证<i className={mirrorCheck?"iconfont icon-xiajiantou font-13 ml10 color-grey-8":"iconfont icon-youjiantou font-13 ml10 color-grey-8"}></i>
+                      <span className="ml20 font-12 color-red">如果源项目为公有仓库，禁止填写用户名密码。如果源项目为私有仓库，则必须填写正确的用户名和密码!</span></p>
                    {
                      mirrorCheck &&
                      <div className="df mb20" style={{alignItems:'center'}}>
@ -361,21 +406,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 +431,7 @@ class Index extends Component {
                      required: true, message: '请填写仓库名称'
                    }],
                  })(
-                    <Input placeholder="仓库名称请使用与项目相关的英文关键字" />
+                    <Input placeholder="仓库名称请使用与项目相关的英文关键字" maxLength={100} />
                  )}
                </Form.Item>
                <Form.Item
--- a/src/forge/Newfile/Index.js
+++ b/src/forge/Newfile/Index.js
@ -73,6 +73,7 @@ class Index extends Component {
              content={undefined}
              readOnly={false}
              editorType="new"
+              descName={filename && `Add ${filename}`}
            ></Meditor>
          </div>
        </div>
--- a/src/forge/Newfile/UserSubmitComponent.js
+++ b/src/forge/Newfile/UserSubmitComponent.js
@ -6,6 +6,20 @@ import "./index.css";

 import axios from "axios";
 const TextArea = Input.TextArea;
+
+
+function turnbar(str){
+  if(str && str.length>0 && str.indexOf("/")>-1){
+    return str.replaceAll('/','%2F');
+  }
+  return str;
+}
+function returnbar(str){
+  if(str && str.length>0 && str.indexOf("%2F")>-1){
+    return str.replaceAll('%2F','/');
+  }
+  return str;
+}
 class UserSubmitComponent extends Component {
  constructor(props) {
    super(props);
@ -16,6 +30,24 @@ class UserSubmitComponent extends Component {
    };
  }

+  componentDidMount=()=>{
+    const { descName } = this.props;
+    if(descName){
+      this.props.form.setFieldsValue({
+        desc:descName
+      })
+    }
+  }
+  
+  componentDidUpdate=(preProps)=>{
+    const { descName } = this.props;
+    if(preProps && descName && preProps.descName !== descName ){
+      this.props.form.setFieldsValue({
+        desc:descName
+      })
+    }
+  }
+
  changeSubmittype = (e) => {
    this.setState({
      submitType: e.target.value,
@ -41,7 +73,7 @@ class UserSubmitComponent extends Component {
        const url = `/${owner}/${projectsId}/create_file.json`;
        axios.post(url, {
          filepath: filename ? filename : path,
-          branch: branch,
+          branch: returnbar(branch),
          new_branch: submitType === "1" ? values.branchname : undefined,
          content,
          message: values.desc,
@ -54,7 +86,7 @@ class UserSubmitComponent extends Component {
              const { getTopCount } = this.props;
              getTopCount && getTopCount(values.branchname);
            }
-            let url = `/projects/${owner}/${projectsId}${values.branchname ? `/tree/${values.branchname}`: (branch ? `/tree/${branch}` : "")}`;
+            let url = `/projects/${owner}/${projectsId}${values.branchname ? `/tree/${turnbar(values.branchname)}`: (branch ? `/tree/${turnbar(branch)}` : "")}`;
            this.props.history.push(url);
          }
        })
@ -75,12 +107,13 @@ class UserSubmitComponent extends Component {
    const { projectsId , owner } = this.props.match.params;
    const { submitType } = this.state;
    const url = `/${owner}/${projectsId}/update_file.json`;
+    let b = currentBranch || branch;
    this.props.form.validateFieldsAndScroll((err, values) => {
      if (!err) {
        axios
          .put(url, {
            filepath: detail.path,
-            branch: submitType === "1" ? undefined : (currentBranch || branch),
+            branch: submitType === "1" ? undefined : returnbar(b),
            new_branch: submitType === "1" ? values.branchname : undefined,
            content: content,
            sha: detail.sha,
@ -89,7 +122,8 @@ class UserSubmitComponent extends Component {
          .then((result) => {
            this.setState({ isSpin: false });
            if (result.data && result.data.status === 1) {
-              let url = `/projects/${owner}/${projectsId}${(values.branchname ? `/tree/${values.branchname}` : ((currentBranch || branch) ? `/tree/${currentBranch || branch}`:""))}`;
+              let b = currentBranch || branch;
+              let url = `/projects/${owner}/${projectsId}${(values.branchname ? `/tree/${turnbar(values.branchname)}` : (b ? `/tree/${turnbar(b)}`:""))}`;
              this.props.history.push(url);
              this.props.showNotification("文件修改成功!");
            }
@ -112,6 +146,7 @@ class UserSubmitComponent extends Component {

    const { current_user, filepath, projectDetail , currentBranch } = this.props;
    const { editor_type } = this.props;
+    let b = currentBranch || branch;
    return (
      <div>
        <span className="df" style={{ alignItems: "center" }}>
@ -170,7 +205,7 @@ class UserSubmitComponent extends Component {
                >
                  <Radio value="0" className="mb10">
                    <i className="iconfont icon-banbenku font-16 mr5"></i>
-                    直接提交至<span className="color-orange">{currentBranch || branch}</span>分支
+                    直接提交至<span className="color-orange">{returnbar(b)}</span>分支
                  </Radio>
                  <Radio value="1">
                    <Icon type="pull-request" className="mr5" />
--- a/src/forge/Newfile/m_editor.js
+++ b/src/forge/Newfile/m_editor.js
@ -27,7 +27,7 @@ class m_editor extends Component {

  render() {
    const { editorValue } = this.state;
-    const { readOnly, editorType, language , currentBranch } = this.props;
+    const { readOnly, editorType, language , currentBranch , descName } = this.props;
    const editor_options = {
      lineNumbers: "on",
      wordWrap: true, //强制换行
@ -64,7 +64,7 @@ class m_editor extends Component {
            />
          </div>
            {!readOnly && (
-              <div style={{marginTop:"20px"}}>
+              <div style={{marginTop:"20px",padding:"20px"}}>
                <UserSubmitComponent
                  {...this.props}
                  {...this.state}
@ -72,6 +72,7 @@ class m_editor extends Component {
                  content={editorValue}
                  editor_type={editorType}
                  currentBranch={currentBranch}
+                  descName={descName}
                ></UserSubmitComponent>
                </div>
            )}
--- a/src/forge/Newfile/upload_file.js
+++ b/src/forge/Newfile/upload_file.js
@ -60,6 +60,7 @@ class UploadFile extends Component {
              filepath={file_path}
              content={editorValue}
              editor_type={"upload"}
+              descName={`ADD file via upload`}
            ></UserSubmitComponent>
          </div>
        </div>
--- a/src/forge/Notice/Apply.jsx
+++ b/src/forge/Notice/Apply.jsx
@ -0,0 +1,114 @@
+import React, { useEffect , useState } from 'react';
+import Axios from 'axios';
+import { Pagination , Spin , Popconfirm }from 'antd';
+import { Link } from 'react-router-dom';
+import { getImageUrl } from 'educoder';
+import Nodata from '../Nodata';
+import { FlexAJ } from '../Component/layout';
+
+const limit = 15;
+function Apply(props) {
+  const username = props.match.params.username;
+  const [ list , setList ] = useState(undefined);
+  const [ page , setPage ] = useState(1);
+  const [ total , setTotal ] = useState(0);
+  const [ isSpin , setIsSpin ] = useState(true);
+
+  useEffect(()=>{
+    if(username){
+      setIsSpin(true);
+      getList();
+    }
+  },[username])
+
+  function getList() {
+    const url =  `/users/${username}/applied_projects.json`;
+    Axios.get(url).then(result=>{
+      if(result){
+        setList(result.data.applied_projects);
+        setTotal(result.data.total_count);
+        setIsSpin(false);
+      }
+    }).catch(error=>{})
+  }
+
+  // 接受
+  function acceptDivert(id){
+    const url =  `/users/${username}/applied_projects/${id}/accept.json`;
+    Axios.post(url).then(result=>{
+      if(result && result.data){
+        getList();
+        props && props.deleteEvent("apply",1);
+      }
+    }).catch(error=>{})
+  }
+
+  // 拒绝
+  function revertDivert(id){
+    const url =  `/users/${username}/applied_projects/${id}/refuse.json`;
+    Axios.post(url).then(result=>{
+      if(result && result.data){
+        getList();
+        props && props.deleteEvent("apply",1);
+      }
+    }).catch(error=>{})
+  }
+  return(
+    <div>
+      <Spin spinning={isSpin}>
+        <div style={{minHeight:"400px"}}>
+          {
+            list && list.length > 0 ? 
+            <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.user && i.user.login}`} className="font-15 mr20">{i.user && i.user.name}</Link>
+                          <span className="color-grey-9">{i.time_ago}</span>
+                        </p>
+                        <FlexAJ>
+                          <p>申请以【{i.role === "developer" ?"开发者":i.role === "manager" ? "管理者":"报告者"}】身份加入【{i.project && i.project.name}】项目。是否同意？</p>
+                          {
+                            i.status === "common" &&
+                            <span>
+                              <Popconfirm title={`确定同意${i.user && i.user.name}加入【${i.project && i.project.name}】项目？`} okText="确定" cancelText="取消" onConfirm={()=>acceptDivert(i.id)}>
+                                <a className="color-blue">同意</a>
+                              </Popconfirm>
+                              <Popconfirm title={`确定拒绝${i.user && i.user.name}加入【${i.project && i.project.name}】项目？`} okText="确定" cancelText="取消" onConfirm={()=>revertDivert(i.id)}>
+                                <a className="color-red ml20">拒绝</a>
+                              </Popconfirm>
+                            </span>
+                          }
+                          {
+                            i.status === "accepted" && <span className="color-grey-9">已接受</span>
+                          }
+                          {
+                            i.status === "refused" && <span className="color-grey-9">已拒绝</span>
+                          }
+                        </FlexAJ>
+                      </div>
+                    </li>
+                  )
+                })
+              }
+            </ul>
+            :
+            ""
+          }
+          {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>
+      </Spin>
+    </div>
+  )
+}
+export default Apply;
--- a/src/forge/Notice/Index.jsx
+++ b/src/forge/Notice/Index.jsx
@ -0,0 +1,128 @@
+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 Apply = Loadable({
+  loader: () => import("./Apply"),
+  loading: Loading,
+});
+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 [ menu , setMenu ] = useState("notify");
+  const [ messagesCount , setMessagesCount ] = useState(0);
+  const [ transferCount , setTransferCount ] = useState(0);
+  const [ applyCount , setApplyCount ] = useState(0);
+
+  const [ flag , setFlag ] = useState(true);
+  const { current_user } = props;
+
+  useEffect(()=>{
+    if((username && current_user && (current_user.login !== username))){
+      props.history.push(`/users/${username}`);
+    }
+  },[current_user,username])
+
+  useEffect(()=>{
+    if(user){
+      setTransferCount(user.undo_transfer_projects);
+      setApplyCount(user.undo_join_projects);
+      setMessagesCount(user.undo_messages);
+    }
+  },[user])
+
+  useEffect(()=>{
+    if(pathname && username){
+      if(pathname === `/users/${username}/notice`){
+        setMenu("notify");
+        changeNum(user.undo_messages);
+      }
+      if(pathname === `/users/${username}/notice/undo`){
+        setMenu("undo");
+      }
+      if(pathname === `/users/${username}/notice/apply`){
+        setMenu("apply");
+      }
+    }
+  },[pathname,user])
+
+  function changeNum(){
+    if(flag){
+      messagesCount && props.deleteUndoEvent(messagesCount);
+      setFlag(false);
+    }
+  }
+
+  function deleteEvent(type,count) {
+    let c = count;
+    if(type==="apply"){
+      setTransferCount(transferCount-count);
+    }else if(type==="undo"){
+      setApplyCount(applyCount-count);
+    }else{
+      setMessagesCount(0);
+      c = messagesCount;
+    }
+    (c || c===0) && props.deleteUndoEvent(c);
+  }
+
+  return (
+    <div>
+      <ul className="noticeMenu">
+        <li className={menu === "notify" ? "active":""}>
+          <Link to={`/users/${username}/notice`} onClick={changeNum}>
+            <span>通知</span>
+            {messagesCount ? <span className="unNum">{messagesCount}</span>:""}
+          </Link>
+        </li>
+        <li className={menu === "undo" ? "active":""}>
+          <Link to={`/users/${username}/notice/undo`}>
+            <span>接收仓库</span>
+            {transferCount ? <span className="unNum">{transferCount}</span>:""}
+          </Link>
+        </li>
+        <li className={menu === "apply" ? "active":""}>
+          <Link to={`/users/${username}/notice/apply`}>
+            <span>成员申请</span>
+            {applyCount ? <span className="unNum">{applyCount}</span>:""}
+          </Link>
+        </li>
+      </ul>
+      <Switch>
+        <Route
+          path="/users/:username/notice/apply"
+          render={(p) => {
+            return <Apply {...props} {...p} deleteEvent={deleteEvent}/>;
+          }}
+        ></Route>
+        <Route
+          path="/users/:username/notice/undo"
+          render={(p) => {
+            return <UndoEvent {...props} {...p} deleteEvent={deleteEvent}/>;
+          }}
+        ></Route>
+        <Route
+          path="/users/:username/notice"
+          render={(p) => {
+            return <Notify {...props} {...p} deleteEvent={deleteEvent}/>;
+          }}
+        ></Route>
+      </Switch>
+  </div>
+  );
+}
+export default Index;
--- a/src/forge/Notice/Index.scss
+++ b/src/forge/Notice/Index.scss
@ -0,0 +1,60 @@
+.noticeMenu{
+  padding:0px 30px;
+  display: flex;
+  border-bottom: 1px solid #eee;
+  li{
+    font-size: 16px;
+    padding:0px;
+    margin-right:30px;
+    height: 70px;
+    line-height: 70px;
+    position: relative;
+    transform: none;
+    a{
+      display: flex;
+    }
+    &.active a span{
+      color: #1890ff;
+    }
+    .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: 27px;
+      margin-left: 10px;
+      display: block;
+    }
+  }
+}
+.notifyList{
+  padding:0px 30px;
+  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,113 @@
+import React, { useEffect, useState } from "react";
+import Nodata from '../Nodata';
+import { Pagination , Spin } 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);
+  const [ isSpin , setIsSpin ] = useState(true);
+
+  useEffect(()=>{
+    props && props.deleteEvent("notify",0);
+  },[])
+
+  useEffect(()=>{
+    if(username){
+      setIsSpin(true);
+      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);
+        setIsSpin(false);
+      }
+    }).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 ""
+    }
+  }
+
+  function renderApplyStatus(status,applied) {
+    let { project } = applied;
+    if(status){
+      switch(status){
+        case 'successed':
+          return <p>已通过你加入【<Link to={`/projects/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】项目的申请</p>
+        default:
+          return <p>已拒绝你加入【<Link to={`/projects/${project && project.owner && project.owner.login}/${project && project.identifier}`}>{project && project.name}</Link>】项目的申请</p>
+      }
+    }else{
+      return ""
+    }
+  }
+
+  return(
+    <div>
+      <Spin spinning={isSpin}>
+        <div style={{minHeight:"400px"}}>
+          {
+            list && list.length > 0 ? 
+            <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>
+                        { i.applied_type === "AppliedProject" ? renderApplyStatus(i.status,i.applied):renderStatus(i.status,i.applied)}
+                      </div>
+                    </li>
+                  )
+                })
+              }
+            </ul>
+            :
+            ""
+          }
+          {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>
+      </Spin>
+    </div>
+  )
+}
+export default Notify;
--- a/src/forge/Notice/UndoEvent.jsx
+++ b/src/forge/Notice/UndoEvent.jsx
@ -0,0 +1,123 @@
+import React, { useEffect, useState } from "react";
+import Nodata from '../Nodata';
+import { FlexAJ } from '../Component/layout';
+import { Pagination , Popconfirm , Spin } 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);
+  const [ isSpin , setIsSpin ] = useState(true);
+
+  useEffect(()=>{
+    if(username){
+      setIsSpin(true);
+      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);
+        setIsSpin(false);
+      }
+    }).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.deleteEvent("undo",1);
+      }
+    }).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.deleteEvent("apply",1);
+      }
+    }).catch(error=>{})
+  }
+
+  return(
+    <div>
+      <Spin spinning={isSpin}>
+        <div style={{minHeight:"400px"}}>
+          {
+          list && list.length > 0 ? 
+          <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>
+      </Spin>
+      {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
@ -249,7 +249,7 @@ class Detail extends Component {
                      添加于 {data && data.created_at}
                    </span>
                    {data && data.user_permission ? (
-                      <span className="pull-right">
+                      <span className="pull-right 123123">
                        <a className="color-blue fr" onClick={this.copydetail}>
                          复制
                        </a>
--- a/src/forge/Order/Milepost.js
+++ b/src/forge/Order/Milepost.js
@ -89,8 +89,9 @@ class Milepost extends Component {
          closeselect: status === "closed" ? current_user.user_id : undefined,
          openselect: status === "closed" ? undefined : current_user.user_id
        })
-
-        this.getList(1, status, 'desc')
+        this.getList(1, status, 'desc');
+        const { getDetail } = this.props;
+        getDetail && getDetail();
      }
    }).catch(error => {
      console.log(error);
@ -107,7 +108,9 @@ class Milepost extends Component {
      }
    }).then((result) => {
      if (result) {
-        this.getList(1, this.state.status, 'desc')
+        this.getList(1, this.state.status, 'desc');
+        const { getDetail } = this.props;
+        getDetail && getDetail();
      }
    }).catch((error) => {
      console.log(error);
@ -150,11 +153,11 @@ class Milepost extends Component {
    const { data, limit, page, openselect, closeselect, spinings } = this.state;
    const { projectsId , owner } = this.props.match.params;
    const menu = (
-      <Menu onClick={this.arrayList}>
-        <Menu.Item key={'created_on'} value="desc">到期日从近到远</Menu.Item>
-        <Menu.Item key={'created_on'} value="asc">到期日从远到近</Menu.Item>
-        <Menu.Item key={'percent'} value="desc">完成度从低到高</Menu.Item>
-        <Menu.Item key={'percent'} value="asc">完成度从高到低</Menu.Item>
+      <Menu className="orderCondition" onClick={this.arrayList}>
+        <Menu.Item key={'effective_date'} value="desc">到期日从后到先</Menu.Item>
+        <Menu.Item key={'effective_date'} value="asc">到期日从先到后</Menu.Item>
+        <Menu.Item key={'percent'} value="asc">完成度从低到高</Menu.Item>
+        <Menu.Item key={'percent'} value="desc">完成度从高到低</Menu.Item>
        <Menu.Item key={'issues_count'} value="desc">任务从多到少</Menu.Item>
        <Menu.Item key={'issues_count'} value="asc">任务从少到多</Menu.Item>
      </Menu>
@ -228,8 +231,8 @@ class Milepost extends Component {
                                <Link to={`/projects/${owner}/${projectsId}/milestones/${item.id}/edit`} className="color-grey-9">编辑</Link>
                              </div>
                              <div className="grid-item ml15 color-grey-9">
-                                <i className="iconfont icon-yiguanbi1 font-14 mr5"></i>
-                                <a onClick={() => this.updatestatusemile(this.state.status === "closed" ? "open" : "closed", item)} className="color-grey-9">{this.state.status === "closed" ? "开启" : "关闭"}</a>
+                                <i className={item.status === "closed" ? "iconfont icon-gouxuan font-14 mr5":"iconfont icon-yiguanbi1 font-14 mr5"}></i>
+                                <a onClick={() => this.updatestatusemile(item.status === "closed" ? "open" : "closed", item)} className="color-grey-9">{this.state.status === "closed" ? "开启" : "关闭"}</a>
                              </div>
                              <div className="grid-item ml15 color-grey-9">
                                <i className="iconfont icon-lajitong font-14 mr5" ></i>
--- a/src/forge/Order/MilepostDetail.js
+++ b/src/forge/Order/MilepostDetail.js
@ -69,6 +69,27 @@ class MilepostDetail extends Component {
    })
  }

+  deletedetail = (id) => {
+    const { projectsId , owner } = this.props.match.params;
+    const url = `/${owner}/${projectsId}/issues/${id}.json`;
+    axios.delete(url, {
+      data: {
+        project_id: projectsId,
+        id: id,
+      },
+    })
+    .then((result) => {
+      if (result) {
+        const { page } = this.state;
+        this.getIssueList(page);
+        const { getDetail } = this.props;
+        getDetail && getDetail();
+      }
+    })
+    .catch((error) => {
+      console.log(error);
+    });
+  };
  // 获取列表数据
  getIssueList = ( page , item , value , update , updateValue , type ) => {
    const { projectsId, meilid , owner } = this.props.match.params;
@ -141,7 +162,7 @@ class MilepostDetail extends Component {

  renderMenu = (array, name, id) => {
    return (
-      <Menu>
+      <Menu className="orderCondition">
        <Menu.Item key={"all"} onClick={(e) => this.getOption(e, id, name)}>{name}</Menu.Item>
        {
          array && array.length > 0 && array.map((item, key) => {
@ -218,7 +239,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>
@ -275,7 +296,15 @@ class MilepostDetail extends Component {
                :
                issues && issues.length>0 && issues.map((item,key)=>{
                  return(
-                    <OrderItem key={key} mile item={item} search_count={search_count} page={page} limit={limit} {...this.props} {...this.state}></OrderItem>
+                    <OrderItem 
+                      key={key} mile 
+                      item={item} 
+                      search_count={search_count} 
+                      page={page} 
+                      limit={limit} 
+                      {...this.props} {...this.state}
+                      deletedetail={this.deletedetail}
+                      ></OrderItem>
                  )
                })
            }
--- a/src/forge/Order/OrderItem.js
+++ b/src/forge/Order/OrderItem.js
@ -42,10 +42,9 @@ class OrderItem extends Component {
    })
  }
  render() {
-    const { item , checkbox , mile } = this.props;
+    const { item , checkbox , mile , user_admin_or_member } = this.props;
    const { projectsId , owner } = this.props.match.params;
-    const { current_user } = this.props
-
+    const { current_user } = this.props;
    return (
      item &&
      <div className="issueItem">
@ -91,13 +90,13 @@ class OrderItem extends Component {
            <div className="milepostleft">
              <Link to={`/projects/${owner}/${projectsId}/issues/${item.id}/detail`}><i className="iconfont icon-pinglun1 mr3 font-16"></i>{item.journals_count}</Link>
              {
-                current_user && current_user.login ?
-                <div style={{ display: this.state.orderid === item.id && this.state.isdisplay ? 'flex' : 'none' }}>
+                user_admin_or_member ?
+                <div id="hoverBox" style={{ display: this.state.orderid === item.id && this.state.isdisplay ? 'flex' : 'none' }}>
                  <div className="mr8 ml8 color-grey-9">
                    <Link to={`/projects/${owner}/${projectsId}/issues/${item.id}/updatedetail`} className="color-grey-9"><i className="iconfont icon-bianji3 font-14 mr5"></i></Link>
                  </div>
                  <div className="color-grey-9">
-                    <Popconfirm placement="bottom" title={'您确定要删除吗'} okText="是" cancelText="否" onConfirm={() => this.deletedetail(item.id)}>
+                    <Popconfirm placement="bottom" overlayClassName="overlayBox" getPopupContainer={()=>document.getElementById("hoverBox")} title={'您确定要删除当前易修吗？'} okText="是" cancelText="否" onConfirm={() => this.deletedetail(item.id)}>
                      <i className="iconfont icon-yiguanbi1 font-14"></i>
                    </Popconfirm>
                  </div>
--- a/src/forge/Order/UpdateMilepost.js
+++ b/src/forge/Order/UpdateMilepost.js
@ -180,8 +180,8 @@ class UpdateMilepost extends Component {
                        <Row type="flex" justify="space-between">
                          <Col>
                            <Group size="small" onChange={e => onTypeChange(e.target.value)} value={type}>
-                              <Button value="month">月份</Button>
-                              <Button value="year">年份</Button>
+                              <Button value="month">日期</Button>
+                              <Button value="year">月份</Button>
                            </Group>
                          </Col>
                          <Col>
--- a/src/forge/Order/newMilepost.js
+++ b/src/forge/Order/newMilepost.js
@ -64,6 +64,8 @@ class NewMilepost extends Component {
          if (result) {
            this.setState({ isSpin: false })
            this.props.history.push(`/projects/${owner}/${projectsId}/milestones`);
+            const { getDetail } = this.props;
+            getDetail && getDetail();
          }
        }).catch(error => {
          this.setState({ isSpin: false })
@ -100,7 +102,7 @@ class NewMilepost extends Component {
                      required: true, message: '请输入标题'
                    }],
                  })(
-                    <Input placeholder="标题" autoComplete="off"/>
+                    <Input placeholder="标题" autoComplete="off" maxLength="30" />
                  )}
                </Form.Item>
              </div>
@ -111,7 +113,7 @@ class NewMilepost extends Component {
                    required: true, message: '请输入描述内容'
                  }],
                })(
-                  <TextArea placeholder="请输入描述内容..." style={{ height: "150px" }} />
+                  <TextArea placeholder="请输入描述内容..." style={{ height: "150px" }} maxLength={500} />

                )}
              </Form.Item>
--- a/src/forge/Order/order.css
+++ b/src/forge/Order/order.css
@ -17,7 +17,9 @@
  line-height: 18px;
  color: red;
 }
-
+.overlayBox{
+  width: 230px;
+}
 .topmilepost {
  box-sizing: border-box;
  display: flex;
@ -590,7 +592,7 @@ a.issue-type-button.active:hover {
 }

 /* 发布人、指派人数量过多时要出现滚动条 */
-.ant-dropdown-menu {
+.ant-dropdown-menu.orderCondition {
  max-height: 350px;
  overflow-y: auto;
 }
--- a/src/forge/Order/order.js
+++ b/src/forge/Order/order.js
@ -201,7 +201,7 @@ class order extends Component {

  renderMenu = (array, name, id, toGet) => {
    return (
-      <Menu>
+      <Menu className="orderCondition">
        <Menu.Item key={"all"} onClick={(e) => this.getOption(e, id, name, toGet)}>
          {name}
        </Menu.Item>
@ -268,11 +268,8 @@ class order extends Component {
      checkedValue:[],
      all:undefined
    });
-    this.state.select_params = {
-      search: undefined,
-      page: 1,
-      limit: 15,
-    };
+    this.state.select_params.page = 1;
+    this.state.select_params.limit = 15;
    this.getIssueList(type);
  };

@ -337,6 +334,8 @@ class order extends Component {
        const { status_type } = this.state;

        this.getIssueList(status_type);
+        const { getDetail } = this.props;
+        getDetail && getDetail();
      }
    })
    .catch((error) => {
@ -348,17 +347,14 @@ class order extends Component {
    this.props.showLoginDialog();
  }
  renderNew =()=>{
-    const { projectsId , owner } = this.props.match.params;
-    if (this.props.checkIfLogin()) {
+    const { data } = this.state;
+    if(data && data.user_admin_or_member){
+      const { projectsId , owner } = this.props.match.params;
      return(
        <Link className="topWrapper_btn ml10" target="_blank" to={`/projects/${owner}/${projectsId}/issues/new`}>
-          +&nbsp;创建任务
+          +&nbsp;创建易修
        </Link>
      )
-    }else{
-      return(
-        <a className="topWrapper_btn ml10" onClick={this.islogin}>+&nbsp;创建任务</a>
-      )
    }
  }

@ -438,6 +434,8 @@ class order extends Component {
      status_id: select_params.update_status_id
    }).then(result => {
      if (result) {
+        const { getDetail } = this.props;
+        (select_params && select_params.update_status_id) && getDetail && getDetail();
        this.props.showNotification("修改成功！");
        this.successFunc();
      }
@ -451,7 +449,6 @@ class order extends Component {
    const { status_type } = this.state;
    this.getIssueList(status_type);
  }
-
  resetSelectParams = () => {
    let select_params = this.state.select_params;
    select_params.update_author_id = undefined;
@ -482,6 +479,8 @@ class order extends Component {
          ids: checkedValue
        }).then(result => {
          if (result) {
+            const { getDetail } = this.props;
+            getDetail && getDetail();
            this.props.showNotification("删除成功！");
            this.successFunc();
          }
@ -553,7 +552,7 @@ class order extends Component {
        <div className="topWrapper" style={{borderBottom:"none"}}>
          <div className="target-detail-search">
            <Search
-              placeholder="输入issue名称进行搜索"
+              placeholder="输入关键字搜索易修"
              enterButton
              onSearch={this.searchFunc}
              style={{ width: 300 }}
@ -574,7 +573,7 @@ class order extends Component {
          <div className="f-wrap-between screenWrap">
            <div className="df">
              {
-                current_user && current_user.login ?
+                ((current_user && current_user.login) && (data && data.user_admin_or_member)) ?
                  <Checkbox value="0" style={{ lineHeight: "50px", marginRight: "15px" }} checked={all} onChange={this.changeAll}></Checkbox>
                  : ""
              }
@ -819,13 +818,14 @@ class order extends Component {
                      <OrderItem
                        key={key}
                        item={item}
-                        checkbox={current_user ? <Checkbox value={item.id} key={item.id} style={{ margin: '4px 15px 0px 0px' }}></Checkbox> : ""}
+                        checkbox={current_user &&(data && data.user_admin_or_member) ? <Checkbox value={item.id} key={item.id} style={{ margin: '4px 15px 0px 0px' }}></Checkbox> : ""}
                        search_count={search_count}
                        page={select_params.page}
                        limit={select_params.limit}
                        {...this.props}
                        {...this.state}
                        deletedetail={this.deletedetail}
+                        user_admin_or_member={data && data.user_admin_or_member}
                      ></OrderItem>
                    )
                  })}
@ -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
@ -92,10 +92,10 @@ class order_form extends Component {

    const url = `/${owner}/${projectsId}/issues/new.json`;
    axios.get(url).then((result) => {
-      if (result) {
+      if (result && result.data) {
        this.setState({
          issue_chosen: result.data.issue_chosen,
-          branches: result.data.branches,
+          branches: result.data.issue_chosen.branches,
          isSpin:false
        });

@ -193,13 +193,14 @@ class order_form extends Component {
            if (result) {
              this.props.history.push(`/projects/${owner}/${projectsId}/issues/${orderId}/detail`);
              this.props.showNotification("任务更新成功！");
+              const { getDetail } = this.props;
+              getDetail && getDetail();
            }
          })
          .catch((error) => {
            this.setState({
              isSpin: false,
            });
-            console.log(error);
          });
        }
      }
@ -310,17 +311,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/SecuritySetting/Index.jsx
+++ b/src/forge/SecuritySetting/Index.jsx
@ -0,0 +1,68 @@
+import React from "react";
+
+import { Route, Switch } from "react-router-dom";
+import { withRouter } from "react-router";
+
+import { SnackbarHOC } from "educoder";
+import { CNotificationHOC } from "../../modules/courses/common/CNotificationHOC";
+import { TPMIndexHOC } from "../../modules/tpm/TPMIndexHOC";
+import Loadable from "react-loadable";
+import Loading from "../../Loading";
+import { Box , Gap , LongWidth } from '../Component/layout';
+import { getImageUrl } from 'educoder';
+import { Link } from 'react-router-dom';
+
+import './Index.scss';
+
+const SSHNew = Loadable({
+  loader: () => import("./sub/New"),
+  loading: Loading,
+});
+const SSHIndex = Loadable({
+  loader: () => import("./sub/SSH"),
+  loading: Loading,
+});
+function Index(props){
+  const { current_user } = props;
+  const { pathname } = props.location;
+
+  return(
+    <div className="newMain clearfix whiteBack">
+      <div className="boies">
+        <Box>
+          <div className="shortW">
+            <div className="userDetail">
+              <img src={getImageUrl(`/${current_user && current_user.image_url}`)} alt=""/>
+              <span>{current_user && current_user.username}</span>
+            </div>
+            <ul className="securityUl">
+              <li>安全设置</li>
+              <li className={pathname.indexOf("/settings/SSH")>-1 ?"active":""}><Link to={`/settings/SSH`}><i className="iconfont icon-xuanzhongssh_icon mr5 font-14"></i>SSH密钥</Link></li>
+            </ul>
+          </div>
+          <LongWidth>
+            <Gap>
+              <Switch>
+                <Route
+                  path="/settings/SSH/new"
+                  render={(p) => (
+                    <SSHNew {...props} {...p}/>
+                  )}
+                ></Route>
+                <Route
+                  path="/settings/SSH"
+                  render={(p) => (
+                    <SSHIndex {...props} {...p}/>
+                  )}
+                ></Route>
+              </Switch>
+            </Gap>
+          </LongWidth>
+        </Box>
+      </div>
+      
+    </div>
+  )
+}
+export default withRouter((CNotificationHOC()(SnackbarHOC()(TPMIndexHOC(Index))))
+);
--- a/src/forge/SecuritySetting/Index.scss
+++ b/src/forge/SecuritySetting/Index.scss
@ -0,0 +1,192 @@
+.whiteBack{
+  background-color: #fff;
+  .boies{
+    width: 1200px;
+    margin:0px auto;
+    padding:30px 0px 10px;
+    .shortW{
+      width: 198px;
+      border: 1px solid rgba(153, 153, 153, 0.22);
+      border-radius: 4px;
+      min-height: 400px;
+      margin-bottom: 30px;
+      .userDetail{
+        background: rgba(153, 153, 153, 0.05);
+        border-radius: 4px 4px 0px 0px;
+        padding:20px 25px;
+        display: flex;
+        align-items: center;
+        justify-content: flex-start;
+        img{
+          height: 48px;
+          width: 48px;
+          border-radius: 50%;
+          margin-right: 12px;
+        }
+        span{
+          font-size: 16px;
+          color: #333;
+          max-width: 90px;
+          display: block;
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+        }
+      }
+      .securityUl{
+        padding:20px 16px;
+        color: #333;
+        li{
+          margin-bottom: 10px;
+          height: 27px;
+          line-height: 27px;
+          position: relative;
+          cursor: pointer;
+          a{
+            color: #666;
+            &:hover{
+              color: #333;
+            }
+          }
+          &.active a{
+            color: #333;
+          }
+          &:first-child{
+            font-size: 16px;
+          }
+          &.active::before{
+            position: absolute;
+            left: -16px;
+            top:0px;
+            height: 100%;
+            width: 2px;
+            content: "";
+            background-color: #2A61FF;
+          }
+        }
+      }
+    }
+    .sshHead{
+      display: flex;
+      align-items: center;
+      padding:15px 20px;
+      justify-content: space-between;
+      border-bottom: 1px solid #EEEEEE;
+      &>span{
+        font-size: 18px;
+      }
+    }
+    .ant-list-item{
+      padding:20px;
+      border-bottom: 1px solid #eee!important;
+      &>img{
+        margin-right: 24px;
+      }
+      &>div{
+        flex:1;
+        width: 0;
+        margin-right: 20px;
+        p{
+          margin-bottom: 8px!important;
+        }
+        span{
+          font-size: 12px;
+        }
+      }
+      .ant-btn.ant-btn-danger{
+        background-color: #fff;
+        border-color: #D0D0D0;
+        color: #DF0002;
+        &:hover{
+          background-color: #DF0002;
+          color: #fff;
+          border-color: #DF0002;
+        }
+      }
+    }
+    .questionLink{
+      padding:15px 20px;
+      a{
+        color: #4B7AFF;
+        &:hover{
+          text-decoration: underline;
+        }
+      }
+    }
+    .sshForm{
+      padding:15px 20px;
+      .ant-col.ant-form-item-label{
+        font-size: 16px;
+        color:#333;
+      }
+    }
+  }
+}
+.deleteBox{
+  .ant-modal-header{
+    background-color: rgba(223, 0, 2, 0.06);
+    border-bottom: none;
+    .ant-modal-title{
+      text-align: left;
+      font-size: 20px;
+    }
+  }
+  .ant-modal-body{
+    padding:30px 50px;
+    p{
+      font-size: 16px;
+      line-height: 26px;
+      color:#666
+    }
+    .desc{
+      .descMain{
+        align-items: center;
+        justify-content: center;
+        font-size: 20px;
+        margin-bottom: 10px;
+        i{
+          font-size: 38px!important;
+          color:#DF0002
+        }
+      }
+    }
+  }
+  .ant-modal-footer{
+    border-top: none;
+    text-align: center;
+    padding-bottom: 40px;
+    button{
+      width: 120px;
+      margin:0px 20px;
+      &.ant-btn-danger{
+        background-color: #fff;
+        color: #DF0002;
+        border-color: #D0D0D0;
+      }
+    }
+  }
+}
+.descModal{
+  .ant-modal-title{
+    text-align: left;
+    font-size: 20px;
+  }
+  .keyContent{
+    border:1px solid #eee;
+    border-radius: 4px;
+    padding:10px 15px;
+    margin-top: 10px;
+    max-height: 200px;
+    overflow-y: auto;
+  }
+  .keysTitle{
+    display: flex;
+    align-items: flex-start;
+    justify-content: flex-start;
+    flex-wrap: wrap;
+    span:last-child{
+      word-break: break-all;
+      flex:1;
+    }
+  }
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
何童崇	52e08e77e5	修改websocket问题	2021-08-25 11:52:52 +08:00
jasder	fb872f3a3d	change request url	2021-08-20 09:06:57 +08:00
何童崇	19ef012a0e	修改指向路径	2021-08-20 09:01:40 +08:00
jasder	b3d62b9cf1	FIX bug	2021-08-19 21:54:56 +08:00
何童崇	d988c4ea5f	兼容页面刷新时的id新增	2021-08-19 21:23:48 +08:00
caishi	313f1edc71	镜像问题websocket传值镜像问题websocket传值	2021-08-19 17:44:13 +08:00
caishi	8adc662e9b	wiki功能分支合并 wiki功能分支合并	2021-08-19 17:31:36 +08:00
何童崇	ff75065a0a	新增wiki模块	2021-08-19 17:21:18 +08:00
何童崇	6e74f88d9e	紧急修复镜像bug	2021-08-19 10:40:44 +08:00
caishi	3294d99516	href	2021-08-09 11:03:49 +08:00
caishi	001cb8da53	issue	2021-08-06 15:06:23 +08:00
caishi	d09e6e2bc6	issue	2021-08-06 14:07:59 +08:00
caishi	e2ad3b1308	issue-同步镜像项目不能对仓库进行操作（新建合并请求、新建发行版等）	2021-08-05 17:13:57 +08:00
caishi	14f80d56ad	Merge branch 'develop' of https://git.trustie.net/jasder/forgeplus-react into develop	2021-08-05 11:12:11 +08:00
caishi	65e7025035	Merge branch 'develop' of https://git.trustie.net/jasder/forgeplus-react into develop # Conflicts: # src/forge/Main/sub/UpdateDescModal.jsx	2021-08-05 11:11:51 +08:00
hc1913847458	aa786f0cf0	限制字符	2021-08-05 10:57:43 +08:00
hc1913847458	2aad9c67f5	限制字符	2021-08-05 10:53:29 +08:00
hc1913847458	de636eed6d	限制字符	2021-08-05 10:42:08 +08:00
caishi	4bde5da97c	markdown-issue	2021-08-05 10:30:04 +08:00
caishi	f944ebad6f	issue	2021-08-04 17:12:29 +08:00
caishi	5140bfbe77	issue修改	2021-08-03 17:37:14 +08:00
caishi	affbe87dfd	新增流水线弹框z-index	2021-08-03 10:38:39 +08:00
caishi	dd1beb3116	合并请求-已拒绝的不能编辑	2021-08-03 09:34:11 +08:00
caishi	d67862156c	update issue	2021-08-02 15:32:51 +08:00
caishi	47365c0bed	webhook-修改一版	2021-08-02 10:35:36 +08:00
caishi	b1ec068663	webhook自动填充	2021-07-30 20:13:34 +08:00
caishi	51d34a7667	同上-password-webhook	2021-07-30 17:35:53 +08:00
caishi	2b47c1ff9a	同上-修改bug	2021-07-30 17:02:44 +08:00
caishi	f7698334ab	webhook上线测试版-1	2021-07-30 15:06:32 +08:00
caishi	f100875b0f	ssh翻页	2021-07-26 09:38:21 +08:00
caishi	4f9f5649a9	设置模块-测试版第一版	2021-07-22 17:44:12 +08:00
caishi	f90243243f	新建项目跳转后的地址	2021-07-21 10:09:48 +08:00
caishi	7a5db58a03	appconfig	2021-07-15 14:46:22 +08:00
caishi	0889ee69c5	未登录时：路由/不显示顶部和底部	2021-07-13 10:42:56 +08:00
caishi	876ee66a05	详情：复刻按钮不能连续点击	2021-07-13 09:58:08 +08:00
caishi	cb514315a6	新建合并请求：切换目标分支或者源分支时不用调用check_can_merge接口	2021-07-12 18:22:36 +08:00
caishi	c5b729038c	邀请码位置，页面整体的加载	2021-07-09 17:10:55 +08:00
caishi	a6d713d1f6	代码库：增加文件类型submodule 不允许点击	2021-07-09 11:28:51 +08:00
caishi	ee1217e171	本地版：replaceAll无替换时报错	2021-07-09 11:05:19 +08:00
caishi	967ff385aa	代码库根目录：点击readme文件的编辑按钮时要显示编辑状态	2021-07-07 11:16:07 +08:00
caishi	e6e0546e27	permission有为空的情况	2021-07-06 14:40:23 +08:00
caishi	1bb339bfb1	新建：拥有者默认选中当前登录用户，默认路由	2021-07-06 11:54:57 +08:00
caishi	275b7d2015	数据为0时不显示	2021-07-05 20:35:29 +08:00
caishi	9e9e4c07bf	合并请求详情：发布合并请求者跳转链接错误	2021-07-05 15:04:17 +08:00
caishi	f854d2164c	工作流-构建列表-头像地址错误	2021-07-02 18:18:49 +08:00
caishi	e48628389e	镜像地址增加跳转链接	2021-07-02 15:35:43 +08:00
caishi	62b9abedbb	index.html lang="zh-cN"禁止浏览器翻译	2021-07-01 16:45:47 +08:00
caishi	f97ca92e41	update	2021-07-01 15:48:04 +08:00
caishi	84bbf5fd52	易修批量修改：非项目协作者不能操作	2021-07-01 13:56:09 +08:00
caishi	ff60cf11e1	update issue	2021-06-30 10:43:22 +08:00
caishi	45f188e6f4	fork项目不能修改可见性（公有私有）	2021-06-29 17:29:35 +08:00
caishi	4b832f40c0	项目详情：顶部信息排版调整，修改显示bug	2021-06-29 14:03:53 +08:00
caishi	1cdf316852	合并请求：冲突文件的显示换行	2021-06-25 18:33:54 +08:00
caishi	79996bd185	权限：易修和合并请求的新建修改等操作权限	2021-06-25 18:21:31 +08:00
caishi	2d312b6176	路由：tree后面的参数branch内容含有/	2021-06-25 14:10:13 +08:00
caishi	bad4f79a0c	易修：批量删除和批量修改issue状态要更新数量	2021-06-22 10:22:00 +08:00
caishi	fad42414dc	代码库：提交信息的显示和隐藏	2021-06-21 17:52:48 +08:00
caishi	c10799b6d0	Merge branch 'develop_search' into develop	2021-06-21 10:00:35 +08:00
caishi	cb95e50a82	代码库：从文件详情切换到文件列表时，上传文件和新建文件的按钮没有显示	2021-06-18 16:55:52 +08:00
caishi	5eaebd4e42	上传文件显示: ADD file via upload 创建新文件显示： Add 文件名修改文件： Update 文件名	2021-06-18 14:23:46 +08:00
caishi	e9badf0d7c	合并请求默认选中开启中的	2021-06-18 09:59:33 +08:00
caishi	e72e817bb1	复刻自，如果是组织要跳转到组织界面	2021-06-17 16:28:27 +08:00
caishi	b5835145f7	个人中心性别icon不显示	2021-06-17 11:38:53 +08:00
caishi	d4e1b2f414	详情banner数量，显示开启中的数量，且执行关闭或者拒绝等修改状态的操作时要更新数量	2021-06-16 15:51:47 +08:00
caishi	f4b3afde6a	项目详情和个人中心的项目列表，增加私有标识	2021-06-16 11:17:46 +08:00
caishi	5806f60491	右侧按钮-帮助弹框	2021-06-16 09:17:33 +08:00
caishi	8298aef72f	forked from 文案	2021-06-15 11:36:42 +08:00
caishi	7ed8d1c8c3	合并全局搜索	2021-06-15 09:21:56 +08:00
何童崇	1d274985ca	解决冲突并提交	2021-06-11 19:03:17 +08:00
何童崇	71d1eb57cc	还原代理的配置	2021-06-11 17:51:54 +08:00
caishi	56434a9714	Merge branch 'draft' into develop	2021-06-11 17:21:27 +08:00
caishi	8b161630c3	添加成员--随便输入不存在的用户时的提示	2021-06-11 16:46:59 +08:00
何童崇	405053696c	修改头部搜索框高度和代理服务路径	2021-06-11 15:28:40 +08:00
caishi	3dffbce8d9	头部导航栏-搜索小改	2021-06-11 11:01:46 +08:00
caishi	63e9cfe394	项目邀请码-第一版测试版上线	2021-06-11 09:25:59 +08:00
何童崇	b38cdd4bb3	修改search校验，同页搜索问题	2021-06-10 17:05:49 +08:00
何童崇	681d0b17e3	修改搜索的功能及图标	2021-06-09 19:47:14 +08:00
caishi	b5fa231adf	小修	2021-06-09 18:00:31 +08:00
caishi	39f0a165b6	issue	2021-06-09 18:00:09 +08:00
caishi	2157f2ffe5	merge	2021-06-09 18:00:06 +08:00
caishi	7c40f9be36	merge 冲突	2021-06-09 17:59:07 +08:00
caishi	93694594c4	冲突	2021-06-09 17:58:11 +08:00
caishi	32299252ad	详情+邀请码的显示	2021-06-09 17:37:04 +08:00
caishi	a12ab04ec0	小修	2021-06-09 11:52:36 +08:00
何童崇	f93df6069c	修改搜索placeplaceholder	2021-06-08 16:08:58 +08:00
何童崇	ff2586f5b9	注释众包/帖子等tab	2021-06-08 16:05:32 +08:00
caishi	b7613584f9	添加成员后要清除选中的成员	2021-06-08 15:09:52 +08:00
caishi	0b7d6ab5fd	issue	2021-06-08 14:56:00 +08:00
caishi	3d764d3075	issue+新建组织-未登录没有弹出登录框	2021-06-08 10:44:44 +08:00
caishi	3cd51d1c72	修改-个人主页	2021-06-07 11:13:38 +08:00
caishi	40f8f5d872	数据统计三个时间筛选参数值必须是时间戳	2021-06-04 14:29:55 +08:00
caishi	e185ae6484	同上+样式	2021-06-04 13:58:42 +08:00
caishi	0bfa7572a5	bug	2021-06-04 10:55:05 +08:00
caishi	fd19a43168	修改资料+密码管理	2021-06-04 09:43:38 +08:00
何童崇	dd9c11dbd9	上传搜索的页面	2021-06-03 10:37:03 +08:00
何童崇	695d5e4f50	Merge remote-tracking branch 'upstream/develop' into dev-search	2021-06-03 10:01:51 +08:00
何童崇	b88c5b1faf	修改导航的搜索	2021-06-03 10:00:24 +08:00
caishi	975d49b80b	同上=issue修改	2021-06-02 18:22:29 +08:00
caishi	4b6592dfb3	同上-修改细节	2021-05-31 18:39:30 +08:00
caishi	1432afebfd	个人中心整体上线	2021-05-31 17:44:30 +08:00
caishi	a9285f37e7	概览页数据绑定完成，只差数据统计页	2021-05-31 09:48:30 +08:00
caishi	d41dce26b1	year	2021-05-28 17:02:54 +08:00
caishi	7bbda5f65d	概览+用户画像	2021-05-28 16:19:40 +08:00
caishi	0274cf84ee	上一版+update	2021-05-26 16:48:18 +08:00
caishi	8e419e63da	上一版-update	2021-05-26 16:00:55 +08:00
caishi	1378ba5c93	代码库-无默认分支时调用entries接口未传ref参数，+个人主页的三个echart	2021-05-26 15:25:21 +08:00
caishi	ae9b48953e	markdown定位问题	2021-05-25 10:05:14 +08:00
caishi	3453aa31eb	readme下拉	2021-05-21 19:21:16 +08:00
caishi	ebf75ed433	issue	2021-05-21 18:58:17 +08:00
caishi	a1bd41795a	分享功能（仅微信）+ 合并请求增加状态的显示，合并请求详情增加（冲突情况下的提示）	2021-05-21 16:44:40 +08:00
caishi	09bf75c6c3	右侧按钮-帮助列表超出没有隐藏	2021-05-14 17:03:27 +08:00
caishi	70af7dae5f	右侧按钮-帮助和返回顶部	2021-05-14 14:37:59 +08:00
caishi	d029840874	头部导航栏无logo是nav也要显示	2021-05-14 11:30:08 +08:00
caishi	303e06586e	新增icon+添加右侧的返回顶部等按钮（接口没有，先隐藏、需要合并到其它分支，上一个提交也一样）	2021-05-14 09:32:23 +08:00
caishi	7ccc1221ef	style	2021-05-11 14:22:01 +08:00
caishi	6a6f0ca784	组件之间进行页面跳转时，滚动条未返回至顶部	2021-05-10 17:24:49 +08:00
caishi	b70dd5928e	details	2021-05-10 11:34:30 +08:00
caishi	202081bbeb	样式	2021-05-08 16:53:16 +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	a408d435f3	统一项目简介、项目概览	2021-05-07 16:26:50 +08:00
caishi	016f7f1a7e	去掉Markdown代码块的间隔色、编号等+issue	2021-05-07 16:00:57 +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	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	c0ddd6eaee	组织-项目列表显示name	2021-04-26 17:20:54 +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	fb41baacc1	代码库编辑文件-切换到其它目录后要重新将编辑状态改为显示状态	2021-04-25 17:46:38 +08:00
caishi	09065383c1	转移项目-前端页面已画完	2021-04-25 17:38:47 +08:00
caishi	c32e215b27	样式覆盖	2021-04-23 18:04:07 +08:00