From 97ab819bf9cb1ab9a3ab4e3afcaa04cb7c277534 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Mon, 19 Apr 2021 17:52:01 +0800
Subject: [PATCH] merge

---
 src/forge/Activity/ActivityItem.js                  | 2 +-
 src/forge/Component/AddMember.jsx                   | 2 +-
 src/forge/Component/Cards.jsx                       | 2 +-
 src/forge/Component/Contributors.jsx                | 2 +-
 src/forge/Component/MemberCards.jsx                 | 2 +-
 src/forge/Component/SearchUser.jsx                  | 2 +-
 src/forge/Head/Header.js                            | 2 +-
 src/forge/Main/CoderDepot.jsx                       | 2 +-
 src/forge/Main/CoderRootCommit.js                   | 4 ++--
 src/forge/Main/sub/Contribute.jsx                   | 2 +-
 src/forge/Merge/Commits.jsx                         | 2 +-
 src/forge/Merge/MergeItem.js                        | 2 +-
 src/forge/Merge/MergeSubmit.js                      | 2 +-
 src/forge/Order/Detail.js                           | 2 +-
 src/forge/Settings/CollaboratorMember.jsx           | 2 +-
 src/forge/Team/Group/GroupDetailProject.jsx         | 2 +-
 src/forge/Team/Group/Setting/GroupMemberSetting.jsx | 2 +-
 src/forge/Team/RightBox.jsx                         | 2 +-
 src/forge/Team/Setting/TeamSettingCommon.jsx        | 2 +-
 src/forge/Team/Setting/TeamSettingMember.jsx        | 2 +-
 src/forge/Team/TeamGroupItems.jsx                   | 2 +-
 src/forge/UsersList/fork_users.js                   | 2 +-
 src/forge/UsersList/user_list.js                    | 2 +-
 src/forge/comments/children_comments.js             | 2 +-
 src/forge/comments/children_journals.js             | 2 +-
 src/forge/comments/comments.js                      | 6 +++---
 src/forge/users/Infos.js                            | 2 +-
 src/forge/users/Team-item.jsx                       | 2 +-
 28 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/forge/Activity/ActivityItem.js b/src/forge/Activity/ActivityItem.js
index 1baa2ce9c..b726a4af0 100644
--- a/src/forge/Activity/ActivityItem.js
+++ b/src/forge/Activity/ActivityItem.js
@@ -33,7 +33,7 @@ class ActivityItem extends Component {
           }
           <p className="itemLine mt10">
             <Link to={`/users/${item && item.user_login}`} className="show-user-link">
-              <img alt="" src={getImageUrl(`images/${item.user_avatar}`)} className="createImage" />
+              <img alt="" src={getImageUrl(`/${item.user_avatar}`)} className="createImage" />
               <span className="mr20">{item.user_name}</span>
             </Link>
             {item.created_at && <span className="color-grey-9">创建于<span className="ml2 color-grey-6">{item.created_at}</span></span>}
diff --git a/src/forge/Component/AddMember.jsx b/src/forge/Component/AddMember.jsx
index a41882295..0548e52da 100644
--- a/src/forge/Component/AddMember.jsx
+++ b/src/forge/Component/AddMember.jsx
@@ -42,7 +42,7 @@ function AddMember({getID,login}){
             className="user_img radius"
             width="28"
             height="28"
-            src={getImageUrl(`images/${item && item.image_url}`)}
+            src={getImageUrl(`/${item && item.image_url}`)}
             alt=""
           />
           <span className="ml10" style={{ "vertical-align": "middle" }}>
diff --git a/src/forge/Component/Cards.jsx b/src/forge/Component/Cards.jsx
index 1c9706c3f..498b375c1 100644
--- a/src/forge/Component/Cards.jsx
+++ b/src/forge/Component/Cards.jsx
@@ -6,7 +6,7 @@ import './Component.scss';
 function Cards({img , title, desc , rightBtn , src}){
   return(
     <div className="cards">
-      {img &&<div className="img"><img src={getImageUrl(`images/${img}`)} alt=""/></div>}
+      {img &&<div className="img"><img src={getImageUrl(`/${img}`)} alt=""/></div>}
       <div className="content">
         <p className="titles">
           <Link to={src}>{title}</Link>
diff --git a/src/forge/Component/Contributors.jsx b/src/forge/Component/Contributors.jsx
index 7848f9fc5..d64e0d42a 100644
--- a/src/forge/Component/Contributors.jsx
+++ b/src/forge/Component/Contributors.jsx
@@ -15,7 +15,7 @@ function Contributors({contributors,owner,projectsId}){
           contributors && contributors.total_count > 0 ?
           contributors.list.map((item,key)=>{
             return(
-              <Link key={key} to={`/users/${item.login}`}><img src={getImageUrl(`images/${item.image_url}`)} alt=""/></Link>
+              <Link key={key} to={`/users/${item.login}`}><img src={getImageUrl(`/${item.image_url}`)} alt=""/></Link>
             )
           })
           :""
diff --git a/src/forge/Component/MemberCards.jsx b/src/forge/Component/MemberCards.jsx
index c0bd12c1f..393ddbb17 100644
--- a/src/forge/Component/MemberCards.jsx
+++ b/src/forge/Component/MemberCards.jsx
@@ -45,7 +45,7 @@ const Div = styled.div`{
 export default (({ user , img, name, time, focusStatus, is_current_user, login , successFunc }) => {
   return (
     <Div>
-      <Link to={`/users/${user && user.login}`}><Img src={getImageUrl(`images/${img}`)} /></Link>
+      <Link to={`/users/${user && user.login}`}><Img src={getImageUrl(`/${img}`)} /></Link>
       <div className="m-infos">
         <Link to={`/users/${user && user.login}`}><Name>{name}</Name></Link>
         <Time><I className="iconfont icon-shijian"></I>加入时间:{time}</Time>
diff --git a/src/forge/Component/SearchUser.jsx b/src/forge/Component/SearchUser.jsx
index 43b45e85c..0203d24f5 100644
--- a/src/forge/Component/SearchUser.jsx
+++ b/src/forge/Component/SearchUser.jsx
@@ -44,7 +44,7 @@ export default ({ getUser })=>{
             className="user_img radius"
             width="28"
             height="28"
-            src={getImageUrl(`images/${item && item.image_url}`)}
+            src={getImageUrl(`/${item && item.image_url}`)}
             alt=""
           />
           <span className="ml10" style={{ "vertical-align": "middle" }}>
diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js
index 37dc92758..0fb5cae5b 100644
--- a/src/forge/Head/Header.js
+++ b/src/forge/Head/Header.js
@@ -673,7 +673,7 @@ class NewHeader extends Component {
             <div className="ml30 edu-menu-panel" style={{ height: "70px", lineHeight: "70px" }}>
               <a href={`/users/${this.props.current_user === undefined ? "" : this.props.current_user.login}/courses`}>
                 <img alt="头像" className="radius" height="34" id="nh_user_logo" name="avatar_image"
-                  src={getImageUrl(`images/` + user.image_url)} width="34">
+                  src={getImageUrl(`/` + user.image_url)} width="34">
                 </img>
               </a>
               <ul className="edu-menu-list" style={{ top: '60px', textAlign: 'center' }}>
diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx
index 41b69004b..0d4c22016 100644
--- a/src/forge/Main/CoderDepot.jsx
+++ b/src/forge/Main/CoderDepot.jsx
@@ -297,7 +297,7 @@ function CoderDepot(props){
                       {
                         lastCommit &&
                         <div className="listtablehead">
-                          <User url={getImageUrl(`images/${lastCommitAuthor && lastCommitAuthor.image_url}`)} name={lastCommitAuthor && lastCommitAuthor.name} />
+                          <User url={getImageUrl(`/${lastCommitAuthor && lastCommitAuthor.image_url}`)} name={lastCommitAuthor && lastCommitAuthor.name} />
                           <div className={hideBtn && hide ? "ellipsistxt hide" :"ellipsistxt"}><p id="ptxt">{lastCommit && lastCommit.message}</p></div>
                           { hideBtn && <span className="ellipsis" onClick={()=>changeHide(hide)}><i className="iconfont icon-shenglvehao"></i></span> }
 
diff --git a/src/forge/Main/CoderRootCommit.js b/src/forge/Main/CoderRootCommit.js
index bb4f5ba52..5c509ecd0 100644
--- a/src/forge/Main/CoderRootCommit.js
+++ b/src/forge/Main/CoderRootCommit.js
@@ -140,11 +140,11 @@ class CoderRootCommit extends Component{
                           {
                             item.id ?
                             <Link to={`/users/${item.login}`} className="show-user-link">
-                              {item.image_url?<img src={getImageUrl(`images/${item.image_url}`)} alt="" width="28px" height="28px" className="mr15 radius"/>:""}
+                              {item.image_url?<img src={getImageUrl(`/${item.image_url}`)} alt="" width="28px" height="28px" className="mr15 radius"/>:""}
                               <label className="font-14 color-grey-6" style={{verticalAlign:'middle'}}>{item.name ?`${item.name}:`:""}提交于 {item.time_from_now}</label>
                             </Link>:
                             <span className="show-user-link">
-                              {item.image_url?<img src={getImageUrl(`images/${item.image_url}`)} alt="" width="28px" height="28px" className="mr15 radius"/>:""}
+                              {item.image_url?<img src={getImageUrl(`/${item.image_url}`)} alt="" width="28px" height="28px" className="mr15 radius"/>:""}
                               <label className="font-14 color-grey-6" style={{verticalAlign:'middle'}}>{item.name ?`${item.name}:`:""}提交于 {item.time_from_now}</label>
                             </span>
                           }
diff --git a/src/forge/Main/sub/Contribute.jsx b/src/forge/Main/sub/Contribute.jsx
index c6bd39982..a41cb3ed6 100644
--- a/src/forge/Main/sub/Contribute.jsx
+++ b/src/forge/Main/sub/Contribute.jsx
@@ -50,7 +50,7 @@ function Contribute(props){
                 list.map((item,key)=>{
                   return(
                     <AlignCenter>
-                      <img alt="" style={{borderRadius:"50%",marginRight:"10px"}} src={getImageUrl(`images/${item.image_url}`)} width="50px" height="50px"/>
+                      <img alt="" style={{borderRadius:"50%",marginRight:"10px"}} src={getImageUrl(`/${item.image_url}`)} width="50px" height="50px"/>
                       <div>
                         <Link to={`/users/${item.login}`} className="font-16">{item.name}</Link>
                         <p className="font-12 color-grey-9">提交{item.contributions}次</p>
diff --git a/src/forge/Merge/Commits.jsx b/src/forge/Merge/Commits.jsx
index a7d12073a..37c254cc9 100644
--- a/src/forge/Merge/Commits.jsx
+++ b/src/forge/Merge/Commits.jsx
@@ -22,7 +22,7 @@ function Commits({ commits , projectsId , owner }){
                   <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(item.sha)}`} className="color-blue">浏览代码</Link>
                 </FlexAJ>
                 <AlignCenter className="mt15">
-                  <User url={getImageUrl(`images/${item.committer && item.committer.image_url}`)} name={`${item.committer && item.committer.name}`}></User><span>：提交于{item.time_from_now}</span>
+                  <User url={getImageUrl(`/${item.committer && item.committer.image_url}`)} name={`${item.committer && item.committer.name}`}></User><span>：提交于{item.time_from_now}</span>
                 </AlignCenter>
               </div>
             </div>
diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js
index dd5f4f45e..e391ea5fc 100644
--- a/src/forge/Merge/MergeItem.js
+++ b/src/forge/Merge/MergeItem.js
@@ -74,7 +74,7 @@ class MergeItem extends Component {
                   >
                     <img
                       className="radius"
-                      src={getImageUrl(`images/${item && item.avatar_url}`)}
+                      src={getImageUrl(`/${item && item.avatar_url}`)}
                       alt=""
                       width="24"
                       height="24"
diff --git a/src/forge/Merge/MergeSubmit.js b/src/forge/Merge/MergeSubmit.js
index 27156f0e0..8f2275d81 100644
--- a/src/forge/Merge/MergeSubmit.js
+++ b/src/forge/Merge/MergeSubmit.js
@@ -101,7 +101,7 @@ class MergeSubmit extends Component{
         render: (text,item) => (
           <span className="f-wrap-alignCenter">
             <Link to={`/users/${item.login}`} className="show-user-link">
-                <img src={getImageUrl(`images/${item.image_url}`)} alt="" width="28px" height="28px" className="mr3 radius"/>
+                <img src={getImageUrl(`/${item.image_url}`)} alt="" width="28px" height="28px" className="mr3 radius"/>
           <label className="hide-1" style={{maxWidth:"75px",'vertical-align':'middle'}}>{text}</label>
           </Link>
           </span>
diff --git a/src/forge/Order/Detail.js b/src/forge/Order/Detail.js
index 874059190..277f5d4ab 100644
--- a/src/forge/Order/Detail.js
+++ b/src/forge/Order/Detail.js
@@ -212,7 +212,7 @@ class Detail extends Component {
                 >
                   <img
                     className="user_img"
-                    src={getImageUrl(`images/${data && data.author_picture}`)}
+                    src={getImageUrl(`/${data && data.author_picture}`)}
                     alt=""
                     width="50"
                     height="50"
diff --git a/src/forge/Settings/CollaboratorMember.jsx b/src/forge/Settings/CollaboratorMember.jsx
index fa307a972..22324a02c 100644
--- a/src/forge/Settings/CollaboratorMember.jsx
+++ b/src/forge/Settings/CollaboratorMember.jsx
@@ -188,7 +188,7 @@ function CollaboratorMember({projectsId,owner,project_id,author,showNotification
             className="show-user-link"
           >
             <img
-              src={getImageUrl(`images/${text}`)}
+              src={getImageUrl(`/${text}`)}
               alt=""
               width="32px"
               height="32px"
diff --git a/src/forge/Team/Group/GroupDetailProject.jsx b/src/forge/Team/Group/GroupDetailProject.jsx
index 70894e33c..c1aad3722 100644
--- a/src/forge/Team/Group/GroupDetailProject.jsx
+++ b/src/forge/Team/Group/GroupDetailProject.jsx
@@ -30,7 +30,7 @@ export default (({projects}) => {
         projects.map((item, key) => {
         return (
           <Div>
-            <Imgs src={item.project && getImageUrl(`images/${item.project.owner_image_url}`)}/>
+            <Imgs src={item.project && getImageUrl(`/${item.project.owner_image_url}`)}/>
             <Link to={`/projects/${item.project.owner_name}/${item.project.identifier}`}>{item.project.name}</Link>
           </Div>
         )
diff --git a/src/forge/Team/Group/Setting/GroupMemberSetting.jsx b/src/forge/Team/Group/Setting/GroupMemberSetting.jsx
index c23ca14e1..847dd6ef4 100644
--- a/src/forge/Team/Group/Setting/GroupMemberSetting.jsx
+++ b/src/forge/Team/Group/Setting/GroupMemberSetting.jsx
@@ -76,7 +76,7 @@ export default ((props) => {
       width: "7%",
       render: (value, item) => {
         return (
-          <Img src={getImageUrl(`images/${item.user.image_url}`)}></Img>
+          <Img src={getImageUrl(`/${item.user.image_url}`)}></Img>
         )
       }
     },
diff --git a/src/forge/Team/RightBox.jsx b/src/forge/Team/RightBox.jsx
index 067317125..0603a4548 100644
--- a/src/forge/Team/RightBox.jsx
+++ b/src/forge/Team/RightBox.jsx
@@ -72,7 +72,7 @@ function RightBox({ OIdentifier , history , admin }) {
             memberData.organization_users.map((item,key)=>{
               return(
                 <div className="teammembers" key={key}>
-                  <Link to={`/users/${item.user && item.user.login}`}><Img src={getImageUrl(`images/${item.user && item.user.image_url}`)} alt="" className="m-img"/></Link>
+                  <Link to={`/users/${item.user && item.user.login}`}><Img src={getImageUrl(`/${item.user && item.user.image_url}`)} alt="" className="m-img"/></Link>
                   <div>
                     <Link to={`/users/${item.user && item.user.login}`}><ListName>{item.user && item.user.name}</ListName></Link>
                     <Align><i className="iconfont icon-shijian color-green mr3 font-13"></i><Span>加入时间：{item.created_at}</Span></Align>
diff --git a/src/forge/Team/Setting/TeamSettingCommon.jsx b/src/forge/Team/Setting/TeamSettingCommon.jsx
index b161e5a10..e70d9a4bb 100644
--- a/src/forge/Team/Setting/TeamSettingCommon.jsx
+++ b/src/forge/Team/Setting/TeamSettingCommon.jsx
@@ -149,7 +149,7 @@ export default Form.create()(
                 <Input value="-1" style={{width:"350px"}}/>
               )}
               <p>选择头像:</p>
-              <UploadImage url={getImageUrl(`images/${image}`)} getImage={getImage}/>
+              <UploadImage url={getImageUrl(`/${image}`)} getImage={getImage}/>
               <Button type={"primary"} onClick={updateDetail}>更新仓库设置</Button>
             </Form>
           </Div>
diff --git a/src/forge/Team/Setting/TeamSettingMember.jsx b/src/forge/Team/Setting/TeamSettingMember.jsx
index 4871def65..34f0e28ed 100644
--- a/src/forge/Team/Setting/TeamSettingMember.jsx
+++ b/src/forge/Team/Setting/TeamSettingMember.jsx
@@ -64,7 +64,7 @@ export default (({organizeDetail})=>{
       width:"5%",
       render:(value)=>{
         return(
-          value && <Link to={`/users/${value && value.login}`}><Img src={getImageUrl('images/'+value.image_url)}></Img> </Link>
+          value && <Link to={`/users/${value && value.login}`}><Img src={getImageUrl('/'+value.image_url)}></Img> </Link>
         )
       }
     },
diff --git a/src/forge/Team/TeamGroupItems.jsx b/src/forge/Team/TeamGroupItems.jsx
index fd66f1ebd..b3b4a3718 100644
--- a/src/forge/Team/TeamGroupItems.jsx
+++ b/src/forge/Team/TeamGroupItems.jsx
@@ -86,7 +86,7 @@ function TeamGroupItems({organizeDetail,limit, count , history}){
                     {
                       item.users && item.users.map((i,k)=>{
                         return( 
-                          k < count ? <Link to={`/users/${i.login}`}><ImgContent title={i.name} key={k} src={getImageUrl(`images/${i.image_url}`)}/></Link> 
+                          k < count ? <Link to={`/users/${i.login}`}><ImgContent title={i.name} key={k} src={getImageUrl(`/${i.image_url}`)}/></Link> 
                           : 
                           k === count ? 
                           <Link to={`/organize/${organizeDetail && organizeDetail.name}/group/${item.id}`} className="moreMember" title="查看更多" ><i className="iconfont icon-zhunbeizhong"></i></Link>
diff --git a/src/forge/UsersList/fork_users.js b/src/forge/UsersList/fork_users.js
index cd7719476..aaaa9b627 100644
--- a/src/forge/UsersList/fork_users.js
+++ b/src/forge/UsersList/fork_users.js
@@ -88,7 +88,7 @@ class ForkUsers extends Component {
                 >
                   <img
                     className="avatar-60"
-                    src={getImageUrl(`images/${item.image_url}`)}
+                    src={getImageUrl(`/${item.image_url}`)}
                     alt=""
                   />
                 </Link>
diff --git a/src/forge/UsersList/user_list.js b/src/forge/UsersList/user_list.js
index 4c1aeda56..592e98068 100644
--- a/src/forge/UsersList/user_list.js
+++ b/src/forge/UsersList/user_list.js
@@ -18,7 +18,7 @@ class UserList extends Component {
                 >
                   <img
                     className="avatar-60"
-                    src={getImageUrl(`images/${item.image_url}`)}
+                    src={getImageUrl(`/${item.image_url}`)}
                     alt=""
                   />
                 </a>
diff --git a/src/forge/comments/children_comments.js b/src/forge/comments/children_comments.js
index 65cf7784e..8a8ccbc80 100644
--- a/src/forge/comments/children_comments.js
+++ b/src/forge/comments/children_comments.js
@@ -118,7 +118,7 @@ class children_comments extends Component {
           >
             <img
               className="radius"
-              src={getImageUrl(`images/${item && item.user_picture}`)}
+              src={getImageUrl(`/${item && item.user_picture}`)}
               alt=""
               width="30"
               height="30"
diff --git a/src/forge/comments/children_journals.js b/src/forge/comments/children_journals.js
index e7eaae8ca..e293c9f37 100644
--- a/src/forge/comments/children_journals.js
+++ b/src/forge/comments/children_journals.js
@@ -82,7 +82,7 @@ class children_journals extends Component {
           >
             <img
               className="radius"
-              src={getImageUrl(`images/${item && item.user_picture}`)}
+              src={getImageUrl(`/${item && item.user_picture}`)}
               alt=""
               width="30"
               height="30"
diff --git a/src/forge/comments/comments.js b/src/forge/comments/comments.js
index f23b493f6..8b9f6c584 100644
--- a/src/forge/comments/comments.js
+++ b/src/forge/comments/comments.js
@@ -375,7 +375,7 @@ class comments extends Component {
             >
               <img
                 className="radius"
-                src={getImageUrl(`images/${item && item.user_picture}`)}
+                src={getImageUrl(`/${item && item.user_picture}`)}
                 alt=""
                 width="30"
                 height="30"
@@ -471,7 +471,7 @@ class comments extends Component {
                     className="radius"
                     src={
                       current_user && current_user.image_url
-                        ? getImageUrl(`images/${current_user.image_url}`)
+                        ? getImageUrl(`/${current_user.image_url}`)
                         : "images/avatars/User/b"
                     }
                     alt=""
@@ -528,7 +528,7 @@ class comments extends Component {
                           className="radius"
                           src={
                             current_user && current_user.image_url
-                              ? getImageUrl(`images/${current_user.image_url}`)
+                              ? getImageUrl(`/${current_user.image_url}`)
                               : "images/avatars/User/b"
                           }
                           alt=""
diff --git a/src/forge/users/Infos.js b/src/forge/users/Infos.js
index ea33627db..e3febfced 100644
--- a/src/forge/users/Infos.js
+++ b/src/forge/users/Infos.js
@@ -150,7 +150,7 @@ class Infos extends Component {
                 <div className="list-l-Menu text-center pd20 ">
                   <Avatar
                     size={110}
-                    src={getImageUrl(`images/${user && user.image_url}`)}
+                    src={getImageUrl(`/${user && user.image_url}`)}
                   />
                   {user && user.user_identity && (
                     <div className="mt-n15 position-relative">
diff --git a/src/forge/users/Team-item.jsx b/src/forge/users/Team-item.jsx
index d457ee264..f3dbc47ce 100644
--- a/src/forge/users/Team-item.jsx
+++ b/src/forge/users/Team-item.jsx
@@ -4,7 +4,7 @@ import { getImageUrl } from 'educoder';
 function TeamItem({item,history}){
   return(
     <div onClick={()=>{history.push(`/organize/${item.name}`)}} style={{cursor:"pointer"}}>
-      <div className="imgBox"><img alt="" src={getImageUrl(`images/${item.avatar_url}`)}/></div>
+      <div className="imgBox"><img alt="" src={getImageUrl(`/${item.avatar_url}`)}/></div>
       <div style={{flex:'1'}}>
         <span className="mb5 font-18 color-grey-3 task-hide">{item.name}</span>
         <div className="task-hide-2">