diff --git a/src/forge/Information/Component/publicBanner.jsx b/src/forge/Information/Component/publicBanner.jsx
index 457fd2135..948875201 100644
--- a/src/forge/Information/Component/publicBanner.jsx
+++ b/src/forge/Information/Component/publicBanner.jsx
@@ -93,7 +93,7 @@ function PublicBanner(props) {
function apply() {
if (checkIfLogin() === false) {
- showLoginDialog()
+ showLoginDialog(`/zone/${deptId}`)
return false;
} else if (memberStatus === memberStatusEnum.applying) {
message.info("您已提交申请,请耐心等待管理员审核!")
@@ -108,7 +108,7 @@ function PublicBanner(props) {
function toLessonsFunc(){
if (checkIfLogin() === false) {
- showLoginDialog()
+ showLoginDialog(`/zone/${deptId}/lessons`)
return false;
} else{
window.location.href = `/zone/${deptId}/lessons`;
diff --git a/src/forge/Information/api.js b/src/forge/Information/api.js
index 5879fa479..9221f8479 100644
--- a/src/forge/Information/api.js
+++ b/src/forge/Information/api.js
@@ -29,10 +29,11 @@ export function getCheckZoneRole(id) {
});
}
-export function getCurrentRole(id) {
+export function getCurrentRole(id, deptId) {
return fetch({
url: `/zone/zoneFront/${id}/checkCurrentRole`,
method: 'get',
+ headers: {'Dept-Id': deptId}
});
}
diff --git a/src/forge/Server/List.jsx b/src/forge/Server/List.jsx
index d47983a80..9416d3cc1 100644
--- a/src/forge/Server/List.jsx
+++ b/src/forge/Server/List.jsx
@@ -46,7 +46,7 @@ function Main(props){
setVisible(false)} onOk={onOk}/>
- -
+ {/*
-
重睛鸟代码溯源
@@ -55,7 +55,7 @@ function Main(props){
查看详情
-
+ */}
{
// 镜像项目隐藏服务
projectDetail && parseInt(projectDetail.type) !== 2 && -
diff --git a/src/forge/Server/img/osredm.png b/src/forge/Server/img/osredm.png
new file mode 100644
index 000000000..7c4c2d61d
Binary files /dev/null and b/src/forge/Server/img/osredm.png differ
diff --git a/src/forge/Server/img/osredm1.png b/src/forge/Server/img/osredm1.png
new file mode 100644
index 000000000..f21b54e74
Binary files /dev/null and b/src/forge/Server/img/osredm1.png differ
diff --git a/src/forge/Server/img/osredm2.png b/src/forge/Server/img/osredm2.png
new file mode 100644
index 000000000..1b923ec3d
Binary files /dev/null and b/src/forge/Server/img/osredm2.png differ
diff --git a/src/forge/Server/reposyncer/component/addTaskModal.jsx b/src/forge/Server/reposyncer/component/addTaskModal.jsx
index a8a58d582..936c683fe 100644
--- a/src/forge/Server/reposyncer/component/addTaskModal.jsx
+++ b/src/forge/Server/reposyncer/component/addTaskModal.jsx
@@ -4,6 +4,7 @@ import axios from 'axios';
import { branchForm, confirmInfo1, confirmInfo2, synchronizeTips } from './editStore';
import gitHub from '../../img/github.png';
import gitee from '../../img/gitee.png';
+import osredm from '../../img/osredm.png';
import '../index.scss';
function DeleteBox({owner, projectsId, visible, setVisible, branchList, reload, form, sync_repositories_unique=[], repositoriesBranch}) {
@@ -76,6 +77,7 @@ function DeleteBox({owner, projectsId, visible, setVisible, branchList, reload,
}}>
Github{!repositoriesBranch["Github"] && ",获取分支列表失败,请检查token是否有效"}
Gitee{!repositoriesBranch["Gitee"] && ",获取分支列表失败,请检查token是否有效"}
+
Osredm{!repositoriesBranch["Osredm"] && ",获取分支列表失败,请检查token是否有效"}
)}
}
diff --git a/src/forge/Server/reposyncer/component/editStore.jsx b/src/forge/Server/reposyncer/component/editStore.jsx
index 8158f6041..325c71f8e 100644
--- a/src/forge/Server/reposyncer/component/editStore.jsx
+++ b/src/forge/Server/reposyncer/component/editStore.jsx
@@ -1,7 +1,5 @@
import React, {Fragment, forwardRef, useEffect, useState} from "react";
import { Button, Divider, Form, Icon, Input, Radio, Select, Steps, Tooltip, message, Modal , AutoComplete } 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";
@@ -148,10 +146,10 @@ function EditStore(props){
// 根据已配置仓库同步的平台显示还剩哪些平台
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"]
+ const platformList = (synchronizedPlatformList.length && ["Github", "Gitee", "Osredm"].filter(item=>synchronizedPlatformList.indexOf(item) === -1)) || ["Github", "Gitee", "Osredm"]
// 正则:校验是否是gitee或者github的仓库地址
- const pattern = platform && (platform === "Github" ? /^https:\/\/github\.com\/.+\/.+$/ : /^https:\/\/gitee\.com\/.+\/.+$/)
+ const pattern = platform && (platform === "Github" ? /^https:\/\/(www\.)?github\.com\/.+\/.+$/ : platform === "Gitee" ? /^https:\/\/(www\.)?gitee\.com\/.+\/.+$/ : /^https:\/\/(www\.)?osredm\.com\/.+\/.+$/)
useEffect(()=>{
// 获取分支列表
@@ -248,6 +246,7 @@ function EditStore(props){
1、登录{platform},确保拥有读写同步仓库的权限
{platform === "Github" && "2、找到已存在的token,或新建一个token;新建方式为:点击个人头像→Settings→Developer Settings→Personal access tokens (classic)→Generate new token"}
{platform === "Gitee" && "2、找到已存在的token,或新建一个token,新建方式为:点击个人头像→设置→私人令牌→生成新令牌"}
+ {platform === "Osredm" && "2、找到已存在的token,或新建一个token,新建方式为:点击个人头像→账号管理→私人令牌→生成新令牌"}
3、确保token拥有仓库读写权限,且未过期。将token复制到此处token填写框
}>
@@ -300,7 +299,7 @@ function EditStore(props){