Merge remote-tracking branch 'origin/master'

03773f28 · laizhilong · 64fca33d · 8f9d0218 · 03773f28 · 03773f28
--- a/config.xml
+++ b/config.xml
@@ -37,11 +37,6 @@
 	  git clone -b master $para2 ibzuaa/
      export NODE_OPTIONS=--max-old-space-size=4096
      cd ibzuaa/
-      mvn clean package -Pweb
-      cd ibzuaa-app/ibzuaa-app-web
-      mvn -Pweb docker:build
-      mvn -Pweb docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzuaa-app-web.yaml ibzlab-rt --with-registry-auth
      </command>
    </hudson.tasks.Shell>
  </builders>

--- a/ibzuaa-app/ibzuaa-app-web/src/main/docker/Dockerfile
+++ b/ibzuaa-app/ibzuaa-app-web/src/main/docker/Dockerfile
@@ -12,6 +12,6 @@ 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

-EXPOSE 30002
+EXPOSE 8080

 ADD ibzuaa-app-web.jar /ibzuaa-app-web.jar
--- a/ibzuaa-app/ibzuaa-app-web/src/main/docker/ibzuaa-app-web.yaml
+++ b/ibzuaa-app/ibzuaa-app-web/src/main/docker/ibzuaa-app-web.yaml
@@ -3,24 +3,9 @@ services:
  ibzuaa-app-web:
    image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-app-web:latest
    ports:
-      - "30002:30002"
+      - "8080:8080"
    networks:
      - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-      - SERVER_PORT=30002
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
-      - SPRING_REDIS_HOST=172.16.100.243
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
-      - SPRING_DATASOURCE_PASSWORD=@6dEfb3@
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
-      - ABC=1
-      - DEC=3
-      - NACOS=172.16.102.211:8848
    deploy:
      resources:
           limits:

--- a/ibzuaa-core/src/main/resources/liquibase/h2_table.xml
+++ b/ibzuaa-core/src/main/resources/liquibase/h2_table.xml
@@ -6,7 +6,7 @@


    <!--输出实体[SYS_AUTHLOG]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_authlog-40-1">
+    <changeSet author="a_A_5d9d78509" id="tab-sys_authlog-62-1">
        <createTable tableName="IBZAUTHLOG">
                <column name="LOGID" remarks="" type="VARCHAR(100)">
                    <constraints primaryKey="true" primaryKeyName="PK_SYS_AUTHLOG_LOGID"/>
@@ -60,7 +60,7 @@


    <!--输出实体[SYS_PSSYSTEM]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_pssystem-39-3">
+    <changeSet author="a_A_5d9d78509" id="tab-sys_pssystem-55-3">
        <createTable tableName="IBZPSSYSTEM">
                <column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
                    <constraints primaryKey="true" primaryKeyName="PK_SYS_PSSYSTEM_PSSYSTEMID"/>
@@ -80,7 +80,7 @@


    <!--输出实体[SYS_PERMISSION]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_permission-219-4">
+    <changeSet author="a_A_5d9d78509" id="tab-sys_permission-253-4">
        <createTable tableName="IBZPERMISSION">
                <column name="SYS_PERMISSIONID" remarks="" type="VARCHAR(200)">
                    <constraints primaryKey="true" primaryKeyName="PK_SYS_PERMISSION_SYS_PERMISSI"/>
@@ -102,7 +102,7 @@


    <!--输出实体[SYS_ROLE]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_role-119-5">
+    <changeSet author="a_A_5d9d78509" id="tab-sys_role-135-5">
        <createTable tableName="IBZROLE">
                <column name="SYS_ROLEID" remarks="" type="VARCHAR(100)">
                    <constraints primaryKey="true" primaryKeyName="PK_SYS_ROLE_SYS_ROLEID"/>
@@ -126,7 +126,7 @@


    <!--输出实体[SYS_ROLE_PERMISSION]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_role_permission-98-6">
+    <changeSet author="a_A_5d9d78509" id="tab-sys_role_permission-132-6">
        <createTable tableName="IBZROLE_PERMISSION">
                <column name="SYS_ROLE_PERMISSIONID" remarks="" type="VARCHAR(100)">
                    <constraints primaryKey="true" primaryKeyName="PK_SYS_ROLE_PERMISSION_SYS_ROL"/>
@@ -164,7 +164,7 @@


    <!--输出实体[SYS_USER_ROLE]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_user_role-72-8">
+    <changeSet author="a_A_5d9d78509" id="tab-sys_user_role-98-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"/>
@@ -185,16 +185,16 @@
        <!--输出实体[SYS_PSSYSTEM]外键关系 -->
        <!--输出实体[SYS_PERMISSION]外键关系 -->
        <!--输出实体[SYS_ROLE]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-sys_role-119-9">
+    <changeSet author="a_A_5d9d78509" id="fk-sys_role-135-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]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-sys_role_permission-98-10">
+    <changeSet author="a_A_5d9d78509" id="fk-sys_role_permission-132-10">
       <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>
        <!--输出实体[SYS_USER_AUTH]外键关系 -->
        <!--输出实体[SYS_USER_ROLE]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-sys_user_role-72-12">
+    <changeSet author="a_A_5d9d78509" id="fk-sys_user_role-98-12">
       <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>


--- a/ibzuaa-core/src/main/resources/mapper/uaa/sysopenaccess/SysOpenAccessMapper.xml
+++ b/ibzuaa-core/src/main/resources/mapper/uaa/sysopenaccess/SysOpenAccessMapper.xml
@@ -7,6 +7,12 @@
 	<select id="selectById"  resultMap="SysOpenAccessResultMap" databaseId="mysql">
        <![CDATA[select t1.* from (SELECT t1.`ACCESSID`, t1.`ACCESSNAME`, t1.`ACCESS_KEY`, t1.`ACCESS_TOKEN`, t1.`DISABLED`, t1.`EXPIRES_TIME`, t1.`OPEN_TYPE`, t1.`REDIRECT_URI`, t1.`REGION_ID`, t1.`SECRET_KEY` FROM `IBZOPENACCESS` t1  ) t1 where accessid=#{id}]]>
    </select>
+	<select id="selectById"  resultMap="SysOpenAccessResultMap" databaseId="oracle">
+        <![CDATA[select t1.* from (SELECT t1.ACCESSID, t1.ACCESSNAME, t1.ACCESS_KEY, t1.ACCESS_TOKEN, t1.DISABLED, t1.EXPIRES_TIME, t1.OPEN_TYPE, t1.REDIRECT_URI, t1.REGION_ID, t1.SECRET_KEY FROM IBZOPENACCESS t1  ) t1 where accessid=#{id}]]>
+    </select>
+	<select id="selectById"  resultMap="SysOpenAccessResultMap" databaseId="postgresql">
+        <![CDATA[select t1.* from (SELECT t1.ACCESSID, t1.ACCESSNAME, t1.ACCESS_KEY, t1.ACCESS_TOKEN, t1.DISABLED, t1.EXPIRES_TIME, t1.OPEN_TYPE, t1.REDIRECT_URI, t1.REGION_ID, t1.SECRET_KEY FROM IBZOPENACCESS t1  ) t1 where accessid=#{id}]]>
+    </select>

    <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
    <resultMap id="SysOpenAccessResultMap" type="cn.ibizlab.core.uaa.domain.SysOpenAccess" autoMapping="true">
@@ -38,10 +44,30 @@
 		<![CDATA[ SELECT t1.`ACCESSID`, t1.`ACCESSNAME`, t1.`ACCESS_KEY`, t1.`ACCESS_TOKEN`, t1.`DISABLED`, t1.`EXPIRES_TIME`, t1.`OPEN_TYPE`, t1.`REDIRECT_URI`, t1.`REGION_ID`, t1.`SECRET_KEY` FROM `IBZOPENACCESS` t1  
 			]]>
    </sql>
+    <!--数据查询[Default]-->
+    <sql id="Default" databaseId="oracle">
+		<![CDATA[ SELECT t1.ACCESSID, t1.ACCESSNAME, t1.ACCESS_KEY, t1.ACCESS_TOKEN, t1.DISABLED, t1.EXPIRES_TIME, t1.OPEN_TYPE, t1.REDIRECT_URI, t1.REGION_ID, t1.SECRET_KEY FROM IBZOPENACCESS t1  
+			]]>
+    </sql>
+    <!--数据查询[Default]-->
+    <sql id="Default" databaseId="postgresql">
+		<![CDATA[ SELECT t1.ACCESSID, t1.ACCESSNAME, t1.ACCESS_KEY, t1.ACCESS_TOKEN, t1.DISABLED, t1.EXPIRES_TIME, t1.OPEN_TYPE, t1.REDIRECT_URI, t1.REGION_ID, t1.SECRET_KEY FROM IBZOPENACCESS t1  
+			]]>
+    </sql>
    <!--数据查询[View]-->
    <sql id="View" databaseId="mysql">
 		<![CDATA[ SELECT t1.`ACCESSID`, t1.`ACCESSNAME`, t1.`ACCESS_KEY`, t1.`ACCESS_TOKEN`, t1.`DISABLED`, t1.`EXPIRES_TIME`, t1.`OPEN_TYPE`, t1.`REDIRECT_URI`, t1.`REGION_ID`, t1.`SECRET_KEY` FROM `IBZOPENACCESS` t1  
 			]]>
    </sql>
+    <!--数据查询[View]-->
+    <sql id="View" databaseId="oracle">
+		<![CDATA[ SELECT t1.ACCESSID, t1.ACCESSNAME, t1.ACCESS_KEY, t1.ACCESS_TOKEN, t1.DISABLED, t1.EXPIRES_TIME, t1.OPEN_TYPE, t1.REDIRECT_URI, t1.REGION_ID, t1.SECRET_KEY FROM IBZOPENACCESS t1  
+			]]>
+    </sql>
+    <!--数据查询[View]-->
+    <sql id="View" databaseId="postgresql">
+		<![CDATA[ SELECT t1.ACCESSID, t1.ACCESSNAME, t1.ACCESS_KEY, t1.ACCESS_TOKEN, t1.DISABLED, t1.EXPIRES_TIME, t1.OPEN_TYPE, t1.REDIRECT_URI, t1.REGION_ID, t1.SECRET_KEY FROM IBZOPENACCESS t1  
+			]]>
+    </sql>
 </mapper>