ibiz4j 部署微服务应用

app_web/src/widgets/jobs-info/default-searchform/default-searchform-service.ts

@@ -281,10 +281,6 @@ export default class DefaultService extends ControlService {
     @Errorlog
     public loadDraft(action: string,context: any = {}, data: any = {}, isloading?: boolean): Promise<any> {
         const {data:Data,context:Context} = this.handleRequestData(action,context,data);
-        //仿真主键数据
-        const PrimaryKey = Util.createUUID();
-        Data.id = PrimaryKey;
-        Data.jobsinfo = PrimaryKey;
         return new Promise((resolve: any, reject: any) => {
             let result: Promise<any>;
             const _appEntityService: any = this.appEntityService;
@@ -294,7 +290,6 @@ export default class DefaultService extends ControlService {
                 result = this.appEntityService.GetDraft(Context,Data, isloading);
             }
             result.then((response) => {
-                response.data.id = PrimaryKey;
                 this.handleResponse(action, response, true);
                 resolve(response);
             }).catch(response => {

app_web/src/widgets/jobs-log/default-searchform/default-searchform-service.ts

@@ -281,10 +281,6 @@ export default class DefaultService extends ControlService {
     @Errorlog
     public loadDraft(action: string,context: any = {}, data: any = {}, isloading?: boolean): Promise<any> {
         const {data:Data,context:Context} = this.handleRequestData(action,context,data);
-        //仿真主键数据
-        const PrimaryKey = Util.createUUID();
-        Data.id = PrimaryKey;
-        Data.jobslog = PrimaryKey;
         return new Promise((resolve: any, reject: any) => {
             let result: Promise<any>;
             const _appEntityService: any = this.appEntityService;
@@ -294,7 +290,6 @@ export default class DefaultService extends ControlService {
                 result = this.appEntityService.GetDraft(Context,Data, isloading);
             }
             result.then((response) => {
-                response.data.id = PrimaryKey;
                 this.handleResponse(action, response, true);
                 resolve(response);
             }).catch(response => {

app_web/src/widgets/jobs-registry/default-searchform/default-searchform-service.ts

@@ -281,10 +281,6 @@ export default class DefaultService extends ControlService {
     @Errorlog
     public loadDraft(action: string,context: any = {}, data: any = {}, isloading?: boolean): Promise<any> {
         const {data:Data,context:Context} = this.handleRequestData(action,context,data);
-        //仿真主键数据
-        const PrimaryKey = Util.createUUID();
-        Data.id = PrimaryKey;
-        Data.jobsregistry = PrimaryKey;
         return new Promise((resolve: any, reject: any) => {
             let result: Promise<any>;
             const _appEntityService: any = this.appEntityService;
@@ -294,7 +290,6 @@ export default class DefaultService extends ControlService {
                 result = this.appEntityService.GetDraft(Context,Data, isloading);
             }
             result.then((response) => {
-                response.data.id = PrimaryKey;
                 this.handleResponse(action, response, true);
                 resolve(response);
             }).catch(response => {

config.xml

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

ibztask-app/ibztask-app-web/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibztask-app-web.jar
 
-EXPOSE 8080
+EXPOSE 30005
 
 ADD ibztask-app-web.jar /ibztask-app-web.jar

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

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

ibztask-provider/ibztask-provider-api/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibztask-provider-api.jar
 
-EXPOSE 40005
+EXPOSE 8081
 
 ADD ibztask-provider-api.jar /ibztask-provider-api.jar

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

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