组织机构增加字段:组织机构类型

@@ -11,8 +11,8 @@
 	</parent>
 	</parent>
 	<groupId>com.tianbo</groupId>
 	<groupId>com.tianbo</groupId>
 	<artifactId>warehouse</artifactId>
 	<artifactId>warehouse</artifactId>
-	<version>3.0Beta</version>
-	<name>warehouse</name>
+	<version>4.0Beta-organization-update</version>
+	<name>usercenter</name>
 	<description>usercenter for springcloud</description>
 	<description>usercenter for springcloud</description>
 
 
 	<properties>
 	<properties>

@@ -34,6 +34,8 @@ public class ROLE implements GrantedAuthority {
 
 
     private String mqcode;
     private String mqcode;
 
 
+    private String orgtype;
+
     private List<ROLE> children;
     private List<ROLE> children;
 
 
     public Integer getRoleId() {
     public Integer getRoleId() {

@@ -11,13 +11,13 @@ import java.security.PublicKey;
 import java.util.Date;
 import java.util.Date;
 
 
 public class JwtTokenUtil {
 public class JwtTokenUtil {
-    //加载jwt.jks文件
-    private static InputStream inputStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("jwt.jks");
     private static PrivateKey privateKey = null;
     private static PrivateKey privateKey = null;
     private static PublicKey publicKey = null;
     private static PublicKey publicKey = null;
 
 
     static {
     static {
         try {
         try {
+            //加载jwt.jks文件
+            InputStream inputStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("jwt.jks");
             KeyStore keyStore = KeyStore.getInstance("JKS");
             KeyStore keyStore = KeyStore.getInstance("JKS");
             keyStore.load(inputStream, "vmvnv1v2".toCharArray());
             keyStore.load(inputStream, "vmvnv1v2".toCharArray());
             privateKey = (PrivateKey) keyStore.getKey("jwt", "vmvnv1v2".toCharArray());
             privateKey = (PrivateKey) keyStore.getKey("jwt", "vmvnv1v2".toCharArray());

@@ -13,6 +13,7 @@
     <result column="business_license" jdbcType="VARCHAR" property="businessLicense" />
     <result column="business_license" jdbcType="VARCHAR" property="businessLicense" />
     <result column="departmentId" jdbcType="VARCHAR" property="departmentid" />
     <result column="departmentId" jdbcType="VARCHAR" property="departmentid" />
     <result column="mq_code" jdbcType="VARCHAR" property="mqcode" />
     <result column="mq_code" jdbcType="VARCHAR" property="mqcode" />
+    <result column="org_type" jdbcType="VARCHAR" property="orgtype" />
   </resultMap>
   </resultMap>
   <resultMap id="TreeSqlWithPermResultMap" type="com.tianbo.warehouse.model.ROLE" extends="BaseResultMap">
   <resultMap id="TreeSqlWithPermResultMap" type="com.tianbo.warehouse.model.ROLE" extends="BaseResultMap">
     <collection column="role_id" javaType="java.util.ArrayList" ofType="com.tianbo.warehouse.model.PERMISSION" property="permissions" select="com.tianbo.warehouse.dao.PERMISSIONMapper.getRolePermisson" />
     <collection column="role_id" javaType="java.util.ArrayList" ofType="com.tianbo.warehouse.model.PERMISSION" property="permissions" select="com.tianbo.warehouse.dao.PERMISSIONMapper.getRolePermisson" />
@@ -40,7 +41,7 @@
   </resultMap>
   </resultMap>
   <sql id="Base_Column_List">
   <sql id="Base_Column_List">
     role_id, role_name, role_sign, description, `type`, parentId, rsort, customs_reg_code,
     role_id, role_name, role_sign, description, `type`, parentId, rsort, customs_reg_code,
-    business_license, departmentId, mq_code
+    business_license, departmentId, mq_code, orgtype
   </sql>
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select
     select