Merge remote-tracking branch 'remotes/origin/dev' into test

modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysUserService.java

@@ -252,6 +252,9 @@ public interface ISysUserService {
     @ApiOperation(value = "封装用户信息",notes = "封装用户列表分页信息")
     SessionUser packPageSessionUser(SessionUser sessionUser, SysUser user);
 
+    @ApiOperation(value = "封装用户信息",notes = "封装用户系统配置信息")
+    SessionUser packConfigSessionUser(SessionUser sessionUser, SysUser user);
+
     /**
      * 根据id查询用户信息
      * @param ids 用户id

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java

@@ -261,7 +261,7 @@ public class WhiteController extends CoreBaseController {
 
     @GetMapping(value = "/find-resource")
     @ApiOperation(value = "按条件查询资源")
-    public ResultBean findSysLocaleResource(SysLocaleResource sysLocaleResource){
+    public ResultBean<SysLocaleResource> findSysLocaleResource(@RequestBody SysLocaleResource sysLocaleResource){
         try {
             startMultiService();
 

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java

@@ -126,7 +126,7 @@ public class SysUserService implements ISysUserService {
             throw new CredentialsException("用户不存在");
         }
         packSessionUser(sessionUser, user, user.getUserType(),loginPlatform, languageCode,deviceId);
-        packPageSessionUser(sessionUser, user);
+        packConfigSessionUser(sessionUser, user);
         AuthUtil.setSessionUser(sessionUser);
         refreshUserLoginInformation(user.getId());
         AuthUtil.online(sessionUser);
@@ -639,6 +639,15 @@ public class SysUserService implements ISysUserService {
     }
 
     @Override
+    public SessionUser packConfigSessionUser(SessionUser sessionUser, SysUser user) {
+        packPageSessionUser(sessionUser, user);
+        String fileViewUrl = RedisUtilTool.getSysConfigStrVal(CommonConstWords.CONFIG_FILE_VIEW_URL,
+                CommonConstWords.CONFIG_FILE_VIEW_URL_DEFAULT);
+        sessionUser.setFileViewUrl(fileViewUrl);
+        return sessionUser;
+    }
+
+    @Override
     public List<SysUser> findSysUserByIds(Long[] ids) {
         DdlPackBean ddlPackBean = new DdlPackBean();
         DdlPreparedPack.getInPackArray(ids, "id", ddlPackBean);