From 0374ad3769c2d06b9ee24b3c8e3bd97aaa7edf11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <1261960504@qq.com>
Date: Mon, 8 Aug 2022 16:52:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E7=89=87=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E5=87=BD=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/UrlTool.js                           | 14 ++++++++++++++
 src/common/educoder.js                          |  2 +-
 src/forge/Newfile/codeReview/mock/pr.service.js |  8 ++++----
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/common/UrlTool.js b/src/common/UrlTool.js
index 765b925e1..991c3a4d7 100644
--- a/src/common/UrlTool.js
+++ b/src/common/UrlTool.js
@@ -19,6 +19,20 @@ export function getImageUrl(path) {
 	return `${path}`;
 }
 
+export function getImageUrlAbsolute(path) {
+	// https://www.educoder.net
+	// https://testbdweb.trustie.net
+  // const local = 'http://localhost:3000'
+  path && !path.startsWith('/') && !path.startsWith('http') &&  (path = '/'.concat(path));
+	const local = 'https://testforgeplus.trustie.net';
+	const prod = window.location.origin;
+	if (isDev) {
+		return `${local}${path}`
+	}else{
+		return `${prod}${path}`;
+	}
+}
+
 export function numFormat(num, digits){
 	let d = digits || 1;
   var si = [
diff --git a/src/common/educoder.js b/src/common/educoder.js
index 067d3f60e..91de34319 100644
--- a/src/common/educoder.js
+++ b/src/common/educoder.js
@@ -4,7 +4,7 @@
 
 export {
 	getUploadLogoActionUrl as getUploadLogoActionUrl,numFormat as numFormat,
-	getImageUrl as getImageUrl,getImage as getImage, getmyUrl as getmyUrl, getRandomNumber as getRandomNumber, getUrl as getUrl, publicSearchs as publicSearchs, getRandomcode as getRandomcode, getUrlmys as getUrlmys, getUrl2 as getUrl2, setImagesUrl as setImagesUrl
+	getImageUrl as getImageUrl,getImageUrlAbsolute as getImageUrlAbsolute,getImage as getImage, getmyUrl as getmyUrl, getRandomNumber as getRandomNumber, getUrl as getUrl, publicSearchs as publicSearchs, getRandomcode as getRandomcode, getUrlmys as getUrlmys, getUrl2 as getUrl2, setImagesUrl as setImagesUrl
 	, getUploadActionUrl as getUploadActionUrl, getUploadActionUrltwo as getUploadActionUrltwo, getUploadActionUrlthree as getUploadActionUrlthree, getUploadActionUrlOfAuth as getUploadActionUrlOfAuth
 	, getTaskUrlById as getTaskUrlById, TEST_HOST, htmlEncode as htmlEncode, getupload_git_file as getupload_git_file, getcdnImageUrl as getcdnImageUrl,
 	turnbar,returnbar
diff --git a/src/forge/Newfile/codeReview/mock/pr.service.js b/src/forge/Newfile/codeReview/mock/pr.service.js
index dedf69a56..3aab1fc03 100755
--- a/src/forge/Newfile/codeReview/mock/pr.service.js
+++ b/src/forge/Newfile/codeReview/mock/pr.service.js
@@ -1,6 +1,6 @@
 import { apiService } from './api.service';
 import { message } from 'antd';
-import { getImageUrl } from "educoder";
+import { getImageUrlAbsolute } from "educoder";
 import { calcChangeLineNum } from './utils/calc-change-line-num';
 import { underscoreToCamelcase } from './utils/camelcase-convert';
 import axios from 'axios';
@@ -92,7 +92,7 @@ export const prService = {
     let journals=underscoreToCamelcase(res.data.journals);
     for(const item of journals){
       item.author=item.user;
-      item.author.avatarUrl=item.user.imageUrl?getImageUrl(item.user.imageUrl):'';
+      item.author.avatarUrl=item.user.imageUrl?getImageUrlAbsolute(item.user.imageUrl):'';
       item.author.username=item.user.name;
       item.type='Common';
       item.stDiff=item.diff;
@@ -165,7 +165,7 @@ export const prService = {
     console.log('addComment===');
     let commentData=underscoreToCamelcase(res.data);
     commentData.author=commentData.user;
-    commentData.author.avatarUrl=commentData.user.imageUrl?getImageUrl(commentData.user.imageUrl):'';
+    commentData.author.avatarUrl=commentData.user.imageUrl?getImageUrlAbsolute(commentData.user.imageUrl):'';
     commentData.author.username=commentData.user.name;
     commentData.type='Common';
     commentData.stDiff=commentData.diff;
@@ -189,7 +189,7 @@ export const prService = {
     let reviews=underscoreToCamelcase(res.data.reviews);
     for(const item of reviews){
       item.author=item.reviewer;
-      item.author.avatarUrl=getImageUrl(item.reviewer.imageUrl);
+      item.author.avatarUrl=getImageUrlAbsolute(item.reviewer.imageUrl);
       item.author.username=item.reviewer.name;
       item.author.webUrl='';
       item.body=item.content;