From 8b8e931b00ad20da383c8a8e282863e303be9040 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=AC=A3=E6=82=A6?= <2289014031@qq.com>
Date: Sun, 8 Sep 2024 19:27:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E7=BA=BF=E4=B8=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/muyu/cloud/market/domin/Customer.java   | 3 +--
 .../src/main/java/com/muyu/cloud/market/domin/MyApi.java      | 1 +
 cloud-market-server/src/main/resources/bootstrap.yml          | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cloud-market-common/src/main/java/com/muyu/cloud/market/domin/Customer.java b/cloud-market-common/src/main/java/com/muyu/cloud/market/domin/Customer.java
index 721a399..2a90e45 100644
--- a/cloud-market-common/src/main/java/com/muyu/cloud/market/domin/Customer.java
+++ b/cloud-market-common/src/main/java/com/muyu/cloud/market/domin/Customer.java
@@ -43,8 +43,7 @@ public class Customer extends BaseEntity {
     /**
      * 生日
      */
-    @JsonFormat(
-            pattern = "yyyy-MM-dd HH:mm:ss"
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss"
     )
     private Date birthday;
     /**
diff --git a/cloud-market-common/src/main/java/com/muyu/cloud/market/domin/MyApi.java b/cloud-market-common/src/main/java/com/muyu/cloud/market/domin/MyApi.java
index 2fe20c2..9322b11 100644
--- a/cloud-market-common/src/main/java/com/muyu/cloud/market/domin/MyApi.java
+++ b/cloud-market-common/src/main/java/com/muyu/cloud/market/domin/MyApi.java
@@ -93,6 +93,7 @@ public class MyApi {
      * 允许试用次数
      */
     private Integer userCount;
+
     /**
      * 是否被购买
      */
diff --git a/cloud-market-server/src/main/resources/bootstrap.yml b/cloud-market-server/src/main/resources/bootstrap.yml
index 3c31ceb..93a3703 100644
--- a/cloud-market-server/src/main/resources/bootstrap.yml
+++ b/cloud-market-server/src/main/resources/bootstrap.yml
@@ -56,6 +56,6 @@ alipay:
           appId: 9021000140633904
           appPrivateKey: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCBCZ4+TPuI+00ZLNdo2wuI8/glDJ+ksfJmWUzmOoSxd9FPPd86XwYWmyzktYh8Vw4c6DipHm3BjCVBiGIKYfk8TfsPMaz2ni3B2MxOgswnPCS+Erp5DlBz7/DMbiPOUfi15KGjB2Y3KF005NnWr9RrF4xR0bEyPdEOQhusfc7qtIintsgTTU0jDhSNLbIA4KuzXwaivAr8eBdy6uE2XO0Mq105UwtD4x7+QE8h/0QlPkS9VgMtyYMrxRBJLS85UatfjLiKcbdIT/wlOmGSoO2AlOzBjCgGZ55mEFbHnCNf0Pmn0Eaf9PLLoc5W4G5OZ7HvjBDzfV0lzzu98J83oA8DAgMBAAECggEAKCL2vsgxQUVxkNAa3Lmtl9bTK6sGiTL0hBNo0QAIwC7Vw0Eqizx9Z1CzIRy6LHrjn+g3n5sgZqCSAhVK8ZHR9YkH+4znEPrYnsAxpIYYvGd/wkOPDxJ9weIzU1M6/fUPWHyaLlyh1axPeaFphNbCSuFTOyvvYwJJYZb8hqXHU8eI0Wo15iMj9K4kcyQiUAQG16WvyXw1cX8Vt5v1r/7k1SdK8tUawzc47irlVihf3HESOX9IbcqL2CGF/3laXojSRvmgNe6Biw9MDJK7qOwrscwyNihZwcDgY6vxGZD5q9DUu6weILCLoNyceDXosOgQwKjVbOzWLj+4opSLgtluIQKBgQDtTJ7cnaK72INLdiNVbx2JtNMD1e1w/NJQvPQg12OC+hBd11U4lsU5GCmnOXshrHCgm4V761O2OMCIxsEFBPGKj1f33i4D3fGbqDwOmXPuYNLTUcIBpxm8h3RfUF3OkkAceYi9kDL5TkqgxO9zRVd9GsK27cPMo3k8zzmyCaomkQKBgQCLNODZDrNepV/vY50GFCzpqX7rdvJBXb1rtHk3JcOd8AsncSlEXLGk4TsLGvDwasBfCsBRC3FY08Ft0LgEyEv5e8DGWtPmu+Ya6ssCFwdjsOH8Ei+YtsB/672zdNtBl2vCkELECZu31659y2DGga0DVHvqmJPp3CqVWfjrQM+uUwKBgQCclkjmL6co6ZCKBST/xVjqe8Ya69nJCywFVwqJeVgTH8wZAHUd6G+wYz9pN8cGy3FuqfGFeh49SmnSV8Ua+M4irsBPse8PYi+ClZs7zwrvLDkydOreiFO1UnT6SF/+ZgekQpZ28GaSmJUqTYnsuL8osLX4XCEuMllYRS4/S51Z4QKBgGtQwYIz9g2h2fp3xca46QLdew3VLd88f9m3ULc18r8gHckzUMf12bEtPVJLW7FL6q+aXzZbZu8+l+CrxiFRtFhJkgyYWsGG21am6QfcbwLoit7DulO1l2NGfoEJNjoznIxqoD321kf9CvTJQ/rkX1ew2rK5G1ZvN5jZuq7J0REnAoGALww4e5u21/ZnayUp/dZcMiQ3+AcWVb/7I4r1lwKTUVkbKa91HsITpc7lk2U5xA2kGbBqLvS+Ok0tgiSKucRf3LDRRZx3uORBKb85GamsTIb//9+qaRWQH/oll6O/ziYrSw1QrhX/DoJpLgWyPZI+aAasFEB6JQs9Smkh1hDYGs0=
           alipayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7rRdHzrcyEdSOLPm3ITg+t/C3tGp9+wl739nOgFExrSD1j1C95tTRGUCqNUQtatiYmlAfwOKzkNhr/XEH/Vvpq5Ei8C4ZBWJqOMw7fQfBE6m5erO/FOuS4pyZCtQZyP9C5nhtYOupnGtq0fmgQaGKk657vszYSMEtpuQaZ5/odUYxRbYP3IHbcK+++PQBarfOdnhNcnR/Ry7TVOC3+da0dogmClPEconZQMwCJ81CJ7Hj4TKKyLTe9bz+J2tkUeNr9Mc72g4ljjftX7k0RBpBpi4HSHJ3SmPLhktiuDOeOGOef88pBgBtFV03/+aFpUEHx/imiHhBMBeNT3kqFV03QIDAQAB
-          notifyUrl: http://453rdd.natappfree.cc/alipay/notify
-          returnUrl: http://localhost:9701/market/apitest/index
+          notifyUrl: http://21.12.0.10:8080/alipay/notify
+          returnUrl: http://21.12.0.10:80/market/orders
 #          localhost:9701