- })
+ 
-1 || item.logo.indexOf("412603")>-1)) ? getImageUrl(item.logo) : LogoBot} alt="" className="imgBox mr20"/>
{item.bot_name}
{item.state === 0 ? '挂起' : '启用'}
diff --git a/src/forge/SecuritySetting/bot/exploit/index.jsx b/src/forge/SecuritySetting/bot/exploit/index.jsx
index db4a9667e..a234457e1 100644
--- a/src/forge/SecuritySetting/bot/exploit/index.jsx
+++ b/src/forge/SecuritySetting/bot/exploit/index.jsx
@@ -6,6 +6,7 @@ import { getImageUrl } from 'educoder';
import { getMyBot, getTransferToBot, receiveTransferBot, refuseTransferBot } from "../../../../softbot/api";
import nullBot from '../../../../softbot/image/notBot1.png';
import moment from "moment";
+import LogoBot from '../../../Settings/image/logoBot.png';
function ExploitBot(props){
const {current_user} = props;
@@ -96,7 +97,7 @@ function ExploitBot(props){
{botList && (botList.length > 0 ?
{botList.map((item, index)=>{return
}
- {list && !list.length &&
-
+ -1 || item.logo.indexOf("412603")>-1)) ? getImageUrl(item.logo) : LogoBot} alt="" className="imgBox mr20" object-fit="fill"/>
{item.bot_name}
{item.is_public ? item.is_market ? '上架' : '公开' : '私有'}
diff --git a/src/forge/SecuritySetting/bot/exploit/new/index.jsx b/src/forge/SecuritySetting/bot/exploit/new/index.jsx
index bdecfa7de..f11ffbc80 100644
--- a/src/forge/SecuritySetting/bot/exploit/new/index.jsx
+++ b/src/forge/SecuritySetting/bot/exploit/new/index.jsx
@@ -83,7 +83,7 @@ function Disposition(props){
bot_name, bot_des, webhook, is_public,
login: current_user && current_user.login,
user_id: current_user && current_user.user_id,
- logo: `/api/attachments/${window.location.host !== 'www.gitlink.org.cn' ? 347246 : 412603}`,
+ // logo: `/api/attachments/${window.location.host !== 'www.gitlink.org.cn' ? 347246 : 412603}`,
limit_and_events: {
event_code: event_code ? event_code.toString() : '',
event_pr: event_pr ? event_pr.toString() : '',
diff --git a/src/forge/Settings/image/logoBot.png b/src/forge/Settings/image/logoBot.png
new file mode 100644
index 000000000..9bcd94646
Binary files /dev/null and b/src/forge/Settings/image/logoBot.png differ
diff --git a/src/forge/Settings/softBot.jsx b/src/forge/Settings/softBot.jsx
index ec371767c..7719a2e69 100644
--- a/src/forge/Settings/softBot.jsx
+++ b/src/forge/Settings/softBot.jsx
@@ -6,6 +6,7 @@ import './setting.scss';
import { useEffect } from "react";
import { getStoreAllInstallBots } from "../../softbot/api";
import { getImageUrl } from 'educoder';
+import LogoBot from './image/logoBot.png';
function SoftBot(props){
const {projectDetail} = props;
@@ -34,7 +35,7 @@ function SoftBot(props){
{botList && (botList.length > 0 ?
{botList.map((item, index)=>{return
@@ -337,12 +362,12 @@ export default Form.create()(
请您谨慎操作，注销后帐号内所有数据都会被清空，且无法恢复帐号!
:
+ {setOffVisible(false)}} {...props}/>
)})
)
\ No newline at end of file
diff --git a/src/forge/users/Material/component/offAccount.jsx b/src/forge/users/Material/component/offAccount.jsx
index eafb8eb47..44acb2e8e 100644
--- a/src/forge/users/Material/component/offAccount.jsx
+++ b/src/forge/users/Material/component/offAccount.jsx
@@ -1,26 +1,46 @@
-import React , { forwardRef } from 'react';
+import React , { forwardRef, useState } from 'react';
import { Modal , Form , Button , Input } from 'antd';
+import Axios from 'axios';
+const { TextArea } = Input;
export default Form.create()(forwardRef((props)=>{
- const { getFieldDecorator , validateFields, resetFields, getFieldsValue } = props && props.form;
- const { onCancel, visible, onOk} = props;
+ const { getFieldDecorator , validateFields } = props && props.form;
+ const { onCancel, visible , current_user} = props;
+ const [ loading , setLoading ] =useState(false);
+
+
+ function onDelete(){
+ validateFields((error,values)=>{
+ if(!error && current_user){
+ setLoading(true);
+ const url = `/v1/${current_user.login}.json`;
+ Axios.delete(url,{
+ data:{...values}
+ }).then(result=>{
+ if(result.data && result.data.status === 0){
+ window.location.href = `/`;
+ onCancel();
+ }
+ setLoading(false);
+ }).catch(error=>{setLoading(false);})
+
+ }
+ })
+ }
return(
-
-
-
- }
+ footer={null}
+ onCancel={onCancel}
+ destroyOnClose={true}
>
-
+ -1 || item.logo.indexOf("412603")>-1)) ? getImageUrl(item.logo) : LogoBot} alt="" className="imgBox mr20"/>
{item.bot_name}
{item.state === 0 ? '挂起' : '启用'}
diff --git a/src/forge/users/Material/Password.jsx b/src/forge/users/Material/Password.jsx
index c9ef3a183..c07984dbe 100644
--- a/src/forge/users/Material/Password.jsx
+++ b/src/forge/users/Material/Password.jsx
@@ -7,6 +7,7 @@ import img1 from '../../Images/personalInfo3.png';
import { setmiyah } from '../../../common/Component';
import { useEffect } from 'react';
import Phone from './Phone';
+import OffAccount from './component/offAccount';
export default Form.create()(
forwardRef((props)=>{
@@ -20,6 +21,9 @@ export default Form.create()(
const [ passMap, setPassMap] = useState({password: undefined, email: undefined, code: undefined});
const [ updatePsdMap, setUpdatePsdMap] = useState({oldPassword: undefined, password: undefined, password1: undefined});
const [ visible, setVisible] = useState(false);
+ const [ offVisible , setOffVisible ] = useState(false);
+ const [ offAgain , setOffAgain ] = useState(false);
+ const [ offLoading , setOffLoading ] = useState(false);
useEffect(()=>{
setPassMap({password: undefined, email: undefined, code: undefined});
@@ -239,6 +243,27 @@ export default Form.create()(
}).catch(error=>{})
}
}
+ // 注销账号检测
+ function checkAccount(){
+ if(current_user){
+ setOffLoading(true);
+ const url = `/v1/${current_user.login}/check_user_can_delete.json`;
+ Axios.post(url).then(result=>{
+ if(result.data){
+ let can_delete = result.data.can_delete;
+ if(can_delete === false){
+ setOffAgain(true);
+ message.error("当前账号名下存在未删除或退出的组织/仓库，请先删除或退出后再尝试注销操作");
+ } else {
+ setOffAgain(false);
+ setOffVisible(true);
+ message.success("已满足注销条件");
+ }
+ setOffLoading(false);
+ }
+ }).catch(error=>{})
+ }
+ }
// type: 0邮箱管理 1密码管理 2账号注销
return(
- GitLink目前提供邮件渠道帐号注销服务。如需注销帐号，请通过发送邮件注销申请邮件到 gitlink@ccf.org.cn。
- 相关注意事项如下:
- 必须使用要注销的 GitLink 帐号所绑定的邮箱地址发送邮件。 - 发送注销申请邮件之前确认帐号下无创建/加入组织，帐号名下无仓库信息。 - 邮件标题: 注销 GitLink 帐号，邮件正文请注明要注销帐号的邮箱和昵称。 - 发送邮件后，我们会积极处理，请耐心等候我们的邮件回复。 + 您可点击按钮完成账号的注销，注销后相关数据将不可恢复，注意事项如下：
+ 请确认需注销的帐号未加入任何组织的owner团队，若owner团队仅此一人，则该组织将被删除。 + 注销账号后，该账号名下所有仓库将被删除，请进行备份以防数据的丢失。 + 注销账号后，该账号在Gitlink产生的所有过程数据（如疑修，合并请求，论坛帖子等）也将被删除。 + 注销后你将丢失该帐号产生的所有数据，一旦注销相关数据将不可恢复，请输入登录密码再次确认。 + { current_user && }
- 相关注意事项如下:
- 必须使用要注销的 GitLink 帐号所绑定的邮箱地址发送邮件。 - 发送注销申请邮件之前确认帐号下无创建/加入组织，帐号名下无仓库信息。 - 邮件标题: 注销 GitLink 帐号，邮件正文请注明要注销帐号的邮箱和昵称。 - 发送邮件后，我们会积极处理，请耐心等候我们的邮件回复。 + 您可点击按钮完成账号的注销，注销后相关数据将不可恢复，注意事项如下：
+ 请确认需注销的帐号未加入任何组织的owner团队，若owner团队仅此一人，则该组织将被删除。 + 注销账号后，该账号名下所有仓库将被删除，请进行备份以防数据的丢失。 + 注销账号后，该账号在Gitlink产生的所有过程数据（如疑修，合并请求，论坛帖子等）也将被删除。 + 注销后你将丢失该帐号产生的所有数据，一旦注销相关数据将不可恢复，请输入登录密码再次确认。 + { current_user && }
{type === '0' ? '更改邮箱后，您在GitLink的登录账号、接收通知的邮件地址将同步变更。请再次确认。' : '更改密码后，您在GitLink的登录密码将同步变更。请再次确认。'}
-
)})
diff --git a/src/forge/users/contribution/index.jsx b/src/forge/users/contribution/index.jsx
index 381b474e3..6c420620a 100644
--- a/src/forge/users/contribution/index.jsx
+++ b/src/forge/users/contribution/index.jsx
@@ -137,7 +137,7 @@ function Contribution(props){
是否仍要注销？
-注销后你将丢失该帐号产生的所有数据，一旦注销相关数据将不可恢复，请输入登录密码再次确认
-转账token数额
操作
{item.name}
{item.balance}
diff --git a/src/index.css b/src/index.css
index 452f0f91b..da10a5654 100644
--- a/src/index.css
+++ b/src/index.css
@@ -25,7 +25,7 @@
}
.ant-message {
- z-index: 20000;
+ z-index: 20000!important;
}
.ant-upload-list-item-info .anticon-loading,
diff --git a/src/softbot/softBotDetail/index.jsx b/src/softbot/softBotDetail/index.jsx
index 3aa711067..9c3c3e4f2 100644
--- a/src/softbot/softBotDetail/index.jsx
+++ b/src/softbot/softBotDetail/index.jsx
@@ -6,6 +6,7 @@ import './index.scss';
import axios from "axios";
import RenderHtml from "../../components/render-html";
import { Link } from "react-router-dom";
+import LogoBot from '../image/logoBot.png';
function SoftBotDEtail(props){
const {match:{params:{id}}, current_user, history, showLoginDialog} = props;
@@ -171,7 +172,7 @@ function SoftBotDEtail(props){
return
{detail &&
-1 || detail.logo.indexOf("412603")>-1)) ? getImageUrl(detail.logo) : LogoBot} alt="" className="installBotImg"/>}
visible={visible}
onOk={okClick}
onCancel={()=>{setSelectValue([]);setVisible(false)}}
diff --git a/src/softbot/softBotList/index.jsx b/src/softbot/softBotList/index.jsx
index b1ab1423b..d1e48065b 100644
--- a/src/softbot/softBotList/index.jsx
+++ b/src/softbot/softBotList/index.jsx
@@ -4,7 +4,8 @@ import { getImageUrl } from 'educoder'
import './index.scss';
import { Link } from "react-router-dom";
import {getAllBotCategory, getContentsLikeNameAndFunc} from '../api.js';
-import Nodata from '../../forge/Nodata'
+import Nodata from '../../forge/Nodata';
+import LogoBot from '../image/logoBot.png';
function SoftBot(props){
const {mygetHelmetapi, current_user, history, showLoginDialog} = props;
@@ -85,7 +86,7 @@ function SoftBot(props){
{!loading && botList && botList.length > 0 && botList.map((item, index)=>{
return
- })
+ 
-1 || detail.logo.indexOf("412603")>-1)) ? getImageUrl(detail.logo) : LogoBot} alt="" className="botImg">
{detail.bot_name}
{detail.first_func && {detail.first_func}}{detail.second_func && {detail.second_func}}{detail.developer_name}
@@ -187,7 +188,7 @@ function SoftBotDEtail(props){
{detail && detail.bot_name}
{detail && detail.bot_name}
{window.location.href=`/softbot/${item.bot_id}`}}>
-
+ -1 || item.logo.indexOf("412603")>-1)) ? getImageUrl(item.logo) : LogoBot} alt="" className="oneBotImg"/>
{item.market_name}
{item.developer_name}