优化bug修改完善

build.gradle

@@ -68,7 +68,13 @@ dependencyManagement {
 dependencies {
     implementation("com.aizuda:aizuda-service-parent:1.0.0")
     implementation("com.github.ben-manes.caffeine:caffeine")
-    implementation("com.lmax:disruptor:3.4.4")
+
+    // 日志
+    api('org.springframework.boot:spring-boot-starter-log4j2')
+    api("com.lmax:disruptor")
+
+    // 文档 https://springdoc.org/v2/#demos
+    implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0")
 
     // 监控
     implementation("com.aizuda:aizuda-monitor")
@@ -82,9 +88,6 @@ dependencies {
     // 电子邮件
     implementation("org.springframework.boot:spring-boot-starter-mail")
 
-    // https://springdoc.org/v2/#demos
-    implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.1.0")
-
     // oss 文件存储
     implementation("com.aizuda:aizuda-oss")
     implementation("io.minio:minio:8.5.2")

src/main/java/com/aizuda/boot/modules/auth/param/LoginParam.java

@@ -21,8 +21,10 @@ import java.io.Serializable;
 @Setter
 @Schema(name = "LoginParam", description = "登录参数")
 public class LoginParam implements Serializable {
+
     @Schema(description = "登录名称")
     private String username;
+
     @Schema(description = "登录密码")
     private String password;
 

src/main/java/com/aizuda/boot/modules/system/entity/SysUser.java

@@ -31,6 +31,7 @@ public class SysUser extends BaseEntity {
     @Size(max = 20)
     private String username;
 
+    @JsonIgnore
     @Schema(description = "密码")
     @NotBlank(groups = Create.class)
     @Size(max = 32)
@@ -73,4 +74,7 @@ public class SysUser extends BaseEntity {
     @Schema(description = "状态 0、禁用 1、正常")
     private Integer status;
 
+    @Schema(description = "工号")
+    private String jobNum;
+
 }

src/main/java/com/aizuda/boot/modules/system/entity/vo/MenuVO.java

@@ -19,6 +19,7 @@ import java.util.Map;
 @Setter
 public class MenuVO implements Serializable {
     private String name;
+    private String redirect;
     private String path;
     private String component;
     private Map<String, Object> meta;

src/main/java/com/aizuda/boot/modules/system/mapper/SysResourceMapper.java

@@ -29,6 +29,6 @@ public interface SysResourceMapper extends CrudMapper<SysResource> {
      * @param userId 用户ID
      * @return
      */
-    @Select("SELECT  r.* FROM sys_resource r WHERE EXISTS (SELECT 1 FROM sys_role_resource s JOIN sys_user_role t ON s.role_id=t.role_id WHERE t.user_id=#{userId} AND r.id=s.resource_id) AND type<3 AND r.deleted=0 AND r.status=1 ORDER BY sort DESC")
+    @Select("SELECT r.* FROM sys_resource r WHERE EXISTS (SELECT 1 FROM sys_role_resource s JOIN sys_user_role t ON s.role_id=t.role_id WHERE t.user_id=#{userId} AND r.id=s.resource_id) AND type<3 AND r.deleted=0 AND r.status=1 ORDER BY sort DESC")
     List<SysResource> selectMenuByUserId(Long userId);
 }

src/main/java/com/aizuda/boot/modules/system/service/impl/SysResourceServiceImpl.java

@@ -114,9 +114,10 @@ public class SysResourceServiceImpl extends BaseServiceImpl<SysResourceMapper, S
     protected MenuVO getMenuVO(SysResource sysResource, List<SysResource> sysResourceList) {
         MenuVO vo = new MenuVO();
         vo.setName(sysResource.getAlias());
+        vo.setRedirect(sysResource.getRedirect());
         vo.setPath(sysResource.getPath());
         vo.setComponent(sysResource.getComponent());
-        vo.setMeta(new HashMap<String, Object>(5) {{
+        vo.setMeta(new HashMap<>(5) {{
             put("title", sysResource.getTitle());
             put("icon", sysResource.getIcon());
             put("type", ResourceType.convert(sysResource.getType()));

src/main/resources/application.yml

@@ -32,3 +32,5 @@ mybatis-plus:
 # 日志
 logging:
   config: classpath:log4j2.xml
+  pattern:
+    console: "%-5level - %msg%n"