Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
834a7d7325
|
@ -5,6 +5,7 @@ import java.util.concurrent.ConcurrentHashMap;
|
|||
|
||||
import com.alibaba.ttl.TransmittableThreadLocal;
|
||||
import com.hzs.common.core.constant.SecurityConstants;
|
||||
import com.hzs.common.core.enums.ESystemType;
|
||||
import com.hzs.common.core.text.Convert;
|
||||
import com.hzs.common.core.utils.StringUtils;
|
||||
|
||||
|
@ -91,7 +92,7 @@ public class SecurityContextHolder {
|
|||
}
|
||||
|
||||
public static Integer getSystemType() {
|
||||
return Convert.toInt(get(SecurityConstants.SYSTEM_TYPE), null);
|
||||
return Convert.toInt(get(SecurityConstants.SYSTEM_TYPE), ESystemType.DEFAULT.getValue());
|
||||
}
|
||||
|
||||
public static void setSystemType(String systemType) {
|
||||
|
|
Loading…
Reference in New Issue