diff --git a/config/webpack.config.dev.js b/config/webpack.config.dev.js
index e95cffd11..9756df5bb 100644
--- a/config/webpack.config.dev.js
+++ b/config/webpack.config.dev.js
@@ -17,6 +17,13 @@ const paths = require("./paths");
 const publicPath = "/";
 const env = getClientEnvironment("/","development");
 
+const process = require('process');
+
+process.on('uncaughtException', function (err) {
+    // 开发时，websocket proxy 会因服务重新部署而报错中断本地 server，这里拦截一下
+    console.log('拦截未处理异常:', err);
+});
+
 module.exports = {
   optimization: {
     splitChunks: {
@@ -273,12 +280,11 @@ module.exports = {
       reactPath:'react.production.min.js',
     }),
     new InterpolateHtmlPlugin(HtmlWebpackPlugin, env.raw),
-
     // Add module names to factory functions so they appear in browser profiler.
     new webpack.NamedModulesPlugin(),
     // Makes some environment variables available to the JS code, for example:
     // if (process.env.NODE_ENV === 'development') { ... }. See `./env.js`.
-    new webpack.DefinePlugin(env.stringified),
+    new webpack.DefinePlugin({ ...env.stringified, __SERVER__: 'false',__CLIENT__: 'true' }),
     // This is necessary to emit hot updates (currently CSS only):
     new webpack.HotModuleReplacementPlugin(),
     // Watcher doesn't work well if you mistype casing in a path so we use
diff --git a/config/webpack.config.prod.js b/config/webpack.config.prod.js
index e441901ba..98c2f41b7 100644
--- a/config/webpack.config.prod.js
+++ b/config/webpack.config.prod.js
@@ -16,7 +16,7 @@ const TerserWebpackPlugin = require('terser-webpack-plugin');
 const paths = require("./paths");
 const getClientEnvironment = require("./env");
 
-let publicPath = "/react/build/";
+let publicPath = "/build/";
 const publicUrl = publicPath.slice(0, -1);
 // const shouldUseSourceMap = process.env.GENERATE_SOURCEMAP !== "false";
 const shouldUseSourceMap = process.env.NODE_ENV !== "production";
@@ -294,6 +294,7 @@ module.exports = {
         minifyURLs: true,
       },
     }),
+    new webpack.DefinePlugin({ ...env.stringified, __SERVER__: 'false',__CLIENT__: 'true' }),
     new InterpolateHtmlPlugin(HtmlWebpackPlugin, env.raw),
     // Makes some environment variables available to the JS code, for example:
     // if (process.env.NODE_ENV === 'production') { ... }. See `./env.js`.
diff --git a/package-lock.json b/package-lock.json
index be7f27fb4..53001c72b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11029,6 +11029,11 @@
       "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.2.1.tgz",
       "integrity": "sha512-Rdgz9Hl9Iv4QKi8b0OlCRQEzp4AgVxyCtz5S/+VIHezDmrDhkp2N2TqBWOLz0/gbeREXOOiI9/4b8BY9uw2vFg=="
     },
+    "keypress": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmmirror.com/keypress/-/keypress-0.1.0.tgz",
+      "integrity": "sha512-x0yf9PL/nx9Nw9oLL8ZVErFAk85/lslwEP7Vz7s5SI1ODXZIgit3C5qyWjw4DxOuO/3Hb4866SQh28a1V1d+WA=="
+    },
     "killable": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
@@ -12777,6 +12782,24 @@
         "pinkie": "^2.0.0"
       }
     },
+    "pinyin": {
+      "version": "4.0.0-alpha.0",
+      "resolved": "https://registry.npmmirror.com/pinyin/-/pinyin-4.0.0-alpha.0.tgz",
+      "integrity": "sha512-hdxO/2RuLWarhLaIcGKdXjkFZ0hFr3W/Yrvrd0YPxuIafixMZSAa4jvxskYLgYHE8OkOXkGsxMsEScwGzqKe3g==",
+      "requires": {
+        "commander": "~1.1.1"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmmirror.com/commander/-/commander-1.1.1.tgz",
+          "integrity": "sha512-71Rod2AhcH3JhkBikVpNd0pA+fWsmAaVoti6OR38T76chA7vE3pSerS0Jor4wDw+tOueD2zLVvFOw5H0Rcj7rA==",
+          "requires": {
+            "keypress": "0.1.x"
+          }
+        }
+      }
+    },
     "pkg-dir": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
diff --git a/package.json b/package.json
index 420fac00d..c78b0e864 100644
--- a/package.json
+++ b/package.json
@@ -52,6 +52,7 @@
     "nvm": "0.0.4",
     "object-assign": "4.1.1",
     "papaparse": "^5.3.2",
+    "pinyin": "^4.0.0-alpha.0",
     "postcss-flexbugs-fixes": "3.2.0",
     "promise": "8.0.1",
     "prop-types": "^15.6.1",
@@ -177,7 +178,7 @@
   "eslintConfig": {
     "extends": "react-app"
   },
-  "proxy": "http://172.20.32.202:4000",
+  "proxy": "https://testforgeplus.trustie.net",
   "port": "3007",
   "devDependencies": {
     "@babel/runtime": "7.0.0-beta.51",
diff --git a/public/images/share_logo_icon.jpg b/public/images/share_logo_icon.jpg
deleted file mode 100644
index 079ac4342..000000000
Binary files a/public/images/share_logo_icon.jpg and /dev/null differ
diff --git a/public/images/share_logo_icon.png b/public/images/share_logo_icon.png
new file mode 100644
index 000000000..b6f6ece07
Binary files /dev/null and b/public/images/share_logo_icon.png differ
diff --git a/public/index.html b/public/index.html
index 06d38434c..df06f2375 100755
--- a/public/index.html
+++ b/public/index.html
@@ -50,6 +50,7 @@
   <script src="%PUBLIC_URL%js/codemirror/merge/merge.js"></script>
   <script src="%PUBLIC_URL%js/alex/moment.js"></script>
   <script src="https://gw.alipayobjects.com/os/lib/alipay/alex/2.0.19/bundle/alex.all.global.min.js"></script>
+  <script src="https://res.wx.qq.com/open/js/jweixin-1.6.0.js"></script>
   <meta name="viewport" content="">
   <%= htmlWebpackPlugin.tags.bodyTags %>
   <script>
diff --git a/src/App.js b/src/App.js
index 1b20937d0..697b56422 100644
--- a/src/App.js
+++ b/src/App.js
@@ -20,11 +20,12 @@ import SiderBar from './forge/Component/SiderBar';
 import SiderBarHelp from './glcc/siderBarHelp';
 // import GlccModal from './modules/glccModal';
 
-import { SnackbarHOC } from 'educoder';
+import { SnackbarHOC, configShareForCustom } from 'educoder';
 import { initAxiosInterceptors } from './AppConfig'
 import { Provider } from 'react-redux';
 import configureStore from './redux/stores/configureStore';
 import cookie from 'react-cookies';
+ 
 
 const store = configureStore();
 window.marked = marked;
@@ -302,6 +303,9 @@ class App extends Component {
           this.setState({
             mygetHelmetapi: response.data.setting
           });
+
+          configShareForCustom(response.data.name)
+
           //存储配置到游览器
           localStorage.setItem('chromesetting', JSON.stringify(response.data.setting));
           localStorage.setItem('chromesettingresponse', JSON.stringify(response));
diff --git a/src/AppConfig.js b/src/AppConfig.js
index 326cfbb03..aed094a8e 100644
--- a/src/AppConfig.js
+++ b/src/AppConfig.js
@@ -32,8 +32,8 @@ export function initAxiosInterceptors(props) {
   // 判断网络是否连接
   initOnlineOfflineListener();
 
-
   var proxy = "https://testforgeplus.trustie.net";
+  // var proxy = "https://www.gitlink.org.cn";
 
   //响应前的设置
   axios.interceptors.request.use(
diff --git a/src/common/UrlTool.js b/src/common/UrlTool.js
index e45ae6ba2..a7bba73cb 100644
--- a/src/common/UrlTool.js
+++ b/src/common/UrlTool.js
@@ -1,6 +1,7 @@
 import React from "react";
 import md5 from 'md5';
 import {Input} from "antd";
+import { url as ssrOrigin, host as ssrHost } from '../ssrUrl'
 const { Search } = Input;
 
 const $ = window.$;
@@ -198,7 +199,7 @@ function railsgettimess(proxy) {
 				}
 			}})
 
-		window.setTimeout(function () {
+		setTimeout(function () {
 			checkSubmitFlgs=false;
 		}, 2500);
 	}
@@ -345,15 +346,15 @@ export function  addMeta(name, content){
 */
 export function setSeoMeta(keyWords, title, description, url, owner, projectId) {
 	// 服务端没有location
-	const host = window.location.host
-	const origin = window.location.origin
-	document.querySelector(`meta[property='og:title']`).content = title + ' | GitLink';
-	document.querySelector(`title`).textContent = title + ' | GitLink';
+	const host = window.location.host === 'null' || !window.location.host ? ssrHost : window.location.host
+	const origin = window.location.origin === 'null' || !window.location.origin ? ssrOrigin : window.location.origin
+	document.querySelector(`meta[property='og:title']`).content = title;
+	document.querySelector(`title`).textContent = title;
 	document.querySelector(`meta[property='og:url']`).content = origin + url;
-	document.querySelector(`meta[property='og:description']`).content = description  + ' | GitLink';
-	document.querySelector(`meta[property='og:image:alt']`).content = description + ' | GitLink';
-	document.querySelector('meta[name="Keywords"]').content= `${ keyWords },${ keyWords ? '' : 'GitLink, git, 开源, 代码托管, 项目管理, 版本控制, 代码分享, 项目协作, 协同开发平台' }` ;
-	document.querySelector(`meta[name='description']`).content = description + ' | GitLink';
+	document.querySelector(`meta[property='og:description']`).content = description;
+	document.querySelector(`meta[property='og:image:alt']`).content = description;
+	document.querySelector('meta[name="Keywords"]').content= `${ keyWords }${ keyWords ? '' : 'GitLink, git, 开源, 代码托管, 项目管理, 版本控制, 代码分享, 项目协作, 协同开发平台' }` ;
+	document.querySelector(`meta[name='description']`).content = description;
 	document.querySelector(`meta[name='go-import']`).content = host + url + ' git ' + origin + url;
 	document.querySelector(`meta[name='octolytics-dimension-user_login']`).content = owner;
 	if (projectId) {
diff --git a/src/common/util/ShareUtil.js b/src/common/util/ShareUtil.js
index 39c031409..3eb42e755 100644
--- a/src/common/util/ShareUtil.js
+++ b/src/common/util/ShareUtil.js
@@ -1,13 +1,20 @@
 import axios from 'axios'
 const host = window.location.protocol + '//' + window.location.host
 const wx = window.wx
+const appId = 'wxf8debe756b4a0309'
+
+let settings = localStorage.chromesetting&&JSON.parse(localStorage.chromesetting);
+let actionUrl = settings && settings.common.zone +'/api';
+
+const service = axios.create({
+    baseURL: actionUrl,
+    timeout: 1800000, // 请求超时时间
+});
+
 function share(shareData) {
     try {
-        wx.onMenuShareAppMessage(shareData);//分享给好友
-        wx.onMenuShareTimeline(shareData);//分享到朋友圈
-        wx.onMenuShareQQ(shareData);//分享给手机QQ
-        wx.onMenuShareWeibo(shareData);//分享腾讯微博
-        wx.onMenuShareQZone(shareData);//分享到QQ空间
+        wx.updateAppMessageShareData(shareData);//分享给好友
+        wx.updateTimelineShareData(shareData);//分享到朋友圈
     } catch(e) {
         console.log(e)
     }
@@ -21,26 +28,24 @@ function requestForSignatrue (callback) {
             callback && callback()
         } else {
             const wx = window.wx
-            const url = '/wechats/js_sdk_signature.json'
+            const url = '/cms/doc/open/wechatSignature'
             urlDoneMap[currentUrl] = true
             // window.encodeURIComponent()
-            axios.post(url, {
-                url: window.__testUrl || currentUrl,
+            service.post(url, {
+                url: currentUrl,
             }).then((response) => {
                 console.log('got res')
-                const data = response.data;
+                const data = response.data && response.data.data;
+
                 wx.config({
                     debug: false,
-                    appId: data.appid,
+                    appId: appId, // data.appid,
                     timestamp: data.timestamp,
                     nonceStr: data.noncestr,
                     signature: data.signature,
                     jsApiList: [
-                        'onMenuShareTimeline',//
-                        'onMenuShareAppMessage',
-                        'onMenuShareQQ',
-                        'onMenuShareWeibo',
-                        'onMenuShareQZone'
+                        'updateAppMessageShareData',//
+                        'updateTimelineShareData',
                     ]
                 });
                 wx.ready(function () {
@@ -125,11 +130,10 @@ export function configShareForCustom (title, desc, imgUrl, path) {
         console.log('configShareForCustom', host)
         const _url = window.location.href.split('#')[0];
         var shareData = {
-            title: title,
-            desc: desc,
+            title: title || 'GitLink | 确实开源',
+            desc: desc || 'GitLink，新一代开源创新服务平台',
             link: path ? `${host}/${path}` : _url,
-            imgUrl: imgUrl || window.__testImageUrl
-                || host + '/react/build/images/share_logo_icon.jpg'
+            imgUrl: imgUrl || host + '/build/images/share_logo_icon.png'
         };
         share(shareData)
     })
diff --git a/src/forge/Badge/Index.jsx b/src/forge/Badge/Index.jsx
index 121267d50..a84fc8a54 100644
--- a/src/forge/Badge/Index.jsx
+++ b/src/forge/Badge/Index.jsx
@@ -29,7 +29,7 @@ function Badge(props) {
         } else {
           setProjectDetail(result.data);
           // seo优化设置
-          let keyWords = `${owner},${projectsId},${result.data.author.name},`;
+          let keyWords = `${owner},${projectsId},${result.data.author.name}`;
           let title = `${owner}/${projectsId}${result.data.description ? '：' + result.data.description : ''}`;
           setSeoMeta(keyWords, title, result.data.description, `/${owner}/${projectsId}`, owner, projectsId);
         }
diff --git a/src/forge/Information/Component/partner.jsx b/src/forge/Information/Component/partner.jsx
index 03d1d3940..b07cb3590 100644
--- a/src/forge/Information/Component/partner.jsx
+++ b/src/forge/Information/Component/partner.jsx
@@ -1,5 +1,5 @@
 import React , { useEffect } from 'react';
-import Slider from 'react-slick';
+// import Slider from 'react-slick';
 import { httpUrl } from '../fetch';
 import axios from 'axios';
 import { useState } from 'react';
diff --git a/src/forge/Information/Pages/apply.jsx b/src/forge/Information/Pages/apply.jsx
index 5f020e6eb..400f08649 100644
--- a/src/forge/Information/Pages/apply.jsx
+++ b/src/forge/Information/Pages/apply.jsx
@@ -1,8 +1,9 @@
 import React, { useEffect } from 'react';
-import { Form , Input , Row , Col, Button } from 'antd';
+import { Form , Input , Row , Col, Button, message } from 'antd';
 import '../index.scss';
 import { postCreateZone } from '../api';
 import axios from 'axios';
+ 
 const { TextArea } = Input;
 
 const phonereg = /^([1][3456789])\d{9}$/
@@ -25,10 +26,10 @@ function Apply(props){
         const zoneApplication = {...values};
         postCreateZone(zoneApplication).then(response=>{
           if(response && response.data && response.data.code===200){
-            props.showNotification("提交成功！");
+            message.success("您的专区申请已提交，请耐心等待管理员与您联系!");
             setTimeout(() => {
               window.location.href="/";
-            }, 70);
+            }, 1000);
           }
         }).catch(error=>{})
       }
@@ -55,6 +56,7 @@ function Apply(props){
       callback();
     }):callback();
   }
+  
 
 
   return(
@@ -72,9 +74,12 @@ function Apply(props){
             label="专区名称"
           >
             {getFieldDecorator("name",{
-              rules:[{required:true,message:"请输入专区名称"}]
+              rules:[
+                {required:true,message:"请输入专区名称"},
+                {pattern: /^[a-zA-Z0-9\u4e00-\u9fa5\\_.-]{1,31}$/, message: "长度1-30,支持中文，英文，数字，可包含下划线(_)，中划线(-)，英文句号(.)"}
+              ]
             })(
-              <Input placeholder="请输入专区名称" maxLength={50} style={{height:"36px"}}/>
+              <Input placeholder="请输入专区名称" maxLength={30} style={{height:"36px"}}/>
             )}
           </Form.Item>
           <Form.Item
@@ -99,18 +104,18 @@ function Apply(props){
           <Row type="flex" justify="space-between">
             <Col span={11}>
               <Form.Item
-              label="专区标识"
+              label="专区英文标识"
               >
                 {getFieldDecorator("key",{
                   rules:[
-                    { required: true,message:"请输入专区域名标识" },
+                    // { required: true,message:"请输入专区域名英文标识" },
                     { pattern: /^[a-zA-Z][a-zA-Z0-9_-]{0,18}[a-zA-Z]$/, message: "长度2-20，只能包含数字、字母、下划线、中划线，必须以字母开头结尾"},
                     { validator:checkId }
                 ],
                 validateTrigger:"onBlur",
                 validateFirst: true,
                 })(
-                  <Input placeholder="请输入专区域名标识" maxLength={20} style={{height:"36px"}}/>
+                  <Input placeholder="请输入专区域名标识，若未填写系统将根据专区名称自动生成" maxLength={20} style={{height:"36px"}}/>
                 )}
               </Form.Item>
             </Col>
diff --git a/src/forge/Information/Pages/headerPagebyCCF.jsx b/src/forge/Information/Pages/headerPagebyCCF.jsx
index 1e3b10b11..d73326d70 100644
--- a/src/forge/Information/Pages/headerPagebyCCF.jsx
+++ b/src/forge/Information/Pages/headerPagebyCCF.jsx
@@ -116,7 +116,7 @@ function HeaderPageCCF(props) {
 			{
 				// 新闻动态
 				data && data.cmsShow === 1 && newsList && newsList.length >= 0 &&
-				<div className="zone_news">
+				<div className="zone_news zone_news_ccf">
 					<p className="in_title mb50">{data.homepageCmsTitle}</p>
 					<div className="boxmain mb100" style={{ display: "flex" }}>
 						<div className="zone_new_first">
diff --git a/src/forge/Information/Pages/newsDetail.jsx b/src/forge/Information/Pages/newsDetail.jsx
index 64c386fa4..06eb97ea1 100644
--- a/src/forge/Information/Pages/newsDetail.jsx
+++ b/src/forge/Information/Pages/newsDetail.jsx
@@ -7,7 +7,7 @@ import { getNewsDetail } from '../api';
 import { isPhone } from 'educoder';
 import { tempConfig } from '../tempInfo';
 import Acce from '../Component/mobile/accessory';
-import { addMeta, setSeoMeta } from 'educoder';
+import { addMeta, setSeoMeta, configShareForCustom } from 'educoder';
 import CommentList from '../Component/comments/list'
 
 
@@ -25,9 +25,12 @@ function NewsDetail(props){
     let initialContent = undefined;
     // 设置网页标题
     if(detail){
-      const { name, cmsDir, summary} = detail;
+      const { name, cmsDir} = detail;
       document.title = `${ name }/${ cmsDir.name }`;
-      addMeta('Keywords', `${ name },${ cmsDir.name },${ summary }`);
+      setMeta()
+      setTimeout(() => {
+        configShareForCustom(detail.name, detail.summary, detail.headImg)
+      }, 1000);
     }
     if(isPhone() && zonedetail){
       setTimeout(()=>{
@@ -43,8 +46,7 @@ function NewsDetail(props){
         document.querySelector('meta[name="viewport"]').setAttribute('content', initialContent);
       }
       if (zonedetail) {
-        document.title= zonedetail.mainTitle;
-        setSeoMeta(`${zonedetail.name},`, zonedetail.name, zonedetail.subTitle, `/zone/${deptId}`)
+        setMeta(true)
       }
     }
   },[zonedetail,detail])
@@ -56,6 +58,19 @@ function NewsDetail(props){
     }
   },[id])
 
+  function setMeta(unmount = false) {
+    if (unmount) {
+      document.title= zonedetail.name;
+      setSeoMeta(`${zonedetail.name}`, zonedetail.name, zonedetail.subTitle, `/zone/${deptId}`)
+    } else {
+      const { name, cmsDir, summary, id} = detail;
+      const title = `${ name }/${ cmsDir.name }`;
+      const keywords = `${ name },${ cmsDir.name },${ zonedetail.name }`;
+      document.title = title;
+      setSeoMeta(keywords, title, summary, `/zone/${deptId}/newdetail/${ id }`)
+    }
+  }
+
   function getDetails(){
     setIsSpin(true)
     getNewsDetail(id).then(result=>{
diff --git a/src/forge/Information/Pages/selfList.jsx b/src/forge/Information/Pages/selfList.jsx
index 76b888abd..f64cb551d 100644
--- a/src/forge/Information/Pages/selfList.jsx
+++ b/src/forge/Information/Pages/selfList.jsx
@@ -22,7 +22,8 @@ function SelfList(props){
   const pathname = props.location.pathname;
   const { deptId} = props.match.params;
   const { id , temp , data } = props;
-  const { sectionCmsTitle } = data;
+  // const { sectionCmsTitle } = data;
+  const sectionCmsTitle = data && data.sectionCmsTitle;
   const limit = 15;
 
   useEffect(()=>{
diff --git a/src/forge/Information/index.jsx b/src/forge/Information/index.jsx
index 2d9b99395..f9db74bdd 100644
--- a/src/forge/Information/index.jsx
+++ b/src/forge/Information/index.jsx
@@ -17,6 +17,7 @@ import "slick-carousel/slick/slick-theme.css";
 import { tempEnum } from "./tempInfo";
 import { ImageLayerOfCommentHOC } from "../../modules/page/layers/ImageLayerOfCommentHOC";
 import { setSeoMeta } from 'educoder';
+import { configShareForCustom } from 'educoder';
 
 
 const SourceDetail = Loadable({
@@ -142,6 +143,7 @@ function Index(props){
           getAdminUrl(data.id);
           getRole(data.id)
         }
+        configShareForCustom(data.mainTitle, data.subTitle, data.introductionImage)
         // 存储deptId，所有专区接口header带上
         sessionStorage.setItem('deptId', data.deptId)
         setSeoMeta(`${data.name},`, data.name, data.subTitle, `/zone/${deptId}`)
diff --git a/src/forge/Information/indexZonebyCCF.scss b/src/forge/Information/indexZonebyCCF.scss
index c6c7478f5..cf7128b2b 100644
--- a/src/forge/Information/indexZonebyCCF.scss
+++ b/src/forge/Information/indexZonebyCCF.scss
@@ -1,6 +1,6 @@
 @import './theme.scss';
 
-.zone_news {
+.zone_news_ccf {
   margin-top: -10px !important;
 
   .zone_new_first {
diff --git a/src/forge/Server/List.jsx b/src/forge/Server/List.jsx
index 995a621d3..280c07f56 100644
--- a/src/forge/Server/List.jsx
+++ b/src/forge/Server/List.jsx
@@ -54,16 +54,16 @@ function Main(props){
             <a onClick={openDetail} className="btnhover">查看详情</a>
           </span>
         </li>
-        {/* <li>
+        <li>
           <div className="servername" style={{marginBottom: '8px'}}>
-            //记得注释 <img src={require('./img/logo.png')} alt=""/>
+            <img src={require('./img/logo3.png')} alt="" style={{width: '24px'}}/>
             <Link to={`/${owner}/${projectsId}/service/reposyncer`}>Reposyncer仓库同步</Link>
           </div>
           <p className="task-hide-2 serverdesc">支持不同开源托管平台自动同步推送/拉取相关代码，实现多平台项目同步开发功能</p>
           <span className="serverbtn">
             <Link to={`/${owner}/${projectsId}/service/reposyncer`} className="btnhover">查看详情</Link>
           </span>
-        </li> */}
+        </li>
         {/* 是站点仓库则显示，否则隐藏 */}
         {projectDetail && projectDetail.web_site && projectDetail.author.type === "User" && <li>
           <span className="servername">
diff --git a/src/forge/Server/img/arrow.png b/src/forge/Server/img/arrow.png
new file mode 100644
index 000000000..09e4a4285
Binary files /dev/null and b/src/forge/Server/img/arrow.png differ
diff --git a/src/forge/Server/img/gitee.png b/src/forge/Server/img/gitee.png
index 221862be2..549e5bd4a 100644
Binary files a/src/forge/Server/img/gitee.png and b/src/forge/Server/img/gitee.png differ
diff --git a/src/forge/Server/img/gitee1.png b/src/forge/Server/img/gitee1.png
new file mode 100644
index 000000000..221862be2
Binary files /dev/null and b/src/forge/Server/img/gitee1.png differ
diff --git a/src/forge/Server/img/gitee1.svg b/src/forge/Server/img/gitee1.svg
deleted file mode 100644
index 3b1577126..000000000
--- a/src/forge/Server/img/gitee1.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="23.589" height="23.589" viewBox="0 0 23.589 23.589">
-  <g id="gitee" transform="translate(0)">
-    <g id="Group" transform="translate(0 0)">
-      <ellipse id="Combined-Shape" cx="11.795" cy="11.795" rx="11.795" ry="11.795" fill="#c71d23"/>
-      <path id="G" d="M32.458,25.178h-6.7a.583.583,0,0,0-.583.582v1.456a.582.582,0,0,0,.582.583h4.078a.582.582,0,0,1,.582.582h0v.146h0v.146a1.747,1.747,0,0,1-1.747,1.747H23.138a.582.582,0,0,1-.582-.582V24.3A1.747,1.747,0,0,1,24.3,22.557h8.153a.584.584,0,0,0,.583-.582V20.518a.582.582,0,0,0-.582-.583H24.3A4.368,4.368,0,0,0,19.935,24.3v8.154a.582.582,0,0,0,.582.582h8.591a3.931,3.931,0,0,0,3.931-3.931V25.76A.582.582,0,0,0,32.458,25.178Z" transform="translate(-14.693 -14.693)" fill="#fff" fill-rule="evenodd"/>
-    </g>
-  </g>
-</svg>
diff --git a/src/forge/Server/img/gitee2.png b/src/forge/Server/img/gitee2.png
new file mode 100644
index 000000000..4f26923d1
Binary files /dev/null and b/src/forge/Server/img/gitee2.png differ
diff --git a/src/forge/Server/img/github.png b/src/forge/Server/img/github.png
index 213968a36..ef1bc47ee 100644
Binary files a/src/forge/Server/img/github.png and b/src/forge/Server/img/github.png differ
diff --git a/src/forge/Server/img/github1.png b/src/forge/Server/img/github1.png
new file mode 100644
index 000000000..80d17a9ee
Binary files /dev/null and b/src/forge/Server/img/github1.png differ
diff --git a/src/forge/Server/img/github2.png b/src/forge/Server/img/github2.png
new file mode 100644
index 000000000..97d6af5e5
Binary files /dev/null and b/src/forge/Server/img/github2.png differ
diff --git a/src/forge/Server/img/github2.svg b/src/forge/Server/img/github2.svg
deleted file mode 100644
index 6dde707a9..000000000
--- a/src/forge/Server/img/github2.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="23.585" height="23.587" viewBox="0 0 23.585 23.587">
-  <path id="路径_46" data-name="路径 46" d="M11.831,0A11.914,11.914,0,0,0,.136,10.156,12.116,12.116,0,0,0,8.089,23.568c.6.111.806-.267.806-.586V20.925c-3.306.735-4-1.626-4-1.626a3.23,3.23,0,0,0-1.315-1.774c-1.068-.742.087-.742.087-.742A2.492,2.492,0,0,1,5.473,18.03,2.539,2.539,0,0,0,6.99,19.266a2.481,2.481,0,0,0,1.927-.226,2.593,2.593,0,0,1,.727-1.618c-2.63-.3-5.391-1.344-5.391-5.938A4.734,4.734,0,0,1,5.466,8.239a4.5,4.5,0,0,1,.116-3.2s1-.327,3.255,1.24a10.968,10.968,0,0,1,5.929,0c2.26-1.566,3.248-1.24,3.248-1.24a4.475,4.475,0,0,1,.145,3.177,4.734,4.734,0,0,1,1.213,3.244c0,4.647-2.768,5.664-5.406,5.938a2.893,2.893,0,0,1,.806,2.227c0,1.618,0,2.925,0,3.318s.211.7.814.579a12.12,12.12,0,0,0,7.824-13.379A11.917,11.917,0,0,0,11.831,0Z" transform="translate(0.018 0)" fill="#1a1414" fill-rule="evenodd"/>
-</svg>
diff --git a/src/forge/Server/img/gitlink1.png b/src/forge/Server/img/gitlink1.png
new file mode 100644
index 000000000..7376d338d
Binary files /dev/null and b/src/forge/Server/img/gitlink1.png differ
diff --git a/src/forge/Server/img/logo3.png b/src/forge/Server/img/logo3.png
new file mode 100644
index 000000000..c2a6c85f0
Binary files /dev/null and b/src/forge/Server/img/logo3.png differ
diff --git a/src/forge/Server/reposyncer/component/addTaskModal.jsx b/src/forge/Server/reposyncer/component/addTaskModal.jsx
new file mode 100644
index 000000000..27824cb34
--- /dev/null
+++ b/src/forge/Server/reposyncer/component/addTaskModal.jsx
@@ -0,0 +1,104 @@
+import React, {useEffect, useState} from 'react';
+import { Button, Modal, Input, Select, message, Form } from 'antd';
+import axios from 'axios';
+import { synchronizeTips } from './editStore';
+import gitHub from '../../img/github.png';
+import gitee from '../../img/gitee.png';
+
+function DeleteBox({owner, projectsId, visible, setVisible, branchList, reload, form, sync_repositories_unique=[]}) {
+  const { getFieldDecorator, validateFields , resetFields } = form;
+  // 选择仓库类型
+  const [platform, setPlatform] = useState();
+  // 已添加的仓库类型
+  const repoTypes = sync_repositories_unique.map(item=>{return item.type})
+
+  useEffect(()=>{
+    if(repoTypes.length === 1){
+      setPlatform(repoTypes[0].split("::")[1])
+    }
+  }, [repoTypes.toString()])
+
+  // 新建同步分支点击函数
+  function createNew(){
+    validateFields((error,values)=>{
+      if(!error){
+        const sync_repository = sync_repositories_unique.filter(item=>item.type === `SyncRepositories::${platform}`)[0]
+        axios.post(`/v1/${owner}/${projectsId}/sync_repositories/create_branch`, {
+          ...values,
+          sync_repository_ids: sync_repository && sync_repository.sync_repository_ids.toString()
+        }).then(res=>{
+          if(res && res.data.message === "success"){
+            resetFields()
+            setVisible(false);
+            message.success('新建成功');
+            reload()
+          }
+        })
+      }
+    })
+  }
+
+  const formItemLayout = {
+    labelCol: { span: 5 },
+    wrapperCol: { span: 18 },
+  }
+
+  return(
+    <Modal
+      title="新建同步分支"
+      visible={visible}
+      onCancel={()=>{setVisible(false)}}
+      footer={<div><Button style={{width: '104px', height:'36px'}} onClick={()=>{setVisible(false)}}>取消</Button><Button type="primary" style={{width: '104px', height:'36px', marginLeft: '40px'}} onClick={createNew}>确认</Button></div>}
+      width={550}
+      className="cancelBound"
+    >
+      <Form {...formItemLayout}>
+        {repoTypes.length > 1 && <Form.Item label="同步仓库平台" className="storeFormItem">
+          {getFieldDecorator("type",{
+            rules:[],
+          })(
+            <Select placeholder="请选择" onChange={(value)=>{
+              setPlatform(value)
+            }}>
+              <Select.Option value="Github"><img src={gitHub} alt="" className="storeLogo mr5"/>Github</Select.Option>
+              <Select.Option value="Gitee"><img src={gitee} alt="" className="storeLogo mr5"/>Gitee</Select.Option>
+            </Select>
+          )}
+        </Form.Item>}
+        {platform && <Form.Item label={`${platform}分支`}>
+          {getFieldDecorator("external_branch_name",{
+            rules:[{required:true,message:`请输入${platform}分支名称`}]
+          })(
+            <Input placeholder={`请输入${platform}分支名称`} className="storeInput" maxLength={50}/>
+          )}
+        </Form.Item>}
+        <Form.Item label="Gitlink分支">
+          {getFieldDecorator("gitlink_branch_name",{
+            rules:[{required:true,message:"请选择Gitlink仓库分支"}]
+          })(
+            <Select placeholder="请选择Gitlink仓库分支">
+              {branchList && branchList.map(item=>{
+                const {branch_id, name} = item;
+                return <Select.Option value={name} key={branch_id}>{name}</Select.Option>
+              })}
+            </Select>
+          )}
+        </Form.Item>
+        <div className='directionByAddTaskModal'>
+          <Form.Item label="首次同步方向：">
+            {getFieldDecorator("first_sync_direction",{
+              rules:[{required:true,message:"请选择首次同步方向"}]
+            })(
+              <Select placeholder="请选择首次同步方向">
+                <Select.Option value="2">{platform}同步至GitLink</Select.Option>
+                <Select.Option value="1">GitLink同步至{platform}</Select.Option>
+              </Select>
+            )}
+          </Form.Item>
+          {synchronizeTips}
+        </div>
+      </Form>
+    </Modal>
+  )
+}
+export default Form.create()(DeleteBox);
\ No newline at end of file
diff --git a/src/forge/Server/reposyncer/component/createJobModal.jsx b/src/forge/Server/reposyncer/component/createJobModal.jsx
deleted file mode 100644
index b8418a877..000000000
--- a/src/forge/Server/reposyncer/component/createJobModal.jsx
+++ /dev/null
@@ -1,76 +0,0 @@
-import React, {useState} from 'react';
-import { Button, Modal, Input, Select, message } from 'antd';
-import axios from 'axios';
-const {Option} = Select;
-
-function DeleteBox({owner, projectsId, visible, setVisible, createJobBy, branchOptions, reload}) {
-  const [error, setError] = useState(undefined);
-  const [errorByOther, setErrorByOther] = useState(undefined);
-  const [branch, setBranch] = useState(undefined);
-  const [branchByOther, setBranchByOther] = useState(undefined);
-
-  // 新建同步分支点击函数
-  function createNew(){
-    if(branch && branchByOther){
-      // 新建同步分支
-      const param = {
-        gitlink_branch: branch,
-        job_type: 'TwoWay',
-        github_branch: undefined,
-        gitee_branch: undefined
-      }
-      createJobBy === 'Github' ? (param.github_branch = branchByOther) : (param.gitee_branch = branchByOther)
-      axios.post(`/${owner}/${projectsId}/synchronizes/create_jobs.json`,param).then(res=>{
-        if(res && res.data.message === "success"){
-          setBranch(undefined);
-          setBranchByOther(undefined);
-          reload && reload(Math.random());
-          message.success('新建成功');
-          setVisible(false);
-        }
-      })
-    }else{
-      !branch && setError('请选择仓库分支')
-      !branchByOther && setErrorByOther('请输入仓库分支')
-    }
-  }
-
-  return(
-    <Modal
-      title="新建同步分支"
-      visible={visible}
-      onCancel={()=>{setVisible(false)}}
-      footer={<div><Button style={{width: '104px', height:'36px'}} onClick={()=>{setVisible(false)}}>取消</Button><Button type="primary" style={{width: '104px', height:'36px', marginLeft: '40px'}} onClick={createNew}>确认</Button></div>}
-      width={550}
-      className="cancelBound createJobBox"
-    >
-      <div className="itemBox mt10">
-        <label className="labelBox font-16"><i className="iconfont icon-a-bitian2x font-12"></i>  {createJobBy}分支:</label>
-        <Input placeholder="请输入分支名称" className="inputBox" value={branchByOther} onChange={(e)=>setBranchByOther(e.target.value)} maxLength={50}/>
-        <div className="errorBox">{errorByOther}</div>
-      </div>
-      <div className="itemBox mt30 mb20">
-        <label className="labelBox font-16"><i className="iconfont icon-a-bitian2x font-12"></i>  GitLink分支:</label>
-        <Select
-          value={branch}
-          onSelect={(e) => {setBranch(e)}}
-          showSearch
-          className="inputBox"
-          dropdownMatchSelectWidth={false}
-          dropdownClassName="overlihide"
-          placeholder="请选择仓库分支"
-          getPopupContainer={trigger => trigger.parentNode}
-        >
-          {branchOptions && branchOptions.map((item, key) => {
-          return (
-            <Option key={key + 1} value={item.name}>
-              {item.name}
-            </Option>
-          )})}
-        </Select>
-        <div className="errorBox">{error}</div>
-      </div>
-    </Modal>
-  )
-}
-export default DeleteBox;
\ No newline at end of file
diff --git a/src/forge/Server/reposyncer/component/editStore.jsx b/src/forge/Server/reposyncer/component/editStore.jsx
index f20c4a294..ec44f415d 100644
--- a/src/forge/Server/reposyncer/component/editStore.jsx
+++ b/src/forge/Server/reposyncer/component/editStore.jsx
@@ -1,57 +1,321 @@
-import React, {forwardRef} from "react";
-import { Button, Form, Input, message } from "antd";
-import gitHub from '../../img/github.png';
+import React, {Fragment, forwardRef, useEffect, useState} from "react";
+import { Button, Divider, Form, Icon, Input, Radio, Select, Steps, Tooltip, message, Modal } from "antd";
+import github from '../../img/github.png';
 import gitee from '../../img/gitee.png';
+import arrow from '../../img/arrow.png';
 import '../index.scss';
 import axios from "axios";
+import CopyTool from "../../../Component/CopyTool";
+import { platformLogo, platformLogoUnText } from "..";
+const { Step } = Steps;
+
+export const confirmInfo1 = (tips="首次同步时，系统将主分支源码强制向从分支推送，覆盖从分支源码。后续任意分支有push事件，将自动同步至其他分支，与主从设置无关。若想更改主从分支，请返回并更改同步方向") =>{
+  return <div className="flexBetween mb30" style={{alignItems: "flex-start"}}>
+    <Icon type="exclamation-circle" theme="filled" style={{ fontSize: '22px', color: '#CA0002' }}/>
+    <span className="ml10 font-15">{tips}</span>
+  </div>
+}
+export const confirmInfo2 = (info) =>{
+  const {mainBranch:{address, branchName, type}, branch} = info
+  return <div className="flexBetween">
+    <div className="infoBoxBlueBg" style={{width: "260px"}}>
+      <span>
+        {platformLogo(type)}
+        <span className="ml10">主分支</span>
+      </span>
+      <Divider dashed style={{margin: '15px'}}/>
+      {/* <a href={address} className="primaryColor">{address}</a> */}
+      <span className="primaryColor">{address}</span>
+      <div className="mt10">
+        <i className="iconfont icon-fenzhi2 font-18"></i>
+        {branchName}
+      </div>
+    </div>
+    <img src={arrow} style={{width: "40px"}}/>
+    <div className="infoBoxBlueBg" style={{width: "260px"}}>
+      <span>
+        {platformLogo(branch.type)}
+        <span className="ml10">从分支</span>
+      </span>
+      <Divider dashed style={{margin: '15px'}}/>
+      {/* <a href={branch.address} className="primaryColor">{branch.address}</a> */}
+      <span className="primaryColor">{branch.address}</span>
+      <div className="mt10">
+        <i className="iconfont icon-fenzhi2 font-18"></i>
+        {branch.branchName}
+      </div>
+    </div>
+  </div>
+}
+
+export const synchronizeTips = (
+  <Tooltip title={<div>
+    ①首次同步方向指两个仓库首次进行同步时，执行gitpull指令的方向<br/>
+    ②若同步分支为全部分支，首次同步方向为<span style={{color: '#466aff'}}>GitLink同步至 Github</span>:系统将本仓库导入至已绑定的Github仓库，覆善目标仓库源码后，保持两个仓库的双向同步<br/>
+    ③若同步分支为单个分支，首次同步方向为<span style={{color: '#466aff'}}>Gitlink同步至 Github</span>:系统将本仓库目标分支导入至已绑定的Github仓库，覆盖目标分支名称的源码，保持两个分支的双向同步
+  </div>}>
+    <Icon type="question-circle" theme="filled" style={{color: '#466aff'}} className="mb20 synchronizeTip"/>
+  </Tooltip>
+)
 
 function EditStore(props){
-  const { form, history} = props;
+  const { form, history, storeDetail} = props;
+  const {sync_repositories_unique=[]} = storeDetail || {};
   const { owner , projectsId } = props.match.params;
-  const { getFieldDecorator, validateFields , setFieldsValue, setFields } = form;
+  const { getFieldDecorator, validateFields , setFieldsValue, setFields, getFieldsValue } = form;
+  const [step, setStep] = useState(0);
+  // 仓库分支列表
+  const [branchList, setBranchList] = useState();
+  // form表单值
+  const [values, setValues] = useState({});
+  // 选择仓库类型
+  const [platform, setPlatform] = useState();
+  // 全部分支/单个分支
+  const [branch, setBranch] = useState(undefined);
+  const [visible, setVisible] = useState();
+  const stepList = [{
+    step: 0,
+    title: "配置同步仓库"
+  }, {
+    step: 1, 
+    title: "配置同步仓库webhook"
+  }, {
+    step: 2, 
+    title: "配置同步分支"
+  }]
+  // 用于显示确认弹框的字段
+  const {type, external_repo_address, external_branch_name, gitlink_branch_name} = values
+  const externalRepoInfo = {
+    address: external_repo_address,
+    branchName: branch === "1" ? "全部分支" : external_branch_name,
+    type
+  }
+  const gitlinkRepoInfo = {
+    address: `${window.location.origin}/${owner}/${projectsId}.git`,
+    branchName: branch === "1" ? "全部分支" : gitlink_branch_name,
+    type: "gitlink"
+  }
+  // 根据已配置仓库同步的平台显示还剩哪些平台
+  const synchronizedPlatformList = sync_repositories_unique.map(item=>{return item.type.split("::").pop()})
+  const platformList = (synchronizedPlatformList.length && ["Github", "Gitee"].filter(item=>synchronizedPlatformList.indexOf(item) === -1)) || ["Github", "Gitee"]
+
+  // 正则：校验是否是gitee或者github的仓库地址
+  const pattern = platform && (platform === "Github" ? /^https:\/\/github\.com\/.+\/.+$/ : /^https:\/\/gitee\.com\/.+\/.+$/)
+
+  useEffect(()=>{
+    // 获取分支列表
+    axios.get(`/${owner}/${projectsId}/branches.json`, {params: {page: 1, limit: 1000}}).then(result=>{
+      setBranchList(result.data);
+    }).catch((error)=>{})
+  }, [])
 
   function submit() {
     validateFields((error,values)=>{
-      setFields({
-        'github_address':{value: values.github_address, errors: null},
-        'github_token':{value: values.github_token, errors: null},
-        'gitee_address':{value: values.gitee_address, errors: null},
-        'gitee_token':{value: values.gitee_token, errors: null}
-      })
       if(!error){
-        // 处理空值
-        for(let i in values){
-          if(!values[i]){
-            delete values[i];
+        values["type"] = `SyncRepositories::${values.type}`
+        axios.post(`/v1/${owner}/${projectsId}/sync_repositories.json`, values).then(res=>{
+          if(res && res.status === 200){
+            setVisible(false);
+            message.success('绑定成功');
+            window.location.href = `/${owner}/${projectsId}/service/reposyncer`;
+          }else{
+            message.error('绑定失败');
           }
-        }
-        const keysArr = Object.keys(values);
-        if(keysArr.indexOf('github_address') === -1 && keysArr.indexOf('gitee_address') === -1){
-          // 校验必填一个github或者gitee地址
-          form.setFields({github_address: {value:values.github_address,errors:[new Error('请至少输入一个地址')]}});
-          form.setFields({gitee_address: {value:values.gitee_address,errors:[new Error('请至少输入一个地址')]}});
-        }else if(keysArr.indexOf('github_address') !== -1 && keysArr.indexOf('github_token') === -1){
-          form.setFields({github_token: {value:values.github_token,errors:[new Error('请输入Github的授权token')]}});
-        }else if(keysArr.indexOf('gitee_address') !== -1 && keysArr.indexOf('gitee_token') === -1){
-          form.setFields({gitee_token: {value:values.gitee_token,errors:[new Error('请输入Gitee的授权token')]}});
-        }else{
-          axios.post(`/${owner}/${projectsId}/synchronizes.json`,values).then(res=>{
-            if(res && res.data.message === "success"){
-              message.success('绑定成功');
-              window.location.href = `/${owner}/${projectsId}/service/reposyncer`;
-            }else{
-              // message.error('绑定失败');
-            }
-          })
-        }
+        })
       }
     })
   }
+  function inviteClick() {
+    const copyEle = document.querySelector('#webhook'); // 获取要复制的节点
+    if (!copyEle) {
+      console.error("您的CopyTool未设置正确的inputId");
+      return;
+    }
+    copyEle.select(); // 执行选中元素
+    if (document.execCommand('copy')) {
+      document.execCommand('copy');
+      document.getSelection().removeAllRanges();
+      message.success("复制成功");
+    }
+  }
+
+  function saveStep3Info(){
+    const {external_branch_name, gitlink_branch_name, first_sync_direction} = getFieldsValue();
+    setValues({
+      ...values,
+      external_branch_name, gitlink_branch_name, first_sync_direction
+    })
+  }
+
+  const formItemLayout = {
+    labelCol: { span: 5 },
+    wrapperCol: { span: 18 },
+    style: {width: '60%'}
+  }
 
   return <div className="storeListBox mt20">
+    <div className="headBox font-16 pl15 mb25">
+      跨平台仓库代码同步
+      <Tooltip title="跨平台仓库代码同步系统提供跨托管平台的项目协同开发同步功能。支持用户在任何一个托管平台上的代码提交、代码推送、合并请求等操作自动同步至其他托管平台。不仅增加每个开源项目与开发者的流量，也使不同平台的开源项目维护与更新变得方便与快捷" overlayStyle={{width: 400}}><span className="helpBox1 font-12 ml10">?</span></Tooltip>
+    </div>
     <div className="registerBox">
-      <Form>
-        <div className="storeTitle pb10 mb15"><img src={gitHub} alt="" className="storeLogo"/></div>
+      <Steps current={step}>
+        {stepList.map(item=>{
+          const {title, step} = item;
+          return <Step title={title} key={step}/>
+        })}
+      </Steps>
+      
+      <Form className="codeSynchronizationForm" colon={false} layout={step === 2 ? "horizontal" : "vertical"} form={form}>
+        {/* 第一步 */}
+        
+        <Form.Item label="请选择同步仓库平台" className="storeFormItem" hidden={step}>
+          {getFieldDecorator("type",{
+            rules:[{required:true,message:"请选择同步仓库平台"}],
+            initialValue: values.type
+          })(
+            <Select placeholder="请选择" onChange={(value)=>{
+              setPlatform(value)
+            }}>
+              {/* <Select.Option value="Github"><img src={github} alt="" className="storeLogo mr5"/>Github</Select.Option>
+              <Select.Option value="Gitee"><img src={gitee} alt="" className="storeLogo mr5"/>Gitee</Select.Option> */}
+              {platformList.map(item=>{
+                return <Select.Option key={item} value={item}>{platformLogoUnText(item)}{item}</Select.Option>
+              })}
+            </Select>
+          )}
+        </Form.Item>
+        <Form.Item label={`${platform}同步仓库地址`} className="storeFormItem" hidden={step || !platform}>
+          {getFieldDecorator("external_repo_address",{
+            rules:[
+              {required:true,message: `请输入${platform}同步仓库地址`},
+              {pattern: pattern, message: `请输入${platform}可访问的仓库地址`}
+            ],
+            initialValue: values.external_repo_address
+          })(
+            <Input placeholder={`请输入${platform}同步仓库地址`} className="storeInput" maxLength={200}/>
+          )}
+        </Form.Item>
+        <Form.Item label={`${platform}同步仓库授权验证`} className="storeFormItem" hidden={step || !platform}>
+          {getFieldDecorator("external_token",{
+            rules:[{required:true,message: `请输入${platform}的授权token`}],
+            initialValue: values.external_token
+          })(
+            <Input addonBefore="token" placeholder={`请输入${platform}的授权token`} className="storeInput" maxLength={300}/>
+          )}
+        </Form.Item>
+        {!step && <div>
+          {/* {platform && <div>
+            <Form.Item label={`${platform}同步仓库授权`} className="storeFormItem" required style={{marginBottom: '0'}}></Form.Item>
+            <Button type="primary" ghost>点击授权</Button>
+          </div>} */}
+          <div className="mt30">
+            <Button type="primary" className="mr30" style={{width: '100px'}} onClick={()=>{
+              // 保存用户已经输入的值
+              const {type, external_repo_address, external_token} = getFieldsValue();
+              setValues({
+                ...values,
+                type, external_repo_address, external_token
+              })
+              setStep(1);
+            }}>下一步</Button>
+            <Button style={{width: '100px'}} onClick={()=>{history.go(-1)}}>返回</Button>
+          </div>
+        </div>}
+        {/* 第二步 */}
+        {step === 1 && <div>
+          <Icon type="info-circle" theme="filled" style={{color: '#466aff'}}/>
+          <span className="color-grey-6 ml5">为了保证双向同步实时性，请您完成以下操作，以保证每个参与同步的仓库均已配置Webhook</span>
+          <p className="mt15 mb15">1、登录{platform}账号</p>
+          
+          2、复制以下url，配置为同步仓库Webhook接收请求的地址<br/>
+          <Input
+            id="webhook"
+            className="mt10 mb15 copyWebhookInput"
+            value={`${window.location.origin}/api/v1/${owner}/${projectsId}/sync_repositories/sync?sync_direction=2`}
+            readOnly
+            addonAfter={<a onClick={inviteClick}>复制链接</a>}
+          />
+          3、前往{platform}仓库Webhook配置页，激活此Webhook<br/>
+          <Button type="primary" ghost className="mt10 mb15" onClick={()=>{
+            const {type, external_repo_address} = values;
+            if(external_repo_address){
+              window.open(`${external_repo_address.replace(/.git$/, "")}${type === "Github" ? "/settings/hooks" : "/hooks"}`)
+            }else{
+              message.error("您暂未配置同步仓库地址")
+            }
+          }}>点击前往</Button><br/>
+          4、完成配置
+          <div className="mt30">
+            <Button type="primary" className="mr30" style={{width: '100px'}} onClick={()=>{setStep(2)}}>下一步</Button>
+            <Button style={{width: '100px'}} onClick={()=>{setStep(0)}}>上一步</Button>
+          </div>
+        </div>}
+        {/* 第三步 */}
+        {step === 2 && <div>
+          <div className="color-grey-6 mb15">请绑定同步分支</div>
+          <Form.Item>
+            {getFieldDecorator("sync_granularity",{
+              rules:[]
+            })(
+              <Radio.Group onChange={(e)=>{
+                const {external_repo_address} = values;
+                if(!external_repo_address){
+                  message.error("您暂未配置同步仓库地址")
+                  return
+                }
+                setBranch(e.target.value);
+              }} value={branch} style={{width: '80%'}}>
+                <Radio value="1" style={{marginRight: '40%'}} disabled>全部分支<br/><span className="color-grey-6 ml25 font-12">建立仓库的实时双向同步</span></Radio>
+                <Radio value="2">单个分支<br/><span className="color-grey-6 ml25 font-12">建立单个分支的实时双向同步</span></Radio>
+              </Radio.Group>
+            )}
+          </Form.Item>
+          {branch === "2" && <Form.Item label={`${platform}分支`} {...formItemLayout}>
+            {getFieldDecorator("external_branch_name",{
+              rules:[{required:true,message:`请输入${platform}分支名称`}]
+            })(
+              <Input placeholder={`请输入${platform}分支名称`} className="storeInput" maxLength={50}/>
+            )}
+          </Form.Item>}
+          {branch === "2" && <Form.Item label="Gitlink分支" {...formItemLayout}>
+            {getFieldDecorator("gitlink_branch_name",{
+              rules:[{required:true,message:"请选择Gitlink仓库分支"}]
+            })(
+              <Select placeholder="请选择Gitlink仓库分支">
+                {branchList && branchList.map(item=>{
+                  const {branch_id, name} = item;
+                  return <Select.Option value={name} key={branch_id}>{name}</Select.Option>
+                })}
+              </Select>
+            )}
+          </Form.Item>}
+          {branch && <div style={{display: 'flex', alignItems: "center"}}>
+            <Form.Item label="首次同步方向：" {...formItemLayout}>
+              {getFieldDecorator("first_sync_direction",{
+                rules:[{required:true,message:"请选择首次同步方向"}]
+              })(
+                <Select placeholder="请选择首次同步方向">
+                  <Select.Option value="2">{platform}同步至GitLink</Select.Option>
+                  <Select.Option value="1">GitLink同步至{platform}</Select.Option>
+                </Select>
+              )}
+            </Form.Item>
+            {synchronizeTips}
+          </div>}
+          <div className="mt30">
+            {branch && <Button type="primary" className="mr30" style={{width: '100px'}} onClick={()=>{
+              saveStep3Info();
+              setVisible(true);
+              // submit();
+            }}>确认绑定</Button>}
+            <Button style={{width: '100px'}} onClick={()=>{
+              saveStep3Info();
+              setStep(1)
+            }}>上一步</Button>
+          </div>
+        </div>}
+        {/* <div className="storeTitle pb10 mb15"><img src={gitHub} alt="" className="storeLogo"/></div>
         <Form.Item label="Github同步仓库地址" className="storeFormItem">
           {getFieldDecorator("github_address",{
             rules:[]
@@ -89,8 +353,25 @@ function EditStore(props){
         <Form.Item>
           <Button type="primary" style={{width: '112px', height: '36px'}} onClick={submit}>确认绑定</Button>
           <Button style={{width: '112px', height: '36px'}} className="ml40" onClick={()=>{history.goBack(-1)}}>取消</Button>
-        </Form.Item>
+        </Form.Item> */}
       </Form>
+      <Modal
+        title="绑定同步分支"
+        visible={visible}
+        onCancel={()=>{setVisible(false)}}
+        footer={<div>
+          <Button style={{ width: '95px', height: '32px' }} onClick={() => { setVisible(false) }} className="mr40">再想想</Button>
+          <Button style={{ width: '95px', height: '32px' }} onClick={submit} type="primary" ghost>开始同步</Button>
+        </div>}
+        width={650}
+        className="reposyncerModal"
+      >
+        {confirmInfo1()}
+        {confirmInfo2({
+          mainBranch: values.first_sync_direction === "1" ? gitlinkRepoInfo : externalRepoInfo,
+          branch: values.first_sync_direction === "1" ? externalRepoInfo : gitlinkRepoInfo
+        })}
+      </Modal>
     </div>
   </div>
 }
diff --git a/src/forge/Server/reposyncer/component/recordList.jsx b/src/forge/Server/reposyncer/component/recordList.jsx
index 4a7b8d1c6..fa958c33e 100644
--- a/src/forge/Server/reposyncer/component/recordList.jsx
+++ b/src/forge/Server/reposyncer/component/recordList.jsx
@@ -1,92 +1,65 @@
 import React, {useState} from "react";
-import { Table, Modal, Button, message } from 'antd';
+import { Table, Modal, Button, message, Breadcrumb, Divider } from 'antd';
 import { Link } from "react-router-dom";
-import gitHub1 from '../../img/github2.svg';
-import gitee1 from '../../img/gitee1.svg';
+// import gitHub1 from '../../img/github2.svg';
+// import gitee1 from '../../img/gitee1.svg';
 import anniu from '../../img/anniu.png';
 import anniu2 from '../../img/anniu2.png';
 import '../index.scss';
 import { useEffect } from "react";
 import axios from "axios";
-import CreateJobModal from './createJobModal';
 import Nodata from "../../../Nodata";
 
 function RecordList(props){
-  const { owner , projectsId, type } = props.match.params;
-  const { storeDetail} = props;
+  const { owner, projectsId, type, syncIds } = props.match.params;
   const [loading, setLoading] = useState(false);
-  const [data, setData] = useState([]);
+  const [data, setData] = useState({});
   // table
   const [current, setCurrent] = useState(1);
   const [total, setTotal] = useState(0);
   const [pageSize, setPageSize] = useState(10);
   const [expandedRowKeys, setExpandedRowKeys] = useState([]);
-  const [deleteRecordId, setDeleteRecordId] = useState(undefined);
-  const [visible, setVisible] = useState(false);
-  const [reload, setReload] = useState(undefined);
-  const [visibleNew, setVisibleNew] = useState(false);
-  const [branchOptions, setBranchOptions] = useState([]);
-  const [logInfo, setLogInfo]= useState([]);
-
-  useEffect(()=>{
-    axios.get(`/${owner}/${projectsId}/pulls/get_branches.json`, {}).then(res=>{
-      res && setBranchOptions(res.data);
-    })
-  }, [])
 
   useEffect(()=>{
     // 获取仓库同步记录
-    axios.get(`/${owner}/${projectsId}/synchronizes/jobs.json`, {params: {type: type, limit: pageSize, page: current}}).then(res=>{
-      if(res && res.data && res.data.message === "success"){
-        // 处理从后往前删除
-        if(current !== 1 && res.data.data.length === 0){
-          setCurrent(current-1);
-        }else{
-          res.data.data.map(item=>{
-            item.create_time = item.create_time.replace('T', ' ')
-          })
-          setData(res.data.data);
-          setTotal(res.data.count);
-        }
+    setLoading(true)
+    axios.get(`/v1/${owner}/${projectsId}/sync_repositories/history`, {params: {
+      type: type,
+      limit: pageSize,
+      page: current,
+      reposync_branch_ids: syncIds
+    }}).then(res=>{
+      setLoading(false);
+      if(res && res.status === 200){
+        res.data.logs.map((item, index)=>{
+        item.id = index+1
+      })
+        setData(res.data);
+        setTotal(res.data.total_count);
       }
+    }).catch(()=>{
+      setLoading(false);
     })
-  },[reload, pageSize, current])
+  },[pageSize, current])
 
   // 同步状态errorBox
   let columns = [
     { title: '序号', dataIndex: 'index', className:"recordColumns", render: (text, item, index) => <span>{(current-1)*pageSize+index + 1}</span> },
-    { title: type === 'github' ? 'Github分支' : 'Gitee分支', dataIndex: type === 'github' ? 'github_branch': 'gitee_branch', className:"recordColumns taskName"},
-    { title: 'GitLink分支', dataIndex: 'gitlink_branch', className:"recordColumns"},
-    { title: '创建时间', dataIndex: 'create_time', className:"primaryColor recordColumns"},
-    { title: '同步状态', dataIndex: 'status', className:"recordColumns", render: ()=><span className="accomplish statusBox">开启中</span>},
-    { title: '操作', dataIndex: 'action', align: 'center', className:"primaryColor recordColumns", render: (text, item)=><span className="deleteRecord" onClick={()=>{setVisible(true);setDeleteRecordId(item.id);}}>删除</span>},
+    { title: '代码变更方', dataIndex: 'change_from', className:"recordColumns"},
+    { title: '同步时间', dataIndex: 'sync_time', className:"recordColumns"},
+    { title: 'commit id', dataIndex: 'commit_id', className:"primaryColor recordColumns"},
+    { title: '同步日志', dataIndex: 'action', align: 'center', className:"primaryColor recordColumns"},
   ]
 
   const customExpandIcon = (props) => {
-    if (props.expanded) {
-      return <a className='primaryColor' onClick={e => {
-        props.onExpand(props.record, e);
-      }}>查看日志<img alt="" src={anniu2} style={{width: '18px'}} className="ml5"/></a>
-    } else {
-      return <a className='primaryColor' onClick={e => {
-        axios.get(`/${owner}/${projectsId}/synchronizes/job_logs.json`, {params:{job_id: props.record.id}}).then(res=>{
-          if(res && res.data){
-            setLogInfo(res.data.data);
-            props.onExpand(props.record, e);
-          }
-        })
-      }}>查看日志<img alt="" src={anniu} style={{width: '18px'}} className="ml5"/></a>
-    }
+    return <a className='primaryColor' onClick={e => {
+      props.onExpand(props.record, e);
+    }}>查看日志<img alt="" src={props.expanded ? anniu2 : anniu} style={{width: '15px'}} className="ml5"/></a>
   }
 
   const expandRow = (record) => {
-    return logInfo  && logInfo.length > 0 ? <div className="expandBox">
-      {logInfo.map(item=>{
-        return <div className="expandCont" key={item.id}>
-          {item.create_time + ' [' + item.log_type + '] ' + item.log}
-        </div>
-      })}
-    </div> : <Nodata _html="暂无数据"/>}
+    return <div className="expandBox" dangerouslySetInnerHTML={{__html:record.log}}></div>
+  }
 
   // 展开收起行回调
   function onExpand(expanded, record){
@@ -112,54 +85,29 @@ function RecordList(props){
     setCurrent(page);
   }
 
-  // 删除同步分支
-  function deleteRecord(){
-    deleteRecordId && axios.delete(`/${owner}/${projectsId}/synchronizes/delete_job.json`, {data: {job_id: deleteRecordId}}).then(res=>{
-      if(res && res.data.message === "success"){
-        setReload(Math.random());
-        message.success('删除成功');
-        setVisible(false);
-      }
-    })
-  }
-
   return <div className="storeListBox">
-    <div className="font-16">
-      <Link to={`/${owner}/${projectsId}/service/reposyncer`} className="blueSpan">仓库绑定</Link>
-      <span> &gt; 同步分支</span>
-    </div>
-    <div className="headBox font-16 pl15 mt20 mb10">
-      <img src={type === 'github' ? gitHub1 : gitee1} alt="" className="mr10 mb5"/>
-      <span>{type === 'github' ? 'Github' : 'Gitee'}仓库地址</span>
-      {storeDetail && <a className="ml15 blueSpan" href={type === 'github' ? storeDetail.github_address : storeDetail.gitee_address} target="_blank">{type === 'github' ? storeDetail.github_address : storeDetail.gitee_address}</a>}
-      <Button style={{width: '94px', height:'36px', padding: 0}} className="blue_border_but createJobBut" onClick={()=>{setVisibleNew(true);}}>新建同步分支</Button>
-    </div>
+    <Breadcrumb separator=">">
+      <Breadcrumb.Item className="font-15"><Link to={`/${owner}/${projectsId}/service/reposyncer`} className="primaryColor">同步记录</Link></Breadcrumb.Item>
+      <Breadcrumb.Item className="font-15 color-grey3">
+        GitLink分支：{data.gitlink_branch_name}
+        <Divider type="vertical" />
+        {data.external_type && data.external_type.split("::").pop()}分支：{data.external_branch_name}</Breadcrumb.Item>
+    </Breadcrumb>
     <Table
-      className="storeListTable"
+      className="storeListTable mt20 recordListTable"
       loading={loading}
       columns={columns}
-      dataSource={data}
+      dataSource={data.logs}
       expandedRowRender={expandRow}
-      expandIconColumnIndex={5}
+      expandIconColumnIndex={4}
       expandIconAsCell={false}
       expandIcon={customExpandIcon}
       rowKey={'id'}
       expandedRowKeys={expandedRowKeys}
       onExpand={onExpand}
-      pagination={{current: current, pageSize: pageSize, total: total, showSizeChanger: true, onShowSizeChange:onShowSizeChange, showQuickJumper: true, onChange: changePage}}
+      pagination={false}
+      // pagination={{current: current, pageSize: pageSize, total: total, showSizeChanger: true, onShowSizeChange:onShowSizeChange, showQuickJumper: true, onChange: changePage}}
     />
-    <Modal
-      title="删除同步分支"
-      visible={visible}
-      onCancel={()=>{setVisible(false)}}
-      footer={<div><Button style={{width: '90px', height:'36px'}} onClick={()=>{setVisible(false)}}>取消</Button><Button className="okBut" style={{width: '90px', height:'36px'}} onClick={deleteRecord}>确认删除</Button></div>}
-      width={535}
-      className="cancelBound"
-    >
-      <div className="bTilModal font-16"><span className="errorRedSpan font-18 mr20 mt20 ml15">!</span>确认删除此同步分支？</div>
-      <div className="sTilModal">  删除同步分支后，系统将清除此条同步数据及日志，对应分支也将停止自动同步</div>
-    </Modal>
-    <CreateJobModal owner={owner} projectsId={projectsId} visible={visibleNew} setVisible={setVisibleNew} createJobBy={type === 'github' ? 'Github' : 'Gitee'} branchOptions={branchOptions} reload={setReload}/>
   </div>
 }
 export default RecordList;
\ No newline at end of file
diff --git a/src/forge/Server/reposyncer/component/setting.jsx b/src/forge/Server/reposyncer/component/setting.jsx
new file mode 100644
index 000000000..4c61edb34
--- /dev/null
+++ b/src/forge/Server/reposyncer/component/setting.jsx
@@ -0,0 +1,85 @@
+import React, { Fragment, useState } from "react";
+import '../index.scss';
+import { Breadcrumb, Button, Input, Table, Tag, message } from "antd";
+import { Link } from "react-router-dom";
+import gitHub1 from '../../img/github1.png';
+import gitee1 from '../../img/gitee1.png';
+import axios from "axios";
+
+function RecordList(props){
+  const { owner , projectsId, platform } = props.match.params;
+  const {storeDetail, reflushRepos} = props;
+  const {sync_repositories_unique=[]} = storeDetail || {};
+  const [token, setToken] = useState({});
+  
+  function inviteClick() {
+    const copyEle = document.querySelector('#webhook'); // 获取要复制的节点
+    if (!copyEle) {
+      console.error("您的CopyTool未设置正确的inputId");
+      return;
+    }
+    copyEle.select(); // 执行选中元素
+    if (document.execCommand('copy')) {
+      document.execCommand('copy');
+      document.getSelection().removeAllRanges();
+      message.success("复制成功");
+    }
+  }
+  // 同步状态errorBox
+  // const columns = [
+  //   { title: `${platform}分支`, dataIndex: platform === 'github' ? 'github_branch': 'gitee_branch'},
+  //   { title: "GitLink分支", dataIndex: "gitlink_branch"}
+  // ]
+  return <div className="storeListBox storeSetting">
+    <Breadcrumb separator=">">
+      <Breadcrumb.Item className="font-15"><Link to={`/${owner}/${projectsId}/service/reposyncer`} className="primaryColor">同步分支列表</Link></Breadcrumb.Item>
+      <Breadcrumb.Item className="font-15">同步配置</Breadcrumb.Item>
+    </Breadcrumb>
+    {sync_repositories_unique.map(item => {
+      const {type, external_repo_address, sync_repository_ids} = item
+      return <Fragment>
+        <div className="font-15 mt20 mb7">同步仓库平台</div>
+        <div className="infoBox">{<img src={type === "SyncRepositories::Github" ? gitHub1 : gitee1} alt="" style={{width: '75px'}}/>}</div>
+        <div className="font-15 mt20 mb7">同步仓库地址</div>
+        <div className="infoBox"><a href={external_repo_address} target="_blank">{external_repo_address}</a></div>
+        <div className="font-15 mt20 mb7">Webhook接受请求地址</div>
+        <Input
+          id="webhook"
+          className="webhookCopyBox copyWebhookInput"
+          value={`${window.location.origin}/api/v1/${owner}/${projectsId}/sync_repositories/sync?sync_direction=2`}
+          readOnly
+          addonAfter={<a className="primaryColor" onClick={inviteClick}>复制链接</a>}
+        />
+        <div className="font-15 mt20 mb7">同步仓库授权</div>
+        <Input addonBefore="token" placeholder={`请输入${type.split("::")[1]}的授权token`} style={{width: '60%'}} defaultValue={item.external_token} maxLength={300} onChange={(e)=>{
+          const objs = {...token}
+          objs[external_repo_address] = e.target.value
+          setToken(objs);
+        }}/>
+        <Button type="primary" className="ml30" onClick={()=>{
+          console.log('更新', token[external_repo_address]);
+          const external_token = token[external_repo_address]
+          if(external_token){
+            axios.post(`/v1/${owner}/${projectsId}/sync_repositories/update_info.json?sync_repository_ids=${sync_repository_ids.toString()}`, {
+              external_repo_address,
+              external_token
+            }).then(res=>{
+              if(res && res.data && !res.data.status){
+                message.success("更新成功");
+                reflushRepos();
+              }
+            })
+          }else{
+            message.error("请先输入新的token")
+          }
+        }}>更新</Button>
+      </Fragment>
+    })}
+    
+    {/* <div className="font-15 mt20 mb7">同步分支配置</div>
+    <Table className="branchTable" columns={columns} bordered/> */}
+    <br/>
+    <Button className="mt20"><Link to={`/${owner}/${projectsId}/service/reposyncer`}>返回</Link></Button>
+  </div>
+}
+export default RecordList;
\ No newline at end of file
diff --git a/src/forge/Server/reposyncer/component/storeList.jsx b/src/forge/Server/reposyncer/component/storeList.jsx
index 85187ebd4..a09ab7aaa 100644
--- a/src/forge/Server/reposyncer/component/storeList.jsx
+++ b/src/forge/Server/reposyncer/component/storeList.jsx
@@ -1,53 +1,207 @@
-import React, { useEffect, useState} from "react";
-import { Button, Modal, Icon, message, Select, Input, Tooltip } from "antd";
+import React, { Fragment, useEffect, useState} from "react";
+import { Button, Modal, Icon, message, Select, Input, Form, Radio, Table, Divider, Badge, Spin, Checkbox } from "antd";
 import { Link } from "react-router-dom";
-import gitHub1 from '../../img/github2.svg';
-import gitee1 from '../../img/gitee1.svg';
+import gitHub from '../../img/github2.png';
+import gitHub1 from '../../img/github1.png';
+import gitee from '../../img/gitee2.png';
+import gitee1 from '../../img/gitee1.png';
 import logo from '../../img/logo2.png';
 import '../index.scss';
 import axios from "axios";
-import CreateJobModal from './createJobModal';
+import AddTaskModal from './addTaskModal';
+import { confirmInfo1, confirmInfo2 } from "./editStore";
+import { platformLogo, platformLogoUnText } from "..";
+
+export function unique(arr) {
+  const data = new Map()
+  return arr.filter((item) => !data.has(item.type) && data.set(item.type, 1))
+}
 
 function StoreList(props){
-  const { storeDetail} = props;
+  const { storeDetail, form, reflushRepos} = props;
+  const { getFieldDecorator, validateFields , setFieldsValue, setFields, getFieldsValue } = form;
+  const {sync_repositories, sync_repositories_unique=[]} = storeDetail || {};
   const { owner , projectsId } = props.match.params;
   const [visible, setVisible] = useState(false);
+  // 新建分支同步
   const [visibleNew, setVisibleNew] = useState(false);
-  const [createJobBy, setCreateJobBy] = useState("Github");
-  const [branchOptions, setBranchOptions] = useState([]);
+  // 仓库分支列表
+  const [branchList, setBranchList] = useState();
+  // 选择仓库类型
+  const [platform, setPlatform] = useState("GitHub");
+  const [current, setCurrent] = useState(1);
+  const [total, setTotal] = useState(0);
+  const [pageSize, setPageSize] = useState(10);
+  // 绑定仓库的id，用于获取同步记录列表
+  const syncRepositoryIdArrar = sync_repositories && sync_repositories.map(item=>{return item.sync_repository_ids});
+  const syncRepositoryIds = syncRepositoryIdArrar && syncRepositoryIdArrar.flat(Infinity).toString();
+  // 同步记录列表
+  const [list, setList] = useState([]);
+  const [branchName, setBranchName] = useState();
+  // 修改同步分支状态弹框
+  const [branchRnable, setBranchRnable] = useState();
+  // 开启同步弹窗显示文案
+  const {first_sync_direction} = getFieldsValue();
+  const {gitlink_branch_name, external_branch_name, type} = branchRnable || {}
+  const repoInfoByType = type && sync_repositories && sync_repositories.filter(item=>item.type === type)[0]
+  const externalRepoInfo = {
+    address: repoInfoByType && repoInfoByType.external_repo_address,
+    branchName: external_branch_name,
+    type
+  }
+  const gitlinkRepoInfo = {
+    address: `${window.location.origin}/${owner}/${projectsId}.git`,
+    branchName: gitlink_branch_name,
+    type: "gitlink"
+  }
+
 
   useEffect(()=>{
     axios.get(`/${owner}/${projectsId}/pulls/get_branches.json`, {}).then(res=>{
-      res && setBranchOptions(res.data);
+      res && setBranchList(res.data);
     })
   }, [])
 
-  // 取消仓库绑定点击函数
-  function updateStore(){
-    axios.delete(`/${owner}/${projectsId}/synchronizes/delete.json`).then(res=>{
-      if(res && res.data.message === "success"){
-        message.success('取消绑定成功');
-        setVisible(false);
-        props.history.push(`/${owner}/${projectsId}/service`)
+  useEffect(()=>{
+    getRecordList()
+  }, [syncRepositoryIds, branchName])
+
+  function getRecordList(){
+    syncRepositoryIds && axios.get(`/v1/${owner}/${projectsId}/sync_repositories/branches.json`, {params: {
+      sync_repository_ids: syncRepositoryIds,
+      branch_name: branchName
+    }}).then(res=>{
+      if(res && res.status === 200){
+        setList(res.data.sync_repository_branches);
       }
     })
   }
 
+  // 取消仓库绑定点击函数
+  function deleteStore(){
+    validateFields((error,values)=>{
+      if(!Object.keys(error || {}).includes("repositories")){
+        const {repositories} = values
+        // 获取删除仓库绑定关系的ids
+        const syncRepositoryIds = repositories.flat(Infinity).toString();
+        axios.post(`/v1/${owner}/${projectsId}/sync_repositories/unbind.json`, {
+          sync_repository_ids: syncRepositoryIds
+        }).then(res=>{
+          if(res && res.data && !res.data.status){
+            setVisible(false);
+            message.success('取消绑定成功');
+            reflushRepos();
+          }
+        })
+      }
+    })
+  }
+
+  // 修改分支同步状态（开启/暂停）
+  function updateBranchRnable(branchInfo){
+    const {gitlink_branch_name, external_branch_name, enable, first_sync_direction} = branchInfo;
+    axios.post(`/v1/${owner}/${projectsId}/sync_repositories/change_enable.json`, {
+      gitlink_branch_name, external_branch_name, first_sync_direction,
+      enable: new Boolean(!enable).toString()
+    }).then(res=>{
+      if(res && res.data && !res.data.status){
+        setBranchRnable(undefined);
+        message.success("操作成功");
+        getRecordList();
+      }
+    })
+  }
+
+  // 切换页数
+  function changePage(page, pageSize){
+    window.scrollTo(0, 0);
+    setCurrent(page);
+  }
+
+  let columns = [
+    { title: '序号', dataIndex: 'index', className:"recordColumns", render: (text, item, index) => <span>{(current-1)*pageSize+index + 1}</span> },
+    { title: '第三方平台分支', dataIndex: "external_branch_name", className:"recordColumns taskName", render: (text, item) => <span>
+      {platformLogoUnText(item.type, "21px")}{text}
+    </span> },
+    { title: 'GitLink分支', dataIndex: 'gitlink_branch_name', className:"recordColumns"},
+    { title: '最后一次同步时间', dataIndex: 'sync_time', className:"primaryColor recordColumns"},
+    { title: '同步状态', dataIndex: 'sync_status', className:"recordColumns", render: (text)=>text === "failure" ? <Badge status="error" text="失败" className="deleteRecord"/> : <Badge status="success" text="成功" className="success"/>},
+    { title: '操作', dataIndex: 'enable', align: 'center', className:"primaryColor recordColumns", render: (text, item)=>{
+      const branch = item[platform === 'GitHub' ? 'github_branch': 'gitee_branch']
+      return <div>
+        <Link to={`/${owner}/${projectsId}/service/reposyncer/record/${item.reposync_branch_ids}`} className="primaryColor">同步记录</Link>
+        <Divider type="vertical" />
+        <a className="primaryColor" onClick={()=>{
+          if(text){
+            // 停止同步状态不需要弹窗
+            updateBranchRnable(item);
+          }else{
+            setBranchRnable(item);
+          }
+        }}>{text ? "停止" : "开始"}</a>
+      </div>
+    }},
+  ]
+
 
   return <div className="storeListBox">
-    <div className="headBox font-16 pl15">Reposyncer仓库同步服务
-      {storeDetail !== null && <Tooltip title="Reposyncer仓库同步系统提供跨托管平台的项目协同开发同步功能。支持用户在任何一个托管平台上的代码提交、代码推送、合并请求等操作自动同步至其他托管平台。不仅增加每个开源项目与开发者的流量，也使不同平台的开源项目维护与更新变得方便与快捷" overlayStyle={{width: 400}}><span className="helpBox1 font-12 ml10">?</span></Tooltip>}
-    </div>
-    {/* 空数据 */}
-    {!storeDetail && <div className="nullStoreBox mt25">
-      <img src={logo} alt="" className="loBox mt50"/>
-      <p className="font-22 mt10">欢迎使用跨平台代码同步服务</p>
-      <div className="introBox font-15">跨平台代码同步服务提供跨托管平台的项目协同开发同步功能。支持用户在任何一个托管平台上的代码提交、代码推送、合并请求等操作自动同步至其他托管平台。不仅增加每个开源项目与开发者的流量，也使不同平台的开源项目维护与更新变得方便与快捷</div>
-      <div className="borBox"></div>
-      <Button type="primary" style={{width: '112px', height: '36px'}}><Link to={`/${owner}/${projectsId}/service/reposyncer/store/edit`}>开始体验</Link></Button>
-    </div>}
-    {/* 已绑定仓库信息 */}
-    {storeDetail && <div className="listStore mt20">
+    <Spin spinning={!sync_repositories}>
+      {/* 空数据 */}
+      {sync_repositories && !sync_repositories.length && <Fragment>
+        <div className="headBox font-16 pl15">跨平台仓库同步服务
+          {/* {storeDetail !== null && <Tooltip title="跨平台仓库代码同步系统提供跨托管平台的项目协同开发同步功能。支持用户在任何一个托管平台上的代码提交、代码推送、合并请求等操作自动同步至其他托管平台。不仅增加每个开源项目与开发者的流量，也使不同平台的开源项目维护与更新变得方便与快捷" overlayStyle={{width: 400}}><span className="helpBox1 font-12 ml10">?</span></Tooltip>} */}
+        </div>
+        <div className="nullStoreBox mt25">
+          <img src={logo} alt="" className="loBox mt50"/>
+          <p className="font-22 mt10">欢迎使用跨平台仓库代码同步服务</p>
+          <div className="introBox font-15">跨平台仓库代码同步服务提供跨托管平台的项目协同开发同步功能。支持用户在任何一个托管平台上的代码提交、代码推送、合并请求等操作自动同步至其他托管平台。不仅增加每个开源项目与开发者的流量，也使不同平台的开源项目维护与更新变得方便与快捷</div>
+          <div className="borBox"></div>
+          <Button type="primary" style={{width: '112px', height: '36px'}}><Link to={`/${owner}/${projectsId}/service/reposyncer/store/edit`}>开始体验</Link></Button>
+        </div>
+      </Fragment>}
+      {/* 已绑定仓库信息 */}
+      {sync_repositories && !!sync_repositories.length && <Fragment>
+        {/* <Radio.Group defaultValue="GitHub" buttonStyle="solid" onChange={(e)=>{
+          setPlatform(e.target.value);
+        }}>
+          <Radio.Button value="GitHub"><img src={platform === "GitHub" ? gitHub : gitHub1} alt="" style={{width: '70px'}}/></Radio.Button>
+          <Radio.Button value="Gitee"><img src={platform === "Gitee" ? gitee : gitee1} alt="" style={{width: '70px'}}/></Radio.Button>
+        </Radio.Group> */}
+        <div className="headBox flexBetween pl20 mt20">
+          <div>
+            {sync_repositories_unique.map((item, index)=>{
+              return <Fragment>
+                <a href={item.external_repo_address} target="_blank">
+                  {/* <img src={item.type === "SyncRepositories::Github" ? gitHub1 : gitee1} alt="" style={{width: '80px'}}/> */}
+                  {platformLogo(item.type)}
+                </a>
+                {sync_repositories_unique[index+1] ? <Divider type="vertical" /> : ""}
+              </Fragment>
+            })}
+          </div>
+          <div className="flexBetween">
+            <Input.Search placeholder="搜索分支名称" allowClear onSearch={(value)=>{
+              setBranchName(value);
+            }}/>
+            <Button type="primary" className="ml20 mr20" onClick={()=>{setVisibleNew(true);}}>添加同步分支</Button>
+          </div>
+        </div>
+        <Table
+          className="storeListTable mt20"
+          columns={columns}
+          dataSource={list}
+          pagination={false}
+          // pagination={{current: current, pageSize: pageSize, total: total, showQuickJumper: true, onChange: changePage}}
+        />
+        <div className="mt20">
+          <Button type="primary" ghost className="mr20" hidden={sync_repositories_unique.length === 2}><Link to={`/${owner}/${projectsId}/service/reposyncer/store/edit`}>添加同步仓库</Link></Button>
+          <Button type="primary" ghost><Link to={`/${owner}/${projectsId}/service/reposyncer/setting`}>查看同步配置</Link></Button>
+          <Button type="danger" ghost className="ml20" onClick={()=>{
+            setVisible(true);
+          }}>解绑此仓库</Button>
+        </div>
+      </Fragment>}
+    {/* {storeDetail && <div className="listStore mt20">
       <div className="storeTitle pb5 mb5 font-18">已绑定仓库地址<Icon type="exclamation-circle" style={{color: '#466aff'}} className="ml10 font-14"/><span className="ml5 font-14" style={{fontWeight: 'normal'}}>对已绑定的仓库，请添加同步分支实现分支的跨平台双向同步</span></div>
       {storeDetail && storeDetail.github_address && <div className="showStoreInfo dashedBor">
         <div className="storeInfoBox">
@@ -69,21 +223,79 @@ function StoreList(props){
           <Button style={{width: '94px', height:'36px', padding: 0}} className="blue_border_but" onClick={()=>{setVisibleNew(true);setCreateJobBy('Gitee')}}>新建同步分支</Button>
         </div>
       </div>}
-      {/* <Button type="primary" style={{width: '134px', height:'36px', padding: 0}} className="mt30"><Link to={`/${owner}/${projectsId}/service/reposyncer/store/edit`}>更改绑定仓库信息</Link></Button> */}
+      // <Button type="primary" style={{width: '134px', height:'36px', padding: 0}} className="mt30"><Link to={`/${owner}/${projectsId}/service/reposyncer/store/edit`}>更改绑定仓库信息</Link></Button>
       <Button style={{width: '134px', height:'36px'}} className="red_border_but mt40" onClick={()=>{setVisible(true)}}>清空仓库绑定</Button>
-    </div>}
+    </div>} */}
+    </Spin>
+    <Modal
+      title="开启同步"
+      visible={Boolean(branchRnable)}
+      onCancel={()=>{setBranchRnable(undefined)}}
+      footer={<div>
+        <Button style={{ width: '95px', height: '32px' }} onClick={() => { setBranchRnable(undefined) }} className="mr40">再想想</Button>
+        <Button style={{ width: '95px', height: '32px' }} type="primary" ghost onClick={()=>{
+          validateFields((error,values)=>{
+            if(!Object.keys(error || {}).includes("first_sync_direction")){
+              // todo: 首次同步方向：
+              updateBranchRnable({
+                ...branchRnable,
+                first_sync_direction: values.first_sync_direction
+              })
+            }
+          })
+        }}>开始同步</Button>
+      </div>}
+      width={650}
+      className="reposyncerModal"
+    >
+      {confirmInfo1("重新开启同步时，系统将主分支源码强制向从分支推送，覆盖从分支源码。后续任意分支有push事件，将自动同步至其他分支，与主从设置无关。若想更改主从分支，请返回并更改同步方向")}
+      {branchRnable && <Form.Item label="首次同步方向：" labelCol= {{ span: 5 }} wrapperCol= {{ span: 18 }}>
+        {getFieldDecorator("first_sync_direction",{
+          rules:[{required:true,message:"请选择首次同步方向"}]
+        })(
+          <Select placeholder="请选择首次同步方向" style={{width: '100%'}}>
+            <Select.Option value="2">{branchRnable.type.split("::").pop()}同步至GitLink</Select.Option>
+            <Select.Option value="1">GitLink同步至{branchRnable.type.split("::").pop()}</Select.Option>
+          </Select>
+        )}
+      </Form.Item>}
+      {first_sync_direction && confirmInfo2({
+        mainBranch: first_sync_direction === "1" ? gitlinkRepoInfo : externalRepoInfo,
+        branch: first_sync_direction === "1" ? externalRepoInfo : gitlinkRepoInfo
+      })}
+    </Modal>
     <Modal
       title="取消绑定"
       visible={visible}
       onCancel={()=>{setVisible(false)}}
-      footer={<div><Button style={{width: '90px', height:'36px'}} onClick={()=>{setVisible(false)}}>取消</Button><Button className="okBut" style={{width: '90px', height:'36px'}} onClick={updateStore}>确认清空</Button></div>}
-      width={535}
-      className="cancelBound"
+      footer={<div>
+        <Button style={{ width: '95px', height: '32px' }} onClick={()=>{setVisible(false)}} className="mr40">取消</Button>
+        <Button style={{ width: '95px', height: '32px' }} onClick={deleteStore} type="primary" ghost>确认</Button>
+      </div>}
+      width={650}
+      className="reposyncerModal"
     >
-      <div className="bTilModal font-16"><span className="errorRedSpan font-18 mr20 mt20 ml15">!</span>您确定要清空已绑定仓库？</div>
-      <div className="sTilModal">此操作将清空所有绑定仓库/绑定分支及同步日志，请谨慎操作</div>
+      <div className="flexBetween ml15" style={{justifyContent: "flex-start"}}>
+        <Icon type="exclamation-circle" theme="filled" style={{ fontSize: '22px', color: '#CA0002' }}/>
+        <span className="font-16 ml10" style={{lineHeight: '30px'}}>{sync_repositories_unique.length > 1 ? "请选择您要解绑的仓库" : "您确定要清空已绑定仓库？"}</span>
+      </div>
+      <div className="font-15 mt5 mb25 ml15">此操作将清空所有绑定仓库/绑定分支及同步日志，请谨慎操作</div>
+      <Form.Item style={{padding: '5px 15px'}}>
+        {getFieldDecorator("repositories",{
+          rules:[{required:true,message:"至少选择一个仓库"}],
+        })(
+          <Checkbox.Group>
+            {sync_repositories_unique.map((item, index) =>{
+              return <Checkbox key={index} value={item.sync_repository_ids} className="infoBoxBlueBg mb20" style={{width: "570px", marginLeft: "0px"}}>
+                {platformLogo(item.type)}
+                <span className="ml10">{item.external_repo_address}</span>
+              </Checkbox>
+            })}
+          </Checkbox.Group>
+        )}
+      </Form.Item>
     </Modal>
-    <CreateJobModal owner={owner} projectsId={projectsId} visible={visibleNew} setVisible={setVisibleNew} createJobBy={createJobBy} branchOptions={branchOptions}/>
+    <AddTaskModal owner={owner} projectsId={projectsId} visible={visibleNew} setVisible={setVisibleNew} branchList={branchList} sync_repositories_unique={sync_repositories_unique} reload={getRecordList}/>
   </div>
 }
-export default StoreList;
\ No newline at end of file
+export default Form.create()(StoreList);;
\ No newline at end of file
diff --git a/src/forge/Server/reposyncer/index.jsx b/src/forge/Server/reposyncer/index.jsx
index b5d95557a..08d178cb0 100644
--- a/src/forge/Server/reposyncer/index.jsx
+++ b/src/forge/Server/reposyncer/index.jsx
@@ -2,6 +2,11 @@ import React, {useState, useEffect} from "react";
 import { Button, Tooltip } from "antd";
 import './index.scss';
 import logo from '../img/logo2.png';
+import gitHub1 from '../img/github1.png';
+import gitee1 from '../img/gitee1.png';
+import gitHub from '../img/github.png';
+import gitee from '../img/gitee.png';
+import gitlink1 from '../img/gitlink1.png';
 import Loadable from "react-loadable";
 import { Route, Switch } from "react-router";
 import Loading from "../../../Loading";
@@ -23,11 +28,25 @@ const RecordList = Loadable({
   loader: () => import("./component/recordList"),
   loading: Loading,
 });
+// 同步仓库配置页
+const Setting = Loadable({
+  loader: () => import("./component/setting"),
+  loading: Loading,
+});
+
+export const platformLogo = (platform="Github", width="80px") => {
+  return <img src={platform.indexOf("Github") !== -1 ? gitHub1 : platform === "gitlink" ? gitlink1 : gitee1} alt="" style={{width: platform === "gitlink" ? '120px' : width}}/>
+}
+
+export const platformLogoUnText = (platform="Github", width="18px") => {
+  return <img src={platform.indexOf("Github") !== -1 ? gitHub : gitee} alt="" style={{width: width}} className="storeLogo mr5"/>
+}
 
 function Reposyncer(propsF){
   const { owner , projectsId } = propsF.match.params;
 
   const [storeDetail, setStoreDetail] = useState(null);
+  const [reload, setReload] = useState();
   const { projectDetail } = propsF;
 
   useEffect(()=>{
@@ -40,31 +59,50 @@ function Reposyncer(propsF){
 
   useEffect(()=>{
     // 获取仓库同步详情
-    axios.get(`/${owner}/${projectsId}/synchronizes.json`).then(res=>{
-      if(res && res.data.message === "success"){
-        setStoreDetail(res.data.data);
+    axios.get(`/v1/${owner}/${projectsId}/sync_repositories.json`).then(res=>{
+      if(res && res.status === 200){
+        setStoreDetail({
+          ...res.data,
+          // 根据仓库类型去重
+          sync_repositories_unique: unique(res.data.sync_repositories || [])
+        });
       }
     })
-  },[])
+  },[reload])
+  
+  function unique(arr) {
+    const data = new Map()
+    return arr.filter((item) => !data.has(item.type) && data.set(item.type, 1))
+  }
+
+  function reflushRepos(){
+    setReload(Math.random())
+  }
 
   return <div className="reposyncerBox">
     <Switch {...propsF}>
       <Route
-        path="/:owner/:projectsId/service/reposyncer/record/:type"
+        path="/:owner/:projectsId/service/reposyncer/record/:syncIds"
         render={(props) => (
-          <RecordList {...propsF} {...props} storeDetail={storeDetail}/>
+          <RecordList {...propsF} {...props}/>
         )}
       ></Route>
       <Route
         path="/:owner/:projectsId/service/reposyncer/store/edit"
         render={(props) => (
-          <EditStore {...propsF} {...props}/>
+          <EditStore {...propsF} {...props} storeDetail={storeDetail}/>
+        )}
+      ></Route>
+      <Route
+        path="/:owner/:projectsId/service/reposyncer/setting"
+        render={(props) => (
+          <Setting {...propsF} {...props} storeDetail={storeDetail} reflushRepos={reflushRepos}/>
         )}
       ></Route>
       <Route
         path="/:owner/:projectsId/service/reposyncer"
         render={(props) => (
-          <StoreList {...propsF} {...props} storeDetail={storeDetail}/>
+          <StoreList {...propsF} {...props} storeDetail={storeDetail} reflushRepos={reflushRepos}/>
         )}
       ></Route>
     </Switch>
diff --git a/src/forge/Server/reposyncer/index.scss b/src/forge/Server/reposyncer/index.scss
index 449531821..1eac96f9f 100644
--- a/src/forge/Server/reposyncer/index.scss
+++ b/src/forge/Server/reposyncer/index.scss
@@ -118,12 +118,10 @@
     border-bottom: 1px solid #e0e6f5;;
   }
   .registerBox{
-    width: 85%;
-    .storeLogo{
-      width: 75px;
-    }
+    width: 80%;
+    margin: 0 auto;
     .storeFormItem{
-      width: 70%;
+      width: 85%;
     }
     .has-error .ant-input, .has-error .ant-input:hover, .has-error .storeInput .ant-input{
       border-color:#f60011;
@@ -156,18 +154,19 @@
       color:$primary-color;
       &:hover{color: $primary-color-hover;}
     }
-    .storeInfoBox{color: #666;}
-    .sTil{
-      color:#202d40;
-      display: flex;
-      align-items: flex-start;
-    }
+    // .storeInfoBox{color: #666;}
+    // .sTil{
+    //   color:#202d40;
+    //   display: flex;
+    //   align-items: flex-start;
+    // }
   }
   .expandBox{
     background-color: #171b23;
     color: white;
     margin: -16px;
-    padding-bottom: 16px;
+    padding: 11px 16px;
+    white-space: pre-wrap;
     .expandCont{
       word-break: break-all;
       padding: 16px 16px 0;
@@ -187,6 +186,9 @@
     font-size: 15px;
     border-bottom: 1px dashed #e0e6f5;
     &.primaryColor{color: $primary-color;}
+    .ant-badge-status-text{
+      color: inherit;
+    }
   }
   tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected) td.recordColumns{
     background-color:#f8f9ff !important;
@@ -210,21 +212,48 @@
   }
   .deleteRecord{
     color:#f60011;
-    cursor: pointer;
-    position: relative;
-    padding-left: 20px;
-    &::before{
-      content: '';
-      position: absolute;
-      top: 6px;
-      left: 5px;
-      width: 1px;
-      height: 9px;
-      background-color: #dfdfdf;;
-    }
+  }
+  .success{
+    color:#009c44;
   }
   .primaryColor{color: $primary-color;}
 }
+.recordListTable{
+  th.recordColumns:first-child {
+    border-left: 1px solid rgba(42, 97, 255, .23);
+  }
+  th.recordColumns:last-child {
+    border-right: 1px solid rgba(42, 97, 255, .23);
+  }
+  th.recordColumns {
+    border-top: 1px solid rgba(42, 97, 255, .23);
+    border-bottom: 1px solid rgba(42, 97, 255, .23) !important;
+    background-color: #fafcff;
+  }
+}
+.reposyncerModal{
+  .ant-modal-header{
+    padding: 5px 24px;
+    background: rgba(70,106,255,0.09);
+    .ant-modal-title{
+      font-weight: normal !important;
+      text-align: left;
+    }
+  }
+  .ant-modal-close-x{
+    line-height: 33px;
+  }
+  .ant-modal-footer{
+    border-top: none;
+    text-align: center;
+    padding-bottom: 30px;
+  }
+  .infoBoxBlueBg{
+    background: rgba(70,106,255,0.05);
+    border-radius: 4px;
+    padding: 19px 15px;
+  }
+}
 .cancelBound{
   .ant-modal-header{
     padding: 10px 25px;
@@ -273,23 +302,42 @@
     }
   }
 }
-.createJobBox{
-  .itemBox{
-    display: flex;
-    align-items: center;
-    position: relative;
-    .errorBox{
-      position: absolute;
-      top: 35px;
-      left: 130px;
-      color:#f60011;
-    }
+.storeLogo{
+  width: 18px;
+  vertical-align: sub;  
+}
+.codeSynchronizationForm{
+  padding: 30px;
+  background: rgba(70,106,255,0.03);
+  margin-top: 25px;
+}
+.flexBetween{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.storeSetting{
+  .infoBox{
+    width: 60%;
+    padding: 3px 15px;
+    background-color: rgba(70,106,255,0.03);
   }
-  .labelBox{
-    width: 125px;
-    .icon-a-bitian2x{color: #fe1010;}
+  .webhookCopyBox{
+    width: 60%;
   }
-  .inputBox{
-    width: 80%;
+  .branchTable{
+    width: 30%;
+  }
+}
+.copyWebhookInput .ant-input-group .ant-input:focus{
+  border-right: 1px solid $primary-color !important;
+}
+.primaryColor{color: $primary-color;}
+.directionByAddTaskModal{
+  position: relative;
+  .synchronizeTip{
+    position: absolute;
+    right: -4px;
+    top: 14px;
   }
 }
\ No newline at end of file
diff --git a/src/forge/Settings/Setting.js b/src/forge/Settings/Setting.js
index 024f98b64..be7eebe8f 100644
--- a/src/forge/Settings/Setting.js
+++ b/src/forge/Settings/Setting.js
@@ -423,7 +423,7 @@ class Setting extends Component {
             {/* <Mirror /> */}
           </WhiteBack>
           {
-            projectDetail && projectDetail.permission && (projectDetail.permission === "Admin" || projectDetail.permission === "Owner")?
+            projectDetail && projectDetail.permission && (projectDetail.permission === "Admin" || projectDetail.permission === "Owner" || projectDetail.permission ==="Manager")?
             <WhiteBack className="dangerousBox mb20">
               <div>
                 <div className="dangerousTitle">危险操作区</div>
diff --git a/src/forge/Settings/Webhooks/Index.jsx b/src/forge/Settings/Webhooks/Index.jsx
index 914028f67..912e68fee 100644
--- a/src/forge/Settings/Webhooks/Index.jsx
+++ b/src/forge/Settings/Webhooks/Index.jsx
@@ -21,6 +21,11 @@ function Index(props) {
   const { owner , projectsId } = props.match.params;
   const { projectDetail } = props;
 
+  const unEditTips = {
+    softbot: "已安装的Bot创建，请勿编辑或删除以防Bot失效",
+    reposync: "Reposyncer仓库同步创建，请勿编辑或删除以防同步失败"
+  }
+
   useEffect(()=>{
     if(projectDetail && document.title.indexOf('网络钩子-') === -1){
       const { author, name} = projectDetail;
@@ -55,8 +60,8 @@ function Index(props) {
   }
 
   function deleteFunc(webhook) {
-    setDeleteWebHookModTitle(webhook.isJianMu ? '请谨慎删除此Webhook' : '删除Webhook');
-    setDeleteWebHookModSubTitle(webhook.isJianMu ? '该Webhook由流水线创建, 删除此Webhook后, 将导致本仓库相关流水线失效。确定要删除此Webhook?' :  `删除后未来事件将不会推送至此Webhook地址: ${webhook.url}`);
+    setDeleteWebHookModTitle("删除Webhook");
+    setDeleteWebHookModSubTitle(`删除后未来事件将不会推送至此Webhook地址: ${webhook.url}`);
     setDeleteId(webhook.id);
     setVisible(true);
   }
@@ -131,14 +136,13 @@ function Index(props) {
                 <List.Item key={k}>
                   <i className={`iconfont mr12 font-17 color-grey-6 ${i.isJianMu ? 'icon-gongzuoliuicon' : i.type === "softbot" ? 'icon-a-zu37 font-20' : 'icon-a-xuanzhongwebhookicon'}`}></i>
                   <span className="webName">{i.isJianMu ? <Tooltip title="该Webhook由流水线创建，请勿编辑或删除以防流水线失效"><span className="webName spanBox">{i.url}</span></Tooltip> : i.url}</span>
-                  {!i.isJianMu && i.type !== "softbot" && <span>
+                  {(i.isJianMu || i.type === "softbot" || i.type === "reposync") ? <span>
+                    <Popover content={`该webhook由${i.isJianMu ? '流水线创建，不可编辑或删除，更改配置将导致流水线失效' : unEditTips[i.type]}`} title="无法编辑此Webhook" overlayClassName="disabledButPopover"><Button ghost type={"primary"} onClick={()=>{gotoEditWebhook(i)}}>查看</Button></Popover>
+                    <Popover content={`该webhook由${i.isJianMu ? '流水线创建，不可编辑或删除，更改配置将导致流水线失效' : unEditTips[i.type]}`} title="无法删除此Webhook" overlayClassName="disabledButPopover"><Button className="ml20" type="danger" disabled>删除</Button></Popover>
+                  </span> : <span>
                     <Button ghost type={"primary"} onClick={()=>{gotoEditWebhook(i)}}>编辑</Button>
                     <Button ghost className="ml20" type="danger" onClick={()=>{deleteFunc(i)}}>删除</Button>
                   </span>}
-                  {(i.isJianMu || i.type === "softbot") && <span>
-                    <Popover content={`该webhook由${i.isJianMu ? '流水线创建，不可编辑或删除，更改配置将导致流水线失效' : '已安装的Bot创建，请勿编辑或删除以防Bot失效'}`} title="无法编辑此Webhook" overlayClassName="disabledButPopover"><Button ghost type={"primary"} onClick={()=>{gotoEditWebhook(i)}}>查看</Button></Popover>
-                    <Popover content={`该webhook由${i.isJianMu ? '流水线创建，不可编辑或删除，更改配置将导致流水线失效' : '已安装的Bot创建，请勿编辑或删除以防Bot失效'}`} title="无法删除此Webhook" overlayClassName="disabledButPopover"><Button className="ml20" type="danger" disabled>删除</Button></Popover>
-                  </span>}
                 </List.Item>
               )
             })}
diff --git a/src/forge/Settings/Webhooks/New.jsx b/src/forge/Settings/Webhooks/New.jsx
index 1e2d4caae..da66c16a5 100644
--- a/src/forge/Settings/Webhooks/New.jsx
+++ b/src/forge/Settings/Webhooks/New.jsx
@@ -73,7 +73,7 @@ function New({ form , match , showNotification , history, projectDetail }) {
         const reg1 = new RegExp("https://(.*?)jianmuhub.com(.*?)");
         const reg2 = new RegExp("https://jianmu.gitlink.org.cn(.*?)");
         const {url, type} = result.data;
-        setUnEdit(reg1.test(url) || reg2.test(url) || type === "softbot")
+        setUnEdit(reg1.test(url) || reg2.test(url) || type === "softbot" || type === "reposync")
         let e = compareArray(result.data.events);
         setFieldsValue({
           ...result.data,
diff --git a/src/forge/Settings/Webhooks/sub/PushHistory.jsx b/src/forge/Settings/Webhooks/sub/PushHistory.jsx
index f375f33f7..f551fb2d0 100644
--- a/src/forge/Settings/Webhooks/sub/PushHistory.jsx
+++ b/src/forge/Settings/Webhooks/sub/PushHistory.jsx
@@ -86,7 +86,7 @@ function PushHistory({id,owner,projectsId,showNotification}) {
         </Collapse>
         :
         <div style={{height:"470px",display:"flex",alignItems:"center",justifyContent:"center"}}>
-          <Spin />
+          <Spin spinning={isSpin}/>
         </div>
       }
       {
diff --git a/src/forge/users/Infos.js b/src/forge/users/Infos.js
index 9981cd2d0..4d3f49439 100644
--- a/src/forge/users/Infos.js
+++ b/src/forge/users/Infos.js
@@ -161,7 +161,7 @@ class Infos extends Component {
       const { pathname } = this.props.location;
       this.renderPath(pathname,result.data);
       document.title =  result.data.username ? result.data.username : username;
-      let keyWords=`${result.data.username},${username},`;
+      let keyWords=`${result.data.username},${username}`;
       let title= result.data.username+'('+ username +')';
       setSeoMeta(keyWords,title,title,`/${username}`,username);
     })
diff --git a/src/glcc/apply/editInfo.jsx b/src/glcc/apply/editInfo.jsx
index 86ecbf46f..bedd81397 100644
--- a/src/glcc/apply/editInfo.jsx
+++ b/src/glcc/apply/editInfo.jsx
@@ -1,5 +1,5 @@
 import React , { useCallback, useEffect , useState } from 'react';
-import { Button, Form, Input, Select, Upload, message, Popconfirm, Checkbox } from 'antd';
+import { Button, Form, Input, Select, Upload, message, Popconfirm, Checkbox, Icon, Tooltip } from 'antd';
 import {getUploadActionUrl} from 'educoder';
 import {applyGlcc, findStudentTaskByTaskId, updateApplyGlcc} from '../api';
 import TextArea from 'antd/lib/input/TextArea';
@@ -231,13 +231,23 @@ function EditRepoApplyInfo(props) {
             {cateList && cateList.map(item=> {return <Option value={item.name} key={item.id}>{item.name}</Option>})}
           </Select>
         )}
-        {helper('GitLink地址',
-          '',
-          'gitlinkUrl',
-          [{ required: true, message: "请输入GitLink项目地址" },
-          { max: 252, message: '超出限制长度252位字符，请重新编辑' }],
-          <Input placeholder="请输入GitLink项目地址" onBlur={()=>{verify("gitlink")}}/>
-        )}
+        
+        <div className='posiHasQuestionBox'>
+          {helper('项目仓库地址',
+            '如需GLCC资助项目奖金，请将项目迁移到Gitlink平台',
+            'gitlinkUrl',
+            [{ required: true, message: "请输入项目仓库地址" },
+            { max: 252, message: '超出限制长度252位字符，请重新编辑' }],
+            <Input placeholder="请输入项目仓库地址" onBlur={()=>{verify("gitlink")}}/>
+          )}
+          {/* <Tooltip title={<div>
+            迁移方式详见 <a href='https://forum.gitlink.org.cn/forums/10594/detail' target="_blank" style={{color: "#466aff"}}>迁移说明文档</a>
+          </div>}
+          >
+            <Icon type="question-circle" theme="filled" className="question mt15 ml10"/>
+          </Tooltip> */}
+          <a href='https://forum.gitlink.org.cn/forums/10594/detail' className="question" target="_blank" style={{color: "#466aff"}}>迁移说明文档</a>
+        </div>
         <Form.Item label="联系人姓名">
           {getFieldDecorator("contactName", { rules: [{ required: true, message: "请输入项目联系人姓名" },
           { max: 32, message: '超出限制长度32位字符，请重新编辑' }], validateFirst: true, initialValue: current_user.username })(
diff --git a/src/glcc/apply/index.jsx b/src/glcc/apply/index.jsx
index fd70553c8..aaba59455 100644
--- a/src/glcc/apply/index.jsx
+++ b/src/glcc/apply/index.jsx
@@ -85,7 +85,7 @@ function Apply(props) {
           <p className='font-15 c000'>申请说明</p>
           <div>1、项目报名时间为<span className='c000'>{formatParsedResult(applyTime, "rangeDay")}</span>，请在报名截止时间（北京时间<span className='c000'>{formatParsedResult(applyTime, "end")}</span>）前提交报名信息。</div>
           <div>2、本次GLCC夏令营建议使用GitLink为代码托管平台，学生基于GitLink上项目完成编程任务。同时也欢迎使用其他代码托管平台的项目参与活动。目前GLCC只对夏令营期间使用GitLink托管的项目提供部分奖励支持。</div>
-          <div>3、如果您的项目还未迁移到GitLink上，迁移事项请查看<a href='https://help.gitlink.org.cn/%E5%BF%AB%E9%80%9F%E5%BC%80%E5%A7%8B/%E5%AF%BC%E5%85%A5GitHub%E7%AD%89%E7%AC%AC%E4%B8%89%E6%96%B9Git%E9%A1%B9%E7%9B%AE?_highlight=%E5%AF%BC%E5%85%A5' target="_blank" className='link'>迁移说明文档</a>。如在迁移过程中遇到问题，请加qq群: 1071514693  联系qq群管理员。</div>
+          <div>3、如果您的项目还未迁移到GitLink上，迁移事项请查看<a href='https://forum.gitlink.org.cn/forums/10594/detail' target="_blank" className='link'>迁移说明文档</a>。如在迁移过程中遇到问题，请加qq群: 1071514693  联系qq群管理员。</div>
           <div>4、提交社区和题目信息后，欢迎与组委会联系沟通宣传推广和后续合作工作。联系人微信: _TigerWang（备注GitLink编程夏令营）</div>
           <div>5、在项目报名期间（{formatParsedResult(applyTime, "rangeDay")}），您可以随时进入当前页调整项目或课题报名信息</div>
           <div><span className='c000'>6、课题奖励默认由项目方支持，可提供现金或者实习机会等其他形式的奖励，请根据课题难度设定奖励内容。若您可能无法支撑本课题奖励，GLCC组委会将进行资助评审，择优资助。如未获得资助，将下线该课题</span></div>
diff --git a/src/glcc/apply/index.scss b/src/glcc/apply/index.scss
index 6a52017c5..e63d9b59c 100644
--- a/src/glcc/apply/index.scss
+++ b/src/glcc/apply/index.scss
@@ -57,6 +57,33 @@
                 max-height: 100px;
             }
         }
+        
+        .posiHasQuestionBox{
+            width: 50%;
+            display: flex;
+            flex-direction: column;
+            position: relative;
+            .question{
+                color: $primary-color;
+                position: absolute;
+                bottom: 20px;
+                right:20px;
+            }
+            .ant-row.ant-form-item{
+                width: 100%;
+            }
+        }
+        
+        .hasQuestionBox{
+            width: 50%;
+            display: inline-flex;
+            .question{
+                color: $primary-color;
+            }
+            .ant-row.ant-form-item{
+                width: 100%;
+            }
+        }
     }
     .introArea{
         width: 100%;
diff --git a/src/glcc/apply/taskApply.jsx b/src/glcc/apply/taskApply.jsx
index 8fe90d38a..2a694d949 100644
--- a/src/glcc/apply/taskApply.jsx
+++ b/src/glcc/apply/taskApply.jsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import {Form, Input, Radio, Select } from 'antd';
+import {Form, Icon, Input, Radio, Select, Tooltip } from 'antd';
 import TextArea from 'antd/lib/input/TextArea';
 import { rewardMoney } from '../api';
 const Option = Select.Option;
@@ -36,13 +36,22 @@ function TaskApply(props) {
           { max: 32, message: '超出限制长度32位字符，请重新编辑' }],
           <Input placeholder="请输入课题名称" {...disabledProps}/>
         )}
-        {helper('课题链接',
-          '',
-          `taskUrl${taskKey}`,
-          [{ required: true, message: "请输入课题链接" },
-          { max: 252, message: '超出限制长度252位字符，请重新编辑' }],
-          <Input placeholder="请输入课题链接" {...disabledProps}/>
-        )}
+        <div className='hasQuestionBox'>
+          {helper('课题链接',
+            '',
+            `taskUrl${taskKey}`,
+            [{ required: true, message: "请输入课题链接" },
+            { max: 252, message: '超出限制长度252位字符，请重新编辑' }],
+            <Input placeholder="请输入课题链接" {...disabledProps}/>
+          )}
+          <Tooltip title={<div>
+            以issue的形式发布课题的具体内容，可参考 <a href='https://www.gitlink.org.cn/KomachiSion/nacos/issues/1' target="_blank" style={{color: "#466aff"}}>课题样例</a>
+          </div>}
+          >
+            <Icon type="question-circle" theme="filled" className="question mt12 ml10"/>
+          </Tooltip>
+        </div>
+        
         {helper('课题难度',
           '',
           `taskDifficulty${taskKey}`,
@@ -122,7 +131,7 @@ function TaskApply(props) {
           `taskDesc${taskKey}`,
           [{ required: true, message: "请输入课题简介" },
           { max: 200, message: '超出限制长度200位字符，请重新编辑' }],
-          <TextArea placeholder="请输入课题简介" rows={4} {...disabledProps}/>
+          <TextArea placeholder="请输入课题简介，以便学生快速了解课题" rows={4} {...disabledProps}/>
         )}</div>
       </div>
     </div>
diff --git a/src/ssrUrl.js b/src/ssrUrl.js
new file mode 100644
index 000000000..4bf99bf81
--- /dev/null
+++ b/src/ssrUrl.js
@@ -0,0 +1,7 @@
+export const url = process.env.NODE_ENV === 'production' ? 'https://www.gitlink.org.cn' : 'https://testforgeplus.trustie.net'
+export const zoneUrl = process.env.NODE_ENV === 'production' ? 'https://gateway.gitlink.org.cn' : 'https://testgetway.trustie.net'
+export const host = process.env.NODE_ENV === 'production' ? 'www.gitlink.org.cn' : 'testforgeplus.trustie.net'
+
+// export const url = process.env.NODE_ENV === 'production' ? 'https://www.gitlink.org.cn' : ''
+// export const zoneUrl = process.env.NODE_ENV === 'production' ? 'https://gateway.gitlink.org.cn' : ''
+// export const host = process.env.NODE_ENV === 'production' ? 'www.gitlink.org.cn' : ''
\ No newline at end of file