diff --git a/CHANGELOG.md b/CHANGELOG.md index 688fca4..2550f57 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ ## 1.8 版本更新 +- 优化:[API]日志输出 - 优化:[API]LDAP的部门同步逻辑 - 优化:[API]LDAP的用户同步逻辑 - 优化:[其它]`docker`镜像更换为阿里云加速 diff --git a/playedu-api/playedu-api/src/main/resources/application.yml b/playedu-api/playedu-api/src/main/resources/application.yml index 5fe736b..2ccf0de 100644 --- a/playedu-api/playedu-api/src/main/resources/application.yml +++ b/playedu-api/playedu-api/src/main/resources/application.yml @@ -53,8 +53,6 @@ mybatis: mybatis-plus: global-config: banner: false -# configuration: -# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl sa-token: token-name: "Authorization" @@ -63,7 +61,9 @@ sa-token: is-share: false jwt-secret-key: "playeduxyz" token-prefix: "Bearer" - is-log: false + is-print: false + is-log: true + log-level: "warn" playedu: core: diff --git a/playedu-api/playedu-common/src/main/java/xyz/playedu/common/domain/AdminRolePermission.java b/playedu-api/playedu-common/src/main/java/xyz/playedu/common/domain/AdminRolePermission.java index e027152..fda75c4 100644 --- a/playedu-api/playedu-common/src/main/java/xyz/playedu/common/domain/AdminRolePermission.java +++ b/playedu-api/playedu-common/src/main/java/xyz/playedu/common/domain/AdminRolePermission.java @@ -15,7 +15,9 @@ */ package xyz.playedu.common.domain; +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.fasterxml.jackson.annotation.JsonProperty; @@ -29,6 +31,7 @@ import java.io.Serializable; @TableName(value = "admin_role_permission") @Data public class AdminRolePermission implements Serializable { + @TableId(type = IdType.NONE) @JsonProperty("role_id") private Integer roleId; diff --git a/playedu-api/playedu-common/src/main/java/xyz/playedu/common/domain/AdminUserRole.java b/playedu-api/playedu-common/src/main/java/xyz/playedu/common/domain/AdminUserRole.java index dd24ade..864fb3c 100644 --- a/playedu-api/playedu-common/src/main/java/xyz/playedu/common/domain/AdminUserRole.java +++ b/playedu-api/playedu-common/src/main/java/xyz/playedu/common/domain/AdminUserRole.java @@ -15,7 +15,9 @@ */ package xyz.playedu.common.domain; +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.fasterxml.jackson.annotation.JsonProperty; @@ -29,6 +31,7 @@ import java.io.Serializable; @TableName(value = "admin_user_role") @Data public class AdminUserRole implements Serializable { + @TableId(type = IdType.NONE) @JsonProperty("admin_id") private Integer adminId; diff --git a/playedu-api/playedu-common/src/main/java/xyz/playedu/common/domain/UserDepartment.java b/playedu-api/playedu-common/src/main/java/xyz/playedu/common/domain/UserDepartment.java index aac2003..131b458 100644 --- a/playedu-api/playedu-common/src/main/java/xyz/playedu/common/domain/UserDepartment.java +++ b/playedu-api/playedu-common/src/main/java/xyz/playedu/common/domain/UserDepartment.java @@ -15,7 +15,9 @@ */ package xyz.playedu.common.domain; +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.fasterxml.jackson.annotation.JsonProperty; @@ -29,6 +31,7 @@ import java.io.Serializable; @TableName(value = "user_department") @Data public class UserDepartment implements Serializable { + @TableId(type = IdType.NONE) @JsonProperty("user_id") private Integer userId; diff --git a/playedu-api/playedu-course/src/main/java/xyz/playedu/course/domain/CourseCategory.java b/playedu-api/playedu-course/src/main/java/xyz/playedu/course/domain/CourseCategory.java index 81a066e..955802d 100644 --- a/playedu-api/playedu-course/src/main/java/xyz/playedu/course/domain/CourseCategory.java +++ b/playedu-api/playedu-course/src/main/java/xyz/playedu/course/domain/CourseCategory.java @@ -15,7 +15,9 @@ */ package xyz.playedu.course.domain; +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.fasterxml.jackson.annotation.JsonProperty; @@ -30,6 +32,7 @@ import java.io.Serializable; @Data public class CourseCategory implements Serializable { /** */ + @TableId(type = IdType.NONE) @JsonProperty("course_id") private Integer courseId; diff --git a/playedu-api/playedu-course/src/main/java/xyz/playedu/course/domain/CourseDepartment.java b/playedu-api/playedu-course/src/main/java/xyz/playedu/course/domain/CourseDepartment.java index d1396a8..65cbc1a 100644 --- a/playedu-api/playedu-course/src/main/java/xyz/playedu/course/domain/CourseDepartment.java +++ b/playedu-api/playedu-course/src/main/java/xyz/playedu/course/domain/CourseDepartment.java @@ -15,7 +15,9 @@ */ package xyz.playedu.course.domain; +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.fasterxml.jackson.annotation.JsonProperty; @@ -29,6 +31,7 @@ import java.io.Serializable; @TableName(value = "course_department") @Data public class CourseDepartment implements Serializable { + @TableId(type = IdType.NONE) @JsonProperty("course_id") private Integer courseId; diff --git a/playedu-api/playedu-resource/src/main/java/xyz/playedu/resource/domain/ResourceCategory.java b/playedu-api/playedu-resource/src/main/java/xyz/playedu/resource/domain/ResourceCategory.java index e83a746..8e49e25 100644 --- a/playedu-api/playedu-resource/src/main/java/xyz/playedu/resource/domain/ResourceCategory.java +++ b/playedu-api/playedu-resource/src/main/java/xyz/playedu/resource/domain/ResourceCategory.java @@ -15,7 +15,9 @@ */ package xyz.playedu.resource.domain; +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 lombok.Data; @@ -29,6 +31,7 @@ import java.io.Serializable; @Data public class ResourceCategory implements Serializable { /** */ + @TableId(type = IdType.NONE) private Integer cid; /** */ diff --git a/playedu-api/playedu-resource/src/main/java/xyz/playedu/resource/domain/ResourceVideo.java b/playedu-api/playedu-resource/src/main/java/xyz/playedu/resource/domain/ResourceVideo.java index a5d3914..1f4d830 100644 --- a/playedu-api/playedu-resource/src/main/java/xyz/playedu/resource/domain/ResourceVideo.java +++ b/playedu-api/playedu-resource/src/main/java/xyz/playedu/resource/domain/ResourceVideo.java @@ -15,7 +15,9 @@ */ package xyz.playedu.resource.domain; +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.fasterxml.jackson.annotation.JsonIgnore; @@ -31,6 +33,7 @@ import java.util.Date; @Data public class ResourceVideo implements Serializable { /** */ + @TableId(type = IdType.NONE) private Integer rid; /** 封面 */