Selaa lähdekoodia

添加接口权限开启开关

hexiao 2 vuotta sitten
vanhempi
commit
aa35bf4341

+ 5 - 3
purchase-admin/src/main/resources/application-dev.yml

@@ -9,12 +9,14 @@ purchase:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例( Windows配置D:/purchase/uploadPath,Linux配置 /home/purchase/uploadPath)
-  #  profile: C:/purchase/uploadPath
-  profile: /Users/sunhuanhuan/Documents/project/106/文档/purchase/uploadPath
+  profile: C:/purchase/uploadPath
+#  profile: /Users/sunhuanhuan/Documents/project/106/文档/purchase/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证
   captchaType: math
+  # 全部用户是否开启接口权限校验,排除admin用户
+  permissionsEnable: false
 
 # 开发环境配置
 server:
@@ -33,7 +35,7 @@ server:
 logging:
   level:
     com.ozs: debug
-    org.springframework: warn
+    org.springframework: debug
 
 
 # 用户配置

+ 2 - 0
purchase-admin/src/main/resources/application-prod.yml

@@ -15,6 +15,8 @@ purchase:
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证
   captchaType: math
+  # 全部用户是否开启接口权限校验,排除admin用户
+  permissionsEnable: true
 
 # 开发环境配置
 server:

+ 2 - 0
purchase-admin/src/main/resources/application-test.yml

@@ -14,6 +14,8 @@ purchase:
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证
   captchaType: math
+  # 全部用户是否开启接口权限校验,排除admin用户
+  permissionsEnable: false
 
 # 开发环境配置
 server:

+ 1 - 1
purchase-admin/src/main/resources/application.yml

@@ -10,4 +10,4 @@ server:
 # Spring配置
 spring:
   profiles:
-    active: druid,dev
+    active: druid,test

+ 2 - 2
purchase-admin/src/main/resources/logback.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-    <!--    <property name="log.path" value="/home/purchase/logs" />-->
-    <property name="log.path" value="/Users/sunhuanhuan/Documents/project/106/文档/purchase/logs"/>
+        <property name="log.path" value="/home/purchase/logs" />
+<!--    <property name="log.path" value="/Users/sunhuanhuan/Documents/project/106/文档/purchase/logs"/>-->
     <!-- 日志输出格式 -->
     <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
 

+ 15 - 0
purchase-common/src/main/java/com/ozs/common/config/PurchaseConfig.java

@@ -33,6 +33,9 @@ public class PurchaseConfig
     /** 验证码类型 */
     private static String captchaType;
 
+    /** 获取权限开关 */
+    private static boolean permissionsEnable;
+
     public String getName()
     {
         return name;
@@ -101,6 +104,16 @@ public class PurchaseConfig
         PurchaseConfig.captchaType = captchaType;
     }
 
+    public static boolean isPermissionsEnable()
+    {
+        return permissionsEnable;
+    }
+
+    public void setPermissionsEnable(boolean permissionsEnable)
+    {
+        PurchaseConfig.permissionsEnable = permissionsEnable;
+    }
+
     /**
      * 获取导入上传路径
      */
@@ -132,4 +145,6 @@ public class PurchaseConfig
     {
         return getProfile() + "/upload";
     }
+
+
 }

+ 3 - 1
purchase-common/src/main/java/com/ozs/common/core/domain/entity/SysUser.java

@@ -3,6 +3,8 @@ package com.ozs.common.core.domain.entity;
 import java.util.Date;
 import java.util.List;
 import javax.validation.constraints.*;
+
+import com.ozs.common.config.PurchaseConfig;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ozs.common.annotation.Excel;
@@ -116,7 +118,7 @@ public class SysUser extends BaseEntity
 
     public static boolean isAdmin(Long userId)
     {
-        return userId != null && 1L == userId;
+        return PurchaseConfig.isPermissionsEnable()? userId != null && 1L == userId : true;
     }
 
     public Long getDeptId()

+ 5 - 1
purchase-common/src/main/java/com/ozs/common/utils/SecurityUtils.java

@@ -1,5 +1,6 @@
 package com.ozs.common.utils;
 
+import com.ozs.common.config.PurchaseConfig;
 import com.ozs.common.exception.ServiceException;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -7,6 +8,9 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import com.ozs.common.constant.HttpStatus;
 import com.ozs.common.core.domain.model.LoginUser;
 
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * 安全服务工具类
  *
@@ -115,6 +119,6 @@ public class SecurityUtils
      */
     public static boolean isAdmin(Long userId)
     {
-        return userId != null && 1L == userId;
+        return PurchaseConfig.isPermissionsEnable()? userId != null && 1L == userId : true;
     }
 }

+ 4 - 0
purchase-framework/src/main/java/com/ozs/framework/web/service/SysLoginService.java

@@ -94,8 +94,12 @@ public class SysLoginService
         {
             AuthenticationContextHolder.clearContext();
         }
+
+        // 记录登录信息
         AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
         LoginUser loginUser = (LoginUser) authentication.getPrincipal();
+
+       //记录登录信息
         recordLoginInfo(loginUser.getUserId());
         // 生成token
         return tokenService.createToken(loginUser);