Merge branch 'v1' into branch-suntao

* v1:
  提出不用的代码
  修复登入、登出
  移除不用的代码

src/main/java/cn/quantgroup/cashloanflowboss/api/log/controller/LogController.java

@@ -2,6 +2,7 @@ package cn.quantgroup.cashloanflowboss.api.log.controller;
 
 import cn.quantgroup.cashloanflowboss.api.log.model.LoginFormModel;
 import cn.quantgroup.cashloanflowboss.api.log.service.LogService;
+import cn.quantgroup.cashloanflowboss.component.security.Authority;
 import cn.quantgroup.cashloanflowboss.component.security.annotiation.Security;
 import cn.quantgroup.cashloanflowboss.core.base.Result;
 import cn.quantgroup.cashloanflowboss.core.dictionary.ApplicationStatus;
@@ -38,8 +39,8 @@ public class LogController {
      *
      * @return
      */
-    @Security(authorityId = "Log.logout")
     @DeleteMapping("/logout")
+    @Security(authorityId = "Log.logout", authorities = Authority.READ)
     public Result<Boolean> logout() {
         return new Result<>(ApplicationStatus.SUCCESS, this.logService.logout());
     }

src/main/java/cn/quantgroup/cashloanflowboss/api/log/service/LogService.java

 package cn.quantgroup.cashloanflowboss.api.log.service;
 
+import cn.quantgroup.cashloanflowboss.api.role.entity.Permission;
 import cn.quantgroup.cashloanflowboss.api.user.dictionary.UserStatus;
 import cn.quantgroup.cashloanflowboss.api.user.entity.boss.User;
 import cn.quantgroup.cashloanflowboss.api.user.service.UserService;
@@ -15,7 +16,7 @@ import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
-import java.util.HashMap;
+import java.util.Arrays;
 
 /**
  * Created by WeiWei on 2019/7/22.
@@ -51,9 +52,12 @@ public class LogService {
         Assert.isFalse(user.getPassword().equalsIgnoreCase(MD5Tools.md5(password)), ApplicationStatus.USERNAME_OR_PASSWORD_ERROR);
 
         HttpSession session = this.request.getSession(true);
-        session.setAttribute(ApplicationDictionary.SECURITY_KEY, JSONTools.serialize(new HashMap<String, Authority>() {{
-            put("Log.logout", Authority.CREATE);
-        }}));
+
+        Permission permission = new Permission();
+        permission.setId("Log.logout");
+        permission.setAuthorities(Arrays.asList(Authority.READ));
+
+        session.setAttribute(ApplicationDictionary.SECURITY_KEY, JSONTools.serialize(Arrays.asList(permission)));
 
         return true;
 

src/main/java/cn/quantgroup/cashloanflowboss/api/user/controller/UserController.java

@@ -4,9 +4,6 @@ import cn.quantgroup.cashloanflowboss.api.user.entity.boss.User;
 import cn.quantgroup.cashloanflowboss.api.user.model.Pagination;
 import cn.quantgroup.cashloanflowboss.api.user.model.RegisterUserFormModel;
 import cn.quantgroup.cashloanflowboss.api.user.service.UserService;
-import cn.quantgroup.cashloanflowboss.component.security.Power;
-import cn.quantgroup.cashloanflowboss.component.security.annotiation.Security;
-import cn.quantgroup.cashloanflowboss.component.validator.constraints.NotEmpty;
 import cn.quantgroup.cashloanflowboss.component.validator.constraints.NotEmpty;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;

src/main/java/cn/quantgroup/cashloanflowboss/component/security/Power.java

-package cn.quantgroup.cashloanflowboss.component.security;
-
-/**
- * Created by WeiWei on 2019/7/26.
- */
-public enum Power {
-
-    /**
-     * 新建
-     */
-    CREATE,
-
-    /**
-     * 更新
-     */
-    UPDATE,
-
-    /**
-     * 删除
-     */
-    DELETE
-
-}

src/main/java/cn/quantgroup/cashloanflowboss/core/configuration/ApplicationExceptionConfiguration.java

@@ -36,7 +36,6 @@ public class ApplicationExceptionConfiguration {
      */
     @ExceptionHandler({ApplicationException.class})
     public Result applicationExceptionHandler(ApplicationException e) {
-        log.error("程序员开小差了,系统异常信息:{}", e.getMessage());
         return new Result<>(e.getStatus(), null, e.getStatus().getMessage());
     }
 
@@ -96,19 +95,9 @@ public class ApplicationExceptionConfiguration {
     @ExceptionHandler({Throwable.class})
     public Result generalException(Throwable e) {
 
-        Throwable cause = e;
+        log.error(e.getMessage(), e);
 
-        while ((cause = cause.getCause()) != null) {
-            if (ApplicationException.class.isAssignableFrom(cause.getClass())) {
-                cause = cause.getCause();
-                break;
-            }
-        }
-
-        String errorMessage = ApplicationException.class.isAssignableFrom(e.getClass()) ? cause.getMessage() : e.getMessage();
-        log.error("程序员开小差了,未明确的异常信息:{}", errorMessage);
-
-        return new Result<>(ApplicationStatus.INTERNAL_SERVICE_ERROR, ApplicationStatus.INTERNAL_SERVICE_ERROR.getMessage());
+        return new Result<>(ApplicationStatus.INTERNAL_SERVICE_ERROR);
 
     }
 

src/main/java/cn/quantgroup/cashloanflowboss/core/configuration/ApplicationSecurityConfiguration.java

@@ -34,7 +34,7 @@ public class ApplicationSecurityConfiguration implements SecurityHandler {
         HttpSession session = this.request.getSession(false);
 
         // 检查是否已登录
-        Assert.isNull(session.getAttribute(ApplicationDictionary.SECURITY_KEY), ApplicationStatus.AUTHENTICATION_FAILURE);
+        Assert.isTrue((Objects.isNull(session) || Objects.isNull(session.getAttribute(ApplicationDictionary.SECURITY_KEY))), ApplicationStatus.AUTHENTICATION_FAILURE);
 
         // 读取Session授权内容
         List<Permission> permissions = JSONTools.deserialize(String.valueOf(session.getAttribute(ApplicationDictionary.SECURITY_KEY)), new TypeReference<List<Permission>>() {});