ibizdev提交

app_web/src/components/app-quick-group/app-quick-group.vue

@@ -5,14 +5,14 @@
         <i v-if=" item.iconcls && !Object.is(item.iconcls, '')" :class="item.iconcls"></i>
         <img v-else-if="item.icon && !Object.is(item.icon, '')" :src="item.icon" />
         <span class="app-quick-item-label">{{item.label}}</span>
-        <span v-show="isSelectedItem(item)" class="app-quick-item-counter">0</span>
+        <span v-show="isSelectedItem(item) && counterService && counterService.counterData && counterService.counterData[item.codename]" class="app-quick-item-counter">{{itemTag(item)}}</span>
       </span>
       <el-dropdown v-if="item.children" style="outline: none !important;" trigger="click" @command="handleCommand($event,item)">
         <span :style="{color:item.color}" :class="{'app-seleted-item':isSelectedItem(item)}">
           <i v-if=" item.iconcls && !Object.is(item.iconcls, '')" :class="item.iconcls"></i>
           <img v-else-if="item.icon && !Object.is(item.icon, '')" :src="item.icon" />
           <span class="app-quick-item-label">{{item.label}}</span>
-          <span v-show="isSelectedItem(item)" class="app-quick-item-counter">0</span>
+          <span v-show="isSelectedItem(item) && counterService && counterService.counterData && counterService.counterData[item.codename]" class="app-quick-item-counter">{{itemTag(item)}}</span>
         </span>
         <el-dropdown-menu slot="dropdown">
           <el-dropdown-item v-for="childitem in item.children" :command="childitem" :key="childitem.id">
@@ -30,7 +30,6 @@
 
 <script lang="ts">
 import { Vue, Component, Prop, Model, Emit } from "vue-property-decorator";
-import CounterService from "@/counter/counter-service";
 @Component({})
 export default class AppQuickGroup extends Vue {
 
@@ -48,23 +47,7 @@ export default class AppQuickGroup extends Vue {
      * @type {string}
      * @memberof AppQuickGroup
      */
-    @Prop() public counterName?:string;
-
-    /**
-     * 计数器服务基类
-     *
-     * @type {any}
-     * @memberof AppQuickGroup
-     */
-    public counterService:any = new CounterService();
-
-    /**
-     * 当前计数器服务
-     *
-     * @type {any}
-     * @memberof AppQuickGroup
-     */
-    public curCounterService:any;
+    @Prop() public counterService?:any;
 
     /**
      * UI选中项
@@ -90,6 +73,14 @@ export default class AppQuickGroup extends Vue {
       }
     }
 
+    public itemTag(item:any){
+      if(this.counterService && this.counterService.counterData && item.codename){
+        return this.counterService.counterData[item.codename];
+      }else{
+        return "";
+      }
+    }
+
     /**
      * 是否选中当前项
      * 
@@ -154,9 +145,7 @@ export default class AppQuickGroup extends Vue {
      * @memberof AppQuickGroup
      */
     public handleClick($event:any,isswitch:boolean = true){
-      if($event && $event.data){
-        this.$emit('valuechange',$event.data);
-      }
+      this.$emit('valuechange',$event);
       if(isswitch){
         this.selectedUiItem = $event;
       }
@@ -172,6 +161,7 @@ export default class AppQuickGroup extends Vue {
      */
     public handleCommand($event:any,item:any){
       item.label = $event.label;
+      item.codename = $event.codename;
       this.handleClick($event,false);
     }
 

app_web/src/engine/view/md-view-engine.ts

@@ -117,6 +117,9 @@ export default class MDViewEngine extends ViewEngine {
         if (Object.is(eventName, 'load')) {
             this.onSearchFormLoad(args);
         }
+        if (Object.is(eventName, 'search')) {
+            this.onSearchFormLoad(args);
+        }
     }
 
     /**
@@ -157,6 +160,20 @@ export default class MDViewEngine extends ViewEngine {
         this.isLoadDefault = true;
     }
 
+    /**
+     * 搜索表单搜索
+     *
+     * @param {*} [args={}]
+     * @memberof MDViewEngine
+     */
+    public onSearchFormSearch(args: any = {}): void {
+        if (this.getMDCtrl() && this.isLoadDefault) {
+            const tag = this.getMDCtrl().name;
+            this.setViewState2({ tag: tag, action: 'load', viewdata: this.view.viewparams });
+        }
+        this.isLoadDefault = true;
+    }
+
     /**
      * 处理实体界面行为
      *

app_web/src/pages/uaa/sys-permissiongrid-view/sys-permissiongrid-view-base.vue

@@ -1270,6 +1270,7 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
      */
     public isSingleSelect: boolean = false;
 
+
     /**
     * 是否嵌入关系界面
     *

app_web/src/pages/uaa/sys-role-permissiongrid-view/sys-role-permissiongrid-view-base.vue

@@ -1298,6 +1298,7 @@ export default class SYS_ROLE_PERMISSIONGridViewBase extends Vue {
      */
     public isSingleSelect: boolean = false;
 
+
     /**
     * 是否嵌入关系界面
     *

app_web/src/pages/uaa/sys-rolegrid-view/sys-rolegrid-view-base.vue

@@ -1270,6 +1270,7 @@ export default class SYS_ROLEGridViewBase extends Vue {
      */
     public isSingleSelect: boolean = false;
 
+
     /**
     * 是否嵌入关系界面
     *

app_web/src/pages/uaa/sys-user-rolegrid-view/sys-user-rolegrid-view-base.vue

@@ -1298,6 +1298,7 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
      */
     public isSingleSelect: boolean = false;
 
+
     /**
     * 是否嵌入关系界面
     *

app_web/src/pages/uaa/sys-usergrid-view/sys-usergrid-view-base.vue

@@ -1270,6 +1270,7 @@ export default class SYS_USERGridViewBase extends Vue {
      */
     public isSingleSelect: boolean = false;
 
+
     /**
     * 是否嵌入关系界面
     *

app_web/src/widgets/sys-permission/default-searchform/default-searchform-base.vue

@@ -784,7 +784,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
         if (!this.formValidateStatus()) {
             return;
         }
-        this.$emit('load', this.data);
+        this.$emit('search', this.data);
     }
 
     /**
@@ -796,7 +796,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
         if (!this.formValidateStatus()) {
             return;
         }
-        this.$emit('load', this.data);
+        this.$emit('search', this.data);
     }
 
     /**

app_web/src/widgets/sys-role-permission/default-searchform/default-searchform-base.vue

@@ -672,7 +672,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
         if (!this.formValidateStatus()) {
             return;
         }
-        this.$emit('load', this.data);
+        this.$emit('search', this.data);
     }
 
     /**
@@ -684,7 +684,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
         if (!this.formValidateStatus()) {
             return;
         }
-        this.$emit('load', this.data);
+        this.$emit('search', this.data);
     }
 
     /**

app_web/src/widgets/sys-role/default-searchform/default-searchform-base.vue

@@ -756,7 +756,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
         if (!this.formValidateStatus()) {
             return;
         }
-        this.$emit('load', this.data);
+        this.$emit('search', this.data);
     }
 
     /**
@@ -768,7 +768,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
         if (!this.formValidateStatus()) {
             return;
         }
-        this.$emit('load', this.data);
+        this.$emit('search', this.data);
     }
 
     /**

app_web/src/widgets/sys-user-role/default-searchform/default-searchform-base.vue

@@ -672,7 +672,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
         if (!this.formValidateStatus()) {
             return;
         }
-        this.$emit('load', this.data);
+        this.$emit('search', this.data);
     }
 
     /**
@@ -684,7 +684,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
         if (!this.formValidateStatus()) {
             return;
         }
-        this.$emit('load', this.data);
+        this.$emit('search', this.data);
     }
 
     /**

app_web/src/widgets/sys-user/default-searchform/default-searchform-base.vue

@@ -672,7 +672,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
         if (!this.formValidateStatus()) {
             return;
         }
-        this.$emit('load', this.data);
+        this.$emit('search', this.data);
     }
 
     /**
@@ -684,7 +684,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
         if (!this.formValidateStatus()) {
             return;
         }
-        this.$emit('load', this.data);
+        this.$emit('search', this.data);
     }
 
     /**

ibzuaa-app/ibzuaa-app-web/src/main/java/cn/ibizlab/web/webApplication.java

@@ -27,6 +27,7 @@ import java.util.List;
 @MapperScan("cn.ibizlab.*.mapper")
 @SpringBootApplication(exclude = {
         org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class,
+            org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration.class,
 })
 public class webApplication extends WebMvcConfigurerAdapter{
 

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

@@ -32,9 +32,5 @@ zuul:
       path: /sys_psdeopprivs/**
       serviceId: ibzuaa-api
       stripPrefix: false
-    wfcore:
-      path: /wfcore/**
-      serviceId: ibzwf-api
-      stripPrefix: true
   sensitive-headers:
     - Cookie,Set-Cookie,Authorization

ibzuaa-boot/src/main/java/cn/ibizlab/DevBootApplication.java

@@ -15,8 +15,10 @@ import java.util.List;
 @EnableDiscoveryClient
 @Configuration
 @EnableTransactionManagement
-@SpringBootApplication
 @EnableFeignClients(basePackages = {"cn.ibizlab" })
+@SpringBootApplication(exclude = {
+            org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration.class,
+})
 public class DevBootApplication extends WebMvcConfigurerAdapter{
 
     public static void main(String[] args) {

ibzuaa-boot/src/main/resources/application-dev.yml

 server:
   port: 8080
 
+#zuul网关路由设置
+zuul:
+  routes:
+  sensitive-headers:
+    - Cookie,Set-Cookie,Authorization

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/ibzuaaapiApplication.java

@@ -23,6 +23,7 @@ import java.util.List;
 @MapperScan("cn.ibizlab.*.mapper")
 @SpringBootApplication(exclude = {
         org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class,
+            org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration.class,
 })
 @EnableFeignClients(basePackages = {"cn.ibizlab" })
 public class ibzuaaapiApplication extends WebMvcConfigurerAdapter{

ibzuaa-util/src/main/java/cn/ibizlab/util/security/AuthPermissionEvaluator.java

@@ -12,6 +12,7 @@ import cn.ibizlab.util.filter.QueryBuildContext;
 import cn.ibizlab.util.filter.QueryWrapperContext;
 import cn.ibizlab.util.helper.DEFieldCacheMap;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.BasicQuery;
 import org.springframework.data.mongodb.core.query.Query;
@@ -48,6 +49,7 @@ public class AuthPermissionEvaluator implements PermissionEvaluator {
     private String keyFieldTag="keyfield";
 
     @Resource
+    @Lazy
     private MongoTemplate mongoTemplate;
 
     /**

ibzuaa-util/src/main/java/cn/ibizlab/util/security/AuthorizationTokenFilter.java

@@ -27,7 +27,7 @@ public class AuthorizationTokenFilter extends OncePerRequestFilter {
     private final AuthTokenUtil authTokenUtil;
     private final String tokenHeader;
 
-    public AuthorizationTokenFilter( AuthenticationUserService userDetailsService, AuthTokenUtil authTokenUtil, @Value("${ibiz.jwt.header:Authorization}") String tokenHeader) {
+    public AuthorizationTokenFilter(AuthenticationUserService userDetailsService, AuthTokenUtil authTokenUtil, @Value("${ibiz.jwt.header:Authorization}") String tokenHeader) {
         this.userDetailsService = userDetailsService;
         this.authTokenUtil = authTokenUtil;
         this.tokenHeader = tokenHeader;

ibzuaa-util/src/main/java/cn/ibizlab/util/service/IBZUAAUserService.java

@@ -12,11 +12,13 @@ import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 import org.springframework.util.DigestUtils;
 import org.springframework.util.StringUtils;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 
 /**
  * 实体[IBZUSER] 服务对象接口实现
  */
 @Service("IBZUAAUserService")
+@ConditionalOnExpression("${ibiz.enablePermissionValid:false}||'${ibiz.auth.service:SimpleUserService}'.equals('IBZUAAUserService')")
 public class IBZUAAUserService implements AuthenticationUserService{
 
 	@Autowired

ibzuaa-util/src/main/java/cn/ibizlab/util/service/IBZUSERServiceImpl.java

@@ -13,11 +13,13 @@ import cn.ibizlab.util.mapper.IBZUSERMapper;
 import cn.ibizlab.util.domain.IBZUSER;
 import org.springframework.util.DigestUtils;
 import org.springframework.util.StringUtils;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 
 /**
  * 实体[IBZUSER] 服务对象接口实现
  */
 @Service("IBZUSERService")
+@ConditionalOnExpression("(!${ibiz.enablePermissionValid:false})&&'${ibiz.auth.service:SimpleUserService}'.equals('IBZUSERService')")
 public class IBZUSERServiceImpl extends ServiceImpl<IBZUSERMapper, IBZUSER> implements IBZUSERService,AuthenticationUserService{
 
 	@Value("${ibiz.auth.pwencrymode:0}")

ibzuaa-util/src/main/java/cn/ibizlab/util/service/SimpleUserService.java

@@ -11,12 +11,14 @@ import org.springframework.util.StringUtils;
 import com.alibaba.fastjson.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 
 /**
  * 实体[IBZUSER] 服务对象接口实现
  */
 @Primary
 @Service("SimpleUserService")
+@ConditionalOnExpression("(!${ibiz.enablePermissionValid:false})&&'${ibiz.auth.service:SimpleUserService}'.equals('SimpleUserService')")
 public class SimpleUserService implements AuthenticationUserService{
 
 	@Override