shiro-redis 升级到2.8.24（支持配置redis连接password）

huigou-common/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.huigou</groupId>
 		<artifactId>root</artifactId>
-		<version>1.1.1</version>
+		<version>1.1.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>huigou-common</artifactId>
 	<name>huigou-common</name>

huigou-common/src/main/java/com/huigou/context/OrgUnit.java

@@ -186,6 +186,7 @@ public class OrgUnit implements Serializable {
         return this.getAttributeValue(PERSON_MEMBER_NAME_FIELD_NAME);
     }
 
+    @Override
     public String toString() {
         return "(" + this.fullId + "," + this.fullName + ")@OrgUnit";
     }

huigou-common/src/main/java/com/huigou/context/PersonMember.java

@@ -64,8 +64,11 @@ public class PersonMember extends OrgNode implements Serializable {
      * @return
      */
     public OrgNode getPosition() {
-        for (Object parent = this; parent != null; parent = ((OrgNode) parent).getParent())
-            if ("pos".equals(((OrgNode) parent).getType())) return (OrgNode) parent;
+        for (Object parent = this; parent != null; parent = ((OrgNode) parent).getParent()) {
+            if ("pos".equals(((OrgNode) parent).getType())) {
+                return (OrgNode) parent;
+            }
+        }
         return null;
     }
 
@@ -75,8 +78,11 @@ public class PersonMember extends OrgNode implements Serializable {
      * @return
      */
     public OrgNode getDept() {
-        for (Object parent = this; parent != null; parent = ((OrgNode) parent).getParent())
-            if ("dpt".equals(((OrgNode) parent).getType())) return (OrgNode) parent;
+        for (Object parent = this; parent != null; parent = ((OrgNode) parent).getParent()) {
+            if ("dpt".equals(((OrgNode) parent).getType())) {
+                return (OrgNode) parent;
+            }
+        }
         return null;
     }
 
@@ -86,8 +92,11 @@ public class PersonMember extends OrgNode implements Serializable {
      * @return
      */
     public OrgNode getOrgn() {
-        for (Object parent = this; parent != null; parent = ((OrgNode) parent).getParent())
-            if ("ogn".equals(((OrgNode) parent).getType())) return (OrgNode) parent;
+        for (Object parent = this; parent != null; parent = ((OrgNode) parent).getParent()) {
+            if ("ogn".equals(((OrgNode) parent).getType())) {
+                return (OrgNode) parent;
+            }
+        }
         return null;
     }
 
@@ -107,6 +116,7 @@ public class PersonMember extends OrgNode implements Serializable {
         this.personId = personId;
     }
     
+    @Override
     public String getOrgId() {
         return orgId;
     }
@@ -115,6 +125,7 @@ public class PersonMember extends OrgNode implements Serializable {
         this.orgId = orgId;
     }
     
+    @Override
     public String getOrgCode() {
         return orgCode;
     }
@@ -123,6 +134,7 @@ public class PersonMember extends OrgNode implements Serializable {
         this.orgCode = orgCode;
     }
 
+    @Override
     public String getOrgName() {
         return orgName;
     }
@@ -131,6 +143,7 @@ public class PersonMember extends OrgNode implements Serializable {
         this.orgName = orgName;
     }
 
+    @Override
     public String getDeptId() {
         return deptId;
     }
@@ -139,6 +152,7 @@ public class PersonMember extends OrgNode implements Serializable {
         this.deptId = deptId;
     }
 
+    @Override
     public String getDeptCode() {
         return deptCode;
     }
@@ -147,6 +161,7 @@ public class PersonMember extends OrgNode implements Serializable {
         this.deptCode = deptCode;
     }
 
+    @Override
     public String getDeptName() {
         return deptName;
     }
@@ -155,6 +170,7 @@ public class PersonMember extends OrgNode implements Serializable {
         this.deptName = deptName;
     }
 
+    @Override
     public String getPositionId() {
         return positionId;
     }
@@ -163,6 +179,7 @@ public class PersonMember extends OrgNode implements Serializable {
         this.positionId = positionId;
     }
 
+    @Override
     public String getPositionCode() {
         return positionCode;
     }
@@ -171,6 +188,7 @@ public class PersonMember extends OrgNode implements Serializable {
         this.positionCode = positionCode;
     }
 
+    @Override
     public String getPositionName() {
         return positionName;
     }

huigou-core-api/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.huigou</groupId>
 		<artifactId>root</artifactId>
-		<version>1.1.1</version>
+		<version>1.1.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>huigou-core-api</artifactId>
 	<name>huigou-core-api</name>

huigou-core-api/src/main/java/com/huigou/uasp/bpm/configuration/domain/model/HandlerKind.java

@@ -2,24 +2,48 @@ package com.huigou.uasp.bpm.configuration.domain.model;
 
 /**
  * 处理人类型
- * 
+ *
  * @author gongmm
  */
 public enum HandlerKind {
+    /**
+     * 管理权限
+     */
     MANAGE_AUTHORITY("ManageAuthority", " 管理权限"),
+    /**
+     * 岗位
+     */
     POS("Pos", "岗位"),
+    /**
+     * 人员成员
+     */
     PSM("Psm", "人员成员"),
+    /**
+     * 部门
+     */
     DEPT("Dept", "部门"),
+    /**
+     * 管理人员函数
+     */
     MANAGER_FUN("ManagerFun", "管理人员函数"),
+    /**
+     * 基础段
+     */
     SEGMENTATION("Segmentation", "基础段"),
+    /**
+     * 手工选择
+     */
     MANUAL_SELECTION("ManualSelection", "手工选择"),
+    /**
+     * 范围选择
+     */
     SCOPE_SELECTION("ScopeSelection", "范围选择");
 
     private final String id;
 
     private final String displayName;
 
-    private HandlerKind(String id, String displayName) {
+    HandlerKind(String id, String displayName) {
         this.id = id;
         this.displayName = displayName;
     }

huigou-core-api/src/main/java/com/huigou/uasp/bpm/engine/application/HandlerParseService.java

@@ -7,36 +7,29 @@ import com.huigou.uasp.bpm.configuration.domain.model.HandlerKind;
 
 /**
  * 处理人解析服务
- * 
+ *
  * @author gongmm
  */
 public interface HandlerParseService {
 
-    static String CURRENT_BIZ_SEGEMENTATION_ID = "currentBizSegementationId";
+    String CURRENT_BIZ_SEGEMENTATION_ID = "currentBizSegementationId";
 
     /**
      * 构建处理人
-     * 
-     * @param handlerKind
-     *            处理人类别
-     * @param handlerId
-     *            处理人ID
-     * @param orgUnits
-     *            组织机构单元
+     *
+     * @param handlerKind 处理人类别
+     * @param handlerId   处理人ID
+     * @param orgUnits    组织机构单元
      */
     void buildHandler(HandlerKind handlerKind, String handlerId, List<OrgUnit> orgUnits);
 
     /**
      * 构建处理人
-     * 
-     * @param handlerKind
-     *            处理人类别
-     * @param bizSegementationId
-     *            业务段ID
-     * @param handlerId
-     *            处理人ID
-     * @param orgUnits
-     *            组织机构单元
+     *
+     * @param handlerKind        处理人类别
+     * @param bizSegementationId 业务段ID
+     * @param handlerId          处理人ID
+     * @param orgUnits           组织机构单元
      */
     void buildSegmentationHandler(HandlerKind handlerKind, Long bizSegementationId, String handlerId, List<OrgUnit> orgUnits);
 }

huigou-core-impl/pom.xml

@@ -6,8 +6,7 @@
 	<parent>
 		<groupId>com.huigou</groupId>
 		<artifactId>root</artifactId>
-		<version>1.1.1</version>
-
+		<version>1.1.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>huigou-core-impl</artifactId>
 	<name>huigou-core-impl</name>

huigou-core-proxy/pom.xml

@@ -6,8 +6,7 @@
 	<parent>
 		<groupId>com.huigou</groupId>
 		<artifactId>root</artifactId>
-		<version>1.1.1</version>
-
+		<version>1.1.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>huigou-core-proxy</artifactId>
 	<name>huigou-core-proxy</name>

huigou-data/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.huigou</groupId>
 		<artifactId>root</artifactId>
-		<version>1.1.1</version>
+		<version>1.1.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>huigou-data</artifactId>
 	<name>huigou-data</name>

huigou-loader/pom.xml

@@ -5,8 +5,7 @@
 	<parent>
 		<groupId>com.huigou</groupId>
 		<artifactId>root</artifactId>
-		<version>1.1.1</version>
-
+		<version>1.1.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>huigou-loader</artifactId>
 	<packaging>jar</packaging>

huigou-system-common/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.huigou</groupId>
 		<artifactId>root</artifactId>
-		<version>1.1.1</version>
+		<version>1.1.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>huigou-system-common</artifactId>

huigou-uasp/pom.xml

@@ -4,8 +4,7 @@
 	<parent>
 		<groupId>com.huigou</groupId>
 		<artifactId>root</artifactId>
-		<version>1.1.1</version>
-
+        <version>1.1.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>huigou-uasp</artifactId>
 	<name>统一架构平台</name>
@@ -329,6 +328,12 @@
 			<groupId>com.github.binarywang</groupId>
 			<artifactId>weixin-java-cp</artifactId>
 			<version>2.4.3</version>
+			<exclusions>
+				<exclusion>
+					<groupId>redis.clients</groupId>
+					<artifactId>jedis</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>com.huigou</groupId>

huigou-uasp/src/main/java/com/huigou/uasp/bpm/engine/application/impl/HandlerParseServiceImpl.java

@@ -110,6 +110,7 @@ public class HandlerParseServiceImpl implements HandlerParseService {
         }
     }
 
+    @Override
     public void buildSegmentationHandler(HandlerKind handlerKind, Long bizSegementationId, String handlerId, List<OrgUnit> orgUnits) {
         ThreadLocalUtil.putVariable(CURRENT_BIZ_SEGEMENTATION_ID, bizSegementationId);
         try {

huigou-xt/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.huigou</groupId>
 		<artifactId>root</artifactId>
-		<version>1.1.1</version>
+		<version>1.1.2-SNAPSHOT</version>
 	</parent>
 	<artifactId>huigou-xt</artifactId>
 	<name>统一应用支撑平台</name>

pom.xml

@@ -6,8 +6,7 @@
 
     <groupId>com.huigou</groupId>
     <artifactId>root</artifactId>
-    <version>1.1.1</version>
-
+    <version>1.1.2-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -152,14 +151,14 @@
         <tomcat.version>8.5.20</tomcat.version>
         <shiro.version>1.2.5</shiro.version>
         <jedis.version>2.9.0</jedis.version>
-        <shiro-redis.version>2.4.2-RELEASE</shiro-redis.version>
+        <shiro-redis.version>2.8.24</shiro-redis.version>
         <shiro-ehcache.version>1.4.0</shiro-ehcache.version>
         <shiro-cas.version>1.2.4</shiro-cas.version>
         <cas-client-core.version>3.2.1</cas-client-core.version>
         <!-- test -->
         <junit.version>4.9</junit.version>
         <spring-data-mongodb.version>1.9.3.RELEASE</spring-data-mongodb.version>
-        <huigou.uasp.version>1.1.1</huigou.uasp.version>
+        <huigou.uasp.version>1.1.2-SNAPSHOT</huigou.uasp.version>
     </properties>
 
     <dependencyManagement>