zhouweidong 发布系统代码

ibzpay-core/src/main/java/cn/ibizlab/core/pay/domain/PayTrade.java

@@ -197,6 +197,22 @@ public class PayTrade extends EntityMP implements Serializable {
     }
 
 
+    /**
+     * 获取 [交易标识]
+     */
+    public String getTradeId(){
+        if(ObjectUtils.isEmpty(tradeId)){
+            tradeId=(String)getDefaultKey(true);
+        }
+        return tradeId;
+    }
+
+    @Override
+    public Serializable getDefaultKey(boolean gen) {
+        if((!ObjectUtils.isEmpty(this.getAccessId()))&&(!ObjectUtils.isEmpty(this.getOutTradeNo())))
+            return DigestUtils.md5DigestAsHex(String.format("%s||%s" ,this.getAccessId(),this.getOutTradeNo()).getBytes());
+        return null;
+    }
 }
 
 

ibzpay-core/src/main/java/cn/ibizlab/core/pay/service/impl/PayTradeServiceImpl.java

@@ -65,7 +65,7 @@ public class PayTradeServiceImpl extends ServiceImpl<PayTradeMapper, PayTrade> i
     @Override
     public void createBatch(List<PayTrade> list) {
         list.forEach(item->fillParentData(item));
-        this.saveBatch(list,batchSize);
+        this.saveOrUpdateBatch(list,batchSize);
     }
 
     @Override

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

@@ -32,7 +32,7 @@ public class AuthorizationTokenFilter extends OncePerRequestFilter {
     private final UserDetailsService userDetailsService;
     private final AuthTokenUtil authTokenUtil;
     private final String tokenHeader;
-    private Set<String> excludesPattern;
+    private Set<String> excludesPattern = new HashSet<String>();
     private PathMatcher pathMatcher = new AntPathMatcher();
 
     public AuthorizationTokenFilter(AuthenticationUserService userDetailsService, AuthTokenUtil authTokenUtil, @Value("${ibiz.jwt.header:Authorization}") String tokenHeader) {