From 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 19 三月 2025 15:50:03 +0800
Subject: [PATCH] fix: resolve merge conflicts in .gitignore
---
ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
index c075328..82b912c 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
@@ -83,6 +83,10 @@
* 令牌前缀
*/
public static final String LOGIN_USER_KEY = "login_user_key";
+ /**
+ * 小程序
+ */
+ public static final String LOGIN_USER_APPLET_KEY = "login_user_applet_key";
/**
* 用户ID
@@ -128,6 +132,10 @@
* LDAPS 远程方法调用
*/
public static final String LOOKUP_LDAPS = "ldaps:";
+ /**
+ * LDAPS 远程方法调用
+ */
+ public static final String INFORMATION_VIEW = "information_view:";
/**
* 自动识别json对象白名单配置（仅允许解析的包名，范围越小越安全）
--
Gitblit v1.7.1