Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/ShiftTimeValidator.java

@@ -15,7 +15,7 @@ public class ShiftTimeValidator implements ConstraintValidator<ShiftTimeAnnotati
     @Override
     public boolean isValid(String s, ConstraintValidatorContext constraintValidatorContext) {
         if (StringUtil.isEmpty(s)) {
-            return false;
+            return true;
         }
         for (String strTime : s.split(",")) {
             String[] times = strTime.split("-");

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/BaseToken.java

@@ -22,13 +22,17 @@ public class BaseToken implements AuthenticationToken {
         this.languageCode = languageCode;
     }
 
-    public BaseToken(String loginName, String loginPwd, String languageCode,Integer loginPlatform) {
+    public BaseToken(String loginName, String loginPwd, String languageCode, Integer loginPlatform) {
         this.loginName = loginName;
         this.loginPwd = loginPwd;
         this.languageCode = languageCode;
         this.loginPlatform = loginPlatform;
     }
 
+    public BaseToken(String loginName) {
+        this.loginName = loginName;
+    }
+
     //身份
     @Override
     public Object getPrincipal() {

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/UserToken.java

@@ -13,7 +13,11 @@ public class UserToken extends BaseToken {
         super(loginName, loginPwd, languageCode);
     }
 
-    public UserToken(String loginName, String loginPwd, String languageCode,Integer loginPlatform) {
+    public UserToken(String loginName, String loginPwd, String languageCode, Integer loginPlatform) {
-        super(loginName, loginPwd, languageCode,loginPlatform);
+        super(loginName, loginPwd, languageCode, loginPlatform);
+    }
+
+    public UserToken(String loginName) {
+        super(loginName);
     }
 }