Merge remote-tracking branch 'origin/base-modify' into base-modify

ace-common/src/main/resources/properties/systemconfig.properties

 #项目url
-XXMP_URL=https://xxtest.upyuns.com/image
+XXMP_URL=/image
 #token到期时间
 TOKEN_OVER_TIME=604800
 #itoken到期时间(6天)

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/UploadService.java

@@ -53,7 +53,7 @@ public class UploadService {
         String filePath = baseUploadPath + realFileRelPath;
         //将文件写入指定位置
         FileUtils.copyInputStreamToFile(file.getInputStream(), new File(filePath));
-        realFileRelPath= SystemConfig.XXMP_URL+realFileRelPath;
+        realFileRelPath=xx_url+SystemConfig.XXMP_URL+realFileRelPath;
         return realFileRelPath;
     }
 
@@ -83,7 +83,7 @@ public class UploadService {
         realFileRelPath=filePath + "/" + no + ".jpg";
         //将文件写入指定位置
         ImgBase64Util.generateImage(imgFile,realFileRelPath);
-        realFileRelPath= SystemConfig.XXMP_URL+realFileRelPath;
+        realFileRelPath=xx_url+SystemConfig.XXMP_URL+realFileRelPath;
         return realFileRelPath;
     }