Merge branch 'huacheng' into huacheng_test

101captain

2022-07-28 f0e91343445b1e568d1dfe705252d3e1201a18a7

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/controller/BaseController.java

@@ -19,6 +19,9 @@
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;

import static java.util.Objects.isNull;
import static org.apache.commons.lang3.StringUtils.isBlank;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
 * @description: 基础controller
@@ -62,7 +65,7 @@
    public Long getCommunityId() {
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        Long communityId = loginUserInfo.getCommunityId();
        if (null == communityId || 0 == communityId) {
        if (null == communityId) {
            throw new ServiceException("用户未绑定社区");
        }
        return communityId;
@@ -113,14 +116,13 @@
            else {
                return "510423";
            }
        }
        else {
        } else {
            LoginUserInfoVO loginUserInfoVO=this.getLoginUserInfo();
            ComActVO comActVO=loginUserInfoVO.getComActVO();
            if(comActVO!=null){
                return comActVO.getAreaCode();
            if(isNull(comActVO) || isBlank(comActVO.getAreaCode())){
                return "510423";
            }
            return "510423";
            return comActVO.getAreaCode();
        }
    }

@@ -137,8 +139,11 @@
    }

    public String getAppId(){
        LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
        return loginUserInfo.getAppId();
        String appid = this.getRequest().getHeader("appid");
        if(StringUtils.isEmpty(appid)){
            return "wx0cef797390444b75";
        }
        return appid;
    }

    public String getAppSecret(){