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

yun-zuoyi
andly.pan 3 years ago
commit 3cbf42162a

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

@ -29,6 +29,10 @@ public class BaseToken implements AuthenticationToken {
this.loginPlatform = loginPlatform; this.loginPlatform = loginPlatform;
} }
public BaseToken(String loginName) {
this.loginName = loginName;
}
//身份 //身份
@Override @Override
public Object getPrincipal() { public Object getPrincipal() {

@ -16,4 +16,8 @@ public class UserToken extends BaseToken {
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);
}
} }

Loading…
Cancel
Save