ibiz4j 发布系统代码 [ibz-dict，字典]

ibzdict-core/src/main/java/cn/ibizlab/core/dict/service/impl/DictCatalogServiceImpl.java

@@ -103,9 +103,8 @@ public class DictCatalogServiceImpl extends ServiceImpl<DictCatalogMapper, DictC
     @Transactional
     public DictCatalog get(String key) {
         DictCatalog et = getById(key);
-        if(et == null){
-            et = new DictCatalog();
-            et.setId(key);
+        if (et == null) {
+            throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), key);
         }
         else {
         }

ibzdict-core/src/main/java/cn/ibizlab/core/dict/service/impl/DictOptionServiceImpl.java

@@ -107,9 +107,8 @@ public class DictOptionServiceImpl extends ServiceImpl<DictOptionMapper, DictOpt
     @Transactional
     public DictOption get(String key) {
         DictOption et = getById(key);
-        if(et == null){
-            et = new DictOption();
-            et.setValueKey(key);
+        if (et == null) {
+            throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), key);
         }
         else {
         }

ibzdict-core/src/main/resources/mapper/dict/dictcatalog/DictCatalogMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
 <mapper	namespace="cn.ibizlab.core.dict.mapper.DictCatalogMapper">
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->

ibzdict-core/src/main/resources/mapper/dict/dictoption/DictOptionMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
 <mapper	namespace="cn.ibizlab.core.dict.mapper.DictOptionMapper">
 
     <!--该方法用于重写mybatis中selectById方法，以实现查询逻辑属性-->

ibzdict-provider/ibzdict-provider-api/src/main/java/cn/ibizlab/api/mapping/DictCatalogMapping.java

@@ -12,4 +12,3 @@ public interface DictCatalogMapping extends MappingBase<DictCatalogDTO, DictCata
 
 
 }
-

ibzdict-provider/ibzdict-provider-api/src/main/java/cn/ibizlab/api/mapping/DictOptionMapping.java

@@ -12,4 +12,3 @@ public interface DictOptionMapping extends MappingBase<DictOptionDTO, DictOption
 
 
 }
-

ibzdict-util/src/main/java/cn/ibizlab/util/client/IBZWFFeignClient.java

@@ -24,4 +24,5 @@ public interface IBZWFFeignClient
 	JSONObject wfstart(@PathVariable("system") String system, @PathVariable("appname") String appname,
 					   @PathVariable("entity") String entity,
 					   @PathVariable("businessKey") String businessKey, @RequestBody JSONObject instance);
+
 }

ibzdict-util/src/main/java/cn/ibizlab/util/domain/DELogic.java

@@ -2,6 +2,7 @@ package cn.ibizlab.util.domain;
 
 import lombok.Data;
 import org.flowable.bpmn.model.Process;
+import org.springframework.core.io.Resource;
 import org.kie.api.runtime.KieContainer;
 import java.io.File;
 import java.io.Serializable;
@@ -14,6 +15,6 @@ public class DELogic implements Serializable {
     Process process;
     KieContainer container;
     List<DELogic> refLogic;
-    List<File> refRuleFiles;
+    List<Resource> refRuleFiles;
     String md5;
 }

ibzdict-util/src/main/java/cn/ibizlab/util/filter/SearchContextBase.java

@@ -67,6 +67,7 @@ public class SearchContextBase implements ISearchContext{
      * 工作流流程标识
      */
     public String processDefinitionKey;
+
     /**
      * 获取工作流步骤标识
      */

ibzdict-util/src/main/java/cn/ibizlab/util/security/AuthenticationUser.java

@@ -52,6 +52,11 @@ public class AuthenticationUser implements UserDetails
      * 租户
      */
     private String srfdcid;
+    /**
+     * 系统标识
+     */
+    private String srfsystemid;
+	/**
     /**
      * 动态实例标识
      */
@@ -254,6 +259,8 @@ public class AuthenticationUser implements UserDetails
 		if(this.sessionParams==null)
 		{
 			sessionParams = getUserSessionParam();
+			sessionParams.put("srfsystemid",this.getSrfsystemid());
+			sessionParams.put("srfdynainstid",this.getSrfdynainstid());
 			sessionParams.put("srfpersonid", this.getUserid());
 			sessionParams.put("srfpersonname", this.getPersonname());
 			sessionParams.put("srforgsectorid", this.getMdeptid());

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

@@ -3,7 +3,6 @@ package cn.ibizlab.util.security;
 import io.jsonwebtoken.ExpiredJwtException;
 import lombok.extern.slf4j.Slf4j;
 import cn.ibizlab.util.service.AuthenticationUserService;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -22,6 +21,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.*;
+import org.springframework.util.StringUtils;
 
 @Slf4j
 @Component