github
/
jeecg-boot
mirror of https://github.com/jeecgboot/jeecg-boot
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #5563 from EightMonth/spring3 

Spring Boot3 & JDK 17
pull/5698/head
JEECG 2023-11-13 09:49:04 +08:00 committed by GitHub
parent a8dde73a8c 157feeb925
commit 23ace2712a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
219 changed files with 1748 additions and 1608 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
jeecg-boot-base-core/pom.xml
View File

@ -9,6 +9,10 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>jeecg-boot-base-core</artifactId> <artifactId>jeecg-boot-base-core</artifactId>
<properties>
<spring-boot.version>3.1.5</spring-boot.version>
</properties>
<repositories> <repositories>
<repository> <repository>
<id>aliyun</id> <id>aliyun</id>
@ -105,14 +109,14 @@
<!-- druid --> <!-- druid -->
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId> <artifactId>druid-spring-boot-3-starter</artifactId>
<version>${druid.version}</version> <version>${druid.version}</version>
</dependency> </dependency>
<!-- 动态数据源 --> <!-- 动态数据源 -->
<dependency> <dependency>
<groupId>com.baomidou</groupId> <groupId>com.baomidou</groupId>
<artifactId>dynamic-datasource-spring-boot-starter</artifactId> <artifactId>dynamic-datasource-spring-boot3-starter</artifactId>
<version>${dynamic-datasource-spring-boot-starter.version}</version> <version>${dynamic-datasource-spring-boot-starter.version}</version>
</dependency> </dependency>
@ -164,6 +168,12 @@
<groupId>org.apache.shiro</groupId> <groupId>org.apache.shiro</groupId>
<artifactId>shiro-spring-boot-starter</artifactId> <artifactId>shiro-spring-boot-starter</artifactId>
<version>${shiro.version}</version> <version>${shiro.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-spring</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<!-- shiro-redis --> <!-- shiro-redis -->
<dependency> <dependency>
@ -181,11 +191,54 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<!-- shiro 无法使用 spring boot 3.X 自带的jedis，降版本处理 -->
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
<version>2.9.0</version>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-spring</artifactId>
<classifier>jakarta</classifier>
<version>${shiro.version}</version>
<!-- 排除仍使用了javax.servlet的依赖 -->
<exclusions>
<exclusion>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-web</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- 引入适配jakarta的依赖包 -->
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-core</artifactId>
<classifier>jakarta</classifier>
<version>${shiro.version}</version>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-web</artifactId>
<classifier>jakarta</classifier>
<version>${shiro.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- knife4j --> <!-- knife4j -->
<dependency> <dependency>
<groupId>com.github.xiaoymin</groupId> <groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-spring-boot-starter</artifactId> <artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
<version>${knife4j-spring-boot-starter.version}</version> <version>${knife4j-spring-boot-starter.version}</version>
</dependency> </dependency>
@ -242,6 +295,16 @@
<dependency> <dependency>
<groupId>com.xkcoding.justauth</groupId> <groupId>com.xkcoding.justauth</groupId>
<artifactId>justauth-spring-boot-starter</artifactId> <artifactId>justauth-spring-boot-starter</artifactId>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-autoconfigure</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.squareup.okhttp3</groupId> <groupId>com.squareup.okhttp3</groupId>

2
jeecg-boot-base-core/src/main/java/org/jeecg/common/api/dto/FileDownDTO.java
View File

@ -2,7 +2,7 @@ package org.jeecg.common.api.dto;
import lombok.Data; import lombok.Data;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import java.io.Serializable; import java.io.Serializable;
/** /**

15
jeecg-boot-base-core/src/main/java/org/jeecg/common/api/vo/Result.java
View File

@ -1,8 +1,7 @@
package org.jeecg.common.api.vo; package org.jeecg.common.api.vo;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.CommonConstant;
@ -15,7 +14,7 @@ import java.io.Serializable;
* @date 2019年1月19日 * @date 2019年1月19日
*/ */
@Data @Data
@ApiModel(value="接口返回对象", description="接口返回对象") @Schema(description="接口返回对象")
public class Result<T> implements Serializable { public class Result<T> implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@ -23,31 +22,31 @@ public class Result<T> implements Serializable {
/** /**
* 成功标志 * 成功标志
*/ */
@ApiModelProperty(value = "成功标志") @Schema(description = "成功标志")
private boolean success = true; private boolean success = true;
/** /**
* 返回处理消息 * 返回处理消息
*/ */
@ApiModelProperty(value = "返回处理消息") @Schema(description = "返回处理消息")
private String message = ""; private String message = "";
/** /**
* 返回代码 * 返回代码
*/ */
@ApiModelProperty(value = "返回代码") @Schema(description = "返回代码")
private Integer code = 0; private Integer code = 0;
/** /**
* 返回数据对象 data * 返回数据对象 data
*/ */
@ApiModelProperty(value = "返回数据对象") @Schema(description = "返回数据对象")
private T result; private T result;
/** /**
* 时间戳 * 时间戳
*/ */
@ApiModelProperty(value = "时间戳") @Schema(description = "时间戳")
private long timestamp = System.currentTimeMillis(); private long timestamp = System.currentTimeMillis();
public Result() { public Result() {

8
jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/AutoLogAspect.java
View File

@ -24,10 +24,10 @@ import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.validation.BindingResult; import org.springframework.validation.BindingResult;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource; import jakarta.annotation.Resource;
import javax.servlet.ServletRequest; import jakarta.servlet.ServletRequest;
import javax.servlet.ServletResponse; import jakarta.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.Date; import java.util.Date;

2
jeecg-boot-base-core/src/main/java/org/jeecg/common/aspect/PermissionDataAspect.java
View File

@ -21,7 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.List; import java.util.List;

6
jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java
View File

@ -23,9 +23,9 @@ import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import javax.annotation.Resource; import jakarta.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.util.*; import java.util.*;

12
jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/entity/JeecgEntity.java
View File

@ -9,10 +9,10 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import io.swagger.v3.oas.annotations.media.Schema;
/** /**
* @Description: Entity基类 * @Description: Entity基类
@ -30,20 +30,20 @@ public class JeecgEntity implements Serializable {
* ID * ID
*/ */
@TableId(type = IdType.ASSIGN_ID) @TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "ID") @Schema(description = "ID")
private java.lang.String id; private java.lang.String id;
/** /**
* 创建人 * 创建人
*/ */
@ApiModelProperty(value = "创建人") @Schema(description = "创建人")
@Excel(name = "创建人", width = 15) @Excel(name = "创建人", width = 15)
private java.lang.String createBy; private java.lang.String createBy;
/** /**
* 创建时间 * 创建时间
*/ */
@ApiModelProperty(value = "创建时间") @Schema(description = "创建时间")
@Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ -52,14 +52,14 @@ public class JeecgEntity implements Serializable {
/** /**
* 更新人 * 更新人
*/ */
@ApiModelProperty(value = "更新人") @Schema(description = "更新人")
@Excel(name = "更新人", width = 15) @Excel(name = "更新人", width = 15)
private java.lang.String updateBy; private java.lang.String updateBy;
/** /**
* 更新时间 * 更新时间
*/ */
@ApiModelProperty(value = "更新时间") @Schema(description = "更新时间")
@Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")

2
jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JeecgDataAutorUtils.java
View File

@ -5,7 +5,7 @@ import org.jeecg.common.system.vo.SysUserCacheInfo;
import org.jeecg.common.util.SpringContextUtils; import org.jeecg.common.util.SpringContextUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

8
jeecg-boot-base-core/src/main/java/org/jeecg/common/system/util/JwtUtil.java
View File

@ -11,10 +11,10 @@ import com.google.common.base.Joiner;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import java.util.Date; import java.util.Date;
import javax.servlet.ServletResponse; import jakarta.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import jakarta.servlet.http.HttpSession;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;

2
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/BrowserUtils.java
View File

@ -5,7 +5,7 @@ import java.util.Map;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
/** /**
* *

2
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/CommonUtils.java
View File

@ -19,7 +19,7 @@ import org.springframework.jdbc.datasource.DriverManagerDataSource;
import org.springframework.util.FileCopyUtils; import org.springframework.util.FileCopyUtils;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import javax.sql.DataSource; import javax.sql.DataSource;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.File; import java.io.File;

2
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/IpUtils.java
View File

@ -1,6 +1,6 @@
package org.jeecg.common.util; package org.jeecg.common.util;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.CommonConstant;

4
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/SpringContextUtils.java
View File

@ -1,7 +1,7 @@
package org.jeecg.common.util; package org.jeecg.common.util;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.constant.ServiceNameConstants; import org.jeecg.common.constant.ServiceNameConstants;

2
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/TokenUtils.java
View File

@ -11,7 +11,7 @@ import org.jeecg.common.exception.JeecgBoot401Exception;
import org.jeecg.common.system.util.JwtUtil; import org.jeecg.common.system.util.JwtUtil;
import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.system.vo.LoginUser;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
/** /**
* @Author scott * @Author scott

2
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/oConvertUtils.java
View File

@ -7,7 +7,7 @@ import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.constant.SymbolConstant; import org.jeecg.common.constant.SymbolConstant;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;

2
jeecg-boot-base-core/src/main/java/org/jeecg/config/AutoPoiDictConfig.java
View File

@ -3,7 +3,7 @@ package org.jeecg.config;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.annotation.Resource; import jakarta.annotation.Resource;
import org.jeecg.common.api.CommonAPI; import org.jeecg.common.api.CommonAPI;
import org.jeecg.common.system.vo.DictModel; import org.jeecg.common.system.vo.DictModel;

6
jeecg-boot-base-core/src/main/java/org/jeecg/config/DruidConfig.java
View File

@ -2,7 +2,9 @@ package org.jeecg.config;
import java.io.IOException; import java.io.IOException;
import javax.servlet.*; import com.alibaba.druid.spring.boot3.autoconfigure.DruidDataSourceAutoConfigure;
import com.alibaba.druid.spring.boot3.autoconfigure.properties.DruidStatProperties;
import jakarta.servlet.*;
import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@ -11,8 +13,6 @@ import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure;
import com.alibaba.druid.spring.boot.autoconfigure.properties.DruidStatProperties;
import com.alibaba.druid.util.Utils; import com.alibaba.druid.util.Utils;
/** /**

366
jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java
View File

@ -1,183 +1,183 @@
package org.jeecg.config; //package org.jeecg.config;
//
// 已使用swagger3config平替
import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j; //import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
import io.swagger.annotations.ApiOperation; //import io.swagger.annotations.ApiOperation;
import org.jeecg.common.constant.CommonConstant; //import org.jeecg.common.constant.CommonConstant;
import org.springframework.beans.BeansException; //import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.BeanPostProcessor; //import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.context.annotation.Bean; //import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; //import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import; //import org.springframework.context.annotation.Import;
import org.springframework.util.ReflectionUtils; //import org.springframework.util.ReflectionUtils;
import org.springframework.web.bind.annotation.RestController; //import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; //import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; //import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping; //import org.springframework.web.servlet.mvc.method.RequestMappingInfoHandlerMapping;
import springfox.bean.validators.configuration.BeanValidatorPluginsConfiguration; //import springfox.bean.validators.configuration.BeanValidatorPluginsConfiguration;
import springfox.documentation.builders.ApiInfoBuilder; //import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.ParameterBuilder; //import springfox.documentation.builders.ParameterBuilder;
import springfox.documentation.builders.PathSelectors; //import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors; //import springfox.documentation.builders.RequestHandlerSelectors;
import springfox.documentation.oas.annotations.EnableOpenApi; //import springfox.documentation.oas.annotations.EnableOpenApi;
import springfox.documentation.schema.ModelRef; //import springfox.documentation.schema.ModelRef;
import springfox.documentation.service.*; //import springfox.documentation.service.*;
import springfox.documentation.spi.DocumentationType; //import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spi.service.contexts.SecurityContext; //import springfox.documentation.spi.service.contexts.SecurityContext;
import springfox.documentation.spring.web.plugins.Docket; //import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.spring.web.plugins.WebFluxRequestHandlerProvider; //import springfox.documentation.spring.web.plugins.WebFluxRequestHandlerProvider;
import springfox.documentation.spring.web.plugins.WebMvcRequestHandlerProvider; //import springfox.documentation.spring.web.plugins.WebMvcRequestHandlerProvider;
import springfox.documentation.swagger2.annotations.EnableSwagger2; //import springfox.documentation.swagger2.annotations.EnableSwagger2;
//
import java.lang.reflect.Field; //import java.lang.reflect.Field;
import java.util.ArrayList; //import java.util.ArrayList;
import java.util.Collections; //import java.util.Collections;
import java.util.List; //import java.util.List;
import java.util.stream.Collectors; //import java.util.stream.Collectors;
//
/** ///**
* @Author scott // * @Author scott
*/ // */
@Configuration //@Configuration
@EnableSwagger2 //开启 Swagger2 //@EnableSwagger2 //开启 Swagger2
@EnableKnife4j //开启 knife4j，可以不写 //@EnableKnife4j //开启 knife4j，可以不写
@Import(BeanValidatorPluginsConfiguration.class) //@Import(BeanValidatorPluginsConfiguration.class)
public class Swagger2Config implements WebMvcConfigurer { //public class Swagger2Config implements WebMvcConfigurer {
//
/** // /**
* // *
* 显示swagger-ui.html文档展示页，还必须注入swagger资源： // * 显示swagger-ui.html文档展示页，还必须注入swagger资源：
* // *
* @param registry // * @param registry
*/ // */
@Override // @Override
public void addResourceHandlers(ResourceHandlerRegistry registry) { // public void addResourceHandlers(ResourceHandlerRegistry registry) {
registry.addResourceHandler("swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/"); // registry.addResourceHandler("swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/");
registry.addResourceHandler("doc.html").addResourceLocations("classpath:/META-INF/resources/"); // registry.addResourceHandler("doc.html").addResourceLocations("classpath:/META-INF/resources/");
registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/"); // registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
} // }
//
/** // /**
* swagger2的配置文件，这里可以配置swagger2的一些基本的内容，比如扫描的包等等 // * swagger2的配置文件，这里可以配置swagger2的一些基本的内容，比如扫描的包等等
* // *
* @return Docket // * @return Docket
*/ // */
@Bean(value = "defaultApi2") // @Bean(value = "defaultApi2")
public Docket defaultApi2() { // public Docket defaultApi2() {
return new Docket(DocumentationType.SWAGGER_2) // return new Docket(DocumentationType.SWAGGER_2)
.apiInfo(apiInfo()) // .apiInfo(apiInfo())
.select() // .select()
//此包路径下的类，才生成接口文档 // //此包路径下的类，才生成接口文档
.apis(RequestHandlerSelectors.basePackage("org.jeecg")) // .apis(RequestHandlerSelectors.basePackage("org.jeecg"))
//加了ApiOperation注解的类，才生成接口文档 // //加了ApiOperation注解的类，才生成接口文档
.apis(RequestHandlerSelectors.withClassAnnotation(RestController.class)) // .apis(RequestHandlerSelectors.withClassAnnotation(RestController.class))
.apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class)) // .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
.paths(PathSelectors.any()) // .paths(PathSelectors.any())
.build() // .build()
.securitySchemes(Collections.singletonList(securityScheme())) // .securitySchemes(Collections.singletonList(securityScheme()))
.securityContexts(securityContexts()) // .securityContexts(securityContexts())
.globalOperationParameters(setHeaderToken()); // .globalOperationParameters(setHeaderToken());
} // }
//
/*** // /***
* oauth2配置 // * oauth2配置
* 需要增加swagger授权回调地址 // * 需要增加swagger授权回调地址
* http://localhost:8888/webjars/springfox-swagger-ui/o2c.html // * http://localhost:8888/webjars/springfox-swagger-ui/o2c.html
* @return // * @return
*/ // */
@Bean // @Bean
SecurityScheme securityScheme() { // SecurityScheme securityScheme() {
return new ApiKey(CommonConstant.X_ACCESS_TOKEN, CommonConstant.X_ACCESS_TOKEN, "header"); // return new ApiKey(CommonConstant.X_ACCESS_TOKEN, CommonConstant.X_ACCESS_TOKEN, "header");
} // }
/** // /**
* JWT token // * JWT token
* @return // * @return
*/ // */
private List<Parameter> setHeaderToken() { // private List<Parameter> setHeaderToken() {
ParameterBuilder tokenPar = new ParameterBuilder(); // ParameterBuilder tokenPar = new ParameterBuilder();
List<Parameter> pars = new ArrayList<>(); // List<Parameter> pars = new ArrayList<>();
tokenPar.name(CommonConstant.X_ACCESS_TOKEN).description("token").modelRef(new ModelRef("string")).parameterType("header").required(false).build(); // tokenPar.name(CommonConstant.X_ACCESS_TOKEN).description("token").modelRef(new ModelRef("string")).parameterType("header").required(false).build();
pars.add(tokenPar.build()); // pars.add(tokenPar.build());
return pars; // return pars;
} // }
//
/** // /**
* api文档的详细信息函数,注意这里的注解引用的是哪个 // * api文档的详细信息函数,注意这里的注解引用的是哪个
* // *
* @return // * @return
*/ // */
private ApiInfo apiInfo() { // private ApiInfo apiInfo() {
return new ApiInfoBuilder() // return new ApiInfoBuilder()
// //大标题 // // //大标题
.title("JeecgBoot 后台服务API接口文档") // .title("JeecgBoot 后台服务API接口文档")
// 版本号 // // 版本号
.version("1.0") // .version("1.0")
// .termsOfServiceUrl("NO terms of service") //// .termsOfServiceUrl("NO terms of service")
// 描述 // // 描述
.description("后台API接口") // .description("后台API接口")
// 作者 // // 作者
.contact(new Contact("北京国炬信息技术有限公司","www.jeccg.com","jeecgos@163.com")) // .contact(new Contact("北京国炬信息技术有限公司","www.jeccg.com","jeecgos@163.com"))
.license("The Apache License, Version 2.0") // .license("The Apache License, Version 2.0")
.licenseUrl("http://www.apache.org/licenses/LICENSE-2.0.html") // .licenseUrl("http://www.apache.org/licenses/LICENSE-2.0.html")
.build(); // .build();
} // }
//
/** // /**
* 新增 securityContexts 保持登录状态 // * 新增 securityContexts 保持登录状态
*/ // */
private List<SecurityContext> securityContexts() { // private List<SecurityContext> securityContexts() {
return new ArrayList( // return new ArrayList(
Collections.singleton(SecurityContext.builder() // Collections.singleton(SecurityContext.builder()
.securityReferences(defaultAuth()) // .securityReferences(defaultAuth())
.forPaths(PathSelectors.regex("^(?!auth).*$")) // .forPaths(PathSelectors.regex("^(?!auth).*$"))
.build()) // .build())
); // );
} // }
//
private List<SecurityReference> defaultAuth() { // private List<SecurityReference> defaultAuth() {
AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything"); // AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
AuthorizationScope[] authorizationScopes = new AuthorizationScope[1]; // AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
authorizationScopes[0] = authorizationScope; // authorizationScopes[0] = authorizationScope;
return new ArrayList( // return new ArrayList(
Collections.singleton(new SecurityReference(CommonConstant.X_ACCESS_TOKEN, authorizationScopes))); // Collections.singleton(new SecurityReference(CommonConstant.X_ACCESS_TOKEN, authorizationScopes)));
} // }
//
/** // /**
* 解决springboot2.6 和springfox不兼容问题 // * 解决springboot2.6 和springfox不兼容问题
* @return // * @return
*/ // */
@Bean // @Bean
public static BeanPostProcessor springfoxHandlerProviderBeanPostProcessor() { // public static BeanPostProcessor springfoxHandlerProviderBeanPostProcessor() {
return new BeanPostProcessor() { // return new BeanPostProcessor() {
//
@Override // @Override
public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException { // public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
if (bean instanceof WebMvcRequestHandlerProvider || bean instanceof WebFluxRequestHandlerProvider) { // if (bean instanceof WebMvcRequestHandlerProvider || bean instanceof WebFluxRequestHandlerProvider) {
customizeSpringfoxHandlerMappings(getHandlerMappings(bean)); // customizeSpringfoxHandlerMappings(getHandlerMappings(bean));
} // }
return bean; // return bean;
} // }
//
private <T extends RequestMappingInfoHandlerMapping> void customizeSpringfoxHandlerMappings(List<T> mappings) { // private <T extends RequestMappingInfoHandlerMapping> void customizeSpringfoxHandlerMappings(List<T> mappings) {
List<T> copy = mappings.stream() // List<T> copy = mappings.stream()
.filter(mapping -> mapping.getPatternParser() == null) // .filter(mapping -> mapping.getPatternParser() == null)
.collect(Collectors.toList()); // .collect(Collectors.toList());
mappings.clear(); // mappings.clear();
mappings.addAll(copy); // mappings.addAll(copy);
} // }
//
@SuppressWarnings("unchecked") // @SuppressWarnings("unchecked")
private List<RequestMappingInfoHandlerMapping> getHandlerMappings(Object bean) { // private List<RequestMappingInfoHandlerMapping> getHandlerMappings(Object bean) {
try { // try {
Field field = ReflectionUtils.findField(bean.getClass(), "handlerMappings"); // Field field = ReflectionUtils.findField(bean.getClass(), "handlerMappings");
field.setAccessible(true); // field.setAccessible(true);
return (List<RequestMappingInfoHandlerMapping>) field.get(bean); // return (List<RequestMappingInfoHandlerMapping>) field.get(bean);
} catch (IllegalArgumentException | IllegalAccessException e) { // } catch (IllegalArgumentException | IllegalAccessException e) {
throw new IllegalStateException(e); // throw new IllegalStateException(e);
} // }
} // }
}; // };
} // }
//
//
} //}

58
jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger3Config.java Normal file
View File

@ -0,0 +1,58 @@
package org.jeecg.config;
import io.swagger.v3.oas.models.Components;
import io.swagger.v3.oas.models.OpenAPI;
import io.swagger.v3.oas.models.Paths;
import io.swagger.v3.oas.models.info.Contact;
import io.swagger.v3.oas.models.info.Info;
import io.swagger.v3.oas.models.info.License;
import io.swagger.v3.oas.models.security.SecurityRequirement;
import io.swagger.v3.oas.models.security.SecurityScheme;
import org.jeecg.common.constant.CommonConstant;
import org.springdoc.core.models.GroupedOpenApi;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
/**
* @author kezhijie@wuhandsj.com
* @date 2023/11/2 14:19
*/
@Configuration
public class Swagger3Config implements WebMvcConfigurer {
/**
*
* 显示swagger-ui.html文档展示页，还必须注入swagger资源：
*
* @param registry
*/
@Override
public void addResourceHandlers(ResourceHandlerRegistry registry) {
registry.addResourceHandler("swagger-ui.html").addResourceLocations("classpath:/META-INF/resources/");
registry.addResourceHandler("doc.html").addResourceLocations("classpath:/META-INF/resources/");
registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
}
@Bean
public GroupedOpenApi swaggerOpenApi() {
return GroupedOpenApi.builder()
.group("default")
.packagesToScan("org.jeecg")
.build();
}
@Bean
public OpenAPI customOpenAPI() {
return new OpenAPI()
.info(new Info()
.title("JeecgBoot 后台服务API接口文档")
.version("1.0")
.contact(new Contact().name("北京国炬信息技术有限公司").url("www.jeccg.com").email("jeecgos@163.com"))
.description( "后台API接口")
.termsOfService("NO terms of service")
.license(new License().name("Apache 2.0").url("http://www.apache.org/licenses/LICENSE-2.0.html"))
);
}
}

13
jeecg-boot-base-core/src/main/java/org/jeecg/config/WebMvcConfiguration.java
View File

@ -10,12 +10,15 @@ import com.fasterxml.jackson.datatype.jsr310.deser.LocalTimeDeserializer;
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer; import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
import io.micrometer.core.instrument.MeterRegistry;
import io.micrometer.prometheus.PrometheusMeterRegistry; import io.micrometer.prometheus.PrometheusMeterRegistry;
import jakarta.annotation.Resource;
import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.boot.actuate.trace.http.InMemoryHttpTraceRepository; import org.springframework.boot.actuate.autoconfigure.metrics.MeterRegistryCustomizer;
import org.springframework.boot.actuate.web.exchanges.InMemoryHttpExchangeRepository;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
@ -30,7 +33,6 @@ import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry
import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import javax.annotation.Resource;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@ -133,8 +135,11 @@ public class WebMvcConfiguration implements WebMvcConfigurer {
* https://blog.csdn.net/u013810234/article/details/110097201 * https://blog.csdn.net/u013810234/article/details/110097201
*/ */
@Bean @Bean
public InMemoryHttpTraceRepository getInMemoryHttpTrace(){ public InMemoryHttpExchangeRepository getInMemoryHttpTrace(){
return new InMemoryHttpTraceRepository(); InMemoryHttpExchangeRepository repository = new InMemoryHttpExchangeRepository();
// 默认保存1000条http请求记录
repository.setCapacity(1000);
return repository;
} }

4
jeecg-boot-base-core/src/main/java/org/jeecg/config/filter/RequestBodyReserveFilter.java
View File

@ -3,8 +3,8 @@ package org.jeecg.config.filter;
import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.CommonConstant;
import org.jeecg.config.sign.util.BodyReaderHttpServletRequestWrapper; import org.jeecg.config.sign.util.BodyReaderHttpServletRequestWrapper;
import javax.servlet.*; import jakarta.servlet.*;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import java.io.IOException; import java.io.IOException;
/** /**

6
jeecg-boot-base-core/src/main/java/org/jeecg/config/filter/WebsocketFilter.java
View File

@ -7,9 +7,9 @@ import org.jeecg.common.util.SpringContextUtils;
import org.jeecg.common.util.TokenUtils; import org.jeecg.common.util.TokenUtils;
import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.util.oConvertUtils;
import javax.servlet.*; import jakarta.servlet.*;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
/** /**

6
jeecg-boot-base-core/src/main/java/org/jeecg/config/firewall/interceptor/LowCodeModeInterceptor.java
View File

@ -17,9 +17,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.AntPathMatcher; import org.springframework.util.AntPathMatcher;
import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.HandlerInterceptor;
import javax.annotation.Resource; import jakarta.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.Set; import java.util.Set;

2
jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/aspect/DynamicTableAspect.java
View File

@ -11,7 +11,7 @@ import org.jeecg.common.util.SpringContextUtils;
import org.jeecg.config.mybatis.ThreadLocalDataHelper; import org.jeecg.config.mybatis.ThreadLocalDataHelper;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import java.lang.reflect.Method; import java.lang.reflect.Method;
/** /**

4
jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/interceptor/DynamicDatasourceInterceptor.java
View File

@ -6,8 +6,8 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.HandlerInterceptor;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
/** /**
* 动态数据源切换拦截器 * 动态数据源切换拦截器

6
jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
View File

@ -29,8 +29,8 @@ import org.springframework.util.StringUtils;
import redis.clients.jedis.HostAndPort; import redis.clients.jedis.HostAndPort;
import redis.clients.jedis.JedisCluster; import redis.clients.jedis.JedisCluster;
import javax.annotation.Resource; import jakarta.annotation.Resource;
import javax.servlet.Filter; import jakarta.servlet.Filter;
import java.util.*; import java.util.*;
/** /**
@ -118,7 +118,7 @@ public class ShiroConfig {
filterChainDefinitionMap.put("/swagger-ui.html", "anon"); filterChainDefinitionMap.put("/swagger-ui.html", "anon");
filterChainDefinitionMap.put("/swagger**/**", "anon"); filterChainDefinitionMap.put("/swagger**/**", "anon");
filterChainDefinitionMap.put("/webjars/**", "anon"); filterChainDefinitionMap.put("/webjars/**", "anon");
filterChainDefinitionMap.put("/v2/**", "anon"); filterChainDefinitionMap.put("/v3/**", "anon");
filterChainDefinitionMap.put("/sys/annountCement/show/**", "anon"); filterChainDefinitionMap.put("/sys/annountCement/show/**", "anon");

4
jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroRealm.java
View File

@ -22,8 +22,8 @@ import org.jeecg.common.util.oConvertUtils;
import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.annotation.Resource; import jakarta.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import java.util.Set; import java.util.Set;
/** /**

2
jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/CustomShiroFilterFactoryBean.java
View File

@ -12,7 +12,7 @@ import org.apache.shiro.web.servlet.AbstractShiroFilter;
import org.apache.shiro.mgt.SecurityManager; import org.apache.shiro.mgt.SecurityManager;
import org.springframework.beans.factory.BeanInitializationException; import org.springframework.beans.factory.BeanInitializationException;
import javax.servlet.Filter; import jakarta.servlet.Filter;
import java.util.Map; import java.util.Map;
/** /**

8
jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/JwtFilter.java
View File

@ -12,10 +12,10 @@ import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import javax.servlet.ServletRequest; import jakarta.servlet.ServletRequest;
import javax.servlet.ServletResponse; import jakarta.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
/** /**
* @Description: 鉴权登录拦截器 * @Description: 鉴权登录拦截器

8
jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/filters/ResourceCheckFilter.java
View File

@ -1,9 +1,9 @@
package org.jeecg.config.shiro.filters; package org.jeecg.config.shiro.filters;
import javax.servlet.ServletRequest; import jakarta.servlet.ServletRequest;
import javax.servlet.ServletResponse; import jakarta.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import org.apache.shiro.subject.Subject; import org.apache.shiro.subject.Subject;
import org.apache.shiro.web.filter.AccessControlFilter; import org.apache.shiro.web.filter.AccessControlFilter;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

2
jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/interceptor/SignAuthConfiguration.java
View File

@ -10,7 +10,7 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import javax.annotation.Resource; import jakarta.annotation.Resource;
/** /**
* 签名 拦截器配置 * 签名 拦截器配置

4
jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/interceptor/SignAuthInterceptor.java
View File

@ -4,8 +4,8 @@ package org.jeecg.config.sign.interceptor;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.SortedMap; import java.util.SortedMap;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.CommonConstant;

10
jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/util/BodyReaderHttpServletRequestWrapper.java
View File

@ -1,10 +1,10 @@
package org.jeecg.config.sign.util; package org.jeecg.config.sign.util;
import javax.servlet.ReadListener; import jakarta.servlet.ReadListener;
import javax.servlet.ServletInputStream; import jakarta.servlet.ServletInputStream;
import javax.servlet.ServletRequest; import jakarta.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper; import jakarta.servlet.http.HttpServletRequestWrapper;
import java.io.*; import java.io.*;
import java.nio.charset.Charset; import java.nio.charset.Charset;

2
jeecg-boot-base-core/src/main/java/org/jeecg/config/sign/util/HttpUtils.java
View File

@ -10,7 +10,7 @@ import java.util.Map;
import java.util.SortedMap; import java.util.SortedMap;
import java.util.TreeMap; import java.util.TreeMap;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.constant.SymbolConstant; import org.jeecg.common.constant.SymbolConstant;

4
jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/service/impl/BaseCommonServiceImpl.java
View File

@ -12,8 +12,8 @@ import org.jeecg.common.util.SpringContextUtils;
import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.util.oConvertUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import jakarta.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import java.util.*; import java.util.*;
/** /**

2
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/cloud/controller/JcloudDemoProviderController.java
View File

@ -8,7 +8,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import jakarta.annotation.Resource;
/** /**
* 服务端提供方——feign接口 * 服务端提供方——feign接口

4
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/MockController.java
View File

@ -6,8 +6,8 @@ import org.apache.commons.io.IOUtils;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import javax.swing.filechooser.FileSystemView; import javax.swing.filechooser.FileSystemView;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;

2
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/controller/VxeMockController.java
View File

@ -18,7 +18,7 @@ import org.jeecg.modules.demo.mock.vxe.entity.MockEntity;
import org.jeecg.modules.demo.mock.vxe.websocket.VxeSocket; import org.jeecg.modules.demo.mock.vxe.websocket.VxeSocket;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.net.URLDecoder; import java.net.URLDecoder;

12
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/mock/vxe/websocket/VxeSocket.java
View File

@ -6,12 +6,12 @@ import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.constant.VxeSocketConst; import org.jeecg.common.constant.VxeSocketConst;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.websocket.OnClose; import jakarta.websocket.OnClose;
import javax.websocket.OnMessage; import jakarta.websocket.OnMessage;
import javax.websocket.OnOpen; import jakarta.websocket.OnOpen;
import javax.websocket.Session; import jakarta.websocket.Session;
import javax.websocket.server.PathParam; import jakarta.websocket.server.PathParam;
import javax.websocket.server.ServerEndpoint; import jakarta.websocket.server.ServerEndpoint;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;

29
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDemoController.java
View File

@ -4,13 +4,12 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.annotations.ApiParam; import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
import org.apache.shiro.mgt.DefaultSecurityManager; import org.apache.shiro.mgt.DefaultSecurityManager;
@ -30,8 +29,6 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Date; import java.util.Date;
@ -44,7 +41,7 @@ import java.util.List;
* @Version:V2.0 * @Version:V2.0
*/ */
@Slf4j @Slf4j
@Api(tags = "单表DEMO") @Tag(name = "单表DEMO")
@RestController @RestController
@RequestMapping("/test/jeecgDemo") @RequestMapping("/test/jeecgDemo")
public class JeecgDemoController extends JeecgController<JeecgDemo, IJeecgDemoService> { public class JeecgDemoController extends JeecgController<JeecgDemo, IJeecgDemoService> {
@ -63,7 +60,7 @@ public class JeecgDemoController extends JeecgController<JeecgDemo, IJeecgDemoSe
* @param req * @param req
* @return * @return
*/ */
@ApiOperation(value = "获取Demo数据列表", notes = "获取所有Demo数据列表") @Operation(summary = "获取所有Demo数据列表")
@GetMapping(value = "/list") @GetMapping(value = "/list")
@PermissionData(pageComponent = "jeecg/JeecgDemoList") @PermissionData(pageComponent = "jeecg/JeecgDemoList")
public Result<?> list(JeecgDemo jeecgDemo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, public Result<?> list(JeecgDemo jeecgDemo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
@ -88,7 +85,7 @@ public class JeecgDemoController extends JeecgController<JeecgDemo, IJeecgDemoSe
*/ */
@PostMapping(value = "/add") @PostMapping(value = "/add")
@AutoLog(value = "添加测试DEMO") @AutoLog(value = "添加测试DEMO")
@ApiOperation(value = "添加DEMO", notes = "添加DEMO") @Operation(summary = "添加DEMO")
public Result<?> add(@RequestBody JeecgDemo jeecgDemo) { public Result<?> add(@RequestBody JeecgDemo jeecgDemo) {
jeecgDemoService.save(jeecgDemo); jeecgDemoService.save(jeecgDemo);
return Result.OK("添加成功！"); return Result.OK("添加成功！");
@ -101,7 +98,7 @@ public class JeecgDemoController extends JeecgController<JeecgDemo, IJeecgDemoSe
* @return * @return
*/ */
@AutoLog(value = "编辑DEMO", operateType = CommonConstant.OPERATE_TYPE_3) @AutoLog(value = "编辑DEMO", operateType = CommonConstant.OPERATE_TYPE_3)
@ApiOperation(value = "编辑DEMO", notes = "编辑DEMO") @Operation(summary = "编辑DEMO")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<?> edit(@RequestBody JeecgDemo jeecgDemo) { public Result<?> edit(@RequestBody JeecgDemo jeecgDemo) {
jeecgDemoService.updateById(jeecgDemo); jeecgDemoService.updateById(jeecgDemo);
@ -116,7 +113,7 @@ public class JeecgDemoController extends JeecgController<JeecgDemo, IJeecgDemoSe
*/ */
@AutoLog(value = "删除测试DEMO") @AutoLog(value = "删除测试DEMO")
@DeleteMapping(value = "/delete") @DeleteMapping(value = "/delete")
@ApiOperation(value = "通过ID删除DEMO", notes = "通过ID删除DEMO") @Operation(summary = "通过ID删除DEMO")
public Result<?> delete(@RequestParam(name = "id", required = true) String id) { public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
jeecgDemoService.removeById(id); jeecgDemoService.removeById(id);
return Result.OK("删除成功!"); return Result.OK("删除成功!");
@ -129,7 +126,7 @@ public class JeecgDemoController extends JeecgController<JeecgDemo, IJeecgDemoSe
* @return * @return
*/ */
@DeleteMapping(value = "/deleteBatch") @DeleteMapping(value = "/deleteBatch")
@ApiOperation(value = "批量删除DEMO", notes = "批量删除DEMO") @Operation(summary = "批量删除DEMO")
public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) { public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.jeecgDemoService.removeByIds(Arrays.asList(ids.split(","))); this.jeecgDemoService.removeByIds(Arrays.asList(ids.split(",")));
return Result.OK("批量删除成功！"); return Result.OK("批量删除成功！");
@ -142,8 +139,8 @@ public class JeecgDemoController extends JeecgController<JeecgDemo, IJeecgDemoSe
* @return * @return
*/ */
@GetMapping(value = "/queryById") @GetMapping(value = "/queryById")
@ApiOperation(value = "通过ID查询DEMO", notes = "通过ID查询DEMO") @Operation(summary = "通过ID查询DEMO")
public Result<?> queryById(@ApiParam(name = "id", value = "示例id", required = true) @RequestParam(name = "id", required = true) String id) { public Result<?> queryById(/*@ApiParam(name = "id", value = "示例id", required = true)*/ @RequestParam(name = "id", required = true) String id) {
JeecgDemo jeecgDemo = jeecgDemoService.getById(id); JeecgDemo jeecgDemo = jeecgDemoService.getById(id);
return Result.OK(jeecgDemo); return Result.OK(jeecgDemo);
} }
@ -475,7 +472,7 @@ public class JeecgDemoController extends JeecgController<JeecgDemo, IJeecgDemoSe
* 测试Mono对象 * 测试Mono对象
* @return * @return
*/ */
@ApiOperation("Mono测试") @Operation(summary = "Mono测试")
@GetMapping(value ="/test") @GetMapping(value ="/test")
public Mono<String> test() { public Mono<String> test() {
//解决shiro报错No SecurityManager accessible to the calling code, either bound to the org.apache.shiro //解决shiro报错No SecurityManager accessible to the calling code, either bound to the org.apache.shiro

14
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgDynamicDataController.java
View File

@ -1,8 +1,7 @@
package org.jeecg.modules.demo.test.controller; package org.jeecg.modules.demo.test.controller;
import io.lettuce.core.dynamic.annotation.Param; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.aspect.annotation.AutoLog;
@ -11,7 +10,10 @@ import org.jeecg.modules.demo.test.entity.JeecgDemo;
import org.jeecg.modules.demo.test.service.IJeecgDemoService; import org.jeecg.modules.demo.test.service.IJeecgDemoService;
import org.jeecg.modules.demo.test.service.IJeecgDynamicDataService; import org.jeecg.modules.demo.test.service.IJeecgDynamicDataService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List; import java.util.List;
@ -21,7 +23,7 @@ import java.util.List;
* @Date:2020-04-21 * @Date:2020-04-21
*/ */
@Slf4j @Slf4j
@Api(tags = "动态数据源测试") @Tag(name = "动态数据源测试")
@RestController @RestController
@RequestMapping("/test/dynamic") @RequestMapping("/test/dynamic")
public class JeecgDynamicDataController extends JeecgController<JeecgDemo, IJeecgDemoService> { public class JeecgDynamicDataController extends JeecgController<JeecgDemo, IJeecgDemoService> {
@ -37,7 +39,7 @@ public class JeecgDynamicDataController extends JeecgController<JeecgDemo, IJeec
*/ */
@PostMapping(value = "/test1") @PostMapping(value = "/test1")
@AutoLog(value = "动态切换数据源") @AutoLog(value = "动态切换数据源")
@ApiOperation(value = "动态切换数据源", notes = "动态切换数据源") @Operation(summary = "动态切换数据源")
public Result<List<JeecgDemo>> selectSpelByKey(@RequestParam(required = false) String dsName) { public Result<List<JeecgDemo>> selectSpelByKey(@RequestParam(required = false) String dsName) {
List<JeecgDemo> list = jeecgDynamicDataService.selectSpelByKey(dsName); List<JeecgDemo> list = jeecgDynamicDataService.selectSpelByKey(dsName);
return Result.OK(list); return Result.OK(list);

2
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderErpMainController.java
View File

@ -17,7 +17,7 @@ import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import java.util.Arrays; import java.util.Arrays;
/** /**

4
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JeecgOrderMainController.java
View File

@ -5,8 +5,8 @@ import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;

4
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/controller/JoaDemoController.java
View File

@ -7,8 +7,8 @@ import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryGenerator;

29
jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/entity/JeecgDemo.java
View File

@ -3,6 +3,7 @@ package org.jeecg.modules.demo.test.entity;
import java.io.Serializable; import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.Version; import com.baomidou.mybatisplus.annotation.Version;
import io.swagger.v3.oas.annotations.media.Schema;
import org.jeecg.common.system.base.entity.JeecgEntity; import org.jeecg.common.system.base.entity.JeecgEntity;
import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
@ -10,8 +11,6 @@ import org.springframework.format.annotation.DateTimeFormat;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
@ -25,59 +24,59 @@ import lombok.experimental.Accessors;
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(value="测试DEMO对象", description="测试DEMO") @Schema(description="测试DEMO")
@TableName("demo") @TableName("demo")
public class JeecgDemo extends JeecgEntity implements Serializable { public class JeecgDemo extends JeecgEntity implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 姓名 */ /** 姓名 */
@Excel(name="姓名",width=25) @Excel(name="姓名",width=25)
@ApiModelProperty(value = "姓名") @Schema(description = "姓名")
private java.lang.String name; private java.lang.String name;
/** 关键词 */ /** 关键词 */
@ApiModelProperty(value = "关键词") @Schema(description = "关键词")
@Excel(name="关键词",width=15) @Excel(name="关键词",width=15)
private java.lang.String keyWord; private java.lang.String keyWord;
/** 打卡时间 */ /** 打卡时间 */
@ApiModelProperty(value = "打卡时间") @Schema(description = "打卡时间")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name="打卡时间",width=20,format="yyyy-MM-dd HH:mm:ss") @Excel(name="打卡时间",width=20,format="yyyy-MM-dd HH:mm:ss")
private java.util.Date punchTime; private java.util.Date punchTime;
/** 工资 */ /** 工资 */
@ApiModelProperty(value = "工资",example = "0") @Schema(description = "工资",example = "0")
@Excel(name="工资",width=15) @Excel(name="工资",width=15)
private java.math.BigDecimal salaryMoney; private java.math.BigDecimal salaryMoney;
/** 奖金 */ /** 奖金 */
@ApiModelProperty(value = "奖金",example = "0") @Schema(description = "奖金",example = "0")
@Excel(name="奖金",width=15) @Excel(name="奖金",width=15)
private java.lang.Double bonusMoney; private java.lang.Double bonusMoney;
/** 性别 {男:1,女:2} */ /** 性别 {男:1,女:2} */
@ApiModelProperty(value = "性别") @Schema(description = "性别")
@Excel(name = "性别", width = 15, dicCode = "sex") @Excel(name = "性别", width = 15, dicCode = "sex")
private java.lang.String sex; private java.lang.String sex;
/** 年龄 */ /** 年龄 */
@ApiModelProperty(value = "年龄",example = "0") @Schema(description = "年龄",example = "0")
@Excel(name="年龄",width=15) @Excel(name="年龄",width=15)
private java.lang.Integer age; private java.lang.Integer age;
/** 生日 */ /** 生日 */
@ApiModelProperty(value = "生日") @Schema(description = "生日")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
@Excel(name="生日",format="yyyy-MM-dd") @Excel(name="生日",format="yyyy-MM-dd")
private java.util.Date birthday; private java.util.Date birthday;
/** 邮箱 */ /** 邮箱 */
@ApiModelProperty(value = "邮箱") @Schema(description = "邮箱")
@Excel(name="邮箱",width=30) @Excel(name="邮箱",width=30)
private java.lang.String email; private java.lang.String email;
/** 个人简介 */ /** 个人简介 */
@ApiModelProperty(value = "个人简介") @Schema(description = "个人简介")
private java.lang.String content; private java.lang.String content;
/** 部门编码 */ /** 部门编码 */
@Excel(name="部门编码",width=25) @Excel(name="部门编码",width=25)
@ApiModelProperty(value = "部门编码") @Schema(description = "部门编码")
private java.lang.String sysOrgCode; private java.lang.String sysOrgCode;
@ApiModelProperty(value = "租户ID") // @Schema(description = "租户ID")
private java.lang.Integer tenantId; private java.lang.Integer tenantId;
/** 乐观锁字段 */ /** 乐观锁字段 */
@Version @Version

2
jeecg-module-demo/src/main/java/org/jeecg/modules/dlglong/controller/DlMockController.java
View File

@ -18,7 +18,7 @@ import org.jeecg.modules.demo.mock.vxe.websocket.VxeSocket;
import org.jeecg.modules.dlglong.entity.MockEntity; import org.jeecg.modules.dlglong.entity.MockEntity;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.net.URLDecoder; import java.net.URLDecoder;

12
jeecg-module-system/jeecg-system-biz/pom.xml
View File

@ -19,10 +19,10 @@
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId> <artifactId>hibernate-core</artifactId>
</dependency> </dependency>
<dependency> <!--<dependency>
<groupId>org.jeecgframework.boot</groupId> <groupId>org.jeecgframework.boot</groupId>
<artifactId>hibernate-re</artifactId> <artifactId>hibernate-re</artifactId>
</dependency> </dependency>-->
<!-- 企业微信/钉钉 api --> <!-- 企业微信/钉钉 api -->
<dependency> <dependency>
@ -30,15 +30,15 @@
<artifactId>jeewx-api</artifactId> <artifactId>jeewx-api</artifactId>
</dependency> </dependency>
<!-- 积木报表 --> <!-- 积木报表 -->
<dependency> <!--<dependency>
<groupId>org.jeecgframework.jimureport</groupId> <groupId>org.jeecgframework.jimureport</groupId>
<artifactId>jimureport-spring-boot-starter</artifactId> <artifactId>jimureport-spring-boot-starter</artifactId>
</dependency> </dependency>-->
<dependency> <!--<dependency>
<groupId>org.jeecgframework.boot</groupId> <groupId>org.jeecgframework.boot</groupId>
<artifactId>drag-free</artifactId> <artifactId>drag-free</artifactId>
<version>1.0.2</version> <version>1.0.2</version>
</dependency> </dependency>-->
<!-- 积木报表 mongo redis 支持包 <!-- 积木报表 mongo redis 支持包
<dependency> <dependency>
<groupId>org.jeecgframework.jimureport</groupId> <groupId>org.jeecgframework.jimureport</groupId>

162
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/jimureport/JimuReportTokenService.java
View File

@ -1,81 +1,81 @@
package org.jeecg.config.jimureport; //package org.jeecg.config.jimureport;
//
import lombok.extern.slf4j.Slf4j; //import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.system.util.JwtUtil; //import org.jeecg.common.system.util.JwtUtil;
import org.jeecg.common.system.vo.SysUserCacheInfo; //import org.jeecg.common.system.vo.SysUserCacheInfo;
import org.jeecg.common.util.RedisUtil; //import org.jeecg.common.util.RedisUtil;
import org.jeecg.common.util.TokenUtils; //import org.jeecg.common.util.TokenUtils;
import org.jeecg.modules.jmreport.api.JmReportTokenServiceI; //import org.jeecg.modules.jmreport.api.JmReportTokenServiceI;
import org.jeecg.modules.system.service.impl.SysBaseApiImpl; //import org.jeecg.modules.system.service.impl.SysBaseApiImpl;
import org.springframework.beans.factory.annotation.Autowired; //import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy; //import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component; //import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils; //import org.springframework.util.CollectionUtils;
//
import javax.servlet.http.HttpServletRequest; //import jakarta.servlet.http.HttpServletRequest;
import java.util.HashMap; //import java.util.HashMap;
import java.util.Map; //import java.util.Map;
import java.util.Set; //import java.util.Set;
//
/** ///**
* 自定义积木报表鉴权(如果不进行自定义，则所有请求不做权限控制) // * 自定义积木报表鉴权(如果不进行自定义，则所有请求不做权限控制)
* * 1.自定义获取登录token // * * 1.自定义获取登录token
* * 2.自定义获取登录用户 // * * 2.自定义获取登录用户
* @author: jeecg-boot // * @author: jeecg-boot
*/ // */
//
//
@Slf4j //@Slf4j
@Component //@Component
public class JimuReportTokenService implements JmReportTokenServiceI { //public class JimuReportTokenService implements JmReportTokenServiceI {
@Autowired // @Autowired
private SysBaseApiImpl sysBaseApi; // private SysBaseApiImpl sysBaseApi;
@Autowired // @Autowired
@Lazy // @Lazy
private RedisUtil redisUtil; // private RedisUtil redisUtil;
//
@Override // @Override
public String getToken(HttpServletRequest request) { // public String getToken(HttpServletRequest request) {
return TokenUtils.getTokenByRequest(request); // return TokenUtils.getTokenByRequest(request);
} // }
//
@Override // @Override
public String getUsername(String token) { // public String getUsername(String token) {
return JwtUtil.getUsername(token); // return JwtUtil.getUsername(token);
} // }
//
@Override // @Override
public String[] getRoles(String token) { // public String[] getRoles(String token) {
String username = JwtUtil.getUsername(token); // String username = JwtUtil.getUsername(token);
Set roles = sysBaseApi.getUserRoleSet(username); // Set roles = sysBaseApi.getUserRoleSet(username);
if(CollectionUtils.isEmpty(roles)){ // if(CollectionUtils.isEmpty(roles)){
return null; // return null;
} // }
return (String[]) roles.toArray(new String[roles.size()]); // return (String[]) roles.toArray(new String[roles.size()]);
} // }
//
@Override // @Override
public Boolean verifyToken(String token) { // public Boolean verifyToken(String token) {
return TokenUtils.verifyToken(token, sysBaseApi, redisUtil); // return TokenUtils.verifyToken(token, sysBaseApi, redisUtil);
} // }
//
@Override // @Override
public Map<String, Object> getUserInfo(String token) { // public Map<String, Object> getUserInfo(String token) {
Map<String, Object> map = new HashMap(5); // Map<String, Object> map = new HashMap(5);
String username = JwtUtil.getUsername(token); // String username = JwtUtil.getUsername(token);
//此处通过token只能拿到一个信息 用户账号 后面的就是根据账号获取其他信息 查询数据或是走redis 用户根据自身业务可自定义 // //此处通过token只能拿到一个信息 用户账号 后面的就是根据账号获取其他信息 查询数据或是走redis 用户根据自身业务可自定义
SysUserCacheInfo userInfo = null; // SysUserCacheInfo userInfo = null;
try { // try {
userInfo = sysBaseApi.getCacheUser(username); // userInfo = sysBaseApi.getCacheUser(username);
} catch (Exception e) { // } catch (Exception e) {
log.error("获取用户信息异常:"+ e.getMessage()); // log.error("获取用户信息异常:"+ e.getMessage());
return map; // return map;
} // }
//设置账号名 // //设置账号名
map.put(SYS_USER_CODE, userInfo.getSysUserCode()); // map.put(SYS_USER_CODE, userInfo.getSysUserCode());
//设置部门编码 // //设置部门编码
map.put(SYS_ORG_CODE, userInfo.getSysOrgCode()); // map.put(SYS_ORG_CODE, userInfo.getSysOrgCode());
// 将所有信息存放至map 解析sql/api会根据map的键值解析 // // 将所有信息存放至map 解析sql/api会根据map的键值解析
return map; // return map;
} // }
} //}

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/aop/TenantPackUserLogAspect.java
View File

@ -14,7 +14,7 @@ import org.jeecg.modules.system.entity.SysTenantPack;
import org.jeecg.modules.system.entity.SysTenantPackUser; import org.jeecg.modules.system.entity.SysTenantPackUser;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.annotation.Resource; import jakarta.annotation.Resource;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.Date; import java.util.Date;

4
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/cas/controller/CasClientController.java
View File

@ -2,8 +2,8 @@ package org.jeecg.modules.cas.controller;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;

4
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/controller/SysMessageController.java
View File

@ -2,8 +2,8 @@ package org.jeecg.modules.message.controller;
import java.util.Arrays; import java.util.Arrays;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.base.controller.JeecgController;

4
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/controller/SysMessageTemplateController.java
View File

@ -3,8 +3,8 @@ package org.jeecg.modules.message.controller;
import java.util.Arrays; import java.util.Arrays;
import java.util.Map; import java.util.Map;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import org.jeecg.common.api.dto.message.MessageDTO; import org.jeecg.common.api.dto.message.MessageDTO;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;

4
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/EmailSendMsgHandle.java
View File

@ -18,8 +18,8 @@ import org.springframework.mail.javamail.JavaMailSender;
import org.springframework.mail.javamail.MimeMessageHelper; import org.springframework.mail.javamail.MimeMessageHelper;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.mail.MessagingException; import jakarta.mail.MessagingException;
import javax.mail.internet.MimeMessage; import jakarta.mail.internet.MimeMessage;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.util.List; import java.util.List;

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/handle/impl/SystemSendMsgHandle.java
View File

@ -19,7 +19,7 @@ import org.jeecg.modules.system.mapper.SysAnnouncementSendMapper;
import org.jeecg.modules.system.mapper.SysUserMapper; import org.jeecg.modules.system.mapper.SysUserMapper;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.annotation.Resource; import jakarta.annotation.Resource;
import java.util.Date; import java.util.Date;
import java.util.Map; import java.util.Map;

6
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/message/websocket/WebSocket.java
View File

@ -2,9 +2,9 @@ package org.jeecg.modules.message.websocket;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import javax.websocket.*; import jakarta.websocket.*;
import javax.websocket.server.PathParam; import jakarta.websocket.server.PathParam;
import javax.websocket.server.ServerEndpoint; import jakarta.websocket.server.ServerEndpoint;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import org.jeecg.common.base.BaseMap; import org.jeecg.common.base.BaseMap;

4
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/monitor/controller/ActuatorRedisController.java
View File

@ -10,8 +10,8 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import javax.swing.filechooser.FileSystemView; import javax.swing.filechooser.FileSystemView;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/monitor/service/impl/RedisServiceImpl.java
View File

@ -6,7 +6,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Properties; import java.util.Properties;
import javax.annotation.Resource; import jakarta.annotation.Resource;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/oss/controller/OssFileController.java
View File

@ -1,6 +1,6 @@
package org.jeecg.modules.oss.controller; package org.jeecg.modules.oss.controller;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.apache.shiro.authz.annotation.RequiresRoles; import org.apache.shiro.authz.annotation.RequiresRoles;

14
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/controller/QuartzJobController.java
View File

@ -3,8 +3,8 @@ package org.jeecg.modules.quartz.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
@ -30,8 +30,8 @@ import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@ -47,7 +47,7 @@ import java.util.Map;
@RestController @RestController
@RequestMapping("/sys/quartzJob") @RequestMapping("/sys/quartzJob")
@Slf4j @Slf4j
@Api(tags = "定时任务接口") @Tag(name = "定时任务接口")
public class QuartzJobController { public class QuartzJobController {
@Autowired @Autowired
private IQuartzJobService quartzJobService; private IQuartzJobService quartzJobService;
@ -154,7 +154,7 @@ public class QuartzJobController {
//@RequiresRoles("admin") //@RequiresRoles("admin")
@RequiresPermissions("system:quartzJob:pause") @RequiresPermissions("system:quartzJob:pause")
@GetMapping(value = "/pause") @GetMapping(value = "/pause")
@ApiOperation(value = "停止定时任务") @Operation(summary = "停止定时任务")
public Result<Object> pauseJob(@RequestParam(name = "id") String id) { public Result<Object> pauseJob(@RequestParam(name = "id") String id) {
QuartzJob job = quartzJobService.getById(id); QuartzJob job = quartzJobService.getById(id);
if (job == null) { if (job == null) {
@ -173,7 +173,7 @@ public class QuartzJobController {
//@RequiresRoles("admin") //@RequiresRoles("admin")
@RequiresPermissions("system:quartzJob:resume") @RequiresPermissions("system:quartzJob:resume")
@GetMapping(value = "/resume") @GetMapping(value = "/resume")
@ApiOperation(value = "启动定时任务") @Operation(summary = "启动定时任务")
public Result<Object> resumeJob(@RequestParam(name = "id") String id) { public Result<Object> resumeJob(@RequestParam(name = "id") String id) {
QuartzJob job = quartzJobService.getById(id); QuartzJob job = quartzJobService.getById(id);
if (job == null) { if (job == null) {

4
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/CommonController.java
View File

@ -20,8 +20,8 @@ import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.HandlerMapping; import org.springframework.web.servlet.HandlerMapping;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import java.io.*; import java.io.*;
/** /**

10
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/DuplicateCheckController.java
View File

@ -1,7 +1,7 @@
package org.jeecg.modules.system.controller; package org.jeecg.modules.system.controller;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
/** /**
* @Title: DuplicateCheckAction * @Title: DuplicateCheckAction
@ -24,7 +24,7 @@ import javax.servlet.http.HttpServletRequest;
@Slf4j @Slf4j
@RestController @RestController
@RequestMapping("/sys/duplicate") @RequestMapping("/sys/duplicate")
@Api(tags="重复校验") @Tag(name="重复校验")
public class DuplicateCheckController { public class DuplicateCheckController {
@Autowired @Autowired
@ -36,7 +36,7 @@ public class DuplicateCheckController {
* @return * @return
*/ */
@RequestMapping(value = "/check", method = RequestMethod.GET) @RequestMapping(value = "/check", method = RequestMethod.GET)
@ApiOperation("重复校验接口") @Operation(summary = "重复校验接口")
public Result<String> doDuplicateCheck(DuplicateCheckVo duplicateCheckVo, HttpServletRequest request) { public Result<String> doDuplicateCheck(DuplicateCheckVo duplicateCheckVo, HttpServletRequest request) {
log.debug("----duplicate check------："+ duplicateCheckVo.toString()); log.debug("----duplicate check------："+ duplicateCheckVo.toString());

24
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java
View File

@ -5,8 +5,8 @@ import com.alibaba.fastjson.JSONObject;
import com.aliyuncs.exceptions.ClientException; import com.aliyuncs.exceptions.ClientException;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresRoles; import org.apache.shiro.authz.annotation.RequiresRoles;
@ -34,9 +34,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import jakarta.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -46,7 +46,7 @@ import java.util.stream.Collectors;
*/ */
@RestController @RestController
@RequestMapping("/sys") @RequestMapping("/sys")
@Api(tags="用户登录") @Tag(name="用户登录")
@Slf4j @Slf4j
public class LoginController { public class LoginController {
@Autowired @Autowired
@ -70,7 +70,7 @@ public class LoginController {
private final String BASE_CHECK_CODES = "qwertyuiplkjhgfdsazxcvbnmQWERTYUPLKJHGFDSAZXCVBNM1234567890"; private final String BASE_CHECK_CODES = "qwertyuiplkjhgfdsazxcvbnmQWERTYUPLKJHGFDSAZXCVBNM1234567890";
@ApiOperation("登录接口") @Operation(summary = "登录接口")
@RequestMapping(value = "/login", method = RequestMethod.POST) @RequestMapping(value = "/login", method = RequestMethod.POST)
public Result<JSONObject> login(@RequestBody SysLoginModel sysLoginModel){ public Result<JSONObject> login(@RequestBody SysLoginModel sysLoginModel){
Result<JSONObject> result = new Result<JSONObject>(); Result<JSONObject> result = new Result<JSONObject>();
@ -395,7 +395,7 @@ public class LoginController {
* @param jsonObject * @param jsonObject
* @return * @return
*/ */
@ApiOperation("手机号登录接口") @Operation(summary ="手机号登录接口")
@PostMapping("/phoneLogin") @PostMapping("/phoneLogin")
public Result<JSONObject> phoneLogin(@RequestBody JSONObject jsonObject) { public Result<JSONObject> phoneLogin(@RequestBody JSONObject jsonObject) {
Result<JSONObject> result = new Result<JSONObject>(); Result<JSONObject> result = new Result<JSONObject>();
@ -507,7 +507,7 @@ public class LoginController {
* @param response * @param response
* @param key * @param key
*/ */
@ApiOperation("获取验证码") @Operation(summary ="获取验证码")
@GetMapping(value = "/randomImage/{key}") @GetMapping(value = "/randomImage/{key}")
public Result<String> randomImage(HttpServletResponse response,@PathVariable("key") String key){ public Result<String> randomImage(HttpServletResponse response,@PathVariable("key") String key){
Result<String> res = new Result<String>(); Result<String> res = new Result<String>();
@ -648,7 +648,7 @@ public class LoginController {
/** /**
* 登录二维码 * 登录二维码
*/ */
@ApiOperation(value = "登录二维码", notes = "登录二维码") @Operation(summary = "登录二维码")
@GetMapping("/getLoginQrcode") @GetMapping("/getLoginQrcode")
public Result<?> getLoginQrcode() { public Result<?> getLoginQrcode() {
String qrcodeId = CommonConstant.LOGIN_QRCODE_PRE+IdWorker.getIdStr(); String qrcodeId = CommonConstant.LOGIN_QRCODE_PRE+IdWorker.getIdStr();
@ -662,7 +662,7 @@ public class LoginController {
/** /**
* 扫码二维码 * 扫码二维码
*/ */
@ApiOperation(value = "扫码登录二维码", notes = "扫码登录二维码") @Operation(summary = "扫码登录二维码")
@PostMapping("/scanLoginQrcode") @PostMapping("/scanLoginQrcode")
public Result<?> scanLoginQrcode(@RequestParam String qrcodeId, @RequestParam String token) { public Result<?> scanLoginQrcode(@RequestParam String qrcodeId, @RequestParam String token) {
Object check = redisUtil.get(CommonConstant.LOGIN_QRCODE + qrcodeId); Object check = redisUtil.get(CommonConstant.LOGIN_QRCODE + qrcodeId);
@ -679,7 +679,7 @@ public class LoginController {
/** /**
* 获取用户扫码后保存的token * 获取用户扫码后保存的token
*/ */
@ApiOperation(value = "获取用户扫码后保存的token", notes = "获取用户扫码后保存的token") @Operation(summary = "获取用户扫码后保存的token")
@GetMapping("/getQrcodeToken") @GetMapping("/getQrcodeToken")
public Result getQrcodeToken(@RequestParam String qrcodeId) { public Result getQrcodeToken(@RequestParam String qrcodeId) {
Object token = redisUtil.get(CommonConstant.LOGIN_QRCODE_TOKEN + qrcodeId); Object token = redisUtil.get(CommonConstant.LOGIN_QRCODE_TOKEN + qrcodeId);

6
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java
View File

@ -47,9 +47,9 @@ import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import javax.annotation.Resource; import jakarta.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.util.*; import java.util.*;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java
View File

@ -3,7 +3,7 @@ package org.jeecg.modules.system.controller;
import java.util.Arrays; import java.util.Arrays;
import java.util.Date; import java.util.Date;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;

4
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCategoryController.java
View File

@ -32,8 +32,8 @@ import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;

24
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCheckRuleController.java
View File

@ -4,8 +4,8 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.aspect.annotation.AutoLog;
@ -17,8 +17,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.net.URLDecoder; import java.net.URLDecoder;
import java.util.Arrays; import java.util.Arrays;
@ -30,7 +30,7 @@ import java.util.Arrays;
* @Version: V1.0 * @Version: V1.0
*/ */
@Slf4j @Slf4j
@Api(tags = "编码校验规则") @Tag(name = "编码校验规则")
@RestController @RestController
@RequestMapping("/sys/checkRule") @RequestMapping("/sys/checkRule")
public class SysCheckRuleController extends JeecgController<SysCheckRule, ISysCheckRuleService> { public class SysCheckRuleController extends JeecgController<SysCheckRule, ISysCheckRuleService> {
@ -48,7 +48,7 @@ public class SysCheckRuleController extends JeecgController<SysCheckRule, ISysCh
* @return * @return
*/ */
@AutoLog(value = "编码校验规则-分页列表查询") @AutoLog(value = "编码校验规则-分页列表查询")
@ApiOperation(value = "编码校验规则-分页列表查询", notes = "编码校验规则-分页列表查询") @Operation(summary = "编码校验规则-分页列表查询")
@GetMapping(value = "/list") @GetMapping(value = "/list")
public Result queryPageList( public Result queryPageList(
SysCheckRule sysCheckRule, SysCheckRule sysCheckRule,
@ -70,7 +70,7 @@ public class SysCheckRuleController extends JeecgController<SysCheckRule, ISysCh
* @return * @return
*/ */
@AutoLog(value = "编码校验规则-通过Code校验传入的值") @AutoLog(value = "编码校验规则-通过Code校验传入的值")
@ApiOperation(value = "编码校验规则-通过Code校验传入的值", notes = "编码校验规则-通过Code校验传入的值") @Operation(summary = "编码校验规则-通过Code校验传入的值")
@GetMapping(value = "/checkByCode") @GetMapping(value = "/checkByCode")
public Result checkByCode( public Result checkByCode(
@RequestParam(name = "ruleCode") String ruleCode, @RequestParam(name = "ruleCode") String ruleCode,
@ -97,7 +97,7 @@ public class SysCheckRuleController extends JeecgController<SysCheckRule, ISysCh
* @return * @return
*/ */
@AutoLog(value = "编码校验规则-添加") @AutoLog(value = "编码校验规则-添加")
@ApiOperation(value = "编码校验规则-添加", notes = "编码校验规则-添加") @Operation(summary = "编码校验规则-添加")
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result add(@RequestBody SysCheckRule sysCheckRule) { public Result add(@RequestBody SysCheckRule sysCheckRule) {
sysCheckRuleService.save(sysCheckRule); sysCheckRuleService.save(sysCheckRule);
@ -111,7 +111,7 @@ public class SysCheckRuleController extends JeecgController<SysCheckRule, ISysCh
* @return * @return
*/ */
@AutoLog(value = "编码校验规则-编辑") @AutoLog(value = "编码校验规则-编辑")
@ApiOperation(value = "编码校验规则-编辑", notes = "编码校验规则-编辑") @Operation(summary = "编码校验规则-编辑")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result edit(@RequestBody SysCheckRule sysCheckRule) { public Result edit(@RequestBody SysCheckRule sysCheckRule) {
sysCheckRuleService.updateById(sysCheckRule); sysCheckRuleService.updateById(sysCheckRule);
@ -125,7 +125,7 @@ public class SysCheckRuleController extends JeecgController<SysCheckRule, ISysCh
* @return * @return
*/ */
@AutoLog(value = "编码校验规则-通过id删除") @AutoLog(value = "编码校验规则-通过id删除")
@ApiOperation(value = "编码校验规则-通过id删除", notes = "编码校验规则-通过id删除") @Operation(summary = "编码校验规则-通过id删除")
@DeleteMapping(value = "/delete") @DeleteMapping(value = "/delete")
public Result delete(@RequestParam(name = "id", required = true) String id) { public Result delete(@RequestParam(name = "id", required = true) String id) {
sysCheckRuleService.removeById(id); sysCheckRuleService.removeById(id);
@ -139,7 +139,7 @@ public class SysCheckRuleController extends JeecgController<SysCheckRule, ISysCh
* @return * @return
*/ */
@AutoLog(value = "编码校验规则-批量删除") @AutoLog(value = "编码校验规则-批量删除")
@ApiOperation(value = "编码校验规则-批量删除", notes = "编码校验规则-批量删除") @Operation(summary = "编码校验规则-批量删除")
@DeleteMapping(value = "/deleteBatch") @DeleteMapping(value = "/deleteBatch")
public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.sysCheckRuleService.removeByIds(Arrays.asList(ids.split(","))); this.sysCheckRuleService.removeByIds(Arrays.asList(ids.split(",")));
@ -153,7 +153,7 @@ public class SysCheckRuleController extends JeecgController<SysCheckRule, ISysCh
* @return * @return
*/ */
@AutoLog(value = "编码校验规则-通过id查询") @AutoLog(value = "编码校验规则-通过id查询")
@ApiOperation(value = "编码校验规则-通过id查询", notes = "编码校验规则-通过id查询") @Operation(summary = "编码校验规则-通过id查询")
@GetMapping(value = "/queryById") @GetMapping(value = "/queryById")
public Result queryById(@RequestParam(name = "id", required = true) String id) { public Result queryById(@RequestParam(name = "id", required = true) String id) {
SysCheckRule sysCheckRule = sysCheckRuleService.getById(id); SysCheckRule sysCheckRule = sysCheckRuleService.getById(id);

34
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysCommentController.java
View File

@ -3,8 +3,8 @@ package org.jeecg.modules.system.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.dto.DataLogDTO; import org.jeecg.common.api.dto.DataLogDTO;
@ -23,8 +23,8 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
@ -34,7 +34,7 @@ import java.util.List;
* @Date: 2022-07-19 * @Date: 2022-07-19
* @Version: V1.0 * @Version: V1.0
*/ */
@Api(tags = "系统评论回复表") @Tag(name = "系统评论回复表")
@RestController @RestController
@RequestMapping("/sys/comment") @RequestMapping("/sys/comment")
@Slf4j @Slf4j
@ -59,7 +59,7 @@ public class SysCommentController extends JeecgController<SysComment, ISysCommen
* @param sysComment * @param sysComment
* @return * @return
*/ */
@ApiOperation(value = "系统评论回复表-列表查询", notes = "系统评论回复表-列表查询") @Operation(summary = "系统评论回复表-列表查询")
@GetMapping(value = "/listByForm") @GetMapping(value = "/listByForm")
public Result<IPage<SysCommentVO>> queryListByForm(SysComment sysComment) { public Result<IPage<SysCommentVO>> queryListByForm(SysComment sysComment) {
List<SysCommentVO> list = sysCommentService.queryFormCommentInfo(sysComment); List<SysCommentVO> list = sysCommentService.queryFormCommentInfo(sysComment);
@ -74,7 +74,7 @@ public class SysCommentController extends JeecgController<SysComment, ISysCommen
* @param sysComment * @param sysComment
* @return * @return
*/ */
@ApiOperation(value = "系统评论回复表-列表查询", notes = "系统评论回复表-列表查询") @Operation(summary = "系统评论回复表-列表查询")
@GetMapping(value = "/fileList") @GetMapping(value = "/fileList")
public Result<IPage<SysCommentFileVo>> queryFileList(SysComment sysComment) { public Result<IPage<SysCommentFileVo>> queryFileList(SysComment sysComment) {
List<SysCommentFileVo> list = sysCommentService.queryFormFileList(sysComment.getTableName(), sysComment.getTableDataId()); List<SysCommentFileVo> list = sysCommentService.queryFormFileList(sysComment.getTableName(), sysComment.getTableDataId());
@ -83,14 +83,14 @@ public class SysCommentController extends JeecgController<SysComment, ISysCommen
return Result.OK(pageList); return Result.OK(pageList);
} }
@ApiOperation(value = "系统评论表-添加文本", notes = "系统评论表-添加文本") @Operation(summary = "系统评论表-添加文本")
@PostMapping(value = "/addText") @PostMapping(value = "/addText")
public Result<String> addText(@RequestBody SysComment sysComment) { public Result<String> addText(@RequestBody SysComment sysComment) {
String commentId = sysCommentService.saveOne(sysComment); String commentId = sysCommentService.saveOne(sysComment);
return Result.OK(commentId); return Result.OK(commentId);
} }
@ApiOperation(value = "系统评论表-添加文件", notes = "系统评论表-添加文件") @Operation(summary = "系统评论表-添加文件")
@PostMapping(value = "/addFile") @PostMapping(value = "/addFile")
public Result<String> addFile(HttpServletRequest request) { public Result<String> addFile(HttpServletRequest request) {
try { try {
@ -107,7 +107,7 @@ public class SysCommentController extends JeecgController<SysComment, ISysCommen
* @param request * @param request
* @return * @return
*/ */
@ApiOperation(value = "系统评论表-添加文件", notes = "系统评论表-添加文件") @Operation(summary = "系统评论表-添加文件")
@PostMapping(value = "/appAddFile") @PostMapping(value = "/appAddFile")
public Result<String> appAddFile(HttpServletRequest request) { public Result<String> appAddFile(HttpServletRequest request) {
try { try {
@ -119,7 +119,7 @@ public class SysCommentController extends JeecgController<SysComment, ISysCommen
} }
} }
@ApiOperation(value = "系统评论回复表-通过id删除", notes = "系统评论回复表-通过id删除") @Operation(summary = "系统评论回复表-通过id删除")
@DeleteMapping(value = "/deleteOne") @DeleteMapping(value = "/deleteOne")
public Result<String> deleteOne(@RequestParam(name = "id", required = true) String id) { public Result<String> deleteOne(@RequestParam(name = "id", required = true) String id) {
SysComment comment = sysCommentService.getById(id); SysComment comment = sysCommentService.getById(id);
@ -162,7 +162,7 @@ public class SysCommentController extends JeecgController<SysComment, ISysCommen
* @return * @return
*/ */
//@AutoLog(value = "系统评论回复表-分页列表查询") //@AutoLog(value = "系统评论回复表-分页列表查询")
@ApiOperation(value = "系统评论回复表-分页列表查询", notes = "系统评论回复表-分页列表查询") @Operation(summary = "系统评论回复表-分页列表查询")
@GetMapping(value = "/list") @GetMapping(value = "/list")
public Result<IPage<SysComment>> queryPageList(SysComment sysComment, public Result<IPage<SysComment>> queryPageList(SysComment sysComment,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@ -181,7 +181,7 @@ public class SysCommentController extends JeecgController<SysComment, ISysCommen
* @param sysComment * @param sysComment
* @return * @return
*/ */
@ApiOperation(value = "系统评论回复表-添加", notes = "系统评论回复表-添加") @Operation(summary = "系统评论回复表-添加")
//@RequiresPermissions("org.jeecg.modules.demo:sys_comment:add") //@RequiresPermissions("org.jeecg.modules.demo:sys_comment:add")
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<String> add(@RequestBody SysComment sysComment) { public Result<String> add(@RequestBody SysComment sysComment) {
@ -196,7 +196,7 @@ public class SysCommentController extends JeecgController<SysComment, ISysCommen
* @return * @return
*/ */
//@AutoLog(value = "系统评论回复表-编辑") //@AutoLog(value = "系统评论回复表-编辑")
@ApiOperation(value = "系统评论回复表-编辑", notes = "系统评论回复表-编辑") @Operation(summary = "系统评论回复表-编辑")
//@RequiresPermissions("org.jeecg.modules.demo:sys_comment:edit") //@RequiresPermissions("org.jeecg.modules.demo:sys_comment:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<String> edit(@RequestBody SysComment sysComment) { public Result<String> edit(@RequestBody SysComment sysComment) {
@ -211,7 +211,7 @@ public class SysCommentController extends JeecgController<SysComment, ISysCommen
* @return * @return
*/ */
//@AutoLog(value = "系统评论回复表-通过id删除") //@AutoLog(value = "系统评论回复表-通过id删除")
@ApiOperation(value = "系统评论回复表-通过id删除", notes = "系统评论回复表-通过id删除") @Operation(summary= "系统评论回复表-通过id删除")
//@RequiresPermissions("org.jeecg.modules.demo:sys_comment:delete") //@RequiresPermissions("org.jeecg.modules.demo:sys_comment:delete")
@DeleteMapping(value = "/delete") @DeleteMapping(value = "/delete")
public Result<String> delete(@RequestParam(name = "id", required = true) String id) { public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
@ -226,7 +226,7 @@ public class SysCommentController extends JeecgController<SysComment, ISysCommen
* @return * @return
*/ */
//@AutoLog(value = "系统评论回复表-批量删除") //@AutoLog(value = "系统评论回复表-批量删除")
@ApiOperation(value = "系统评论回复表-批量删除", notes = "系统评论回复表-批量删除") @Operation(summary = "系统评论回复表-批量删除")
//@RequiresPermissions("org.jeecg.modules.demo:sys_comment:deleteBatch") //@RequiresPermissions("org.jeecg.modules.demo:sys_comment:deleteBatch")
@DeleteMapping(value = "/deleteBatch") @DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) { public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
@ -241,7 +241,7 @@ public class SysCommentController extends JeecgController<SysComment, ISysCommen
* @return * @return
*/ */
//@AutoLog(value = "系统评论回复表-通过id查询") //@AutoLog(value = "系统评论回复表-通过id查询")
@ApiOperation(value = "系统评论回复表-通过id查询", notes = "系统评论回复表-通过id查询") @Operation(summary = "系统评论回复表-通过id查询")
@GetMapping(value = "/queryById") @GetMapping(value = "/queryById")
public Result<SysComment> queryById(@RequestParam(name = "id", required = true) String id) { public Result<SysComment> queryById(@RequestParam(name = "id", required = true) String id) {
SysComment sysComment = sysCommentService.getById(id); SysComment sysComment = sysCommentService.getById(id);

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDataLogController.java
View File

@ -3,7 +3,7 @@ package org.jeecg.modules.system.controller;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.CommonConstant;

25
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDataSourceController.java
View File

@ -3,16 +3,16 @@ package org.jeecg.modules.system.controller;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.DynamicRoutingDataSource;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.apache.shiro.authz.annotation.RequiresRoles;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.config.TenantContext; import org.jeecg.common.config.TenantContext;
@ -30,9 +30,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.sql.DataSource;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
@ -43,7 +40,7 @@ import java.util.List;
* @Version: V1.0 * @Version: V1.0
*/ */
@Slf4j @Slf4j
@Api(tags = "多数据源管理") @Tag(name = "多数据源管理")
@RestController @RestController
@RequestMapping("/sys/dataSource") @RequestMapping("/sys/dataSource")
public class SysDataSourceController extends JeecgController<SysDataSource, ISysDataSourceService> { public class SysDataSourceController extends JeecgController<SysDataSource, ISysDataSourceService> {
@ -62,7 +59,7 @@ public class SysDataSourceController extends JeecgController<SysDataSource, ISys
* @return * @return
*/ */
@AutoLog(value = "多数据源管理-分页列表查询") @AutoLog(value = "多数据源管理-分页列表查询")
@ApiOperation(value = "多数据源管理-分页列表查询", notes = "多数据源管理-分页列表查询") @Operation(summary = "多数据源管理-分页列表查询")
@RequiresPermissions("system:datasource:list") @RequiresPermissions("system:datasource:list")
@GetMapping(value = "/list") @GetMapping(value = "/list")
public Result<?> queryPageList( public Result<?> queryPageList(
@ -111,7 +108,7 @@ public class SysDataSourceController extends JeecgController<SysDataSource, ISys
* @return * @return
*/ */
@AutoLog(value = "多数据源管理-添加") @AutoLog(value = "多数据源管理-添加")
@ApiOperation(value = "多数据源管理-添加", notes = "多数据源管理-添加") @Operation(summary = "多数据源管理-添加")
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<?> add(@RequestBody SysDataSource sysDataSource) { public Result<?> add(@RequestBody SysDataSource sysDataSource) {
//update-begin-author:taoyan date:2022-8-10 for: jdbc连接地址漏洞问题 //update-begin-author:taoyan date:2022-8-10 for: jdbc连接地址漏洞问题
@ -132,7 +129,7 @@ public class SysDataSourceController extends JeecgController<SysDataSource, ISys
* @return * @return
*/ */
@AutoLog(value = "多数据源管理-编辑") @AutoLog(value = "多数据源管理-编辑")
@ApiOperation(value = "多数据源管理-编辑", notes = "多数据源管理-编辑") @Operation(summary = "多数据源管理-编辑")
@RequestMapping(value = "/edit", method ={RequestMethod.PUT, RequestMethod.POST}) @RequestMapping(value = "/edit", method ={RequestMethod.PUT, RequestMethod.POST})
public Result<?> edit(@RequestBody SysDataSource sysDataSource) { public Result<?> edit(@RequestBody SysDataSource sysDataSource) {
//update-begin-author:taoyan date:2022-8-10 for: jdbc连接地址漏洞问题 //update-begin-author:taoyan date:2022-8-10 for: jdbc连接地址漏洞问题
@ -153,7 +150,7 @@ public class SysDataSourceController extends JeecgController<SysDataSource, ISys
* @return * @return
*/ */
@AutoLog(value = "多数据源管理-通过id删除") @AutoLog(value = "多数据源管理-通过id删除")
@ApiOperation(value = "多数据源管理-通过id删除", notes = "多数据源管理-通过id删除") @Operation(summary = "多数据源管理-通过id删除")
@DeleteMapping(value = "/delete") @DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name = "id") String id) { public Result<?> delete(@RequestParam(name = "id") String id) {
return sysDataSourceService.deleteDataSource(id); return sysDataSourceService.deleteDataSource(id);
@ -166,7 +163,7 @@ public class SysDataSourceController extends JeecgController<SysDataSource, ISys
* @return * @return
*/ */
@AutoLog(value = "多数据源管理-批量删除") @AutoLog(value = "多数据源管理-批量删除")
@ApiOperation(value = "多数据源管理-批量删除", notes = "多数据源管理-批量删除") @Operation(summary = "多数据源管理-批量删除")
@DeleteMapping(value = "/deleteBatch") @DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name = "ids") String ids) { public Result<?> deleteBatch(@RequestParam(name = "ids") String ids) {
List<String> idList = Arrays.asList(ids.split(",")); List<String> idList = Arrays.asList(ids.split(","));
@ -185,7 +182,7 @@ public class SysDataSourceController extends JeecgController<SysDataSource, ISys
* @return * @return
*/ */
@AutoLog(value = "多数据源管理-通过id查询") @AutoLog(value = "多数据源管理-通过id查询")
@ApiOperation(value = "多数据源管理-通过id查询", notes = "多数据源管理-通过id查询") @Operation(summary = "多数据源管理-通过id查询")
@GetMapping(value = "/queryById") @GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name = "id") String id) throws InterruptedException { public Result<?> queryById(@RequestParam(name = "id") String id) throws InterruptedException {
SysDataSource sysDataSource = sysDataSourceService.getById(id); SysDataSource sysDataSource = sysDataSourceService.getById(id);

4
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java
View File

@ -39,8 +39,8 @@ import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.util.*; import java.util.*;

41
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartPermissionController.java
View File

@ -1,18 +1,20 @@
package org.jeecg.modules.system.controller; package org.jeecg.modules.system.controller;
import java.util.*;
import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.base.service.BaseCommonService; import org.jeecg.modules.base.service.BaseCommonService;
@ -22,20 +24,15 @@ import org.jeecg.modules.system.entity.SysPermission;
import org.jeecg.modules.system.entity.SysPermissionDataRule; import org.jeecg.modules.system.entity.SysPermissionDataRule;
import org.jeecg.modules.system.model.TreeModel; import org.jeecg.modules.system.model.TreeModel;
import org.jeecg.modules.system.service.ISysDepartPermissionService; import org.jeecg.modules.system.service.ISysDepartPermissionService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.modules.system.service.ISysDepartRolePermissionService; import org.jeecg.modules.system.service.ISysDepartRolePermissionService;
import org.jeecg.modules.system.service.ISysPermissionDataRuleService; import org.jeecg.modules.system.service.ISysPermissionDataRuleService;
import org.jeecg.modules.system.service.ISysPermissionService; import org.jeecg.modules.system.service.ISysPermissionService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import java.util.*;
import java.util.stream.Collectors;
/** /**
* @Description: 部门权限表 * @Description: 部门权限表
@ -44,7 +41,7 @@ import io.swagger.annotations.ApiOperation;
* @Version: V1.0 * @Version: V1.0
*/ */
@Slf4j @Slf4j
@Api(tags="部门权限表") @Tag(name="部门权限表")
@RestController @RestController
@RequestMapping("/sys/sysDepartPermission") @RequestMapping("/sys/sysDepartPermission")
public class SysDepartPermissionController extends JeecgController<SysDepartPermission, ISysDepartPermissionService> { public class SysDepartPermissionController extends JeecgController<SysDepartPermission, ISysDepartPermissionService> {
@ -72,7 +69,7 @@ public class SysDepartPermissionController extends JeecgController<SysDepartPerm
* @param req * @param req
* @return * @return
*/ */
@ApiOperation(value="部门权限表-分页列表查询", notes="部门权限表-分页列表查询") @Operation(summary="部门权限表-分页列表查询")
@GetMapping(value = "/list") @GetMapping(value = "/list")
public Result<?> queryPageList(SysDepartPermission sysDepartPermission, public Result<?> queryPageList(SysDepartPermission sysDepartPermission,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@ -90,7 +87,7 @@ public class SysDepartPermissionController extends JeecgController<SysDepartPerm
* @param sysDepartPermission * @param sysDepartPermission
* @return * @return
*/ */
@ApiOperation(value="部门权限表-添加", notes="部门权限表-添加") @Operation(summary="部门权限表-添加")
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<?> add(@RequestBody SysDepartPermission sysDepartPermission) { public Result<?> add(@RequestBody SysDepartPermission sysDepartPermission) {
sysDepartPermissionService.save(sysDepartPermission); sysDepartPermissionService.save(sysDepartPermission);
@ -103,7 +100,7 @@ public class SysDepartPermissionController extends JeecgController<SysDepartPerm
* @param sysDepartPermission * @param sysDepartPermission
* @return * @return
*/ */
@ApiOperation(value="部门权限表-编辑", notes="部门权限表-编辑") @Operation(summary="部门权限表-编辑")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<?> edit(@RequestBody SysDepartPermission sysDepartPermission) { public Result<?> edit(@RequestBody SysDepartPermission sysDepartPermission) {
sysDepartPermissionService.updateById(sysDepartPermission); sysDepartPermissionService.updateById(sysDepartPermission);
@ -116,7 +113,7 @@ public class SysDepartPermissionController extends JeecgController<SysDepartPerm
* @param id * @param id
* @return * @return
*/ */
@ApiOperation(value="部门权限表-通过id删除", notes="部门权限表-通过id删除") @Operation(summary="部门权限表-通过id删除")
@DeleteMapping(value = "/delete") @DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) { public Result<?> delete(@RequestParam(name="id",required=true) String id) {
sysDepartPermissionService.removeById(id); sysDepartPermissionService.removeById(id);
@ -129,7 +126,7 @@ public class SysDepartPermissionController extends JeecgController<SysDepartPerm
* @param ids * @param ids
* @return * @return
*/ */
@ApiOperation(value="部门权限表-批量删除", notes="部门权限表-批量删除") @Operation(summary="部门权限表-批量删除")
@DeleteMapping(value = "/deleteBatch") @DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) { public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
this.sysDepartPermissionService.removeByIds(Arrays.asList(ids.split(","))); this.sysDepartPermissionService.removeByIds(Arrays.asList(ids.split(",")));
@ -142,7 +139,7 @@ public class SysDepartPermissionController extends JeecgController<SysDepartPerm
* @param id * @param id
* @return * @return
*/ */
@ApiOperation(value="部门权限表-通过id查询", notes="部门权限表-通过id查询") @Operation(summary="部门权限表-通过id查询")
@GetMapping(value = "/queryById") @GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name="id",required=true) String id) { public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
SysDepartPermission sysDepartPermission = sysDepartPermissionService.getById(id); SysDepartPermission sysDepartPermission = sysDepartPermissionService.getById(id);

25
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartRoleController.java
View File

@ -2,9 +2,12 @@ package org.jeecg.modules.system.controller;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import io.swagger.v3.oas.annotations.Operation;
import javax.servlet.http.HttpServletResponse; import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@ -29,8 +32,6 @@ import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
/** /**
* @Description: 部门角色 * @Description: 部门角色
@ -39,7 +40,7 @@ import io.swagger.annotations.ApiOperation;
* @Version: V1.0 * @Version: V1.0
*/ */
@Slf4j @Slf4j
@Api(tags="部门角色") @Tag(name="部门角色")
@RestController @RestController
@RequestMapping("/sys/sysDepartRole") @RequestMapping("/sys/sysDepartRole")
public class SysDepartRoleController extends JeecgController<SysDepartRole, ISysDepartRoleService> { public class SysDepartRoleController extends JeecgController<SysDepartRole, ISysDepartRoleService> {
@ -70,7 +71,7 @@ public class SysDepartRoleController extends JeecgController<SysDepartRole, ISys
* @param req * @param req
* @return * @return
*/ */
@ApiOperation(value="部门角色-分页列表查询", notes="部门角色-分页列表查询") @Operation(summary="部门角色-分页列表查询")
@GetMapping(value = "/list") @GetMapping(value = "/list")
public Result<?> queryPageList(SysDepartRole sysDepartRole, public Result<?> queryPageList(SysDepartRole sysDepartRole,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@ -105,7 +106,7 @@ public class SysDepartRoleController extends JeecgController<SysDepartRole, ISys
* @return * @return
*/ */
@RequiresPermissions("system:depart:role:add") @RequiresPermissions("system:depart:role:add")
@ApiOperation(value="部门角色-添加", notes="部门角色-添加") @Operation(summary="部门角色-添加")
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<?> add(@RequestBody SysDepartRole sysDepartRole) { public Result<?> add(@RequestBody SysDepartRole sysDepartRole) {
sysDepartRoleService.save(sysDepartRole); sysDepartRoleService.save(sysDepartRole);
@ -118,7 +119,7 @@ public class SysDepartRoleController extends JeecgController<SysDepartRole, ISys
* @param sysDepartRole * @param sysDepartRole
* @return * @return
*/ */
@ApiOperation(value="部门角色-编辑", notes="部门角色-编辑") @Operation(summary="部门角色-编辑")
@RequiresPermissions("system:depart:role:edit") @RequiresPermissions("system:depart:role:edit")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<?> edit(@RequestBody SysDepartRole sysDepartRole) { public Result<?> edit(@RequestBody SysDepartRole sysDepartRole) {
@ -133,7 +134,7 @@ public class SysDepartRoleController extends JeecgController<SysDepartRole, ISys
* @return * @return
*/ */
@AutoLog(value = "部门角色-通过id删除") @AutoLog(value = "部门角色-通过id删除")
@ApiOperation(value="部门角色-通过id删除", notes="部门角色-通过id删除") @Operation(summary="部门角色-通过id删除")
@RequiresPermissions("system:depart:role:delete") @RequiresPermissions("system:depart:role:delete")
@DeleteMapping(value = "/delete") @DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name="id",required=true) String id) { public Result<?> delete(@RequestParam(name="id",required=true) String id) {
@ -148,7 +149,7 @@ public class SysDepartRoleController extends JeecgController<SysDepartRole, ISys
* @return * @return
*/ */
@AutoLog(value = "部门角色-批量删除") @AutoLog(value = "部门角色-批量删除")
@ApiOperation(value="部门角色-批量删除", notes="部门角色-批量删除") @Operation(summary="部门角色-批量删除")
@RequiresPermissions("system:depart:role:deleteBatch") @RequiresPermissions("system:depart:role:deleteBatch")
@DeleteMapping(value = "/deleteBatch") @DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) { public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
@ -162,7 +163,7 @@ public class SysDepartRoleController extends JeecgController<SysDepartRole, ISys
* @param id * @param id
* @return * @return
*/ */
@ApiOperation(value="部门角色-通过id查询", notes="部门角色-通过id查询") @Operation(summary="部门角色-通过id查询")
@GetMapping(value = "/queryById") @GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name="id",required=true) String id) { public Result<?> queryById(@RequestParam(name="id",required=true) String id) {
SysDepartRole sysDepartRole = sysDepartRoleService.getById(id); SysDepartRole sysDepartRole = sysDepartRoleService.getById(id);

4
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDictController.java
View File

@ -42,8 +42,8 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.net.URLDecoder; import java.net.URLDecoder;
import java.util.*; import java.util.*;

10
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDictItemController.java
View File

@ -4,11 +4,11 @@ package org.jeecg.modules.system.controller;
import java.util.Arrays; import java.util.Arrays;
import java.util.Date; import java.util.Date;
import javax.servlet.http.HttpServletRequest; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.apache.shiro.authz.annotation.RequiresRoles; import org.apache.shiro.authz.annotation.RequiresRoles;
@ -40,7 +40,7 @@ import lombok.extern.slf4j.Slf4j;
* @Author zhangweijian * @Author zhangweijian
* @since 2018-12-28 * @since 2018-12-28
*/ */
@Api(tags = "数据字典") @Tag(name = "数据字典")
@RestController @RestController
@RequestMapping("/sys/dictItem") @RequestMapping("/sys/dictItem")
@Slf4j @Slf4j
@ -162,7 +162,7 @@ public class SysDictItemController {
* @return * @return
*/ */
@RequestMapping(value = "/dictItemCheck", method = RequestMethod.GET) @RequestMapping(value = "/dictItemCheck", method = RequestMethod.GET)
@ApiOperation("字典重复校验接口") @Operation(summary = "字典重复校验接口")
public Result<Object> doDictItemCheck(SysDictItem sysDictItem, HttpServletRequest request) { public Result<Object> doDictItemCheck(SysDictItem sysDictItem, HttpServletRequest request) {
Long num = Long.valueOf(0); Long num = Long.valueOf(0);
LambdaQueryWrapper<SysDictItem> queryWrapper = new LambdaQueryWrapper<SysDictItem>(); LambdaQueryWrapper<SysDictItem> queryWrapper = new LambdaQueryWrapper<SysDictItem>();

22
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysFilesController.java
View File

@ -3,8 +3,8 @@ package org.jeecg.modules.system.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.aspect.annotation.AutoLog;
@ -16,8 +16,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import java.util.Arrays; import java.util.Arrays;
/** /**
@ -27,7 +27,7 @@ import java.util.Arrays;
* @Version: V1.0 * @Version: V1.0
*/ */
@Slf4j @Slf4j
@Api(tags = "知识库-文档管理") @Tag(name = "知识库-文档管理")
@RestController @RestController
@RequestMapping("/sys/files") @RequestMapping("/sys/files")
public class SysFilesController extends JeecgController<SysFiles, ISysFilesService> { public class SysFilesController extends JeecgController<SysFiles, ISysFilesService> {
@ -44,7 +44,7 @@ public class SysFilesController extends JeecgController<SysFiles, ISysFilesServi
* @return * @return
*/ */
@AutoLog(value = "知识库-文档管理-分页列表查询") @AutoLog(value = "知识库-文档管理-分页列表查询")
@ApiOperation(value = "知识库-文档管理-分页列表查询", notes = "知识库-文档管理-分页列表查询") @Operation(summary = "知识库-文档管理-分页列表查询")
@GetMapping(value = "/list") @GetMapping(value = "/list")
public Result<?> queryPageList(SysFiles sysFiles, public Result<?> queryPageList(SysFiles sysFiles,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@ -63,7 +63,7 @@ public class SysFilesController extends JeecgController<SysFiles, ISysFilesServi
* @return * @return
*/ */
@AutoLog(value = "知识库-文档管理-添加") @AutoLog(value = "知识库-文档管理-添加")
@ApiOperation(value = "知识库-文档管理-添加", notes = "知识库-文档管理-添加") @Operation(summary = "知识库-文档管理-添加")
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<?> add(@RequestBody SysFiles sysFiles) { public Result<?> add(@RequestBody SysFiles sysFiles) {
sysFilesService.save(sysFiles); sysFilesService.save(sysFiles);
@ -77,7 +77,7 @@ public class SysFilesController extends JeecgController<SysFiles, ISysFilesServi
* @return * @return
*/ */
@AutoLog(value = "知识库-文档管理-编辑") @AutoLog(value = "知识库-文档管理-编辑")
@ApiOperation(value = "知识库-文档管理-编辑", notes = "知识库-文档管理-编辑") @Operation(summary = "知识库-文档管理-编辑")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<?> edit(@RequestBody SysFiles sysFiles) { public Result<?> edit(@RequestBody SysFiles sysFiles) {
sysFilesService.updateById(sysFiles); sysFilesService.updateById(sysFiles);
@ -91,7 +91,7 @@ public class SysFilesController extends JeecgController<SysFiles, ISysFilesServi
* @return * @return
*/ */
@AutoLog(value = "知识库-文档管理-通过id删除") @AutoLog(value = "知识库-文档管理-通过id删除")
@ApiOperation(value = "知识库-文档管理-通过id删除", notes = "知识库-文档管理-通过id删除") @Operation(summary = "知识库-文档管理-通过id删除")
@DeleteMapping(value = "/delete") @DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name = "id", required = true) String id) { public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
sysFilesService.removeById(id); sysFilesService.removeById(id);
@ -105,7 +105,7 @@ public class SysFilesController extends JeecgController<SysFiles, ISysFilesServi
* @return * @return
*/ */
@AutoLog(value = "知识库-文档管理-批量删除") @AutoLog(value = "知识库-文档管理-批量删除")
@ApiOperation(value = "知识库-文档管理-批量删除", notes = "知识库-文档管理-批量删除") @Operation(summary = "知识库-文档管理-批量删除")
@DeleteMapping(value = "/deleteBatch") @DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) { public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.sysFilesService.removeByIds(Arrays.asList(ids.split(","))); this.sysFilesService.removeByIds(Arrays.asList(ids.split(",")));
@ -119,7 +119,7 @@ public class SysFilesController extends JeecgController<SysFiles, ISysFilesServi
* @return * @return
*/ */
@AutoLog(value = "知识库-文档管理-通过id查询") @AutoLog(value = "知识库-文档管理-通过id查询")
@ApiOperation(value = "知识库-文档管理-通过id查询", notes = "知识库-文档管理-通过id查询") @Operation(summary = "知识库-文档管理-通过id查询")
@GetMapping(value = "/queryById") @GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name = "id", required = true) String id) { public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
SysFiles sysFiles = sysFilesService.getById(id); SysFiles sysFiles = sysFilesService.getById(id);

22
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysFillRuleController.java
View File

@ -5,8 +5,8 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.aspect.annotation.AutoLog;
@ -19,8 +19,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import java.util.Arrays; import java.util.Arrays;
/** /**
@ -30,7 +30,7 @@ import java.util.Arrays;
* @Version: V1.0 * @Version: V1.0
*/ */
@Slf4j @Slf4j
@Api(tags = "填值规则") @Tag(name = "填值规则")
@RestController @RestController
@RequestMapping("/sys/fillRule") @RequestMapping("/sys/fillRule")
public class SysFillRuleController extends JeecgController<SysFillRule, ISysFillRuleService> { public class SysFillRuleController extends JeecgController<SysFillRule, ISysFillRuleService> {
@ -47,7 +47,7 @@ public class SysFillRuleController extends JeecgController<SysFillRule, ISysFill
* @return * @return
*/ */
@AutoLog(value = "填值规则-分页列表查询") @AutoLog(value = "填值规则-分页列表查询")
@ApiOperation(value = "填值规则-分页列表查询", notes = "填值规则-分页列表查询") @Operation(summary = "填值规则-分页列表查询")
@GetMapping(value = "/list") @GetMapping(value = "/list")
public Result<?> queryPageList(SysFillRule sysFillRule, public Result<?> queryPageList(SysFillRule sysFillRule,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@ -78,7 +78,7 @@ public class SysFillRuleController extends JeecgController<SysFillRule, ISysFill
* @return * @return
*/ */
@AutoLog(value = "填值规则-添加") @AutoLog(value = "填值规则-添加")
@ApiOperation(value = "填值规则-添加", notes = "填值规则-添加") @Operation(summary = "填值规则-添加")
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<?> add(@RequestBody SysFillRule sysFillRule) { public Result<?> add(@RequestBody SysFillRule sysFillRule) {
sysFillRuleService.save(sysFillRule); sysFillRuleService.save(sysFillRule);
@ -92,7 +92,7 @@ public class SysFillRuleController extends JeecgController<SysFillRule, ISysFill
* @return * @return
*/ */
@AutoLog(value = "填值规则-编辑") @AutoLog(value = "填值规则-编辑")
@ApiOperation(value = "填值规则-编辑", notes = "填值规则-编辑") @Operation(summary = "填值规则-编辑")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
public Result<?> edit(@RequestBody SysFillRule sysFillRule) { public Result<?> edit(@RequestBody SysFillRule sysFillRule) {
sysFillRuleService.updateById(sysFillRule); sysFillRuleService.updateById(sysFillRule);
@ -106,7 +106,7 @@ public class SysFillRuleController extends JeecgController<SysFillRule, ISysFill
* @return * @return
*/ */
@AutoLog(value = "填值规则-通过id删除") @AutoLog(value = "填值规则-通过id删除")
@ApiOperation(value = "填值规则-通过id删除", notes = "填值规则-通过id删除") @Operation(summary = "填值规则-通过id删除")
@DeleteMapping(value = "/delete") @DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name = "id", required = true) String id) { public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
sysFillRuleService.removeById(id); sysFillRuleService.removeById(id);
@ -120,7 +120,7 @@ public class SysFillRuleController extends JeecgController<SysFillRule, ISysFill
* @return * @return
*/ */
@AutoLog(value = "填值规则-批量删除") @AutoLog(value = "填值规则-批量删除")
@ApiOperation(value = "填值规则-批量删除", notes = "填值规则-批量删除") @Operation(summary = "填值规则-批量删除")
@DeleteMapping(value = "/deleteBatch") @DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) { public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.sysFillRuleService.removeByIds(Arrays.asList(ids.split(","))); this.sysFillRuleService.removeByIds(Arrays.asList(ids.split(",")));
@ -134,7 +134,7 @@ public class SysFillRuleController extends JeecgController<SysFillRule, ISysFill
* @return * @return
*/ */
@AutoLog(value = "填值规则-通过id查询") @AutoLog(value = "填值规则-通过id查询")
@ApiOperation(value = "填值规则-通过id查询", notes = "填值规则-通过id查询") @Operation(summary = "填值规则-通过id查询")
@GetMapping(value = "/queryById") @GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name = "id", required = true) String id) { public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
SysFillRule sysFillRule = sysFillRuleService.getById(id); SysFillRule sysFillRule = sysFillRuleService.getById(id);

22
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysFormFileController.java
View File

@ -3,8 +3,8 @@ package org.jeecg.modules.system.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.aspect.annotation.AutoLog;
@ -16,8 +16,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import java.util.Arrays; import java.util.Arrays;
/** /**
@ -27,7 +27,7 @@ import java.util.Arrays;
* @Version: V1.0 * @Version: V1.0
*/ */
@Slf4j @Slf4j
@Api(tags = "表单评论文件") @Tag(name = "表单评论文件")
@RestController @RestController
@RequestMapping("/sys/formFile") @RequestMapping("/sys/formFile")
public class SysFormFileController extends JeecgController<SysFormFile, ISysFormFileService> { public class SysFormFileController extends JeecgController<SysFormFile, ISysFormFileService> {
@ -44,7 +44,7 @@ public class SysFormFileController extends JeecgController<SysFormFile, ISysForm
* @return * @return
*/ */
@AutoLog(value = "表单评论文件-分页列表查询") @AutoLog(value = "表单评论文件-分页列表查询")
@ApiOperation(value = "表单评论文件-分页列表查询", notes = "表单评论文件-分页列表查询") @Operation(summary = "表单评论文件-分页列表查询")
@GetMapping(value = "/list") @GetMapping(value = "/list")
public Result<?> queryPageList(SysFormFile sysFormFile, public Result<?> queryPageList(SysFormFile sysFormFile,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@ -63,7 +63,7 @@ public class SysFormFileController extends JeecgController<SysFormFile, ISysForm
* @return * @return
*/ */
@AutoLog(value = "表单评论文件-添加") @AutoLog(value = "表单评论文件-添加")
@ApiOperation(value = "表单评论文件-添加", notes = "表单评论文件-添加") @Operation(summary = "表单评论文件-添加")
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<?> add(@RequestBody SysFormFile sysFormFile) { public Result<?> add(@RequestBody SysFormFile sysFormFile) {
sysFormFileService.save(sysFormFile); sysFormFileService.save(sysFormFile);
@ -77,7 +77,7 @@ public class SysFormFileController extends JeecgController<SysFormFile, ISysForm
* @return * @return
*/ */
@AutoLog(value = "表单评论文件-编辑") @AutoLog(value = "表单评论文件-编辑")
@ApiOperation(value = "表单评论文件-编辑", notes = "表单评论文件-编辑") @Operation(summary = "表单评论文件-编辑")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<?> edit(@RequestBody SysFormFile sysFormFile) { public Result<?> edit(@RequestBody SysFormFile sysFormFile) {
sysFormFileService.updateById(sysFormFile); sysFormFileService.updateById(sysFormFile);
@ -91,7 +91,7 @@ public class SysFormFileController extends JeecgController<SysFormFile, ISysForm
* @return * @return
*/ */
@AutoLog(value = "表单评论文件-通过id删除") @AutoLog(value = "表单评论文件-通过id删除")
@ApiOperation(value = "表单评论文件-通过id删除", notes = "表单评论文件-通过id删除") @Operation(summary = "表单评论文件-通过id删除")
@DeleteMapping(value = "/delete") @DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name = "id", required = true) String id) { public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
sysFormFileService.removeById(id); sysFormFileService.removeById(id);
@ -105,7 +105,7 @@ public class SysFormFileController extends JeecgController<SysFormFile, ISysForm
* @return * @return
*/ */
@AutoLog(value = "表单评论文件-批量删除") @AutoLog(value = "表单评论文件-批量删除")
@ApiOperation(value = "表单评论文件-批量删除", notes = "表单评论文件-批量删除") @Operation(summary = "表单评论文件-批量删除")
@DeleteMapping(value = "/deleteBatch") @DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) { public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.sysFormFileService.removeByIds(Arrays.asList(ids.split(","))); this.sysFormFileService.removeByIds(Arrays.asList(ids.split(",")));
@ -119,7 +119,7 @@ public class SysFormFileController extends JeecgController<SysFormFile, ISysForm
* @return * @return
*/ */
@AutoLog(value = "表单评论文件-通过id查询") @AutoLog(value = "表单评论文件-通过id查询")
@ApiOperation(value = "表单评论文件-通过id查询", notes = "表单评论文件-通过id查询") @Operation(summary = "表单评论文件-通过id查询")
@GetMapping(value = "/queryById") @GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name = "id", required = true) String id) { public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
SysFormFile sysFormFile = sysFormFileService.getById(id); SysFormFile sysFormFile = sysFormFileService.getById(id);

5
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysGatewayRouteController.java
View File

@ -3,10 +3,9 @@ package org.jeecg.modules.system.controller;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.apache.shiro.authz.annotation.RequiresRoles;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.util.oConvertUtils; import org.jeecg.common.util.oConvertUtils;
@ -23,7 +22,7 @@ import java.util.List;
* @Date: 2020-05-26 * @Date: 2020-05-26
* @Version: V1.0 * @Version: V1.0
*/ */
@Api(tags = "gateway路由管理") @Tag(name = "gateway路由管理")
@RestController @RestController
@RequestMapping("/sys/gatewayRoute") @RequestMapping("/sys/gatewayRoute")
@Slf4j @Slf4j

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysLogController.java
View File

@ -3,7 +3,7 @@ package org.jeecg.modules.system.controller;
import java.util.Arrays; import java.util.Arrays;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.CommonConstant;

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java
View File

@ -27,7 +27,7 @@ import org.jeecg.modules.system.util.PermissionDataUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;

26
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysPositionController.java
View File

@ -5,8 +5,8 @@ import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
@ -34,8 +34,8 @@ import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.net.URLDecoder; import java.net.URLDecoder;
@ -52,7 +52,7 @@ import java.util.stream.Collectors;
* @Version: V1.0 * @Version: V1.0
*/ */
@Slf4j @Slf4j
@Api(tags = "职务表") @Tag(name = "职务表")
@RestController @RestController
@RequestMapping("/sys/position") @RequestMapping("/sys/position")
public class SysPositionController { public class SysPositionController {
@ -76,7 +76,7 @@ public class SysPositionController {
* @return * @return
*/ */
@AutoLog(value = "职务表-分页列表查询") @AutoLog(value = "职务表-分页列表查询")
@ApiOperation(value = "职务表-分页列表查询", notes = "职务表-分页列表查询") @Operation(summary = "职务表-分页列表查询")
@GetMapping(value = "/list") @GetMapping(value = "/list")
public Result<IPage<SysPosition>> queryPageList(SysPosition sysPosition, public Result<IPage<SysPosition>> queryPageList(SysPosition sysPosition,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@ -104,7 +104,7 @@ public class SysPositionController {
* @return * @return
*/ */
@AutoLog(value = "职务表-添加") @AutoLog(value = "职务表-添加")
@ApiOperation(value = "职务表-添加", notes = "职务表-添加") @Operation(summary = "职务表-添加")
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<SysPosition> add(@RequestBody SysPosition sysPosition) { public Result<SysPosition> add(@RequestBody SysPosition sysPosition) {
Result<SysPosition> result = new Result<SysPosition>(); Result<SysPosition> result = new Result<SysPosition>();
@ -132,7 +132,7 @@ public class SysPositionController {
* @return * @return
*/ */
@AutoLog(value = "职务表-编辑") @AutoLog(value = "职务表-编辑")
@ApiOperation(value = "职务表-编辑", notes = "职务表-编辑") @Operation(summary = "职务表-编辑")
@RequestMapping(value = "/edit", method ={RequestMethod.PUT, RequestMethod.POST}) @RequestMapping(value = "/edit", method ={RequestMethod.PUT, RequestMethod.POST})
public Result<SysPosition> edit(@RequestBody SysPosition sysPosition) { public Result<SysPosition> edit(@RequestBody SysPosition sysPosition) {
Result<SysPosition> result = new Result<SysPosition>(); Result<SysPosition> result = new Result<SysPosition>();
@ -157,7 +157,7 @@ public class SysPositionController {
* @return * @return
*/ */
@AutoLog(value = "职务表-通过id删除") @AutoLog(value = "职务表-通过id删除")
@ApiOperation(value = "职务表-通过id删除", notes = "职务表-通过id删除") @Operation(summary = "职务表-通过id删除")
@DeleteMapping(value = "/delete") @DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name = "id", required = true) String id) { public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
try { try {
@ -178,7 +178,7 @@ public class SysPositionController {
* @return * @return
*/ */
@AutoLog(value = "职务表-批量删除") @AutoLog(value = "职务表-批量删除")
@ApiOperation(value = "职务表-批量删除", notes = "职务表-批量删除") @Operation(summary = "职务表-批量删除")
@DeleteMapping(value = "/deleteBatch") @DeleteMapping(value = "/deleteBatch")
public Result<SysPosition> deleteBatch(@RequestParam(name = "ids", required = true) String ids) { public Result<SysPosition> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
Result<SysPosition> result = new Result<SysPosition>(); Result<SysPosition> result = new Result<SysPosition>();
@ -198,7 +198,7 @@ public class SysPositionController {
* @return * @return
*/ */
@AutoLog(value = "职务表-通过id查询") @AutoLog(value = "职务表-通过id查询")
@ApiOperation(value = "职务表-通过id查询", notes = "职务表-通过id查询") @Operation(summary = "职务表-通过id查询")
@GetMapping(value = "/queryById") @GetMapping(value = "/queryById")
public Result<SysPosition> queryById(@RequestParam(name = "id", required = true) String id) { public Result<SysPosition> queryById(@RequestParam(name = "id", required = true) String id) {
Result<SysPosition> result = new Result<SysPosition>(); Result<SysPosition> result = new Result<SysPosition>();
@ -298,7 +298,7 @@ public class SysPositionController {
* @return * @return
*/ */
@AutoLog(value = "职务表-通过code查询") @AutoLog(value = "职务表-通过code查询")
@ApiOperation(value = "职务表-通过code查询", notes = "职务表-通过code查询") @Operation(summary = "职务表-通过code查询")
@GetMapping(value = "/queryByCode") @GetMapping(value = "/queryByCode")
public Result<SysPosition> queryByCode(@RequestParam(name = "code", required = true) String code) { public Result<SysPosition> queryByCode(@RequestParam(name = "code", required = true) String code) {
Result<SysPosition> result = new Result<SysPosition>(); Result<SysPosition> result = new Result<SysPosition>();
@ -322,7 +322,7 @@ public class SysPositionController {
* @return * @return
*/ */
@AutoLog(value = "职务表-通过多个查询") @AutoLog(value = "职务表-通过多个查询")
@ApiOperation(value = "职务表-通过多个id查询", notes = "职务表-通过多个id查询") @Operation(summary = "职务表-通过多个id查询")
@GetMapping(value = "/queryByIds") @GetMapping(value = "/queryByIds")
public Result<List<SysPosition>> queryByIds(@RequestParam(name = "ids") String ids) { public Result<List<SysPosition>> queryByIds(@RequestParam(name = "ids") String ids) {
Result<List<SysPosition>> result = new Result<>(); Result<List<SysPosition>> result = new Result<>();

4
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleController.java
View File

@ -10,8 +10,8 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.RandomUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO; import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;

25
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleIndexController.java
View File

@ -1,8 +1,11 @@
package org.jeecg.modules.system.controller; package org.jeecg.modules.system.controller;
import java.util.Arrays; import java.util.Arrays;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
@ -22,8 +25,6 @@ import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
/** /**
* @Description: 角色首页配置 * @Description: 角色首页配置
@ -32,7 +33,7 @@ import io.swagger.annotations.ApiOperation;
* @Version: V1.0 * @Version: V1.0
*/ */
@Slf4j @Slf4j
@Api(tags = "角色首页配置") @Tag(name = "角色首页配置")
@RestController @RestController
@RequestMapping("/sys/sysRoleIndex") @RequestMapping("/sys/sysRoleIndex")
public class SysRoleIndexController extends JeecgController<SysRoleIndex, ISysRoleIndexService> { public class SysRoleIndexController extends JeecgController<SysRoleIndex, ISysRoleIndexService> {
@ -49,7 +50,7 @@ public class SysRoleIndexController extends JeecgController<SysRoleIndex, ISysRo
* @return * @return
*/ */
@AutoLog(value = "角色首页配置-分页列表查询") @AutoLog(value = "角色首页配置-分页列表查询")
@ApiOperation(value = "角色首页配置-分页列表查询", notes = "角色首页配置-分页列表查询") @Operation(summary = "角色首页配置-分页列表查询")
@GetMapping(value = "/list") @GetMapping(value = "/list")
public Result<?> queryPageList(SysRoleIndex sysRoleIndex, public Result<?> queryPageList(SysRoleIndex sysRoleIndex,
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@ -69,7 +70,7 @@ public class SysRoleIndexController extends JeecgController<SysRoleIndex, ISysRo
*/ */
@RequiresPermissions("system:roleindex:add") @RequiresPermissions("system:roleindex:add")
@AutoLog(value = "角色首页配置-添加") @AutoLog(value = "角色首页配置-添加")
@ApiOperation(value = "角色首页配置-添加", notes = "角色首页配置-添加") @Operation(summary = "角色首页配置-添加")
@PostMapping(value = "/add") @PostMapping(value = "/add")
//@DynamicTable(value = DynamicTableConstant.SYS_ROLE_INDEX) //@DynamicTable(value = DynamicTableConstant.SYS_ROLE_INDEX)
public Result<?> add(@RequestBody SysRoleIndex sysRoleIndex,HttpServletRequest request) { public Result<?> add(@RequestBody SysRoleIndex sysRoleIndex,HttpServletRequest request) {
@ -85,7 +86,7 @@ public class SysRoleIndexController extends JeecgController<SysRoleIndex, ISysRo
*/ */
@RequiresPermissions("system:roleindex:edit") @RequiresPermissions("system:roleindex:edit")
@AutoLog(value = "角色首页配置-编辑") @AutoLog(value = "角色首页配置-编辑")
@ApiOperation(value = "角色首页配置-编辑", notes = "角色首页配置-编辑") @Operation(summary = "角色首页配置-编辑")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
//@DynamicTable(value = DynamicTableConstant.SYS_ROLE_INDEX) //@DynamicTable(value = DynamicTableConstant.SYS_ROLE_INDEX)
public Result<?> edit(@RequestBody SysRoleIndex sysRoleIndex,HttpServletRequest request) { public Result<?> edit(@RequestBody SysRoleIndex sysRoleIndex,HttpServletRequest request) {
@ -100,7 +101,7 @@ public class SysRoleIndexController extends JeecgController<SysRoleIndex, ISysRo
* @return * @return
*/ */
@AutoLog(value = "角色首页配置-通过id删除") @AutoLog(value = "角色首页配置-通过id删除")
@ApiOperation(value = "角色首页配置-通过id删除", notes = "角色首页配置-通过id删除") @Operation(summary = "角色首页配置-通过id删除")
@DeleteMapping(value = "/delete") @DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name = "id", required = true) String id) { public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
sysRoleIndexService.removeById(id); sysRoleIndexService.removeById(id);
@ -114,7 +115,7 @@ public class SysRoleIndexController extends JeecgController<SysRoleIndex, ISysRo
* @return * @return
*/ */
@AutoLog(value = "角色首页配置-批量删除") @AutoLog(value = "角色首页配置-批量删除")
@ApiOperation(value = "角色首页配置-批量删除", notes = "角色首页配置-批量删除") @Operation(summary = "角色首页配置-批量删除")
@DeleteMapping(value = "/deleteBatch") @DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) { public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
this.sysRoleIndexService.removeByIds(Arrays.asList(ids.split(","))); this.sysRoleIndexService.removeByIds(Arrays.asList(ids.split(",")));
@ -128,7 +129,7 @@ public class SysRoleIndexController extends JeecgController<SysRoleIndex, ISysRo
* @return * @return
*/ */
@AutoLog(value = "角色首页配置-通过id查询") @AutoLog(value = "角色首页配置-通过id查询")
@ApiOperation(value = "角色首页配置-通过id查询", notes = "角色首页配置-通过id查询") @Operation(summary = "角色首页配置-通过id查询")
@GetMapping(value = "/queryById") @GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name = "id", required = true) String id) { public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
SysRoleIndex sysRoleIndex = sysRoleIndexService.getById(id); SysRoleIndex sysRoleIndex = sysRoleIndexService.getById(id);
@ -165,7 +166,7 @@ public class SysRoleIndexController extends JeecgController<SysRoleIndex, ISysRo
* @return * @return
*/ */
@AutoLog(value = "角色首页配置-通过code查询") @AutoLog(value = "角色首页配置-通过code查询")
@ApiOperation(value = "角色首页配置-通过code查询", notes = "角色首页配置-通过code查询") @Operation(summary = "角色首页配置-通过code查询")
@GetMapping(value = "/queryByCode") @GetMapping(value = "/queryByCode")
//@DynamicTable(value = DynamicTableConstant.SYS_ROLE_INDEX) //@DynamicTable(value = DynamicTableConstant.SYS_ROLE_INDEX)
public Result<?> queryByCode(@RequestParam(name = "roleCode", required = true) String roleCode,HttpServletRequest request) { public Result<?> queryByCode(@RequestParam(name = "roleCode", required = true) String roleCode,HttpServletRequest request) {

20
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTableWhiteListController.java
View File

@ -3,10 +3,10 @@ package org.jeecg.modules.system.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api; import io.swagger.v3.oas.annotations.Operation;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresRoles;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.base.controller.JeecgController;
@ -16,8 +16,6 @@ import org.jeecg.modules.system.service.ISysTableWhiteListService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
/** /**
* @Description: 系统表白名单 * @Description: 系统表白名单
* @Author: jeecg-boot * @Author: jeecg-boot
@ -25,7 +23,7 @@ import javax.servlet.http.HttpServletRequest;
* @Version: V1.0 * @Version: V1.0
*/ */
@Slf4j @Slf4j
@Api(tags = "系统表白名单") @Tag(name = "系统表白名单")
@RestController @RestController
@RequestMapping("/sys/tableWhiteList") @RequestMapping("/sys/tableWhiteList")
public class SysTableWhiteListController extends JeecgController<SysTableWhiteList, ISysTableWhiteListService> { public class SysTableWhiteListController extends JeecgController<SysTableWhiteList, ISysTableWhiteListService> {
@ -63,7 +61,7 @@ public class SysTableWhiteListController extends JeecgController<SysTableWhiteLi
* @return * @return
*/ */
@AutoLog(value = "系统表白名单-添加") @AutoLog(value = "系统表白名单-添加")
@ApiOperation(value = "系统表白名单-添加", notes = "系统表白名单-添加") @Operation(summary = "系统表白名单-添加")
//@RequiresRoles("admin") //@RequiresRoles("admin")
@PostMapping(value = "/add") @PostMapping(value = "/add")
public Result<?> add(@RequestBody SysTableWhiteList sysTableWhiteList) { public Result<?> add(@RequestBody SysTableWhiteList sysTableWhiteList) {
@ -81,7 +79,7 @@ public class SysTableWhiteListController extends JeecgController<SysTableWhiteLi
* @return * @return
*/ */
@AutoLog(value = "系统表白名单-编辑") @AutoLog(value = "系统表白名单-编辑")
@ApiOperation(value = "系统表白名单-编辑", notes = "系统表白名单-编辑") @Operation(summary = "系统表白名单-编辑")
//@RequiresRoles("admin") //@RequiresRoles("admin")
@RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
public Result<?> edit(@RequestBody SysTableWhiteList sysTableWhiteList) { public Result<?> edit(@RequestBody SysTableWhiteList sysTableWhiteList) {
@ -99,7 +97,7 @@ public class SysTableWhiteListController extends JeecgController<SysTableWhiteLi
* @return * @return
*/ */
@AutoLog(value = "系统表白名单-通过id删除") @AutoLog(value = "系统表白名单-通过id删除")
@ApiOperation(value = "系统表白名单-通过id删除", notes = "系统表白名单-通过id删除") @Operation(summary = "系统表白名单-通过id删除")
//@RequiresRoles("admin") //@RequiresRoles("admin")
@DeleteMapping(value = "/delete") @DeleteMapping(value = "/delete")
public Result<?> delete(@RequestParam(name = "id") String id) { public Result<?> delete(@RequestParam(name = "id") String id) {
@ -117,7 +115,7 @@ public class SysTableWhiteListController extends JeecgController<SysTableWhiteLi
* @return * @return
*/ */
@AutoLog(value = "系统表白名单-批量删除") @AutoLog(value = "系统表白名单-批量删除")
@ApiOperation(value = "系统表白名单-批量删除", notes = "系统表白名单-批量删除") @Operation(summary = "系统表白名单-批量删除")
//@RequiresRoles("admin") //@RequiresRoles("admin")
@DeleteMapping(value = "/deleteBatch") @DeleteMapping(value = "/deleteBatch")
public Result<?> deleteBatch(@RequestParam(name = "ids") String ids) { public Result<?> deleteBatch(@RequestParam(name = "ids") String ids) {
@ -135,7 +133,7 @@ public class SysTableWhiteListController extends JeecgController<SysTableWhiteLi
* @return * @return
*/ */
@AutoLog(value = "系统表白名单-通过id查询") @AutoLog(value = "系统表白名单-通过id查询")
@ApiOperation(value = "系统表白名单-通过id查询", notes = "系统表白名单-通过id查询") @Operation(summary = "系统表白名单-通过id查询")
//@RequiresRoles("admin") //@RequiresRoles("admin")
@GetMapping(value = "/queryById") @GetMapping(value = "/queryById")
public Result<?> queryById(@RequestParam(name = "id", required = true) String id) { public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysTenantController.java
View File

@ -35,7 +35,7 @@ import org.jeecg.modules.system.vo.tenant.TenantPackUserCount;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import java.util.*; import java.util.*;
/** /**

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUploadController.java
View File

@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.multipart.MultipartHttpServletRequest;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
/** /**
* minio文件上传示例 * minio文件上传示例

4
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserAgentController.java
View File

@ -7,8 +7,8 @@ import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;

4
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
View File

@ -46,8 +46,8 @@ import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserOnlineController.java
View File

@ -20,7 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import jakarta.annotation.Resource;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdAppController.java
View File

@ -26,7 +26,7 @@ import org.jeecg.modules.system.vo.thirdapp.SyncInfoVo;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;

8
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdLoginController.java
View File

@ -5,7 +5,7 @@ import cn.hutool.core.util.RandomUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.xkcoding.justauth.AuthRequestFactory; import com.xkcoding.justauth.AuthRequestFactory;
import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.Operation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import me.zhyd.oauth.model.AuthCallback; import me.zhyd.oauth.model.AuthCallback;
import me.zhyd.oauth.model.AuthResponse; import me.zhyd.oauth.model.AuthResponse;
@ -32,8 +32,8 @@ import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap; import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.net.URLEncoder; import java.net.URLEncoder;
@ -270,7 +270,7 @@ public class ThirdLoginController {
* @param jsonObject * @param jsonObject
* @return * @return
*/ */
@ApiOperation("手机号登录接口") @Operation(summary ="手机号登录接口")
@PostMapping("/bindingThirdPhone") @PostMapping("/bindingThirdPhone")
@ResponseBody @ResponseBody
public Result<String> bindingThirdPhone(@RequestBody JSONObject jsonObject) { public Result<String> bindingThirdPhone(@RequestBody JSONObject jsonObject) {

23
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysCheckRule.java
View File

@ -4,8 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
@ -24,44 +23,44 @@ import java.util.Date;
@TableName("sys_check_rule") @TableName("sys_check_rule")
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(value = "sys_check_rule对象", description = "编码校验规则") @Schema(description = "sys_check_rule对象")
public class SysCheckRule { public class SysCheckRule {
/** /**
* 主键id * 主键id
*/ */
@TableId(type = IdType.ASSIGN_ID) @TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键id") @Schema(description = "主键id")
private String id; private String id;
/** /**
* 规则名称 * 规则名称
*/ */
@Excel(name = "规则名称", width = 15) @Excel(name = "规则名称", width = 15)
@ApiModelProperty(value = "规则名称") @Schema(description = "规则名称")
private String ruleName; private String ruleName;
/** /**
* 规则Code * 规则Code
*/ */
@Excel(name = "规则Code", width = 15) @Excel(name = "规则Code", width = 15)
@ApiModelProperty(value = "规则Code") @Schema(description = "规则Code")
private String ruleCode; private String ruleCode;
/** /**
* 规则JSON * 规则JSON
*/ */
@Excel(name = "规则JSON", width = 15) @Excel(name = "规则JSON", width = 15)
@ApiModelProperty(value = "规则JSON") @Schema(description = "规则JSON")
private String ruleJson; private String ruleJson;
/** /**
* 规则描述 * 规则描述
*/ */
@Excel(name = "规则描述", width = 15) @Excel(name = "规则描述", width = 15)
@ApiModelProperty(value = "规则描述") @Schema(description = "规则描述")
private String ruleDescription; private String ruleDescription;
/** /**
* 更新人 * 更新人
*/ */
@Excel(name = "更新人", width = 15) @Excel(name = "更新人", width = 15)
@ApiModelProperty(value = "更新人") @Schema(description = "更新人")
private String updateBy; private String updateBy;
/** /**
* 更新时间 * 更新时间
@ -69,13 +68,13 @@ public class SysCheckRule {
@Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新时间") @Schema(description = "更新时间")
private Date updateTime; private Date updateTime;
/** /**
* 创建人 * 创建人
*/ */
@Excel(name = "创建人", width = 15) @Excel(name = "创建人", width = 15)
@ApiModelProperty(value = "创建人") @Schema(description = "创建人")
private String createBy; private String createBy;
/** /**
* 创建时间 * 创建时间
@ -83,6 +82,6 @@ public class SysCheckRule {
@Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建时间") @Schema(description = "创建时间")
private Date createTime; private Date createTime;
} }

27
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysComment.java
View File

@ -4,8 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
@ -26,55 +25,55 @@ import java.util.Date;
@TableName("sys_comment") @TableName("sys_comment")
@Accessors(chain = true) @Accessors(chain = true)
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
@ApiModel(value="sys_comment对象", description="系统评论回复表") @Schema(description="sys_comment对象")
public class SysComment implements Serializable { public class SysComment implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/**id*/ /**id*/
@TableId(type = IdType.ASSIGN_ID) @TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id") @Schema(description = "id")
private String id; private String id;
/**表名*/ /**表名*/
@Excel(name = "表名", width = 15) @Excel(name = "表名", width = 15)
@ApiModelProperty(value = "表名") @Schema(description = "表名")
private String tableName; private String tableName;
/**数据id*/ /**数据id*/
@Excel(name = "数据id", width = 15) @Excel(name = "数据id", width = 15)
@ApiModelProperty(value = "数据id") @Schema(description = "数据id")
private String tableDataId; private String tableDataId;
/**来源用户id*/ /**来源用户id*/
@Excel(name = "来源用户id", width = 15) @Excel(name = "来源用户id", width = 15)
@ApiModelProperty(value = "来源用户id") @Schema(description = "来源用户id")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
private String fromUserId; private String fromUserId;
/**发送给用户id(允许为空)*/ /**发送给用户id(允许为空)*/
@Excel(name = "发送给用户id(允许为空)", width = 15) @Excel(name = "发送给用户id(允许为空)", width = 15)
@ApiModelProperty(value = "发送给用户id(允许为空)") @Schema(description = "发送给用户id(允许为空)")
@Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname") @Dict(dictTable = "sys_user", dicCode = "id", dicText = "realname")
private String toUserId; private String toUserId;
/**评论id(允许为空，不为空时，则为回复)*/ /**评论id(允许为空，不为空时，则为回复)*/
@Excel(name = "评论id(允许为空，不为空时，则为回复)", width = 15) @Excel(name = "评论id(允许为空，不为空时，则为回复)", width = 15)
@ApiModelProperty(value = "评论id(允许为空，不为空时，则为回复)") @Schema(description = "评论id(允许为空，不为空时，则为回复)")
@Dict(dictTable = "sys_comment", dicCode = "id", dicText = "comment_content") @Dict(dictTable = "sys_comment", dicCode = "id", dicText = "comment_content")
private String commentId; private String commentId;
/**回复内容*/ /**回复内容*/
@Excel(name = "回复内容", width = 15) @Excel(name = "回复内容", width = 15)
@ApiModelProperty(value = "回复内容") @Schema(description = "回复内容")
private String commentContent; private String commentContent;
/**创建人*/ /**创建人*/
@ApiModelProperty(value = "创建人") @Schema(description = "创建人")
private String createBy; private String createBy;
/**创建日期*/ /**创建日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期") @Schema(description = "创建日期")
private Date createTime; private Date createTime;
/**更新人*/ /**更新人*/
@ApiModelProperty(value = "更新人") @Schema(description = "更新人")
private String updateBy; private String updateBy;
/**更新日期*/ /**更新日期*/
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期") @Schema(description = "更新日期")
private Date updateTime; private Date updateTime;
} }

37
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDataSource.java
View File

@ -4,8 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
@ -23,102 +22,102 @@ import org.springframework.format.annotation.DateTimeFormat;
@TableName("sys_data_source") @TableName("sys_data_source")
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(value = "sys_data_source对象", description = "多数据源管理") @Schema(description = "sys_data_source对象")
public class SysDataSource { public class SysDataSource {
/** /**
* id * id
*/ */
@TableId(type = IdType.ASSIGN_ID) @TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id") @Schema(description = "id")
private java.lang.String id; private java.lang.String id;
/** /**
* 数据源编码 * 数据源编码
*/ */
@Excel(name = "数据源编码", width = 15) @Excel(name = "数据源编码", width = 15)
@ApiModelProperty(value = "数据源编码") @Schema(description = "数据源编码")
private java.lang.String code; private java.lang.String code;
/** /**
* 数据源名称 * 数据源名称
*/ */
@Excel(name = "数据源名称", width = 15) @Excel(name = "数据源名称", width = 15)
@ApiModelProperty(value = "数据源名称") @Schema(description = "数据源名称")
private java.lang.String name; private java.lang.String name;
/** /**
* 描述 * 描述
*/ */
@Excel(name = "备注", width = 15) @Excel(name = "备注", width = 15)
@ApiModelProperty(value = "备注") @Schema(description = "备注")
private java.lang.String remark; private java.lang.String remark;
/** /**
* 数据库类型 * 数据库类型
*/ */
@Dict(dicCode = "database_type") @Dict(dicCode = "database_type")
@Excel(name = "数据库类型", width = 15, dicCode = "database_type") @Excel(name = "数据库类型", width = 15, dicCode = "database_type")
@ApiModelProperty(value = "数据库类型") @Schema(description = "数据库类型")
private java.lang.String dbType; private java.lang.String dbType;
/** /**
* 驱动类 * 驱动类
*/ */
@Excel(name = "驱动类", width = 15) @Excel(name = "驱动类", width = 15)
@ApiModelProperty(value = "驱动类") @Schema(description = "驱动类")
private java.lang.String dbDriver; private java.lang.String dbDriver;
/** /**
* 数据源地址 * 数据源地址
*/ */
@Excel(name = "数据源地址", width = 15) @Excel(name = "数据源地址", width = 15)
@ApiModelProperty(value = "数据源地址") @Schema(description = "数据源地址")
private java.lang.String dbUrl; private java.lang.String dbUrl;
/** /**
* 数据库名称 * 数据库名称
*/ */
@Excel(name = "数据库名称", width = 15) @Excel(name = "数据库名称", width = 15)
@ApiModelProperty(value = "数据库名称") @Schema(description = "数据库名称")
private java.lang.String dbName; private java.lang.String dbName;
/** /**
* 用户名 * 用户名
*/ */
@Excel(name = "用户名", width = 15) @Excel(name = "用户名", width = 15)
@ApiModelProperty(value = "用户名") @Schema(description = "用户名")
private java.lang.String dbUsername; private java.lang.String dbUsername;
/** /**
* 密码 * 密码
*/ */
@Excel(name = "密码", width = 15) @Excel(name = "密码", width = 15)
@ApiModelProperty(value = "密码") @Schema(description = "密码")
private java.lang.String dbPassword; private java.lang.String dbPassword;
/** /**
* 创建人 * 创建人
*/ */
@ApiModelProperty(value = "创建人") @Schema(description = "创建人")
private java.lang.String createBy; private java.lang.String createBy;
/** /**
* 创建日期 * 创建日期
*/ */
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期") @Schema(description = "创建日期")
private java.util.Date createTime; private java.util.Date createTime;
/** /**
* 更新人 * 更新人
*/ */
@ApiModelProperty(value = "更新人") @Schema(description = "更新人")
private java.lang.String updateBy; private java.lang.String updateBy;
/** /**
* 更新日期 * 更新日期
*/ */
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期") @Schema(description = "更新日期")
private java.util.Date updateTime; private java.util.Date updateTime;
/** /**
* 所属部门 * 所属部门
*/ */
@Excel(name = "所属部门", width = 15) @Excel(name = "所属部门", width = 15)
@ApiModelProperty(value = "所属部门") @Schema(description = "所属部门")
private java.lang.String sysOrgCode; private java.lang.String sysOrgCode;
/**租户ID*/ /**租户ID*/
@ApiModelProperty(value = "租户ID") @Schema(description = "租户ID")
private java.lang.Integer tenantId; private java.lang.Integer tenantId;
} }

18
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartPermission.java
View File

@ -1,18 +1,12 @@
package org.jeecg.modules.system.entity; package org.jeecg.modules.system.entity;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecgframework.poi.excel.annotation.Excel;
/** /**
@ -25,23 +19,23 @@ import org.jeecgframework.poi.excel.annotation.Excel;
@TableName("sys_depart_permission") @TableName("sys_depart_permission")
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(value="sys_depart_permission对象", description="部门权限表") @Schema(description="部门权限表")
public class SysDepartPermission { public class SysDepartPermission {
/**id*/ /**id*/
@TableId(type = IdType.ASSIGN_ID) @TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id") @Schema(description = "id")
private java.lang.String id; private java.lang.String id;
/**部门id*/ /**部门id*/
@Excel(name = "部门id", width = 15) @Excel(name = "部门id", width = 15)
@ApiModelProperty(value = "部门id") @Schema(description = "部门id")
private java.lang.String departId; private java.lang.String departId;
/**权限id*/ /**权限id*/
@Excel(name = "权限id", width = 15) @Excel(name = "权限id", width = 15)
@ApiModelProperty(value = "权限id") @Schema(description = "权限id")
private java.lang.String permissionId; private java.lang.String permissionId;
/**数据规则id*/ /**数据规则id*/
@ApiModelProperty(value = "数据规则id") @Schema(description = "数据规则id")
private java.lang.String dataRuleIds; private java.lang.String dataRuleIds;
public SysDepartPermission() { public SysDepartPermission() {

30
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRole.java
View File

@ -1,20 +1,16 @@
package org.jeecg.modules.system.entity; package org.jeecg.modules.system.entity;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.jeecg.common.aspect.annotation.Dict; import org.jeecg.common.aspect.annotation.Dict;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
/** /**
* @Description: 部门角色 * @Description: 部门角色
@ -26,49 +22,49 @@ import org.jeecgframework.poi.excel.annotation.Excel;
@TableName("sys_depart_role") @TableName("sys_depart_role")
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(value="sys_depart_role对象", description="部门角色") @Schema(description="sys_depart_role对象")
public class SysDepartRole { public class SysDepartRole {
/**id*/ /**id*/
@TableId(type = IdType.ASSIGN_ID) @TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id") @Schema(description = "id")
private java.lang.String id; private java.lang.String id;
/**部门id*/ /**部门id*/
@Excel(name = "部门id", width = 15) @Excel(name = "部门id", width = 15)
@ApiModelProperty(value = "部门id") @Schema(description = "部门id")
@Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id") @Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id")
private java.lang.String departId; private java.lang.String departId;
/**部门角色名称*/ /**部门角色名称*/
@Excel(name = "部门角色名称", width = 15) @Excel(name = "部门角色名称", width = 15)
@ApiModelProperty(value = "部门角色名称") @Schema(description = "部门角色名称")
private java.lang.String roleName; private java.lang.String roleName;
/**部门角色编码*/ /**部门角色编码*/
@Excel(name = "部门角色编码", width = 15) @Excel(name = "部门角色编码", width = 15)
@ApiModelProperty(value = "部门角色编码") @Schema(description = "部门角色编码")
private java.lang.String roleCode; private java.lang.String roleCode;
/**描述*/ /**描述*/
@Excel(name = "描述", width = 15) @Excel(name = "描述", width = 15)
@ApiModelProperty(value = "描述") @Schema(description = "描述")
private java.lang.String description; private java.lang.String description;
/**创建人*/ /**创建人*/
@Excel(name = "创建人", width = 15) @Excel(name = "创建人", width = 15)
@ApiModelProperty(value = "创建人") @Schema(description = "创建人")
private java.lang.String createBy; private java.lang.String createBy;
/**创建时间*/ /**创建时间*/
@Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建时间") @Schema(description = "创建时间")
private java.util.Date createTime; private java.util.Date createTime;
/**更新人*/ /**更新人*/
@Excel(name = "更新人", width = 15) @Excel(name = "更新人", width = 15)
@ApiModelProperty(value = "更新人") @Schema(description = "更新人")
private java.lang.String updateBy; private java.lang.String updateBy;
/**更新时间*/ /**更新时间*/
@Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新时间") @Schema(description = "更新时间")
private java.util.Date updateTime; private java.util.Date updateTime;

24
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRolePermission.java
View File

@ -1,19 +1,15 @@
package org.jeecg.modules.system.entity; package org.jeecg.modules.system.entity;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
/** /**
* @Description: 部门角色权限 * @Description: 部门角色权限
@ -25,34 +21,34 @@ import org.jeecgframework.poi.excel.annotation.Excel;
@TableName("sys_depart_role_permission") @TableName("sys_depart_role_permission")
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(value="sys_depart_role_permission对象", description="部门角色权限") @Schema(description="sys_depart_role_permission对象")
public class SysDepartRolePermission { public class SysDepartRolePermission {
/**id*/ /**id*/
@TableId(type = IdType.ASSIGN_ID) @TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id") @Schema(description = "id")
private java.lang.String id; private java.lang.String id;
/**部门id*/ /**部门id*/
@Excel(name = "部门id", width = 15) @Excel(name = "部门id", width = 15)
@ApiModelProperty(value = "部门id") @Schema(description = "部门id")
private java.lang.String departId; private java.lang.String departId;
/**角色id*/ /**角色id*/
@Excel(name = "角色id", width = 15) @Excel(name = "角色id", width = 15)
@ApiModelProperty(value = "角色id") @Schema(description = "角色id")
private java.lang.String roleId; private java.lang.String roleId;
/**权限id*/ /**权限id*/
@Excel(name = "权限id", width = 15) @Excel(name = "权限id", width = 15)
@ApiModelProperty(value = "权限id") @Schema(description = "权限id")
private java.lang.String permissionId; private java.lang.String permissionId;
/**dataRuleIds*/ /**dataRuleIds*/
@Excel(name = "dataRuleIds", width = 15) @Excel(name = "dataRuleIds", width = 15)
@ApiModelProperty(value = "dataRuleIds") @Schema(description = "dataRuleIds")
private java.lang.String dataRuleIds; private java.lang.String dataRuleIds;
/** 操作时间 */ /** 操作时间 */
@Excel(name = "操作时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @Excel(name = "操作时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "操作时间") @Schema(description = "操作时间")
private java.util.Date operateDate; private java.util.Date operateDate;
/** 操作ip */ /** 操作ip */
private java.lang.String operateIp; private java.lang.String operateIp;

16
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepartRoleUser.java
View File

@ -1,18 +1,12 @@
package org.jeecg.modules.system.entity; package org.jeecg.modules.system.entity;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecgframework.poi.excel.annotation.Excel;
/** /**
@ -25,20 +19,20 @@ import org.jeecgframework.poi.excel.annotation.Excel;
@TableName("sys_depart_role_user") @TableName("sys_depart_role_user")
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(value="sys_depart_role_user对象", description="部门角色人员信息") @Schema(description="sys_depart_role_user对象")
public class SysDepartRoleUser { public class SysDepartRoleUser {
/**主键id*/ /**主键id*/
@TableId(type = IdType.ASSIGN_ID) @TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键id") @Schema(description = "主键id")
private java.lang.String id; private java.lang.String id;
/**用户id*/ /**用户id*/
@Excel(name = "用户id", width = 15) @Excel(name = "用户id", width = 15)
@ApiModelProperty(value = "用户id") @Schema(description = "用户id")
private java.lang.String userId; private java.lang.String userId;
/**角色id*/ /**角色id*/
@Excel(name = "角色id", width = 15) @Excel(name = "角色id", width = 15)
@ApiModelProperty(value = "角色id") @Schema(description = "角色id")
private java.lang.String droleId; private java.lang.String droleId;
public SysDepartRoleUser() { public SysDepartRoleUser() {

50
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFiles.java
View File

@ -5,14 +5,14 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict; import org.jeecg.common.aspect.annotation.Dict;
import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date; import java.util.Date;
/** /**
@ -25,101 +25,101 @@ import java.util.Date;
@TableName("sys_files") @TableName("sys_files")
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(value="sys_files对象", description="知识库-文档管理") @Schema(description="sys_files对象")
public class SysFiles { public class SysFiles {
/**主键id*/ /**主键id*/
@TableId(type = IdType.ASSIGN_ID) @TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键id") @Schema(description = "主键id")
private String id; private String id;
/**文件名称*/ /**文件名称*/
@Excel(name = "文件名称", width = 15) @Excel(name = "文件名称", width = 15)
@ApiModelProperty(value = "文件名称") @Schema(description = "文件名称")
private String fileName; private String fileName;
/**文件地址*/ /**文件地址*/
@Excel(name = "文件地址", width = 15) @Excel(name = "文件地址", width = 15)
@ApiModelProperty(value = "文件地址") @Schema(description = "文件地址")
private String url; private String url;
/**创建人登录名称*/ /**创建人登录名称*/
@Excel(name = "创建人登录名称", width = 15) @Excel(name = "创建人登录名称", width = 15)
@Dict(dicCode = "username",dicText = "realname",dictTable = "sys_user") @Dict(dicCode = "username",dicText = "realname",dictTable = "sys_user")
@ApiModelProperty(value = "创建人登录名称") @Schema(description = "创建人登录名称")
private String createBy; private String createBy;
/**创建日期*/ /**创建日期*/
@Excel(name = "创建日期", width = 20, format = "yyyy-MM-dd HH:mm:ss") @Excel(name = "创建日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期") @Schema(description = "创建日期")
private Date createTime; private Date createTime;
/**更新人登录名称*/ /**更新人登录名称*/
@Excel(name = "更新人登录名称", width = 15) @Excel(name = "更新人登录名称", width = 15)
@ApiModelProperty(value = "更新人登录名称") @Schema(description = "更新人登录名称")
private String updateBy; private String updateBy;
/**更新日期*/ /**更新日期*/
@Excel(name = "更新日期", width = 20, format = "yyyy-MM-dd HH:mm:ss") @Excel(name = "更新日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期") @Schema(description = "更新日期")
private Date updateTime; private Date updateTime;
/**文档类型（folder:文件夹 excel:excel doc:word pp:ppt image:图片 archive:其他文档 video:视频）*/ /**文档类型（folder:文件夹 excel:excel doc:word pp:ppt image:图片 archive:其他文档 video:视频）*/
@Excel(name = "文档类型（folder:文件夹 excel:excel doc:word pp:ppt image:图片 archive:其他文档 video:视频）", width = 15) @Excel(name = "文档类型（folder:文件夹 excel:excel doc:word pp:ppt image:图片 archive:其他文档 video:视频）", width = 15)
@ApiModelProperty(value = "文档类型（folder:文件夹 excel:excel doc:word pp:ppt image:图片 archive:其他文档 video:视频）") @Schema(description = "文档类型（folder:文件夹 excel:excel doc:word pp:ppt image:图片 archive:其他文档 video:视频）")
private String fileType; private String fileType;
/**文件上传类型(temp/本地上传(临时文件) manage/知识库 comment)*/ /**文件上传类型(temp/本地上传(临时文件) manage/知识库 comment)*/
@Excel(name = "文件上传类型(temp/本地上传(临时文件) manage/知识库 common(通用上传))", width = 15) @Excel(name = "文件上传类型(temp/本地上传(临时文件) manage/知识库 common(通用上传))", width = 15)
@ApiModelProperty(value = "文件上传类型(temp/本地上传(临时文件) manage/知识库)") @Schema(description = "文件上传类型(temp/本地上传(临时文件) manage/知识库)")
private String storeType; private String storeType;
/**父级id*/ /**父级id*/
@Excel(name = "父级id", width = 15) @Excel(name = "父级id", width = 15)
@ApiModelProperty(value = "父级id") @Schema(description = "父级id")
private String parentId; private String parentId;
/**租户id*/ /**租户id*/
@Excel(name = "租户id", width = 15) @Excel(name = "租户id", width = 15)
@ApiModelProperty(value = "租户id") @Schema(description = "租户id")
private String tenantId; private String tenantId;
/**文件大小（kb）*/ /**文件大小（kb）*/
@Excel(name = "文件大小（kb）", width = 15) @Excel(name = "文件大小（kb）", width = 15)
@ApiModelProperty(value = "文件大小（kb）") @Schema(description = "文件大小（kb）")
private Double fileSize; private Double fileSize;
/**是否文件夹(1：是 0：否)*/ /**是否文件夹(1：是 0：否)*/
@Excel(name = "是否文件夹(1：是 0：否)", width = 15) @Excel(name = "是否文件夹(1：是 0：否)", width = 15)
@ApiModelProperty(value = "是否文件夹(1：是 0：否)") @Schema(description = "是否文件夹(1：是 0：否)")
private String izFolder; private String izFolder;
/**是否为1级文件夹，允许为空 (1：是 )*/ /**是否为1级文件夹，允许为空 (1：是 )*/
@Excel(name = "是否为1级文件夹，允许为空 (1：是 )", width = 15) @Excel(name = "是否为1级文件夹，允许为空 (1：是 )", width = 15)
@ApiModelProperty(value = "是否为1级文件夹，允许为空 (1：是 )") @Schema(description = "是否为1级文件夹，允许为空 (1：是 )")
private String izRootFolder; private String izRootFolder;
/**是否标星(1：是 0：否)*/ /**是否标星(1：是 0：否)*/
@Excel(name = "是否标星(1：是 0：否)", width = 15) @Excel(name = "是否标星(1：是 0：否)", width = 15)
@ApiModelProperty(value = "是否标星(1：是 0：否)") @Schema(description = "是否标星(1：是 0：否)")
private String izStar; private String izStar;
/**下载次数*/ /**下载次数*/
@Excel(name = "下载次数", width = 15) @Excel(name = "下载次数", width = 15)
@ApiModelProperty(value = "下载次数") @Schema(description = "下载次数")
private Integer downCount; private Integer downCount;
/**阅读次数*/ /**阅读次数*/
@Excel(name = "阅读次数", width = 15) @Excel(name = "阅读次数", width = 15)
@ApiModelProperty(value = "阅读次数") @Schema(description = "阅读次数")
private Integer readCount; private Integer readCount;
/**分享链接*/ /**分享链接*/
@Excel(name = "分享链接", width = 15) @Excel(name = "分享链接", width = 15)
@ApiModelProperty(value = "分享链接") @Schema(description = "分享链接")
private String shareUrl; private String shareUrl;
/**分享权限(1.关闭分享 2.允许所有联系人查看 3.允许任何人查看)*/ /**分享权限(1.关闭分享 2.允许所有联系人查看 3.允许任何人查看)*/
@Excel(name = "分享权限(1.关闭分享 2.允许所有联系人查看 3.允许任何人查看)", width = 15) @Excel(name = "分享权限(1.关闭分享 2.允许所有联系人查看 3.允许任何人查看)", width = 15)
@ApiModelProperty(value = "分享权限(1.关闭分享 2.允许所有联系人查看 3.允许任何人查看)") @Schema(description = "分享权限(1.关闭分享 2.允许所有联系人查看 3.允许任何人查看)")
private String sharePerms; private String sharePerms;
/**是否允许下载(1：是 0：否)*/ /**是否允许下载(1：是 0：否)*/
@Excel(name = "是否允许下载(1：是 0：否)", width = 15) @Excel(name = "是否允许下载(1：是 0：否)", width = 15)
@ApiModelProperty(value = "是否允许下载(1：是 0：否)") @Schema(description = "是否允许下载(1：是 0：否)")
private String enableDown; private String enableDown;
/**是否允许修改(1：是 0：否)*/ /**是否允许修改(1：是 0：否)*/
@Excel(name = "是否允许修改(1：是 0：否)", width = 15) @Excel(name = "是否允许修改(1：是 0：否)", width = 15)
@ApiModelProperty(value = "是否允许修改(1：是 0：否)") @Schema(description = "是否允许修改(1：是 0：否)")
private String enableUpdat; private String enableUpdat;
/**删除状态(0-正常,1-删除至回收站)*/ /**删除状态(0-正常,1-删除至回收站)*/
@Excel(name = "删除状态(0-正常,1-删除至回收站)", width = 15) @Excel(name = "删除状态(0-正常,1-删除至回收站)", width = 15)
@ApiModelProperty(value = "删除状态(0-正常,1-删除至回收站)") @Schema(description = "删除状态(0-正常,1-删除至回收站)")
private String delFlag; private String delFlag;
/** /**

23
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysFillRule.java
View File

@ -4,8 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors; import lombok.experimental.Accessors;
@ -22,44 +21,44 @@ import org.springframework.format.annotation.DateTimeFormat;
@TableName("sys_fill_rule") @TableName("sys_fill_rule")
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
@Accessors(chain = true) @Accessors(chain = true)
@ApiModel(value = "sys_fill_rule对象", description = "填值规则") @Schema( description = "填值规则")
public class SysFillRule { public class SysFillRule {
/** /**
* 主键ID * 主键ID
*/ */
@TableId(type = IdType.ASSIGN_ID) @TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "主键ID") @Schema(description = "主键ID")
private java.lang.String id; private java.lang.String id;
/** /**
* 规则名称 * 规则名称
*/ */
@Excel(name = "规则名称", width = 15) @Excel(name = "规则名称", width = 15)
@ApiModelProperty(value = "规则名称") @Schema(description = "规则名称")
private java.lang.String ruleName; private java.lang.String ruleName;
/** /**
* 规则Code * 规则Code
*/ */
@Excel(name = "规则Code", width = 15) @Excel(name = "规则Code", width = 15)
@ApiModelProperty(value = "规则Code") @Schema(description = "规则Code")
private java.lang.String ruleCode; private java.lang.String ruleCode;
/** /**
* 规则实现类 * 规则实现类
*/ */
@Excel(name = "规则实现类", width = 15) @Excel(name = "规则实现类", width = 15)
@ApiModelProperty(value = "规则实现类") @Schema(description = "规则实现类")
private java.lang.String ruleClass; private java.lang.String ruleClass;
/** /**
* 规则参数 * 规则参数
*/ */
@Excel(name = "规则参数", width = 15) @Excel(name = "规则参数", width = 15)
@ApiModelProperty(value = "规则参数") @Schema(description = "规则参数")
private java.lang.String ruleParams; private java.lang.String ruleParams;
/** /**
* 修改人 * 修改人
*/ */
@Excel(name = "修改人", width = 15) @Excel(name = "修改人", width = 15)
@ApiModelProperty(value = "修改人") @Schema(description = "修改人")
private java.lang.String updateBy; private java.lang.String updateBy;
/** /**
* 修改时间 * 修改时间
@ -67,13 +66,13 @@ public class SysFillRule {
@Excel(name = "修改时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @Excel(name = "修改时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "修改时间") @Schema(description = "修改时间")
private java.util.Date updateTime; private java.util.Date updateTime;
/** /**
* 创建人 * 创建人
*/ */
@Excel(name = "创建人", width = 15) @Excel(name = "创建人", width = 15)
@ApiModelProperty(value = "创建人") @Schema(description = "创建人")
private java.lang.String createBy; private java.lang.String createBy;
/** /**
* 创建时间 * 创建时间
@ -81,6 +80,6 @@ public class SysFillRule {
@Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建时间") @Schema(description = "创建时间")
private java.util.Date createTime; private java.util.Date createTime;
} }

Some files were not shown because too many files have changed in this diff Show More