Merge branch 'dev' of https://gitlab.33.cn/yimu/mall-server into dev

# Conflicts: # .gitignore

Merge branch 'dev' of https://gitlab.33.cn/yimu/mall-server into dev
c171d927 · wp · ff487019 · e4d36177 · c171d927 · c171d927
Commit c171d927 authored Dec 23, 2021 by wp
3 changed files
--- a/mall-server-admin/src/main/java/com/fzm/mall/server/admin/pay/WeiXinProties.java
+++ b/mall-server-admin/src/main/java/com/fzm/mall/server/admin/pay/WeiXinProties.java
@@ -4,46 +4,46 @@ import lombok.Getter;

 public class WeiXinProties {
    @Getter
-    private static final String APP_ID = "wxf68e7ff5bccec3d6";
-    @Getter
-    private static final String MERC_ID = "1616366424";
-    @Getter
-    private static final String SECRET = "bd41bcb52c65a27340ee10bcd931d48b";
-    @Getter
-    private static final String SERIAL_NO = "6E24BCEDCC3F926DED59DD74DF2DB8824FDA6098";
-    @Getter
-    private static final String PRIVATE_KEY = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC1TSycYKVL2u5k\n" +
-            "+3V7unXLbaTkSVGnhnBjt2fkFRZm6wyR/KoJ/MYhBLczXgElPE0S5FRYhzH0Ze/v\n" +
-            "zj8Sl00C1aYACs1SjZh1NKUdK19AKaC7ZZTmL9clMsCPVYod+XfK+r8MN17Q5eFd\n" +
-            "aHrstXRUComswxjuTA9QX8C8kWuUtdjDKQZMMF1vdp4G3IEYPaL9V8ZEype2MTvc\n" +
-            "97A3CRfUibpOVbY6qowzUYHl5rhtwu91SPd/I1QcYDSVOJXl8qqdwr5XxHfjpqFU\n" +
-            "kOAvpRfuwYlvgnORk7MZ1x+2Z8oW7n1JZRSFpL5qQk43m+L2bQFXa+z9SQM4VU4F\n" +
-            "NsGsCTTfAgMBAAECggEAe72ypwCnkQBaGX4vD0WSREgPdOg93PM7HjP9qoRiB9iB\n" +
-            "edpTTAHEUKDhUSPl8D4Z9Lz2fH25sK8qdif0kIHHxBmB9SFqRd/yoHxP/XquxiIj\n" +
-            "XAPW/szEMNVU6/9cB11PT7CYWIQqKLXdfV1kGM84GGwgz1NRXsN26EqSR6GRJatZ\n" +
-            "lrl5K4li1DR4Yc2hiVFJsKDMcw2a0rBVAZDos2P22WhR/2KMHSrUG1pBpnpInjoZ\n" +
-            "oifrcGUWXb4wvLHrq0j+46MH+GlYCYSzjsqriEnVLFVIXjQrra37R9lFPqwgdJjo\n" +
-            "6aY88GFVqLj6lGoj+/GMjTQ1Zq7LwpZ/p/y6KJq2EQKBgQDdfKbAA953/TmUj4i7\n" +
-            "bnDkt4ORoEeREqyPyIiwZt9INYn7hrsghwfJv/GnpAfxKPKKV56FAF0G4xZkXlni\n" +
-            "MaR6PrmTkZOrg0aHGx8GHsxePjmZPyoLfRMy3fDs1wpHjSHgZmhiVraL5qSjbHE2\n" +
-            "I5YJ/tsoYc/+uA+rwMB8RuYIIwKBgQDRjXt26aePOPEEh/hmGlM+qwwR0scwttg+\n" +
-            "mFTjbJkmOoPrvjngZDcBvLLGwoGBoxgqQbmGSMpE65wHzgFTTorpUcgBMUDVDzRQ\n" +
-            "RwfGkSdO8GBxprXGps0SfH/20yHyknHp9sKOXSNjhwvSBitHi3w0VBAMk9knYcb0\n" +
-            "W8+Bvp7uFQKBgQDFY/0cbZZMK4KwkscR+9hjDeYU19pQQWtG7TpctCHUMdraLnYB\n" +
-            "BDZ9qDHO7NIjLBIUFwhwkiVWKPZg1vGWNBXY2KP9DyWjGmi1qgcZJkOOzjf5CqEH\n" +
-            "Ah4lHEVGXlOL9wy096+ZzJv9zLz35IJ09HwYRmi88Yc0BIf60tr5JxqFLwKBgEgG\n" +
-            "t08yFJPX4I/MJIcDuWUq6aUeq7SExGMPfO4Gn8VSC5H1+nK0P2vrbg9/P4BNjLrJ\n" +
-            "iHktf8icqy7Lkg0OTBTSNUqjoUMaTMLjBzsrHTW2zY+C26wCHS6jeGBgRaTYzSq7\n" +
-            "1DeWr9k/y8JOuIWI3hImarXIA7XTl8zZ2cMgwAPZAoGABGHzezqinXsODRWSVR1g\n" +
-            "0hITXizwcSFAyt5QfqHDMBcJ3Z0p6nR6aHLCkiqwHtpnlAQ8+1oiVoRrxo2SUSsL\n" +
-            "yH9Yi3Ye+IOAvA0WS1WYo9J4nAbEe3gvkSCThChV+91otQgqyySrHpUXtu6gFxmd\n" +
-            "+3Fwe/WrmL/s511eVswgiZI=";
-    @Getter
-    private static final String NOTIFY_URL = "https://server.hongrenlian.cn/root/mall/wxpay/without/return";
+    private static final String APP_ID = "wxbdddd81913c795e9";
+    @Getter
+    private static final String MERC_ID = "1604477044";
+    @Getter
+    private static final String SECRET = "aa201717c46a0e07c4c143b1ee73229a";
+    @Getter
+    private static final String SERIAL_NO = "72A62544B0A08A214FAEC780108692EDC6E7D5FA";
+    @Getter
+    private static final String PRIVATE_KEY = "MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDCwTnXfToW1zn/\n" +
+            "9RuT/++d8l1VeUorxPtQt62IaliqMztUEiehQ2dOtadPzvUu9VSadaEWwfhMsowo\n" +
+            "sIUaOij/6qfZcm4V9PgziNS33n7WGPFAhhiIHujb6VvQDirKdAKX9DqH9DoSg0bw\n" +
+            "cSK1OdWPsRC5nhHPgDJvKzibVJeV/e36lI7ZdvB93yCChB9XFoCVhwHHteZY+sLX\n" +
+            "4RSLBzCK4z/YOiytaYkYK4YZ7QjGyCcCLNXaMa9aBEfrUKAJOePBvrPl5ieNhPyY\n" +
+            "3pPdAarqKoUaSQ74B6I9zmwNZiuJc22K70/sb6iEzPRgdiV63iDzwDp8nJm/vMZq\n" +
+            "xAigr0L5AgMBAAECggEBAIK0CSyst2KC2UMFbZe7CUY4VRk7CGMtlPiL/ONzc8Pu\n" +
+            "FCAM+xnIUbnKQdpW68ezEC+FSDIsxYY7wcLBDOMYK1HtWu6dVHJZ8IUtjI1FvlvT\n" +
+            "a33BQQ+BpweHqn2MNH2gs+jlGK8LYjnwbpiJZSC5CrGfxLi98/gNckuXdysP75fS\n" +
+            "IiHnWFX2AZ3jrp+yL7dT1hkPqjZjdHespU9WRKGxSfRYFnsbPdpGYv4+RGRTTlf/\n" +
+            "fAw4n30jGc8Ua1zsGhIjlZp/x4SBnArHO+rupPH2kYDmVNJVZOqaIIJMZOprRDUz\n" +
+            "fUEIguAwJLqU2OVTsM8FEr6nV2UEbPg/A91XTqIRKbECgYEA7jNKHv+oYs3kbwGo\n" +
+            "GkgPwHnkDQbUkrfNAG1kdPTyqMCrINfeOvoDMjbcjbMlI/Gv3TaO98Ou6JTKkiav\n" +
+            "VAIg4HY0cU6fQUB4PcK9UW69ztDk7O3z4KjVE8xYMegdTb++d85QPDLHC+I2qB55\n" +
+            "o9Ux/sq+0DM8kLVkJm8UISSV0d0CgYEA0U7VjLTruNuwYAhXvIb+bjiNx52duqIN\n" +
+            "GGO/zBJwoo3s1biWy3Uho6db12bqnVsSD2UXebjJblPyZr94cAaTbIEzxLd1Fl0k\n" +
+            "RIBtN4IQLWzEUwRK8PlDr2/PM+s7CIrFttsL0JsT9uBtAsMdcYa4VB/U/8s/WQzK\n" +
+            "ddRbg5MsOc0CgYEA17/dAvbNrbCPl3wIpsVefxfoV2Q4ZivUou5ybvzuTas1VSox\n" +
+            "P3n0KydF3ZLFsSjYAaXJGOFFK6SZVodzhsPmw2hNV9O+q3uZbVdV4sxLX2gV8gQV\n" +
+            "QQeq96O+vnVfFWz3N8zHH79eSoU6vEveIWaZQg6hhjLiSLADZkx2Dw70JIECgYEA\n" +
+            "tWAiL68rwWImYeF43fcBDdRWEA+mee8pd+QgdR/ZmRNxkvZFPgO/ZciGDo+xaTBc\n" +
+            "4xhQEnutmbyHBsCPBky8fb8sdCAiB4IpBm9ftUUw7ZweOG403sKyA5nZLP1/h3Rx\n" +
+            "xnXktB1eXIW4ETexEQqUOtnmws6Gk41A+IBP2SG0plUCgYBn6abQwTpR1Ima5ZcJ\n" +
+            "tRokADWeTUL3TGKEpHDw6ywxsmaEUACh9dhb/rEsvMitE7em2Dg1eyqialFMD50a\n" +
+            "zw9dZrrb6bCcV5U4wfT8x+iQXWYXYPJbRx+5SFYOSZkKUrHVsgdLX+dDXsg88yuM\n" +
+            "UtSQ5NpWkCE1oULt9EfRAF1HyQ==";
+    @Getter
+    private static final String NOTIFY_URL = "https://testadminym.8n.cn/root/mall/wxpay/without/return";
    @Getter
    private static final String WEIXINPAY_URL = "https://api.mch.weixin.qq.com/v3/pay/transactions/jsapi";//微信jsapi下单地址
    @Getter
-    private static final String APIV3_KEY = "gTaZbpHQBtyNUiAUBY2B5ilVNaBwnEWF";
+    private static final String APIV3_KEY = "D864DA53FEF8ACD41519064967DC10D2";
    @Getter
    private static final String API_KEY = "api秘钥，新版本v3接口好像没用";
    @Getter

--- a/mall-server-front/src/main/java/com/fzm/mall/server/front/order/controller/weixinPay/WeiXinProties.java
+++ b/mall-server-front/src/main/java/com/fzm/mall/server/front/order/controller/weixinPay/WeiXinProties.java
@@ -5,51 +5,51 @@ import lombok.Getter;
 public class WeiXinProties {
    //app
    @Getter
-    private static final String WX_APP_ID = "wxb45e6d38dd1babba";
+    private static final String WX_APP_ID = "wxbdddd81913c795e9";
    @Getter
-    private static final String WXSECRET = "b74337b37b30b9d527de9f1b7fe2270e";
+    private static final String WXSECRET = "aa201717c46a0e07c4c143b1ee73229a";
    //jsapi
    @Getter
-    private static final String APP_ID = "wxf68e7ff5bccec3d6";
-    @Getter
-    private static final String MERC_ID = "1616366424";
-    @Getter
-    private static final String SECRET = "bd41bcb52c65a27340ee10bcd931d48b";
-    @Getter
-    private static final String SERIAL_NO = "6E24BCEDCC3F926DED59DD74DF2DB8824FDA6098";
-    @Getter
-    private static final String PRIVATE_KEY = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC1TSycYKVL2u5k\n" +
-            "+3V7unXLbaTkSVGnhnBjt2fkFRZm6wyR/KoJ/MYhBLczXgElPE0S5FRYhzH0Ze/v\n" +
-            "zj8Sl00C1aYACs1SjZh1NKUdK19AKaC7ZZTmL9clMsCPVYod+XfK+r8MN17Q5eFd\n" +
-            "aHrstXRUComswxjuTA9QX8C8kWuUtdjDKQZMMF1vdp4G3IEYPaL9V8ZEype2MTvc\n" +
-            "97A3CRfUibpOVbY6qowzUYHl5rhtwu91SPd/I1QcYDSVOJXl8qqdwr5XxHfjpqFU\n" +
-            "kOAvpRfuwYlvgnORk7MZ1x+2Z8oW7n1JZRSFpL5qQk43m+L2bQFXa+z9SQM4VU4F\n" +
-            "NsGsCTTfAgMBAAECggEAe72ypwCnkQBaGX4vD0WSREgPdOg93PM7HjP9qoRiB9iB\n" +
-            "edpTTAHEUKDhUSPl8D4Z9Lz2fH25sK8qdif0kIHHxBmB9SFqRd/yoHxP/XquxiIj\n" +
-            "XAPW/szEMNVU6/9cB11PT7CYWIQqKLXdfV1kGM84GGwgz1NRXsN26EqSR6GRJatZ\n" +
-            "lrl5K4li1DR4Yc2hiVFJsKDMcw2a0rBVAZDos2P22WhR/2KMHSrUG1pBpnpInjoZ\n" +
-            "oifrcGUWXb4wvLHrq0j+46MH+GlYCYSzjsqriEnVLFVIXjQrra37R9lFPqwgdJjo\n" +
-            "6aY88GFVqLj6lGoj+/GMjTQ1Zq7LwpZ/p/y6KJq2EQKBgQDdfKbAA953/TmUj4i7\n" +
-            "bnDkt4ORoEeREqyPyIiwZt9INYn7hrsghwfJv/GnpAfxKPKKV56FAF0G4xZkXlni\n" +
-            "MaR6PrmTkZOrg0aHGx8GHsxePjmZPyoLfRMy3fDs1wpHjSHgZmhiVraL5qSjbHE2\n" +
-            "I5YJ/tsoYc/+uA+rwMB8RuYIIwKBgQDRjXt26aePOPEEh/hmGlM+qwwR0scwttg+\n" +
-            "mFTjbJkmOoPrvjngZDcBvLLGwoGBoxgqQbmGSMpE65wHzgFTTorpUcgBMUDVDzRQ\n" +
-            "RwfGkSdO8GBxprXGps0SfH/20yHyknHp9sKOXSNjhwvSBitHi3w0VBAMk9knYcb0\n" +
-            "W8+Bvp7uFQKBgQDFY/0cbZZMK4KwkscR+9hjDeYU19pQQWtG7TpctCHUMdraLnYB\n" +
-            "BDZ9qDHO7NIjLBIUFwhwkiVWKPZg1vGWNBXY2KP9DyWjGmi1qgcZJkOOzjf5CqEH\n" +
-            "Ah4lHEVGXlOL9wy096+ZzJv9zLz35IJ09HwYRmi88Yc0BIf60tr5JxqFLwKBgEgG\n" +
-            "t08yFJPX4I/MJIcDuWUq6aUeq7SExGMPfO4Gn8VSC5H1+nK0P2vrbg9/P4BNjLrJ\n" +
-            "iHktf8icqy7Lkg0OTBTSNUqjoUMaTMLjBzsrHTW2zY+C26wCHS6jeGBgRaTYzSq7\n" +
-            "1DeWr9k/y8JOuIWI3hImarXIA7XTl8zZ2cMgwAPZAoGABGHzezqinXsODRWSVR1g\n" +
-            "0hITXizwcSFAyt5QfqHDMBcJ3Z0p6nR6aHLCkiqwHtpnlAQ8+1oiVoRrxo2SUSsL\n" +
-            "yH9Yi3Ye+IOAvA0WS1WYo9J4nAbEe3gvkSCThChV+91otQgqyySrHpUXtu6gFxmd\n" +
-            "+3Fwe/WrmL/s511eVswgiZI=";
-    @Getter
-    private static final String NOTIFY_URL = "https://server.hongrenlian.cn/root/mall/wxpay/without/return";
+    private static final String APP_ID = "wxbdddd81913c795e9";
+    @Getter
+    private static final String MERC_ID = "1604477044";
+    @Getter
+    private static final String SECRET = "aa201717c46a0e07c4c143b1ee73229a";
+    @Getter
+    private static final String SERIAL_NO = "72A62544B0A08A214FAEC780108692EDC6E7D5FA";
+    @Getter
+    private static final String PRIVATE_KEY = "MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDCwTnXfToW1zn/\n" +
+            "9RuT/++d8l1VeUorxPtQt62IaliqMztUEiehQ2dOtadPzvUu9VSadaEWwfhMsowo\n" +
+            "sIUaOij/6qfZcm4V9PgziNS33n7WGPFAhhiIHujb6VvQDirKdAKX9DqH9DoSg0bw\n" +
+            "cSK1OdWPsRC5nhHPgDJvKzibVJeV/e36lI7ZdvB93yCChB9XFoCVhwHHteZY+sLX\n" +
+            "4RSLBzCK4z/YOiytaYkYK4YZ7QjGyCcCLNXaMa9aBEfrUKAJOePBvrPl5ieNhPyY\n" +
+            "3pPdAarqKoUaSQ74B6I9zmwNZiuJc22K70/sb6iEzPRgdiV63iDzwDp8nJm/vMZq\n" +
+            "xAigr0L5AgMBAAECggEBAIK0CSyst2KC2UMFbZe7CUY4VRk7CGMtlPiL/ONzc8Pu\n" +
+            "FCAM+xnIUbnKQdpW68ezEC+FSDIsxYY7wcLBDOMYK1HtWu6dVHJZ8IUtjI1FvlvT\n" +
+            "a33BQQ+BpweHqn2MNH2gs+jlGK8LYjnwbpiJZSC5CrGfxLi98/gNckuXdysP75fS\n" +
+            "IiHnWFX2AZ3jrp+yL7dT1hkPqjZjdHespU9WRKGxSfRYFnsbPdpGYv4+RGRTTlf/\n" +
+            "fAw4n30jGc8Ua1zsGhIjlZp/x4SBnArHO+rupPH2kYDmVNJVZOqaIIJMZOprRDUz\n" +
+            "fUEIguAwJLqU2OVTsM8FEr6nV2UEbPg/A91XTqIRKbECgYEA7jNKHv+oYs3kbwGo\n" +
+            "GkgPwHnkDQbUkrfNAG1kdPTyqMCrINfeOvoDMjbcjbMlI/Gv3TaO98Ou6JTKkiav\n" +
+            "VAIg4HY0cU6fQUB4PcK9UW69ztDk7O3z4KjVE8xYMegdTb++d85QPDLHC+I2qB55\n" +
+            "o9Ux/sq+0DM8kLVkJm8UISSV0d0CgYEA0U7VjLTruNuwYAhXvIb+bjiNx52duqIN\n" +
+            "GGO/zBJwoo3s1biWy3Uho6db12bqnVsSD2UXebjJblPyZr94cAaTbIEzxLd1Fl0k\n" +
+            "RIBtN4IQLWzEUwRK8PlDr2/PM+s7CIrFttsL0JsT9uBtAsMdcYa4VB/U/8s/WQzK\n" +
+            "ddRbg5MsOc0CgYEA17/dAvbNrbCPl3wIpsVefxfoV2Q4ZivUou5ybvzuTas1VSox\n" +
+            "P3n0KydF3ZLFsSjYAaXJGOFFK6SZVodzhsPmw2hNV9O+q3uZbVdV4sxLX2gV8gQV\n" +
+            "QQeq96O+vnVfFWz3N8zHH79eSoU6vEveIWaZQg6hhjLiSLADZkx2Dw70JIECgYEA\n" +
+            "tWAiL68rwWImYeF43fcBDdRWEA+mee8pd+QgdR/ZmRNxkvZFPgO/ZciGDo+xaTBc\n" +
+            "4xhQEnutmbyHBsCPBky8fb8sdCAiB4IpBm9ftUUw7ZweOG403sKyA5nZLP1/h3Rx\n" +
+            "xnXktB1eXIW4ETexEQqUOtnmws6Gk41A+IBP2SG0plUCgYBn6abQwTpR1Ima5ZcJ\n" +
+            "tRokADWeTUL3TGKEpHDw6ywxsmaEUACh9dhb/rEsvMitE7em2Dg1eyqialFMD50a\n" +
+            "zw9dZrrb6bCcV5U4wfT8x+iQXWYXYPJbRx+5SFYOSZkKUrHVsgdLX+dDXsg88yuM\n" +
+            "UtSQ5NpWkCE1oULt9EfRAF1HyQ==";
+    @Getter
+    private static final String NOTIFY_URL = "https://testym.8n.cn/root/mall/wxpay/without/return";
    @Getter
    private static final String WEIXINPAY_URL = "https://api.mch.weixin.qq.com/v3/pay/transactions/jsapi";//微信jsapi下单地址
    @Getter
-    private static final String APIV3_KEY = "gTaZbpHQBtyNUiAUBY2B5ilVNaBwnEWF";
+    private static final String APIV3_KEY = "D864DA53FEF8ACD41519064967DC10D2";
    @Getter
    private static final String API_KEY = "api秘钥，新版本v3接口好像没用";
    @Getter

--- a/mall-sql/mall_create.sql
+++ b/mall-sql/mall_create.sql
@@ -2475,10 +2475,10 @@ INSERT INTO `sys_version`(`id`, `type`, `version_name`, `force_version`, `addres
 INSERT INTO `sys_version`(`id`, `type`, `version_name`, `force_version`, `address`, `create_time`, `version_code`, `update_time`, `content`) VALUES (2, 'android', '1.0.1', '101', 'https://hlg-data.oss-cn-shanghai.aliyuncs.com/install/android/szbq.apk', 1626254054976, 101, 1626254054976, '版本内容');

 ALTER TABLE `goods_spu`
-    ADD COLUMN   `nft_file` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'ntf文件', AFTER `delay_delivery`;
+    ADD COLUMN   `nft_file` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'ntf文件';

 ALTER TABLE `goods_spu`
-    ADD COLUMN   `hash` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通邦nfthash', AFTER `nft_file`;
+    ADD COLUMN   `hash` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '通邦nfthash';

 ALTER TABLE `opration_function`
    ADD COLUMN `param` varchar(500) NOT NULL DEFAULT '' COMMENT '功能区跳转参数';