Merge branch 'schedule' of http://dev.xinyingpower.com:8080/git/xymp/backend into schedule

xymanager_common/src/main/java/com/shxy/xymanager_common/config/SecurityConfig.java

@@ -23,8 +23,8 @@ public class SecurityConfig {
 
     private String jwtPrefix = "Bearer";
 
-    // default 24 hours
-    private Integer jwtExpiration = 24 * 60 * 60;
+    // default 7 days
+    private Integer jwtExpiration = 7 * 24 * 60 * 60;
 
     private List<String> urlWhiteList = Lists.newArrayList();
 

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/RoleServiceImpl.java

@@ -105,7 +105,7 @@ public class RoleServiceImpl implements RoleService {
     @Override
     public void changePermission(Integer roleId, List<TbPermission> list) throws Exception {
         if (roleId == SUPER_ADMIN) {
-            throw new Exception("不能修改admin的权限");
+            throw new Exception("不能修改超级管理员的权限");
         }
         TbPermissionExample example = new TbPermissionExample();
         TbPermissionExample.Criteria criteria = example.createCriteria();