Merge pull request #79 from hocgin/v1.0.20

V1.0.20

Author: hocgin

README.md

@@ -1,6 +1,8 @@
 # spring-boot-starters-project
 
-> [![Publish Package](https://github.com/hocgin/spring-boot-starters-project/actions/workflows/publish.yml/badge.svg)](https://github.com/hocgin/spring-boot-starters-project/actions/workflows/publish.yml)
+> [![Deploy](https://github.com/hocgin/spring-boot-starters-project/actions/workflows/deploy.yml/badge.svg?branch=v1.0.20)](https://github.com/hocgin/spring-boot-starters-project/actions/workflows/deploy.yml)
+> [![Maven Central](https://maven-badges.herokuapp.com/maven-central/in.hocg.boot/spring-boot-starters-project/badge.svg)](https://search.maven.org/search?q=in.hocg.boot)
+
 
 [Maven Center](https://search.maven.org/search?q=in.hocg.boot)
 
@@ -33,7 +35,6 @@
 |wx-ma-spring-boot-starter|微信公众号(配置化)|-|
 |wx-mp-spring-boot-starter|微信小程序(配置化)|-|
 |xxljob-spring-boot-starter|xxljob(薄封装)|-|
-
 |spring-boot-webmagic|挖坑|-|
 |spring-boot-excel|挖坑|-|
 |spring-boot-elasticsearch|挖坑|-|

pom.xml

@@ -16,7 +16,7 @@
   <version>${revision}</version>
 
   <properties>
-    <revision>1.0.19</revision>
+    <revision>1.0.20</revision>
 
     <java.version>1.8</java.version>
     <java.source.version>1.8</java.source.version>

spring-boot-mybatis-plus/mybatis-plus-spring-boot-autoconfigure/src/main/java/in/hocg/boot/mybatis/plus/autoconfiguration/ro/ScrollRo.java

@@ -0,0 +1,22 @@
+package in.hocg.boot.mybatis.plus.autoconfiguration.ro;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * Created by hocgin on 2021/11/29
+ * email: [email protected]
+ * 滚动翻页
+ *
+ * @author hocgin
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+public class ScrollRo extends BasicRo {
+    private Serializable nextId;
+    private Integer size = 20;
+}

spring-boot-mybatis-plus/mybatis-plus-spring-boot-autoconfigure/src/main/java/in/hocg/boot/mybatis/plus/autoconfiguration/vo/IScroll.java

@@ -0,0 +1,31 @@
+package in.hocg.boot.mybatis.plus.autoconfiguration.vo;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Created by hocgin on 2021/11/29
+ * email: [email protected]
+ *
+ * @author hocgin
+ */
+@Data
+@Accessors(chain = true)
+public class IScroll<T> implements Serializable {
+    /**
+     * 是否有下一页
+     */
+    private Boolean hasMore = false;
+    /**
+     * 上一页的最后ID(> ID)
+     */
+    private Serializable nextId;
+    /**
+     * 数据
+     */
+    private List<T> records = Collections.emptyList();
+}

spring-boot-sso/sso-client-spring-boot-autoconfigure/src/main/java/in/hocg/boot/sso/client/autoconfigure/core/servlet/ServletSsoClientConfiguration.java

@@ -1,5 +1,8 @@
 package in.hocg.boot.sso.client.autoconfigure.core.servlet;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
 import in.hocg.boot.sso.client.autoconfigure.core.AuthenticationResult;
 import in.hocg.boot.sso.client.autoconfigure.properties.SsoClientProperties;
@@ -30,6 +33,8 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Created by hocgin on 2020/9/2
@@ -50,15 +55,45 @@ protected void configure(HttpSecurity http) throws Exception {
         String[] ignoreUrls = properties.getIgnoreUrls().toArray(new String[]{});
         String[] denyUrls = properties.getDenyUrls().toArray(new String[]{});
         String[] authenticatedUrls = properties.getAuthenticatedUrls().toArray(new String[]{});
+        Map<String, List<String>> hasAnyRole = properties.getHasAnyRole();
+        Map<String, List<String>> hasAnyAuthority = properties.getHasAnyAuthority();
+        Map<String, String> hasIpAddress = properties.getHasIpAddress();
         {
             ExpressionUrlAuthorizationConfigurer<HttpSecurity>.ExpressionInterceptUrlRegistry expressionInterceptUrlRegistry =
                 http.authorizeRequests();
+
+            // 如果配置禁止访问
             if (denyUrls.length > 0) {
                 expressionInterceptUrlRegistry.antMatchers(denyUrls).denyAll();
             }
+
+            // 如果配置需登陆
             if (authenticatedUrls.length > 0) {
                 expressionInterceptUrlRegistry.antMatchers(authenticatedUrls).authenticated();
             }
+
+            // 如果配置角色
+            if (CollUtil.isNotEmpty(hasAnyRole)) {
+                hasAnyRole.entrySet().stream()
+                    .filter(entry -> StrUtil.isNotBlank(entry.getKey()) && CollUtil.isNotEmpty(entry.getValue()))
+                    .forEach(entry -> expressionInterceptUrlRegistry.antMatchers(entry.getKey()).hasAnyRole(ArrayUtil.toArray(entry.getValue(), String.class)));
+            }
+
+            // 如果配置权限
+            if (CollUtil.isNotEmpty(hasAnyAuthority)) {
+                hasAnyRole.entrySet().stream()
+                    .filter(entry -> StrUtil.isNotBlank(entry.getKey()) && CollUtil.isNotEmpty(entry.getValue()))
+                    .forEach(entry -> expressionInterceptUrlRegistry.antMatchers(entry.getKey()).hasAnyAuthority(ArrayUtil.toArray(entry.getValue(), String.class)));
+            }
+
+            // 如果配置IP白名单
+            if (CollUtil.isNotEmpty(hasIpAddress)) {
+                hasIpAddress.entrySet().stream()
+                    .filter(entry -> StrUtil.isNotBlank(entry.getKey()) && StrUtil.isNotBlank(entry.getValue()))
+                    .forEach(entry -> expressionInterceptUrlRegistry.antMatchers(entry.getKey()).hasIpAddress(entry.getValue()));
+            }
+
+            // 如果配置忽略
             if (ignoreUrls.length > 0) {
                 expressionInterceptUrlRegistry.antMatchers(ignoreUrls).permitAll();
             }

spring-boot-sso/sso-client-spring-boot-autoconfigure/src/main/java/in/hocg/boot/sso/client/autoconfigure/properties/SsoClientProperties.java

@@ -1,12 +1,14 @@
 package in.hocg.boot.sso.client.autoconfigure.properties;
 
 
+import com.google.common.collect.Maps;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by hocgin on 2019/6/12.
@@ -33,4 +35,16 @@ public class SsoClientProperties {
      * 需认证(支持表达式)
      */
     private List<String> authenticatedUrls = Collections.emptyList();
+    /**
+     * 需要任意角色(支持表达式)
+     */
+    private Map<String, List<String>> hasAnyRole = Maps.newHashMap();
+    /**
+     * 需要任意权限(支持表达式)
+     */
+    private Map<String, List<String>> hasAnyAuthority = Maps.newHashMap();
+    /**
+     * IP 白名单(支持表达式)
+     */
+    private Map<String, String> hasIpAddress = Maps.newHashMap();
 }

spring-boot-web/web-core/src/main/java/in/hocg/boot/web/exception/ServiceException.java

@@ -4,6 +4,8 @@
 import cn.hutool.http.HttpStatus;
 import lombok.Getter;
 
+import java.util.function.Supplier;
+
 /**
  * Created by hocgin on 2019-09-24.
  * email: [email protected]
@@ -19,15 +21,19 @@ protected ServiceException(int code, String message) {
         this.code = code;
     }
 
+    public static Supplier<ServiceException> supplier(CharSequence template, Object... args) {
+        return () -> ServiceException.wrap(StrUtil.format(template, args));
+    }
+
     public static ServiceException wrap(Exception e) {
         return wrap(e.getMessage());
     }
 
-    public static ServiceException wrap(String message, Object... args) {
+    public static ServiceException wrap(CharSequence message, Object... args) {
         return wrap(HttpStatus.HTTP_INTERNAL_ERROR, message, args);
     }
 
-    public static ServiceException wrap(int code, String message, Object... args) {
+    public static ServiceException wrap(int code, CharSequence message, Object... args) {
         return new ServiceException(code, StrUtil.format(message, args));
     }