Skip to content

G
guns-vip
Commit a63bdc68 by fengshuonan
Options

更新justAuth和kernel-core的版本

parent c888c4fa
Showing with 2 additions and 17 deletions
guns-base-support/guns-base/src/main/java/cn/stylefeng/guns/base/oshi/SystemHardwareInfo.java
package cn.stylefeng.guns.base.oshi; package cn.stylefeng.guns.base.oshi;
import cn.hutool.core.util.NetUtil; import cn.hutool.core.net.NetUtil;
import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.NumberUtil;
import cn.stylefeng.guns.base.oshi.model.*; import cn.stylefeng.guns.base.oshi.model.*;
import cn.stylefeng.guns.base.oshi.util.IpInfoUtils; import cn.stylefeng.guns.base.oshi.util.IpInfoUtils;
......
guns-base-support/guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/third/factory/OAuthRequestFactory.java
...@@ -31,7 +31,6 @@ public class OAuthRequestFactory { ...@@ -31,7 +31,6 @@ public class OAuthRequestFactory {
.clientId("") .clientId("")
.clientSecret("") .clientSecret("")
.redirectUri(BASE_URL + "/oauth/callback/dingtalk") .redirectUri(BASE_URL + "/oauth/callback/dingtalk")
.state("state")
.build()); .build());
break; break;
case "baidu": case "baidu":
...@@ -39,7 +38,6 @@ public class OAuthRequestFactory { ...@@ -39,7 +38,6 @@ public class OAuthRequestFactory {
.clientId("") .clientId("")
.clientSecret("") .clientSecret("")
.redirectUri(BASE_URL + "/oauth/callback/baidu") .redirectUri(BASE_URL + "/oauth/callback/baidu")
.state("state")
.build()); .build());
break; break;
case "github": case "github":
...@@ -47,7 +45,6 @@ public class OAuthRequestFactory { ...@@ -47,7 +45,6 @@ public class OAuthRequestFactory {
.clientId("") .clientId("")
.clientSecret("") .clientSecret("")
.redirectUri(BASE_URL + "/oauth/callback/github") .redirectUri(BASE_URL + "/oauth/callback/github")
.state("state")
.build()); .build());
break; break;
case "gitee": case "gitee":
...@@ -55,7 +52,6 @@ public class OAuthRequestFactory { ...@@ -55,7 +52,6 @@ public class OAuthRequestFactory {
.clientId("") .clientId("")
.clientSecret("") .clientSecret("")
.redirectUri(BASE_URL + "/oauth/callback/gitee") .redirectUri(BASE_URL + "/oauth/callback/gitee")
.state("state")
.build()); .build());
break; break;
case "weibo": case "weibo":
...@@ -63,7 +59,6 @@ public class OAuthRequestFactory { ...@@ -63,7 +59,6 @@ public class OAuthRequestFactory {
.clientId("") .clientId("")
.clientSecret("") .clientSecret("")
.redirectUri(BASE_URL + "/oauth/callback/weibo") .redirectUri(BASE_URL + "/oauth/callback/weibo")
.state("state")
.build()); .build());
break; break;
case "coding": case "coding":
...@@ -71,7 +66,6 @@ public class OAuthRequestFactory { ...@@ -71,7 +66,6 @@ public class OAuthRequestFactory {
.clientId("") .clientId("")
.clientSecret("") .clientSecret("")
.redirectUri(BASE_URL + "/oauth/callback/tencentCloud") .redirectUri(BASE_URL + "/oauth/callback/tencentCloud")
.state("state")
.build()); .build());
break; break;
case "tencentCloud": case "tencentCloud":
...@@ -79,7 +73,6 @@ public class OAuthRequestFactory { ...@@ -79,7 +73,6 @@ public class OAuthRequestFactory {
.clientId("") .clientId("")
.clientSecret("") .clientSecret("")
.redirectUri(BASE_URL + "/oauth/callback/tencentCloud") .redirectUri(BASE_URL + "/oauth/callback/tencentCloud")
.state("state")
.build()); .build());
break; break;
case "oschina": case "oschina":
...@@ -87,7 +80,6 @@ public class OAuthRequestFactory { ...@@ -87,7 +80,6 @@ public class OAuthRequestFactory {
.clientId("") .clientId("")
.clientSecret("") .clientSecret("")
.redirectUri(BASE_URL + "/oauth/callback/oschina") .redirectUri(BASE_URL + "/oauth/callback/oschina")
.state("state")
.build()); .build());
break; break;
case "alipay": case "alipay":
...@@ -97,7 +89,6 @@ public class OAuthRequestFactory { ...@@ -97,7 +89,6 @@ public class OAuthRequestFactory {
.clientSecret("") .clientSecret("")
.alipayPublicKey("") .alipayPublicKey("")
.redirectUri(BASE_URL + "/oauth/callback/alipay") .redirectUri(BASE_URL + "/oauth/callback/alipay")
.state("state")
.build()); .build());
break; break;
case "qq": case "qq":
...@@ -105,7 +96,6 @@ public class OAuthRequestFactory { ...@@ -105,7 +96,6 @@ public class OAuthRequestFactory {
.clientId("") .clientId("")
.clientSecret("") .clientSecret("")
.redirectUri(BASE_URL + "/oauth/callback/qq") .redirectUri(BASE_URL + "/oauth/callback/qq")
.state("state")
.build()); .build());
break; break;
case "wechat": case "wechat":
...@@ -113,7 +103,6 @@ public class OAuthRequestFactory { ...@@ -113,7 +103,6 @@ public class OAuthRequestFactory {
.clientId("") .clientId("")
.clientSecret("") .clientSecret("")
.redirectUri(BASE_URL + "/oauth/callback/wechat") .redirectUri(BASE_URL + "/oauth/callback/wechat")
.state("state")
.build()); .build());
break; break;
case "csdn": case "csdn":
...@@ -121,7 +110,6 @@ public class OAuthRequestFactory { ...@@ -121,7 +110,6 @@ public class OAuthRequestFactory {
.clientId("") .clientId("")
.clientSecret("") .clientSecret("")
.redirectUri(BASE_URL + "/oauth/callback/wechat") .redirectUri(BASE_URL + "/oauth/callback/wechat")
.state("state")
.build()); .build());
break; break;
case "taobao": case "taobao":
...@@ -129,7 +117,6 @@ public class OAuthRequestFactory { ...@@ -129,7 +117,6 @@ public class OAuthRequestFactory {
.clientId("") .clientId("")
.clientSecret("") .clientSecret("")
.redirectUri(BASE_URL + "/oauth/callback/taobao") .redirectUri(BASE_URL + "/oauth/callback/taobao")
.state("state")
.build()); .build());
break; break;
case "google": case "google":
...@@ -137,7 +124,6 @@ public class OAuthRequestFactory { ...@@ -137,7 +124,6 @@ public class OAuthRequestFactory {
.clientId("") .clientId("")
.clientSecret("") .clientSecret("")
.redirectUri(BASE_URL + "/oauth/callback/google") .redirectUri(BASE_URL + "/oauth/callback/google")
.state("state")
.build()); .build());
break; break;
case "facebook": case "facebook":
...@@ -145,7 +131,6 @@ public class OAuthRequestFactory { ...@@ -145,7 +131,6 @@ public class OAuthRequestFactory {
.clientId("") .clientId("")
.clientSecret("") .clientSecret("")
.redirectUri(BASE_URL + "/oauth/callback/facebook") .redirectUri(BASE_URL + "/oauth/callback/facebook")
.state("state")
.build()); .build());
break; break;
} }
......
guns-base-support/guns-sys/src/main/java/cn/stylefeng/guns/sys/modular/third/factory/OAuthUserInfoFactory.java
...@@ -6,8 +6,8 @@ import cn.stylefeng.guns.sys.core.shiro.ShiroKit; ...@@ -6,8 +6,8 @@ import cn.stylefeng.guns.sys.core.shiro.ShiroKit;
import cn.stylefeng.guns.sys.modular.system.entity.User; import cn.stylefeng.guns.sys.modular.system.entity.User;
import cn.stylefeng.guns.sys.modular.third.entity.OauthUserInfo; import cn.stylefeng.guns.sys.modular.third.entity.OauthUserInfo;
import cn.stylefeng.roses.core.util.ToolUtil; import cn.stylefeng.roses.core.util.ToolUtil;
import me.zhyd.oauth.enums.AuthUserGender;
import me.zhyd.oauth.model.AuthUser; import me.zhyd.oauth.model.AuthUser;
import me.zhyd.oauth.model.AuthUserGender;
import java.util.Date; import java.util.Date;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment