Merge remote-tracking branch 'origin/master'

91358439 · sq3536 · b927c898 · f0bf1684 · 91358439 · 91358439
--- a/config.xml
+++ b/config.xml
@@ -37,6 +37,11 @@
 	  git clone -b master $para2 ibzwf/
      export NODE_OPTIONS=--max-old-space-size=4096
      cd ibzwf/
+      mvn clean package -Papi
+      cd ibzwf-provider/ibzwf-provider-api
+      mvn -Papi docker:build
+      mvn -Papi docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzwf-provider-api.yaml ibzlab-rt --with-registry-auth      
      </command>
    </hudson.tasks.Shell>
  </builders>

--- a/ibzwf-core/src/main/resources/liquibase/changelog/20190625112530_init_ibizsys.xml
+++ b/ibzwf-core/src/main/resources/liquibase/changelog/20190625112530_init_ibizsys.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: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/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+    <changeSet author="Think (generated)" id="1561433044682-1">
+        <createTable remarks="文件" tableName="IBZFILE">
+            <column name="FILEID" type="VARCHAR2(100 BYTE)">
+                <constraints primaryKey="true" primaryKeyName="SYS_C00168533"/>
+            </column>
+            <column name="FILENAME" type="VARCHAR2(200 BYTE)"/>
+            <column name="FILEPATH" type="VARCHAR2(500 BYTE)"/>
+            <column name="FOLDER" type="VARCHAR2(20 BYTE)"/>
+            <column name="CREATEMAN" type="VARCHAR2(60 BYTE)"/>
+            <column name="CREATEDATE" type="date"/>
+            <column name="UPDATEMAN" type="VARCHAR2(60 BYTE)"/>
+            <column name="UPDATEDATE" type="date"/>
+            <column name="FILEEXT" type="VARCHAR2(10 BYTE)"/>
+            <column name="FILESIZE" type="INTEGER"/>
+            <column name="DIGESTCODE" type="VARCHAR2(64 BYTE)"/>
+            <column name="OWNERTYPE" type="VARCHAR2(100 BYTE)"/>
+            <column name="OWNERID" type="VARCHAR2(100 BYTE)"/>
+            <column name="MEMO" type="VARCHAR2(500 BYTE)"/>
+            <column name="RESERVER" type="VARCHAR2(100 BYTE)"/>
+        </createTable>
+    </changeSet>
+    <changeSet author="Think (generated)" id="1561433044682-2">
+        <createTable remarks="用户" tableName="IBZUSER">
+            <column name="USERID" type="VARCHAR2(100 BYTE)">
+                <constraints primaryKey="true" primaryKeyName="SYS_C00168531"/>
+            </column>
+            <column name="PERSONNAME" type="VARCHAR2(200 BYTE)"/>
+            <column name="USERNAME" type="VARCHAR2(200 BYTE)"/>
+            <column name="USERCODE" type="VARCHAR2(100 BYTE)"/>
+            <column name="LOGINNAME" type="VARCHAR2(100 BYTE)"/>
+            <column name="PASSWORD" type="VARCHAR2(100 BYTE)"/>
+            <column name="DOMAINS" type="VARCHAR2(100 BYTE)"/>
+            <column name="MDEPTID" type="VARCHAR2(100 BYTE)"/>
+            <column name="MDEPTCODE" type="VARCHAR2(100 BYTE)"/>
+            <column name="MDEPTNAME" type="VARCHAR2(200 BYTE)"/>
+            <column name="BCODE" type="VARCHAR2(100 BYTE)"/>
+            <column name="POSTID" type="VARCHAR2(100 BYTE)"/>
+            <column name="POSTCODE" type="VARCHAR2(100 BYTE)"/>
+            <column name="POSTNAME" type="VARCHAR2(200 BYTE)"/>
+            <column name="ORGID" type="VARCHAR2(100 BYTE)"/>
+            <column name="ORGCODE" type="VARCHAR2(100 BYTE)"/>
+            <column name="ORGNAME" type="VARCHAR2(200 BYTE)"/>
+            <column name="NICKNAME" type="VARCHAR2(36 BYTE)"/>
+            <column name="EMAIL" type="VARCHAR2(100 BYTE)"/>
+            <column name="AVATAR" type="VARCHAR2(100 BYTE)"/>
+            <column name="PHONE" type="VARCHAR2(100 BYTE)"/>
+            <column name="RESERVER" type="VARCHAR2(100 BYTE)"/>
+            <column name="USERICON" type="VARCHAR2(100 BYTE)"/>
+            <column name="SEX" type="VARCHAR2(10 BYTE)"/>
+            <column name="BIRTHDAY" type="date"/>
+            <column name="CERTCODE" type="VARCHAR2(36 BYTE)"/>
+            <column name="ADDR" type="VARCHAR2(200 BYTE)"/>
+            <column name="THEME" type="VARCHAR2(100 BYTE)"/>
+            <column name="FONTSIZE" type="VARCHAR2(10 BYTE)"/>
+            <column name="LANG" type="VARCHAR2(100 BYTE)"/>
+            <column name="MEMO" type="VARCHAR2(500 BYTE)"/>
+        </createTable>
+    </changeSet>
+    <changeSet author="Think (generated)" id="1561433044682-3">
+        <insert tableName="IBZUSER">
+            <column name="USERID" value="0100"/>
+            <column name="PERSONNAME" value="管理员"/>
+            <column name="USERNAME" value="系统管理员"/>
+            <column name="USERCODE" value="0100"/>
+            <column name="LOGINNAME" value="ibzadmin"/>
+            <column name="PASSWORD" value="123456"/>
+            <column name="DOMAINS" value="100000"/>
+            <column name="MDEPTID"/>
+            <column name="MDEPTCODE"/>
+            <column name="MDEPTNAME"/>
+            <column name="BCODE"/>
+            <column name="POSTID"/>
+            <column name="POSTCODE"/>
+            <column name="POSTNAME"/>
+            <column name="ORGID"/>
+            <column name="ORGCODE"/>
+            <column name="ORGNAME"/>
+            <column name="NICKNAME"/>
+            <column name="EMAIL"/>
+            <column name="AVATAR"/>
+            <column name="PHONE"/>
+            <column name="RESERVER"/>
+            <column name="USERICON"/>
+            <column name="SEX"/>
+            <column name="BIRTHDAY"/>
+            <column name="CERTCODE"/>
+            <column name="ADDR"/>
+            <column name="THEME"/>
+            <column name="FONTSIZE"/>
+            <column name="LANG"/>
+            <column name="MEMO"/>
+        </insert>
+    </changeSet>
+</databaseChangeLog>
--- a/ibzwf-provider/ibzwf-provider-api/src/main/docker/Dockerfile
+++ b/ibzwf-provider/ibzwf-provider-api/src/main/docker/Dockerfile
@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
    sleep ${IBZ_SLEEP} && \
    java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzwf-provider-api.jar

-EXPOSE 8081
+EXPOSE 40003

 ADD ibzwf-provider-api.jar /ibzwf-provider-api.jar
--- a/ibzwf-provider/ibzwf-provider-api/src/main/docker/ibzwf-provider-api.yaml
+++ b/ibzwf-provider/ibzwf-provider-api/src/main/docker/ibzwf-provider-api.yaml
@@ -3,9 +3,21 @@ services:
  ibzwf-provider-api:
    image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzwf-provider-api:latest
    ports:
-      - "8081:8081"
+      - "40003:40003"
    networks:
      - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
+      - SERVER_PORT=40003
+      - 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
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
    deploy:
      mode: replicated
      replicas: 1