@@ -67,27 +67,11 @@ | |||
<artifactId>spring-boot-starter-validation</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>nl.basjes.parse.useragent</groupId> | |||
<artifactId>yauaa</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>jakarta.persistence</groupId> | |||
<artifactId>jakarta.persistence-api</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.springframework.data</groupId> | |||
<artifactId>spring-data-jpa</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.hibernate</groupId> | |||
<artifactId>hibernate-core</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.springframework.boot</groupId> | |||
<artifactId>spring-boot-starter-data-jpa</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.springframework.boot</groupId> | |||
<artifactId>spring-boot-starter-web</artifactId> | |||
</dependency> | |||
<dependency> | |||
@@ -115,10 +99,6 @@ | |||
<groupId>org.springframework.boot</groupId> | |||
<artifactId>spring-boot-starter-aop</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.springframework</groupId> | |||
<artifactId>spring-test</artifactId> | |||
</dependency> | |||
<!--cache--> | |||
<dependency> | |||
<groupId>com.github.ben-manes.caffeine</groupId> | |||
@@ -148,12 +128,10 @@ | |||
<artifactId>jjwt-jackson</artifactId> | |||
<version>${jjwt.version}</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.poi</groupId> | |||
<artifactId>poi</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.poi</groupId> | |||
<artifactId>poi-ooxml</artifactId> | |||
@@ -173,28 +151,6 @@ | |||
<groupId>org.aspectj</groupId> | |||
<artifactId>aspectjweaver</artifactId> | |||
</dependency> | |||
<!--pdf工具依赖 start--> | |||
<dependency> | |||
<groupId>com.itextpdf</groupId> | |||
<artifactId>itextpdf</artifactId> | |||
<version>5.5.13</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>com.itextpdf</groupId> | |||
<artifactId>itext-asian</artifactId> | |||
<version>5.2.0</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.apache.pdfbox</groupId> | |||
<artifactId>pdfbox</artifactId> | |||
<version>2.0.4</version> | |||
</dependency> | |||
<!--pdf工具依赖 end--> | |||
<dependency> | |||
<groupId>org.jxls</groupId> | |||
<artifactId>jxls-jexcel</artifactId> | |||
<version>1.0.6</version> | |||
</dependency> | |||
<!--Spring boot 测试--> | |||
<dependency> | |||
<groupId>org.springframework.boot</groupId> | |||
@@ -202,18 +158,14 @@ | |||
<scope>test</scope> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.springframework.boot</groupId> | |||
<artifactId>spring-boot-starter-freemarker</artifactId> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.mapstruct</groupId> | |||
<artifactId>mapstruct</artifactId> | |||
<version>1.4.2.Final</version> | |||
<version>1.5.3.Final</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.mapstruct</groupId> | |||
<artifactId>mapstruct-processor</artifactId> | |||
<version>1.4.2.Final</version> | |||
<version>1.5.3.Final</version> | |||
</dependency> | |||
<dependency> | |||
<groupId>org.springframework.boot</groupId> | |||
@@ -1,4 +1,4 @@ | |||
package com.ningdatech.pmapi.common.constants; | |||
package com.ningdatech.pmapi.common.constant; | |||
import com.ningdatech.basic.model.ApiResponse; | |||
@@ -81,16 +81,6 @@ public interface BizConst { | |||
*/ | |||
String REGEX_PASS = "^(?![a-zA-Z]+$)(?![A-Z0-9]+$)(?![A-Z\\W_]+$)(?![a-z0-9]+$)(?![a-z\\W_]+$)(?![0-9\\W_]+$)[a-zA-Z0-9\\W_]{8,20}$"; | |||
/** | |||
* 租车费率 | |||
*/ | |||
BigDecimal RATE_CAR_RENTAL = new BigDecimal("1.13"); | |||
/** | |||
* 服务费率 | |||
*/ | |||
BigDecimal RATE_SERVICE = new BigDecimal("0.0442"); | |||
ApiResponse<Void> UNAUTHENTICATED = ApiResponse.of(401, "用户未登录", null); | |||
int MAX_EXPORT_COUNT = 5000; |
@@ -3,10 +3,12 @@ package com.ningdatech.pmapi.user.entity; | |||
import com.baomidou.mybatisplus.annotation.IdType; | |||
import com.baomidou.mybatisplus.annotation.TableId; | |||
import com.baomidou.mybatisplus.annotation.TableName; | |||
import java.io.Serializable; | |||
import java.time.LocalDateTime; | |||
import io.swagger.annotations.ApiModel; | |||
import io.swagger.annotations.ApiModelProperty; | |||
import lombok.Data; | |||
import java.io.Serializable; | |||
import java.time.LocalDateTime; | |||
/** | |||
* <p> | |||
@@ -16,6 +18,7 @@ import io.swagger.annotations.ApiModelProperty; | |||
* @author Liuxinxin | |||
* @since 2023-01-05 | |||
*/ | |||
@Data | |||
@TableName("nd_role_info") | |||
@ApiModel(value = "RoleInfo对象", description = "角色表") | |||
public class RoleInfo implements Serializable { | |||
@@ -35,50 +38,4 @@ public class RoleInfo implements Serializable { | |||
private LocalDateTime updateOn; | |||
public Long getId() { | |||
return id; | |||
} | |||
public void setId(Long id) { | |||
this.id = id; | |||
} | |||
public String getName() { | |||
return name; | |||
} | |||
public void setName(String name) { | |||
this.name = name; | |||
} | |||
public String getDescription() { | |||
return description; | |||
} | |||
public void setDescription(String description) { | |||
this.description = description; | |||
} | |||
public LocalDateTime getCreateOn() { | |||
return createOn; | |||
} | |||
public void setCreateOn(LocalDateTime createOn) { | |||
this.createOn = createOn; | |||
} | |||
public LocalDateTime getUpdateOn() { | |||
return updateOn; | |||
} | |||
public void setUpdateOn(LocalDateTime updateOn) { | |||
this.updateOn = updateOn; | |||
} | |||
@Override | |||
public String toString() { | |||
return "RoleInfo{" + | |||
"id=" + id + | |||
", name=" + name + | |||
", description=" + description + | |||
", createOn=" + createOn + | |||
", updateOn=" + updateOn + | |||
"}"; | |||
} | |||
} |
@@ -3,10 +3,11 @@ package com.ningdatech.pmapi.user.entity; | |||
import com.baomidou.mybatisplus.annotation.IdType; | |||
import com.baomidou.mybatisplus.annotation.TableId; | |||
import com.baomidou.mybatisplus.annotation.TableName; | |||
import io.swagger.annotations.ApiModel; | |||
import lombok.Data; | |||
import java.io.Serializable; | |||
import java.time.LocalDateTime; | |||
import io.swagger.annotations.ApiModel; | |||
import io.swagger.annotations.ApiModelProperty; | |||
/** | |||
* <p> | |||
@@ -16,6 +17,7 @@ import io.swagger.annotations.ApiModelProperty; | |||
* @author Liuxinxin | |||
* @since 2023-01-04 | |||
*/ | |||
@Data | |||
@TableName("nd_user_auth") | |||
@ApiModel(value = "UserAuth对象", description = "用户鉴权表") | |||
public class UserAuth implements Serializable { | |||
@@ -37,66 +39,4 @@ public class UserAuth implements Serializable { | |||
private String credential; | |||
public Long getId() { | |||
return id; | |||
} | |||
public void setId(Long id) { | |||
this.id = id; | |||
} | |||
public LocalDateTime getCreateOn() { | |||
return createOn; | |||
} | |||
public void setCreateOn(LocalDateTime createOn) { | |||
this.createOn = createOn; | |||
} | |||
public LocalDateTime getUpdateOn() { | |||
return updateOn; | |||
} | |||
public void setUpdateOn(LocalDateTime updateOn) { | |||
this.updateOn = updateOn; | |||
} | |||
public Long getUserId() { | |||
return userId; | |||
} | |||
public void setUserId(Long userId) { | |||
this.userId = userId; | |||
} | |||
public String getAuthType() { | |||
return authType; | |||
} | |||
public void setAuthType(String authType) { | |||
this.authType = authType; | |||
} | |||
public String getIdentifier() { | |||
return identifier; | |||
} | |||
public void setIdentifier(String identifier) { | |||
this.identifier = identifier; | |||
} | |||
public String getCredential() { | |||
return credential; | |||
} | |||
public void setCredential(String credential) { | |||
this.credential = credential; | |||
} | |||
@Override | |||
public String toString() { | |||
return "UserAuth{" + | |||
"id=" + id + | |||
", createOn=" + createOn + | |||
", updateOn=" + updateOn + | |||
", userId=" + userId + | |||
", authType=" + authType + | |||
", identifier=" + identifier + | |||
", credential=" + credential + | |||
"}"; | |||
} | |||
} |
@@ -3,10 +3,12 @@ package com.ningdatech.pmapi.user.entity; | |||
import com.baomidou.mybatisplus.annotation.IdType; | |||
import com.baomidou.mybatisplus.annotation.TableId; | |||
import com.baomidou.mybatisplus.annotation.TableName; | |||
import java.io.Serializable; | |||
import java.time.LocalDateTime; | |||
import io.swagger.annotations.ApiModel; | |||
import io.swagger.annotations.ApiModelProperty; | |||
import lombok.Data; | |||
import java.io.Serializable; | |||
import java.time.LocalDateTime; | |||
/** | |||
* <p> | |||
@@ -16,6 +18,7 @@ import io.swagger.annotations.ApiModelProperty; | |||
* @author Liuxinxin | |||
* @since 2023-01-04 | |||
*/ | |||
@Data | |||
@TableName("nd_user_info") | |||
@ApiModel(value = "UserInfo对象", description = "用户信息表") | |||
public class UserInfo implements Serializable { | |||
@@ -71,138 +74,4 @@ public class UserInfo implements Serializable { | |||
@ApiModelProperty("身份证号") | |||
private String idCard; | |||
public Long getId() { | |||
return id; | |||
} | |||
public void setId(Long id) { | |||
this.id = id; | |||
} | |||
public LocalDateTime getCreateOn() { | |||
return createOn; | |||
} | |||
public void setCreateOn(LocalDateTime createOn) { | |||
this.createOn = createOn; | |||
} | |||
public LocalDateTime getUpdateOn() { | |||
return updateOn; | |||
} | |||
public void setUpdateOn(LocalDateTime updateOn) { | |||
this.updateOn = updateOn; | |||
} | |||
public Long getCreateBy() { | |||
return createBy; | |||
} | |||
public void setCreateBy(Long createBy) { | |||
this.createBy = createBy; | |||
} | |||
public Long getUpdateBy() { | |||
return updateBy; | |||
} | |||
public void setUpdateBy(Long updateBy) { | |||
this.updateBy = updateBy; | |||
} | |||
public String getUsername() { | |||
return username; | |||
} | |||
public void setUsername(String username) { | |||
this.username = username; | |||
} | |||
public String getMobile() { | |||
return mobile; | |||
} | |||
public void setMobile(String mobile) { | |||
this.mobile = mobile; | |||
} | |||
public String getRealName() { | |||
return realName; | |||
} | |||
public void setRealName(String realName) { | |||
this.realName = realName; | |||
} | |||
public Long getCompanyId() { | |||
return companyId; | |||
} | |||
public void setCompanyId(Long companyId) { | |||
this.companyId = companyId; | |||
} | |||
public String getCompanyName() { | |||
return companyName; | |||
} | |||
public void setCompanyName(String companyName) { | |||
this.companyName = companyName; | |||
} | |||
public String getRole() { | |||
return role; | |||
} | |||
public void setRole(String role) { | |||
this.role = role; | |||
} | |||
public Long getRegionCode() { | |||
return regionCode; | |||
} | |||
public void setRegionCode(Long regionCode) { | |||
this.regionCode = regionCode; | |||
} | |||
public Long getAvatarFileId() { | |||
return avatarFileId; | |||
} | |||
public void setAvatarFileId(Long avatarFileId) { | |||
this.avatarFileId = avatarFileId; | |||
} | |||
public String getManageCompanyIds() { | |||
return manageCompanyIds; | |||
} | |||
public void setManageCompanyIds(String manageCompanyIds) { | |||
this.manageCompanyIds = manageCompanyIds; | |||
} | |||
public Boolean getDeleted() { | |||
return deleted; | |||
} | |||
public void setDeleted(Boolean deleted) { | |||
this.deleted = deleted; | |||
} | |||
public String getIdCard() { | |||
return idCard; | |||
} | |||
public void setIdCard(String idCard) { | |||
this.idCard = idCard; | |||
} | |||
@Override | |||
public String toString() { | |||
return "UserInfo{" + | |||
"id=" + id + | |||
", createOn=" + createOn + | |||
", updateOn=" + updateOn + | |||
", createBy=" + createBy + | |||
", updateBy=" + updateBy + | |||
", username=" + username + | |||
", mobile=" + mobile + | |||
", realName=" + realName + | |||
", companyId=" + companyId + | |||
", companyName=" + companyName + | |||
", role=" + role + | |||
", regionCode=" + regionCode + | |||
", avatarFileId=" + avatarFileId + | |||
", manageCompanyIds=" + manageCompanyIds + | |||
", deleted=" + deleted + | |||
", idCard=" + idCard + | |||
"}"; | |||
} | |||
} |
@@ -3,9 +3,11 @@ package com.ningdatech.pmapi.user.entity; | |||
import com.baomidou.mybatisplus.annotation.IdType; | |||
import com.baomidou.mybatisplus.annotation.TableId; | |||
import com.baomidou.mybatisplus.annotation.TableName; | |||
import java.io.Serializable; | |||
import io.swagger.annotations.ApiModel; | |||
import io.swagger.annotations.ApiModelProperty; | |||
import lombok.Data; | |||
import java.io.Serializable; | |||
/** | |||
* <p> | |||
@@ -15,6 +17,7 @@ import io.swagger.annotations.ApiModelProperty; | |||
* @author Liuxinxin | |||
* @since 2023-01-05 | |||
*/ | |||
@Data | |||
@TableName("nd_user_role") | |||
@ApiModel(value = "UserRole对象", description = "用户角色表") | |||
public class UserRole implements Serializable { | |||
@@ -30,34 +33,4 @@ public class UserRole implements Serializable { | |||
@ApiModelProperty("角色 ID") | |||
private Long roleId; | |||
public Long getId() { | |||
return id; | |||
} | |||
public void setId(Long id) { | |||
this.id = id; | |||
} | |||
public Long getUserId() { | |||
return userId; | |||
} | |||
public void setUserId(Long userId) { | |||
this.userId = userId; | |||
} | |||
public Long getRoleId() { | |||
return roleId; | |||
} | |||
public void setRoleId(Long roleId) { | |||
this.roleId = roleId; | |||
} | |||
@Override | |||
public String toString() { | |||
return "UserRole{" + | |||
"id=" + id + | |||
", userId=" + userId + | |||
", roleId=" + roleId + | |||
"}"; | |||
} | |||
} |
@@ -2,7 +2,7 @@ package com.ningdatech.pmapi.user.security.auth; | |||
import com.ningdatech.basic.util.NdJsonUtil; | |||
import com.ningdatech.basic.util.StrPool; | |||
import com.ningdatech.pmapi.common.constants.BizConst; | |||
import com.ningdatech.pmapi.common.constant.BizConst; | |||
import com.ningdatech.pmapi.user.security.auth.config.AuthProperties; | |||
import com.ningdatech.pmapi.user.security.auth.handler.DefaultExpiredSessionStrategy; | |||
import com.ningdatech.pmapi.user.security.auth.password.UsernamePasswordAuthSecurityConfig; | |||