Merge branch 'dev' into test

modules/i3plus-pojo-andon/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-aps/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-base-mongo/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-base/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseThreadLocal.java

@@ -23,48 +23,48 @@ public class BaseThreadLocal {
             return new HashMap<String,Object>();
         }
     };*/
-    private static final ThreadLocal<HashMap<String,Object>> DATA_THREAD_LOCAL = ThreadLocal.withInitial(() -> new HashMap<>());
+    private static final ThreadLocal<HashMap<String, Object>> DATA_THREAD_LOCAL = ThreadLocal.withInitial(() -> new HashMap<>());
 
     public static Object getData(String key) {
-        if(DATA_THREAD_LOCAL.get() != null) {
+        if (DATA_THREAD_LOCAL.get() != null) {
             return DATA_THREAD_LOCAL.get().get(key);
-        }else{
+        } else {
             return null;
         }
     }
 
     public static String getDataStr(String key) {
         Object data = getData(key);
-        if(data != null){
+        if (data != null) {
             return data.toString();
-        }else{
+        } else {
             return null;
         }
     }
 
     public static int getDataInt(String key) {
         Object data = getData(key);
-        if(data != null){
+        if (data != null) {
             return Integer.parseInt(data.toString());
-        }else{
+        } else {
             return 0;
         }
     }
 
     public static long getDataLong(String key) {
         Object data = getData(key);
-        if(data != null){
+        if (data != null) {
             return Long.parseLong(data.toString());
-        }else{
+        } else {
             return 0L;
         }
     }
 
     public static double getDataDouble(String key) {
         Object data = getData(key);
-        if(data != null){
+        if (data != null) {
             return Double.parseDouble(data.toString());
-        }else{
+        } else {
             return 0.0;
         }
     }
@@ -78,8 +78,8 @@ public class BaseThreadLocal {
      * 手动再次清除线程变量
      * 需要在方法后调用，或者通过ascept拦截后进行清空
      */
-    public static void removeThreadLocal(){
-        if(DATA_THREAD_LOCAL != null) {
+    public static void removeThreadLocal() {
+        if (DATA_THREAD_LOCAL != null) {
             if (DATA_THREAD_LOCAL.get() != null) {
                 //清空数据
                 DATA_THREAD_LOCAL.get().clear();
@@ -89,16 +89,16 @@ public class BaseThreadLocal {
         }
     }
 
-    public static String getInfo(){
+    public static String getInfo() {
         Thread thread = Thread.currentThread();
         return "thead-id:" + thread.getId() + ",thread:" + thread;
     }
 
-    public static void printDetail(){
+    public static void printDetail() {
         LOGGER.info("========本地线程临时数据=======");
         LOGGER.info("数据数量：{}", DATA_THREAD_LOCAL.get().size());
-        for(String key : DATA_THREAD_LOCAL.get().keySet()){
-            LOGGER.info("key:{},value:{}",key, DATA_THREAD_LOCAL.get().get(key));
+        for (String key : DATA_THREAD_LOCAL.get().keySet()) {
+            LOGGER.info("key:{},value:{}", key, DATA_THREAD_LOCAL.get().get(key));
         }
     }
 
@@ -107,18 +107,22 @@ public class BaseThreadLocal {
     public static final String EMP_NAME = "USER_NAME";    //用户名
     public static final String ORGANIZE_CODE = "ORGANIZE_CODE";    //组织代码
     public static final String LANGUAGE_CODE = "LANGUAGE_CODE";    //语言代码
+    /**
+     * 单点登录标志
+     */
+    public static final String OSS_LOGIN = "OSS_LOGIN";
 
-    public static boolean isInit(){
+    public static boolean isInit() {
         Object data = getData(INIT_INFO);
-        if(data != null){
+        if (data != null) {
             return Boolean.parseBoolean(data.toString());
-        }else{
+        } else {
             return false;
         }
     }
 
     //初始化用户数据
-    public static void initSessionUserThreadLocal(String empName, String organizeCode,String languageCode){
+    public static void initSessionUserThreadLocal(String empName, String organizeCode, String languageCode) {
         setData(BaseThreadLocal.EMP_NAME, empName);
         setData(BaseThreadLocal.ORGANIZE_CODE, organizeCode);
         setData(BaseThreadLocal.LANGUAGE_CODE, languageCode);
@@ -126,25 +130,27 @@ public class BaseThreadLocal {
     }
 
     //获取线程中的人员姓名
-    public static String getThreadEmpName(){
+    public static String getThreadEmpName() {
         String empName = getDataStr(EMP_NAME);
-        if(empName == null){
+        if (empName == null) {
             empName = "系统";
         }
         return empName;
     }
+
     //获取线程中的组织代码
-    public static String getThreadOrganizeCode(){
+    public static String getThreadOrganizeCode() {
         String organizeCode = getDataStr(ORGANIZE_CODE);
-        if(organizeCode == null){
+        if (organizeCode == null) {
             organizeCode = "-1";
         }
         return organizeCode;
     }
+
     //获取线程中的语言代码
-    public static String getThreadLanguageCode(){
+    public static String getThreadLanguageCode() {
         String organizeCode = getDataStr(LANGUAGE_CODE);
-        if(organizeCode == null){
+        if (organizeCode == null) {
             organizeCode = "CN/zh";
         }
         return organizeCode;

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java

@@ -20,20 +20,28 @@ public class CommonEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SOFT_TYPE {
-        /** WMS 服务 */
+        /**
+         * WMS 服务
+         */
         WMS(3, 8200, 10, 102000000L, "i3wms", "仓库管理软件"),
         SWEB(7, 8800, 19, 108000000L, "i3sweb", "供应商服务"),
         QMS(5, 0, 0, 0, "i3qms", "质量管理软件"),
 
-        /** Mes 服务 */
+        /**
+         * Mes 服务
+         */
         MES(4, 8300, 11, 103000000L, "i3mes", "生产管理软件"),
         MES_PCN(6, 8350, 12, 107000000L, "i3mes-pcn", "生产管理软件-节点中心"),
 
-        /** PTL 服务 */
+        /**
+         * PTL 服务
+         */
         PTL(8, 8700, 20, 111000000L, "i3ptl", "亮灯自动拣选"),
         PTL_PCN(9, 8750, 21, 109000000L, "i3ptl-pcn", "亮灯自动拣选-节点中心"),
 
-        /** Block 服务 */
+        /**
+         * Block 服务
+         */
         FORM(20, 8900, 16, 104000000L, "block-form", "智能表单"),
         REPORT(21, 8910, 17, 105000000L, "block-report", "智能报表"),
         WORKFLOW(22, 0, 0, 0, "block-workflow", "智能工作流"),
@@ -41,42 +49,66 @@ public class CommonEnumUtil {
         SOFTSWITCH(24, 8920, 18, 130000000L, "block-softswitch", "软件适配器"),
         HARDSWITCH(25, 0, 0, 0, "block-hardswitch", "硬件适配器"),
 
-        /** LAC 服务 */
+        /**
+         * LAC 服务
+         */
         LAC(26, 8600, 13, 150000000L, "lac", "连接适配器"),
 
-        /** 安灯服务 */
+        /**
+         * 安灯服务
+         */
         ANDON(27, 8500, 14, 110000000L, "andon", "安灯"),
 
-        /** 计划排产服务 */
+        /**
+         * 计划排产服务
+         */
         APS(28, 8400, 15, 140000000L, "i3aps", "高级计划与排产"),
         SURFACE(98, 0, 0, 0, "i3surface", "对外服务"),
 
-        /** 基础服务 */
+        /**
+         * 基础服务
+         */
         IMPP(1, 0, 0, 100000000L, "impp-platform", "IMPP平台"),
         CONSOLE(95, 8010, 0, 0, "impp-console", "服务监控台"),
         GATEWAY(96, 9000, 0, 0, "impp-gateway", "服务网关"),
         CLOUD(97, 0, 0, 0, "i3cloud", "微服务"),
         CENTER(99, 8000, 1, 0, "icloud-server", "注册中心"),
 
-        /** 平台服务 */
+        /**
+         * 平台服务
+         */
         CORE(2, 8100, 4, 101000000L, "i3core", "i3业务平台"),
         MDM(29, 8150, 22, 0, "i3mdm", "数据中心MDM"),
 
-        /** 调试服务 */
+        /**
+         * 调试服务
+         */
         DEV(9999, 0000, 0, 120000000L, "Development", "系统调试");
 
 
-        /** 产品ID */
+        /**
+         * 产品ID
+         */
         private int value;
-        /** 应用默认端口 */
+        /**
+         * 应用默认端口
+         */
         private int port;
-        /** 应用默认雪花DataBaseId(0-31)共32 个存储区 */
+        /**
+         * 应用默认雪花DataBaseId(0-31)共32 个存储区
+         */
         private int snowflakeId;
-        /** 产品代码 */
+        /**
+         * 产品代码
+         */
         private String code;
-        /** 顶级菜单代码 */
+        /**
+         * 顶级菜单代码
+         */
         private long menuRootId;
-        /** 产品描述 */
+        /**
+         * 产品描述
+         */
         private String description;
 
         SOFT_TYPE(int value, int port, int snowflakeId, long menuRootCode, String code, String description) {
@@ -177,6 +209,7 @@ public class CommonEnumUtil {
             }
             return null;
         }
+
         public synchronized static int descriptionOfValue(String desc) {
             int tmp = IMPP.value;
             for (int i = 0; i < values().length; i++) {
@@ -187,6 +220,7 @@ public class CommonEnumUtil {
             }
             return tmp;
         }
+
         public static int descOf(String desc) {
             int tmp = IMPP.value;
             for (int i = 0; i < values().length; i++) {
@@ -253,7 +287,7 @@ public class CommonEnumUtil {
             return boolIntVal == 1 ? TRUE_OR_FALSE.TRUE.getValue() : TRUE_OR_FALSE.FALSE.getValue();
         }
 
-        public static TRUE_OR_FALSE valueOfEnum(int value){
+        public static TRUE_OR_FALSE valueOfEnum(int value) {
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].value == value) {
                     return values()[i];
@@ -262,13 +296,18 @@ public class CommonEnumUtil {
             return null;
         }
 
-        public static String valueOfDescription(int val) {return valueOf(val);}
-        public static int descriptionOfValue(String desc) {return descOf(desc);}
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descriptionOfValue(String desc) {
+            return descOf(desc);
+        }
 
         public static boolean valueOfBoolean(int val) {
-            if(val == TRUE.value){
+            if (val == TRUE.value) {
                 return true;
-            }else {
+            } else {
                 return false;
             }
         }
@@ -348,6 +387,7 @@ public class CommonEnumUtil {
             }
             return tmp;
         }
+
         public static int descOf(String desc) {
             int tmp = COMMON.value;
             for (int i = 0; i < values().length; i++) {
@@ -357,9 +397,11 @@ public class CommonEnumUtil {
             }
             return tmp;
         }
+
         public static String valueOfDescription(int val) {
             return valueOf(val);
         }
+
         public static int descriptionOfValue(String val) {
             return descOf(val);
         }
@@ -453,7 +495,7 @@ public class CommonEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum USER_STATUS {
-//        EMPTY(1, "fa fa-success cell-fa fa-check", "正常"),
+        //        EMPTY(1, "fa fa-success cell-fa fa-check", "正常"),
 //        FREEZE(2, "冻结", "冻结_FREEZE"),
 //        ABERRANT(3, "异常", "异常_ABERRANT"),
 //        RESIGNATION(4, "离职", "离职_RESIGNATION"),
@@ -508,6 +550,7 @@ public class CommonEnumUtil {
             return tmp;
         }
     }
+
     /**
      * 数据类型
      * 1库存移动数据
@@ -569,6 +612,7 @@ public class CommonEnumUtil {
             return tmp;
         }
     }
+
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum USER_INFO_STATUS {
         INCUMBENT(1, "正常", "正常_NORMAL"),
@@ -619,9 +663,9 @@ public class CommonEnumUtil {
 
     /**
      * 数据状态
-     *  1 启用
-     *  2 禁用
-     *  3 锁定
+     * 1 启用
+     * 2 禁用
+     * 3 锁定
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum DATA_STATUS {
@@ -711,7 +755,7 @@ public class CommonEnumUtil {
             return tmp;
         }
 
-        public static METHOD_LEVEL get(int id){
+        public static METHOD_LEVEL get(int id) {
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].value == id) {
                     return values()[i];
@@ -805,9 +849,9 @@ public class CommonEnumUtil {
     /**
      * 父节点配置
      */
-    public enum PARENT{
+    public enum PARENT {
 
-        DEFAULT(-1L,"根节点");
+        DEFAULT(-1L, "根节点");
 
         private Long value = -1L;
         private String description = null;
@@ -876,9 +920,9 @@ public class CommonEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum CLOUD_APP_STATUS {
-        UP(1,"UP" ,"在线"),
-        DOWN(2, "DOWN","断线"),
-        RESTRICTED(3,"RESTRICTED" ,"受限");
+        UP(1, "UP", "在线"),
+        DOWN(2, "DOWN", "断线"),
+        RESTRICTED(3, "RESTRICTED", "受限");
 
         private int value;
         private String code;
@@ -991,6 +1035,7 @@ public class CommonEnumUtil {
 
         /**
          * -1 未识别操作系统
+         *
          * @param desc
          * @return
          */
@@ -1051,6 +1096,7 @@ public class CommonEnumUtil {
             }
             return tmp;
         }
+
         public static String valueOfDescription(int val) {
             return valueOf(val);
         }
@@ -1092,6 +1138,7 @@ public class CommonEnumUtil {
             this.value = value;
             this.description = description;
         }
+
         public static CONTENT_TYPE valueOfContenType(String val) {
             CONTENT_TYPE tmp = null;
             for (int i = 0; i < values().length; i++) {
@@ -1128,10 +1175,10 @@ public class CommonEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum HTTP_METHOD_TYPE {
-        GET(1,"GET" ,"GET"),
-        POST(2, "POST","POST"),
-        DELETE(3, "DELETE","DELETE"),
-        PUT(4, "PUT","PUT");
+        GET(1, "GET", "GET"),
+        POST(2, "POST", "POST"),
+        DELETE(3, "DELETE", "DELETE"),
+        PUT(4, "PUT", "PUT");
 
         private int value;
         private String code;
@@ -1210,13 +1257,13 @@ public class CommonEnumUtil {
      * 变量类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum  BASIS_TYPE {
+    public enum BASIS_TYPE {
         INT(1, "int"),
         DOUBLE(2, "double"),
         LONG(3, "long"),
         FLOAT(4, "float"),
         CHAR(5, "char"),
-        BOOLEAN(6,"boolean"),
+        BOOLEAN(6, "boolean"),
         BYTE(7, "byte"),
         SHORT(8, "short");
 
@@ -1329,14 +1376,14 @@ public class CommonEnumUtil {
         TEXT(200, "TEXT", "文本"),
         NUMBER(210, "NUMBER", "数字"),
         PASSWORD(230, "PASSWORD", "密码"),
-        DATE_TIME(300, "DATE", "日期",SQL_WHERE.BETWEEN),
+        DATE_TIME(300, "DATE", "日期", SQL_WHERE.BETWEEN),
         //        DATE(300, "DATE", "日期(yyyy-MM-dd)"),
 //        DATE_TIME(310, "DATE_TIME", "时间(yyyy-MM-dd hh:mm:ss)"),
         //        ELEMENT(700, "DICT_SELECT", "元素"),
         DICTIONARY(800, "DICT_SELECT", "字典"),
         CASCADE(900, "CASCADE", "级联"),
         PICK_UP(1000, "PICK_UP", "拾取"),
-        INTERVAL(1100, "INTERVAL", "区间",SQL_WHERE.INTERVAL);
+        INTERVAL(1100, "INTERVAL", "区间", SQL_WHERE.INTERVAL);
         //FILE(400, "file", "文件"),
         //IMAGE(410, "image", "image"),
         //OFF(500, "color", "颜色"),
@@ -1440,7 +1487,7 @@ public class CommonEnumUtil {
         MORE(20, " > ", "大于"),
         LESS(30, " < ", "小于"),
         MORE_OR_EQUAL(21, " >= ", "大于等于"),
-        LESS_OR_EQUAL (31, " <= ", "小于等于"),
+        LESS_OR_EQUAL(31, " <= ", "小于等于"),
         LIKE(40, " LIKE ", "全模糊"),
         START_LIKE(41, " LIKE ", "前模糊"),
         END_LIKE(52, " LIKE ", "后模糊"),
@@ -1531,7 +1578,7 @@ public class CommonEnumUtil {
         private int value;
         private String description;
 
-        private MiSS_RESOURCE_SOURCE(int value,  String description) {
+        private MiSS_RESOURCE_SOURCE(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -1606,7 +1653,7 @@ public class CommonEnumUtil {
          */
         private Class clzFullName;
         /**
-         *  属性类型 对应的 控件类型
+         * 属性类型 对应的 控件类型
          */
         private PROPERTY_CONTROL_TYPE controlType;
         /**
@@ -1622,8 +1669,8 @@ public class CommonEnumUtil {
          */
         private String defaultValue;
 
-        private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,
-                              PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere) {
+        private PROPERTY_TYPE(int value, String code, String description, String classPath, Class clzFullName,
+                              PROPERTY_CONTROL_TYPE controlType, SQL_WHERE defaultWhere) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -1633,8 +1680,8 @@ public class CommonEnumUtil {
             this.defaultWhere = defaultWhere;
         }
 
-        private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,
-                              PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere,String defaultValue) {
+        private PROPERTY_TYPE(int value, String code, String description, String classPath, Class clzFullName,
+                              PROPERTY_CONTROL_TYPE controlType, SQL_WHERE defaultWhere, String defaultValue) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -1646,8 +1693,8 @@ public class CommonEnumUtil {
             this.defaultFormat = defaultFormat;
         }
 
-        private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,
-                              PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere,String defaultValue,String defaultFormat) {
+        private PROPERTY_TYPE(int value, String code, String description, String classPath, Class clzFullName,
+                              PROPERTY_CONTROL_TYPE controlType, SQL_WHERE defaultWhere, String defaultValue, String defaultFormat) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -1813,11 +1860,11 @@ public class CommonEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum DATA_SOURCE_TYPE {
-        SOURCE_MARIA_DB(100, "MariaDB", "MariaDB 10.1","com.mysql.jdbc.Driver",3306,null),
-        SOURCE_SQL_SERVER(200, "SQL Server", "SQL Server 2017","com.microsoft.sqlserver.jdbc.SQLServerDriver",1433,"dbo"),
-        SOURCE_ORACLE(300, "Oracle", "Oralce 12C","oracle.jdbc.driver.OracleDriver",1521,null),
-        SOURCE_POSTGRE_SQL(400, "PostgreSql", "PostgreSql 10.5","org.postgresql.Driver",5432,"public"),
-        SOURCE_SAP_HANA(500, "SapHana", "SapHana","com.sap.db.jdbc.Driver",39015,null);
+        SOURCE_MARIA_DB(100, "MariaDB", "MariaDB 10.1", "com.mysql.jdbc.Driver", 3306, null),
+        SOURCE_SQL_SERVER(200, "SQL Server", "SQL Server 2017", "com.microsoft.sqlserver.jdbc.SQLServerDriver", 1433, "dbo"),
+        SOURCE_ORACLE(300, "Oracle", "Oralce 12C", "oracle.jdbc.driver.OracleDriver", 1521, null),
+        SOURCE_POSTGRE_SQL(400, "PostgreSql", "PostgreSql 10.5", "org.postgresql.Driver", 5432, "public"),
+        SOURCE_SAP_HANA(500, "SapHana", "SapHana", "com.sap.db.jdbc.Driver", 39015, null);
 
         private int value;
         private String code;
@@ -1826,7 +1873,7 @@ public class CommonEnumUtil {
         private int defaultPort;
         private String defaultSchemaPattern;
 
-        private DATA_SOURCE_TYPE (int value, String code, String description,String driverClassName,int port,String defaultSchemaPattern) {
+        private DATA_SOURCE_TYPE(int value, String code, String description, String driverClassName, int port, String defaultSchemaPattern) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -1910,51 +1957,51 @@ public class CommonEnumUtil {
         }
 
         public String getSchemaPattern(String schema) {
-            if(this.equals(SOURCE_SAP_HANA)){
+            if (this.equals(SOURCE_SAP_HANA)) {
                 return schema;
             }
             return defaultSchemaPattern;
         }
 
-        public String getJDBCUrl(String database,String host,Integer port){
-            if(this.getValue() == SOURCE_MARIA_DB.getValue()){
-                return getJDBCUrlMySQL(database,host,port);
-            }else if(this.getValue() == SOURCE_ORACLE.getValue()){
-                return getJDBCUrlOracle(database,host,port);
-            }else if(this.getValue() == SOURCE_POSTGRE_SQL.getValue()){
-                return getJDBCUrlPostgreSQL(database,host,port);
-            }else if(this.getValue() == SOURCE_SQL_SERVER.getValue()){
-                return getJDBCUrlSQLServer(database,host,port);
-            }else if(this.getValue() == SOURCE_SAP_HANA.getValue()){
-                return getJDBCUrlSapHana(database,host,port);
+        public String getJDBCUrl(String database, String host, Integer port) {
+            if (this.getValue() == SOURCE_MARIA_DB.getValue()) {
+                return getJDBCUrlMySQL(database, host, port);
+            } else if (this.getValue() == SOURCE_ORACLE.getValue()) {
+                return getJDBCUrlOracle(database, host, port);
+            } else if (this.getValue() == SOURCE_POSTGRE_SQL.getValue()) {
+                return getJDBCUrlPostgreSQL(database, host, port);
+            } else if (this.getValue() == SOURCE_SQL_SERVER.getValue()) {
+                return getJDBCUrlSQLServer(database, host, port);
+            } else if (this.getValue() == SOURCE_SAP_HANA.getValue()) {
+                return getJDBCUrlSapHana(database, host, port);
             }
             return null;
         }
 
-        public String getJDBCUrl(String database,String host,Integer port,String instanceName){
-            if(this.getValue() == SOURCE_MARIA_DB.getValue()){
-                return getJDBCUrlMySQL(database,host,port);
-            }else if(this.getValue() == SOURCE_ORACLE.getValue()){
-                return getJDBCUrlOracle(database,host,port);
-            }else if(this.getValue() == SOURCE_POSTGRE_SQL.getValue()){
-                return getJDBCUrlPostgreSQL(database,host,port);
-            }else if(this.getValue() == SOURCE_SQL_SERVER.getValue()){
-                return getJDBCUrlSQLServer(database,host,port,instanceName);
+        public String getJDBCUrl(String database, String host, Integer port, String instanceName) {
+            if (this.getValue() == SOURCE_MARIA_DB.getValue()) {
+                return getJDBCUrlMySQL(database, host, port);
+            } else if (this.getValue() == SOURCE_ORACLE.getValue()) {
+                return getJDBCUrlOracle(database, host, port);
+            } else if (this.getValue() == SOURCE_POSTGRE_SQL.getValue()) {
+                return getJDBCUrlPostgreSQL(database, host, port);
+            } else if (this.getValue() == SOURCE_SQL_SERVER.getValue()) {
+                return getJDBCUrlSQLServer(database, host, port, instanceName);
             }
             return null;
         }
 
-        public static DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName){
-            if(StringUtils.isNotBlank(databaseProductName)){
-                if(databaseProductName.indexOf(":mysql:") != -1){
+        public static DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName) {
+            if (StringUtils.isNotBlank(databaseProductName)) {
+                if (databaseProductName.indexOf(":mysql:") != -1) {
                     return SOURCE_MARIA_DB;
-                }else if(databaseProductName.indexOf(":oracle:") != -1){
+                } else if (databaseProductName.indexOf(":oracle:") != -1) {
                     return SOURCE_ORACLE;
-                }else if(databaseProductName.indexOf(":postgresql:") != -1){
+                } else if (databaseProductName.indexOf(":postgresql:") != -1) {
                     return SOURCE_POSTGRE_SQL;
-                }else if(databaseProductName.indexOf(":sqlserver:") != -1){
+                } else if (databaseProductName.indexOf(":sqlserver:") != -1) {
                     return SOURCE_SQL_SERVER;
-                }else if(databaseProductName.indexOf(":sap:") != -1){
+                } else if (databaseProductName.indexOf(":sap:") != -1) {
                     return SOURCE_SAP_HANA;
                 }
             }
@@ -1963,9 +2010,9 @@ public class CommonEnumUtil {
 
 
         // cn.estsh.i3plus.mes.pcn.util.BsJdbcTemplateConfigTest
-        private String getJDBCUrlMySQL(String database,String host,Integer port){
+        private String getJDBCUrlMySQL(String database, String host, Integer port) {
             // 针对mysql 8.0 先加上allowPublicKeyRetrieval 赋予默认时区CST
-            return "jdbc:mysql://"+host+":"+port+"/"+database+
+            return "jdbc:mysql://" + host + ":" + port + "/" + database +
                     "?autoReconnect=true" +
                     "&useSSL=false" +
                     "&characterEncoding=utf-8" +
@@ -1973,23 +2020,23 @@ public class CommonEnumUtil {
                     "&serverTimezone=CST";
         }
 
-        private String getJDBCUrlOracle(String database,String host,Integer port){
-            return "jdbc:oracle:thin:@"+host+":"+port+":"+database;
+        private String getJDBCUrlOracle(String database, String host, Integer port) {
+            return "jdbc:oracle:thin:@" + host + ":" + port + ":" + database;
         }
 
-        private String getJDBCUrlPostgreSQL(String database,String host,Integer port){
-            return "jdbc:postgresql://"+host+":"+port+"/"+database;
+        private String getJDBCUrlPostgreSQL(String database, String host, Integer port) {
+            return "jdbc:postgresql://" + host + ":" + port + "/" + database;
         }
 
-        private String getJDBCUrlSQLServer(String database,String host,Integer port){
-            return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database+";autoReconnect=true";
+        private String getJDBCUrlSQLServer(String database, String host, Integer port) {
+            return "jdbc:sqlserver://" + host + ":" + port + ";database=" + database + ";autoReconnect=true";
         }
 
-        private String getJDBCUrlSapHana(String database,String host,Integer port){
+        private String getJDBCUrlSapHana(String database, String host, Integer port) {
             return "jdbc:sap://" + host + ":" + port + "?reconnect=true";
         }
 
-        private String getJDBCUrlSQLServer(String database,String host,Integer port,String instanceName){
+        private String getJDBCUrlSQLServer(String database, String host, Integer port, String instanceName) {
             StringBuffer sb = new StringBuffer();
             sb.append("jdbc:sqlserver://").append(host);
             // 实例
@@ -2010,7 +2057,7 @@ public class CommonEnumUtil {
      * 变量类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum  LICENSE_SOURCE {
+    public enum LICENSE_SOURCE {
         LOCAL_SYSTEM_FILE(1, "本地文件"),
         NETWORK_ESTSH(2, "网络-官方授权"),
         SENSE_HARDWARE_USB_LOCK(3, "硬件锁"),
@@ -2102,8 +2149,8 @@ public class CommonEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ACTUATOR_ENV_PATH {
-        PID(1,"/PID" ,"PID"),
-        JAVA_VERSION(2, "/java.version","jdk版本");
+        PID(1, "/PID", "PID"),
+        JAVA_VERSION(2, "/java.version", "jdk版本");
 
         private int value;
         private String path;
@@ -2202,7 +2249,7 @@ public class CommonEnumUtil {
             this.description = description;
         }
 
-        private ACTUATOR_METRICS_INFO(int value, String path, String tag,  String description) {
+        private ACTUATOR_METRICS_INFO(int value, String path, String tag, String description) {
             this.value = value;
             this.path = path;
             this.tag = tag;
@@ -2216,6 +2263,7 @@ public class CommonEnumUtil {
         public String getPath() {
             return path;
         }
+
         public String getTag() {
             return tag;
         }
@@ -2276,7 +2324,7 @@ public class CommonEnumUtil {
         private String code;
         private String description;
 
-        private DATA_SOURCE_STATUS (int value, String code, String description) {
+        private DATA_SOURCE_STATUS(int value, String code, String description) {
             this.value = value;
             this.code = code;
             this.description = description;
@@ -2295,7 +2343,6 @@ public class CommonEnumUtil {
         }
 
 
-
         public static String valueOfCode(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
@@ -2466,7 +2513,6 @@ public class CommonEnumUtil {
     }
 
 
-
     /**
      * 业务表：库存条码质检状态
      */
@@ -2589,7 +2635,7 @@ public class CommonEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum DYNAMIC_DATA_SOURCE_TYPE {
-        MASTER,NODE
+        MASTER, NODE
     }
 
     /**
@@ -2687,5 +2733,4 @@ public class CommonEnumUtil {
     }
 
 
-
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java

@@ -445,7 +445,7 @@ public class ImppEnumUtil {
         MESSAGE_SEND_STATUS() {
         }
 
-        MESSAGE_SEND_STATUS(int value,  String description) {
+        MESSAGE_SEND_STATUS(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -1032,10 +1032,10 @@ public class ImppEnumUtil {
         REF_OBJECT(3, "对象"),
         REF_DICT(4, "字典");
 
-        private int value;
-        private String description;
+        private final int value;
+        private final String description;
 
-        private COL_REF_TYPE(int value, String description) {
+        COL_REF_TYPE(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -1084,8 +1084,8 @@ public class ImppEnumUtil {
         WORK_WECHAT(8, "企业微信配置"),
         SMS(9, "短信配置");
 
-        private int value;
-        private String description;
+        private final int value;
+        private final String description;
 
         public int getValue() {
             return value;
@@ -1095,7 +1095,7 @@ public class ImppEnumUtil {
             return description;
         }
 
-        private SYS_CONFIG_GROUP(int value, String description) {
+        SYS_CONFIG_GROUP(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -1118,8 +1118,8 @@ public class ImppEnumUtil {
         EXTERNAL(2, "外部人员"),
         URGENT(3, "紧急联系人"),
         SUPPLIER(4, "供应商");
-        private int value;
-        private String description;
+        private final int value;
+        private final String description;
 
         public int getValue() {
             return value;
@@ -1129,7 +1129,7 @@ public class ImppEnumUtil {
             return description;
         }
 
-        private MESSAGE_RECEIVER_TYPE(int value, String description) {
+        MESSAGE_RECEIVER_TYPE(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -1222,8 +1222,8 @@ public class ImppEnumUtil {
     public enum DICTIONARY_GROUP {
         SYSTEM(1, "系统字典"),
         EXTERNAL(2, "业务字典");
-        private int value;
-        private String description;
+        private final int value;
+        private final String description;
 
         public int getValue() {
             return value;
@@ -1233,7 +1233,7 @@ public class ImppEnumUtil {
             return description;
         }
 
-        private DICTIONARY_GROUP(int value, String description) {
+        DICTIONARY_GROUP(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -1254,10 +1254,10 @@ public class ImppEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum LOG_STORAGE {
-//        MONGO(1, "MongoDB"),
+        //        MONGO(1, "MongoDB"),
         ELASTICSEARCH(2, "Elasticsearch");
-        private int value;
-        private String description;
+        private final int value;
+        private final String description;
 
         public int getValue() {
             return value;
@@ -1267,7 +1267,7 @@ public class ImppEnumUtil {
             return description;
         }
 
-        private LOG_STORAGE(int value, String description) {
+        LOG_STORAGE(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -1299,8 +1299,8 @@ public class ImppEnumUtil {
     public enum CHECK_TEXT {
         PASSWORD_VERIFY(1, "保存策略"),
         PASSWORD_LOGIN(2, "登录策略");
-        private int value;
-        private String description;
+        private final int value;
+        private final String description;
 
         public int getValue() {
             return value;
@@ -1310,7 +1310,7 @@ public class ImppEnumUtil {
             return description;
         }
 
-        private CHECK_TEXT(int value, String description) {
+        CHECK_TEXT(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -1342,8 +1342,8 @@ public class ImppEnumUtil {
     public enum USER_CUSTOMIZE_CONFIG_TYPE {
         WEB_TABLE_SHOW_COL(10, "前端表格显示列");
 
-        private int value;
-        private String description;
+        private final int value;
+        private final String description;
 
         USER_CUSTOMIZE_CONFIG_TYPE(int value, String description) {
             this.value = value;
@@ -1387,8 +1387,8 @@ public class ImppEnumUtil {
     public enum USER_EXTERNAL_REF {
         WORK_WECHAT(10, "企业微信");
 
-        private int value;
-        private String description;
+        private final int value;
+        private final String description;
 
         USER_EXTERNAL_REF(int value, String description) {
             this.value = value;
@@ -1429,7 +1429,7 @@ public class ImppEnumUtil {
      * 用户绑定属性
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum USER_BIND_PROPERTY{
+    public enum USER_BIND_PROPERTY {
         USER_LOGIN_NAME("userId", "登录名称"),
         USER_NAME("userName", "用户名称"),
         EMAIL("email", "邮箱"),
@@ -1437,10 +1437,10 @@ public class ImppEnumUtil {
         USER_EMP_NO("empNo", "工号"),
         USER_WECHAT_NO("userWeChatNo", "微信号");
 
-        private String value;
-        private String description;
+        private final String value;
+        private final String description;
 
-        private USER_BIND_PROPERTY(String value, String description) {
+        USER_BIND_PROPERTY(String value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -1638,4 +1638,36 @@ public class ImppEnumUtil {
             return tmp;
         }
     }
+
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum AUTH_LOGIN_STRATEGY {
+        ACCOUNT(10, "Default", "defaultLoginStrategy", "账户密码登录"),
+        E9(20, "E9", "e9LoginStrategy", "泛微单点登录策略");
+
+        private final int value;
+        private final String code;
+        private final String strategyName;
+        private final String description;
+
+        AUTH_LOGIN_STRATEGY(int value, String code, String strategyName, String description) {
+            this.value = value;
+            this.code = code;
+            this.strategyName = strategyName;
+            this.description = description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String codeOfStrategyName(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].strategyName;
+                }
+            }
+            return tmp;
+        }
+    }
 }

modules/i3plus-pojo-form/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-hardswitch/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-ics/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-jobflow/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-lac/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-mdm/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-mes-pcn/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-mes/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-model/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/RoleRealmModel.java

@@ -0,0 +1,25 @@
+package cn.estsh.i3plus.pojo.model.platform;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.shiro.realm.Realm;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/1/19 下午1:29
+ * @desc
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class RoleRealmModel {
+
+    private Realm userRealm;
+
+    private Realm saRealm;
+
+    private Realm adminRealm;
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/SystemLoginModel.java

@@ -0,0 +1,40 @@
+package cn.estsh.i3plus.pojo.model.platform;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author Wynne.Lu
+ * @date 2021/1/18 上午10:56
+ * @desc 系统登录模型
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("系统登录模型")
+public class SystemLoginModel {
+
+    @ApiParam(value = "登录名")
+    private String loginName;
+
+    @ApiParam(value = "登录密码")
+    private String loginPwd;
+
+    @ApiParam(value = "语言代码")
+    private String languageCode;
+
+    @ApiParam(value = "设备id")
+    private String deviceId;
+
+    @ApiParam(value = "单点登录策略")
+    private String loginStrategy;
+
+    @ApiParam(value = "app Id")
+    private String appId;
+
+}

modules/i3plus-pojo-platform/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-ptl/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-report/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-softswitch/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-sweb/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-wms/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-pojo-workflow/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-       <version>1.0-TEST-SNAPSHOT</version>
+       <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

pom.xml

@@ -15,7 +15,7 @@
     <groupId>i3plus.pojo</groupId>
     <artifactId>i3plus-pojo</artifactId>
     <packaging>pom</packaging>
-    <version>1.0-TEST-SNAPSHOT</version>
+    <version>1.0-DEV-SNAPSHOT</version>
     <modules>
         <module>modules/i3plus-pojo-base</module>
         <module>modules/i3plus-pojo-platform</module>