Skip to content

Commit 026d098

Browse files
committed
修改mp拦截器,添加倒叙排序注解
1 parent e1a51b0 commit 026d098

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

nginx-ops-admin/src/main/java/io/github/nginx/ops/server/admin/config/MybatisPlusConfig.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor;
99
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
1010
import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
11-
import io.github.nginx.ops.server.system.domain.dto.UserInfo;
12-
import io.github.nginx.ops.server.system.util.UserInfoUtils;
1311
import lombok.extern.slf4j.Slf4j;
1412
import net.sf.jsqlparser.expression.Expression;
1513
import net.sf.jsqlparser.expression.StringValue;
@@ -53,9 +51,8 @@ public void insertFill(MetaObject metaObject) {
5351
public void updateFill(MetaObject metaObject) {
5452
log.debug("start update fill ....");
5553
DateTime dateTime = new DateTime();
56-
UserInfo userInfo = UserInfoUtils.getUserInfo();
57-
this.strictInsertFill(
58-
metaObject, "updateBy", String.class, userInfo.getSysUser().getLoginName());
54+
// UserInfo userInfo = UserInfoUtils.getUserInfo();
55+
this.strictInsertFill(metaObject, "updateBy", String.class, "test");
5956
this.strictUpdateFill(metaObject, "updateTime", Date.class, dateTime);
6057
}
6158

nginx-ops-admin/src/main/java/io/github/nginx/ops/server/admin/config/SaTokenConfigure.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ public class SaTokenConfigure implements WebMvcConfigurer {
2020
@Override
2121
public void addInterceptors(InterceptorRegistry registry) {
2222
// 注册 Sa-Token 拦截器,打开注解式鉴权功能
23-
registry.addInterceptor(new SaAnnotationInterceptor()).addPathPatterns("/**");
23+
registry
24+
.addInterceptor(new SaAnnotationInterceptor())
25+
.addPathPatterns("/**")
26+
.excludePathPatterns("/login");
27+
;
2428
}
2529
}

nginx-ops-admin/src/main/java/io/github/nginx/ops/server/admin/service/impl/AdminServerImpl.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ public SaTokenInfo login(LoginDTO dto, HttpServletRequest request) {
7171
throw new BusinessException(AdminReturnCodeConstant.CAPTCHA_HAS_EXPIRED);
7272
}
7373
SysUser sysUser = sysUserService.getOneByLoginName(dto.getLoginName());
74-
if (ObjectUtil.isEmpty(sysUser) || !encoder.matches(sysUser.getPassword(), dto.getPassword())) {
74+
if (ObjectUtil.isEmpty(sysUser)
75+
|| Boolean.FALSE.equals(encoder.matches(dto.getPassword(), sysUser.getPassword()))) {
7576
throw new BusinessException(AdminReturnCodeConstant.USER_DOES_NOT_EXIST);
7677
}
7778
if (Boolean.FALSE.equals(sysUser.getIsEnable())) {

nginx-ops-comm/src/main/java/io/github/nginx/ops/server/comm/domain/entity/BaseEntity.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
package io.github.nginx.ops.server.comm.domain.entity;
22

33
import com.baomidou.mybatisplus.annotation.FieldFill;
4+
import com.baomidou.mybatisplus.annotation.OrderBy;
45
import com.baomidou.mybatisplus.annotation.TableField;
56
import com.baomidou.mybatisplus.annotation.TableId;
6-
import lombok.AllArgsConstructor;
7-
import lombok.Getter;
8-
import lombok.NoArgsConstructor;
9-
import lombok.Setter;
10-
import lombok.ToString;
7+
import lombok.*;
118
import lombok.experimental.SuperBuilder;
129

1310
import java.io.Serializable;
@@ -38,5 +35,6 @@ public class BaseEntity implements Serializable {
3835
private String updateBy;
3936
/** 修改时间 */
4037
@TableField(fill = FieldFill.INSERT_UPDATE)
38+
@OrderBy
4139
private Date updateTime;
4240
}

0 commit comments

Comments
 (0)