zhouweidong 部署微服务应用 [ibz-dst，应用]

app_web/src/engine/view/grid-view8-engine.ts

@@ -9,14 +9,6 @@ import GridViewEngine from './grid-view-engine';
  */
 export default class GridView8Engine extends GridViewEngine {
 
-    /**
-     * 表格部件
-     *
-     * @type {*}
-     * @memberof GridView8Engine
-     */
-    protected grid: any;
-
     /**
      * 表格部件
      *

app_web/src/locale/lanres/entities/meta-model/meta-model_BO_CN_base.ts

@@ -104,14 +104,14 @@ function getLocaleResourceBase(){
 			},
 		},
 		gridviewtoolbar_toolbar: {
-			tbitem1_export: {
-				caption: commonLogic.appcommonhandle("模型导出",null),
-				tip: commonLogic.appcommonhandle("模型导出",null),
-			},
 			tbitem1_import: {
 				caption: commonLogic.appcommonhandle("模型导入",null),
 				tip: commonLogic.appcommonhandle("模型导入",null),
 			},
+			tbitem1_export: {
+				caption: commonLogic.appcommonhandle("模型导出",null),
+				tip: commonLogic.appcommonhandle("模型导出",null),
+			},
 			tbitem2: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),

app_web/src/locale/lanres/entities/meta-model/meta-model_en_US_base.ts

@@ -104,14 +104,14 @@ function getLocaleResourceBase(){
 			},
 		},
 		gridviewtoolbar_toolbar: {
-			tbitem1_export: {
-				caption: commonLogic.appcommonhandle("模型导出",null),
-				tip: commonLogic.appcommonhandle("模型导出",null),
-			},
 			tbitem1_import: {
 				caption: commonLogic.appcommonhandle("模型导入",null),
 				tip: commonLogic.appcommonhandle("模型导入",null),
 			},
+			tbitem1_export: {
+				caption: commonLogic.appcommonhandle("模型导出",null),
+				tip: commonLogic.appcommonhandle("模型导出",null),
+			},
 			tbitem2: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),

app_web/src/locale/lanres/entities/meta-model/meta-model_zh_CN_base.ts

@@ -104,14 +104,14 @@ function getLocaleResourceBase(){
 			},
 		},
 		gridviewtoolbar_toolbar: {
-			tbitem1_export: {
-				caption: commonLogic.appcommonhandle("模型导出",null),
-				tip: commonLogic.appcommonhandle("模型导出",null),
-			},
 			tbitem1_import: {
 				caption: commonLogic.appcommonhandle("模型导入",null),
 				tip: commonLogic.appcommonhandle("模型导入",null),
 			},
+			tbitem1_export: {
+				caption: commonLogic.appcommonhandle("模型导出",null),
+				tip: commonLogic.appcommonhandle("模型导出",null),
+			},
 			tbitem2: {
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),

app_web/src/pages/lite/meta-model-grid-view/meta-model-grid-view-base.vue

@@ -13,18 +13,18 @@
                 <div class='pull-right'>
                     <div class='toolbar-container'>
                         <tooltip :transfer="true" :max-width="600">
-                                <i-button v-show="toolBarModels.tbitem1_export.visabled" :disabled="toolBarModels.tbitem1_export.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem1_export' }, $event)">
+                                <i-button v-show="toolBarModels.tbitem1_import.visabled" :disabled="toolBarModels.tbitem1_import.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem1_import' }, $event)">
                                     <i class=''></i>
-                                    <span class='caption'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_export.caption')}}</span>
+                                    <span class='caption'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_import.caption')}}</span>
                                 </i-button>
-                            <div slot='content'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_export.tip')}}</div>
+                            <div slot='content'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_import.tip')}}</div>
                         </tooltip>
                         <tooltip :transfer="true" :max-width="600">
-                                <i-button v-show="toolBarModels.tbitem1_import.visabled" :disabled="toolBarModels.tbitem1_import.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem1_import' }, $event)">
+                                <i-button v-show="toolBarModels.tbitem1_export.visabled" :disabled="toolBarModels.tbitem1_export.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem1_export' }, $event)">
                                     <i class=''></i>
-                                    <span class='caption'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_import.caption')}}</span>
+                                    <span class='caption'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_export.caption')}}</span>
                                 </i-button>
-                            <div slot='content'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_import.tip')}}</div>
+                            <div slot='content'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_export.tip')}}</div>
                         </tooltip>
                         <span class='seperator'>|</span>
                         <tooltip :transfer="true" :max-width="600">
@@ -384,10 +384,10 @@ export default class MetaModelGridViewBase extends Vue {
      * @memberof MetaModelGridView
      */
     public toolBarModels: any = {
-        tbitem1_export: { name: 'tbitem1_export', actiontarget: 'NONE', caption: '模型导出', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'export', target: 'MULTIKEY' } },
-
         tbitem1_import: { name: 'tbitem1_import', actiontarget: 'NONE', caption: '模型导入', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'import', target: 'NONE' } },
 
+        tbitem1_export: { name: 'tbitem1_export', actiontarget: 'NONE', caption: '模型导出', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'export', target: 'MULTIKEY' } },
+
         tbitem2: {  name: 'tbitem2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
         tbitem3: { name: 'tbitem3', actiontarget: 'NONE', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
@@ -764,12 +764,12 @@ export default class MetaModelGridViewBase extends Vue {
      * @memberof MetaModelGridViewBase
      */
     public toolbar_click($event: any, $event2?: any) {
-        if (Object.is($event.tag, 'tbitem1_export')) {
-            this.toolbar_tbitem1_export_click(null, '', $event2);
-        }
         if (Object.is($event.tag, 'tbitem1_import')) {
             this.toolbar_tbitem1_import_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'tbitem1_export')) {
+            this.toolbar_tbitem1_export_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem3')) {
             this.toolbar_tbitem3_click(null, '', $event2);
         }
@@ -920,7 +920,7 @@ export default class MetaModelGridViewBase extends Vue {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem1_export_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem1_import_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -938,7 +938,7 @@ export default class MetaModelGridViewBase extends Vue {
         }
         // 界面行为
         const curUIService:MetaModelUIService  = new MetaModelUIService();
-        curUIService.MetaModel_export(datas,contextJO, paramJO,  $event, xData,this,"MetaModel");
+        curUIService.MetaModel_import(datas,contextJO, paramJO,  $event, xData,this,"MetaModel");
     }
 
     /**
@@ -949,7 +949,7 @@ export default class MetaModelGridViewBase extends Vue {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem1_import_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem1_export_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -967,7 +967,7 @@ export default class MetaModelGridViewBase extends Vue {
         }
         // 界面行为
         const curUIService:MetaModelUIService  = new MetaModelUIService();
-        curUIService.MetaModel_import(datas,contextJO, paramJO,  $event, xData,this,"MetaModel");
+        curUIService.MetaModel_export(datas,contextJO, paramJO,  $event, xData,this,"MetaModel");
     }
 
     /**

config.xml

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

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

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

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

@@ -22,7 +22,34 @@ spec:
         image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzdst-app-web:latest
         imagePullPolicy: Always
         ports:
-        - containerPort: 8080
+        - containerPort: 30011
+        env:
+        - name: SPRING_CLOUD_NACOS_DISCOVERY_IP
+          value: "172.16.180.237"      
+        - name: SERVER_PORT
+          value: "30011"
+        - 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"      
         volumeMounts:
         - name: data
           mountPath: /app/file
@@ -42,9 +69,9 @@ spec:
   type: NodePort
   ports:
   - name: http
-    port: 8080
-    targetPort: 8080
-    nodePort: 8080
+    port: 30011
+    targetPort: 30011
+    nodePort: 30011
     protocol: TCP
   selector:
     app: ibzdst-app-web

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

@@ -3,9 +3,23 @@ services:
   ibzdst-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzdst-app-web:latest
     ports:
-      - "8080:8080"
+      - "30011:30011"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
+      - SERVER_PORT=30011
+      - 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:

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

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

ibzdst-provider/ibzdst-provider-api/src/main/docker/ibzdst-provider-api-k8s.yaml

@@ -22,34 +22,7 @@ spec:
         image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzdst-provider-api:latest
         imagePullPolicy: Always
         ports:
-        - containerPort: 40011
-        env:
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_IP
-          value: "172.16.180.237"      
-        - name: SERVER_PORT
-          value: "40011"
-        - 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&serverTimezone=GMT%2B8"
-        - 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: 8081
         volumeMounts:
         - name: data
           mountPath: /app/file
@@ -69,9 +42,9 @@ spec:
   type: NodePort
   ports:
   - name: http
-    port: 40011
-    targetPort: 40011
-    nodePort: 40011
+    port: 8081
+    targetPort: 8081
+    nodePort: 8081
     protocol: TCP
   selector:
     app: ibzdst-provider-api

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

@@ -3,23 +3,9 @@ services:
   ibzdst-provider-api:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzdst-provider-api:latest
     ports:
-      - "40011:40011"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-      - SERVER_PORT=40011
-      - 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&serverTimezone=GMT%2B8
-      - 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: