ContiNew/continew-admin
1
1
Fork 0
mirror of https://github.com/continew-org/continew-admin.git synced 2025-09-15 02:57:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: 优化部分接口响应格式为 kv 格式

Browse Source
This commit is contained in:
Charles7c
2024-03-06 22:53:10 +08:00
parent 948f904ca9
commit b40d872bc4
4 changed files with 109 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/auth/SocialAuthController.java
View File

@@ -16,32 +16,27 @@
package top.charles7c.continew.admin.webapi.auth;
import lombok.RequiredArgsConstructor;
import cn.dev33.satoken.annotation.SaIgnore;
import cn.dev33.satoken.stp.StpUtil;
import com.xkcoding.justauth.AuthRequestFactory;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.enums.ParameterIn;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.web.bind.annotation.*;
import com.xkcoding.justauth.AuthRequestFactory;
import cn.dev33.satoken.annotation.SaIgnore;
import cn.dev33.satoken.stp.StpUtil;
import top.charles7c.continew.admin.auth.model.resp.LoginResp;
import top.charles7c.continew.admin.auth.service.LoginService;
import top.charles7c.continew.starter.core.exception.BadRequestException;
import top.charles7c.continew.starter.core.util.validate.ValidationUtils;
import top.charles7c.continew.starter.web.model.R;
import top.charles7c.continew.starter.log.core.annotation.Log;
import lombok.RequiredArgsConstructor;
import me.zhyd.oauth.model.AuthCallback;
import me.zhyd.oauth.model.AuthResponse;
import me.zhyd.oauth.model.AuthUser;
import me.zhyd.oauth.request.AuthRequest;
import me.zhyd.oauth.utils.AuthStateUtils;
import org.springframework.web.bind.annotation.*;
import top.charles7c.continew.admin.auth.model.resp.LoginResp;
import top.charles7c.continew.admin.auth.model.resp.SocialAuthAuthorizeResp;
import top.charles7c.continew.admin.auth.service.LoginService;
import top.charles7c.continew.starter.core.exception.BadRequestException;
import top.charles7c.continew.starter.core.util.validate.ValidationUtils;
import top.charles7c.continew.starter.log.core.annotation.Log;
import top.charles7c.continew.starter.web.model.R;
/**
* 三方账号认证 API
@@ -63,9 +58,11 @@ public class SocialAuthController {
@Operation(summary = "三方账号登录授权", description = "三方账号登录授权")
@Parameter(name = "source", description = "来源", example = "gitee", in = ParameterIn.PATH)
@GetMapping("/{source}")
public R<String> authorize(@PathVariable String source) {
public R<SocialAuthAuthorizeResp> authorize(@PathVariable String source) {
AuthRequest authRequest = this.getAuthRequest(source);
return R.ok("操作成功", authRequest.authorize(AuthStateUtils.createState()));
return R.ok(SocialAuthAuthorizeResp.builder()
.authorizeUrl(authRequest.authorize(AuthStateUtils.createState()))
.build());
}
@Operation(summary = "三方账号登录", description = "三方账号登录")

5
continew-admin-webapi/src/main/java/top/charles7c/continew/admin/webapi/common/CommonController.java
View File

@@ -39,6 +39,7 @@ import top.charles7c.continew.admin.system.model.query.DeptQuery;
import top.charles7c.continew.admin.system.model.query.MenuQuery;
import top.charles7c.continew.admin.system.model.query.OptionQuery;
import top.charles7c.continew.admin.system.model.query.RoleQuery;
import top.charles7c.continew.admin.system.model.resp.FileUploadResp;
import top.charles7c.continew.admin.system.service.*;
import top.charles7c.continew.starter.core.autoconfigure.project.ProjectProperties;
import top.charles7c.continew.starter.core.util.validate.ValidationUtils;
@@ -77,11 +78,11 @@ public class CommonController {
@Operation(summary = "上传文件", description = "上传文件")
@PostMapping("/file")
public R<String> upload(@NotNull(message = "文件不能为空") MultipartFile file) {
public R<FileUploadResp> upload(@NotNull(message = "文件不能为空") MultipartFile file) {
ValidationUtils.throwIf(projectProperties.isProduction(), "演示环境不支持上传文件");
ValidationUtils.throwIf(file::isEmpty, "文件不能为空");
FileInfo fileInfo = fileService.upload(file);
return R.ok("上传成功", fileInfo.getUrl());
return R.ok(FileUploadResp.builder().url(fileInfo.getUrl()).build());
}
@Operation(summary = "查询部门树", description = "查询树结构的部门列表")