zhouweidong 发布系统代码 [ibiz-uaa，UAA鉴权]

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysAuthLogServiceImpl.java

@@ -100,9 +100,8 @@ public class SysAuthLogServiceImpl extends ServiceImpl<SysAuthLogMapper, SysAuth
     @Transactional
     public SysAuthLog get(String key) {
         SysAuthLog et = getById(key);
-        if(et == null){
-            et = new SysAuthLog();
-            et.setLogid(key);
+        if (et == null) {
+            throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), key);
         }
         else {
         }

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysOpenAccessServiceImpl.java

@@ -100,9 +100,8 @@ public class SysOpenAccessServiceImpl extends ServiceImpl<SysOpenAccessMapper, S
     @Transactional
     public SysOpenAccess get(String key) {
         SysOpenAccess et = getById(key);
-        if(et == null){
-            et = new SysOpenAccess();
-            et.setId(key);
+        if (et == null) {
+            throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), key);
         }
         else {
         }

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysPSSystemServiceImpl.java

@@ -100,9 +100,8 @@ public class SysPSSystemServiceImpl extends ServiceImpl<SysPSSystemMapper, SysPS
     @Transactional
     public SysPSSystem get(String key) {
         SysPSSystem et = getById(key);
-        if(et == null){
-            et = new SysPSSystem();
-            et.setPssystemid(key);
+        if (et == null) {
+            throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), key);
         }
         else {
         }

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysPermissionServiceImpl.java

@@ -105,9 +105,8 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
     @Transactional
     public SysPermission get(String key) {
         SysPermission et = getById(key);
-        if(et == null){
-            et = new SysPermission();
-            et.setPermissionid(key);
+        if (et == null) {
+            throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), key);
         }
         else {
         }

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysRolePermissionServiceImpl.java

@@ -110,9 +110,8 @@ public class SysRolePermissionServiceImpl extends ServiceImpl<SysRolePermissionM
     @Transactional
     public SysRolePermission get(String key) {
         SysRolePermission et = getById(key);
-        if(et == null){
-            et = new SysRolePermission();
-            et.setRolepermissionid(key);
+        if (et == null) {
+            throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), key);
         }
         else {
         }

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysRoleServiceImpl.java

@@ -116,9 +116,8 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
     @Transactional
     public SysRole get(String key) {
         SysRole et = getById(key);
-        if(et == null){
-            et = new SysRole();
-            et.setRoleid(key);
+        if (et == null) {
+            throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), key);
         }
         else {
         }

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysUserAuthServiceImpl.java

@@ -107,9 +107,8 @@ public class SysUserAuthServiceImpl extends ServiceImpl<SysUserAuthMapper, SysUs
     @Transactional
     public SysUserAuth get(String key) {
         SysUserAuth et = getById(key);
-        if(et == null){
-            et = new SysUserAuth();
-            et.setId(key);
+        if (et == null) {
+            throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), key);
         }
         else {
         }

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysUserRoleServiceImpl.java

@@ -110,9 +110,8 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUs
     @Transactional
     public SysUserRole get(String key) {
         SysUserRole et = getById(key);
-        if(et == null){
-            et = new SysUserRole();
-            et.setUserroleid(key);
+        if (et == null) {
+            throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), key);
         }
         else {
         }

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysUserServiceImpl.java

@@ -106,9 +106,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Transactional
     public SysUser get(String key) {
         SysUser et = getById(key);
-        if(et == null){
-            et = new SysUser();
-            et.setUserid(key);
+        if (et == null) {
+            throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), key);
         }
         else {
         }

ibzuaa-core/src/main/resources/liquibase/h2_table.xml

@@ -6,7 +6,7 @@
 
 
     <!--输出实体[SYS_AUTHLOG]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_authlog-6-1">
+    <changeSet author="root" id="tab-sys_authlog-6-1">
         <createTable tableName="IBZAUTHLOG">
                 <column name="LOGID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_AUTHLOG_LOGID"/>
@@ -32,7 +32,7 @@
 
 
     <!--输出实体[SYS_OPEN_ACCESS]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_open_access-37-2">
+    <changeSet author="root" id="tab-sys_open_access-37-2">
         <createTable tableName="IBZOPENACCESS">
                 <column name="ACCESSID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_OPEN_ACCESS_ACCESSID"/>
@@ -64,7 +64,7 @@
 
 
     <!--输出实体[SYS_PSSYSTEM]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_pssystem-1-3">
+    <changeSet author="root" id="tab-sys_pssystem-1-3">
         <createTable tableName="IBZPSSYSTEM">
                 <column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_PSSYSTEM_PSSYSTEMID"/>
@@ -84,7 +84,7 @@
 
 
     <!--输出实体[SYS_PERMISSION]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_permission-9-4">
+    <changeSet author="root" id="tab-sys_permission-9-4">
         <createTable tableName="IBZPERMISSION">
                 <column name="SYS_PERMISSIONID" remarks="" type="VARCHAR(200)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_PERMISSION_SYS_PERMISSI"/>
@@ -106,7 +106,7 @@
 
 
     <!--输出实体[SYS_ROLE]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_role-50-5">
+    <changeSet author="root" id="tab-sys_role-50-5">
         <createTable tableName="IBZROLE">
                 <column name="SYS_ROLEID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_ROLE_SYS_ROLEID"/>
@@ -130,7 +130,7 @@
 
 
     <!--输出实体[SYS_ROLE_PERMISSION]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_role_permission-25-6">
+    <changeSet author="root" id="tab-sys_role_permission-25-6">
         <createTable tableName="IBZROLE_PERMISSION">
                 <column name="SYS_ROLE_PERMISSIONID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_ROLE_PERMISSION_SYS_ROL"/>
@@ -150,7 +150,7 @@
 
 
     <!--输出实体[SYS_USER_AUTH]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_user_auth-25-7">
+    <changeSet author="root" id="tab-sys_user_auth-25-7">
         <createTable tableName="IBZUSERAUTH">
                 <column name="AUTHID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_USER_AUTH_AUTHID"/>
@@ -168,7 +168,7 @@
 
 
     <!--输出实体[SYS_USER_ROLE]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_user_role-15-8">
+    <changeSet author="root" id="tab-sys_user_role-15-8">
         <createTable tableName="IBZUSER_ROLE">
                 <column name="SYS_USER_ROLEID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_USER_ROLE_SYS_USER_ROLE"/>
@@ -189,13 +189,13 @@
         <!--输出实体[SYS_PSSYSTEM]外键关系 -->
         <!--输出实体[SYS_PERMISSION]外键关系 -->
         <!--输出实体[SYS_ROLE]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-sys_role-50-9">
+    <changeSet author="root" id="fk-sys_role-50-9">
        <addForeignKeyConstraint baseColumnNames="PROLEID" baseTableName="IBZROLE" constraintName="DER1N_SYS_ROLE_SYS_ROLE_PROLEI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SYS_ROLEID" referencedTableName="IBZROLE" validate="true"/>
     </changeSet>
         <!--输出实体[SYS_ROLE_PERMISSION]外键关系 -->
         <!--输出实体[SYS_USER_AUTH]外键关系 -->
         <!--输出实体[SYS_USER_ROLE]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-sys_user_role-15-10">
+    <changeSet author="root" id="fk-sys_user_role-15-10">
        <addForeignKeyConstraint baseColumnNames="SYS_ROLEID" baseTableName="IBZUSER_ROLE" constraintName="DER1N_SYS_USER_ROLE_SYS_ROLE_S" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SYS_ROLEID" referencedTableName="IBZROLE" validate="true"/>
     </changeSet>
 

ibzuaa-core/src/main/resources/mapper/uaa/sysauthlog/SysAuthLogMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
 <mapper	namespace="cn.ibizlab.core.uaa.mapper.SysAuthLogMapper">
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->

ibzuaa-core/src/main/resources/mapper/uaa/sysopenaccess/SysOpenAccessMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
 <mapper	namespace="cn.ibizlab.core.uaa.mapper.SysOpenAccessMapper">
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->

ibzuaa-core/src/main/resources/mapper/uaa/syspermission/SysPermissionMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
 <mapper	namespace="cn.ibizlab.core.uaa.mapper.SysPermissionMapper">
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->

ibzuaa-core/src/main/resources/mapper/uaa/sysrole/SysRoleMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
 <mapper	namespace="cn.ibizlab.core.uaa.mapper.SysRoleMapper">
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->

ibzuaa-core/src/main/resources/mapper/uaa/sysrolepermission/SysRolePermissionMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
 <mapper	namespace="cn.ibizlab.core.uaa.mapper.SysRolePermissionMapper">
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->

ibzuaa-core/src/main/resources/mapper/uaa/sysuser/SysUserMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
 <mapper	namespace="cn.ibizlab.core.uaa.mapper.SysUserMapper">
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->

ibzuaa-core/src/main/resources/mapper/uaa/sysuserauth/SysUserAuthMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
 <mapper	namespace="cn.ibizlab.core.uaa.mapper.SysUserAuthMapper">
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->

ibzuaa-core/src/main/resources/mapper/uaa/sysuserrole/SysUserRoleMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
 <mapper	namespace="cn.ibizlab.core.uaa.mapper.SysUserRoleMapper">
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/mapping/SysAppMapping.java

@@ -12,4 +12,3 @@ public interface SysAppMapping extends MappingBase<SysAppDTO, SysApp> {
 
 
 }
-

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/mapping/SysAuthLogMapping.java

@@ -12,4 +12,3 @@ public interface SysAuthLogMapping extends MappingBase<SysAuthLogDTO, SysAuthLog
 
 
 }
-

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/mapping/SysOpenAccessMapping.java

@@ -12,4 +12,3 @@ public interface SysOpenAccessMapping extends MappingBase<SysOpenAccessDTO, SysO
 
 
 }
-

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/mapping/SysPSSystemMapping.java

@@ -12,4 +12,3 @@ public interface SysPSSystemMapping extends MappingBase<SysPSSystemDTO, SysPSSys
 
 
 }
-

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/mapping/SysPermissionMapping.java

@@ -12,4 +12,3 @@ public interface SysPermissionMapping extends MappingBase<SysPermissionDTO, SysP
 
 
 }
-

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/mapping/SysRoleMapping.java

@@ -12,4 +12,3 @@ public interface SysRoleMapping extends MappingBase<SysRoleDTO, SysRole> {
 
 
 }
-

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/mapping/SysRolePermissionMapping.java

@@ -12,4 +12,3 @@ public interface SysRolePermissionMapping extends MappingBase<SysRolePermissionD
 
 
 }
-

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/mapping/SysUserAuthMapping.java

@@ -12,4 +12,3 @@ public interface SysUserAuthMapping extends MappingBase<SysUserAuthDTO, SysUserA
 
 
 }
-

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/mapping/SysUserMapping.java

@@ -12,4 +12,3 @@ public interface SysUserMapping extends MappingBase<SysUserDTO, SysUser> {
 
 
 }
-

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/mapping/SysUserRoleMapping.java

@@ -12,4 +12,3 @@ public interface SysUserRoleMapping extends MappingBase<SysUserRoleDTO, SysUserR
 
 
 }
-

ibzuaa-util/src/main/java/cn/ibizlab/util/client/IBZWFFeignClient.java

@@ -24,4 +24,5 @@ public interface IBZWFFeignClient
 	JSONObject wfstart(@PathVariable("system") String system, @PathVariable("appname") String appname,
 					   @PathVariable("entity") String entity,
 					   @PathVariable("businessKey") String businessKey, @RequestBody JSONObject instance);
+
 }

ibzuaa-util/src/main/java/cn/ibizlab/util/domain/DELogic.java

@@ -2,6 +2,7 @@ package cn.ibizlab.util.domain;
 
 import lombok.Data;
 import org.flowable.bpmn.model.Process;
+import org.springframework.core.io.Resource;
 import org.kie.api.runtime.KieContainer;
 import java.io.File;
 import java.io.Serializable;
@@ -14,6 +15,6 @@ public class DELogic implements Serializable {
     Process process;
     KieContainer container;
     List<DELogic> refLogic;
-    List<File> refRuleFiles;
+    List<Resource> refRuleFiles;
     String md5;
 }

ibzuaa-util/src/main/java/cn/ibizlab/util/filter/SearchContextBase.java

@@ -67,6 +67,7 @@ public class SearchContextBase implements ISearchContext{
      * 工作流流程标识
      */
     public String processDefinitionKey;
+
     /**
      * 获取工作流步骤标识
      */

ibzuaa-util/src/main/java/cn/ibizlab/util/security/AuthenticationUser.java

@@ -254,6 +254,7 @@ public class AuthenticationUser implements UserDetails
 		if(this.sessionParams==null)
 		{
 			sessionParams = getUserSessionParam();
+			sessionParams.put("srfdynainstid",this.getSrfdynainstid());
 			sessionParams.put("srfpersonid", this.getUserid());
 			sessionParams.put("srfpersonname", this.getPersonname());
 			sessionParams.put("srforgsectorid", this.getMdeptid());