退出bug

admin-core/src/main/java/com/ibeetl/admin/core/conf/MVCConf.java

@@ -1,5 +1,6 @@
 package com.ibeetl.admin.core.conf;
 
+import cn.hutool.extra.spring.SpringUtil;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.beetl.core.GroupTemplate;
@@ -104,6 +105,8 @@ public class MVCConf implements WebMvcConfigurer, InitializingBean {
         }
         
         var.put("jsVer", System.currentTimeMillis());
+        // 当前环境判断
+        var.put("profile", SpringUtil.getProperty("spring.profiles.active"));
        
        groupTemplate.setSharedVars(var);
     }

admin-core/src/main/resources/templates/index.html

@@ -414,10 +414,13 @@
                 var ret = Common.postAjax("/logout.json");
                 if (ret.code == 0 || ret.code == 401) {
                     Common.info("退出成功！");
+                    var host = '${request.requestURL}'.replaceAll(/\/server.*/g, '');
                     Common.awaitTime(1200, function () {
-                        //window.location.href = ret.data;
-                        // window.location.href = "http://116.205.131.177:8080/Login";
-                        window.location.href = Common.ctxPath.replaceAll(/\/server.*/g, '')
+                        if('${profile!}' === 'prod') {
+                            window.location.href = host;
+                        } else {
+                            window.location.href = host + '/server';
+                        }
                     });
                 }
             });

web/src/main/java/cn/jlw/Interceptor/InterceptorConfig.java

@@ -1,5 +1,6 @@
 package cn.jlw.Interceptor;
 
+import cn.hutool.extra.spring.SpringUtil;
 import cn.jlw.aliPay.interceptor.AliPayInterceptor;
 import com.ibeetl.admin.core.conf.MVCConf;
 import com.ibeetl.jlw.entity.FileEntity;
@@ -131,6 +132,8 @@ public class InterceptorConfig implements WebMvcConfigurer, InitializingBean {
         }
 
         var.put("jsVer", System.currentTimeMillis());
+        // 当前环境判断
+        var.put("profile", SpringUtil.getProperty("spring.profiles.active"));
         groupTemplate.setSharedVars(var);
     }