Merge remote-tracking branch 'origin/master'

config.xml

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

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

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

@@ -3,9 +3,22 @@ services:
   ibzlite-provider-api:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzlite-provider-api:latest
     ports:
-      - "8081:8081"
+      - "40010:40010"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
+      - SERVER_PORT=40010
+      - 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
+      - NACOS=172.16.102.211:8848
     deploy:
       resources:
            limits: