Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

1098226878@qq.com

2021-12-28 745d27feae34022ccb708aba034123e08e4e9e14

Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

 java110-bean/src/main/java/com/java110/dto/app/AppDto.java

@@ -26,6 +26,7 @@


    private String appId;
    private String[] appIds;
    private String blackListIp;
    private String name;
    private String securityCode;
@@ -111,4 +112,12 @@
    public void setStatusCd(String statusCd) {
        this.statusCd = statusCd;
    }

    public String[] getAppIds() {
        return appIds;
    }

    public void setAppIds(String[] appIds) {
        this.appIds = appIds;
    }
}

 java110-db/src/main/resources/mapper/community/AppServiceDaoImplMapper.xml

@@ -87,6 +87,13 @@
        <if test="appId !=null and appId != ''">
            and t.app_id= #{appId}
        </if>
        <if test="appIds !=null ">
            and t.app_id in
            <foreach collection="appIds" item="item" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>

        <if test="blackListIp !=null and blackListIp != ''">
            and t.black_list_ip= #{blackListIp}
        </if>
@@ -147,6 +154,12 @@
        <if test="appId !=null and appId != ''">
            and t.app_id= #{appId}
        </if>
        <if test="appIds !=null ">
            and t.app_id in
            <foreach collection="appIds" item="item" open="(" close=")" separator=",">
                #{item}
            </foreach>
        </if>
        <if test="blackListIp !=null and blackListIp != ''">
            and t.black_list_ip= #{blackListIp}
        </if>

 service-api/src/main/java/com/java110/api/listener/advert/SaveAdvertListener.java

@@ -3,18 +3,19 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.api.listener.AbstractServiceApiPlusListener;
import com.java110.core.annotation.Java110Listener;
import com.java110.core.context.DataFlowContext;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.intf.common.IFileInnerServiceSMO;
import com.java110.dto.file.FileDto;
import com.java110.intf.common.IFileInnerServiceSMO;
import com.java110.intf.common.IFileRelInnerServiceSMO;
import com.java110.po.advert.AdvertItemPo;
import com.java110.po.advert.AdvertPo;
import com.java110.po.file.FileRelPo;
import com.java110.utils.constant.*;
import com.java110.utils.constant.BusinessTypeConstant;
import com.java110.utils.constant.ServiceCodeAdvertConstant;
import com.java110.utils.util.Assert;
import com.java110.core.context.DataFlowContext;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
import com.java110.core.annotation.Java110Listener;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -69,7 +70,7 @@
        reqJson.put("advertId", advertId);
        reqJson.put("state", "1000");
        reqJson.put("createTime", new Date());
//        reqJson.put("communityId", "9999");
        reqJson.put("communityId", "9999");
        AdvertPo advertPo = BeanConvertUtil.covertBean(reqJson, AdvertPo.class);
        super.insert(context, advertPo, BusinessTypeConstant.BUSINESS_TYPE_SAVE_ADVERT);
        if (hasKeyAndValue(reqJson, "photos") && reqJson.getJSONArray("photos").size() > 0) {
@@ -97,7 +98,7 @@
        paramInJson.put("fileSaveName", fileName);
        paramInJson.put("advertPhotoId", fileDto.getFileId());
        itemTypeCd = "8888";
/*        url = fileDto.getFileId();*/
        /*        url = fileDto.getFileId();*/
        AdvertItemPo advertItemPo = new AdvertItemPo();
        advertItemPo.setAdvertId(paramInJson.getString("advertId"));
        advertItemPo.setAdvertItemId("-1");

 service-api/src/main/java/com/java110/api/properties/WechatAuthProperties.java

@@ -51,6 +51,10 @@
    }

    public String getAppId() {
        String appIdCache = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "appId");
        if (!StringUtil.isEmpty(appIdCache)) {
            return appIdCache;
        }
        return appId;
    }

@@ -59,6 +63,11 @@
    }

    public String getSecret() {

        String appSecretCache = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "appSecret");
        if (!StringUtil.isEmpty(appSecretCache)) {
            return appSecretCache;
        }
        return secret;
    }

@@ -75,14 +84,23 @@
    }

    public String getKey() {
        String keyCache = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "key");
        if (!StringUtil.isEmpty(keyCache)) {
            return keyCache;
        }
        return key;
    }

    public void setKey(String key) {

        this.key = key;
    }

    public String getMchId() {
        String mchIdCache = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "mchId");
        if (!StringUtil.isEmpty(mchIdCache)) {
            return mchIdCache;
        }
        return mchId;
    }


 service-user/src/main/java/com/java110/user/cmd/owner/OwnerCommunityCmd.java

@@ -71,6 +71,10 @@
        communityDto.setState("1100");
        communityDto.setCommunityIds(communityIds.toArray(new String[communityIds.size()]));
        List<CommunityDto> communityDtos = communityInnerServiceSMOImpl.queryCommunitys(communityDto);
        if(communityDtos == null || communityDtos.size()<1){
            cmdDataFlowContext.setResponseEntity(ResultVo.success());
            return ;
        }
        for (OwnerDto tmpOwnerDto : ownerDtos) {
            for (CommunityDto tmpCommunityDto : communityDtos) {
                if (!tmpCommunityDto.getCommunityId().equals(tmpOwnerDto.getCommunityId())) {