Merge remote-tracking branch 'origin/master'

src/main/java/com/bootdo/system/controller/LoginController.java

@@ -142,7 +142,7 @@ public class LoginController extends BaseController {
         //获取当前登录账号信息
         UserDO currUser = ShiroUtils.getUser();
 
-        if(ObjectUtils.isEmpty(logoutRedirectUrl)){
+        if(!ObjectUtils.isEmpty(logoutRedirectUrl) && logoutRedirectUrl.contains("http")){
             //返回第三方退出登录接口
             //回调地址示例：https://testmicrosrv.scca.com.cn:9668/session/end?client_id=f104472f-02f4-6ab6-f6dc&access_token=HRMpcEUueorxSGQccNolRB2vkpaxnWHGvQonRtnoKEr3Z7KQthcUFz8jdaSD&logout_redirect_uri=http://124.70.58.209:19087/login
             String logoutRedirectBackUrl = permAuthPrefix + "/session/end" +
@@ -230,6 +230,8 @@ public class LoginController extends BaseController {
 
     @GetMapping("/logout")
     String logout() {
+        logger.error("logout======in==="+logoutRedirectUrl);
+
         //获取当前登录账号信息
         UserDO currUser = ShiroUtils.getUser();
 
@@ -239,17 +241,19 @@ public class LoginController extends BaseController {
         } catch (Exception e){
             e.printStackTrace();
         }
-
-        if(ObjectUtils.isEmpty(logoutRedirectUrl)){
+        logger.error("logout======begin==="+logoutRedirectUrl);
+        if(!ObjectUtils.isEmpty(logoutRedirectUrl) && logoutRedirectUrl.contains("http")){
+            logger.error("logout======not null==="+logoutRedirectUrl);
             //返回第三方退出登录接口
             //回调地址示例：https://testmicrosrv.scca.com.cn:9668/session/end?client_id=f104472f-02f4-6ab6-f6dc&access_token=HRMpcEUueorxSGQccNolRB2vkpaxnWHGvQonRtnoKEr3Z7KQthcUFz8jdaSD&logout_redirect_uri=http://124.70.58.209:19087/login
             String logoutRedirectBackUrl = permAuthPrefix + "/session/end" +
                     "?client_id=" + this.uniIdentAuthAppId +
                     "&access_token=" + redisUtil.hget(Constants.USERNAME_ACCESS_TOKEN, currUser.getUsername()) +
                     "&logout_redirect_uri=" + this.logoutRedirectUrl;
-            logger.error("logoutRedirectBackUrl==============="+logoutRedirectBackUrl);
+            logger.error("logoutRedirectBackUrl========end======="+logoutRedirectBackUrl);
             return "redirect:" + logoutRedirectBackUrl;
         }else {
+            logger.error("logout======is null==="+logoutRedirectUrl);
             return "redirect:" +  loginUrl;
         }
 

src/main/resources/application-prod.yml

@@ -85,16 +85,16 @@ server:
 #允许http api调用的IP
 api-allow-ip: 127.0.0.1,172.18.105.10,172.18.105.11,218.89.240.185
 
-#登录页地址         备注：修改为空。
-login_url:
+#登录页地址         门户页面上，系统按钮的链接地址
+login_url: http://218.89.240.185:19087/gateway/record
 
 #后台管理
 back_manange_sso_url: http://218.89.240.185:19087/system/user
 
 # 退出登录，需要跳转的地址
 logout:
-# 具体说明详见【风评系统】的相同配置项
-  redirect_url:
+# 门户页面上，系统按钮的链接地址
+  redirect_url: http://218.89.240.185:19087/gateway/record
 #4A的Oauth权限认证
 oauth_permission_authentication:
   prefix: http://172.18.105.21:18001