forgetest5
/
ifffff
mirror of https://gitee.com/maxjhandsome/pig
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/dev'

This commit is contained in:
glpyh 2018-07-01 10:35:24 +08:00
parent c89e360beb 9c66dd157f
commit fa1df09150
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pig-auth/src/main/java/com/github/pig/auth/util/UserDetailsImpl.java
View File

@ -40,7 +40,7 @@ public class UserDetailsImpl implements UserDetails {
private String username;
private String password;
private String status;
private List<SysRole> roleList = new ArrayList<>();
private List<SysRole> roleList;
public UserDetailsImpl(UserVO userVo) {
this.username = userVo.getUsername();

7
pom.xml
View File

@ -59,7 +59,7 @@
<velocity-engine-core.version>2.0</velocity-engine-core.version>
<qiniu.version>[7.2.0, 7.2.99]</qiniu.version>
<kaptcha.version>0.0.9</kaptcha.version>
<javadoc.version>3.0.0</javadoc.version>
<spring-boot-admin-server.version>1.5.6</spring-boot-admin-server.version>
<spring-boot-admin-server-ui.version>1.5.6</spring-boot-admin-server-ui.version>
<spring-boot-admin-server-ui-turbine.version>1.5.6</spring-boot-admin-server-ui-turbine.version>
@ -154,6 +154,11 @@
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${javadoc.version}</version>
</plugin>
</plugins>
</pluginManagement>
</build>