elf
/
elf-shop-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

perf(后台管理): 模块依赖调整

Browse Source
master
wayn 4 years ago
parent 91831dc3ff
commit 94802f2f27
37 changed files with 523 additions and 400 deletions
Show Stats Download Patch File Download Diff File

329
pom.xml
Unescape Escape View File

@ -6,14 +6,8 @@
<module>waynboot-common</module>
<module>waynboot-admin-api</module>
<module>waynboot-generator</module>
<module>waynboot-mobile</module>
<module>waynboot-mobile-api</module>
</modules>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.2.4.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>com.wayn</groupId>
<artifactId>waynboot</artifactId>
<version>0.0.1-SNAPSHOT</version>
@ -23,8 +17,12 @@
<properties>
<java.version>1.8</java.version>
<druid.version>1.1.23</druid.version>
<spring-boot.version>2.2.4.RELEASE</spring-boot.version>
<mysql.connector.java.version>8.0.19</mysql.connector.java.version>
<jedis.version>3.1.0</jedis.version>
<lombok.version>1.18.6</lombok.version>
<mybatis-plus.version>3.3.2</mybatis-plus.version>
<druid.version>1.1.23</druid.version>
<commons.io.version>2.5</commons.io.version>
<commons.collections.version>3.2.2</commons.collections.version>
<commons.fileupload.version>1.3.3</commons.fileupload.version>
@ -37,160 +35,167 @@
<qiniu.version>[7.2.0, 7.2.99]</qiniu.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-redis</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<!-- https://mvnrepository.com/artifact/com.baomidou/mybatis-plus-boot-starter -->
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>${mybatis-plus.version}</version>
</dependency>
<!--阿里数据库连接池 -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
<version>${druid.version}</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<!--io常用工具类 -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons.io.version}</version>
</dependency>
<!-- Apache工具组件 -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons-lang3.version}</version>
</dependency>
<!-- Apache 集合工具组件 -->
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>${commons.collections.version}</version>
</dependency>
<!-- 验证码 -->
<dependency>
<groupId>com.github.whvcse</groupId>
<artifactId>easy-captcha</artifactId>
<version>${easy-captcha.version}</version>
</dependency>
<!--文件上传工具类 -->
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>${commons.fileupload.version}</version>
</dependency>
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
</dependency>
<!-- jwt验证 -->
<dependency>
<groupId>com.auth0</groupId>
<artifactId>java-jwt</artifactId>
<version>${jwt.version}</version>
</dependency>
<!-- 阿里JSON解析器 -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>${fastjson.version}</version>
</dependency>
<dependency>
<groupId>cn.afterturn</groupId>
<artifactId>easypoi-base</artifactId>
<version>${easypoi.version}</version>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>cn.afterturn</groupId>
<artifactId>easypoi-annotation</artifactId>
<version>${easypoi.version}</version>
</dependency>
<!-- swagger2-->
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>${swagger.version}</version>
</dependency>
<!--防止进入swagger页面报类型转换错误，排除2.9.2中的引用，手动增加1.5.21版本-->
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>1.5.21</version>
</dependency>
<!-- swagger2-UI-->
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
<version>${swagger.version}</version>
</dependency>
<!-- 七牛云 -->
<dependency>
<groupId>com.qiniu</groupId>
<artifactId>qiniu-java-sdk</artifactId>
<version>${qiniu.version}</version>
</dependency>
</dependencies>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring-boot.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
<version>${spring-boot.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-redis</artifactId>
<version>${spring-boot.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
<version>${spring-boot.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>${spring-boot.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>${spring-boot.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>${mybatis-plus.version}</version>
</dependency>
<!--阿里数据库连接池 -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
<version>${druid.version}</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.connector.java.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
<optional>true</optional>
</dependency>
<!-- Apache工具组件 -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons-lang3.version}</version>
</dependency>
<!-- Apache 集合工具组件 -->
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>${commons.collections.version}</version>
</dependency>
<!-- 验证码 -->
<dependency>
<groupId>com.github.whvcse</groupId>
<artifactId>easy-captcha</artifactId>
<version>${easy-captcha.version}</version>
</dependency>
<!--文件上传工具类 -->
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>${commons.fileupload.version}</version>
</dependency>
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
<version>${jedis.version}</version>
</dependency>
<!-- jwt验证 -->
<dependency>
<groupId>com.auth0</groupId>
<artifactId>java-jwt</artifactId>
<version>${jwt.version}</version>
</dependency>
<!-- 阿里JSON解析器 -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>${fastjson.version}</version>
</dependency>
<dependency>
<groupId>cn.afterturn</groupId>
<artifactId>easypoi-base</artifactId>
<version>${easypoi.version}</version>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>cn.afterturn</groupId>
<artifactId>easypoi-annotation</artifactId>
<version>${easypoi.version}</version>
</dependency>
<!-- 七牛云 -->
<dependency>
<groupId>com.qiniu</groupId>
<artifactId>qiniu-java-sdk</artifactId>
<version>${qiniu.version}</version>
</dependency>
<!-- swagger2-->
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>${swagger.version}</version>
</dependency>
<!--防止进入swagger页面报类型转换错误，排除2.9.2中的引用，手动增加1.5.21版本-->
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>1.5.21</version>
</dependency>
<!-- swagger2-UI-->
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
<version>${swagger.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<build>
</build>

15
waynboot-admin-api/pom.xml
Unescape Escape View File

@ -12,6 +12,20 @@
<artifactId>waynboot-admin-api</artifactId>
<dependencies>
<!-- swagger2-->
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>${swagger.version}</version>
</dependency>
<!-- swagger2-UI-->
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
<version>${swagger.version}</version>
</dependency>
<dependency>
<groupId>com.wayn</groupId>
<artifactId>waynboot-common</artifactId>
@ -24,6 +38,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring-boot.version}</version>
</plugin>
</plugins>
</build>

135
waynboot-common/pom.xml
Unescape Escape View File

@ -12,5 +12,140 @@
<artifactId>waynboot-common</artifactId>
<version>0.0.1-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
<version>${spring-boot.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-redis</artifactId>
<version>${spring-boot.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
<version>${spring-boot.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>${spring-boot.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>${spring-boot.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>${mybatis-plus.version}</version>
</dependency>
<!--阿里数据库连接池 -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
<version>${druid.version}</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.connector.java.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
</dependency>
<!-- Apache工具组件 -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons-lang3.version}</version>
</dependency>
<!-- Apache 集合工具组件 -->
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>${commons.collections.version}</version>
</dependency>
<!-- 验证码 -->
<dependency>
<groupId>com.github.whvcse</groupId>
<artifactId>easy-captcha</artifactId>
<version>${easy-captcha.version}</version>
</dependency>
<!--文件上传工具类 -->
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>${commons.fileupload.version}</version>
</dependency>
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
<version>${jedis.version}</version>
</dependency>
<!-- jwt验证 -->
<dependency>
<groupId>com.auth0</groupId>
<artifactId>java-jwt</artifactId>
<version>${jwt.version}</version>
</dependency>
<!-- 阿里JSON解析器 -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>${fastjson.version}</version>
</dependency>
<dependency>
<groupId>cn.afterturn</groupId>
<artifactId>easypoi-base</artifactId>
<version>${easypoi.version}</version>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>cn.afterturn</groupId>
<artifactId>easypoi-annotation</artifactId>
<version>${easypoi.version}</version>
</dependency>
<!-- 七牛云 -->
<dependency>
<groupId>com.qiniu</groupId>
<artifactId>qiniu-java-sdk</artifactId>
<version>${qiniu.version}</version>
</dependency>
<!--防止进入swagger页面报类型转换错误，排除2.9.2中的引用，手动增加1.5.21版本-->
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>1.5.21</version>
</dependency>
</dependencies>
</project>

7
waynboot-generator/pom.xml
Unescape Escape View File

@ -12,6 +12,13 @@
<artifactId>waynboot-generator</artifactId>
<dependencies>
<!-- Apache工具组件 -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>${commons-lang3.version}</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-generator</artifactId>

17
waynboot-mobile/pom.xml → waynboot-mobile-api/pom.xml
Unescape Escape View File

@ -9,9 +9,23 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>waynboot-mobile</artifactId>
<artifactId>waynboot-mobile-api</artifactId>
<dependencies>
<!-- swagger2-->
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>${swagger.version}</version>
</dependency>
<!-- swagger2-UI-->
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
<version>${swagger.version}</version>
</dependency>
<dependency>
<groupId>com.wayn</groupId>
<artifactId>waynboot-common</artifactId>
@ -24,6 +38,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring-boot.version}</version>
</plugin>
</plugins>
</build>

0
waynboot-mobile/src/main/java/com/wayn/MobileApplication.java → waynboot-mobile-api/src/main/java/com/wayn/MobileApplication.java
Unescape Escape View File

5
waynboot-mobile/src/main/java/com/wayn/mobile/api/controller/LoginController.java → waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/LoginController.java
Unescape Escape View File

@ -7,15 +7,18 @@ import com.wayn.mobile.framework.security.service.LoginService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
@RestController
public class LoginController {
@Autowired
private LoginService loginService;
@PostMapping("/login")
public R login(@RequestBody LoginObj loginObj) {
// 生成令牌
String token = loginService.login(loginObj.getUsername(), loginObj.getPassword());
// 生成令牌
return R.success().add(SysConstants.TOKEN, token);
}

0
waynboot-mobile/src/main/java/com/wayn/mobile/api/controller/TestController.java → waynboot-mobile-api/src/main/java/com/wayn/mobile/api/controller/TestController.java
Unescape Escape View File

0
waynboot-mobile/src/main/java/com/wayn/mobile/framework/config/CacheConfig.java → waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/config/CacheConfig.java
Unescape Escape View File

0
waynboot-mobile/src/main/java/com/wayn/mobile/framework/config/DruidConfig.java → waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/config/DruidConfig.java
Unescape Escape View File

0
waynboot-mobile/src/main/java/com/wayn/mobile/framework/config/MvcConfig.java → waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/config/MvcConfig.java
Unescape Escape View File

0
waynboot-mobile/src/main/java/com/wayn/mobile/framework/config/MybatisPlusConfig.java → waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/config/MybatisPlusConfig.java
Unescape Escape View File

0
waynboot-mobile/src/main/java/com/wayn/mobile/framework/config/SecurityConfig.java → waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/config/SecurityConfig.java
Unescape Escape View File

0
waynboot-mobile/src/main/java/com/wayn/mobile/framework/config/SwaggerConfig.java → waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/config/SwaggerConfig.java
Unescape Escape View File

0
waynboot-mobile/src/main/java/com/wayn/mobile/framework/config/UploadConfig.java → waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/config/UploadConfig.java
Unescape Escape View File

0
waynboot-mobile/src/main/java/com/wayn/mobile/framework/config/WaynConfig.java → waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/config/WaynConfig.java
Unescape Escape View File

0
waynboot-mobile/src/main/java/com/wayn/mobile/framework/config/properties/DruidProperties.java → waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/config/properties/DruidProperties.java
Unescape Escape View File

0
waynboot-mobile/src/main/java/com/wayn/mobile/framework/manager/datasource/RoutingDataSource.java → waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/manager/datasource/RoutingDataSource.java
Unescape Escape View File

0
waynboot-mobile/src/main/java/com/wayn/mobile/framework/manager/datasource/thread/DataSourceHolder.java → waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/manager/datasource/thread/DataSourceHolder.java
Unescape Escape View File

0
waynboot-mobile/src/main/java/com/wayn/mobile/framework/manager/exception/GlobalExceptionHandler.java → waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/manager/exception/GlobalExceptionHandler.java
Unescape Escape View File

0
waynboot-mobile/src/main/java/com/wayn/mobile/framework/manager/upload/service/UploadService.java → waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/manager/upload/service/UploadService.java
Unescape Escape View File

0
waynboot-mobile/src/main/java/com/wayn/mobile/framework/manager/upload/service/impl/UploadServiceImpl.java → waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/manager/upload/service/impl/UploadServiceImpl.java
Unescape Escape View File

0
waynboot-mobile/src/main/java/com/wayn/mobile/framework/redis/RedisCache.java → waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/redis/RedisCache.java
Unescape Escape View File

0
waynboot-mobile/src/main/java/com/wayn/mobile/framework/redis/RedisConfig.java → waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/redis/RedisConfig.java
Unescape Escape View File

27
waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/security/LoginObj.java
Unescape Escape View File

@ -0,0 +1,27 @@
package com.wayn.mobile.framework.security;
import lombok.Data;
@Data
public class LoginObj {
/**
* 用户名
*/
private String username;
/**
* 用户密码
*/
private String password;
/**
* 验证码
*/
private String code;
/**
* 验证码 key
*/
private String key;
}

132
waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/security/LoginUserDetail.java
Unescape Escape View File

@ -0,0 +1,132 @@
package com.wayn.mobile.framework.security;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.wayn.common.core.domain.shop.Member;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.userdetails.UserDetails;
import java.util.Collection;
import java.util.Set;
public class LoginUserDetail implements UserDetails {
private static final long serialVersionUID = 1L;
private String token;
private Member member;
/**
* 登陆时间
*/
private Long loginTime;
/**
* 过期时间
*/
private Long expireTime;
/**
* 权限列表
*/
private Set<String> permissions;
public LoginUserDetail(Member member) {
this.member = member;
}
public LoginUserDetail(Member member, Set<String> permissions) {
this.member = member;
this.permissions = permissions;
}
public LoginUserDetail() {
}
public Set<String> getPermissions() {
return permissions;
}
public LoginUserDetail setPermissions(Set<String> permissions) {
this.permissions = permissions;
return this;
}
public Long getLoginTime() {
return loginTime;
}
public LoginUserDetail setLoginTime(Long loginTime) {
this.loginTime = loginTime;
return this;
}
public Long getExpireTime() {
return expireTime;
}
public LoginUserDetail setExpireTime(Long expireTime) {
this.expireTime = expireTime;
return this;
}
public String getToken() {
return token;
}
public LoginUserDetail setToken(String token) {
this.token = token;
return this;
}
public Member getMember() {
return member;
}
public LoginUserDetail setMember(Member member) {
this.member = member;
return this;
}
@Override
public Collection<? extends GrantedAuthority> getAuthorities() {
return null;
}
@JsonIgnore
@Override
public String getPassword() {
return this.member.getPassword();
}
@Override
public String getUsername() {
return this.member.getUsername();
}
@JsonIgnore
@Override
public boolean isAccountNonExpired() {
return true;
}
@JsonIgnore
@Override
public boolean isAccountNonLocked() {
return true;
}
@JsonIgnore
@Override
public boolean isCredentialsNonExpired() {
return true;
}
@JsonIgnore
@Override
public boolean isEnabled() {
return true;
}
}

2
waynboot-mobile/src/main/java/com/wayn/mobile/framework/security/filter/JwtAuthenticationTokenFilter.java → waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/security/filter/JwtAuthenticationTokenFilter.java
Unescape Escape View File

@ -1,6 +1,6 @@
package com.wayn.mobile.framework.security.filter;
import com.wayn.common.core.model.LoginUserDetail;
import com.wayn.mobile.framework.security.LoginUserDetail;
import com.wayn.mobile.framework.security.service.TokenService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;

0
waynboot-mobile/src/main/java/com/wayn/mobile/framework/security/handle/AuthenticationEntryPointImpl.java → waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/security/handle/AuthenticationEntryPointImpl.java
Unescape Escape View File

2
waynboot-mobile/src/main/java/com/wayn/mobile/framework/security/handle/LogoutSuccessHandlerImpl.java → waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/security/handle/LogoutSuccessHandlerImpl.java
Unescape Escape View File

@ -1,8 +1,8 @@
package com.wayn.mobile.framework.security.handle;
import com.wayn.common.core.model.LoginUserDetail;
import com.wayn.common.util.R;
import com.wayn.common.util.json.JsonUtil;
import com.wayn.mobile.framework.security.LoginUserDetail;
import com.wayn.mobile.framework.security.service.TokenService;
import lombok.SneakyThrows;
import org.springframework.beans.factory.annotation.Autowired;

2
waynboot-mobile/src/main/java/com/wayn/mobile/framework/security/service/LoginService.java → waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/security/service/LoginService.java
Unescape Escape View File

@ -1,7 +1,7 @@
package com.wayn.mobile.framework.security.service;
import com.wayn.common.core.model.LoginUserDetail;
import com.wayn.common.exception.BusinessException;
import com.wayn.mobile.framework.security.LoginUserDetail;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;

2
waynboot-mobile/src/main/java/com/wayn/mobile/framework/security/service/MyAuthenticationFailureHandler.java → waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/security/service/MyAuthenticationFailureHandler.java
Unescape Escape View File

@ -19,7 +19,7 @@ public class MyAuthenticationFailureHandler implements AuthenticationFailureHand
@SneakyThrows
@Override
public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response, AuthenticationException exception) {
public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response, AuthenticationException exception) throws IOException, ServletException {
log.info("登录失败");
//设置状态码
response.setStatus(500);

11
waynboot-mobile/src/main/java/com/wayn/mobile/framework/security/service/TokenService.java → waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/security/service/TokenService.java
Unescape Escape View File

@ -2,10 +2,10 @@ package com.wayn.mobile.framework.security.service;
import com.auth0.jwt.interfaces.DecodedJWT;
import com.wayn.common.constant.SysConstants;
import com.wayn.common.core.model.LoginUserDetail;
import com.wayn.common.core.service.system.IUserService;
import com.wayn.common.util.jwt.JwtUtil;
import com.wayn.mobile.framework.redis.RedisCache;
import com.wayn.mobile.framework.security.LoginUserDetail;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@ -20,7 +20,8 @@ public class TokenService {
protected static final long MILLIS_SECOND = 1000;
protected static final long MILLIS_MINUTE = 60 * MILLIS_SECOND;
private static final Long MILLIS_MINUTE_TEN = 20 * 60 * MILLIS_SECOND;
protected static final long MILLIS_DAY = 24 * 60 * MILLIS_MINUTE;
private static final Long MILLIS_DAY_FIVE = 5 * 24 * 60 * MILLIS_MINUTE;
// 令牌自定义标识
@Value("${token.header}")
private String header;
@ -64,16 +65,16 @@ public class TokenService {
public void refreshToken(LoginUserDetail loginUser) {
loginUser.setLoginTime(System.currentTimeMillis());
loginUser.setExpireTime(loginUser.getLoginTime() + expireTime * MILLIS_MINUTE);
loginUser.setExpireTime(loginUser.getLoginTime() + expireTime * MILLIS_DAY);
// 根据uuid将loginUser缓存
String userKey = SysConstants.LOGIN_TOKEN_KEY + loginUser.getToken();
redisCache.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES);
redisCache.setCacheObject(userKey, loginUser, expireTime, TimeUnit.DAYS);
}
public void verifyToken(LoginUserDetail loginUser) {
long expireTime = loginUser.getExpireTime();
long currentTime = System.currentTimeMillis();
if (expireTime - currentTime <= MILLIS_MINUTE_TEN) {
if (expireTime - currentTime <= MILLIS_DAY_FIVE) {
refreshToken(loginUser);
}
}

18
waynboot-mobile/src/main/java/com/wayn/mobile/framework/security/service/UserDetailsServiceImpl.java → waynboot-mobile-api/src/main/java/com/wayn/mobile/framework/security/service/UserDetailsServiceImpl.java
Unescape Escape View File

@ -2,22 +2,19 @@ package com.wayn.mobile.framework.security.service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.wayn.common.core.domain.shop.Member;
import com.wayn.common.core.domain.system.User;
import com.wayn.common.core.model.LoginUserDetail;
import com.wayn.common.core.service.shop.IMemberService;
import com.wayn.common.core.service.system.IDeptService;
import com.wayn.common.core.service.system.IUserService;
import com.wayn.common.enums.UserStatus;
import com.wayn.mobile.framework.security.LoginUserDetail;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.DisabledException;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.core.userdetails.UsernameNotFoundException;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
import java.util.Collections;
@Slf4j
@Service
public class UserDetailsServiceImpl implements UserDetailsService {
@ -25,11 +22,6 @@ public class UserDetailsServiceImpl implements UserDetailsService {
@Autowired
private IMemberService iMemberService;
public static void main(String[] args) {
BCryptPasswordEncoder bCryptPasswordEncoder = new BCryptPasswordEncoder();
System.out.println(bCryptPasswordEncoder.encode("123456"));
}
@Override
public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
Member member = iMemberService.getOne(new QueryWrapper<Member>().eq("username", username));
@ -37,11 +29,11 @@ public class UserDetailsServiceImpl implements UserDetailsService {
log.info("登录用户：{} 不存在.", username);
throw new UsernameNotFoundException("登录用户：" + username + " 不存在");
}
if (UserStatus.DISABLE.getCode().equals(member.getStatus())) {
if (UserStatus.DISABLE.getCode() == member.getStatus()) {
log.info("登录用户：{} 已经被停用.", username);
throw new DisabledException("登录用户：" + username + " 不存在");
}
return new LoginUserDetail(null, null);
return new LoginUserDetail(member, Collections.emptySet());
}
}

4
waynboot-mobile/src/main/resources/application-dev.yml → waynboot-mobile-api/src/main/resources/application-dev.yml
Unescape Escape View File

@ -6,7 +6,7 @@ spring:
druid:
# 主库数据源
master:
url: jdbc:mysql://localhost:3306/wayn_shop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
url: jdbc:mysql://192.168.31.49:3306/wayn_shop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: admin123
# 从库数据源
@ -56,7 +56,7 @@ spring:
config:
multi-statement-allow: true
redis:
host: localhost
host: 192.168.31.49
port: 6379
timeout: 5000
password:

6
waynboot-mobile/src/main/resources/application.yml → waynboot-mobile-api/src/main/resources/application.yml
Unescape Escape View File

@ -1,5 +1,5 @@
server:
port: 81
port: 82
spring:
profiles:
@ -22,8 +22,8 @@ token:
header: Authorization
# 令牌秘钥
secret: abcdefghijklmnopqrstuvwxyz
# 令牌有效期（默认30分钟）
expireTime: 120
# 令牌有效期（默认30天）
expireTime: 30
# 日志配置
logging:

153
waynboot-mobile/src/main/java/com/wayn/mobile/framework/security/service/PermissionService.java
Unescape Escape View File

@ -1,153 +0,0 @@
package com.wayn.mobile.framework.security.service;
import com.wayn.common.core.domain.system.Role;
import com.wayn.common.core.model.LoginUserDetail;
import com.wayn.common.util.ServletUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.Objects;
import java.util.Set;
/**
* RuoYi首创 自定义权限实现，ss取自SpringSecurity首字母
*
* @author ruoyi
*/
@Service("ss")
public class PermissionService {
/**
* 所有权限标识
*/
private static final String ALL_PERMISSION = "*:*:*";
/**
* 管理员角色权限标识
*/
private static final String SUPER_ADMIN = "admin";
private static final String ROLE_DELIMETER = ",";
private static final String PERMISSION_DELIMETER = ",";
@Autowired
private TokenService tokenService;
/**
* 验证用户是否具备某权限
*
* @param permission 权限字符串
* @return 用户是否具备某权限
*/
public boolean hasPermi(String permission) {
if (StringUtils.isEmpty(permission)) {
return false;
}
LoginUserDetail loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
if (Objects.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getPermissions())) {
return false;
}
return hasPermissions(loginUser.getPermissions(), permission);
}
/**
* 验证用户是否不具备某权限，与 hasPermi逻辑相反
*
* @param permission 权限字符串
* @return 用户是否不具备某权限
*/
public boolean lacksPermi(String permission) {
return !hasPermi(permission);
}
/**
* 验证用户是否具有以下任意一个权限
*
* @param permissions 以 PERMISSION_NAMES_DELIMETER 为分隔符的权限列表
* @return 用户是否具有以下任意一个权限
*/
public boolean hasAnyPermi(String permissions) {
if (StringUtils.isEmpty(permissions)) {
return false;
}
LoginUserDetail loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
if (Objects.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getPermissions())) {
return false;
}
Set<String> authorities = loginUser.getPermissions();
for (String permission : permissions.split(PERMISSION_DELIMETER)) {
if (permission != null && hasPermissions(authorities, permission)) {
return true;
}
}
return false;
}
/**
* 判断用户是否拥有某个角色
*
* @param role 角色字符串
* @return 用户是否具备某角色
*/
public boolean hasRole(String role) {
if (StringUtils.isEmpty(role)) {
return false;
}
LoginUserDetail loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
if (Objects.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getUser().getRoles())) {
return false;
}
for (Role sysRole : loginUser.getUser().getRoles()) {
String roleKey = sysRole.getRoleKey();
if (SUPER_ADMIN.contains(roleKey) || roleKey.contains(StringUtils.trim(role))) {
return true;
}
}
return false;
}
/**
* 验证用户是否不具备某角色，与 isRole逻辑相反。
*
* @param role 角色名称
* @return 用户是否不具备某角色
*/
public boolean lacksRole(String role) {
return !hasRole(role);
}
/**
* 验证用户是否具有以下任意一个角色
*
* @param roles 以 ROLE_NAMES_DELIMETER 为分隔符的角色列表
* @return 用户是否具有以下任意一个角色
*/
public boolean hasAnyRoles(String roles) {
if (StringUtils.isEmpty(roles)) {
return false;
}
LoginUserDetail loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
if (Objects.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getUser().getRoles())) {
return false;
}
for (String role : roles.split(ROLE_DELIMETER)) {
if (hasRole(role)) {
return true;
}
}
return false;
}
/**
* 判断是否包含权限
*
* @param permissions 权限列表
* @param permission 权限字符串
* @return 用户是否具备某权限
*/
private boolean hasPermissions(Set<String> permissions, String permission) {
return permissions.contains(ALL_PERMISSION) || permissions.contains(StringUtils.trim(permission));
}
}

56
waynboot-mobile/src/main/java/com/wayn/mobile/framework/security/service/SysPermissionService.java
Unescape Escape View File

@ -1,56 +0,0 @@
package com.wayn.mobile.framework.security.service;
import com.wayn.common.core.domain.system.User;
import com.wayn.common.core.service.system.IMenuService;
import com.wayn.common.core.service.system.IRoleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.HashSet;
import java.util.Set;
/**
* 用户权限处理
*/
@Component
public class SysPermissionService {
@Autowired
private IRoleService roleService;
@Autowired
private IMenuService menuService;
/**
* 获取角色数据权限
*
* @param user 用户信息
* @return 角色权限信息
*/
public Set<String> getRolePermission(User user) {
Set<String> roles = new HashSet<>();
// 管理员拥有所有权限
if (user.isAdmin()) {
roles.add("admin");
} else {
roles.addAll(roleService.selectRoleByUserId(user.getUserId()));
}
return roles;
}
/**
* 获取菜单数据权限
*
* @param user 用户信息
* @return 菜单权限信息
*/
public Set<String> getMenuPermission(User user) {
Set<String> perms = new HashSet<>();
// 管理员拥有所有权限
if (user.isAdmin()) {
perms.add("*:*:*");
} else {
perms.addAll(menuService.selectMenuPermsByUserId(user.getUserId()));
}
return perms;
}
}
Write Preview
Loading…
Cancel
Save