From dedb6f26be813caaa0d6ec828d39deaa18fddcb3 Mon Sep 17 00:00:00 2001
From: xyh <18782104331@139.com>
Date: 星期三, 16 六月 2021 20:17:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_excel610' into test_excel610
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java
index 2586260..86db85b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/constants/Constants.java
@@ -90,7 +90,7 @@
/**
* 令牌有效期（分钟）
*/
- public final static long TOKEN_EXPIRE = 720;
+ public final static long _EXPIRE = 720;
/**
* 参数管理 cache key
@@ -137,4 +137,11 @@
* 首页商城是否展示（1.是 2.否）
*/
public static final Integer IS_SHOP_OPEN = 2;
+
+ /**
+ * 网格综治-默认角色权限默认字符串
+ */
+ public static final String GRID_DEFAULT_ROLE_KEY="grid_member_default_role";
+
+ public static final String ZONG_ZHI_GRID_MEMBER_IMAGE_URL = "http://image.panzhihua.nhys.cdnhxx.com//idcard/15a0563a7a1d42768322c95e5cb022c4.jpg";
}
--
Gitblit v1.7.1