tony001 部署微服务接口 [后台服务，接口示例]

config.xml

@@ -37,11 +37,11 @@
 	  git clone -b master $para2 demosys/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd demosys/
-      mvn clean package -Pweb
-      cd demo-app/demo-app-web
-      mvn -Pweb docker:build
-      mvn -Pweb docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/demo-app-web.yaml iBizDemo --with-registry-auth
+      mvn clean package -Pdemoapi
+      cd demo-provider/demo-provider-demoapi
+      mvn -Pdemoapi docker:build
+      mvn -Pdemoapi docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/demo-provider-demoapi.yaml iBizDemo --with-registry-auth      
       </command>
     </hudson.tasks.Shell>
   </builders>

demo-app/demo-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 /demo-app-web.jar
 
-EXPOSE 51001
+EXPOSE 8080
 
 ADD demo-app-web.jar /demo-app-web.jar

demo-app/demo-app-web/src/main/docker/demo-app-web.yaml

@@ -3,24 +3,9 @@ services:
   demo-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/demo-app-web:latest
     ports:
-      - "51001:51001"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-      - SERVER_PORT=51001
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
-      - SPRING_REDIS_HOST=172.16.240.110
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_df847bdfd
-      - SPRING_DATASOURCE_PASSWORD=3d6@460A
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_df847bdfd?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_df847bdfd
-      - NACOS=172.16.240.110:8848
-      - SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
-      - SEATA_ENABLED=true
     deploy:
       resources:
            limits:

demo-core/src/main/java/cn/ibizlab/core/sample/mapping/IBIZBOOKDataImport.java

@@ -8,12 +8,12 @@ import java.util.List;
 public interface IBIZBOOKDataImport {
     @Mappings({
         @Mapping(target = "ibizbookid", source = "ibizbookid"),
-        @Mapping(target = "createdate", source = "createdate"),
         @Mapping(target = "price", source = "price"),
-        @Mapping(target = "ibizbookname", source = "ibizbookname"),
+        @Mapping(target = "createdate", source = "createdate"),
         @Mapping(target = "booknumber", source = "booknumber"),
-        @Mapping(target = "updateman", source = "updateman"),
         @Mapping(target = "createman", source = "createman"),
+        @Mapping(target = "ibizbookname", source = "ibizbookname"),
+        @Mapping(target = "updateman", source = "updateman"),
         @Mapping(target = "updatedate", source = "updatedate"),
         @Mapping(target = "type", source = "type"),
         @Mapping(target = "press", source = "press"),

demo-core/src/main/resources/liquibase/h2_table.xml

@@ -1136,7 +1136,7 @@
 
 
     <!--输出实体[IBIZSAMPLE0021]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizsample0021-46-38">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizsample0021-52-38">
         <createTable tableName="T_IBIZSAMPLE0021">
                 <column name="IBIZSAMPLE0021ID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_IBIZSAMPLE0021_IBIZSAMPLE00"/>

demo-core/src/main/resources/workflow/ACTv1.bpmn

@@ -35,6 +35,9 @@
      </userTask>
      <userTask flowable:category="${businessKey}"  flowable:candidateUsers="${wfCoreService.getGroupUsers('DepartmentHeads|dept|CURDEPTID',execution)}" flowable:exclusive="true" id="tid-5-169c10a35ed0da0f748ed4176aab8351" name="部门经理审核" >
         <documentation>${majortext}</documentation>
+         <extensionElements>
+         <flowable:form process-form="Main2"/>
+         </extensionElements>
      </userTask>
      <userTask flowable:category="${businessKey}"  flowable:candidateUsers="${wfCoreService.getGroupUsers('FinancialManager|org|CURORGID',execution)}" flowable:exclusive="true" id="tid-10-cec5ba3ae05225e0f4b71f4fd4bc080b" name="财务经理审核" >
         <documentation>${majortext}</documentation>

demo-provider/demo-provider-demoapi/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 /demo-provider-demoapi.jar
 
-EXPOSE 8081
+EXPOSE 51000
 
 ADD demo-provider-demoapi.jar /demo-provider-demoapi.jar

demo-provider/demo-provider-demoapi/src/main/docker/demo-provider-demoapi.yaml

@@ -3,9 +3,24 @@ services:
   demo-provider-demoapi:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/demo-provider-demoapi:latest
     ports:
-      - "8081:8081"
+      - "51000:51000"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
+      - SERVER_PORT=51000
+      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
+      - SPRING_REDIS_HOST=172.16.240.110
+      - SPRING_REDIS_PORT=6379
+      - SPRING_REDIS_DATABASE=0
+      - SPRING_DATASOURCE_USERNAME=a_LAB01_df847bdfd
+      - SPRING_DATASOURCE_PASSWORD=3d6@460A
+      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_df847bdfd?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_df847bdfd
+      - NACOS=172.16.240.110:8848
+      - SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
+      - SEATA_ENABLED=true
     deploy:
       resources:
            limits: