Merge remote-tracking branch 'origin/master'

user_center/src/main/java/com/huaxu/config/ResourceServerConfig.java

@@ -17,7 +17,9 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
                 .and()
                 .authorizeRequests()
                 .antMatchers("/swagger-ui.html","/webjars/**", "/webjars/**", "/swagger-resources/**",
-                       "/v2/**","/app/**","/user/**","/menu/**","/role/**","/org/**","/userGroup/**","/loginLog/**","/operateLog/**","/excel/download/**","/dict/**","/userRegister/**","/area/**")
+                       "/v2/**","/app/**","/user/**","/menu/**","/role/**","/org/**","/userGroup/**",
+                        "/loginLog/**","/operateLog/**","/excel/download/**","/dict/**","/userRegister/**",
+                        "/area/**","/tenant/**")
                 .permitAll() //配置不需要身份认证的请求路径
                 .anyRequest().authenticated() //其他所有访问路径都需要身份认证
                 .and()

user_center/src/main/java/com/huaxu/controller/LoginLogController.java

@@ -109,19 +109,15 @@ public class LoginLogController {
     /**
      * 分页查询
      *
-     * @param pageNum  偏移
-     * @param pageSize 条数
      * @return Response对象
      */
     @RequestMapping(value = "selectPage", method = RequestMethod.POST)
     @ApiOperation(value = "查询登录日志信息列表")
     public AjaxMessage<Pagination<LoginLogDto>> selectPage(
-            @ApiParam(value = "登录日志信息", required = true) @RequestBody LoginLogDto loginLogDto,
-            @ApiParam(value = "页数,非必传，默认第一页", defaultValue = "1") @RequestParam(required = false, defaultValue = "1") Integer pageNum,
-            @ApiParam(value = "条数，非必传，默认15条", defaultValue = "30") @RequestParam(required = false, defaultValue = "30")Integer pageSize
-
+            @ApiParam(value = "登录日志信息", required = true) @RequestBody LoginLogDto loginLogDto
     ) {
-        IPage<LoginLogDto> iPage = new Page<>(pageNum, pageSize);
+
+        IPage<LoginLogDto> iPage = new Page<>(loginLogDto.getPageNum(), loginLogDto.getPageSize());
 
         iPage = loginLogService.selectPage(iPage, loginLogDto);
 

user_center/src/main/java/com/huaxu/controller/OperateLogController.java

@@ -109,19 +109,15 @@ public class OperateLogController {
     /**
      * 分页查询
      *
-     * @param pageNum  偏移
-     * @param pageSize 条数
      * @return Response对象
      */
     @RequestMapping(value = "selectPage", method = RequestMethod.POST)
     @ApiOperation(value = "查询操作日志信息列表")
     public AjaxMessage<Pagination<OperateLogDto>> selectPage(
-            @ApiParam(value = "操作日志信息", required = true) @RequestBody OperateLogDto operateLogDto,
-            @ApiParam(value = "页数,非必传，默认第一页",  defaultValue = "1") @RequestParam(required = false, defaultValue = "1") Integer pageNum,
-            @ApiParam(value = "条数，非必传，默认30条",  defaultValue = "30") @RequestParam(required = false, defaultValue = "30") Integer pageSize
+            @ApiParam(value = "操作日志信息", required = true) @RequestBody OperateLogDto operateLogDto
 
     ) {
-        IPage<OperateLogDto> iPage = new Page<>(pageNum, pageSize);
+        IPage<OperateLogDto> iPage = new Page<>(operateLogDto.getPageNum(), operateLogDto.getPageSize());
 
         iPage = operateLogService.selectPage(iPage, operateLogDto);
 

user_center/src/main/java/com/huaxu/controller/TenantController.java

@@ -149,11 +149,13 @@ public class TenantController {
     @RequestMapping(value = "selectPage", method = RequestMethod.POST)
     @ApiOperation(value = "查询租户信息列表")
     public AjaxMessage<Pagination<TenantDto>> selectPage(
-            @ApiParam(value = "租户名称")  @RequestBody TenantDto tenantDto,
+            @ApiParam(value = "租户名称")  @RequestParam(required = false) String tenantName,
             @ApiParam(value = "页数,非必传，默认第一页",  defaultValue = "1") @RequestParam(required = false, defaultValue = "1") Integer pageNum,
             @ApiParam(value = "条数，非必传，默认30条",  defaultValue = "30") @RequestParam(required = false, defaultValue = "30") Integer pageSize
 
     ) {
+        TenantDto tenantDto = new TenantDto();
+        tenantDto.setTenantName(tenantName);
         IPage<TenantDto> iPage = new Page<>(pageNum, pageSize);
 
         iPage = tenantService.selectPage(iPage, tenantDto );

user_center/src/main/java/com/huaxu/dto/LoginLogDto.java

@@ -38,4 +38,25 @@ public class LoginLogDto extends LoginLogEntity {
     @ApiModelProperty(value = "查询条件（终止时间）yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date endTime;
+
+    @ExcelIgnore
+    @ApiModelProperty(value ="分页查询：页数,默认 1 ")
+    private Integer pageNum;
+    @ExcelIgnore
+    @ApiModelProperty(value ="分页查询：条数，默认 30")
+    private Integer pageSize;
+
+    public Integer getPageNum() {
+        if(pageNum == null){
+            return 1;
+        }
+        return pageNum;
+    }
+
+    public Integer getPageSize() {
+        if(pageSize == null){
+            return 30;
+        }
+        return pageSize;
+    }
 }

user_center/src/main/java/com/huaxu/dto/OperateLogDto.java

@@ -35,4 +35,26 @@ public class OperateLogDto extends OperateLogEntity {
     @ApiModelProperty(value = "查询条件（终止时间）yyyy-MM-dd" )
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date endTime;
+
+
+    @ExcelIgnore
+    @ApiModelProperty(value ="分页查询：页数,默认 1 ")
+    private Integer pageNum;
+    @ExcelIgnore
+    @ApiModelProperty(value ="分页查询：条数，默认 30")
+    private Integer pageSize;
+
+    public Integer getPageNum() {
+        if(pageNum == null){
+            return 1;
+        }
+        return pageNum;
+    }
+
+    public Integer getPageSize() {
+        if(pageSize == null){
+            return 30;
+        }
+        return pageSize;
+    }
 }