ibizdev提交

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
         });

app_web/src/widgets/wfgroup/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>
@@ -61,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>

app_web/src/widgets/wfgroup/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;

app_web/src/widgets/wfmember/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>
@@ -54,7 +56,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/wfmember/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;

app_web/src/widgets/wfprocess-definition/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>
@@ -77,7 +79,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/wfprocess-definition/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;

app_web/src/widgets/wfuser/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>
@@ -61,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>

app_web/src/widgets/wfuser/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;

config.xml

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

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

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

@@ -3,11 +3,9 @@ services:
   ibzwf-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzwf-app-web:latest
     ports:
-      - "30003:30003"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.180.237
     deploy:
       mode: replicated
       replicas: 1

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

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

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

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

ibzwf-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:0A91C1B1-3B67-4EDA-9572-5DB491871FEE}")
+    @Value("${ibiz.systemid:2C40DFCD-0DF5-47BF-91A5-C45F810B0001}")
     private String systemId;
 
     @Override

ibzwf-util/src/main/resources/application-sys.yml

+#nacos配置中心、数据源
+spring:
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 172.16.102.211:8848
+  cache:
+    redis:
+      time-to-live: 3600
+    caffeine:
+      spec: initialCapacity=5,maximumSize=500,expireAfterWrite=3600s
+  redis:
+    host: 172.16.100.243
+    port: 6379
+    password:
+    database: 0
+    lettuce:
+      pool:
+        max-active: 32
+        max-wait: 300ms
+        max-idle: 16
+        min-idle: 8
+  datasource:
+    username: a_A_5d9d78509
+    password: '@6dEfb3@'
+    url: jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
+    driver-class-name: com.mysql.jdbc.Driver
+    filters: stat,wall,log4j2
+    #配置初始化大小/最小/最大
+    initial-size: 1
+    min-idle: 1
+    max-active: 20
+    #获取连接等待超时时间
+    max-wait: 60000
+    #间隔多久进行一次检测，检测需要关闭的空闲连接
+    time-between-eviction-runs-millis: 60000
+    #一个连接在池中最小生存的时间
+    min-evictable-idle-time-millis: 300000
+    validation-query: SELECT 1 FROM DUAL
+    test-while-idle: true
+    test-on-borrow: false
+    test-on-return: false
+    #打开PSCache，并指定每个连接上PSCache的大小。oracle设为true，mysql设为false。分库分表较多推荐设置为false
+    pool-prepared-statements: false
+    max-pool-prepared-statement-per-connection-size: 20
+    isSyncDBSchema: false
+    defaultSchema: a_A_5d9d78509
+    conf: classpath:liquibase/master.xml
+
+#Mybatis-plus配置
+mybatis-plus:
+  global-config:
+    refresh-mapper: true
+    db-config:
+      # 全局逻辑已删除默认值
+      logic-delete-value: 0
+      # 全局逻辑未删除默认值
+      logic-not-delete-value: 1
+  mapper-locations: classpath*:/mapper/*/*/*.xml
+  configuration:
+    jdbc-type-for-null: 'null'
+    map-underscore-to-camel-case: false
+
+#阿里sentinel熔断器
+feign:
+  sentinel:
+    enabled: true
+
+#Log配置
+logging:
+  level:
+    cn.ibizlab: debug
+    org.springframework.boot.autoconfigure: ERROR
+
+#zuul网关超时设置
+ribbon:
+  ReadTimeout: 60000
+  ConnectTimeout: 60000
+
+#系统是否开启权限验证、是否开启缓存
+#缓存模式：关闭缓存(无配置项)、本地缓存(enableCaffeineCache=true-默认)、caffeine+redis两级缓存(enableRedisCache=true)
+ibiz:
+  enablePermissionValid: true
+  enableCaffeineCache: true
+  #enableRedisCache: true
+