From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期一, 29 七月 2024 18:51:32 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-modules/ruoyi-order/src/main/resources/conf/param.properties | 34 ++++++++++++++++------------------ 1 files changed, 16 insertions(+), 18 deletions(-) diff --git a/ruoyi-modules/ruoyi-order/src/main/resources/conf/param.properties b/ruoyi-modules/ruoyi-order/src/main/resources/conf/param.properties index 8356c04..e18bb5d 100644 --- a/ruoyi-modules/ruoyi-order/src/main/resources/conf/param.properties +++ b/ruoyi-modules/ruoyi-order/src/main/resources/conf/param.properties @@ -6,16 +6,17 @@ ## 支付宝配置文件 ## # 商户收款支付宝账号 -seller_email = 962295261@qq.com +seller_email = tuodanchaowan@163.com # 商户私钥 -private_key = MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCh8gD6Up6ekrCgX5jKW5dBpieAJETViJ2pjTlxAsUq6XYsuxDPcAQDtBXPwhnIMsoMzTvgjRVS632h2nIDVOPEeW1kOkNor4mnchYowDCh+nt9VbI+2N0RVAPGqlNELAlvvmpZiUCupWHdZIco/UHYdWWLAsK+8wjT1LgVGOGU5Q9+98yCsxfeWkfFlgRM/FwhaYUkfgudujYQCf6GxhCNMci8iylreQMUcb8gaF4bjcLPyYAPCiINA5bq8GJwQG+CAqpMOXzFcRnyvAsUAn0mctfPpb6Kp2vUF5Yh2dQMpcSQMkH7arqS0jmCTy0v1/8nQLlKVQEXrTrx44f3/wB9AgMBAAECggEAHYn456/+Qspa8UW+ptqCAnV+Kv9ylshuiai624Q31pXy+kG81TmHYe2NNPIgpcWt2RvuWg0h4JgXuFgSB82KJiJH88o01Xl/UE2dAR3dQQ5hTAE/m/sOh8SdU7VprruhlQJUf7RrWe/MpAdcJ/vZ8NOpC+wa/Z1y9MCOOzromrHJaxqJeNInj5asJRpet0mCbXi6yduaF3dMwwyCP/yL0vyjQEb5vyPic7Vi1tzhnaUG/kEM3TYv/BqY2wW5AGUdtoOA6ao+eR1lyAqSPmL81b1ytYJv83FZzpv7IXwp6kDbcbSNYcycT9uzxOxzWIeolX77QERCjQYBi8s65KjuuQKBgQD7dv58c58yHm3uwKuA6pdIgk0uPQ1JEmCYAFT73YNEX7uL4fRJuf4mJuuMSlSM9eKuDeGahsia5jiNoxI4I6xqPJ4crJZX3M/P7zWSEdji6a+2+5uqtpWuA/7lPfmy/CuPdRYqoepELoZdYh0jmQrYXzoWarL51teGXkiS+/v28wKBgQCk3bNmhBmACCyDmQ6UpwxAZs5huknT6SmkWZsc3PDSyJXXfxkJR5EvxXsX+djfGUbB8B6RUjlHXsK03ojNhmW31z+lMseBLhq8+9nbtooo7yWLPhBimM5ta5O07XwW0aDC/hILpjZG7Nc9S6oAOx8xCTlKBAG83xU2GfL1rAzmzwKBgQD3zuQrMKYJdgNP7X8VpBlB02bL0k5tXDbklC8rpbfegZkI2LssjKXwYxptPjLkVsv0Sqmw5nJ6c7X3nmQt/rnCV8pY55uhKnGAsHNSZ1QdCb2nzXwyV4xZ2IYw00pnICqtTO1zRezfFBpFnJKqqf8OC4nq3WtS2m26dN+AOeKsEQKBgAruK+u7DFnBsPnUlvPiE1zdtAckq6piBgHAcxk5yLmg1NZhtc44sXaCWEPhq7A248sN2Wj3E5cYwD3vlxBRPcMvgSe5syJsZRdsdygq9QP7vvh5V+rBiMYWYMeZCyYUJd1nrNia33RaVXbZ4l57jPjaTLMMivTzsVtR4xrIml5fAoGAafZXXMmHRPdoMPbuZv19OBZYHFLy4eVihBJML9WYpPJS0wTdvcsrIWsdfFvJgM5ofgsbZ03gy4dDYp8jq/4RaYcsJ8PBW1ETuyf/Kw8+BglxX1NEDcVqniW9pHd0FRahn//h0cBK0iAfcs+VtIN2fcCzUmBfx7iegusq0o6eJfU= +private_key = MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC3ap1qQ5GTe+syB8Tu/fH8nRdpjA7yNgLINR/kFq1VFzxDref7DQDUDWXt+s5QZyBjL1UfbQWtA96F+OpgmIiNMdZSn9FH/w5XSqSd7B4nAa1sgfdLdZDvm+crqzn8OzyEJTrO8tihF+9K+btBl37s3QfmmzCRl1PAAMGqfy/JcQ2aivY+hxb25V0kD5AAXM7mVC2zzcBrykzafQCXEnDC7ls4Hjy0agmq1bKSx8SLYTsXAzZiGk9E7yh76nDAB+P1+kKPEYJXociU3k4YRR7l+6tzBPd+/mVkL34nuV5IiAK/795CrP/9gC50nZK/6CqSPDlQlOaAaJ2uZvAOeKx3AgMBAAECggEAMzw5+swjJ0KvYYtgDK6tYTZ0qswwBKLnxgto/CsFgkZ6VCGJMszgFVwkxASSi00zc+Ft8thehIUXLO9qcU9Knb51MyFnsafi1qmIMIEbryO90RjA/rg5o2U2fzFWgkn9zqAjvFmEAAQSmSwHjfwGvZ3Erjtdpt3RzEmpz7m1nJxYuZ2JLdo8AIY+iYn1NeDxHMi27RtqsZje7RV5YXrqKtMMzW2atmj+Dbn/E1pxpF0Dz6l0TqQh5B+9j1XlPTZKcYOYHNI0ACV+dV1NZsqmdhX0lKtQbsj/Q67vhq7uCmQRKcEka/5Z0X/TOKbwJE6i2/YEuA4PUGLpBMZQXhSGYQKBgQD50IuUTG6fg1dqFt9bJXxq2i1lkIHvzaCkHqVnTMyTDs+VcO2S6YaAFy6BLSI933qvHLogkhqnHiN+BRHe/M5+4TAOx30SQlJYa5ojpNFwMnRSZgxLoEddwlfj6qTnCgDW3CsUPR85x85NjIhONy75muNnNG8GHdn3blk2Y7KhpwKBgQC79TQhz5eJ6cwiWPWMWnnSAVvFKW4iPZjkbk+Sl7JXuqzvsdE47gGN0Vk8iYWEc2WrnQY6vf7WnamQYi+Gr5ySfTSt9qwvRx0IRzHdSZkOsHJLBCnAt+Pf+pSBc2Z788iUXVbDRAIfF6YYG44P3jHspbnGPJt14PP0sHbPmh7YsQKBgGzGGYChJyndjpprCyYs1FfSWCH5IhrAdkn/7hVko08FC+4OFeP6Os5bSayFcntua4UEBSdZdrF9tgaRPo7RlTg55SsKQbNJnYFSmPMcOPWZgny+YmwrheeVT5+188eF24eypi9Rzd7i2Tl7D36/GH0mrA2sDwuiw92w9rdwAb/RAoGAf6RDZPqvNI87e8/h4RDITd9yTPCXxFUEcYygKTMvf/hb3ONq7DhlgcO70CqsK4iacPLP+jBw0Zp8PnsPP24e7DRvA/zSbcDjbG285URH1vvogh0vpZq7+60WENsnq+GgQ3EnrK+QqUDMIO8FiK0iRk09XexmvqSnx3HXHaDSdeECgYB9htO5mOn2/ugIeMw11g+JJkZ/hzE55/6fLf7zh3yel5EflmAdYRv0lHafjyXIzNrAnBgD95x4LKGLi9A5AMo9SJJu0ZOg1KujKPVY4ByCm9SO7ErJDuHI4AhtewdHhYDpnXMakoxm/medSjlt7GCVv7E/eDpNZs+MLi9MiTFx2g== # 支付宝公钥 -ali_public_key = MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo3EoPQOXMlLmsCev3M3SAtu09YSPld7R0BFjaLBImX3oMueU8vekJQ1dDcJjYPAfaK+zlfbFqHoWWr2vft7jieQe5dXCS4vOm50Uhl5CfyrEcKsj9CMVX8aDzfVRSvItx1yG2o3jq42YlLV09FACeTP6NvDDQ+oaG8TXUzFkAv4wRfOUX/r/RKnXG5UZXhIUx7+A9qqDe/h1f0jbq6Q8n0Gxj0p0fhMOZwPdCR1Lota288SdgsT3oCypN5lzWrbhIhxAldsvMuEeAhszqN+DO37tc3dvqI1UGnXtvQz/bzBeTUpy71optvNNVq19WHj/7SWrYm8WStZNz5LzAX218QIDAQAB +ali_public_key = MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlW2RMACojdqTa8H+j6411Lm5UipGXXbQiswq50rUflwjTj843zNVaVpk8uJmbdmtUBJlmblgBS/a31O4L4LrHB8WxJ+w0f9DBNTq9T6b80MiAVnU/3gXK365DmbzPWS5pR9wEgJVHnfOFUbsB5AVFHV0m9hUZcPv7xveuEp3BEoD5smaDJByR+KgFw0Q0JgINhhE6bsEa3UgJ198af269LtQ5HJl1TWLI8aeqW14HrxyADIt49NB9KZ8MOdKP+66HWcrXlipKFHtccy3dff72DqPmFdESoXfLXKZyhU5w9v4Q5F6UoAGTPwl9KQwikTobNeJ/7su7X3AB6+C14J4sQIDAQAB # 支付宝回调地址 -notify_url = http://116.63.172.131:8088/api/pay/alipay/notify +#notify_url = http://10.136.177.152:9000/order/forepart/paylog/alipay/notify +notify_url=http://221.182.45.100:9000/order/forepart/paylog/wxpay/notify # 签约的appid -app_id = 2021001161670285 +app_id = 2021004150664294 ## 支付宝配置文件 ## @@ -24,26 +25,23 @@ # 微信开发平台（应用APPID） #以前的wx74f8aea529dc99d7 -appID = wx24b9abadcc524e29 +appID = wx69e3ac6e13a889b7 # 微信支付分配的商户号ID（微信支付商户号） -mchID = 1600685974 +mchID = 1220540001 -# 公众号的商户号 -GmchID = 1600685974 +# 小程序的商户号 +XmchID = 1220540001 # 应用对应的密钥（商户平台开发设置） -key = E10ADC3949BA59ABBE56E057F20F883E +key = 1PJiendxfSBX9Wrx9mQzNeiXacYwWXFY # 微信回调地址 -wx_notify_url = http://116.63.172.131:8088/api/pay/wxpay/notify +#wx_notify_url = http://10.136.177.152:9000/order/forepart/paylog/wxpay/notify +wx_notify_url=http://221.182.45.100:9000/order/forepart/paylog/wxpay/notify -# 没有公众号支付所以没有后面的参数配置 -# 公众号对应的密钥（商户平台开发设置） -key_2 = ZTlyynxl24490918687091970bianhao -# 公众号的APPID -GappID = wx742b6a65ca132418 -#公众号的appSecret -appSecret = 1baf1d22f695f3a9aa9f59934bcc94fe +# 小程序的APPID +XappID =wx69e3ac6e13a889b7 + -- Gitblit v1.7.1