Merge remote-tracking branch 'origin/master'

config.xml

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

ibzou-core/src/main/resources/liquibase/changelog/20190625112530_init_ibizsys.xml

@@ -56,6 +56,7 @@
             <column name="FONTSIZE" type="VARCHAR2(10 BYTE)"/>
             <column name="LANG" type="VARCHAR2(100 BYTE)"/>
             <column name="MEMO" type="VARCHAR2(500 BYTE)"/>
+            <column name="SUPERUSER" type="INTEGER"/>
         </createTable>
     </changeSet>
     <changeSet author="Think (generated)" id="1561433044682-3">
@@ -65,6 +66,7 @@
             <column name="USERNAME" value="系统管理员"/>
             <column name="USERCODE" value="0100"/>
             <column name="LOGINNAME" value="ibzadmin"/>
+            <column name="SUPERUSER" value="1"/>
             <column name="PASSWORD" value="123456"/>
             <column name="DOMAINS" value="100000"/>
             <column name="MDEPTID"/>

ibzou-provider/ibzou-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 /ibzou-provider-api.jar
 
-EXPOSE 8081
+EXPOSE 40001
 
 ADD ibzou-provider-api.jar /ibzou-provider-api.jar

ibzou-provider/ibzou-provider-api/src/main/docker/ibzou-provider-api.yaml

@@ -3,9 +3,21 @@ services:
   ibzou-provider-api:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzou-provider-api:latest
     ports:
-      - "8081:8081"
+      - "40001:40001"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
+      - SERVER_PORT=40001
+      - 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

ibzou-util/src/main/java/cn/ibizlab/util/domain/IBZUSER.java

@@ -111,4 +111,6 @@ public class IBZUSER implements Serializable{
     @Size(min = 0, max = 500, message = "[备注]长度必须在[500]以内!")
     private String memo;
 
+    private int superuser;
+
 }
\ No newline at end of file