remove 移除所有 swagger 配置 准备对接 springdoc

This commit is contained in:
疯狂的狮子li
2022-07-22 18:46:07 +08:00
parent 70ca157c07
commit 9256e938c6
96 changed files with 326 additions and 1118 deletions

View File

@@ -46,12 +46,6 @@
<artifactId>ruoyi-common-security</artifactId>
</dependency>
<!-- RuoYi Common Swagger -->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common-swagger</artifactId>
</dependency>
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common-web</artifactId>

View File

@@ -1,16 +1,11 @@
package com.ruoyi.auth.controller;
import cn.dev33.satoken.exception.NotLoginException;
import cn.dev33.satoken.stp.StpUtil;
import com.alibaba.nacos.api.common.Constants;
import com.ruoyi.auth.form.LoginBody;
import com.ruoyi.auth.form.RegisterBody;
import com.ruoyi.auth.form.SmsLoginBody;
import com.ruoyi.auth.service.SysLoginService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.satoken.utils.LoginHelper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -28,14 +23,15 @@ import java.util.Map;
* @author Lion Li
*/
@Validated
@Api(value = "认证鉴权控制器", tags = {"认证鉴权管理"})
@RequiredArgsConstructor
@RestController
public class TokenController {
private final SysLoginService sysLoginService;
@ApiOperation("登录方法")
/**
* 登录方法
*/
@PostMapping("login")
public R<Map<String, Object>> login(@Validated @RequestBody LoginBody form) {
// 用户登录
@@ -53,7 +49,6 @@ public class TokenController {
* @param smsLoginBody 登录信息
* @return 结果
*/
@ApiOperation("短信登录")
@PostMapping("/smsLogin")
public R<Map<String, Object>> smsLogin(@Validated @RequestBody SmsLoginBody smsLoginBody) {
Map<String, Object> ajax = new HashMap<>();
@@ -69,7 +64,6 @@ public class TokenController {
* @param xcxCode 小程序code
* @return 结果
*/
@ApiOperation("小程序登录(示例)")
@PostMapping("/xcxLogin")
public R<Map<String, Object>> xcxLogin(@NotBlank(message = "{xcx.code.not.blank}") String xcxCode) {
Map<String, Object> ajax = new HashMap<>();
@@ -79,14 +73,18 @@ public class TokenController {
return R.ok(ajax);
}
@ApiOperation("登出方法")
/**
* 登出方法
*/
@DeleteMapping("logout")
public R<Void> logout() {
sysLoginService.logout();
return R.ok();
}
@ApiOperation("用户注册")
/**
* 用户注册
*/
@PostMapping("register")
public R<Void> register(@RequestBody RegisterBody registerBody) {
// 用户注册

View File

@@ -1,8 +1,6 @@
package com.ruoyi.auth.form;
import com.ruoyi.common.core.constant.UserConstants;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.hibernate.validator.constraints.Length;
@@ -16,7 +14,6 @@ import javax.validation.constraints.NotBlank;
*/
@Data
@NoArgsConstructor
@ApiModel("用户登录对象")
public class LoginBody {
/**
@@ -24,7 +21,6 @@ public class LoginBody {
*/
@NotBlank(message = "{user.username.not.blank}")
@Length(min = UserConstants.USERNAME_MIN_LENGTH, max = UserConstants.USERNAME_MAX_LENGTH, message = "{user.username.length.valid}")
@ApiModelProperty(value = "用户名")
private String username;
/**
@@ -32,7 +28,6 @@ public class LoginBody {
*/
@NotBlank(message = "{user.password.not.blank}")
@Length(min = UserConstants.PASSWORD_MIN_LENGTH, max = UserConstants.PASSWORD_MAX_LENGTH, message = "{user.password.length.valid}")
@ApiModelProperty(value = "用户密码")
private String password;
}

View File

@@ -1,7 +1,5 @@
package com.ruoyi.auth.form;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -12,10 +10,8 @@ import lombok.EqualsAndHashCode;
*/
@Data
@EqualsAndHashCode(callSuper = true)
@ApiModel("用户注册对象")
public class RegisterBody extends LoginBody {
@ApiModelProperty(value = "用户类型")
private String userType;
}

View File

@@ -1,7 +1,5 @@
package com.ruoyi.auth.form;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
@@ -13,21 +11,18 @@ import javax.validation.constraints.NotBlank;
*/
@Data
@ApiModel("短信登录对象")
public class SmsLoginBody {
/**
* 用户名
*/
@NotBlank(message = "{user.phonenumber.not.blank}")
@ApiModelProperty(value = "用户手机号")
private String phonenumber;
/**
* 用户密码
*/
@NotBlank(message = "{sms.code.not.blank}")
@ApiModelProperty(value = "短信验证码")
private String smsCode;
}