Merge branch 'feature/0721-tenant' into develop

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/TenantAccountRecordController.java

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.admin.controller;
 
+import cn.hutool.core.net.URLEncodeUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
 import com.alibaba.fastjson.JSON;
@@ -113,6 +114,7 @@ public class TenantAccountRecordController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('tenantAccountRecord/import')")
     public HttpResponseResult<FileImportInfo> importFile(@RequestBody FileImportInfoWrapper.FileImport wrapper) {
 
+        wrapper.setImportUrl(URLEncodeUtil.encode(wrapper.getImportUrl()));
 
         // 读取数据
         return HttpResponseResult.succeed(excelAnalyseCoreService.analyseReadExcelData(

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ExcelAnalyseCoreServiceImpl.java

@@ -105,7 +105,7 @@ public class ExcelAnalyseCoreServiceImpl implements ExcelAnalyseCoreService {
             return fileImportInfoService.getById(wrapper.getId());
 
         }catch (NotOfficeXmlFileException e) {
-            throw new BizException("上传文件格式版本太低");
+            throw new BizException("文件名格式错误");
         } catch (Exception e) {
             log.error("asyncAnalyseReadExcelData wrapper={}", wrapper.jsonString(), e);
         }
@@ -160,8 +160,6 @@ public class ExcelAnalyseCoreServiceImpl implements ExcelAnalyseCoreService {
                 log.info("createFileImportRecord uploadFile={}, resp={}", uploadFile, context.getResp());
                 // 删除本地缓存文件
                 DownloadManager.getInstance().deleteOnExit(respPath);
-            } else if (StringUtils.isNotEmpty(respPath)) {
-                context.setResp(wrapper.getImportUrl());
             }
         }