From 1b4e5143aa26b61f284dd3803a2ab854cbb93480 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Thu, 27 Jun 2019 17:24:01 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8D=95=E5=B8=90=E5=8F=B7?= =?UTF-8?q?=E5=A4=9A=E5=B9=B3=E5=8F=B0=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 21 +++++++-------------- .../i3plus/pojo/base/shirotoken/AdminToken.java | 4 ++++ .../i3plus/pojo/base/shirotoken/BaseToken.java | 16 ++++++++++++++++ .../i3plus/pojo/base/shirotoken/SaAdminToken.java | 4 ++++ .../i3plus/pojo/base/shirotoken/UserToken.java | 4 ++++ .../i3plus/pojo/platform/bean/SessionUser.java | 2 -- 6 files changed, 35 insertions(+), 16 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 1280e58..156a405 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -722,20 +722,13 @@ public class CommonEnumUtil { } /** - * 客户端操作系统 - * return "Windows"; - * return "Mac"; - * return "Unix"; - * return "Android"; - * return "IPhone"; + * 客户端登录标识 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum LOG_LOGIN_PLATFORM { - WINDOWS(1, "Windows", "Windows 操作系统"), - MAC(2, "Mac", "Mac 操作系统"), - UNIX(3, "Unix", "Linux 操作系统"), - ANDROID(4, "Android", "Android 操作系统"), - IPHONE(5, "IPhone", "IPhone 操作系统"); + PC_IMPP_CORE(10, "PC-IMPP", "PC后台管理端"), + PC_WMS_SWEB(20, "PC-SWEB", "PC SWEB后台管理端"), + Mobile_PDA(30, "Mobile-PDA", "移动设备PDA操作端"); private int value; private String name; @@ -762,11 +755,11 @@ public class CommonEnumUtil { return name; } - public static String valueOf(int val) { - String tmp = null; + public static LOG_LOGIN_PLATFORM valueOf(int val) { + LOG_LOGIN_PLATFORM tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { - tmp = values()[i].getName(); + tmp = values()[i]; } } return tmp; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/AdminToken.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/AdminToken.java index 16eca8d..85dafe5 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/AdminToken.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/AdminToken.java @@ -9,6 +9,10 @@ package cn.estsh.i3plus.pojo.base.shirotoken; **/ public class AdminToken extends BaseToken { + public AdminToken(String loginName, String loginPwd, String languageCode,Integer loginPlatform) { + super(loginName, loginPwd, languageCode,loginPlatform); + } + public AdminToken(String loginName, String loginPwd, String languageCode) { super(loginName, loginPwd, languageCode); } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/BaseToken.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/BaseToken.java index 86c236a..2ba35cf 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/BaseToken.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/BaseToken.java @@ -14,6 +14,7 @@ public class BaseToken implements AuthenticationToken { private String loginName; private String loginPwd; private String languageCode; + private Integer loginPlatform; public BaseToken(String loginName, String loginPwd, String languageCode) { this.loginName = loginName; @@ -21,6 +22,13 @@ public class BaseToken implements AuthenticationToken { this.languageCode = languageCode; } + public BaseToken(String loginName, String loginPwd, String languageCode,Integer loginPlatform) { + this.loginName = loginName; + this.loginPwd = loginPwd; + this.languageCode = languageCode; + this.loginPlatform = loginPlatform; + } + //身份 @Override public Object getPrincipal() { @@ -56,4 +64,12 @@ public class BaseToken implements AuthenticationToken { public void setLanguageCode(String languageCode) { this.languageCode = languageCode; } + + public Integer getLoginPlatform() { + return loginPlatform; + } + + public void setLoginPlatform(Integer loginPlatform) { + this.loginPlatform = loginPlatform; + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/SaAdminToken.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/SaAdminToken.java index 0d4e1fe..8cee322 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/SaAdminToken.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/SaAdminToken.java @@ -12,4 +12,8 @@ public class SaAdminToken extends BaseToken { public SaAdminToken(String loginName, String loginPwd, String languageCode) { super(loginName, loginPwd, languageCode); } + + public SaAdminToken(String loginName, String loginPwd, String languageCode,Integer loginPlatform) { + super(loginName, loginPwd, languageCode,loginPlatform); + } } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/UserToken.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/UserToken.java index 84a10d1..9d6cf59 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/UserToken.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/UserToken.java @@ -12,4 +12,8 @@ public class UserToken extends BaseToken { public UserToken(String loginName, String loginPwd, String languageCode) { super(loginName, loginPwd, languageCode); } + + public UserToken(String loginName, String loginPwd, String languageCode,Integer loginPlatform) { + super(loginName, loginPwd, languageCode,loginPlatform); + } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java index 59baf96..3ee307d 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java @@ -16,8 +16,6 @@ import java.util.List; @Data public class SessionUser implements Serializable { - private static final long serialVersionUID = 1L; - @ApiParam("用户ID") private Long userId;