ソースを参照

文件上传处理oss特殊字符问题

user5 3 年 前
コミット
8fd1242673

+ 20 - 10
src/main/webapp/static/oss/ossupload.js

@@ -48,7 +48,7 @@ function ftlUploadWithSts(storeAs, file,attachmentId,attachmentFlag,uploadPath,d
     file.name.replace(/—/g,"")
     var fileName = file.name;
     // 将单引号‘’都转换成',将双引号“”都转换成"
-    fileName = fileName.replace(/\’|\‘/g,"'").replace(/\“|\”/g,"\"");
+    fileName = fileName.replace(/\’|\‘/g,"'").replace(/\“|\”/g,"");
     // 将中括号【】转换成[],将大括号{}转换成{}
     fileName = fileName.replace(/\【/g,"(").replace(/\】/g,")").replace(/\{/g,"(").replace(/\}/g,")");
     fileName = fileName.replace(/\[/g,"(").replace(/\]/g,")").replace(/\{/g,"(").replace(/\}/g,")");
@@ -60,6 +60,7 @@ function ftlUploadWithSts(storeAs, file,attachmentId,attachmentFlag,uploadPath,d
     fileName = fileName.replace(/±/g,"")
     fileName = fileName.replace(/#/g,"")
     fileName = fileName.replace(/%/g,"")
+    fileName = fileName.replace(/Π/g,"")
     var dfl=new File([file],fileName,{type:file.type});
     file = dfl
     /*console.log(file.name.indexOf("—")!=-1);
@@ -72,7 +73,7 @@ function multipartUploadWithSts(storeAs, file,attachmentId,attachmentFlag,upload
     file.name.replace(/—/g,"")
     var fileName = file.name;
     // 将单引号‘’都转换成',将双引号“”都转换成"
-    fileName = fileName.replace(/\’|\‘/g,"'").replace(/\“|\”/g,"\"");
+    fileName = fileName.replace(/\’|\‘/g,"'").replace(/\“|\”/g,"");
     // 将中括号【】转换成[],将大括号{}转换成{}
     fileName = fileName.replace(/\【/g,"(").replace(/\】/g,")").replace(/\{/g,"(").replace(/\}/g,")");
     fileName = fileName.replace(/\[/g,"(").replace(/\]/g,")").replace(/\{/g,"(").replace(/\}/g,")");
@@ -84,6 +85,7 @@ function multipartUploadWithSts(storeAs, file,attachmentId,attachmentFlag,upload
     fileName = fileName.replace(/±/g,"")
     fileName = fileName.replace(/#/g,"")
     fileName = fileName.replace(/%/g,"")
+    fileName = fileName.replace(/Π/g,"")
     var dfl=new File([file],fileName,{type:file.type});
     file = dfl
     /*console.log(file.name.indexOf("—")!=-1);
@@ -102,7 +104,7 @@ function CollectUploadWithSts(storeAs, file,attachmentId,attachmentFlag,uploadPa
     file.name.replace(/—/g,"")
     var fileName = file.name;
     // 将单引号‘’都转换成',将双引号“”都转换成"
-    fileName = fileName.replace(/\’|\‘/g,"'").replace(/\“|\”/g,"\"");
+    fileName = fileName.replace(/\’|\‘/g,"'").replace(/\“|\”/g,"");
     // 将中括号【】转换成[],将大括号{}转换成{}
     fileName = fileName.replace(/\【/g,"(").replace(/\】/g,")").replace(/\{/g,"(").replace(/\}/g,")");
     fileName = fileName.replace(/\[/g,"(").replace(/\]/g,")").replace(/\{/g,"(").replace(/\}/g,")");
@@ -114,6 +116,7 @@ function CollectUploadWithSts(storeAs, file,attachmentId,attachmentFlag,uploadPa
     fileName = fileName.replace(/±/g,"")
     fileName = fileName.replace(/#/g,"")
     fileName = fileName.replace(/%/g,"")
+    fileName = fileName.replace(/Π/g,"")
     var dfl=new File([file],fileName,{type:file.type});
     file = dfl
 
@@ -161,7 +164,7 @@ function multipartUploadWithStsOnProcessAccessory(storeAs, file,attachmentId,att
     file.name.replace(/—/g,"")
     var fileName = file.name;
     // 将单引号‘’都转换成',将双引号“”都转换成"
-    fileName = fileName.replace(/\’|\‘/g,"'").replace(/\“|\”/g,"\"");
+    fileName = fileName.replace(/\’|\‘/g,"'").replace(/\“|\”/g,"");
     // 将中括号【】转换成[],将大括号{}转换成{}
     fileName = fileName.replace(/\【/g,"(").replace(/\】/g,")").replace(/\{/g,"(").replace(/\}/g,")");
     fileName = fileName.replace(/\[/g,"(").replace(/\]/g,")").replace(/\{/g,"(").replace(/\}/g,")");
@@ -173,6 +176,7 @@ function multipartUploadWithStsOnProcessAccessory(storeAs, file,attachmentId,att
     fileName = fileName.replace(/±/g,"")
     fileName = fileName.replace(/#/g,"")
     fileName = fileName.replace(/%/g,"")
+    fileName = fileName.replace(/Π/g,"")
     var dfl=new File([file],fileName,{type:file.type});
     file = dfl
 
@@ -220,7 +224,7 @@ function multipartUploadWithSts(storeAs, file,attachmentId,attachmentFlag,upload
     file.name.replace(/—/g,"")
     var fileName = file.name;
     // 将单引号‘’都转换成',将双引号“”都转换成"
-    fileName = fileName.replace(/\’|\‘/g,"'").replace(/\“|\”/g,"\"");
+    fileName = fileName.replace(/\’|\‘/g,"'").replace(/\“|\”/g,"");
     // 将中括号【】转换成[],将大括号{}转换成{}
     fileName = fileName.replace(/\【/g,"(").replace(/\】/g,")").replace(/\{/g,"(").replace(/\}/g,")");
     fileName = fileName.replace(/\[/g,"(").replace(/\]/g,")").replace(/\{/g,"(").replace(/\}/g,")");
@@ -232,6 +236,7 @@ function multipartUploadWithSts(storeAs, file,attachmentId,attachmentFlag,upload
     fileName = fileName.replace(/±/g,"")
     fileName = fileName.replace(/#/g,"")
     fileName = fileName.replace(/%/g,"")
+    fileName = fileName.replace(/Π/g,"")
     var dfl=new File([file],fileName,{type:file.type});
     file = dfl
 
@@ -280,7 +285,7 @@ function multipartUploadWorkOrder(storeAs, file,attachmentId,attachmentFlag,uplo
     file.name.replace(/—/g,"")
     var fileName = file.name;
     // 将单引号‘’都转换成',将双引号“”都转换成"
-    fileName = fileName.replace(/\’|\‘/g,"'").replace(/\“|\”/g,"\"");
+    fileName = fileName.replace(/\’|\‘/g,"'").replace(/\“|\”/g,"");
     // 将中括号【】转换成[],将大括号{}转换成{}
     fileName = fileName.replace(/\【/g,"(").replace(/\】/g,")").replace(/\{/g,"(").replace(/\}/g,")");
     fileName = fileName.replace(/\[/g,"(").replace(/\]/g,")").replace(/\{/g,"(").replace(/\}/g,")");
@@ -292,6 +297,7 @@ function multipartUploadWorkOrder(storeAs, file,attachmentId,attachmentFlag,uplo
     fileName = fileName.replace(/±/g,"")
     fileName = fileName.replace(/#/g,"")
     fileName = fileName.replace(/%/g,"")
+    fileName = fileName.replace(/Π/g,"")
     var dfl=new File([file],fileName,{type:file.type});
     file = dfl
 
@@ -523,7 +529,7 @@ function multipartUploadWithStsCollection(storeAs, file,attachmentId,attachmentF
     file.fileName.replace(/—/g,"")
     var fileName = file.fileName;
     // 将单引号‘’都转换成',将双引号“”都转换成"
-    fileName = fileName.replace(/\’|\‘/g,"'").replace(/\“|\”/g,"\"");
+    fileName = fileName.replace(/\’|\‘/g,"'").replace(/\“|\”/g,"");
     // 将中括号【】转换成[],将大括号{}转换成{}
     fileName = fileName.replace(/\【/g,"(").replace(/\】/g,")").replace(/\{/g,"(").replace(/\}/g,")");
     fileName = fileName.replace(/\[/g,"(").replace(/\]/g,")").replace(/\{/g,"(").replace(/\}/g,")");
@@ -535,6 +541,7 @@ function multipartUploadWithStsCollection(storeAs, file,attachmentId,attachmentF
     fileName = fileName.replace(/±/g,"")
     fileName = fileName.replace(/#/g,"")
     fileName = fileName.replace(/%/g,"")
+    fileName = fileName.replace(/Π/g,"")
     var dfl=new File([file],fileName,{type:file.type});
     file = dfl
 
@@ -585,7 +592,7 @@ function multipartUploadWithStsCollectionCollect(storeAs, file,attachmentId,atta
     file.fileName.replace(/—/g,"")
     var fileName = file.fileName;
     // 将单引号‘’都转换成',将双引号“”都转换成"
-    fileName = fileName.replace(/\’|\‘/g,"'").replace(/\“|\”/g,"\"");
+    fileName = fileName.replace(/\’|\‘/g,"'").replace(/\“|\”/g,"");
     // 将中括号【】转换成[],将大括号{}转换成{}
     fileName = fileName.replace(/\【/g,"(").replace(/\】/g,")").replace(/\{/g,"(").replace(/\}/g,")");
     fileName = fileName.replace(/\[/g,"(").replace(/\]/g,")").replace(/\{/g,"(").replace(/\}/g,")");
@@ -597,6 +604,7 @@ function multipartUploadWithStsCollectionCollect(storeAs, file,attachmentId,atta
     fileName = fileName.replace(/±/g,"")
     fileName = fileName.replace(/#/g,"")
     fileName = fileName.replace(/%/g,"")
+    fileName = fileName.replace(/Π/g,"")
     var dfl=new File([file],fileName,{type:file.type});
     file = dfl
 
@@ -1439,7 +1447,7 @@ function multipartUploadWithStsRecordsReported(storeAs, file,attachmentId,attach
     file.name.replace(/—/g,"")
     var fileName = file.name;
     // 将单引号‘’都转换成',将双引号“”都转换成"
-    fileName = fileName.replace(/\’|\‘/g,"'").replace(/\“|\”/g,"\"");
+    fileName = fileName.replace(/\’|\‘/g,"'").replace(/\“|\”/g,"");
     // 将中括号【】转换成[],将大括号{}转换成{}
     fileName = fileName.replace(/\【/g,"(").replace(/\】/g,")").replace(/\{/g,"(").replace(/\}/g,")");
     fileName = fileName.replace(/\[/g,"(").replace(/\]/g,")").replace(/\{/g,"(").replace(/\}/g,")");
@@ -1451,6 +1459,7 @@ function multipartUploadWithStsRecordsReported(storeAs, file,attachmentId,attach
     fileName = fileName.replace(/±/g,"")
     fileName = fileName.replace(/#/g,"")
     fileName = fileName.replace(/%/g,"")
+    fileName = fileName.replace(/Π/g,"")
     var dfl=new File([file],fileName,{type:file.type});
     file = dfl
 
@@ -2045,7 +2054,7 @@ function fileCollectAccessory(storeAs, file,attachmentId,attachmentFlag,uploadPa
     file.name.replace(/—/g,"")
     var fileName = file.name;
     // 将单引号‘’都转换成',将双引号“”都转换成"
-    fileName = fileName.replace(/\’|\‘/g,"'").replace(/\“|\”/g,"\"");
+    fileName = fileName.replace(/\’|\‘/g,"'").replace(/\“|\”/g,"");
     // 将中括号【】转换成[],将大括号{}转换成{}
     fileName = fileName.replace(/\【/g,"(").replace(/\】/g,")").replace(/\{/g,"(").replace(/\}/g,")");
     fileName = fileName.replace(/\[/g,"(").replace(/\]/g,")").replace(/\{/g,"(").replace(/\}/g,")");
@@ -2057,6 +2066,7 @@ function fileCollectAccessory(storeAs, file,attachmentId,attachmentFlag,uploadPa
     fileName = fileName.replace(/±/g,"")
     fileName = fileName.replace(/#/g,"")
     fileName = fileName.replace(/%/g,"")
+    fileName = fileName.replace(/Π/g,"")
     var dfl=new File([file],fileName,{type:file.type});
     file = dfl
     requestUrl = realPath+"/previewController/getAccess";

+ 2 - 2
src/main/webapp/webpage/include/head.jsp

@@ -98,7 +98,7 @@
         {
              document.write('<script src="http://gosspublic.alicdn.com/aliyun-oss-sdk-4.4.4.min.js"><\/script>');
             document.write('<script src="${ctxStatic}/bos/node_modules/@baiducloud/sdk/dist/baidubce-sdk.bundle.min.js"><\/script>');
-            document.write('<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?7"><\/script>');
+            document.write('<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?8"><\/script>');
             /*document.write('<script type="text/javascript" src="${ctxStatic}/bos/bosupload.js"><\/script>');*/
         }
     }
@@ -106,7 +106,7 @@
     {
          document.write('<script src="http://gosspublic.alicdn.com/aliyun-oss-sdk-4.4.4.min.js"><\/script>');
         document.write('<script src="${ctxStatic}/bos/node_modules/@baiducloud/sdk/dist/baidubce-sdk.bundle.min.js"><\/script>');
-        document.write('<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?7"><\/script>');
+        document.write('<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?8"><\/script>');
         /*document.write('<script type="text/javascript" src="${ctxStatic}/bos/bosupload.js"><\/script>');*/
     }
 

+ 1 - 1
src/main/webapp/webpage/include/ossTools.jsp

@@ -9,4 +9,4 @@
 <script type="text/javascript" src="${ctxStatic}/oss/lib/plupload-2.3.6/plupload-2.3.6/js/jquery.plupload.queue/jquery.plupload.queue.js"></script>
 <script type="text/javascript" src="${ctxStatic}/oss/lib/plupload-2.3.6/plupload-2.3.6/js/plupload.dev.js"></script>
 <script type="text/javascript" src="${ctxStatic}/oss/upload.js"></script>
-<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js"></script>
+<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?8"></script>

+ 1 - 1
src/main/webapp/webpage/modules/projectcontentinfo/achievementFileDataForm.jsp

@@ -6,7 +6,7 @@
 	<meta name="decorator" content="default"/>
 	<link href="${ctxStatic}/bootstrap-select-1.12.4/css/bootstrap-select.min.css" rel="stylesheet" />
 	<script src="${ctxStatic}/bootstrap-select-1.12.4/js/bootstrap-select.min.js"></script>
-	<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js"></script>
+	<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?8"></script>
 	<style>
 		label.error{
 			top:40px;

+ 1 - 1
src/main/webapp/webpage/modules/projectcontentinfo/basedDataForm.jsp

@@ -6,7 +6,7 @@
 	<meta name="decorator" content="default"/>
 	<link href="${ctxStatic}/bootstrap-select-1.12.4/css/bootstrap-select.min.css" rel="stylesheet" />
 	<script src="${ctxStatic}/bootstrap-select-1.12.4/js/bootstrap-select.min.js"></script>
-	<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js"></script>
+	<script type="text/javascript" src="${ctxStatic}/oss/ossupload.js?8"></script>
 	<style>
 		label.error{
 			top:40px;