Merge pull request #32 from TaleLin/refactor/other

整理代码规范

Author: colorful3

pom.xml

@@ -11,7 +11,7 @@
 
     <groupId>io.github.talelin</groupId>
     <artifactId>latticy</artifactId>
-    <version>0.1.0-RELEASE</version>
+    <version>0.1.1-RC1</version>
     <name>latticy</name>
     <description>Demo project for lin cms</description>
 

src/main/java/io/github/talelin/latticy/bo/GroupPermissionBO.java

@@ -9,6 +9,7 @@
 
 /**
  * @author pedro@TaleLin
+ * @author Juzi@TaleLin
  */
 @Data
 @NoArgsConstructor
@@ -20,7 +21,7 @@ public class GroupPermissionBO {
 
     private String info;
 
-    private List permissions;
+    private List<PermissionDO> permissions;
 
     public GroupPermissionBO(GroupDO group, List<PermissionDO> permissions) {
         BeanUtil.copyProperties(group, this);

src/main/java/io/github/talelin/latticy/common/exception/RestExceptionHandler.java

@@ -35,8 +35,8 @@
 /**
  * @author pedro@TaleLin
  * @author colorful@TaleLin
+ * @author Juzi@TaleLin
  */
-@SuppressWarnings("Duplicates")
 @Order
 @RestControllerAdvice
 @Slf4j

src/main/java/io/github/talelin/latticy/common/interceptor/AuthorizeVerifyResolverImpl.java

@@ -1,6 +1,9 @@
 package io.github.talelin.latticy.common.interceptor;
 
-import com.auth0.jwt.exceptions.*;
+import com.auth0.jwt.exceptions.AlgorithmMismatchException;
+import com.auth0.jwt.exceptions.InvalidClaimException;
+import com.auth0.jwt.exceptions.JWTDecodeException;
+import com.auth0.jwt.exceptions.SignatureVerificationException;
 import com.auth0.jwt.exceptions.TokenExpiredException;
 import com.auth0.jwt.interfaces.Claim;
 import io.github.talelin.autoconfigure.bean.MetaInfo;
@@ -28,14 +31,14 @@
 
 /**
  * @author pedro@TaleLin
+ * @author Juzi@TaleLin
  */
-@SuppressWarnings("Duplicates")
 @Component
 public class AuthorizeVerifyResolverImpl implements AuthorizeVerifyResolver {
 
-    public final static String authorizationHeader = "Authorization";
+    public final static String AUTHORIZATION_HEADER = "Authorization";
 
-    public final static String bearerPattern = "^Bearer$";
+    public final static String BEARER_PATTERN = "^Bearer$";
 
     @Autowired
     private DoubleJWT jwt;
@@ -53,9 +56,10 @@ public class AuthorizeVerifyResolverImpl implements AuthorizeVerifyResolver {
     private String servePath;
 
 
+    @Override
     public boolean handleLogin(HttpServletRequest request, HttpServletResponse response, MetaInfo meta) {
         String tokenStr = verifyHeader(request, response);
-        Map<String, Claim> claims = null;
+        Map<String, Claim> claims;
         try {
             claims = jwt.decodeAccessToken(tokenStr);
         } catch (TokenExpiredException e) {
@@ -70,30 +74,35 @@ public boolean handleLogin(HttpServletRequest request, HttpServletResponse respo
     public boolean handleGroup(HttpServletRequest request, HttpServletResponse response, MetaInfo meta) {
         handleLogin(request, response, meta);
         UserDO user = LocalUser.getLocalUser();
-        if (verifyAdmin(user))
+        if (verifyAdmin(user)) {
             return true;
+        }
         long userId = user.getId();
         String permission = meta.getPermission();
         String module = meta.getModule();
         List<PermissionDO> permissions = userService.getUserPermissions(userId);
         boolean matched = permissions.stream().anyMatch(it -> it.getModule().equals(module) && it.getName().equals(permission));
-        if (!matched)
+        if (!matched) {
             throw new AuthenticationException("you don't have the permission to access", 10001);
+        }
         return true;
     }
 
+    @Override
     public boolean handleAdmin(HttpServletRequest request, HttpServletResponse response, MetaInfo meta) {
         handleLogin(request, response, meta);
         UserDO user = LocalUser.getLocalUser();
-        if (!verifyAdmin(user))
+        if (!verifyAdmin(user)) {
             throw new AuthenticationException("you don't have the permission to access", 10001);
+        }
         return true;
     }
 
 
+    @Override
     public boolean handleRefresh(HttpServletRequest request, HttpServletResponse response, MetaInfo meta) {
         String tokenStr = verifyHeader(request, response);
-        Map<String, Claim> claims = null;
+        Map<String, Claim> claims;
         try {
             claims = jwt.decodeRefreshToken(tokenStr);
         } catch (TokenExpiredException e) {
@@ -148,7 +157,7 @@ private boolean verifyAdmin(UserDO user) {
 
     private String verifyHeader(HttpServletRequest request, HttpServletResponse response) {
         // 处理头部header,带有access_token的可以访问
-        String authorization = request.getHeader(authorizationHeader);
+        String authorization = request.getHeader(AUTHORIZATION_HEADER);
         if (authorization == null || Strings.isBlank(authorization)) {
             throw new AuthorizationException("authorization field is required", 10012);
         }
@@ -160,7 +169,7 @@ private String verifyHeader(HttpServletRequest request, HttpServletResponse resp
         String scheme = splits[0];
         // token 字段
         String tokenStr = splits[1];
-        if (!Pattern.matches(bearerPattern, scheme)) {
+        if (!Pattern.matches(BEARER_PATTERN, scheme)) {
             throw new AuthorizationException("authorization field is invalid", 10013);
         }
         return tokenStr;

src/main/java/io/github/talelin/latticy/controller/cms/UserController.java

@@ -31,6 +31,7 @@
 
 /**
  * @author pedro@TaleLin
+ * @author Juzi@TaleLin
  */
 @RestController
 @RequestMapping("/cms/user")
@@ -72,8 +73,9 @@ public Tokens login(@RequestBody @Validated LoginDTO validator) {
                 user.getId(),
                 user.getUsername(),
                 validator.getPassword());
-        if (!valid)
+        if (!valid) {
             throw new ParameterException("username or password is fault", 10031);
+        }
         return jwt.generateTokens(user.getId());
     }
 

src/main/java/io/github/talelin/latticy/dto/book/CreateOrUpdateBookDTO.java

@@ -1,16 +1,16 @@
 package io.github.talelin.latticy.dto.book;
 
-import lombok.Getter;
+import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.Setter;
 
-import javax.validation.constraints.*;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.Size;
 
 /**
  * @author pedro@TaleLin
+ * @author Juzi@TaleLin
  */
-@Setter
-@Getter
+@Data
 @NoArgsConstructor
 public class CreateOrUpdateBookDTO {
 

src/main/java/io/github/talelin/latticy/dto/user/ChangePasswordDTO.java

@@ -1,18 +1,17 @@
 package io.github.talelin.latticy.dto.user;
 
 import io.github.talelin.autoconfigure.validator.EqualField;
-import lombok.Getter;
+import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.Setter;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Pattern;
 
 /**
  * @author pedro@TaleLin
+ * @author Juzi@TaleLin
  */
-@Setter
-@Getter
+@Data
 @NoArgsConstructor
 @EqualField(srcField = "newPassword", dstField = "confirmPassword", message = "{password.equal-field}")
 public class ChangePasswordDTO {
@@ -26,4 +25,5 @@ public class ChangePasswordDTO {
 
     @NotBlank(message = "{password.old-password.not-blank}")
     private String oldPassword;
+
 }

src/main/java/io/github/talelin/latticy/dto/user/LoginDTO.java

@@ -1,16 +1,15 @@
 package io.github.talelin.latticy.dto.user;
 
-import lombok.Getter;
+import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.Setter;
 
 import javax.validation.constraints.NotBlank;
 
 /**
  * @author pedro@TaleLin
+ * @author Juzi@TaleLin
  */
-@Setter
-@Getter
+@Data
 @NoArgsConstructor
 public class LoginDTO {
 

src/main/java/io/github/talelin/latticy/dto/user/RegisterDTO.java

@@ -2,18 +2,20 @@
 
 import io.github.talelin.autoconfigure.validator.EqualField;
 import io.github.talelin.autoconfigure.validator.LongList;
-import lombok.Getter;
+import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.Setter;
 
-import javax.validation.constraints.*;
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
 import java.util.List;
 
 /**
  * @author pedro@TaleLin
+ * @author Juzi@TaleLin
  */
-@Setter
-@Getter
+@Data
 @NoArgsConstructor
 @EqualField(srcField = "password", dstField = "confirmPassword", message = "{password.equal-field}")
 public class RegisterDTO {
@@ -34,6 +36,4 @@ public class RegisterDTO {
 
     @NotBlank(message = "{password.confirm-password.not-blank}")
     private String confirmPassword;
-
-
 }

src/main/java/io/github/talelin/latticy/module/file/AbstractUploader.java

@@ -13,18 +13,21 @@
  * 模版模式
  *
  * @author pedro@TaleLin
+ * @author Juzi@TaleLin
  */
 public abstract class AbstractUploader implements Uploader {
 
     private PreHandler preHandler;
 
+    @Override
     public List<File> upload(MultiValueMap<String, MultipartFile> fileMap) {
         checkFileMap(fileMap);
         // 得到单个文件的大小限制
         // 本地存储需先初始化存储文件夹
         return handleMultipartFiles(fileMap);
     }
 
+    @Override
     public List<File> upload(MultiValueMap<String, MultipartFile> fileMap, PreHandler preHandler) {
         this.preHandler = preHandler;
         return this.upload(fileMap);
@@ -60,8 +63,9 @@ private void handleOneFile0(List<File> res, long singleFileLimit, MultipartFile
                 extension(ext).
                 build();
         // 如果预处理器不为空，且处理结果为false，直接返回, 否则处理
-        if (preHandler != null && !preHandler.handle(fileData))
+        if (preHandler != null && !preHandler.handle(fileData)) {
             return;
+        }
         boolean ok = handleOneFile(bytes, newFilename);
         if (ok) {
             res.add(fileData);