Jenkins自动合并

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi;
 import cn.estsh.i3plus.core.api.iservice.base.ISystemInitService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysLocaleResourceService;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
+import cn.estsh.i3plus.platform.common.exception.BaseImppException;
 import cn.estsh.i3plus.platform.common.tool.ExcelTool;
 import cn.estsh.i3plus.platform.common.tool.StringTool;
 import cn.estsh.i3plus.platform.common.util.CommonConstWords;
@@ -313,6 +314,8 @@ public class SysLocaleResourceController extends CoreBaseController {
             return ResultBean.success("导入成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         } catch (ImppBusiException busExcep) {
             return ResultBean.fail(busExcep);
+        } catch (BaseImppException busExcep) {
+            return ResultBean.fail(busExcep);
         } catch (Exception e) {
             return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
         }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMenuController.java

@@ -7,6 +7,7 @@ import cn.estsh.i3plus.platform.common.exception.BaseImppException;
 import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
 import cn.estsh.i3plus.platform.common.tool.ExcelTool;
 import cn.estsh.i3plus.platform.common.tool.StringTool;
+import cn.estsh.i3plus.platform.common.util.FileContentTypeTool;
 import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
@@ -377,7 +378,7 @@ public class SysMenuController extends CoreBaseController {
      */
     @GetMapping("/download/excel")
     @ApiOperation(value = "权限文件下载", notes = "权限文件下载")
-    public ResultBean singleDownload(HttpServletResponse response) {
+    public void singleDownload(HttpServletResponse response) {
         try {
             startMultiService();
             ExcelTool excelTool = new ExcelTool(entityManager, redisRes);
@@ -394,7 +395,8 @@ public class SysMenuController extends CoreBaseController {
             InputStream targetStream = new DataInputStream(new FileInputStream(excle));
             response.setContentType("application/force-download"); // 设置强制下载不打开
             response.addHeader("Content-Disposition", "attachment;fileName=" + fileName); // 设置文件名
-            response.addHeader("Content-type", "application/octet-stream"); // 设置文件名
+            response.addHeader("Content-type", FileContentTypeTool.getContentType(StringTool.getStringFileSuffix(fileName,true)));
+            // 设置文件名
 
             BufferedInputStream bis = null;
             try {
@@ -419,11 +421,11 @@ public class SysMenuController extends CoreBaseController {
                 }
             }
             file.delete(); // 删除临时文件
-            return ResultBean.success("下载").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+            ResultBean.success("下载").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
-            return ResultBean.fail(busExcep);
-        }catch(Exception e){
-            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+            ResultBean.fail(busExcep);
+        } catch (Exception e) {
+            ImppExceptionBuilder.newInstance().buildExceptionResult(e);
         }
     }
 

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java

@@ -9,8 +9,11 @@ import cn.estsh.i3plus.platform.common.util.CommonConstWords;
 import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
-import cn.estsh.i3plus.pojo.base.util.StringUtil;
-import cn.estsh.i3plus.pojo.platform.bean.*;
+import cn.estsh.i3plus.pojo.platform.bean.SysConfig;
+import cn.estsh.i3plus.pojo.platform.bean.SysDictionary;
+import cn.estsh.i3plus.pojo.platform.bean.SysLocaleLanguage;
+import cn.estsh.i3plus.pojo.platform.bean.SysLocaleResource;
+import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
 import cn.estsh.i3plus.pojo.platform.repository.SysConfigRepository;
 import cn.estsh.i3plus.pojo.platform.repository.SysDictionaryRepository;
 import cn.estsh.i3plus.pojo.platform.repository.SysLocaleLanguageRepository;
@@ -22,9 +25,11 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -69,7 +74,6 @@ public class SystemInitService implements ISystemInitService {
         putAndLoadSysConfig();
         putAndLoadSysDictionary();
         putAndLoadSysLocaleLanguage();
-        putAndLoadSysMenu();
     }
 
     @Override
@@ -166,6 +170,9 @@ public class SystemInitService implements ISystemInitService {
             }
 
         }
+
+        //加载语言数据
+        putAndLoadSysMenu();
     }
 
     @ApiOperation(value = "加载语言数据",notes = "加载语言数据")
@@ -220,8 +227,6 @@ public class SystemInitService implements ISystemInitService {
         }
     }
 
-
-
     /**
      * 缓存存放数据统一管理
      * @param key