Merge remote-tracking branch 'origin/master'

app_web/src/widgets/sys-permission/main-grid/main-grid-base.vue

@@ -72,7 +72,7 @@
                         </div>
                     </poptip>
                 </span>
-                <span class="batch-toolbar">
+                <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>

app_web/src/widgets/sys-role-permission/main-grid/main-grid-base.vue

@@ -77,7 +77,7 @@
                         </div>
                     </poptip>
                 </span>
-                <span class="batch-toolbar">
+                <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>

app_web/src/widgets/sys-role/main-grid/main-grid-base.vue

@@ -70,7 +70,7 @@
                         </div>
                     </poptip>
                 </span>
-                <span class="batch-toolbar">
+                <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>

app_web/src/widgets/sys-user-role/main-grid/main-grid-base.vue

@@ -77,7 +77,7 @@
                         </div>
                     </poptip>
                 </span>
-                <span class="batch-toolbar">
+                <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>

app_web/src/widgets/sys-user/main-grid/main-grid-base.vue

@@ -63,7 +63,7 @@
                         </div>
                     </poptip>
                 </span>
-                <span class="batch-toolbar">
+                <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>

config.xml

@@ -37,6 +37,11 @@
 	  git clone -b master $para2 ibzuaa/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibzuaa/
+      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 ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_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,11 @@ 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
     deploy:
       mode: replicated
       replicas: 1

ibzuaa-app/ibzuaa-app-web/src/main/resources/application-web-dev.yml

 server:
-  port: 8080
+  port: 30002
\ No newline at end of file

ibzuaa-app/ibzuaa-app-web/src/main/resources/application-web-prod.yml

 server:
-  port: 8080
+  port: 30002
 
 #zuul网关路由设置
 zuul:

ibzuaa-util/src/main/java/cn/ibizlab/util/job/PermissionSyncJob.java

@@ -32,7 +32,7 @@ public class PermissionSyncJob implements ApplicationRunner {
     @Value("${ibiz.enablePermissionValid:false}")
     boolean enablePermissionValid;  //是否开启权限校验
 
-    @Value("${ibiz.systemid:2C40DFCD-0DF5-47BF-91A5-C45F810B0001}")
+    @Value("${ibiz.systemid:EB948A46-DF8C-4BE3-8020-0ADA23440D31}")
     private String systemId;
 
     @Override