From e099f2b9b194ce4addec64845273a075995e9b4f Mon Sep 17 00:00:00 2001 From: haoqiong liu Date: Thu, 30 Jul 2020 11:31:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B0=81=E8=A3=85=E5=AF=B9?= =?UTF-8?q?=E8=B1=A1=EF=BC=8C=E8=B0=83=E6=95=B4java11=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 10 +++- .../common/base/common/ResultPageInfo.java | 19 +++++++ .../com/common/base/common/WebPageInfo.java | 57 +++++++++++++++++++ .../common/base/utils/EmptyCheckUtils.java | 15 +++++ .../com/common/base/utils/EncryptUtil.java | 7 ++- .../com/common/base/utils/UserInfoUtil.java | 14 +++++ 6 files changed, 117 insertions(+), 5 deletions(-) create mode 100644 src/main/java/com/common/base/common/ResultPageInfo.java create mode 100644 src/main/java/com/common/base/common/WebPageInfo.java create mode 100644 src/main/java/com/common/base/utils/EmptyCheckUtils.java diff --git a/pom.xml b/pom.xml index 78b9567..b50145f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,12 +5,12 @@ org.springframework.boot spring-boot-starter-parent - 2.3.0.RELEASE + 2.1.5.RELEASE com.common.base base - 0.0.1-SNAPSHOT + 0.0.1-COMMON jar common-base 基础包 @@ -123,6 +123,12 @@ commons-pool2 2.6.2 + + + commons-codec + commons-codec + 1.14 + org.springframework.boot spring-boot-starter-test diff --git a/src/main/java/com/common/base/common/ResultPageInfo.java b/src/main/java/com/common/base/common/ResultPageInfo.java new file mode 100644 index 0000000..2743663 --- /dev/null +++ b/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 { + + private List list; + + private long total; +} diff --git a/src/main/java/com/common/base/common/WebPageInfo.java b/src/main/java/com/common/base/common/WebPageInfo.java new file mode 100644 index 0000000..16a346b --- /dev/null +++ b/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()); + } +} diff --git a/src/main/java/com/common/base/utils/EmptyCheckUtils.java b/src/main/java/com/common/base/utils/EmptyCheckUtils.java new file mode 100644 index 0000000..97865d0 --- /dev/null +++ b/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; + } + } +} diff --git a/src/main/java/com/common/base/utils/EncryptUtil.java b/src/main/java/com/common/base/utils/EncryptUtil.java index aff3f83..c2a6631 100644 --- a/src/main/java/com/common/base/utils/EncryptUtil.java +++ b/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())); } /** diff --git a/src/main/java/com/common/base/utils/UserInfoUtil.java b/src/main/java/com/common/base/utils/UserInfoUtil.java index 11e6079..af1ba48 100644 --- a/src/main/java/com/common/base/utils/UserInfoUtil.java +++ b/src/main/java/com/common/base/utils/UserInfoUtil.java @@ -43,4 +43,18 @@ public class UserInfoUtil { public static 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; + } }