ibiz4j 部署微服务应用

9302eadb · ibizdev · aa5dd8a3 · 9302eadb · 9302eadb · 9302eadb
--- a/app_web/src/widgets/ibzdepartment/edit-grid-grid/edit-grid-grid-base.vue
+++ b/app_web/src/widgets/ibzdepartment/edit-grid-grid/edit-grid-grid-base.vue
@@ -16,8 +16,6 @@
        ref='multipleTable' :data="items" :show-header="!isHideHeader">
            <template slot="empty">
                无数据 
-                <span class="quick-toolbar">
-                </span>
            </template>
            <template v-if="!isSingleSelect">
                <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
@@ -343,8 +341,6 @@
                        </div>
                    </poptip>
                </span>
-                <span v-if="selections.length > 0" class="batch-toolbar">
-                </span>
                <span class="page-button"><i-button icon="md-refresh" :title="$t('app.gridpage.refresh')" @click="pageRefresh()"></i-button></span>&nbsp;
                <span>
                    {{$t('app.gridpage.show')}}&nbsp;

--- a/app_web/src/widgets/ibzdepartment/main-grid/main-grid-base.vue
+++ b/app_web/src/widgets/ibzdepartment/main-grid/main-grid-base.vue
@@ -16,8 +16,6 @@
        ref='multipleTable' :data="items" :show-header="!isHideHeader">
            <template slot="empty">
                无数据 
-                <span class="quick-toolbar">
-                </span>
            </template>
            <template v-if="!isSingleSelect">
                <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
@@ -212,8 +210,6 @@
                        </div>
                    </poptip>
                </span>
-                <span v-if="selections.length > 0" class="batch-toolbar">
-                </span>
                <span class="page-button"><i-button icon="md-refresh" :title="$t('app.gridpage.refresh')" @click="pageRefresh()"></i-button></span>&nbsp;
                <span>
                    {{$t('app.gridpage.show')}}&nbsp;

--- a/app_web/src/widgets/ibzdept-member/main-grid/main-grid-base.vue
+++ b/app_web/src/widgets/ibzdept-member/main-grid/main-grid-base.vue
@@ -16,8 +16,6 @@
        ref='multipleTable' :data="items" :show-header="!isHideHeader">
            <template slot="empty">
                无数据 
-                <span class="quick-toolbar">
-                </span>
            </template>
            <template v-if="!isSingleSelect">
                <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
@@ -80,8 +78,6 @@
                        </div>
                    </poptip>
                </span>
-                <span v-if="selections.length > 0" class="batch-toolbar">
-                </span>
                <span class="page-button"><i-button icon="md-refresh" :title="$t('app.gridpage.refresh')" @click="pageRefresh()"></i-button></span>&nbsp;
                <span>
                    {{$t('app.gridpage.show')}}&nbsp;

--- a/app_web/src/widgets/ibzemployee/edit-grid-grid/edit-grid-grid-base.vue
+++ b/app_web/src/widgets/ibzemployee/edit-grid-grid/edit-grid-grid-base.vue
@@ -16,8 +16,6 @@
        ref='multipleTable' :data="items" :show-header="!isHideHeader">
            <template slot="empty">
                无数据 
-                <span class="quick-toolbar">
-                </span>
            </template>
            <template v-if="!isSingleSelect">
                <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
@@ -325,8 +323,6 @@
                        </div>
                    </poptip>
                </span>
-                <span v-if="selections.length > 0" class="batch-toolbar">
-                </span>
                <span class="page-button"><i-button icon="md-refresh" :title="$t('app.gridpage.refresh')" @click="pageRefresh()"></i-button></span>&nbsp;
                <span>
                    {{$t('app.gridpage.show')}}&nbsp;

--- a/app_web/src/widgets/ibzemployee/main-grid/main-grid-base.vue
+++ b/app_web/src/widgets/ibzemployee/main-grid/main-grid-base.vue
@@ -16,8 +16,6 @@
        ref='multipleTable' :data="items" :show-header="!isHideHeader">
            <template slot="empty">
                无数据 
-                <span class="quick-toolbar">
-                </span>
            </template>
            <template v-if="!isSingleSelect">
                <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
@@ -178,8 +176,6 @@
                        </div>
                    </poptip>
                </span>
-                <span v-if="selections.length > 0" class="batch-toolbar">
-                </span>
                <span class="page-button"><i-button icon="md-refresh" :title="$t('app.gridpage.refresh')" @click="pageRefresh()"></i-button></span>&nbsp;
                <span>
                    {{$t('app.gridpage.show')}}&nbsp;

--- a/app_web/src/widgets/ibzorganization/main-grid/main-grid-base.vue
+++ b/app_web/src/widgets/ibzorganization/main-grid/main-grid-base.vue
@@ -16,8 +16,6 @@
        ref='multipleTable' :data="items" :show-header="!isHideHeader">
            <template slot="empty">
                无数据 
-                <span class="quick-toolbar">
-                </span>
            </template>
            <template v-if="!isSingleSelect">
                <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
@@ -164,8 +162,6 @@
                        </div>
                    </poptip>
                </span>
-                <span v-if="selections.length > 0" class="batch-toolbar">
-                </span>
                <span class="page-button"><i-button icon="md-refresh" :title="$t('app.gridpage.refresh')" @click="pageRefresh()"></i-button></span>&nbsp;
                <span>
                    {{$t('app.gridpage.show')}}&nbsp;

--- a/config.xml
+++ b/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>

--- a/ibzou-app/ibzou-app-web/src/main/docker/Dockerfile
+++ b/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
--- a/ibzou-app/ibzou-app-web/src/main/docker/ibzou-app-web.yaml
+++ b/ibzou-app/ibzou-app-web/src/main/docker/ibzou-app-web.yaml
@@ -3,9 +3,21 @@ 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
    deploy:
      mode: replicated
      replicas: 1

--- a/ibzou-provider/ibzou-provider-api/src/main/docker/Dockerfile
+++ b/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
--- a/ibzou-provider/ibzou-provider-api/src/main/docker/ibzou-provider-api.yaml
+++ b/ibzou-provider/ibzou-provider-api/src/main/docker/ibzou-provider-api.yaml
@@ -3,21 +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
    deploy:
      mode: replicated
      replicas: 1