diff --git a/han-hai-module-pay/src/main/resources/apiclient_cert.pem b/han-hai-module-pay/src/main/resources/apiclient_cert.pem index fcdf88e..6dc6498 100644 --- a/han-hai-module-pay/src/main/resources/apiclient_cert.pem +++ b/han-hai-module-pay/src/main/resources/apiclient_cert.pem @@ -1,28 +1,25 @@ ------BEGIN PRIVATE KEY----- -MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDPo5Z4gvrmMdQH -3fmBDEzaNulWjzSYNmKsZtZzbEw8h/MdTxXps/a0LHO0dfVTpEgD2O+jGYYsdfSV -abR9VBpM9pEBQmjufIPlDd7BOjmxkqeIfuhVu1d2bAo6MVXWkY9/Wv3cLaSnZtrj -yVFhLVJNq5tugTRsLzRmiSOSJqJ0GRKlfwiQrcnuLT64iRJSEPstWN1n9EsoyonN -rMaG1oMtMbytvbd5YOBN/b/XozvGNInwguKC+O5ACmfoxLVqGpoP6AvrjBIIxcxz -jzZQAWJa2FUK7iehCzaPkiAhPnaBZ0VN+eeVOVPPC5sHKp8UveiM+8W6wmdrg0gI -UY1EumYfAgMBAAECggEAYppa0GvS3hH3kKzW2XOP42iEMnjbDxV0kk5btIBPS8d7 -qgVucIbntvQNFjuV/txa3ojcc+WhE+gH+BQ0g/e2baoBfkmdLvOuZs3JZJVT5IGy -UV2C04OdqzzvNmdLThPdwyrgtvht4pkzhUyK+szc8sl1jGqLDHz2M2MYo0T5jIun -8GeNL2SkJs4E/6wFYN7hFOL9TaHwEiphF6J+nDVIqlC4PhbMqZcOP3vwxoGUvgcH -r27w371Np/aoJ3b6i/G9drTp9E8FrCesvuoK0NaTGshzOoqsRQTfANNNkxRmo++U -2GSF+j195yM0Btx8tpiWmblChb/0uI2RqwgzIbbxsQKBgQD5FNMsOBtBrIdNnaNq -Y9v8oBD2RkAXj9/+VlixHT3RN7/DAF+RJktAffwJ/DtZQIlA8g4UN1i29mAPEdhV -Bm2diJVPatV0MxihyR87fU+G5I3Jly1zBGdlzSjNYBqnnAzbefDEhH2s1zYKNh05 -/89wJAhdPGXfTdogNHmNp2guKwKBgQDVaBLRHk2SYOu/JQ4/1dLtk3MWD/WITf4t -add6lS1Tg8E3j4hoOcBsgz4zMkyQtm7P7KaVz+0qAEXxeXhce5f7nr8x48rA0SyT -QkLB1AQQuHIko6j1oVohKOrf53jIKh4+h0daYpVA5gZVn75InKlEF4zuM8Af4C33 -PduIwQUh3QKBgBJlH1NcsWagPz3ULoVk6pI1oAsQFRuoXHqEFfi+mBoja94S4Pvv -QA97PmneXuOwiHJrbe7AR6T7fQyf3MIqv12rAJvk3+6890y7dbsG/iCQMIh6ybh8 -0sYJ6MGCH3XRaIGs98MLpdxl6G/In0/xPHijsJpyI3PiZAGM3o0/l8oRAoGBANTE -r8YZPWQNB96Klntkt6kw0pSTksy0XhBvL2xDYW6btT+s9mZb9hL6g0BODPJXQYJC -wxAov5+ZqCKKZktm2m//pUabg6Hcq2GitaZEuUzmaL9JAQLtPUxEXHCietSu0Xqs -K6LdGUwcSwKBgxkoQMbn6BXyOMJPI+UWolPlhjVtAoGBAI1ihRUL/oUYNao/a69B -gDCeeJmPPdFjixwAjiu3hUKJRs3F/Nigpewo7nQgska5mgaRx6u/3IpUoxLWh9sN -yVRFkdweg5uc5OdIiCfyuPLGopk3fjW1qKp8wVPw2I5NxEhvT/aNKOsokGrtXqRg -Cy2h60ovFhbrbwqFPCVLQlvS ------END PRIVATE KEY----- +-----BEGIN CERTIFICATE----- +MIIEKDCCAxCgAwIBAgIUM+n+gHZTGnx61AHcNOBT29fCjiIwDQYJKoZIhvcNAQEL +BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT +FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg +Q0EwHhcNMjUwMzMxMTA1NjEwWhcNMzAwMzMwMTA1NjEwWjCBgTETMBEGA1UEAwwK +MTcxMjM3ODIyNzEbMBkGA1UECgwS5b6u5L+h5ZWG5oi357O757ufMS0wKwYDVQQL +DCTlub/lt57nkZ7lroHlgaXlurfnp5HmioDmnInpmZDlhazlj7gxCzAJBgNVBAYT +AkNOMREwDwYDVQQHDAhTaGVuWmhlbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC +AQoCggEBALxqfe9wIiwGBzLAb4fm1lnT+pkkgR6oUdgO8rGqzr2yWdPilTEbvCKv +rqj5JA/ts8GkcOHs4aCG6E/wpNJgycbXTSTjhF+bsKH4/b+Z17F+C7hoLYIEV/rO +I6OikHMF9zdMQ67AJ09NwUvgbfJnrnGV2I76y2IN15drkRCsP0sVYvhgAM6R3xE/ +FQYVBpZZadRH7tV1YIexhnsnWqvCbJWw1extxYB1ArCJfLt/Czog7JFSPiny1Rz8 +YOrPW/AJNlAnoqbdv6cIuptINtnzZeFIknNlHMbNxj8ip15BP0utvRJhazccOY3n +82eBTZyKGJSrDguvNbL+6LT4W+3joBUCAwEAAaOBuTCBtjAJBgNVHRMEAjAAMAsG +A1UdDwQEAwID+DCBmwYDVR0fBIGTMIGQMIGNoIGKoIGHhoGEaHR0cDovL2V2Y2Eu +aXRydXMuY29tLmNuL3B1YmxpYy9pdHJ1c2NybD9DQT0xQkQ0MjIwRTUwREJDMDRC +MDZBRDM5NzU0OTg0NkMwMUMzRThFQkQyJnNnPUhBQ0M0NzFCNjU0MjJFMTJCMjdB +OUQzM0E4N0FEMUNERjU5MjZFMTQwMzcxMA0GCSqGSIb3DQEBCwUAA4IBAQCom9Rk +nb2IIqvUGWfsdYPXChJ7xB6KrZHJoqo+WL0Hc++kdx/IWBr+7B94GJtzHoOqbxZ0 +s39RtCZvv+bfqK7IoyztkARHDK757Ujmnm1ZNHQFLpdTBX1HOzQrDwWFbNuGuKGM +PKRGOmEqOsM1J7Y5ary/+ulr4PvVfz23N8udrRZUT3o45REUWOpfJrIpaQeSfXeW +gNwH6nAOgZ12uPsaUkOZSx5dM7PdQa/LqA1+7VaC4lE6Oa698+F7UeOoGQtEKF1w +yCa9PcV4PDX5LPAzCfOoyBX9V9FRBHfNCVCUOpR7fRWhkpZti4IOG4iNgj+VF5/w +LnB4kVpnnwOo9+V6 +-----END CERTIFICATE----- diff --git a/han-hai-module-pay/src/main/resources/pay_weixin.properties b/han-hai-module-pay/src/main/resources/pay_weixin.properties index ee81b4e..8715f18 100644 --- a/han-hai-module-pay/src/main/resources/pay_weixin.properties +++ b/han-hai-module-pay/src/main/resources/pay_weixin.properties @@ -5,8 +5,8 @@ #pay.notifyUrl=https://jobadmin.java996.icu/job-dev/job/pay/notify #pay.notifyUrlDev=https://jobadmin.java996.icu/job-dev/job/pay/notify -pay.mchId=1669760259 -pay.appId=wxe934cebcbc89d869 +pay.mchId=1712378227 +pay.appId=wx77ba4c7131677a74 pay.mchKey=78e4e80a2096b362114a7afeefd2ef24 pay.keyPath=classpath:apiclient_cert.pem pay.notifyUrl=http://h5.xzaiyp.top/massage-api/post/create diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ShopServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ShopServiceImpl.java index 43a393d..d5d0603 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ShopServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/ShopServiceImpl.java @@ -6,10 +6,6 @@ import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.apiBean.PageBean; import org.jeecg.modules.apiService.ShopService; -import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; -import org.jeecg.modules.massageItem.entity.MassageItem; -import org.jeecg.modules.massageItem.service.IMassageItemService; -import org.jeecg.modules.massageOrder.entity.MassageOrder; import org.jeecg.modules.massageShop.entity.MassageShop; import org.jeecg.modules.massageShop.service.IMassageShopService; import org.springframework.stereotype.Service;