ibiz4j 部署微服务应用

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

@@ -8,8 +8,8 @@
         "viewtag": "0134ebf9391cb5f988839332c1352cd9"
     },
     "index": {
-        "title": "ibizlab-uaa",
-        "caption": "ibizlab-uaa",
+        "title": "uaa",
+        "caption": "ibizlab",
         "viewtype": "APPINDEXVIEW",
         "viewmodule": "uaa",
         "viewname": "Index",

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

@@ -54,8 +54,8 @@ export default {
         // 非实体视图
         views: {
             index: {
-                caption: "ibizlab-uaa",
-                title: "ibizlab-uaa",
+                caption: "ibizlab",
+                title: "uaa",
             },
         },
         utilview:{

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

@@ -54,8 +54,8 @@ export default {
         // 非实体视图
         views: {
             index: {
-                caption: "ibizlab-uaa",
-                title: "ibizlab-uaa",
+                caption: "ibizlab",
+                title: "uaa",
             },
         },
         utilview:{

app_web/src/mock/app/main-appmenu/main-appmenu.ts

@@ -79,7 +79,7 @@ mock.onGet('v7/mainappmenu').reply((config: any) => {
 	iconcls: 'fa fa-buysellads',
 	icon: '',
 	textcls: '',
-	appfunctag: '_2',
+	appfunctag: 'Auto12',
 	resourcetag: '',
 },
         ],

app_web/src/mock/viewconfig/viewconfig.ts

@@ -16,8 +16,8 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewtag": "0134ebf9391cb5f988839332c1352cd9"
         },
         "index": {
-            "title": "ibizlab-uaa",
-            "caption": "ibizlab-uaa",
+            "title": "uaa",
+            "caption": "ibizlab",
             "viewtype": "APPINDEXVIEW",
             "viewmodule": "uaa",
             "viewname": "Index",

app_web/src/widgets/app/main-appmenu/main-appmenu-base.vue

@@ -586,8 +586,8 @@ export default class MainBase extends Vue implements ControlInterface {
                 case 'Auto5': 
                     this.clickAuto5(item);
                     return;
-                case '_2': 
-                    this.click_2(item);
+                case 'Auto12': 
+                    this.clickAuto12(item);
                     return;
                 case 'Auto6': 
                     this.clickAuto6(item);
@@ -651,7 +651,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @param {*} [item={}]
      * @memberof Main
      */
-    public click_2(item: any = {}) {
+    public clickAuto12(item: any = {}) {
         const viewparam: any = {};
         Object.assign(viewparam, {});
         const deResParameters: any[] = [];

app_web/src/widgets/app/main-appmenu/main-appmenu-model.ts

@@ -86,7 +86,7 @@ export default class MainModel {
 	iconcls: 'fa fa-buysellads',
 	icon: '',
 	textcls: '',
-	appfunctag: '_2',
+	appfunctag: 'Auto12',
 	resourcetag: '',
 	authtag:'web-Main-menuitem2',
 },
@@ -125,7 +125,7 @@ export default class MainModel {
             ],
         },
         {
-            appfunctag: '_2',
+            appfunctag: 'Auto12',
             appfuncyype: 'APPVIEW',
             openmode: '',
             codename: 'sysappgridview',

app_web/vue.config.js

@@ -30,7 +30,7 @@ module.exports = {
             filename: 'index.html',
             // 当使用 title 选项时，
             // template 中的 title 标签需要是 <title><%= htmlWebpackPlugin.options.title %></title>
-            title: 'ibizlab-uaa',
+            title: 'uaa',
             // 在这个页面中包含的块，默认情况下会包含
             // 提取出来的通用 chunk 和 vendor chunk。
             // chunks: ['chunk-vendors', 'chunk-common', 'index']

config.xml

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

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

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

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

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

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

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