From b8571f010ee3dec5e6cbab95f634082eefce22a8 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 03 十二月 2024 09:29:09 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/common/config/ConfigProperties.java | 2 +-
zy-acs-flow/src/App.jsx | 10 ++++++++--
zy-acs-flow/src/utils/token-util.js | 2 +-
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/zy-acs-flow/src/App.jsx b/zy-acs-flow/src/App.jsx
index 22d624a..9b38f36 100644
--- a/zy-acs-flow/src/App.jsx
+++ b/zy-acs-flow/src/App.jsx
@@ -7,6 +7,7 @@
localStorageStore,
useStore,
StoreContextProvider,
+ resolveBrowserLocale,
} from "react-admin";
import polyglotI18nProvider from 'ra-i18n-polyglot';
import englishMessages from './i18n/en';
@@ -30,11 +31,16 @@
return englishMessages;
},
// default
- 'en',
+ // 'en',
+ resolveBrowserLocale('en', { fullLocale: true }),
[
{ locale: 'en', name: 'English' },
{ locale: 'zh', name: '绠�浣撲腑鏂�' },
- ]
+ ],
+ {
+ // msg in console
+ allowMissing: true,
+ }
);
const store = localStorageStore(SPA_VERSION, SPA_NAME);
diff --git a/zy-acs-flow/src/utils/token-util.js b/zy-acs-flow/src/utils/token-util.js
index d66fb33..b79f0c2 100644
--- a/zy-acs-flow/src/utils/token-util.js
+++ b/zy-acs-flow/src/utils/token-util.js
@@ -8,7 +8,7 @@
return token;
}
-export const setToken = (token, remember) => {
+export const setToken = (token, remember = true) => {
removeToken();
if (token) {
if (remember) {
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/common/config/ConfigProperties.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/common/config/ConfigProperties.java
index 7c716bd..c97f6b3 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/common/config/ConfigProperties.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/common/config/ConfigProperties.java
@@ -18,7 +18,7 @@
/**
* token杩囨湡鏃堕棿, 鍗曚綅绉�
*/
- private Long tokenExpireTime = 60 * 60 * 24L;
+ private Long tokenExpireTime = (long) (60 * 60 * 24 * 7);
/**
* token蹇杩囨湡鑷姩鍒锋柊鏃堕棿, 鍗曚綅鍒嗛挓
--
Gitblit v1.9.1