兼容da

2f4343fa · sq3536 · 6dda1515 · 2f4343fa · 2f4343fa · 2f4343fa
--- a/ibzuaa-core/src/main/resources/liquibase/changelog/20200528022858_changelog.xml
+++ b/ibzuaa-core/src/main/resources/liquibase/changelog/20200528022858_changelog.xml
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:pro="http://www.liquibase.org/xml/ns/pro" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/pro http://www.liquibase.org/xml/ns/pro/liquibase-pro-3.8.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.8.xsd">
-    <changeSet author="sq3536 (generated)" id="1590632951240-1">
-        <createTable tableName="IBZAUTHLOG">
-            <column name="LOGID" type="VARCHAR(100)">
-                <constraints nullable="false" primaryKey="true" primaryKeyName="PK_SYS_AUTHLOG_LOGID"/>
-            </column>
-            <column name="USERNAME" type="VARCHAR(100)"/>
-            <column name="PERSONNAME" type="VARCHAR(100)"/>
-            <column name="DOMAIN" type="VARCHAR(100)"/>
-            <column name="AUTHTIME" type="TIMESTAMP"/>
-            <column name="IPADDR" type="VARCHAR(100)"/>
-            <column name="MACADDR" type="VARCHAR(100)"/>
-            <column name="USERAGENT" type="VARCHAR(100)"/>
-            <column name="AUTHCODE" type="VARCHAR(15)"/>
-        </createTable>
-    </changeSet>
-    <changeSet author="sq3536 (generated)" id="1590632951240-2">
+<!--    <changeSet author="sq3536 (generated)" id="1590632951240-1">-->
+<!--        <createTable tableName="IBZAUTHLOG">-->
+<!--            <column name="LOGID" type="VARCHAR(100)">-->
+<!--                <constraints nullable="false" primaryKey="true" primaryKeyName="PK_SYS_AUTHLOG_LOGID"/>-->
+<!--            </column>-->
+<!--            <column name="USERNAME" type="VARCHAR(100)"/>-->
+<!--            <column name="PERSONNAME" type="VARCHAR(100)"/>-->
+<!--            <column name="DOMAIN" type="VARCHAR(100)"/>-->
+<!--            <column name="AUTHTIME" type="TIMESTAMP"/>-->
+<!--            <column name="IPADDR" type="VARCHAR(100)"/>-->
+<!--            <column name="MACADDR" type="VARCHAR(100)"/>-->
+<!--            <column name="USERAGENT" type="VARCHAR(100)"/>-->
+<!--            <column name="AUTHCODE" type="VARCHAR(15)"/>-->
+<!--        </createTable>-->
+<!--    </changeSet>-->
+    <changeSet author="sq3536 (generated)" id="1590632951241-4">
+        <preConditions onFail="MARK_RAN"  >
+            <not>
+                <tableExists tableName="IBZPERMISSION" />
+            </not>
+        </preConditions>
        <createTable tableName="IBZPERMISSION">
            <column name="SYS_PERMISSIONID" type="VARCHAR(200)">
                <constraints nullable="false" primaryKey="true" primaryKeyName="PK_SYS_PERMISSION_SYS_PERMISSI"/>
@@ -27,8 +32,7 @@
            <column name="CREATEDATE" type="TIMESTAMP"/>
            <column name="UPDATEDATE" type="TIMESTAMP"/>
        </createTable>
-    </changeSet>
-    <changeSet author="sq3536 (generated)" id="1590632951240-3">
+
        <createTable tableName="IBZPSSYSTEM">
            <column name="PSSYSTEMID" type="VARCHAR(100)">
                <constraints nullable="false" primaryKey="true" primaryKeyName="PK_SYS_PSSYSTEM_PSSYSTEMID"/>
@@ -36,8 +40,7 @@
            <column name="PSSYSTEMNAME" type="VARCHAR(100)"/>
            <column name="SYSSTRUCTURE" type="CLOB"/>
        </createTable>
-    </changeSet>
-    <changeSet author="sq3536 (generated)" id="1590632951240-4">
+
        <createTable tableName="IBZROLE">
            <column name="SYS_ROLEID" type="VARCHAR(100)">
                <constraints nullable="false" primaryKey="true" primaryKeyName="PK_SYS_ROLE_SYS_ROLEID"/>
@@ -47,8 +50,7 @@
            <column name="CREATEDATE" type="TIMESTAMP"/>
            <column name="UPDATEDATE" type="TIMESTAMP"/>
        </createTable>
-    </changeSet>
-    <changeSet author="sq3536 (generated)" id="1590632951240-5">
+
        <createTable tableName="IBZROLE_PERMISSION">
            <column name="SYS_ROLE_PERMISSIONID" type="VARCHAR(100)">
                <constraints nullable="false" primaryKey="true" primaryKeyName="PK_SYS_ROLE_PERMISSION_SYS_ROL"/>
@@ -58,8 +60,7 @@
            <column name="CREATEDATE" type="TIMESTAMP"/>
            <column name="UPDATEDATE" type="TIMESTAMP"/>
        </createTable>
-    </changeSet>
-    <changeSet author="sq3536 (generated)" id="1590632951240-6">
+
        <createTable tableName="IBZUSER_ROLE">
            <column name="SYS_USER_ROLEID" type="VARCHAR(100)">
                <constraints nullable="false" primaryKey="true" primaryKeyName="PK_SYS_USER_ROLE_SYS_USER_ROLE"/>
@@ -69,11 +70,9 @@
            <column name="CREATEDATE" type="TIMESTAMP"/>
            <column name="UPDATEDATE" type="TIMESTAMP"/>
        </createTable>
-    </changeSet>
-    <changeSet author="sq3536 (generated)" id="1590632951240-7">
+
        <addForeignKeyConstraint baseColumnNames="SYS_PERMISSIONID" baseTableName="IBZROLE_PERMISSION" constraintName="DER1N_SYS_ROLE_PERMISSION_SYS_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SYS_PERMISSIONID" referencedTableName="IBZPERMISSION" validate="true"/>
-    </changeSet>
-    <changeSet author="sq3536 (generated)" id="1590632951240-8">
+
        <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>
 </databaseChangeLog>
--- a/ibzuaa-core/src/main/resources/liquibase/changelog/20200528022859_changelog.xml
+++ b/ibzuaa-core/src/main/resources/liquibase/changelog/20200528022859_changelog.xml
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:pro="http://www.liquibase.org/xml/ns/pro" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/pro http://www.liquibase.org/xml/ns/pro/liquibase-pro-3.8.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.8.xsd">
+    <changeSet author="sq3536 (generated)" id="1590632951241-1">
+        <preConditions onFail="MARK_RAN"  >
+            <not>
+                <tableExists tableName="IBZAUTHLOG" />
+            </not>
+        </preConditions>
+        <createTable tableName="IBZAUTHLOG">
+            <column name="LOGID" type="VARCHAR(100)">
+                <constraints nullable="false" primaryKey="true" primaryKeyName="PK_SYS_AUTHLOG_LOGID"/>
+            </column>
+            <column name="USERNAME" type="VARCHAR(100)"/>
+            <column name="PERSONNAME" type="VARCHAR(100)"/>
+            <column name="AUTHTIME" type="TIMESTAMP"/>
+            <column name="IPADDR" type="VARCHAR(100)"/>
+            <column name="MACADDR" type="VARCHAR(100)"/>
+            <column name="USERAGENT" type="VARCHAR(100)"/>
+            <column name="AUTHCODE" type="VARCHAR(15)"/>
+        </createTable>
+    </changeSet>
+
+    <changeSet author="mac (generated)" id="1590632951241-2">
+        <preConditions onFail="MARK_RAN"  >
+            <not >
+                <columnExists tableName="IBZAUTHLOG" columnName="DOMAINS" />
+            </not>
+        </preConditions>
+        <addColumn tableName="IBZAUTHLOG">
+            <column name="DOMAINS" type="VARCHAR(100 BYTE)"/>
+        </addColumn>
+    </changeSet>
+
+</databaseChangeLog>
--- a/ibzuaa-core/src/main/resources/liquibase/changelog/20201224104515_changelog.xml
+++ b/ibzuaa-core/src/main/resources/liquibase/changelog/20201224104515_changelog.xml
 <?xml version="1.1" encoding="UTF-8" standalone="no"?>
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:pro="http://www.liquibase.org/xml/ns/pro" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/pro http://www.liquibase.org/xml/ns/pro/liquibase-pro-3.9.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.9.xsd">
-    <changeSet author="mac (generated)" id="1608806718748-1">
-        <preConditions onFail="MARK_RAN"  >
-            <not>
-                <indexExists tableName="IBZUSER_ROLE" columnNames="SYS_USERID" />
-            </not>
-        </preConditions>
-        <createIndex tableName="IBZUSER_ROLE" indexName="IDX_SYSUSER_ROLE_USERID">
-            <column name="SYS_USERID"></column>
-        </createIndex>
-    </changeSet>
-    <changeSet author="mac (generated)" id="1608806718749-1">
-        <preConditions onFail="MARK_RAN"  >
-            <not>
-                <indexExists tableName="IBZROLE_PERMISSION" columnNames="SYS_ROLEID" />
-            </not>
-        </preConditions>
-        <createIndex tableName="IBZROLE_PERMISSION" indexName="IDX_SYSROLE_PERM_ROLEID">
-            <column name="SYS_ROLEID"></column>
-        </createIndex>
-    </changeSet>
+<!--    <changeSet author="mac (generated)" id="1608806718748-1">-->
+<!--        <preConditions onFail="MARK_RAN"  >-->
+<!--            <not>-->
+<!--                <indexExists tableName="IBZUSER_ROLE" columnNames="SYS_USERID" />-->
+<!--            </not>-->
+<!--        </preConditions>-->
+<!--        <createIndex tableName="IBZUSER_ROLE" indexName="IDX_SYSUSER_ROLE_USERID">-->
+<!--            <column name="SYS_USERID"></column>-->
+<!--        </createIndex>-->
+<!--    </changeSet>-->
+<!--    <changeSet author="mac (generated)" id="1608806718749-1">-->
+<!--        <preConditions onFail="MARK_RAN"  >-->
+<!--            <not>-->
+<!--                <indexExists tableName="IBZROLE_PERMISSION" columnNames="SYS_ROLEID" />-->
+<!--            </not>-->
+<!--        </preConditions>-->
+<!--        <createIndex tableName="IBZROLE_PERMISSION" indexName="IDX_SYSROLE_PERM_ROLEID">-->
+<!--            <column name="SYS_ROLEID"></column>-->
+<!--        </createIndex>-->
+<!--    </changeSet>-->
 </databaseChangeLog>