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

ibzuaa-app/ibzuaa-app-web/src/main/docker/Dockerfile

@@ -6,11 +6,9 @@ ENV TZ=Asia/Shanghai \
     IBIZ_SLEEP=0 \
     JAVA_OPTS=""
 
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-
 CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
-    java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzuaa-app-web.jar
+    java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /ibzuaa-app-web.jar
 
 EXPOSE 8080
 

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-8-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-24-7">
+    <changeSet author="root" id="tab-sys_user_auth-24-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/syspermission/SysPermissionMapper.xml

@@ -30,7 +30,8 @@
     </sql>
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="oracle">
-		<![CDATA[ 
+		<![CDATA[ SELECT t1.CREATEDATE, t1.ENABLE, t1.PERMISSIONTYPE, t1.PSSYSTEMID, t1.SYS_PERMISSIONID, t1.SYS_PERMISSIONNAME, t1.UPDATEDATE FROM IBZPERMISSION t1  
+					 WHERE 	t1.ENABLE = 1
 			]]>
     </sql>
     <!--数据查询[Default]-->

ibzuaa-provider/ibzuaa-provider-api/src/main/docker/Dockerfile

@@ -6,11 +6,9 @@ ENV TZ=Asia/Shanghai \
     IBIZ_SLEEP=0 \
     JAVA_OPTS=""
 
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-
 CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
-    java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzuaa-provider-api.jar
+    java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /ibzuaa-provider-api.jar
 
 EXPOSE 8081
 

ibzuaa-util/src/main/java/cn/ibizlab/util/aspect/DELogicAspect.java

@@ -78,12 +78,14 @@ public class DELogicAspect {
         EntityBase entity = null;
         if ("remove".equalsIgnoreCase(action) || "get".equalsIgnoreCase(action)) {
             entity = getEntity(service.getClass());
-            String id = DEFieldCacheMap.getDEKeyField(entity.getClass());
-            if(StringUtils.isEmpty(id)) {
-                log.debug("无法获取实体主键属性[{}]",entity.getClass().getSimpleName());
-                return point.proceed();
+            if(!ObjectUtils.isEmpty(entity)) {
+                String id = DEFieldCacheMap.getDEKeyField(entity.getClass());
+                if(StringUtils.isEmpty(id)) {
+                    log.debug("无法获取实体主键属性[{}]",entity.getClass().getSimpleName());
+                    return point.proceed();
+                }
+                entity.set(id, arg);
             }
-            entity.set(id, arg);
         } else if (arg instanceof EntityBase) {
             entity = (EntityBase) arg;
         }
@@ -187,7 +189,7 @@ public class DELogicAspect {
         KieBuilder kieBuilder = kieServices.newKieBuilder(kieFileSystem).buildAll();
         Results results = kieBuilder.getResults();
         if (results.hasMessages(Message.Level.ERROR)) {
-            throw new BadRequestAlertException(String.format("编译实体处理逻辑 [%s] 发生异常, %s", logic.getName(), results.getMessages()), "LogicAspect", "reloadLogic");
+            throw new BadRequestAlertException(String.format("编译实体处理逻辑 [%s] 发生异常, %s", logic.getName(), results.getMessages()), "DELogicAspect", "reloadLogic");
         }
         KieContainer kieContainer = kieServices.newKieContainer(kieServices.getRepository().getDefaultReleaseId());
         logic.setContainer(kieContainer);
@@ -290,6 +292,7 @@ public class DELogicAspect {
                 logic.setMd5(getMd5(refFiles));
             }
         } catch (Exception e) {
+            log.error("执行处理逻辑失败"+e);
         } finally {
             try {
                 if (reader != null) {
@@ -299,6 +302,7 @@ public class DELogicAspect {
                     bpmn.close();
                 }
             } catch (Exception e) {
+                log.error("执行处理逻辑失败"+e);
             }
         }
         return logic;
@@ -326,7 +330,8 @@ public class DELogicAspect {
         if(!ObjectUtils.isEmpty(service.getSuperclass()) && !service.getSuperclass().getName().equals(Object.class.getName())) {
             return getEntity(service.getSuperclass());
         }
-        throw new BadRequestAlertException("获取实体信息失败", "DELogicAspect", "getEntity");
+        log.error("获取实体信息失败，未能在[{}]中找到参数为实体类对象的行为，如create.update等",service.getSimpleName());
+        return null;
     }
 
     /**
@@ -347,6 +352,7 @@ public class DELogicAspect {
                         buffer.append(strBpmn);
                     }
                 } catch (Exception e) {
+                    log.error("处理逻辑版本检查失败"+e);
                 } finally {
                     if (bpmnFile != null) {
                         bpmnFile.close();
@@ -359,6 +365,7 @@ public class DELogicAspect {
                 return null;
             }
         } catch (Exception e) {
+            log.error("处理逻辑版本检查失败"+e);
             return null;
         }
     }
@@ -418,6 +425,7 @@ public class DELogicAspect {
                 FileUtils.copyToFile(in, bpmn);
             }
         } catch (IOException e) {
+            log.error("执行处理逻辑失败，无法获取逻辑文件"+e);
         } finally {
             if (in != null) {
                 try {