diff --git a/blog-core/src/main/java/com/zyd/blog/framework/property/JustAuthProperties.java b/blog-core/src/main/java/com/zyd/blog/framework/property/JustAuthProperties.java deleted file mode 100644 index 5218bb39c6c3693ac2478ed9b4d7f06babc32772..0000000000000000000000000000000000000000 --- a/blog-core/src/main/java/com/zyd/blog/framework/property/JustAuthProperties.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.zyd.blog.framework.property; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import me.zhyd.oauth.config.AuthConfig; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.core.annotation.Order; -import org.springframework.stereotype.Component; - -/** - * @author yadong.zhang (yadong.zhang0415(a)gmail.com) - * @version 1.0 - * @website https://docs.zhyd.me - * @date 2019/5/23 18:16 - * @since 1.8 - */ -@Component -@ConfigurationProperties(prefix = "me.zhyd.oauth") -@Data -@EqualsAndHashCode(callSuper = false) -@Order(-1) -public class JustAuthProperties { - - private AuthConfig gitee; - private AuthConfig github; - private AuthConfig weibo; - private AuthConfig dingtalk; - private AuthConfig baidu; - private AuthConfig coding; - private AuthConfig tencentCloud; - private AuthConfig oschina; - private AuthConfig alipay; - private AuthConfig qq; - private AuthConfig wechat; - private AuthConfig taobao; - private AuthConfig google; - private AuthConfig facebook; - private AuthConfig csdn; - - private AuthConfig douyin; - private AuthConfig linkedin; - private AuthConfig microsoft; - private AuthConfig mi; - private AuthConfig toutiao; - private AuthConfig teambition; - private AuthConfig renren; - private AuthConfig pinterest; - private AuthConfig stackoverflow; - private AuthConfig huawei; - private AuthConfig wechatEnterprise; -} diff --git a/blog-core/src/main/java/com/zyd/blog/framework/tag/CustomTags.java b/blog-core/src/main/java/com/zyd/blog/framework/tag/CustomTags.java index fe0eddd1146f4f0a6eb7e314cd76fa163d25e452..fba977199d29c64a57b66e5c57b8b1ed75b65c6c 100644 --- a/blog-core/src/main/java/com/zyd/blog/framework/tag/CustomTags.java +++ b/blog-core/src/main/java/com/zyd/blog/framework/tag/CustomTags.java @@ -5,7 +5,6 @@ import com.zyd.blog.business.entity.User; import com.zyd.blog.business.enums.ConfigKeyEnum; import com.zyd.blog.business.enums.UserTypeEnum; import com.zyd.blog.business.service.*; -import com.zyd.blog.framework.property.JustAuthProperties; import com.zyd.blog.persistence.beans.SysConfig; import com.zyd.blog.util.SessionUtil; import lombok.extern.slf4j.Slf4j; @@ -55,8 +54,6 @@ public class CustomTags extends BaseTag { @Autowired private SysTemplateService templateService; @Autowired - private JustAuthProperties authProperties; - @Autowired private SysSocialConfigService sysSocialConfigService; public CustomTags() { diff --git a/blog-web/src/main/resources/application-dev.yml b/blog-web/src/main/resources/application-dev.yml index e44f4409259678eca8b7cb51460b80a3a2af139d..ff56a37036eae9396582424e6d0fb315ff2a7802 100644 --- a/blog-web/src/main/resources/application-dev.yml +++ b/blog-web/src/main/resources/application-dev.yml @@ -67,112 +67,4 @@ app: # 启用后,项目在启动时会打印数据库(Mysql和Redis)链接信息(包含密码) # 代码请参考 enabledConfigLog: true - -me: - zhyd: - oauth: - gitee: - clientId: - clientSecret: - redirectUri: - github: - clientId: - clientSecret: - redirectUri: - weibo: - clientId: - clientSecret: - redirectUri: - dingtalk: - clientId: - clientSecret: - redirectUri: - baidu: - clientId: - clientSecret: - redirectUri: - coding: - clientId: - clientSecret: - redirectUri: - tencentCloud: - clientId: - clientSecret: - redirectUri: - oschina: - clientId: - clientSecret: - redirectUri: - alipay: - clientId: - clientSecret: - redirectUri: - alipayPublicKey: - qq: - clientId: - clientSecret: - redirectUri: - wechat: - clientId: - clientSecret: - redirectUri: - taobao: - clientId: - clientSecret: - redirectUri: - google: - clientId: - clientSecret: - redirectUri: - facebook: - clientId: - clientSecret: - redirectUri: - douyin: - clientId: - clientSecret: - redirectUri: - linkedin: - clientId: - clientSecret: - redirectUri: - microsoft: - clientId: - clientSecret: - redirectUri: - mi: - clientId: - clientSecret: - redirectUri: - toutiao: - clientId: - clientSecret: - redirectUri: - teambition: - clientId: - clientSecret: - redirectUri: - renren: - clientId: - clientSecret: - redirectUri: - pinterest: - clientId: - clientSecret: - redirectUri: - stackoverflow: - clientId: - clientSecret: - redirectUri: - stackOverflowKey: - huawei: - clientId: - clientSecret: - redirectUri: - wechatEnterprise: - clientId: - clientSecret: - redirectUri: - agentId: - ####################################自定义配置########################################## diff --git a/blog-web/src/main/resources/application-test.yml b/blog-web/src/main/resources/application-test.yml index f01f32a4d490e3f03af588e20eb3c985cc00e07a..f657140ab2e905b6ef161edb97dabcdaf58924db 100644 --- a/blog-web/src/main/resources/application-test.yml +++ b/blog-web/src/main/resources/application-test.yml @@ -68,112 +68,4 @@ app: # 启用后,项目在启动时会打印数据库(Mysql和Redis)链接信息(包含密码) # 代码请参考 enabledConfigLog: false - -me: - zhyd: - oauth: - gitee: - clientId: - clientSecret: - redirectUri: - github: - clientId: - clientSecret: - redirectUri: - weibo: - clientId: - clientSecret: - redirectUri: - dingtalk: - clientId: - clientSecret: - redirectUri: - baidu: - clientId: - clientSecret: - redirectUri: - coding: - clientId: - clientSecret: - redirectUri: - tencentCloud: - clientId: - clientSecret: - redirectUri: - oschina: - clientId: - clientSecret: - redirectUri: - alipay: - clientId: - clientSecret: - redirectUri: - alipayPublicKey: - qq: - clientId: - clientSecret: - redirectUri: - wechat: - clientId: - clientSecret: - redirectUri: - taobao: - clientId: - clientSecret: - redirectUri: - google: - clientId: - clientSecret: - redirectUri: - facebook: - clientId: - clientSecret: - redirectUri: - douyin: - clientId: - clientSecret: - redirectUri: - linkedin: - clientId: - clientSecret: - redirectUri: - microsoft: - clientId: - clientSecret: - redirectUri: - mi: - clientId: - clientSecret: - redirectUri: - toutiao: - clientId: - clientSecret: - redirectUri: - teambition: - clientId: - clientSecret: - redirectUri: - renren: - clientId: - clientSecret: - redirectUri: - pinterest: - clientId: - clientSecret: - redirectUri: - stackoverflow: - clientId: - clientSecret: - redirectUri: - stackOverflowKey: - huawei: - clientId: - clientSecret: - redirectUri: - wechatEnterprise: - clientId: - clientSecret: - redirectUri: - agentId: - ####################################自定义配置##########################################