Browse Source

Merge remote-tracking branch 'origin/master'

master
CMM 1 year ago
parent
commit
72166037ec
3 changed files with 4 additions and 8 deletions
  1. +3
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/filemanage/model/vo/DocumentationVO.java
  2. +1
    -1
      pmapi/src/main/java/com/ningdatech/pmapi/user/security/auth/lisenter/AuthorizationEventListener.java
  3. +0
    -7
      pmapi/src/main/java/com/ningdatech/pmapi/user/security/auth/model/WebRequestDetails.java

+ 3
- 0
pmapi/src/main/java/com/ningdatech/pmapi/filemanage/model/vo/DocumentationVO.java View File

@@ -19,6 +19,9 @@ public class DocumentationVO {
@ApiModelProperty("主键") @ApiModelProperty("主键")
private Long id; private Long id;


@ApiModelProperty("文档ID")
private Long fileId;

@ApiModelProperty("文件名") @ApiModelProperty("文件名")
private String fileName; private String fileName;




pmapi/src/main/java/com/ningdatech/pmapi/user/controller/AuthorizationEventListener.java → pmapi/src/main/java/com/ningdatech/pmapi/user/security/auth/lisenter/AuthorizationEventListener.java View File

@@ -1,4 +1,4 @@
package com.ningdatech.pmapi.user.controller;
package com.ningdatech.pmapi.user.security.auth.lisenter;


import cn.hutool.core.date.LocalDateTimeUtil; import cn.hutool.core.date.LocalDateTimeUtil;
import com.ningdatech.log.model.OptLogDTO; import com.ningdatech.log.model.OptLogDTO;

+ 0
- 7
pmapi/src/main/java/com/ningdatech/pmapi/user/security/auth/model/WebRequestDetails.java View File

@@ -5,7 +5,6 @@ import cn.hutool.extra.servlet.ServletUtil;
import org.springframework.security.web.authentication.WebAuthenticationDetails; import org.springframework.security.web.authentication.WebAuthenticationDetails;


import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.time.LocalDateTime;


/** /**
* <p> * <p>
@@ -19,8 +18,6 @@ public class WebRequestDetails extends WebAuthenticationDetails {


private static final long serialVersionUID = -4466339683132696235L; private static final long serialVersionUID = -4466339683132696235L;


private LocalDateTime requestTime;

private final String requestIp; private final String requestIp;


private final String requestUri; private final String requestUri;
@@ -49,10 +46,6 @@ public class WebRequestDetails extends WebAuthenticationDetails {
this.userAgent = StrUtil.sub(request.getHeader("user-agent"), 0, 500); this.userAgent = StrUtil.sub(request.getHeader("user-agent"), 0, 500);
} }


public LocalDateTime getRequestTime() {
return requestTime;
}

public String getRequestIp() { public String getRequestIp() {
return requestIp; return requestIp;
} }


Loading…
Cancel
Save