ibiz4j 部署微服务应用

app_web/public/assets/json/view-config.json

@@ -176,8 +176,8 @@
         "viewtag": "9ed83d4d91fedf510a43bbe8908a21ba"
     },
     "ouindexview": {
-        "title": "ibizlab-ou",
-        "caption": "ibizlab-ou",
+        "title": "organizational-unit",
+        "caption": "ibizlab",
         "viewtype": "APPINDEXVIEW",
         "viewmodule": "ou",
         "viewname": "OUIndexView",

app_web/src/locale/lang/en-US.ts

@@ -54,8 +54,8 @@ export default {
         // 非实体视图
         views: {
             ouindexview: {
-                caption: "ibizlab-ou",
-                title: "ibizlab-ou",
+                caption: "ibizlab",
+                title: "organizational-unit",
             },
         },
         utilview:{

app_web/src/locale/lang/zh-CN.ts

@@ -54,8 +54,8 @@ export default {
         // 非实体视图
         views: {
             ouindexview: {
-                caption: "ibizlab-ou",
-                title: "ibizlab-ou",
+                caption: "ibizlab",
+                title: "organizational-unit",
             },
         },
         utilview:{

app_web/src/mock/app/ouindex-view-appmenu/ouindex-view-appmenu.ts

@@ -79,7 +79,7 @@ mock.onGet('v7/ouindex-viewappmenu').reply((config: any) => {
 	iconcls: 'fa fa-simplybuilt',
 	icon: '',
 	textcls: '',
-	appfunctag: '_2',
+	appfunctag: 'Auto6',
 	resourcetag: '',
 },
             {
@@ -97,7 +97,7 @@ mock.onGet('v7/ouindex-viewappmenu').reply((config: any) => {
 	iconcls: 'fa fa-group',
 	icon: '',
 	textcls: '',
-	appfunctag: '_3',
+	appfunctag: 'Auto7',
 	resourcetag: '',
 },
         ],

app_web/src/mock/viewconfig/viewconfig.ts

@@ -184,8 +184,8 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewtag": "9ed83d4d91fedf510a43bbe8908a21ba"
         },
         "ouindexview": {
-            "title": "ibizlab-ou",
-            "caption": "ibizlab-ou",
+            "title": "organizational-unit",
+            "caption": "ibizlab",
             "viewtype": "APPINDEXVIEW",
             "viewmodule": "ou",
             "viewname": "OUIndexView",

app_web/src/widgets/app/ouindex-view-appmenu/ouindex-view-appmenu-base.vue

@@ -580,8 +580,8 @@ export default class OUIndexViewBase extends Vue implements ControlInterface {
                 navDataService.removeNavData(this.viewtag);
             }
             switch (item.appfunctag) {
-                case '_2': 
-                    this.click_2(item);
+                case 'Auto6': 
+                    this.clickAuto6(item);
                     return;
                 case 'Auto5': 
                     this.clickAuto5(item);
@@ -589,8 +589,8 @@ export default class OUIndexViewBase extends Vue implements ControlInterface {
                 case 'Auto3': 
                     this.clickAuto3(item);
                     return;
-                case '_3': 
-                    this.click_3(item);
+                case 'Auto7': 
+                    this.clickAuto7(item);
                     return;
                 case 'Auto4': 
                     this.clickAuto4(item);
@@ -608,7 +608,7 @@ export default class OUIndexViewBase extends Vue implements ControlInterface {
      * @param {*} [item={}]
      * @memberof OUIndexView
      */
-    public click_2(item: any = {}) {
+    public clickAuto6(item: any = {}) {
         const viewparam: any = {};
         Object.assign(viewparam, {});
         const deResParameters: any[] = [];
@@ -677,7 +677,7 @@ export default class OUIndexViewBase extends Vue implements ControlInterface {
      * @param {*} [item={}]
      * @memberof OUIndexView
      */
-    public click_3(item: any = {}) {
+    public clickAuto7(item: any = {}) {
         const viewparam: any = {};
         Object.assign(viewparam, {});
         const deResParameters: any[] = [];

app_web/src/widgets/app/ouindex-view-appmenu/ouindex-view-appmenu-model.ts

@@ -86,7 +86,7 @@ export default class OUIndexViewModel {
 	iconcls: 'fa fa-simplybuilt',
 	icon: '',
 	textcls: '',
-	appfunctag: '_2',
+	appfunctag: 'Auto6',
 	resourcetag: '',
 	authtag:'web-OUIndexView-menuitem4',
 },
@@ -105,7 +105,7 @@ export default class OUIndexViewModel {
 	iconcls: 'fa fa-group',
 	icon: '',
 	textcls: '',
-	appfunctag: '_3',
+	appfunctag: 'Auto7',
 	resourcetag: '',
 	authtag:'web-OUIndexView-menuitem5',
 },
@@ -120,7 +120,7 @@ export default class OUIndexViewModel {
 	 */
 	public funcs: any[] = [
         {
-            appfunctag: '_2',
+            appfunctag: 'Auto6',
             appfuncyype: 'APPVIEW',
             openmode: '',
             codename: 'ibzpostgridview',
@@ -156,7 +156,7 @@ export default class OUIndexViewModel {
             ],
         },
         {
-            appfunctag: '_3',
+            appfunctag: 'Auto7',
             appfuncyype: 'APPVIEW',
             openmode: '',
             codename: 'ibzteamgridview',

config.xml

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

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

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

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

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

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

@@ -3,22 +3,9 @@ services:
   ibzou-provider-api:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzou-provider-api:latest
     ports:
-      - "40001:40001"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-      - SERVER_PORT=40001
-      - 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: