From d31920a1233ab14cdd5e33756bb1b0e3ed235e66 Mon Sep 17 00:00:00 2001
From: 1098226878 <1098226878@qq.com>
Date: 星期三, 08 九月 2021 12:39:48 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-core/src/main/java/com/java110/core/factory/Java110TransactionalFactory.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/java110-core/src/main/java/com/java110/core/factory/Java110TransactionalFactory.java b/java110-core/src/main/java/com/java110/core/factory/Java110TransactionalFactory.java
old mode 100644
new mode 100755
index 25fa152..c220c19
--- a/java110-core/src/main/java/com/java110/core/factory/Java110TransactionalFactory.java
+++ b/java110-core/src/main/java/com/java110/core/factory/Java110TransactionalFactory.java
@@ -8,7 +8,11 @@
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.http.*;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
import org.springframework.web.client.HttpStatusCodeException;
import org.springframework.web.client.RestTemplate;
@@ -97,6 +101,21 @@
}
/**
+ * 娓呯悊浜嬪姟
+ */
+ public static void clearOId() {
+ //娓呯悊浜嬪姟
+ if(!StringUtil.isEmpty(getOId())) {
+ remove(O_ID);
+ }
+ //娓呯悊瑙掕壊
+ if(!StringUtil.isEmpty(getServiceRole())) {
+ remove(SERVICE_ROLE);
+ }
+
+ }
+
+ /**
* 鑾峰彇浜嬪姟ID
*
* @return
@@ -153,6 +172,7 @@
* 澶勭悊澶辫触锛屽洖閫�浜嬪姟
*/
public static void fallbackOId() {
+
String oId = getOId();
if (StringUtil.isEmpty(oId) || ROLE_OBSERVER.equals(getServiceRole())) {
//褰撳墠娌℃湁寮�鍚簨鍔℃棤闇�鍥為��
--
Gitblit v1.8.0