ibiz4j 发布系统代码 [ibiz-rt，ibizlab-runtime]

app_Web/src/pages/notify/msg-user-account-grid-view/msg-user-account-grid-view-base.vue

@@ -1263,16 +1263,28 @@ export default class MsgUserAccountGridViewBase extends Vue {
         const deResParameters: any[] = [];
         const parameters: any[] = [
             { pathName: 'msguseraccounts', parameterName: 'msguseraccount' },
-            { pathName: 'editview', parameterName: 'editview' },
         ];
         const _this: any = this;
-        const openIndexViewTab = (data: any) => {
-            const _data: any = { w: (new Date().getTime()) };
-            Object.assign(_data, data);
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
-            this.$router.push(routePath);
+        const openDrawer = (view: any, data: any) => {
+            let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
+            container.subscribe((result: any) => {
+                if (!result || !Object.is(result.ret, 'OK')) {
+                    return;
+                }
+                if (!xData || !(xData.refresh instanceof Function)) {
+                    return;
+                }
+                xData.refresh(result.datas);
+            });
         }
-        openIndexViewTab(data);
+        const view: any = {
+            viewname: 'msg-user-account-edit-view', 
+            height: 0, 
+            width: 0,  
+            title: this.$t('entities.msguseraccount.views.editview.title'),
+            placement: 'DRAWER_RIGHT',
+        };
+        openDrawer(view, data);
     }
 
 
@@ -1304,17 +1316,31 @@ export default class MsgUserAccountGridViewBase extends Vue {
         const deResParameters: any[] = [];
         const parameters: any[] = [
             { pathName: 'msguseraccounts', parameterName: 'msguseraccount' },
-            { pathName: 'editview', parameterName: 'editview' },
         ];
         const _this: any = this;
         if(fullargs && fullargs.copymode){
             Object.assign(data,{copymode:true});
         }
-        const openIndexViewTab = (data: any) => {
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
-            this.$router.push(routePath);
+        const openDrawer = (view: any, data: any) => {
+            let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
+            container.subscribe((result: any) => {
+                if (!result || !Object.is(result.ret, 'OK')) {
+                    return;
+                }
+                if (!xData || !(xData.refresh instanceof Function)) {
+                    return;
+                }
+                xData.refresh(result.datas);
+            });
         }
-        openIndexViewTab(data);
+        const view: any = {
+            viewname: 'msg-user-account-edit-view', 
+            height: 0, 
+            width: 0,  
+            title: this.$t('entities.msguseraccount.views.editview.title'),
+            placement: 'DRAWER_RIGHT',
+        };
+        openDrawer(view, data);
     }
 
 

app_Web/src/pages/pay/pay-open-access-grid-view/pay-open-access-grid-view-base.vue

@@ -1263,16 +1263,28 @@ export default class PayOpenAccessGridViewBase extends Vue {
         const deResParameters: any[] = [];
         const parameters: any[] = [
             { pathName: 'payopenaccesses', parameterName: 'payopenaccess' },
-            { pathName: 'editview', parameterName: 'editview' },
         ];
         const _this: any = this;
-        const openIndexViewTab = (data: any) => {
-            const _data: any = { w: (new Date().getTime()) };
-            Object.assign(_data, data);
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
-            this.$router.push(routePath);
+        const openDrawer = (view: any, data: any) => {
+            let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
+            container.subscribe((result: any) => {
+                if (!result || !Object.is(result.ret, 'OK')) {
+                    return;
+                }
+                if (!xData || !(xData.refresh instanceof Function)) {
+                    return;
+                }
+                xData.refresh(result.datas);
+            });
         }
-        openIndexViewTab(data);
+        const view: any = {
+            viewname: 'pay-open-access-edit-view', 
+            height: 0, 
+            width: 0,  
+            title: this.$t('entities.payopenaccess.views.editview.title'),
+            placement: 'DRAWER_RIGHT',
+        };
+        openDrawer(view, data);
     }
 
 
@@ -1304,17 +1316,31 @@ export default class PayOpenAccessGridViewBase extends Vue {
         const deResParameters: any[] = [];
         const parameters: any[] = [
             { pathName: 'payopenaccesses', parameterName: 'payopenaccess' },
-            { pathName: 'editview', parameterName: 'editview' },
         ];
         const _this: any = this;
         if(fullargs && fullargs.copymode){
             Object.assign(data,{copymode:true});
         }
-        const openIndexViewTab = (data: any) => {
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
-            this.$router.push(routePath);
+        const openDrawer = (view: any, data: any) => {
+            let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
+            container.subscribe((result: any) => {
+                if (!result || !Object.is(result.ret, 'OK')) {
+                    return;
+                }
+                if (!xData || !(xData.refresh instanceof Function)) {
+                    return;
+                }
+                xData.refresh(result.datas);
+            });
         }
-        openIndexViewTab(data);
+        const view: any = {
+            viewname: 'pay-open-access-edit-view', 
+            height: 0, 
+            width: 0,  
+            title: this.$t('entities.payopenaccess.views.editview.title'),
+            placement: 'DRAWER_RIGHT',
+        };
+        openDrawer(view, data);
     }
 
 

app_Web/src/pages/pay/pay-trade-grid-view/pay-trade-grid-view-base.vue

@@ -1263,16 +1263,28 @@ export default class PayTradeGridViewBase extends Vue {
         const deResParameters: any[] = [];
         const parameters: any[] = [
             { pathName: 'paytrades', parameterName: 'paytrade' },
-            { pathName: 'editview', parameterName: 'editview' },
         ];
         const _this: any = this;
-        const openIndexViewTab = (data: any) => {
-            const _data: any = { w: (new Date().getTime()) };
-            Object.assign(_data, data);
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
-            this.$router.push(routePath);
+        const openDrawer = (view: any, data: any) => {
+            let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
+            container.subscribe((result: any) => {
+                if (!result || !Object.is(result.ret, 'OK')) {
+                    return;
+                }
+                if (!xData || !(xData.refresh instanceof Function)) {
+                    return;
+                }
+                xData.refresh(result.datas);
+            });
         }
-        openIndexViewTab(data);
+        const view: any = {
+            viewname: 'pay-trade-edit-view', 
+            height: 0, 
+            width: 0,  
+            title: this.$t('entities.paytrade.views.editview.title'),
+            placement: 'DRAWER_RIGHT',
+        };
+        openDrawer(view, data);
     }
 
 
@@ -1304,17 +1316,31 @@ export default class PayTradeGridViewBase extends Vue {
         const deResParameters: any[] = [];
         const parameters: any[] = [
             { pathName: 'paytrades', parameterName: 'paytrade' },
-            { pathName: 'editview', parameterName: 'editview' },
         ];
         const _this: any = this;
         if(fullargs && fullargs.copymode){
             Object.assign(data,{copymode:true});
         }
-        const openIndexViewTab = (data: any) => {
-            const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
-            this.$router.push(routePath);
+        const openDrawer = (view: any, data: any) => {
+            let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
+            container.subscribe((result: any) => {
+                if (!result || !Object.is(result.ret, 'OK')) {
+                    return;
+                }
+                if (!xData || !(xData.refresh instanceof Function)) {
+                    return;
+                }
+                xData.refresh(result.datas);
+            });
         }
-        openIndexViewTab(data);
+        const view: any = {
+            viewname: 'pay-trade-edit-view', 
+            height: 0, 
+            width: 0,  
+            title: this.$t('entities.paytrade.views.editview.title'),
+            placement: 'DRAWER_RIGHT',
+        };
+        openDrawer(view, data);
     }
 
 

config.xml

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

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

ibzrt-app/ibzrt-app-web/src/main/docker/ibzrt-app-web-k8s.yaml

@@ -22,34 +22,7 @@ spec:
         image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzrt-app-web:latest
         imagePullPolicy: Always
         ports:
-        - containerPort: 30000
-        env:
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_IP
-          value: "172.16.180.237"      
-        - name: SERVER_PORT
-          value: "30000"
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR
-          value: "172.16.100.243:8848"
-        - name: SPRING_REDIS_HOST
-          value: "172.16.100.243"
-        - name: SPRING_REDIS_PORT
-          value: "6379"
-        - name: SPRING_REDIS_DATABASE
-          value: "0"
-        - name: SPRING_DATASOURCE_USERNAME
-          value: "a_A_5d9d78509"
-        - name: SPRING_DATASOURCE_PASSWORD
-          value: "@6dEfb3@"
-        - name: SPRING_DATASOURCE_URL
-          value: "jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true"
-        - name: SPRING_DATASOURCE_DRIVER-CLASS-NAME
-          value: "com.mysql.jdbc.Driver"
-        - name: SPRING_DATASOURCE_DEFAULTSCHEMA
-          value: "a_A_5d9d78509"
-        - name: NACOS
-          value: "172.16.100.243:8848"      
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_GROUP
-          value: "ibizdev"      
+        - containerPort: 8080
         volumeMounts:
         - name: data
           mountPath: /app/file
@@ -69,9 +42,9 @@ spec:
   type: NodePort
   ports:
   - name: http
-    port: 30000
-    targetPort: 30000
-    nodePort: 30000
+    port: 8080
+    targetPort: 8080
+    nodePort: 8080
     protocol: TCP
   selector:
     app: ibzrt-app-web

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

@@ -3,23 +3,9 @@ services:
   ibzrt-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzrt-app-web:latest
     ports:
-      - "30000:30000"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-      - SERVER_PORT=30000
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.100.243: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.100.243:8848
-      - SPRING_CLOUD_NACOS_DISCOVERY_GROUP=ibizdev
     deploy:
       resources:
            limits: