wzy
2021-01-10 16da0ad1fda1dffa3019425a6887d38ed4217f44
refs
author wzy <wzy19931122ai@163.com>
Sunday, January 10, 2021 14:26 +0800
committer wzy <wzy19931122ai@163.com>
Sunday, January 10, 2021 14:26 +0800
commit16da0ad1fda1dffa3019425a6887d38ed4217f44
tree 810a5b58fd90be8d196f3390b9d408d673b91363 tree | zip | gz
parent ed55b07e0000d99d0aeb796649077d178256fbb8 view | diff
b5857b4fa654ac45f80e6c485a6c3ce12ca3870a view | diff
Merge branch 'api' into order_reform
3 files deleted
32 files modified
6 files added
1138 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/component/rabbitmq/RabiitMqTemplate.java 1 ●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/component/wechat/externalInterface/common/HttpsRequest2.java 53 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/component/wechat/externalInterface/common/Signature.java 20 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/component/wechat/externalInterface/common/WechatConfigure.java 19 ●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/component/wechat/externalInterface/protocol/paramProtocol/BrandWCPayRequestData.java 6 ●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/component/wechat/externalInterface/protocol/payComProtocol/JsApiPayComReqData.java 6 ●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/component/wechat/externalInterface/protocol/payProtocol/JsApiPayReqData.java 23 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/component/wechat/externalInterface/protocol/queryProtocol/JsApiPayReqData.java 295 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/component/wechat/externalInterface/protocol/queryProtocol/ScanPayQueryReqData.java 6 ●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/component/wechat/externalInterface/protocol/refundProtocol/RefundReqData.java 8 ●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/component/wechat/externalInterface/protocol/rsaProtocal/JsApiRSAReqData.java 50 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/component/wechat/externalInterface/service/BaseService.java 4 ●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/component/wechat/externalInterface/service/JsApiGetPublicKeyService.java 19 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/component/wechat/externalInterface/weixinUtil/WeixinServiceUtil.java 62 ●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/config/RabbitMqConfig.java 8 ●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/core/tools/rr/GlueFactory.java 23 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java 2 ●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java 44 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysProjServicesServiceImpl.java 20 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java 1 ●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/action/ShopRefundRecordAction.java 8 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WXShopOrderAction.java 1 ●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxCommonAction.java 13 ●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/impl/WxShopRefundRecordServiceImpl.java 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopWxtemplateMsg.java 89 ●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopWxtemplateMsgDao.java 2 ●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/MQTaskRouting.java 6 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/VipCreateTask.java 2 ●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/templateMsg/AppointmentSuccess.java 2 ●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/wechart/templateMsg/MsgDemo3.java 35 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/wechart/templateMsg/Task/TemplateMessageBulder.java 19 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/wechart/templateMsg/Task/UniformMsgSentTask.java 120 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/wechart/templateMsg/Task/messageBulderDemo/DefaultTemplateMessageBulder.java 99 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/wechart/templateMsg/TemplateNameConstance.java 15 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/application.properties 2 ●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/db/increment/20210109.sql 5 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/lhx/system.properties 3 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/test/application.properties 9 ●●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/config/test/system.properties 2 ●●● diff | view | raw | blame | history
zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopWxtemplateMsgDao.xml 30 ●●●● diff | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/shop/templateMsg-list.html 1 ●●●● diff | view | raw | blame | history