上传文件

app/router/controller/CustomerController.js

@@ -2790,8 +2790,7 @@ sap.ui.define(
                     var headers = {};//headers: headers,
                     if (that.getStorage().get("csrfToken") != null && that.getStorage().get("csrfToken") !== undefined) {
                         headers = {
-                            'x-csrf-token': that.getStorage().get("csrfToken"),
-                            'Content-Type': 'application/json'
+                            'x-csrf-token': that.getStorage().get("csrfToken")
                         };
                     }
                     headers.language=that.language;
@@ -3360,8 +3359,7 @@ sap.ui.define(
                     var headers = {};//headers: headers,
                     if (that.getStorage().get("csrfToken") != null && that.getStorage().get("csrfToken") !== undefined) {
                         headers = {
-                            'x-csrf-token': that.getStorage().get("csrfToken"),
-                            'Content-Type': 'application/json'
+                            'x-csrf-token': that.getStorage().get("csrfToken")
                         };
                     }
                     headers.language=that.language;

app/router/controller/organizationStructure/Party.controller.js

@@ -348,8 +348,7 @@ sap.ui.define(
                     var headers = {};//headers: headers,
                     if (that.getStorage().get("csrfToken") != null && that.getStorage().get("csrfToken") !== undefined) {
                         headers = {
-                            'x-csrf-token': that.getStorage().get("csrfToken"),
-                            'Content-Type': 'application/json'
+                            'x-csrf-token': that.getStorage().get("csrfToken")
                         };
                     }
                     headers.language=that.language;

app/router/controller/print/PrintTemplate.controller.js

@@ -341,8 +341,7 @@ sap.ui.define(
                     var headers = {};//headers: headers,
                     if (that.getStorage().get("csrfToken") != null && that.getStorage().get("csrfToken") !== undefined) {
                         headers = {
-                            'x-csrf-token': that.getStorage().get("csrfToken"),
-                            'Content-Type': 'application/json'
+                            'x-csrf-token': that.getStorage().get("csrfToken")
                         };
                     }
                     headers.language=that.language;

app/router/controller/purchase/PurchaseOrder.controller.js

@@ -2048,16 +2048,21 @@ sap.ui.define(
 
                     let userAuthentication = this.loginInfo.userAuthentication;
                     let appKey = userAuthentication.appKey;
-
+                    var headers = {};//headers: headers,
+                    if (that.getStorage().get("csrfToken") != null && that.getStorage().get("csrfToken") !== undefined) {
+                        headers = {
+                            'x-csrf-token': that.getStorage().get("csrfToken")
+                        };
+                    }
+                    headers.language=that.language;
+                    headers.appKey=appKey;
                     $.ajax({
                         url: this.baseUrl + "attachment/batchUpload",
                         type: "POST",
+                        headers: headers,
                         data: formData,
                         processData: false,
                         contentType: false,
-                        headers: {
-                            'appKey':appKey
-                        },
                         success: function(res) {
                             if(res.success){
                                 let fileList = res.result;

app/router/controller/purchase/PurchaseOrderForReturn.controller.js

@@ -1871,16 +1871,21 @@ sap.ui.define(
 
                     let userAuthentication = this.loginInfo.userAuthentication;
                     let appKey = userAuthentication.appKey;
-
+                    var headers = {};//headers: headers,
+                    if (that.getStorage().get("csrfToken") != null && that.getStorage().get("csrfToken") !== undefined) {
+                        headers = {
+                            'x-csrf-token': that.getStorage().get("csrfToken")
+                        };
+                    }
+                    headers.language=that.language;
+                    headers.appKey=appKey;
                     $.ajax({
                         url: this.baseUrl + "attachment/batchUpload",
                         type: "POST",
+                        headers: headers,
                         data: formData,
                         processData: false,
                         contentType: false,
-                        headers: {
-                            'appKey':appKey
-                        },
                         success: function(res) {
                             if(res.success){
                                 let fileList = res.result;

app/router/controller/sales/SalesOrder.controller.js

@@ -4331,8 +4331,7 @@ sap.ui.define(
                     var headers = {};//headers: headers,
                     if (that.getStorage().get("csrfToken") != null && that.getStorage().get("csrfToken") !== undefined) {
                         headers = {
-                            'x-csrf-token': that.getStorage().get("csrfToken"),
-                            'Content-Type': 'application/json'
+                            'x-csrf-token': that.getStorage().get("csrfToken")
                         };
                     }
                     headers.language=that.language;

mtaDeploy.sh

@@ -146,6 +146,11 @@ common(){
 	starttime=`date +%s`
   secondsToTime "${starttime}" "${starttime}"
 
+  #登录BTP 输入密码： Gzp@123456 后回车。
+  echo -e "\033[30;42m 登录BTP test 子账户 输入密码： Gzp@123456 后回车 \033[0m"
+  # 登录BTP命令：
+  cf login -a https://api.cf.cn40.platform.sapcloud.cn -o "Shenzhen-Lianchuangjie-Technology-Co-Ltd-test-cnrc164l" -s gzpTest -u zhipeng.guo@boscloud.cn
+
   #校验登录状态
 	account=$(cf services)
   accountMatch='.*succeeded.*'

srv/src/main/java/customer/lianchuangjie/master/service/impl/AttachmentServiceImpl.java

@@ -36,6 +36,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.multipart.MultipartResolver;
 
 import static customer.lianchuangjie.common.util.ConvertUtils.getSuffix;
 
@@ -54,6 +55,8 @@ public class AttachmentServiceImpl extends ServiceImpl<AttachmentDao, Attachment
     private AttachmentProductBatchDao attachmentProductBatchDao;
     @Autowired
     private GoldSampleDao goldSampleDao;
+    @Autowired
+    private MultipartResolver multipartResolver;
 
     /**
      * 批量上传
@@ -65,10 +68,19 @@ public class AttachmentServiceImpl extends ServiceImpl<AttachmentDao, Attachment
     @Transactional(rollbackFor = Exception.class)
     public Result<?> batchUpload(HttpServletRequest request, String language) {
         String message = "";
-        MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-        Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
         List<JSONObject> results = new ArrayList<>();
+        // 获取原始请求对象
+        HttpServletRequest originalRequest = request;
+        while (originalRequest instanceof javax.servlet.http.HttpServletRequestWrapper) {
+            originalRequest = (HttpServletRequest) ((javax.servlet.http.HttpServletRequestWrapper) originalRequest).getRequest();
+            log.info("[originalRequest instanceof javax.servlet.http.HttpServletRequestWrapper]true");
+        }
+        if (multipartResolver.isMultipart(originalRequest)) {
+            log.info("[multipartResolver.isMultipart(originalRequest)]true");
+            MultipartHttpServletRequest multipartRequest = multipartResolver.resolveMultipart(originalRequest);
+            Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
             for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+                log.info("[fileMap.entrySet()]for");
                 JSONObject item = new JSONObject();
                 MultipartFile file = entity.getValue();// 获取上传文件对象
                 try {
@@ -99,6 +111,9 @@ public class AttachmentServiceImpl extends ServiceImpl<AttachmentDao, Attachment
                     }
                 }
             }
+        } else {
+            log.info("[multipartResolver.isMultipart(originalRequest)]false");
+        }
         if (results.size() > 0) {
             Result<Object> ok = Result.ok(MessageUtil.get("success", new Object[] { message }, language));
             ok.setResult(results);