Merge branch 'master' into router

# Conflicts:
#	src/utils/domainManager.ts
#	src/utils/psdParser/text.ts
#	src/utils/upload/aliyun.ts

src/configs/axios.ts

@@ -78,7 +78,7 @@ const service = Axios.create({
 	// process.env.VUE_APP_API_URL
 	//'http://reborn.oytour.com/api/common/post'
 	baseURL: process.env.VUE_APP_API_URL,
-	timeout: 20000,
+	timeout: 200000,
 	headers: {
 		'User-Type': 'bus',
 		'Content-Type': 'application/json;charset=UTF-8'

src/utils/domainManager.ts

@@ -3,7 +3,7 @@ export const domainManager = () => {
     const obj = {
         domainUrl: locationName.indexOf('oytour') !== -1 ? "https://reborn.oytour.com/api/common/post" : "http://192.168.10.214/api/common/post",
         //上传站点
-        UploadUrl: locationName.indexOf('oytour') !== -1 ? "https://upload.oytour.com" : "http://192.168.5.214:8120",
+        UploadUrl: locationName.indexOf('oytour') !== -1 ? "https://upload.oytour.com" : "http://192.168.5.46:8120",
         //文件站点
         ViittoFileUrl: locationName.indexOf('oytour') !== -1 ? "http://imgfile.oytour.com" : 'http://192.168.10.214:8130',
         // 通知erp

src/views/Editor/Thumbnails/index.vue

@@ -287,7 +287,7 @@ const GetTripFiledData = async () =>{
                     try {
                       // let width = y.width
                       // let height = y.height
-                      let tempSize = await FileService.getImageSizeWithoutDownloading(value[0])
+                      let tempSize = await FileService.convertNetworkToBase64Async(value[0])//await FileService.getImageSizeWithoutDownloading(value[0])
                       let width = 0
                       let height =  0
                       //按照宽度进行缩放