新增封装对象，调整java11兼容性

pom.xml

@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.3.0.RELEASE</version>
+        <version>2.1.5.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.common.base</groupId>
     <artifactId>base</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>0.0.1-COMMON</version>
     <packaging>jar</packaging>
     <name>common-base</name>
     <description>基础包</description>
@@ -123,6 +123,12 @@
             <artifactId>commons-pool2</artifactId>
             <version>2.6.2</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/commons-codec/commons-codec -->
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.14</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>

src/main/java/com/common/base/common/ResultPageInfo.java

@@ -0,0 +1,19 @@
+package com.common.base.common;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder(toBuilder = true)
+@Data
+public class ResultPageInfo<T> {
+
+    private List<T> list;
+
+    private long total;
+}

src/main/java/com/common/base/common/WebPageInfo.java

@@ -0,0 +1,57 @@
+package com.common.base.common;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.Serializable;
+
+/**
+ * (WebPageInfo)实体类
+ *
+ * @author lhc
+ * @since 2020-02-11 19:29:10
+ */
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder(toBuilder = true)
+@Data
+@ApiModel
+public class WebPageInfo implements Serializable {
+
+    private static final long serialVersionUID = 1156251348750279606L;
+
+    public static final String DESC = "desc";
+    public static final String ASC = "asc";
+
+    @ApiModelProperty(
+            value="每页显示条数" ,
+            example="10",
+            dataType = "Integer"
+    )
+    private Integer pageSize = 10;
+
+    @ApiModelProperty(
+            value="页码" ,
+            example="1",
+            dataType = "Integer"
+    )
+    private Integer pageNum = 1;
+
+    @ApiModelProperty(value="排序字段")
+    private String sortField;
+
+    @ApiModelProperty(
+            value = "正序倒序",
+            allowableValues = "asc,desc",
+            example = "asc")
+    private String order = ASC;
+
+    public static boolean hasSort(WebPageInfo webPageInfo) {
+        return !StringUtils.isBlank(webPageInfo.getSortField());
+    }
+}

src/main/java/com/common/base/utils/EmptyCheckUtils.java

@@ -0,0 +1,15 @@
+package com.common.base.utils;
+
+import com.common.base.common.ServiceException;
+import org.springframework.util.StringUtils;
+
+public class EmptyCheckUtils {
+
+    public static boolean checkWithException(Object object,String info){
+        if (StringUtils.isEmpty(object)) {
+            throw new ServiceException(info);
+        } else {
+            return true;
+        }
+    }
+}

src/main/java/com/common/base/utils/EncryptUtil.java

@@ -1,6 +1,7 @@
 package com.common.base.utils;
 
-import com.sun.org.apache.xerces.internal.impl.dv.util.Base64;
+
+import org.apache.shiro.codec.Base64;
 
 import javax.crypto.Cipher;
 import javax.crypto.KeyGenerator;
@@ -137,7 +138,7 @@ public class EncryptUtil {
     }
 
     private String base64(byte[] res) {
-        return Base64.encode(res);
+        return String.valueOf(Base64.encode(res));
     }
 
     /**
@@ -305,7 +306,7 @@ public class EncryptUtil {
      * @return
      */
     public String Base64Encode(String res) {
-        return Base64.encode(res.getBytes());
+        return String.valueOf(Base64.encode(res.getBytes()));
     }
 
     /**

src/main/java/com/common/base/utils/UserInfoUtil.java

@@ -43,4 +43,18 @@ public class UserInfoUtil<T> {
     public static <T> T getUserInfo(){
         return (T)SecurityUtils.getSubject().getPrincipal();
     }
+
+    /**
+     * 获取当前用户token
+     * @param request
+     * @return
+     */
+    public static String getUserToken(HttpServletRequest request){
+        String token = request.getHeader("X-Access-Token");
+        //如果header中不存在token，则从参数中获取token
+        if (org.apache.commons.lang3.StringUtils.isBlank(token)) {
+                token = request.getParameter("token");
+        }
+        return token;
+    }
 }