Browse Source

fix bug!!!!!!!!

wenhongquan 3 years ago
parent
commit
249bae7bc6

BIN
.gradle/7.2/executionHistory/executionHistory.lock


BIN
.gradle/7.2/fileHashes/fileHashes.lock


BIN
.gradle/buildOutputCleanup/buildOutputCleanup.lock


+ 2 - 2
.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Wed Dec 22 16:07:15 CST 2021
-gradle.version=7.2
+#Sat Dec 25 00:51:00 CST 2021
+gradle.version=7.3

+ 2 - 1
gradle.properties

@@ -6,7 +6,8 @@ author                          =xintiong
 
 #docker jib image
 jibFromImage					=anapsix/alpine-java:8_server-jre_unlimited
-jibToImage						=200.200.19.125:5000/taihu_jh/taihu
+jibToImage						=docker.xt.wenhq.top:8083/taihu_jh/taihu
+#jibToImage						=200.200.19.125:5000/taihu_jh/taihu
 #jibToImage						=192.168.100.3:8051/taihu_jh/taihu
 jibToAuthUsername				=admin
 jibToAuthPassword				=xtwenhongquan

+ 1 - 0
maxkey-authentications/maxkey-authentication-social/src/main/java/org/maxkey/authn/support/socialsignon/SocialSignOnEndpoint.java

@@ -299,6 +299,7 @@ public class SocialSignOnEndpoint extends AbstractSocialSignOnEndpoint
             if (socialSignOnType.equals(SOCIALSIGNON_TYPE.SOCIALSIGNON_TYPE_LOGON)
                     || socialSignOnType.equals(""))
             {
+                this.socialSignOnProvider = socialSignOnProviderService.get(this.provider);
                 socialSignOn(socialsAssociate);
                 // 先判断用户是否存在
                 // 1. 不存在 先存入用户

+ 3 - 1
maxkey-gateway/src/main/java/org/gateway/filter/AuthAndLogFilter.java

@@ -44,7 +44,9 @@ public class AuthAndLogFilter implements GlobalFilter, Ordered
                 || address.contains("thirdLogin/getUserInfo") // 获取用户
                 || address.contains("registration/registeron") // 注册
                 || address.contains("logon/oauth20/authorize/dingtalk") // 钉钉登录
-                || address.contains("logon/oauth20/scanqrcode/dingtalk")) // 钉钉登录
+                || address.contains("logon/oauth20/scanqrcode/dingtalk") // 钉钉登录
+                || address.contains("logon/oauth20/callback/dingtalk"))
+
         {
             return chain.filter(exchange.mutate().build());
         }

+ 5 - 5
maxkey-webs/maxkey-web-maxkey/src/main/resources/application-http.properties

@@ -31,10 +31,10 @@ spring.cloud.nacos.discovery.server-addr        =${NACOS_DISCOVERY_SERVER_ADDR:1
 #domain name configuration                                                 #
 ############################################################################
 maxkey.server.scheme                            =http
-maxkey.server.basedomain                        =${SERVER_DOMAIN:localhost}
+maxkey.server.basedomain                        =${SERVER_DOMAIN:thtest}
 maxkey.server.domain                            =${maxkey.server.basedomain}
 maxkey.server.name                              =${maxkey.server.scheme}://${maxkey.server.domain}
-maxkey.server.uri                               =${maxkey.server.name}:${server.port}${server.servlet.context-path}
+maxkey.server.uri                               =${SERVER_DOMAIN_FULL:http://thtest.xt.wenhq.top:8083/taihu-auth}
 #default.uri                
 maxkey.server.default.uri                       =${maxkey.server.uri}/appList
 maxkey.server.mgt.uri                           =${maxkey.server.name}:9527/taihu-mgt/login
@@ -122,9 +122,9 @@ mybatis.table-column-case                       =lowercase
 ############################################################################
 #redis server  configuration                                               #
 ############################################################################
-spring.redis.host                               =localhost
-spring.redis.port                               =6379
-spring.redis.password                           =
+spring.redis.host                               =${REDIS_HOST:61.132.52.38}
+spring.redis.port                               =${REDIS_PORT:20003}
+spring.redis.password                           =${REDIS_PWD:password}
 spring.redis.timeout                            =10000
 spring.redis.jedis.pool.max-wait                =1000
 spring.redis.jedis.pool.max-idle                =200