shigongchen 3 months ago
parent
commit
fc54cbb2ca

+ 1 - 1
yudao-framework/yudao-spring-boot-starter-biz-data-permission/src/main/java/cn/iocoder/yudao/framework/datapermission/core/rule/dept/DeptDataPermissionRuleCustomizer.java

@@ -5,7 +5,7 @@ package cn.iocoder.yudao.framework.datapermission.core.rule.dept;
  *
  *
  * @author 芋道源码
  * @author 芋道源码
  */
  */
-@FunctionalInterface
+
 public interface DeptDataPermissionRuleCustomizer {
 public interface DeptDataPermissionRuleCustomizer {
 
 
     /**
     /**

+ 2 - 0
yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/SecurityProperties.java

@@ -41,6 +41,8 @@ public class SecurityProperties {
 
 
     /**
     /**
      * 免登录的 URL 列表
      * 免登录的 URL 列表
+     *
+     * 通过配置文件获取    application.yaml
      */
      */
     private List<String> permitAllUrls = Collections.emptyList();
     private List<String> permitAllUrls = Collections.emptyList();
 
 

+ 1 - 1
yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/filter/TokenAuthenticationFilter.java

@@ -95,7 +95,7 @@ public class TokenAuthenticationFilter extends OncePerRequestFilter {
     /**
     /**
      * 模拟登录用户,方便日常开发调试
      * 模拟登录用户,方便日常开发调试
      *
      *
-     * 注意,在线上环境下,一定要关闭该功能!!!
+//     * 注意,在线上环境下,一定要关闭该功能!!!
      *
      *
      * @param request 请求
      * @param request 请求
      * @param token 模拟的 token,格式为 {@link SecurityProperties#getMockSecret()} + 用户编号
      * @param token 模拟的 token,格式为 {@link SecurityProperties#getMockSecret()} + 用户编号

+ 1 - 1
yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/core/service/SecurityFrameworkServiceImpl.java

@@ -15,7 +15,7 @@ import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUti
  *
  *
  * @author 芋道源码
  * @author 芋道源码
  */
  */
-@AllArgsConstructor
+@AllArgsConstructor  //用于自动生成一个包含所有字段的构造函数。这个构造函数会接受类中所有的字段作为参数,并将它们初始化。
 public class SecurityFrameworkServiceImpl implements SecurityFrameworkService {
 public class SecurityFrameworkServiceImpl implements SecurityFrameworkService {
 
 
     private final PermissionApi permissionApi;
     private final PermissionApi permissionApi;

+ 4 - 1
yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/framework/file/core/client/s3/S3FileClient.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.infra.framework.file.core.client.s3;
 package cn.iocoder.yudao.module.infra.framework.file.core.client.s3;
 
 
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.io.IoUtil;
+import cn.hutool.core.map.MapWrapper;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpUtil;
 import cn.hutool.http.HttpUtil;
 import cn.iocoder.yudao.module.infra.framework.file.core.client.AbstractFileClient;
 import cn.iocoder.yudao.module.infra.framework.file.core.client.AbstractFileClient;
@@ -8,6 +9,8 @@ import io.minio.*;
 import io.minio.http.Method;
 import io.minio.http.Method;
 
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayInputStream;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeUnit;
 
 
 /**
 /**
@@ -103,7 +106,7 @@ public class S3FileClient extends AbstractFileClient<S3FileClientConfig> {
         // 执行上传
         // 执行上传
         client.putObject(PutObjectArgs.builder()
         client.putObject(PutObjectArgs.builder()
                 .bucket(config.getBucket()) // bucket 必须传递
                 .bucket(config.getBucket()) // bucket 必须传递
-                .contentType(type)
+                .contentType(type).headers(new HashMap(){{put("x-amz-acl", "public-read");}})
                 .object(path) // 相对路径作为 key
                 .object(path) // 相对路径作为 key
                 .stream(new ByteArrayInputStream(content), content.length, -1) // 文件内容
                 .stream(new ByteArrayInputStream(content), content.length, -1) // 文件内容
                 .build());
                 .build());

+ 0 - 2
yudao-module-learn/yudao-learn-biz/src/main/java/cn/iocoder/yudao/module/learn/controller/admin/PersonList/DemoTestController.java

@@ -49,10 +49,8 @@ public class DemoTestController {
     @PostMapping("/delPerson")
     @PostMapping("/delPerson")
     @Operation(summary = "删除测试人员信息")
     @Operation(summary = "删除测试人员信息")
     public CommonResult<Integer>delPerson(@Valid @RequestBody PersonVo personVo){
     public CommonResult<Integer>delPerson(@Valid @RequestBody PersonVo personVo){
-
         boolean del = personListService.deletePerson(personVo);
         boolean del = personListService.deletePerson(personVo);
         return success((del == true) ? 0:500 ,"删除成功");
         return success((del == true) ? 0:500 ,"删除成功");
-
     }
     }
 
 
     /**
     /**

+ 1 - 0
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java

@@ -73,6 +73,7 @@ public class AuthController {
     @PermitAll
     @PermitAll
     @Operation(summary = "登出系统")
     @Operation(summary = "登出系统")
     public CommonResult<Boolean> logout(HttpServletRequest request) {
     public CommonResult<Boolean> logout(HttpServletRequest request) {
+        //从请求中,获得认证 Token
         String token = SecurityFrameworkUtils.obtainAuthorization(request,
         String token = SecurityFrameworkUtils.obtainAuthorization(request,
                 securityProperties.getTokenHeader(), securityProperties.getTokenParameter());
                 securityProperties.getTokenHeader(), securityProperties.getTokenParameter());
         if (StrUtil.isNotBlank(token)) {
         if (StrUtil.isNotBlank(token)) {

+ 1 - 1
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/permission/RoleDO.java

@@ -63,7 +63,7 @@ public class RoleDO extends TenantBaseDO {
 
 
     /**
     /**
      * 数据范围
      * 数据范围
-     *
+     *·
      * 枚举 {@link DataScopeEnum}
      * 枚举 {@link DataScopeEnum}
      */
      */
     private Integer dataScope;
     private Integer dataScope;

+ 2 - 1
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2TokenServiceImpl.java

@@ -147,6 +147,7 @@ public class OAuth2TokenServiceImpl implements OAuth2TokenService {
     }
     }
 
 
     private OAuth2AccessTokenDO createOAuth2AccessToken(OAuth2RefreshTokenDO refreshTokenDO, OAuth2ClientDO clientDO) {
     private OAuth2AccessTokenDO createOAuth2AccessToken(OAuth2RefreshTokenDO refreshTokenDO, OAuth2ClientDO clientDO) {
+        //generateAccessToken() 使用uuid生成token
         OAuth2AccessTokenDO accessTokenDO = new OAuth2AccessTokenDO().setAccessToken(generateAccessToken())
         OAuth2AccessTokenDO accessTokenDO = new OAuth2AccessTokenDO().setAccessToken(generateAccessToken())
                 .setUserId(refreshTokenDO.getUserId()).setUserType(refreshTokenDO.getUserType())
                 .setUserId(refreshTokenDO.getUserId()).setUserType(refreshTokenDO.getUserType())
                 .setUserInfo(buildUserInfo(refreshTokenDO.getUserId(), refreshTokenDO.getUserType()))
                 .setUserInfo(buildUserInfo(refreshTokenDO.getUserId(), refreshTokenDO.getUserType()))
@@ -191,7 +192,7 @@ public class OAuth2TokenServiceImpl implements OAuth2TokenService {
     private static String generateAccessToken() {
     private static String generateAccessToken() {
         return IdUtil.fastSimpleUUID();
         return IdUtil.fastSimpleUUID();
     }
     }
-
+    //通过uuid生成刷新令牌
     private static String generateRefreshToken() {
     private static String generateRefreshToken() {
         return IdUtil.fastSimpleUUID();
         return IdUtil.fastSimpleUUID();
     }
     }