From c4e89f73974c5b61b7d7177f5886c0acad2f93f7 Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Sat, 3 Dec 2022 00:54:19 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E5=87=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ibeetl/admin/core/conf/MVCConf.java    | 3 +++
 admin-core/src/main/resources/templates/index.html       | 9 ++++++---
 .../main/java/cn/jlw/Interceptor/InterceptorConfig.java  | 3 +++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/conf/MVCConf.java b/admin-core/src/main/java/com/ibeetl/admin/core/conf/MVCConf.java
index 24edc19c..036bf3ea 100644
--- a/admin-core/src/main/java/com/ibeetl/admin/core/conf/MVCConf.java
+++ b/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);
     }
diff --git a/admin-core/src/main/resources/templates/index.html b/admin-core/src/main/resources/templates/index.html
index 388aa603..28e0a72e 100644
--- a/admin-core/src/main/resources/templates/index.html
+++ b/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';
+                        }
                     });
                 }
             });
diff --git a/web/src/main/java/cn/jlw/Interceptor/InterceptorConfig.java b/web/src/main/java/cn/jlw/Interceptor/InterceptorConfig.java
index 916d516f..f48870d6 100644
--- a/web/src/main/java/cn/jlw/Interceptor/InterceptorConfig.java
+++ b/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);
     }