增加动态数据源静态方法获取方式

hsweb-web-core/src/main/java/org/hsweb/web/core/authorize/validator/SimpleAuthorizeValidator.java

@@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
+import java.util.function.Predicate;
 
 /**
  * 权限验证器
@@ -43,9 +44,9 @@ public class SimpleAuthorizeValidator implements AuthorizeValidator {
         //验证角色
         if (!roles.isEmpty()) {
             if (mod == Authorize.MOD.AND)
-                access = roles.stream().allMatch(role -> user.hasAccessRole(role));
+                access = roles.stream().allMatch(user::hasAccessRole);
             else
-                access = roles.stream().anyMatch(role -> user.hasAccessRole(role));
+                access = roles.stream().anyMatch(user::hasAccessRole);
         }
         //验证表达式
         if (!expressions.isEmpty()) {

hsweb-web-core/src/main/java/org/hsweb/web/core/datasource/DynamicDataSource.java

@@ -31,6 +31,7 @@ public interface DynamicDataSource extends DataSource {
 
     String DATA_SOURCE_FLAG_LAST = "data-source-id-last";
 
+
     static void useLast() {
         use(ThreadLocalUtils.get(DATA_SOURCE_FLAG_LAST));
     }

hsweb-web-core/src/main/java/org/hsweb/web/core/datasource/DynamicDataSourceHolder.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2015-2016 http://hsweb.me
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.hsweb.web.core.datasource;
+
+
+import javax.sql.DataSource;
+
+public class DynamicDataSourceHolder {
+
+    private static DynamicDataSource dynamicDataSource;
+
+    public static DataSource getActiveSource() {
+        if (dynamicDataSource != null) {
+            return dynamicDataSource.getActiveDataSource();
+        }
+        return null;
+    }
+
+    public static void install(DynamicDataSource dynamicDataSource) {
+        if (DynamicDataSourceHolder.dynamicDataSource != null) {
+            throw new UnsupportedOperationException();
+        }
+        DynamicDataSourceHolder.dynamicDataSource = dynamicDataSource;
+    }
+}