fix

.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Thu Dec 09 11:16:18 CST 2021
-gradle.version=7.3
+#Wed Dec 22 16:07:15 CST 2021
+gradle.version=7.2

gradle.properties

@@ -7,8 +7,10 @@ author                          =xintiong
 #docker jib image
 jibFromImage					=anapsix/alpine-java:8_server-jre_unlimited
 jibToImage						=200.200.19.125:5000/taihu_jh/taihu
+#jibToImage						=192.168.100.3:8051/taihu_jh/taihu
 jibToAuthUsername				=admin
 jibToAuthPassword				=xtwenhongquan
+#jibToAuthPassword				=Harbor12345
 
 #maxkey used jars version
 #Apache

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

@@ -253,14 +253,15 @@ public class SocialSignOnEndpoint extends AbstractSocialSignOnEndpoint
     public ModelAndView callbackDingTalk(@PathVariable String provider)
     {
         // 对 callbackUrl 进行处理
-        if (StringUtils.isNotEmpty(callbackUrl))
+        String curl = callbackUrl;
+        if (StringUtils.isNotEmpty(curl))
         {
-            if (callbackUrl.contains("?") || callbackUrl.contains("&"))
+            if (curl.contains("?") || curl.contains("&"))
             {
-                callbackUrl += "&ticket=";
+                curl += "&ticket=";
             } else
             {
-                callbackUrl += "?ticket=";
+                curl += "?ticket=";
             }
         }
         // 获取access_token，注意正式代码要有异常流处理
@@ -350,7 +351,7 @@ public class SocialSignOnEndpoint extends AbstractSocialSignOnEndpoint
 
 
                 // TODO  整合前端的地址
-                return WebContext.redirect(callbackUrl + ticket);
+                return WebContext.redirect(curl + ticket);
             } else
             {
                 socialBind(socialsAssociate);

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

@@ -31,8 +31,8 @@ spring.cloud.nacos.discovery.server-addr        =${NACOS_DISCOVERY_SERVER_ADDR:1
 #domain name configuration                                                 #
 ############################################################################
 maxkey.server.scheme                            =http
-maxkey.server.basedomain                        =${SERVER_DOMAIN:maxkey.top}
-maxkey.server.domain                            =sso.${maxkey.server.basedomain}
+maxkey.server.basedomain                        =${SERVER_DOMAIN:localhost}
+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}
 #default.uri                
@@ -76,7 +76,7 @@ maxkey.ipaddress.whitelist                      =false
 maxkey.notices.visible                          =false
 
 # call back url
-maxkey.callback.url                             = ${CALL_BACK_URL:${maxkey.server.uri}}
+maxkey.callback.url                             = ${CALL_BACK_URL:http://localhost:8000/#/login}
 ############################################################################
 #ssl configuration                                                         #
 ############################################################################

maxkey-webs/maxkey-web-maxkey/src/main/resources/application-https.properties

@@ -31,8 +31,8 @@ spring.cloud.nacos.discovery.server-addr        =${NACOS_DISCOVERY_SERVER_ADDR:1
 #domain name configuration                                                 #
 ############################################################################
 maxkey.server.scheme                            =https
-maxkey.server.basedomain                        =${SERVER_DOMAIN:maxkey.top}
-maxkey.server.domain                            =sso.${maxkey.server.basedomain}
+maxkey.server.basedomain                        =${SERVER_DOMAIN:localhost}
+maxkey.server.domain                            =${maxkey.server.basedomain}
 maxkey.server.name                              =${maxkey.server.scheme}://${maxkey.server.domain}
 maxkey.server.uri                               =${maxkey.server.name}${server.servlet.context-path}
 #default.uri                

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

@@ -27,8 +27,8 @@ spring.cloud.nacos.discovery.server-addr        =${NACOS_DISCOVERY_SERVER_ADDR:1
 #domain name configuration                                                 #
 ############################################################################
 maxkey.server.scheme                            =http
-maxkey.server.basedomain                        =${SERVER_DOMAIN:maxkey.top}
-maxkey.server.domain                            =sso.${maxkey.server.basedomain}
+maxkey.server.basedomain                        =${SERVER_DOMAIN:localhost}
+maxkey.server.domain                            =${maxkey.server.basedomain}
 maxkey.server.name                              =${maxkey.server.scheme}://${maxkey.server.domain}
 maxkey.server.uri                               =${maxkey.server.name}:9527${server.servlet.context-path}
 #default.uri