ibizdev提交

3cef2236 · ibizdev · d5a18345 · 3cef2236 · 3cef2236 · 3cef2236
--- a/app_web/src/components/app-user/app-user.vue
+++ b/app_web/src/components/app-user/app-user.vue
@@ -64,6 +64,12 @@ export default class AppUser extends Vue {
                _user.avatar = this.$store.getters.getAppData().context.srfusericonpath;
            }
        }
+        if(localStorage.getItem("user")){
+            let user:any = JSON.parse(localStorage.getItem("user") as string);
+            if(user && user.personname){
+                _user.name = user.personname;
+            }
+        }
        Object.assign(this.user,_user,{
            time: +new Date
        });

--- a/app_web/src/widgets/sys-permission/main-grid/main-grid-base.vue
+++ b/app_web/src/widgets/sys-permission/main-grid/main-grid-base.vue
@@ -15,6 +15,8 @@
        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>

--- a/app_web/src/widgets/sys-permission/main-grid/main-grid.less
+++ b/app_web/src/widgets/sys-permission/main-grid/main-grid.less
@@ -29,6 +29,9 @@
      display: inline;
    }
    .el-table {
+      .quick-toolbar{
+          display: inline-block;
+      }
      .el-tooltip{
        .ivu-form-item{
          margin-bottom: unset !important;
@@ -51,6 +54,20 @@
            position: absolute;
            left: 0;
        }
+        .batch-toolbar{
+            position: absolute;
+            left: 105px;
+          >.toolbar-container{
+              button  {
+                  font-size: 16px;
+                  min-width: 32px;
+                  height: 32px;
+                  margin-right: 4px;
+                  margin-top: 0;
+                  margin-bottom: 0;
+              }
+          }
+        }
    }
    .el-table__body-wrapper{
      height: calc(100% - 45px) !important;

--- a/app_web/src/widgets/sys-role-permission/main-grid/main-grid-base.vue
+++ b/app_web/src/widgets/sys-role-permission/main-grid/main-grid-base.vue
@@ -15,6 +15,8 @@
        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>

--- a/app_web/src/widgets/sys-role-permission/main-grid/main-grid.less
+++ b/app_web/src/widgets/sys-role-permission/main-grid/main-grid.less
@@ -29,6 +29,9 @@
      display: inline;
    }
    .el-table {
+      .quick-toolbar{
+          display: inline-block;
+      }
      .el-tooltip{
        .ivu-form-item{
          margin-bottom: unset !important;
@@ -51,6 +54,20 @@
            position: absolute;
            left: 0;
        }
+        .batch-toolbar{
+            position: absolute;
+            left: 105px;
+          >.toolbar-container{
+              button  {
+                  font-size: 16px;
+                  min-width: 32px;
+                  height: 32px;
+                  margin-right: 4px;
+                  margin-top: 0;
+                  margin-bottom: 0;
+              }
+          }
+        }
    }
    .el-table__body-wrapper{
      height: calc(100% - 45px) !important;

--- a/app_web/src/widgets/sys-role/main-grid/main-grid-base.vue
+++ b/app_web/src/widgets/sys-role/main-grid/main-grid-base.vue
@@ -15,6 +15,8 @@
        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>

--- a/app_web/src/widgets/sys-role/main-grid/main-grid.less
+++ b/app_web/src/widgets/sys-role/main-grid/main-grid.less
@@ -29,6 +29,9 @@
      display: inline;
    }
    .el-table {
+      .quick-toolbar{
+          display: inline-block;
+      }
      .el-tooltip{
        .ivu-form-item{
          margin-bottom: unset !important;
@@ -51,6 +54,20 @@
            position: absolute;
            left: 0;
        }
+        .batch-toolbar{
+            position: absolute;
+            left: 105px;
+          >.toolbar-container{
+              button  {
+                  font-size: 16px;
+                  min-width: 32px;
+                  height: 32px;
+                  margin-right: 4px;
+                  margin-top: 0;
+                  margin-bottom: 0;
+              }
+          }
+        }
    }
    .el-table__body-wrapper{
      height: calc(100% - 45px) !important;

--- a/app_web/src/widgets/sys-user-role/main-grid/main-grid-base.vue
+++ b/app_web/src/widgets/sys-user-role/main-grid/main-grid-base.vue
@@ -15,6 +15,8 @@
        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>

--- a/app_web/src/widgets/sys-user-role/main-grid/main-grid.less
+++ b/app_web/src/widgets/sys-user-role/main-grid/main-grid.less
@@ -29,6 +29,9 @@
      display: inline;
    }
    .el-table {
+      .quick-toolbar{
+          display: inline-block;
+      }
      .el-tooltip{
        .ivu-form-item{
          margin-bottom: unset !important;
@@ -51,6 +54,20 @@
            position: absolute;
            left: 0;
        }
+        .batch-toolbar{
+            position: absolute;
+            left: 105px;
+          >.toolbar-container{
+              button  {
+                  font-size: 16px;
+                  min-width: 32px;
+                  height: 32px;
+                  margin-right: 4px;
+                  margin-top: 0;
+                  margin-bottom: 0;
+              }
+          }
+        }
    }
    .el-table__body-wrapper{
      height: calc(100% - 45px) !important;

--- a/app_web/src/widgets/sys-user/main-grid/main-grid-base.vue
+++ b/app_web/src/widgets/sys-user/main-grid/main-grid-base.vue
@@ -15,6 +15,8 @@
        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>

--- a/app_web/src/widgets/sys-user/main-grid/main-grid.less
+++ b/app_web/src/widgets/sys-user/main-grid/main-grid.less
@@ -29,6 +29,9 @@
      display: inline;
    }
    .el-table {
+      .quick-toolbar{
+          display: inline-block;
+      }
      .el-tooltip{
        .ivu-form-item{
          margin-bottom: unset !important;
@@ -51,6 +54,20 @@
            position: absolute;
            left: 0;
        }
+        .batch-toolbar{
+            position: absolute;
+            left: 105px;
+          >.toolbar-container{
+              button  {
+                  font-size: 16px;
+                  min-width: 32px;
+                  height: 32px;
+                  margin-right: 4px;
+                  margin-top: 0;
+                  margin-bottom: 0;
+              }
+          }
+        }
    }
    .el-table__body-wrapper{
      height: calc(100% - 45px) !important;

--- a/config.xml
+++ b/config.xml
@@ -37,11 +37,6 @@
 	  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>

--- a/ibzuaa-app/ibzuaa-app-web/src/main/docker/Dockerfile
+++ b/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 30002
+EXPOSE 8080

 ADD ibzuaa-app-web.jar /ibzuaa-app-web.jar
--- a/ibzuaa-app/ibzuaa-app-web/src/main/docker/ibzuaa-app-web.yaml
+++ b/ibzuaa-app/ibzuaa-app-web/src/main/docker/ibzuaa-app-web.yaml
@@ -3,11 +3,9 @@ services:
  ibzuaa-app-web:
    image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-app-web:latest
    ports:
-      - "30002:30002"
+      - "8080:8080"
    networks:
      - agent_network
-    environment:
-      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.180.237
    deploy:
      mode: replicated
      replicas: 1

--- a/ibzuaa-app/ibzuaa-app-web/src/main/resources/application-web-dev.yml
+++ b/ibzuaa-app/ibzuaa-app-web/src/main/resources/application-web-dev.yml
 server:
-  port: 30002
\ No newline at end of file
+  port: 8080
\ No newline at end of file
--- a/ibzuaa-app/ibzuaa-app-web/src/main/resources/application-web-prod.yml
+++ b/ibzuaa-app/ibzuaa-app-web/src/main/resources/application-web-prod.yml
 server:
-  port: 30002
+  port: 8080

 #zuul网关路由设置
 zuul:

--- a/ibzuaa-util/src/main/java/cn/ibizlab/util/job/PermissionSyncJob.java
+++ b/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:EB948A46-DF8C-4BE3-8020-0ADA23440D31}")
+    @Value("${ibiz.systemid:2C40DFCD-0DF5-47BF-91A5-C45F810B0001}")
    private String systemId;

    @Override

--- a/ibzuaa-util/src/main/resources/application-sys.yml
+++ b/ibzuaa-util/src/main/resources/application-sys.yml
@@ -81,6 +81,6 @@ ribbon:
 #缓存模式：关闭缓存(无配置项)、本地缓存(enableCaffeineCache=true-默认)、caffeine+redis两级缓存(enableRedisCache=true)
 ibiz:
  enablePermissionValid: false
-  enableCaffeineCache: false
+  enableCaffeineCache: true
  #enableRedisCache: false