正在显示
3 个修改的文件
包含
5 行增加
和
8 行删除
| @@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
| 2 | <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | 2 | <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | 
| 3 | xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | 3 | xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | 
| 4 | <modelVersion>4.0.0</modelVersion> | 4 | <modelVersion>4.0.0</modelVersion> | 
| 5 | - <packaging>pom</packaging> | 5 | + <packaging>jar</packaging> | 
| 6 | <parent> | 6 | <parent> | 
| 7 | <groupId>org.springframework.boot</groupId> | 7 | <groupId>org.springframework.boot</groupId> | 
| 8 | <artifactId>spring-boot-starter-parent</artifactId> | 8 | <artifactId>spring-boot-starter-parent</artifactId> | 
| @@ -64,10 +64,10 @@ | @@ -64,10 +64,10 @@ | ||
| 64 | <artifactId>jjwt</artifactId> | 64 | <artifactId>jjwt</artifactId> | 
| 65 | <version>0.7.0</version> | 65 | <version>0.7.0</version> | 
| 66 | </dependency> | 66 | </dependency> | 
| 67 | - <dependency> | ||
| 68 | - <groupId>org.springframework.security</groupId> | ||
| 69 | - <artifactId>spring-security-jwt</artifactId> | ||
| 70 | - </dependency> | 67 | + <!--<dependency>--> | 
| 68 | + <!--<groupId>org.springframework.security</groupId>--> | ||
| 69 | + <!--<artifactId>spring-security-jwt</artifactId>--> | ||
| 70 | + <!--</dependency>--> | ||
| 71 | <dependency> | 71 | <dependency> | 
| 72 | <groupId>org.springframework.cloud</groupId> | 72 | <groupId>org.springframework.cloud</groupId> | 
| 73 | <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId> | 73 | <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId> | 
| @@ -7,7 +7,6 @@ import com.tianbo.warehouse.dao.PERMISSIONMapper; | @@ -7,7 +7,6 @@ import com.tianbo.warehouse.dao.PERMISSIONMapper; | ||
| 7 | import com.tianbo.warehouse.model.PERMISSION; | 7 | import com.tianbo.warehouse.model.PERMISSION; | 
| 8 | import com.tianbo.warehouse.model.ROLE; | 8 | import com.tianbo.warehouse.model.ROLE; | 
| 9 | import com.tianbo.warehouse.service.PermissionService; | 9 | import com.tianbo.warehouse.service.PermissionService; | 
| 10 | -import org.apache.cxf.annotations.Logging; | ||
| 11 | import org.springframework.beans.factory.annotation.Autowired; | 10 | import org.springframework.beans.factory.annotation.Autowired; | 
| 12 | import org.springframework.security.core.context.SecurityContextHolder; | 11 | import org.springframework.security.core.context.SecurityContextHolder; | 
| 13 | import org.springframework.security.core.userdetails.UserDetails; | 12 | import org.springframework.security.core.userdetails.UserDetails; | 
| @@ -17,7 +16,6 @@ import java.util.List; | @@ -17,7 +16,6 @@ import java.util.List; | ||
| 17 | import java.util.Map; | 16 | import java.util.Map; | 
| 18 | 17 | ||
| 19 | 18 | ||
| 20 | -@Logging | ||
| 21 | @RestController() | 19 | @RestController() | 
| 22 | public class PermssionController { | 20 | public class PermssionController { | 
| 23 | 21 | 
| @@ -5,7 +5,6 @@ import org.springframework.boot.context.properties.ConfigurationProperties; | @@ -5,7 +5,6 @@ import org.springframework.boot.context.properties.ConfigurationProperties; | ||
| 5 | import org.springframework.stereotype.Component; | 5 | import org.springframework.stereotype.Component; | 
| 6 | 6 | ||
| 7 | @ConfigurationProperties(prefix = "tianbo.security") | 7 | @ConfigurationProperties(prefix = "tianbo.security") | 
| 8 | -@Component | ||
| 9 | public class SecurityProperties { | 8 | public class SecurityProperties { | 
| 10 | 9 | ||
| 11 | /** | 10 | /** | 
- 
请 注册 或 登录 后发表评论