From 8bb298f062211d0f7347cc792674a5f1cee03ca7 Mon Sep 17 00:00:00 2001
From: caicai8 <1149225589@qq.com>
Date: Fri, 20 Mar 2020 20:50:30 +0800
Subject: [PATCH] issue

---
 src/AppConfig.js                     |  2 +-
 src/forge/Main/CoderRootCommit.js    |  3 +--
 src/forge/Main/CoderRootDirectory.js | 10 +++-------
 src/forge/Main/Detail.js             |  5 ++---
 src/forge/Main/IndexItem.js          |  2 +-
 src/forge/Merge/MergeSubmit.js       |  3 +--
 src/forge/Merge/NewMerge.js          |  3 +--
 src/forge/Settings/Setting.js        |  2 +-
 8 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/src/AppConfig.js b/src/AppConfig.js
index fcc74368..68dd5439 100644
--- a/src/AppConfig.js
+++ b/src/AppConfig.js
@@ -128,7 +128,7 @@ export function initAxiosInterceptors(props) {
     // TODO 读取到package.json中的配置？
 		
 			var //proxy = "http://localhost:3000"
-               proxy="http://123.59.135.93:56666"
+               proxy="https://testforgeplus.trustie.net"
             // proxy="http://localhost:3000"
 
     // 在这里使用requestMap控制，避免用户通过双击等操作发出重复的请求；
diff --git a/src/forge/Main/CoderRootCommit.js b/src/forge/Main/CoderRootCommit.js
index 2aa0d353..d77e4ec2 100644
--- a/src/forge/Main/CoderRootCommit.js
+++ b/src/forge/Main/CoderRootCommit.js
@@ -28,9 +28,8 @@ class CoderRootCommit extends Component{
   }
 
   getCommitList=(branch , page , limit)=>{
-    const { login } = this.props.current_user;
     const { projectsId } = this.props.match.params;
-    const url = `/${login}/${projectsId}/commits.json`;
+    const url = `/repositories/${projectsId}/commits.json`;
     axios.get(url,{
       params:{
         sha:branch,
diff --git a/src/forge/Main/CoderRootDirectory.js b/src/forge/Main/CoderRootDirectory.js
index ff6e3235..5bc08982 100644
--- a/src/forge/Main/CoderRootDirectory.js
+++ b/src/forge/Main/CoderRootDirectory.js
@@ -62,11 +62,9 @@ class CoderRootDirectory extends Component{
 
   // 获取根目录
   getProjectRoot=(branch)=>{
-    const { current_user } = this.props;
-    const { projectsId , author } = this.props.match.params;
-    const { state } = this.props.history.location;
+    const { projectsId } = this.props.match.params;
     console.log(this.props);
-    const url = `/${author}/${projectsId}/entries.json`;
+    const url = `/repositories/${projectsId}/entries.json`;
     axios.get((url),{
       params:{
         branch
@@ -125,13 +123,11 @@ class CoderRootDirectory extends Component{
 
   // 获取子目录
   getFileDetail=(arr)=>{
-    const { current_user } = this.props;
     const { projectsId } = this.props.match.params;
     const { branch } = this.state;
-    const { state } = this.props.history.location;
 
 
-    const url =`/${state ? state : current_user && current_user.login}/${projectsId}/sub_entries.json`;
+    const url =`/repositories/${projectsId}/sub_entries.json`;
 
     axios.get(url,{
       params:{
diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js
index 01133e20..ccaf6990 100644
--- a/src/forge/Main/Detail.js
+++ b/src/forge/Main/Detail.js
@@ -153,7 +153,6 @@ class Detail extends Component{
         this.setState({
           current_user:result.data
         })
-        this.getDetail();
       }
     }).catch(error=>{
       console.log(error)
@@ -173,8 +172,8 @@ class Detail extends Component{
   // }
 
   getDetail=()=>{
-    const { projectsId , author } = this.props.match.params;
-    const url = `/${author}/${projectsId}.json`;
+    const { projectsId } = this.props.match.params;
+    const url = `/repositories/${projectsId}.json`;
     axios.get(url).then((result)=>{
       if(result){
         this.setState({
diff --git a/src/forge/Main/IndexItem.js b/src/forge/Main/IndexItem.js
index b9b46383..17341a21 100644
--- a/src/forge/Main/IndexItem.js
+++ b/src/forge/Main/IndexItem.js
@@ -28,7 +28,7 @@ class IndexItem extends Component{
                 <Link to={`/projects/${item.id}/${item.author && item.author.login}/coder`} className="hide-1 font-16 color-grey-3" style={{whiteSpace:"wrap"}}>{item.name}</Link>
               </div>
               <div className="p-r-content">
-                <p className="break_word task-hide flex1" style={{maxHeight:"40px"}}>{item.description}</p>
+                <p className="break_word task-hide flex1" style={{maxHeight:"40px",width:"0"}}>{item.description}</p>
                 <span className="p-r-tags">
                   {/* { item.forked_count ? <span><label>Fork</label><span>{ item.forked_count}</span></span>:"" } */}
                   <span className="pariseTag"><img src={img_parise} alt="" className="pariseImg"/>点赞 ({ item.praises_count })</span>
diff --git a/src/forge/Merge/MergeSubmit.js b/src/forge/Merge/MergeSubmit.js
index d043261f..b879f8c2 100644
--- a/src/forge/Merge/MergeSubmit.js
+++ b/src/forge/Merge/MergeSubmit.js
@@ -74,9 +74,8 @@ class MergeSubmit extends Component{
 
  //获取提交列表
   getCommitList=(branch , page , limit)=>{
-    const { login } = this.props.current_user;
     const { projectsId } = this.props.match.params;
-    const url = `/${login}/${projectsId}/commits.json`;
+    const url = `/repositories/${projectsId}/commits.json`;
     axios.get(url,{
       params:{
         sha:branch,
diff --git a/src/forge/Merge/NewMerge.js b/src/forge/Merge/NewMerge.js
index a57ec1a0..fb583c8f 100644
--- a/src/forge/Merge/NewMerge.js
+++ b/src/forge/Merge/NewMerge.js
@@ -168,9 +168,8 @@ class NewMerge extends Component{
 
   //获取提交列表
   getCommitList=(branch , page , limit)=>{
-    const { current_user } = this.props;
     const { projectsId } = this.props.match.params;
-    const url = `/${current_user&&current_user.login}/${projectsId}/commits.json`;
+    const url = `/repositories/${projectsId}/commits.json`;
     axios.get(url,{
       params:{
         sha:branch,
diff --git a/src/forge/Settings/Setting.js b/src/forge/Settings/Setting.js
index b49a400e..540e24a9 100644
--- a/src/forge/Settings/Setting.js
+++ b/src/forge/Settings/Setting.js
@@ -34,7 +34,7 @@ class Setting extends Component{
   getInfo=()=>{
     const { current_user } = this.props;
     const { projectsId } = this.props.match.params;
-    const url = `/${current_user.login}/${projectsId}/edit.json`;
+    const url = `/repositories/${projectsId}/edit.json`;
     axios.get(url).then(result=>{
       if(result){
         this.props.form.setFieldsValue({