From 91c94c55fe895b2ac1924d6d4ca0b1c101efdb5d Mon Sep 17 00:00:00 2001 From: lroyia Date: Fri, 24 Oct 2025 15:28:10 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../youfool/course/config/PrjDataSource.java | 2 +- .../youfool/course/config/SwaggerKnife4j.java | 45 ------------ .../course/controller/LoginController.java | 23 ++++--- .../course/controller/OAuth2Controller.java | 17 +++-- .../course/controller/TestController.java | 62 ----------------- .../youfool/course/entity/Course.java | 61 ++--------------- .../course/entity/CourseAttachment.java | 68 ++----------------- .../youfool/course/entity/CourseComment.java | 60 ++-------------- .../youfool/course/entity/CourseVideo.java | 64 ++--------------- .../youfool/course/entity/SysUser.java | 53 --------------- .../service/impl/UserBaseServiceImpl.java | 3 +- 11 files changed, 46 insertions(+), 412 deletions(-) delete mode 100644 src/main/java/com/chinaweal/youfool/course/config/SwaggerKnife4j.java delete mode 100644 src/main/java/com/chinaweal/youfool/course/controller/TestController.java diff --git a/src/main/java/com/chinaweal/youfool/course/config/PrjDataSource.java b/src/main/java/com/chinaweal/youfool/course/config/PrjDataSource.java index 3d05c9e..7e6fd6e 100644 --- a/src/main/java/com/chinaweal/youfool/course/config/PrjDataSource.java +++ b/src/main/java/com/chinaweal/youfool/course/config/PrjDataSource.java @@ -3,6 +3,7 @@ package com.chinaweal.youfool.course.config; import com.baomidou.mybatisplus.core.config.GlobalConfig; import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean; import com.chinaweal.youfool.framework.springboot.mybatis.plus.CommonMetaObjectHandler; +import jakarta.annotation.Resource; import org.apache.commons.lang3.ArrayUtils; import org.mybatis.spring.annotation.MapperScan; import org.springframework.context.annotation.Bean; @@ -11,7 +12,6 @@ import org.springframework.context.annotation.Primary; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; -import javax.annotation.Resource; import javax.sql.DataSource; /** diff --git a/src/main/java/com/chinaweal/youfool/course/config/SwaggerKnife4j.java b/src/main/java/com/chinaweal/youfool/course/config/SwaggerKnife4j.java deleted file mode 100644 index 80b6c13..0000000 --- a/src/main/java/com/chinaweal/youfool/course/config/SwaggerKnife4j.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.chinaweal.youfool.course.config; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import springfox.documentation.builders.ApiInfoBuilder; -import springfox.documentation.builders.PathSelectors; -import springfox.documentation.builders.RequestHandlerSelectors; -import springfox.documentation.service.ApiInfo; -import springfox.documentation.service.Contact; -import springfox.documentation.spi.DocumentationType; -import springfox.documentation.spring.web.plugins.Docket; -import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc; - - -@Configuration -@EnableSwagger2WebMvc -public class SwaggerKnife4j { - private final String applicationName = "youfool-prj-springboot-template"; - private final String description = "boot基础的后台模板"; - - @Bean("cms") - public Docket cmsApi() { - //添加head参数start - return new Docket(DocumentationType.SWAGGER_2) - .enable(true) - .apiInfo(apiInfo()) - .groupName("基础框架") - .select() - .apis(RequestHandlerSelectors.basePackage("com.chinaweal.youfool.framework.springboot.cms")) - .paths(PathSelectors.any()) - .build(); - } - - private ApiInfo apiInfo() { - return new ApiInfoBuilder() - .title(applicationName) - .description(description) - .termsOfServiceUrl("https://www.chinaweal.com.cn") - .contact(new Contact("chinaweal", "https://www.chinaweal.com.cn", "")) - .license("众望通科技") - .licenseUrl("https://www.chinaweal.com.cn") - .build(); - } - -} \ No newline at end of file diff --git a/src/main/java/com/chinaweal/youfool/course/controller/LoginController.java b/src/main/java/com/chinaweal/youfool/course/controller/LoginController.java index b9aecaf..cf48187 100644 --- a/src/main/java/com/chinaweal/youfool/course/controller/LoginController.java +++ b/src/main/java/com/chinaweal/youfool/course/controller/LoginController.java @@ -2,15 +2,16 @@ package com.chinaweal.youfool.course.controller; import cn.dev33.satoken.session.SaSession; import cn.dev33.satoken.stp.StpUtil; +import com.chinaweal.youfool.course.common.constants.SessionConstants; +import com.chinaweal.youfool.course.entity.SysUser; +import com.chinaweal.youfool.course.entity.UserBaseExtend; +import com.chinaweal.youfool.course.service.SysUserService; import com.chinaweal.youfool.framework.springboot.common.base.BaseController; import com.chinaweal.youfool.framework.springboot.common.util.AssertUtils; import com.chinaweal.youfool.framework.springboot.common.util.RSAUtil; +import com.chinaweal.youfool.framework.springboot.rest.BaseResultCode; import com.chinaweal.youfool.framework.springboot.rest.RestResult; -import com.chinaweal.youfool.framework.springboot.rest.ResultCode; import com.chinaweal.youfool.framework.springboot.user.entity.UserBase; -import com.chinaweal.youfool.course.common.constants.SessionConstants; -import com.chinaweal.youfool.course.entity.SysUser; -import com.chinaweal.youfool.course.service.SysUserService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -31,7 +32,7 @@ import java.util.Set; @Slf4j @RestController @RequestMapping("/user/auth") -public class LoginController extends BaseController { +public class LoginController { @Autowired private SysUserService sysUserService; @@ -55,30 +56,30 @@ public class LoginController extends BaseController { password = RSAUtil.decrypt(password, privateKey); } catch (Exception e) { log.error("密码解密失败：{}", password, e); - return RestResult.error(ResultCode.BUSINESS_LOGIC_ERROR, "密码解密失败"); + return RestResult.error(BaseResultCode.BUSINESS_LOGIC_ERROR, "密码解密失败"); } } // 查询用户信息 SysUser sysUser = sysUserService.getUserByUsername(username); if (sysUser == null || !sysUser.getPassword().equals(password)) { - return RestResult.error(ResultCode.BUSINESS_LOGIC_ERROR, "用户名或密码错误"); + return RestResult.error(BaseResultCode.BUSINESS_LOGIC_ERROR, "用户名或密码错误"); } // 匹配成功的话，登记登录信息 StpUtil.login(sysUser.getUserId()); SaSession session = StpUtil.getSession(); // 将用户信息存储至session - UserBase userBase = new UserBase(); + UserBaseExtend userBase = new UserBaseExtend(); userBase.setUsername(sysUser.getUsername()); userBase.setEmail(sysUser.getEmail()); userBase.setAvatar(sysUser.getAvatar()); - userBase.setId(sysUser.getUserId()); - + userBase.setUserId(sysUser.getUserId()); + Set permissionSet = new HashSet<>(); permissionSet.add("admin"); userBase.setPermission(permissionSet); - session.set(SessionConstants.USER_KEY, userBase); + session.set(SaSession.USER, userBase); return RestResult.ok(); } diff --git a/src/main/java/com/chinaweal/youfool/course/controller/OAuth2Controller.java b/src/main/java/com/chinaweal/youfool/course/controller/OAuth2Controller.java index c763dec..3c0ae1a 100644 --- a/src/main/java/com/chinaweal/youfool/course/controller/OAuth2Controller.java +++ b/src/main/java/com/chinaweal/youfool/course/controller/OAuth2Controller.java @@ -2,9 +2,8 @@ package com.chinaweal.youfool.course.controller; import cn.dev33.satoken.session.SaSession; import cn.dev33.satoken.stp.StpUtil; -import com.chinaweal.youfool.framework.springboot.user.entity.UserBase; -import com.chinaweal.youfool.course.common.constants.SessionConstants; import com.chinaweal.youfool.course.entity.SysUser; +import com.chinaweal.youfool.course.entity.UserBaseExtend; import com.chinaweal.youfool.course.service.SysUserService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -69,7 +68,7 @@ public class OAuth2Controller { /** * Gitea回调处理 * - * @param code 授权码 + * @param code 授权码 * @param state 状态 * @return 重定向到首页 */ @@ -95,7 +94,7 @@ public class OAuth2Controller { // 获取用户信息 Map userInfo = getUserInfo(accessToken); - + // 处理用户登录 handleUserLogin(userInfo); @@ -119,7 +118,7 @@ public class OAuth2Controller { headers.put("Authorization", "token " + accessToken); org.springframework.http.HttpEntity entity = new org.springframework.http.HttpEntity<>(headers); - Map userInfo = restTemplate.exchange(userUrl, + Map userInfo = restTemplate.exchange(userUrl, org.springframework.http.HttpMethod.GET, entity, Map.class).getBody(); return userInfo; @@ -165,11 +164,11 @@ public class OAuth2Controller { SaSession session = StpUtil.getSession(); // 构建用户信息 - UserBase userBase = new UserBase(); + UserBaseExtend userBase = new UserBaseExtend(); userBase.setUsername(sysUser.getUsername()); userBase.setEmail(sysUser.getEmail()); - userBase.setAvatarUrl(sysUser.getAvatar()); - userBase.setId(sysUser.getUserId()); + userBase.setAvatar(sysUser.getAvatar()); + userBase.setUserId(sysUser.getUserId()); // 设置权限 Set permissionSet = new HashSet<>(); @@ -177,6 +176,6 @@ public class OAuth2Controller { userBase.setPermission(permissionSet); // 将用户信息存储至session - session.set(SessionConstants.USER_KEY, userBase); + session.set(SaSession.USER, userBase); } } \ No newline at end of file diff --git a/src/main/java/com/chinaweal/youfool/course/controller/TestController.java b/src/main/java/com/chinaweal/youfool/course/controller/TestController.java deleted file mode 100644 index 56faf97..0000000 --- a/src/main/java/com/chinaweal/youfool/course/controller/TestController.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.chinaweal.youfool.course.controller; - -import cn.dev33.satoken.stp.StpUtil; -import com.chinaweal.youfool.framework.springboot.rest.RestResult; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 测试控制器 - * - * @author lroyia - * @since 2025/10/24 - **/ -@Slf4j -@RestController -@RequestMapping("/test") -public class TestController { - - /** - * 测试接口，需要登录 - * - * @return 测试结果 - */ - @GetMapping("/hello") - public RestResult hello() { - return RestResult.ok("Hello, " + StpUtil.getLoginIdAsString() + "!"); - } - - /** - * 测试管理员权限 - * - * @return 测试结果 - */ - @GetMapping("/admin") - public RestResult admin() { - StpUtil.checkPermission("admin"); - return RestResult.ok("Admin access granted!"); - } - - /** - * 测试用户权限 - * - * @return 测试结果 - */ - @GetMapping("/user") - public RestResult user() { - StpUtil.checkPermission("user"); - return RestResult.ok("User access granted!"); - } - - /** - * 获取当前登录信息 - * - * @return 登录信息 - */ - @GetMapping("/info") - public RestResult info() { - return RestResult.ok("Current login id: " + StpUtil.getLoginIdAsString()); - } -} \ No newline at end of file diff --git a/src/main/java/com/chinaweal/youfool/course/entity/Course.java b/src/main/java/com/chinaweal/youfool/course/entity/Course.java index 749eec6..d7f0b4d 100644 --- a/src/main/java/com/chinaweal/youfool/course/entity/Course.java +++ b/src/main/java/com/chinaweal/youfool/course/entity/Course.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.chinaweal.youfool.framework.springboot.common.util.DateUtil; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -80,7 +82,8 @@ public class Course implements Serializable { *

记录创建时间，系统自动生成。

*/ @TableField("create_time") - @Schema(description = "创建时间", example = "2024-01-01T10:00:00") + @Schema(description = "创建时间", example = "2024-01-01 10:00:00") + @JsonFormat(pattern = DateUtil.DATETIME_DEFAULT_FORMAT, timezone = "GMT+8") private LocalDateTime createTime; /** @@ -98,59 +101,7 @@ public class Course implements Serializable { *

记录最后更新时间，系统自动更新。

*/ @TableField("update_time") - @Schema(description = "更新时间", example = "2024-01-02T15:30:00") + @Schema(description = "更新时间", example = "2024-01-02 15:30:00") + @JsonFormat(pattern = DateUtil.DATETIME_DEFAULT_FORMAT, timezone = "GMT+8") private LocalDateTime updateTime; - - /** - * 无参构造函数 - */ - public Course() { - } - - /** - * 带课程ID的构造函数 - * - * @param id 课程ID - */ - public Course(String id) { - this.id = id; - } - - /** - * 完整参数构造函数 - * - * @param id 课程ID - * @param courseDate 课程日期 - * @param courseName 课程名称 - * @param courseDesc 课程描述 - * @param createBy 创建人 - * @param createTime 创建时间 - * @param updateBy 更新人 - * @param updateTime 更新时间 - */ - public Course(String id, LocalDate courseDate, String courseName, String courseDesc, - String createBy, LocalDateTime createTime, String updateBy, LocalDateTime updateTime) { - this.id = id; - this.courseDate = courseDate; - this.courseName = courseName; - this.courseDesc = courseDesc; - this.createBy = createBy; - this.createTime = createTime; - this.updateBy = updateBy; - this.updateTime = updateTime; - } - - @Override - public String toString() { - return "Course{" + - "id='" + id + '\'' + - ", courseDate=" + courseDate + - ", courseName='" + courseName + '\'' + - ", courseDesc='" + courseDesc + '\'' + - ", createBy='" + createBy + '\'' + - ", createTime=" + createTime + - ", updateBy='" + updateBy + '\'' + - ", updateTime=" + updateTime + - '}'; - } } \ No newline at end of file diff --git a/src/main/java/com/chinaweal/youfool/course/entity/CourseAttachment.java b/src/main/java/com/chinaweal/youfool/course/entity/CourseAttachment.java index a63add3..92d81f0 100644 --- a/src/main/java/com/chinaweal/youfool/course/entity/CourseAttachment.java +++ b/src/main/java/com/chinaweal/youfool/course/entity/CourseAttachment.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.chinaweal.youfool.framework.springboot.common.util.DateUtil; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -97,7 +99,8 @@ public class CourseAttachment implements Serializable { *

记录创建时间，系统自动生成。

*/ @TableField("create_time") - @Schema(description = "创建时间", example = "2024-01-01T10:00:00") + @Schema(description = "创建时间", example = "2024-01-01 10:00:00") + @JsonFormat(pattern = DateUtil.DATETIME_DEFAULT_FORMAT, timezone = "GMT+8") private LocalDateTime createTime; /** @@ -115,66 +118,7 @@ public class CourseAttachment implements Serializable { *

记录最后更新时间，系统自动更新。

*/ @TableField("update_time") - @Schema(description = "更新时间", example = "2024-01-02T15:30:00") + @Schema(description = "更新时间", example = "2024-01-02 15:30:00") + @JsonFormat(pattern = DateUtil.DATETIME_DEFAULT_FORMAT, timezone = "GMT+8") private LocalDateTime updateTime; - - /** - * 无参构造函数 - */ - public CourseAttachment() { - } - - /** - * 带附件ID的构造函数 - * - * @param id 附件ID - */ - public CourseAttachment(String id) { - this.id = id; - } - - /** - * 完整参数构造函数 - * - * @param id 附件ID - * @param courseId 课程ID - * @param fileName 文件名称 - * @param fileFormat 文件格式 - * @param absoluteName 文件绝对路径名称 - * @param fileSize 文件大小 - * @param createBy 创建人 - * @param createTime 创建时间 - * @param updateBy 更新人 - * @param updateTime 更新时间 - */ - public CourseAttachment(String id, String courseId, String fileName, String fileFormat, - String absoluteName, Long fileSize, String createBy, LocalDateTime createTime, - String updateBy, LocalDateTime updateTime) { - this.id = id; - this.courseId = courseId; - this.fileName = fileName; - this.fileFormat = fileFormat; - this.absoluteName = absoluteName; - this.fileSize = fileSize; - this.createBy = createBy; - this.createTime = createTime; - this.updateBy = updateBy; - this.updateTime = updateTime; - } - - @Override - public String toString() { - return "CourseAttachment{" + - "id='" + id + '\'' + - ", courseId='" + courseId + '\'' + - ", fileName='" + fileName + '\'' + - ", fileFormat='" + fileFormat + '\'' + - ", absoluteName='" + absoluteName + '\'' + - ", fileSize=" + fileSize + - ", createBy='" + createBy + '\'' + - ", createTime=" + createTime + - ", updateBy='" + updateBy + '\'' + - ", updateTime=" + updateTime + - '}'; - } } \ No newline at end of file diff --git a/src/main/java/com/chinaweal/youfool/course/entity/CourseComment.java b/src/main/java/com/chinaweal/youfool/course/entity/CourseComment.java index 024e672..4f21105 100644 --- a/src/main/java/com/chinaweal/youfool/course/entity/CourseComment.java +++ b/src/main/java/com/chinaweal/youfool/course/entity/CourseComment.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.chinaweal.youfool.framework.springboot.common.util.DateUtil; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -79,7 +81,8 @@ public class CourseComment implements Serializable { *

记录创建时间，系统自动生成。

*/ @TableField("create_time") - @Schema(description = "创建时间", example = "2024-01-01T10:00:00") + @Schema(description = "创建时间", example = "2024-01-01 10:00:00") + @JsonFormat(pattern = DateUtil.DATETIME_DEFAULT_FORMAT, timezone = "GMT+8") private LocalDateTime createTime; /** @@ -97,59 +100,8 @@ public class CourseComment implements Serializable { *

记录最后更新时间，系统自动更新。

*/ @TableField("update_time") - @Schema(description = "更新时间", example = "2024-01-02T15:30:00") + @Schema(description = "更新时间", example = "2024-01-02 15:30:00") + @JsonFormat(pattern = DateUtil.DATETIME_DEFAULT_FORMAT, timezone = "GMT+8") private LocalDateTime updateTime; - /** - * 无参构造函数 - */ - public CourseComment() { - } - - /** - * 带评论ID的构造函数 - * - * @param id 评论ID - */ - public CourseComment(String id) { - this.id = id; - } - - /** - * 完整参数构造函数 - * - * @param id 评论ID - * @param courseId 课程ID - * @param commentText 评论文本 - * @param parentId 回复ID - * @param createBy 创建人 - * @param createTime 创建时间 - * @param updateBy 更新人 - * @param updateTime 更新时间 - */ - public CourseComment(String id, String courseId, String commentText, String parentId, - String createBy, LocalDateTime createTime, String updateBy, LocalDateTime updateTime) { - this.id = id; - this.courseId = courseId; - this.commentText = commentText; - this.parentId = parentId; - this.createBy = createBy; - this.createTime = createTime; - this.updateBy = updateBy; - this.updateTime = updateTime; - } - - @Override - public String toString() { - return "CourseComment{" + - "id='" + id + '\'' + - ", courseId='" + courseId + '\'' + - ", commentText='" + commentText + '\'' + - ", parentId='" + parentId + '\'' + - ", createBy='" + createBy + '\'' + - ", createTime=" + createTime + - ", updateBy='" + updateBy + '\'' + - ", updateTime=" + updateTime + - '}'; - } } \ No newline at end of file diff --git a/src/main/java/com/chinaweal/youfool/course/entity/CourseVideo.java b/src/main/java/com/chinaweal/youfool/course/entity/CourseVideo.java index 226ab2b..0ea00bb 100644 --- a/src/main/java/com/chinaweal/youfool/course/entity/CourseVideo.java +++ b/src/main/java/com/chinaweal/youfool/course/entity/CourseVideo.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.chinaweal.youfool.framework.springboot.common.util.DateUtil; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -88,7 +90,8 @@ public class CourseVideo implements Serializable { *

记录创建时间，系统自动生成。

*/ @TableField("create_time") - @Schema(description = "创建时间", example = "2024-01-01T10:00:00") + @Schema(description = "创建时间", example = "2024-01-01 10:00:00") + @JsonFormat(pattern = DateUtil.DATETIME_DEFAULT_FORMAT, timezone = "GMT+8") private LocalDateTime createTime; /** @@ -106,62 +109,7 @@ public class CourseVideo implements Serializable { *

记录最后更新时间，系统自动更新。

*/ @TableField("update_time") - @Schema(description = "更新时间", example = "2024-01-02T15:30:00") + @Schema(description = "更新时间", example = "2024-01-02 15:30:00") + @JsonFormat(pattern = DateUtil.DATETIME_DEFAULT_FORMAT, timezone = "GMT+8") private LocalDateTime updateTime; - - /** - * 无参构造函数 - */ - public CourseVideo() { - } - - /** - * 带视频ID的构造函数 - * - * @param id 视频ID - */ - public CourseVideo(String id) { - this.id = id; - } - - /** - * 完整参数构造函数 - * - * @param id 视频ID - * @param courseId 课程主键 - * @param sortIdx 排序索引 - * @param videoName 视频名称 - * @param attachmentId 附件ID - * @param createBy 创建人 - * @param createTime 创建时间 - * @param updateBy 更新人 - * @param updateTime 更新时间 - */ - public CourseVideo(String id, String courseId, Integer sortIdx, String videoName, String attachmentId, - String createBy, LocalDateTime createTime, String updateBy, LocalDateTime updateTime) { - this.id = id; - this.courseId = courseId; - this.sortIdx = sortIdx; - this.videoName = videoName; - this.attachmentId = attachmentId; - this.createBy = createBy; - this.createTime = createTime; - this.updateBy = updateBy; - this.updateTime = updateTime; - } - - @Override - public String toString() { - return "CourseVideo{" + - "id='" + id + '\'' + - ", courseId='" + courseId + '\'' + - ", sortIdx=" + sortIdx + - ", videoName='" + videoName + '\'' + - ", attachmentId='" + attachmentId + '\'' + - ", createBy='" + createBy + '\'' + - ", createTime=" + createTime + - ", updateBy='" + updateBy + '\'' + - ", updateTime=" + updateTime + - '}'; - } } \ No newline at end of file diff --git a/src/main/java/com/chinaweal/youfool/course/entity/SysUser.java b/src/main/java/com/chinaweal/youfool/course/entity/SysUser.java index 0ade793..3d63aab 100644 --- a/src/main/java/com/chinaweal/youfool/course/entity/SysUser.java +++ b/src/main/java/com/chinaweal/youfool/course/entity/SysUser.java @@ -98,57 +98,4 @@ public class SysUser implements Serializable { @TableField("gitea_open_id") @Schema(description = "Gitea Open ID", example = "1234567890") private String giteaOpenId; - - /** - * 无参构造函数 - */ - public SysUser() { - } - - /** - * 带用户ID的构造函数 - * - * @param userId 用户ID - */ - public SysUser(String userId) { - this.userId = userId; - } - - /** - * 完整参数构造函数 - * - * @param userId 用户ID - * @param username 用户名 - * @param nickname 昵称 - * @param name 姓名 - * @param avatar 头像 - * @param email 邮箱 - * @param password 密码 - * @param giteaOpenId Gitea Open ID - */ - public SysUser(String userId, String username, String nickname, String name, - String avatar, String email, String password, String giteaOpenId) { - this.userId = userId; - this.username = username; - this.nickname = nickname; - this.name = name; - this.avatar = avatar; - this.email = email; - this.password = password; - this.giteaOpenId = giteaOpenId; - } - - @Override - public String toString() { - return "SysUser{" + - "userId='" + userId + '\'' + - ", username='" + username + '\'' + - ", nickname='" + nickname + '\'' + - ", name='" + name + '\'' + - ", avatar='" + avatar + '\'' + - ", email='" + email + '\'' + - ", password='" + password + '\'' + - ", giteaOpenId='" + giteaOpenId + '\'' + - '}'; - } } \ No newline at end of file diff --git a/src/main/java/com/chinaweal/youfool/course/service/impl/UserBaseServiceImpl.java b/src/main/java/com/chinaweal/youfool/course/service/impl/UserBaseServiceImpl.java index 6f2fb22..a08f75d 100644 --- a/src/main/java/com/chinaweal/youfool/course/service/impl/UserBaseServiceImpl.java +++ b/src/main/java/com/chinaweal/youfool/course/service/impl/UserBaseServiceImpl.java @@ -6,7 +6,6 @@ import cn.dev33.satoken.stp.StpUtil; import com.chinaweal.youfool.framework.springboot.rest.RestResult; import com.chinaweal.youfool.framework.springboot.user.entity.UserBase; import com.chinaweal.youfool.framework.springboot.user.service.UserBaseService; -import com.chinaweal.youfool.course.common.constants.SessionConstants; import org.springframework.stereotype.Service; import java.util.List; @@ -25,7 +24,7 @@ public class UserBaseServiceImpl implements UserBaseService { public UserBase getCurrentUser() { try { SaSession session = StpUtil.getSession(); - return session.get(SessionConstants.USER_KEY, null); + return session.get(SaSession.USER, null); } catch (NotLoginException e) { UserBase userBase = new UserBase(); userBase.setUsername("guest");