> login(@RequestBody LoginDTO dto) {
//表单校验
ValidatorUtils.validateEntity(dto);
@@ -51,10 +51,10 @@ public class ApiLoginController {
@Login
@PostMapping("logout")
- @ApiOperation("退出")
- public Result logout(@ApiIgnore @RequestAttribute("userId") Long userId) {
+ @Operation(summary = "退出")
+ public Result logout(@Parameter(hidden = true) @RequestAttribute("userId") Long userId) {
tokenService.expireToken(userId);
return new Result();
}
-}
\ No newline at end of file
+}
diff --git a/renren-api/src/main/java/io/renren/controller/ApiRegisterController.java b/renren-api/src/main/java/io/renren/controller/ApiRegisterController.java
index 126417e11eabc27f12884b006a5ef5f91962a546..d2dd544c505af1d7384ae5648a8ef6ed18ca3ebd 100644
--- a/renren-api/src/main/java/io/renren/controller/ApiRegisterController.java
+++ b/renren-api/src/main/java/io/renren/controller/ApiRegisterController.java
@@ -14,8 +14,8 @@ import io.renren.common.validator.ValidatorUtils;
import io.renren.dto.RegisterDTO;
import io.renren.entity.UserEntity;
import io.renren.service.UserService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -31,13 +31,13 @@ import java.util.Date;
*/
@RestController
@RequestMapping("/api")
-@Api(tags = "注册接口")
+@Tag(name = "注册接口")
@AllArgsConstructor
public class ApiRegisterController {
private final UserService userService;
@PostMapping("register")
- @ApiOperation("注册")
+ @Operation(summary = "注册")
public Result register(@RequestBody RegisterDTO dto) {
//表单校验
ValidatorUtils.validateEntity(dto);
@@ -51,4 +51,4 @@ public class ApiRegisterController {
return new Result();
}
-}
\ No newline at end of file
+}
diff --git a/renren-api/src/main/java/io/renren/controller/ApiTestController.java b/renren-api/src/main/java/io/renren/controller/ApiTestController.java
index e85f55f722e62ff791faaea061ce28088ca087f2..0d600a83af11c5f2744e52498ac9b5b4f25e9936 100644
--- a/renren-api/src/main/java/io/renren/controller/ApiTestController.java
+++ b/renren-api/src/main/java/io/renren/controller/ApiTestController.java
@@ -1,8 +1,8 @@
/**
* Copyright (c) 2018 人人开源 All rights reserved.
- *
+ *
* https://www.renren.io
- *
+ *
* 版权所有，侵权必究！
*/
@@ -12,13 +12,13 @@ import io.renren.annotation.Login;
import io.renren.annotation.LoginUser;
import io.renren.common.utils.Result;
import io.renren.entity.UserEntity;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import springfox.documentation.annotations.ApiIgnore;
/**
* 测试接口
@@ -27,27 +27,27 @@ import springfox.documentation.annotations.ApiIgnore;
*/
@RestController
@RequestMapping("/api")
-@Api(tags="测试接口")
+@Tag(name = "测试接口")
public class ApiTestController {
@Login
@GetMapping("userInfo")
- @ApiOperation(value="获取用户信息", response=UserEntity.class)
- public Result userInfo(@ApiIgnore @LoginUser UserEntity user){
+ @Operation(summary = "获取用户信息")
+ public Result userInfo(@Parameter(hidden = true) @LoginUser UserEntity user) {
return new Result().ok(user);
}
@Login
@GetMapping("userId")
- @ApiOperation("获取用户ID")
- public Result userInfo(@ApiIgnore @RequestAttribute("userId") Long userId){
+ @Operation(summary = "获取用户ID")
+ public Result userInfo(@Parameter(hidden = true) @RequestAttribute("userId") Long userId) {
return new Result().ok(userId);
}
@GetMapping("notToken")
- @ApiOperation("忽略Token验证测试")
- public Result notToken(){
+ @Operation(summary = "忽略Token验证测试")
+ public Result notToken() {
return new Result().ok("无需token也能访问。。。");
}
-}
\ No newline at end of file
+}
diff --git a/renren-api/src/main/java/io/renren/dto/LoginDTO.java b/renren-api/src/main/java/io/renren/dto/LoginDTO.java
index 935bd1ab71103829b06fb9a7cc7bf4436d97d4d9..7f0cb54c3243966ca33592c05460dc59fa376e5f 100644
--- a/renren-api/src/main/java/io/renren/dto/LoginDTO.java
+++ b/renren-api/src/main/java/io/renren/dto/LoginDTO.java
@@ -9,11 +9,10 @@
package io.renren.dto;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
import lombok.Data;
-import javax.validation.constraints.NotBlank;
/**
* 登录表单
@@ -21,14 +20,14 @@ import javax.validation.constraints.NotBlank;
* @author Mark sunlightcs@gmail.com
*/
@Data
-@ApiModel(value = "登录表单")
+@Schema(title = "登录表单")
public class LoginDTO {
- @ApiModelProperty(value = "手机号")
+ @Schema(title = "手机号")
@NotBlank(message="手机号不能为空")
private String mobile;
- @ApiModelProperty(value = "密码")
+ @Schema(title = "密码")
@NotBlank(message="密码不能为空")
private String password;
-}
\ No newline at end of file
+}
diff --git a/renren-api/src/main/java/io/renren/dto/RegisterDTO.java b/renren-api/src/main/java/io/renren/dto/RegisterDTO.java
index ff1f45a60a1192207c6b80d3cf5c5bd6c8d13944..4fadc8464f4a4de27989590410992d9f5a2b60f5 100644
--- a/renren-api/src/main/java/io/renren/dto/RegisterDTO.java
+++ b/renren-api/src/main/java/io/renren/dto/RegisterDTO.java
@@ -8,11 +8,10 @@
package io.renren.dto;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
import lombok.Data;
-import javax.validation.constraints.NotBlank;
/**
* 注册表单
@@ -20,13 +19,13 @@ import javax.validation.constraints.NotBlank;
* @author Mark sunlightcs@gmail.com
*/
@Data
-@ApiModel(value = "注册表单")
+@Schema(title = "注册表单")
public class RegisterDTO {
- @ApiModelProperty(value = "手机号")
+ @Schema(title = "手机号")
@NotBlank(message="手机号不能为空")
private String mobile;
- @ApiModelProperty(value = "密码")
+ @Schema(title = "密码")
@NotBlank(message="密码不能为空")
private String password;
diff --git a/renren-api/src/main/java/io/renren/interceptor/AuthorizationInterceptor.java b/renren-api/src/main/java/io/renren/interceptor/AuthorizationInterceptor.java
index 42dd5b079407a22391a9abd7d8fa35975aaefe03..2a7b9be5f0faa7b394f5bb09c954b287563096a8 100644
--- a/renren-api/src/main/java/io/renren/interceptor/AuthorizationInterceptor.java
+++ b/renren-api/src/main/java/io/renren/interceptor/AuthorizationInterceptor.java
@@ -14,13 +14,12 @@ import io.renren.common.exception.ErrorCode;
import io.renren.common.exception.RenException;
import io.renren.entity.TokenEntity;
import io.renren.service.TokenService;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.springframework.stereotype.Component;
import org.springframework.web.method.HandlerMethod;
-import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import org.springframework.web.servlet.HandlerInterceptor;
/**
* 权限(Token)验证
@@ -28,7 +27,7 @@ import javax.servlet.http.HttpServletResponse;
* @author Mark sunlightcs@gmail.com
*/
@Component
-public class AuthorizationInterceptor extends HandlerInterceptorAdapter {
+public class AuthorizationInterceptor implements HandlerInterceptor {
@Resource
private TokenService tokenService;
diff --git a/renren-api/src/main/resources/application.yml b/renren-api/src/main/resources/application.yml
index a4ce80d089133d4d992d7ac0915e17ce2af7b66d..02fbf50f8ccf808def17cb34ee8bae23de46cdc1 100644
--- a/renren-api/src/main/resources/application.yml
+++ b/renren-api/src/main/resources/application.yml
@@ -40,18 +40,20 @@ spring:
max-file-size: 100MB
max-request-size: 100MB
enabled: true
- redis:
- database: 0
- host: 192.168.10.10
- port: 6379
- password: # 密码（默认为空）
- timeout: 6000ms # 连接超时时长（毫秒）
- lettuce:
- pool:
- max-active: 1000 # 连接池最大连接数（使用负值表示没有限制）
- max-wait: -1ms # 连接池最大阻塞等待时间（使用负值表示没有限制）
- max-idle: 10 # 连接池中的最大空闲连接
- min-idle: 5 # 连接池中的最小空闲连接
+
+ data:
+ redis:
+ database: 0
+ host: 192.168.10.10
+ port: 6379
+ password: # 密码（默认为空）
+ timeout: 6000ms # 连接超时时长（毫秒）
+ lettuce:
+ pool:
+ max-active: 1000 # 连接池最大连接数（使用负值表示没有限制）
+ max-wait: -1ms # 连接池最大阻塞等待时间（使用负值表示没有限制）
+ max-idle: 10 # 连接池中的最大空闲连接
+ min-idle: 5 # 连接池中的最小空闲连接
renren:
redis:
@@ -78,4 +80,4 @@ mybatis-plus:
configuration-properties:
prefix:
blobType: BLOB
- boolValue: TRUE
\ No newline at end of file
+ boolValue: TRUE
diff --git a/renren-common/src/main/java/io/renren/common/page/PageData.java b/renren-common/src/main/java/io/renren/common/page/PageData.java
index c8dd3cee5ad1b6f16c24492ea6453d04386941f1..abe523e7ade29989a50d00532710d5f788d7a2e4 100644
--- a/renren-common/src/main/java/io/renren/common/page/PageData.java
+++ b/renren-common/src/main/java/io/renren/common/page/PageData.java
@@ -8,8 +8,7 @@
package io.renren.common.page;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
@@ -21,14 +20,14 @@ import java.util.List;
* @author Mark sunlightcs@gmail.com
*/
@Data
-@ApiModel(value = "分页数据")
+@Schema(title = "分页数据")
public class PageData implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "总记录数")
+ @Schema(title = "总记录数")
private int total;
- @ApiModelProperty(value = "列表数据")
+ @Schema(title = "列表数据")
private List list;
/**
@@ -40,4 +39,4 @@ public class PageData implements Serializable {
this.list = list;
this.total = (int)total;
}
-}
\ No newline at end of file
+}
diff --git a/renren-common/src/main/java/io/renren/common/redis/RedisConfig.java b/renren-common/src/main/java/io/renren/common/redis/RedisConfig.java
index 44b95543c21adb6c4e8809545c6fa72454885959..a3104ffe606448d5159b61f853d7dc6f001f0e5b 100644
--- a/renren-common/src/main/java/io/renren/common/redis/RedisConfig.java
+++ b/renren-common/src/main/java/io/renren/common/redis/RedisConfig.java
@@ -12,6 +12,7 @@ import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.PropertyAccessor;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator;
+import jakarta.annotation.Resource;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.redis.connection.RedisConnectionFactory;
@@ -19,7 +20,6 @@ import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
import org.springframework.data.redis.serializer.StringRedisSerializer;
-import javax.annotation.Resource;
/**
* Redis配置
@@ -53,4 +53,4 @@ public class RedisConfig {
return redisTemplate;
}
-}
\ No newline at end of file
+}
diff --git a/renren-common/src/main/java/io/renren/common/redis/RedisUtils.java b/renren-common/src/main/java/io/renren/common/redis/RedisUtils.java
index 5fdbba944589e78370718d0a42239aa3d8d5f838..dea505bcb8c760387b6a431c446a88c3bead32b7 100644
--- a/renren-common/src/main/java/io/renren/common/redis/RedisUtils.java
+++ b/renren-common/src/main/java/io/renren/common/redis/RedisUtils.java
@@ -8,11 +8,11 @@
package io.renren.common.redis;
+import jakarta.annotation.Resource;
import org.springframework.data.redis.core.HashOperations;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
-import javax.annotation.Resource;
import java.util.Collection;
import java.util.Map;
import java.util.concurrent.TimeUnit;
@@ -123,4 +123,4 @@ public class RedisUtils {
public Object rightPop(String key) {
return redisTemplate.opsForList().rightPop(key);
}
-}
\ No newline at end of file
+}
diff --git a/renren-common/src/main/java/io/renren/common/utils/HttpContextUtils.java b/renren-common/src/main/java/io/renren/common/utils/HttpContextUtils.java
index 369e4a96e934828e119f1afec5b4417f1b9ff787..ed457639d400a7c0003e3647e1647b4c675f64d6 100644
--- a/renren-common/src/main/java/io/renren/common/utils/HttpContextUtils.java
+++ b/renren-common/src/main/java/io/renren/common/utils/HttpContextUtils.java
@@ -9,12 +9,12 @@
package io.renren.common.utils;
import cn.hutool.core.util.StrUtil;
+import jakarta.servlet.http.HttpServletRequest;
import org.springframework.http.HttpHeaders;
import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
-import javax.servlet.http.HttpServletRequest;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
@@ -60,4 +60,4 @@ public class HttpContextUtils {
HttpServletRequest request = getHttpServletRequest();
return request.getHeader(HttpHeaders.ORIGIN);
}
-}
\ No newline at end of file
+}
diff --git a/renren-common/src/main/java/io/renren/common/utils/IpUtils.java b/renren-common/src/main/java/io/renren/common/utils/IpUtils.java
index d5396b9c89552976ad55bae7ba761ab5fe4cd34c..013f4b4b3336b9d7871d23e214ace95460233b49 100644
--- a/renren-common/src/main/java/io/renren/common/utils/IpUtils.java
+++ b/renren-common/src/main/java/io/renren/common/utils/IpUtils.java
@@ -9,14 +9,14 @@
package io.renren.common.utils;
import cn.hutool.core.util.StrUtil;
+import jakarta.servlet.http.HttpServletRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.servlet.http.HttpServletRequest;
/**
* IP地址
- *
+ *
* @author Mark sunlightcs@gmail.com
*/
public class IpUtils {
@@ -24,7 +24,7 @@ public class IpUtils {
/**
* 获取IP地址
- *
+ *
* 使用Nginx等反向代理软件， 则不能通过request.getRemoteAddr()获取IP地址
* 如果使用了多级反向代理的话，X-Forwarded-For的值并不止一个，而是一串IP地址，X-Forwarded-For中第一个非unknown的有效IP字符串，则为真实IP地址
*/
@@ -51,8 +51,8 @@ public class IpUtils {
} catch (Exception e) {
logger.error("IPUtils ERROR ", e);
}
-
+
return ip;
}
-
+
}
diff --git a/renren-common/src/main/java/io/renren/common/utils/Result.java b/renren-common/src/main/java/io/renren/common/utils/Result.java
index 801d183e9bf97c0685773b436d8bb43a5a88ef2f..b6a1a2d930244cda9a76b7abf4acf52aa7cd5867 100644
--- a/renren-common/src/main/java/io/renren/common/utils/Result.java
+++ b/renren-common/src/main/java/io/renren/common/utils/Result.java
@@ -9,8 +9,7 @@
package io.renren.common.utils;
import io.renren.common.exception.ErrorCode;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import java.io.Serializable;
@@ -20,23 +19,23 @@ import java.io.Serializable;
* @author Mark sunlightcs@gmail.com
* @since 1.0.0
*/
-@ApiModel(value = "响应")
+@Schema(title = "响应")
public class Result implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 编码：0表示成功，其他值表示失败
*/
- @ApiModelProperty(value = "编码：0表示成功，其他值表示失败")
+ @Schema(title = "编码：0表示成功，其他值表示失败")
private int code = 0;
/**
* 消息内容
*/
- @ApiModelProperty(value = "消息内容")
+ @Schema(title = "消息内容")
private String msg = "success";
/**
* 响应数据
*/
- @ApiModelProperty(value = "响应数据")
+ @Schema(title = "响应数据")
private T data;
public Result ok(T data) {
diff --git a/renren-common/src/main/java/io/renren/common/validator/ValidatorUtils.java b/renren-common/src/main/java/io/renren/common/validator/ValidatorUtils.java
index 61a02f79b6b99ed8d372126cb2665f7477563d98..263d8ccf796bc4dc8bb4ae3433c76982327f31fb 100644
--- a/renren-common/src/main/java/io/renren/common/validator/ValidatorUtils.java
+++ b/renren-common/src/main/java/io/renren/common/validator/ValidatorUtils.java
@@ -9,14 +9,14 @@
package io.renren.common.validator;
import io.renren.common.exception.RenException;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
import org.hibernate.validator.messageinterpolation.ResourceBundleMessageInterpolator;
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.context.support.ResourceBundleMessageSource;
import org.springframework.validation.beanvalidation.MessageSourceResourceBundleLocator;
-import javax.validation.ConstraintViolation;
-import javax.validation.Validation;
-import javax.validation.Validator;
import java.util.Locale;
import java.util.Set;
@@ -54,4 +54,4 @@ public class ValidatorUtils {
throw new RenException(constraint.getMessage());
}
}
-}
\ No newline at end of file
+}
diff --git a/renren-common/src/main/java/io/renren/common/validator/group/Group.java b/renren-common/src/main/java/io/renren/common/validator/group/Group.java
index 23b23283ceaf9cdc71f2431970aeeac88960b7d7..05c47753b8116ba826f772ac6f5f105ff3991a86 100644
--- a/renren-common/src/main/java/io/renren/common/validator/group/Group.java
+++ b/renren-common/src/main/java/io/renren/common/validator/group/Group.java
@@ -8,7 +8,8 @@
package io.renren.common.validator.group;
-import javax.validation.GroupSequence;
+
+import jakarta.validation.GroupSequence;
/**
* 定义校验顺序，如果AddGroup组失败，则UpdateGroup组不会再校验
diff --git a/renren-common/src/main/java/io/renren/common/xss/XssFilter.java b/renren-common/src/main/java/io/renren/common/xss/XssFilter.java
index d9936c84331cdfe1fd7204136135d741ffa428fd..f518df03dbac4a21aa3dafcfa414bda0a9f30c86 100644
--- a/renren-common/src/main/java/io/renren/common/xss/XssFilter.java
+++ b/renren-common/src/main/java/io/renren/common/xss/XssFilter.java
@@ -8,8 +8,9 @@
package io.renren.common.xss;
-import javax.servlet.*;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.*;
+import jakarta.servlet.http.HttpServletRequest;
+
import java.io.IOException;
/**
@@ -34,4 +35,4 @@ public class XssFilter implements Filter {
public void destroy() {
}
-}
\ No newline at end of file
+}
diff --git a/renren-common/src/main/java/io/renren/common/xss/XssHttpServletRequestWrapper.java b/renren-common/src/main/java/io/renren/common/xss/XssHttpServletRequestWrapper.java
index b1d76ac93a007dd66b67a0bdd491ee30803fd22a..6bf4f332e804ae94f445f9ed803346f34930b743 100644
--- a/renren-common/src/main/java/io/renren/common/xss/XssHttpServletRequestWrapper.java
+++ b/renren-common/src/main/java/io/renren/common/xss/XssHttpServletRequestWrapper.java
@@ -10,13 +10,13 @@ package io.renren.common.xss;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.StrUtil;
+import jakarta.servlet.ReadListener;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
-import javax.servlet.ReadListener;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
@@ -151,4 +151,4 @@ public class XssHttpServletRequestWrapper extends HttpServletRequestWrapper {
String header = super.getHeader(HttpHeaders.CONTENT_TYPE);
return StrUtil.startWithIgnoreCase(header, MediaType.APPLICATION_JSON_VALUE);
}
-}
\ No newline at end of file
+}
diff --git a/renren-dynamic-datasource/src/main/java/io/renren/commons/dynamic/datasource/config/DynamicDataSourceConfig.java b/renren-dynamic-datasource/src/main/java/io/renren/commons/dynamic/datasource/config/DynamicDataSourceConfig.java
index 114cd31a85a4ff0ac4863bb763336677d9d4ddc5..ed17f317b7f2e807fa2510be4d3325d45b89a99f 100644
--- a/renren-dynamic-datasource/src/main/java/io/renren/commons/dynamic/datasource/config/DynamicDataSourceConfig.java
+++ b/renren-dynamic-datasource/src/main/java/io/renren/commons/dynamic/datasource/config/DynamicDataSourceConfig.java
@@ -11,12 +11,12 @@ package io.renren.commons.dynamic.datasource.config;
import com.alibaba.druid.pool.DruidDataSource;
import io.renren.commons.dynamic.datasource.properties.DataSourceProperties;
import io.renren.commons.dynamic.datasource.properties.DynamicDataSourceProperties;
+import jakarta.annotation.Resource;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import javax.annotation.Resource;
import java.util.HashMap;
import java.util.Map;
@@ -61,4 +61,4 @@ public class DynamicDataSourceConfig {
return targetDataSources;
}
-}
\ No newline at end of file
+}
diff --git a/renren-generator/pom.xml b/renren-generator/pom.xml
index 27b258fe153e833d9dcc6eacbaad91f5d2e4d830..3d3a7a0e7fcc4e9402acfbd196d7c7074c52a35b 100644
--- a/renren-generator/pom.xml
+++ b/renren-generator/pom.xml
@@ -11,14 +11,14 @@
org.springframework.boot
spring-boot-starter-parent
- 2.7.15
+ 3.2.5
UTF-8
UTF-8
- 1.8
- 2.2.2
+ 17
+ 3.0.3
1.4.2
1.2.14
1.10
diff --git a/renren-generator/src/main/java/io/renren/config/DbConfig.java b/renren-generator/src/main/java/io/renren/config/DbConfig.java
index 0c2f01ab47c1e42e2e6b0045be921a51e9d3332d..484e31cdfef021c8b47fa7d3de3561e932e51396 100644
--- a/renren-generator/src/main/java/io/renren/config/DbConfig.java
+++ b/renren-generator/src/main/java/io/renren/config/DbConfig.java
@@ -10,12 +10,12 @@ package io.renren.config;
import io.renren.dao.*;
import io.renren.utils.RenException;
+import jakarta.annotation.Resource;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
-import javax.annotation.Resource;
/**
* 数据库配置
diff --git a/renren-generator/src/main/java/io/renren/controller/SysGeneratorController.java b/renren-generator/src/main/java/io/renren/controller/SysGeneratorController.java
index d37dad984fd409a770f16272f3191ec7c8da4be7..6eda8ea319154f8e91bd7816d91d87fd33c298de 100644
--- a/renren-generator/src/main/java/io/renren/controller/SysGeneratorController.java
+++ b/renren-generator/src/main/java/io/renren/controller/SysGeneratorController.java
@@ -13,13 +13,13 @@ import io.renren.service.SysGeneratorService;
import io.renren.utils.PageUtils;
import io.renren.utils.Query;
import io.renren.utils.R;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Map;
diff --git a/renren-generator/src/main/java/io/renren/service/SysGeneratorService.java b/renren-generator/src/main/java/io/renren/service/SysGeneratorService.java
index 1f98cfd23e4555d38486239a879a8a64660d77d7..0c0ef6d771250eaf52b498de65a5df2c48c43b3a 100644
--- a/renren-generator/src/main/java/io/renren/service/SysGeneratorService.java
+++ b/renren-generator/src/main/java/io/renren/service/SysGeneratorService.java
@@ -14,10 +14,10 @@ import io.renren.dao.GeneratorDao;
import io.renren.utils.GenUtils;
import io.renren.utils.PageUtils;
import io.renren.utils.Query;
+import jakarta.annotation.Resource;
import org.apache.tomcat.util.http.fileupload.IOUtils;
import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
import java.io.ByteArrayOutputStream;
import java.util.List;
import java.util.Map;
diff --git a/renren-generator/src/main/resources/application.yml b/renren-generator/src/main/resources/application.yml
index 9e7d6484467b8be049ccc7775652d3168a0e9ff2..54cec86a5b3ac6f7073ca996a7d68f30f285f970 100644
--- a/renren-generator/src/main/resources/application.yml
+++ b/renren-generator/src/main/resources/application.yml
@@ -10,8 +10,8 @@ spring:
#MySQL配置
driverClassName: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://localhost:3306/renren_security?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
- username: renren
- password: 123456
+ username: root
+ password: root
#oracle配置
# driverClassName: oracle.jdbc.OracleDriver
# url: jdbc:oracle:thin:@192.168.10.10:1521:xe
@@ -47,4 +47,4 @@ pagehelper:
#指定数据库，可选值有【mysql、oracle、sqlserver、postgresql】
renren:
- database: mysql
\ No newline at end of file
+ database: mysql
diff --git a/renren-generator/src/main/resources/template/Controller.java.vm b/renren-generator/src/main/resources/template/Controller.java.vm
index bcb855b727904c80f1caf01d090c2526dde39668..4b556e7523f2cb69706fe00326bb993cbd8fbf60 100644
--- a/renren-generator/src/main/resources/template/Controller.java.vm
+++ b/renren-generator/src/main/resources/template/Controller.java.vm
@@ -13,16 +13,12 @@ import ${package}.common.validator.group.UpdateGroup;
import ${package}.modules.${moduleName}.dto.${className}DTO;
import ${package}.modules.${moduleName}.excel.${className}Excel;
import ${package}.modules.${moduleName}.service.${className}Service;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import springfox.documentation.annotations.ApiIgnore;
-
-import javax.servlet.http.HttpServletResponse;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
@@ -35,28 +31,28 @@ import java.util.Map;
*/
@RestController
@RequestMapping("${moduleName}/${pathName}")
-@Api(tags="${comments}")
+@Tag(name="${comments}")
public class ${className}Controller {
@Autowired
private ${className}Service ${classname}Service;
@GetMapping("page")
- @ApiOperation("分页")
- @ApiImplicitParams({
- @ApiImplicitParam(name = Constant.PAGE, value = "当前页码，从1开始", paramType = "query", required = true, dataType="int") ,
- @ApiImplicitParam(name = Constant.LIMIT, value = "每页显示记录数", paramType = "query",required = true, dataType="int") ,
- @ApiImplicitParam(name = Constant.ORDER_FIELD, value = "排序字段", paramType = "query", dataType="String") ,
- @ApiImplicitParam(name = Constant.ORDER, value = "排序方式，可选值(asc、desc)", paramType = "query", dataType="String")
+ @Operation(summary = "分页")
+ @Parameters({
+ @Parameter(name = Constant.PAGE, description = "当前页码，从1开始", in = ParameterIn.QUERY, required = true, ref="int") ,
+ @Parameter(name = Constant.LIMIT, description = "每页显示记录数", in = ParameterIn.QUERY,required = true, ref="int") ,
+ @Parameter(name = Constant.ORDER_FIELD, description = "排序字段", in = ParameterIn.QUERY, ref="String") ,
+ @Parameter(name = Constant.ORDER, description = "排序方式，可选值(asc、desc)", in = ParameterIn.QUERY, ref="String")
})
@RequiresPermissions("${moduleName}:${pathName}:page")
- public Result> page(@ApiIgnore @RequestParam Map params){
+ public Result> page(@Parameter(hidden = true) @RequestParam Map params){
PageData<${className}DTO> page = ${classname}Service.page(params);
return new Result>().ok(page);
}
@GetMapping("{id}")
- @ApiOperation("信息")
+ @Operation(summary = "信息")
@RequiresPermissions("${moduleName}:${pathName}:info")
public Result<${className}DTO> get(@PathVariable("id") Long id){
${className}DTO data = ${classname}Service.get(id);
@@ -65,7 +61,7 @@ public class ${className}Controller {
}
@PostMapping
- @ApiOperation("保存")
+ @Operation(summary = "保存")
@LogOperation("保存")
@RequiresPermissions("${moduleName}:${pathName}:save")
public Result save(@RequestBody ${className}DTO dto){
@@ -78,7 +74,7 @@ public class ${className}Controller {
}
@PutMapping
- @ApiOperation("修改")
+ @Operation(summary = "修改")
@LogOperation("修改")
@RequiresPermissions("${moduleName}:${pathName}:update")
public Result update(@RequestBody ${className}DTO dto){
@@ -91,7 +87,7 @@ public class ${className}Controller {
}
@DeleteMapping
- @ApiOperation("删除")
+ @Operation(summary = "删除")
@LogOperation("删除")
@RequiresPermissions("${moduleName}:${pathName}:delete")
public Result delete(@RequestBody Long[] ids){
@@ -104,13 +100,13 @@ public class ${className}Controller {
}
@GetMapping("export")
- @ApiOperation("导出")
+ @Operation(summary = "导出")
@LogOperation("导出")
@RequiresPermissions("${moduleName}:${pathName}:export")
- public void export(@ApiIgnore @RequestParam Map params, HttpServletResponse response) throws Exception {
+ public void export(@Parameter(hidden = true) @RequestParam Map params, HttpServletResponse response) throws Exception {
List<${className}DTO> list = ${classname}Service.list(params);
ExcelUtils.exportExcelToTarget(response, null, "${comments}", list, ${className}Excel.class);
}
-}
\ No newline at end of file
+}
diff --git a/renren-generator/src/main/resources/template/DTO.java.vm b/renren-generator/src/main/resources/template/DTO.java.vm
index 5080f4e613597bfb5522c5a189c82b0e591655d4..b05bc697224c84b69647b509ae08e932cd614df1 100644
--- a/renren-generator/src/main/resources/template/DTO.java.vm
+++ b/renren-generator/src/main/resources/template/DTO.java.vm
@@ -1,7 +1,5 @@
package ${package}.modules.${moduleName}.dto;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@@ -18,14 +16,14 @@ import java.math.BigDecimal;
* @since ${version} ${date}
*/
@Data
-@ApiModel(value = "${comments}")
+@Schema(name = "${comments}")
public class ${className}DTO implements Serializable {
private static final long serialVersionUID = 1L;
#foreach ($column in $columns)
- @ApiModelProperty(value = "$column.comments")
+ @SchemaProperty(name = "$column.comments")
private $column.attrType $column.attrname;
#end
-}
\ No newline at end of file
+}