From 66e4211cbfa154a87390b25c93b32d722e0d690c Mon Sep 17 00:00:00 2001
From: xiang <5914123@qq.com>
Date: 星期四, 14 九月 2023 15:22:37 +0800
Subject: [PATCH] Merge branch 'haucheng_panzhihua' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java
index 08d075e..963b4e3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java
@@ -65,9 +65,9 @@
public Long getCommunityId() {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Long communityId = loginUserInfo.getCommunityId();
- if (null == communityId) {
- throw new ServiceException("用户未绑定社区");
- }
+// if (null == communityId) {
+// throw new ServiceException("用户未绑定社区");
+// }
return communityId;
}
@@ -139,8 +139,11 @@
}
public String getAppId(){
- LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
- return "wx118de8a734d269f0";
+ String appid = this.getRequest().getHeader("appid");
+ if(StringUtils.isEmpty(appid)){
+ return "wx0cef797390444b75";
+ }
+ return appid;
}
public String getAppSecret(){
--
Gitblit v1.7.1