联讯物业系统后台
parent: 84c686b0 | 补丁 | 提交 | ignore whitespace
java110
2023-01-30 a31e79f8a020cdcfa7105a11d907abe7e4e3cfff 
wechat store config
13个文件已修改
49 ■■■■■ 已修改文件
java110-utils/src/main/java/com/java110/utils/constant/MappingConstant.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-acct/src/main/java/com/java110/acct/payment/adapt/alipay/AliPaymentFactoryAdapt.java 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-acct/src/main/java/com/java110/acct/payment/adapt/chinaUms/ChinaUmsPaymentFactoryAdapt.java 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-acct/src/main/java/com/java110/acct/payment/adapt/fuiou/FuiouPaymentFactoryAdapt.java 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-acct/src/main/java/com/java110/acct/payment/adapt/icbc/IcbcPaymentFactoryAdapt.java.txt 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-acct/src/main/java/com/java110/acct/payment/adapt/pingan/PinganPaymentFactoryAdapt.java 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-acct/src/main/java/com/java110/acct/payment/adapt/plutus/PlutusPaymentFactoryAdapt.java 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-acct/src/main/java/com/java110/acct/payment/adapt/wechat/WechatPaymentFactoryAdapt.java 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-acct/src/main/java/com/java110/acct/smo/impl/QrCodePlutusPaymentAdapt.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-api/src/main/java/com/java110/api/properties/WechatAuthProperties.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-job/src/main/java/com/java110/job/adapt/fee/ReturnPayFeeMoneyAdapt.java 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-job/src/main/java/com/java110/job/adapt/fee/ReturnPayFeeToPlutusAdapt.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springboot/src/main/java/com/java110/boot/properties/WechatAuthProperties.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 java110-utils/src/main/java/com/java110/utils/constant/MappingConstant.java


@@ -23,6 +23,9 @@


    // 平台URL


    public static final String URL_DOMAIN ="URL_DOMAIN";




    // 微信商户


    public static final String WECHAT_STORE_DOMAIN ="WECHAT_STORE";




    public  static final String KEY_LOG_ON_OFF = "LOG_ON_OFF";




    public  static final String KEY_COST_TIME_ON_OFF = "COST_TIME_ON_OFF";




 service-acct/src/main/java/com/java110/acct/payment/adapt/alipay/AliPaymentFactoryAdapt.java


@@ -266,8 +266,8 @@


            smallWeChatDto = new SmallWeChatDto();


            smallWeChatDto.setAppId(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "appId"));


            smallWeChatDto.setAppSecret(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "appSecret"));


            smallWeChatDto.setMchId(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "mchId"));


            smallWeChatDto.setPayPassword(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "key"));


            smallWeChatDto.setMchId(MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "mchId"));


            smallWeChatDto.setPayPassword(MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "key"));


            return smallWeChatDto;


        }






 service-acct/src/main/java/com/java110/acct/payment/adapt/chinaUms/ChinaUmsPaymentFactoryAdapt.java


@@ -280,8 +280,8 @@


            smallWeChatDto = new SmallWeChatDto();


            smallWeChatDto.setAppId(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "appId"));


            smallWeChatDto.setAppSecret(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "appSecret"));


            smallWeChatDto.setMchId(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "mchId"));


            smallWeChatDto.setPayPassword(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "key"));


            smallWeChatDto.setMchId(MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "mchId"));


            smallWeChatDto.setPayPassword(MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "key"));


            return smallWeChatDto;


        }






 service-acct/src/main/java/com/java110/acct/payment/adapt/fuiou/FuiouPaymentFactoryAdapt.java


@@ -294,8 +294,8 @@


            smallWeChatDto = new SmallWeChatDto();


            smallWeChatDto.setAppId(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "appId"));


            smallWeChatDto.setAppSecret(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "appSecret"));


            smallWeChatDto.setMchId(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "mchId"));


            smallWeChatDto.setPayPassword(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "key"));


            smallWeChatDto.setMchId(MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "mchId"));


            smallWeChatDto.setPayPassword(MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "key"));


            return smallWeChatDto;


        }






 service-acct/src/main/java/com/java110/acct/payment/adapt/icbc/IcbcPaymentFactoryAdapt.java.txt


@@ -369,8 +369,8 @@


            smallWeChatDto = new SmallWeChatDto();


            smallWeChatDto.setAppId(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "appId"));


            smallWeChatDto.setAppSecret(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "appSecret"));


            smallWeChatDto.setMchId(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "mchId"));


            smallWeChatDto.setPayPassword(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "key"));


            smallWeChatDto.setMchId(MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "mchId"));


            smallWeChatDto.setPayPassword(MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "key"));


            return smallWeChatDto;


        }






 service-acct/src/main/java/com/java110/acct/payment/adapt/pingan/PinganPaymentFactoryAdapt.java


@@ -276,8 +276,8 @@


            smallWeChatDto = new SmallWeChatDto();


            smallWeChatDto.setAppId(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "appId"));


            smallWeChatDto.setAppSecret(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "appSecret"));


            smallWeChatDto.setMchId(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "mchId"));


            smallWeChatDto.setPayPassword(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "key"));


            smallWeChatDto.setMchId(MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "mchId"));


            smallWeChatDto.setPayPassword(MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "key"));


            return smallWeChatDto;


        }






 service-acct/src/main/java/com/java110/acct/payment/adapt/plutus/PlutusPaymentFactoryAdapt.java


@@ -279,8 +279,8 @@


            smallWeChatDto = new SmallWeChatDto();


            smallWeChatDto.setAppId(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "appId"));


            smallWeChatDto.setAppSecret(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "appSecret"));


            smallWeChatDto.setMchId(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "mchId"));


            smallWeChatDto.setPayPassword(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "key"));


            smallWeChatDto.setMchId(MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "mchId"));


            smallWeChatDto.setPayPassword(MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "key"));


            return smallWeChatDto;


        }






 service-acct/src/main/java/com/java110/acct/payment/adapt/wechat/WechatPaymentFactoryAdapt.java


@@ -305,8 +305,8 @@


            smallWeChatDto = new SmallWeChatDto();


            smallWeChatDto.setAppId(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "appId"));


            smallWeChatDto.setAppSecret(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "appSecret"));


            smallWeChatDto.setMchId(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "mchId"));


            smallWeChatDto.setPayPassword(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "key"));


            smallWeChatDto.setMchId(MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "mchId"));


            smallWeChatDto.setPayPassword(MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "key"));


            return smallWeChatDto;


        }






 service-acct/src/main/java/com/java110/acct/smo/impl/QrCodePlutusPaymentAdapt.java


@@ -9,6 +9,7 @@


import com.java110.dto.smallWeChat.SmallWeChatDto;


import com.java110.intf.store.ISmallWeChatInnerServiceSMO;


import com.java110.utils.cache.MappingCache;


import com.java110.utils.constant.MappingConstant;


import com.java110.utils.constant.WechatConstant;


import com.java110.utils.util.PayUtil;


import com.java110.vo.ResultVo;


@@ -72,7 +73,7 @@


            shopSmallWeChatDto.setObjId(communityId);


            shopSmallWeChatDto.setAppId(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "appId"));


            shopSmallWeChatDto.setAppSecret(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "appSecret"));


            shopSmallWeChatDto.setMchId(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "mchId"));


            shopSmallWeChatDto.setMchId(MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "mchId"));


            shopSmallWeChatDto.setPayPassword(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "payPassword"));


        } else {


            shopSmallWeChatDto = smallWeChatDtos.get(0);




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


@@ -2,6 +2,7 @@






import com.java110.utils.cache.MappingCache;


import com.java110.utils.constant.MappingConstant;


import com.java110.utils.constant.WechatConstant;


import com.java110.utils.util.StringUtil;


import org.springframework.boot.context.properties.ConfigurationProperties;


@@ -84,7 +85,7 @@


    }




    public String getKey() {


        String keyCache = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "key");


        String keyCache = MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "key");


        if (!StringUtil.isEmpty(keyCache)) {


            return keyCache;


        }




 service-job/src/main/java/com/java110/job/adapt/fee/ReturnPayFeeMoneyAdapt.java


@@ -128,9 +128,9 @@


        smallWeChatDto.setAppId(onlinePayDtos.get(0).getAppId());


        List<SmallWeChatDto> smallWeChatDtos = smallWechatV1InnerServiceSMOImpl.querySmallWechats(smallWeChatDto);


        if (smallWeChatDto == null || smallWeChatDtos.size() <= 0) {


            payPassword = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "key");


            payPassword = MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "key");


            certData = MappingCache.getRemark(WechatConstant.WECHAT_DOMAIN, "cert");


            mchPassword = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "mchId");


            mchPassword = MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "mchId");


        } else {


            payPassword = smallWeChatDtos.get(0).getPayPassword();


            certData = smallWeChatDtos.get(0).getCertPath();




 service-job/src/main/java/com/java110/job/adapt/fee/ReturnPayFeeToPlutusAdapt.java


@@ -17,6 +17,7 @@


import com.java110.job.adapt.DatabusAdaptImpl;


import com.java110.po.onlinePay.OnlinePayPo;


import com.java110.utils.cache.MappingCache;


import com.java110.utils.constant.MappingConstant;


import com.java110.utils.constant.WechatConstant;


import com.java110.utils.util.BeanConvertUtil;


import com.java110.utils.util.PayUtil;


@@ -122,7 +123,7 @@


        if (smallWeChatDtos == null || smallWeChatDtos.size() < 1) {


            privateKey = MappingCache.getRemark(WechatConstant.WECHAT_DOMAIN, "PLUTUS_PRIVATE_KEY");


            devId = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "PLUTUS_DEV_ID");


            payPassword = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "key");


            payPassword = MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "key");


            publicKey = MappingCache.getRemark(WechatConstant.WECHAT_DOMAIN, "PLUTUS_PUBLIC_KEY");


        } else {


            privateKey = CommunitySettingFactory.getRemark(smallWeChatDtos.get(0).getObjId(), "PLUTUS_PRIVATE_KEY");




 springboot/src/main/java/com/java110/boot/properties/WechatAuthProperties.java


@@ -2,6 +2,7 @@






import com.java110.utils.cache.MappingCache;


import com.java110.utils.constant.MappingConstant;


import com.java110.utils.constant.WechatConstant;


import com.java110.utils.util.StringUtil;


import org.springframework.boot.context.properties.ConfigurationProperties;


@@ -84,7 +85,7 @@


    }




    public String getKey() {


        String keyCache = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "key");


        String keyCache = MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "key");


        if (!StringUtil.isEmpty(keyCache)) {


            return keyCache;


        }


@@ -97,7 +98,7 @@


    }




    public String getMchId() {


        String mchIdCache = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "mchId");


        String mchIdCache = MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "mchId");


        if (!StringUtil.isEmpty(mchIdCache)) {


            return mchIdCache;


        }