Merge remote-tracking branch 'origin/dev' into satoken

疯狂的狮子li

2021-11-29 42295ef2ac0a5e78674cf24b62d6834138f0ffdc

 ruoyi-framework/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java

@@ -1,8 +1,8 @@
package com.ruoyi.framework.config;

import cn.dev33.satoken.SaManager;
import cn.dev33.satoken.config.SaTokenConfig;
import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
import com.github.xiaoymin.knife4j.spring.extension.OpenApiExtensionResolver;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.framework.config.properties.SwaggerProperties;
@@ -35,6 +35,9 @@
    @Autowired
    private SaTokenConfig saTokenConfig;

    @Autowired
    private OpenApiExtensionResolver openApiExtensionResolver;

    /**
     * 创建API
     */
@@ -59,6 +62,7 @@
               // 设置安全模式，swagger可以设置访问token
               .securitySchemes(securitySchemes())
               .securityContexts(securityContexts())
                    .extensions(openApiExtensionResolver.buildExtensions(group.getName()))
               .pathMapping(swaggerProperties.getPathMapping());
         String beanName = StringUtils.substringAfterLast(basePackage, ".") + "Docket";
         SpringUtils.registerBean(beanName, docket);
@@ -96,7 +100,7 @@
        AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
        authorizationScopes[0] = authorizationScope;
        List<SecurityReference> securityReferences = new ArrayList<>();
        securityReferences.add(new SecurityReference(SaManager.getConfig().getTokenName(), authorizationScopes));
        securityReferences.add(new SecurityReference(saTokenConfig.getTokenName(), authorizationScopes));
        return securityReferences;
    }