垃圾回收支付证书更改

@@ -2,9 +2,11 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/config.php" afterPath="$PROJECT_DIR$/api/config.php" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/OrderController.php" afterPath="$PROJECT_DIR$/api/index/controller/OrderController.php" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" afterPath="$PROJECT_DIR$/app/admin/controller/ShoporderController.php" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/wechat/cert/apiclient_cert.p12" afterPath="$PROJECT_DIR$/public/wechat/cert/apiclient_cert.p12" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/wechat/cert/apiclient_cert.pem" afterPath="$PROJECT_DIR$/public/wechat/cert/apiclient_cert.pem" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/wechat/cert/apiclient_key.pem" afterPath="$PROJECT_DIR$/public/wechat/cert/apiclient_key.pem" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/wechat/cert/证书使用说明.txt" afterPath="$PROJECT_DIR$/public/wechat/cert/证书使用说明.txt" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -113,8 +115,8 @@
       <file leaf-file-name="PayController.php" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="400">
-              <caret line="25" column="46" lean-forward="true" selection-start-line="25" selection-start-column="46" selection-end-line="25" selection-end-column="46" />
+            <state relative-caret-position="175">
+              <caret line="16" column="23" lean-forward="true" selection-start-line="16" selection-start-column="23" selection-end-line="16" selection-end-column="23" />
               <folding>
                 <element signature="e#861#925#0#PHP" expanded="false" />
                 <element signature="e#930#1766#0#PHP" expanded="false" />
@@ -220,8 +222,8 @@
   </component>
   <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
   <component name="ProjectFrameBounds" extendedState="1">
-    <option name="x" value="155" />
-    <option name="y" value="77" />
+    <option name="x" value="227" />
+    <option name="y" value="59" />
     <option name="width" value="1700" />
     <option name="height" value="1038" />
   </component>
@@ -296,6 +298,7 @@
       <recent name="D:\htdocs\scrap1\scrap" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
+      <recent name="D:\htdocs\scrap1\scrap\public\wechat\cert" />
       <recent name="D:\htdocs\scrap1\scrap\public\static\js" />
     </key>
   </component>
@@ -381,17 +384,18 @@
       <workItem from="1575444399653" duration="12810000" />
       <workItem from="1575462840839" duration="250000" />
       <workItem from="1575506248144" duration="15103000" />
-      <workItem from="1575527294268" duration="3424000" />
+      <workItem from="1575527294268" duration="3697000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="485236000" />
+    <option name="totallyTimeSpent" value="485509000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="155" y="77" width="1700" height="1038" extended-state="1" />
+    <frame x="227" y="59" width="1700" height="1038" extended-state="1" />
+    <editor active="true" />
     <layout>
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16341463" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16341463" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32982457" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -981,8 +985,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/api/index/controller/PayController.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="400">
-          <caret line="25" column="46" lean-forward="true" selection-start-line="25" selection-start-column="46" selection-end-line="25" selection-end-column="46" />
+        <state relative-caret-position="175">
+          <caret line="16" column="23" lean-forward="true" selection-start-line="16" selection-start-column="23" selection-end-line="16" selection-end-column="23" />
           <folding>
             <element signature="e#861#925#0#PHP" expanded="false" />
             <element signature="e#930#1766#0#PHP" expanded="false" />

 -----BEGIN CERTIFICATE-----
-MIIEZDCCA82gAwIBAgIEAhEzATANBgkqhkiG9w0BAQUFADCBijELMAkGA1UEBhMC
-Q04xEjAQBgNVBAgTCUd1YW5nZG9uZzERMA8GA1UEBxMIU2hlbnpoZW4xEDAOBgNV
-BAoTB1RlbmNlbnQxDDAKBgNVBAsTA1dYRzETMBEGA1UEAxMKTW1wYXltY2hDQTEf
-MB0GCSqGSIb3DQEJARYQbW1wYXltY2hAdGVuY2VudDAeFw0xODA3MDMxMjMwNDVa
-Fw0yODA2MzAxMjMwNDVaMIGTMQswCQYDVQQGEwJDTjESMBAGA1UECBMJR3Vhbmdk
-b25nMREwDwYDVQQHEwhTaGVuemhlbjEQMA4GA1UEChMHVGVuY2VudDEOMAwGA1UE
-CxMFTU1QYXkxJzAlBgNVBAMUHuWkqea0peaWueebruenkeaKgOaciemZkOWFrOWP
-uDESMBAGA1UEBBMJMTAwODkxMjUxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAsLJARXruD6jC8cchcOFHqsX9FPCypVafg4pVrVMDwlXNzqWqlizaRaGY
-HPsDhgJvU3YX+xWo43aocsPkXw+Yl24SnwAwAUz1gL3RA1yrT1S2uFVMZ3uLVXTk
-qnxa2iWtrjf46Qx6wEX++Fw99HCQldu/B3zaOjK5XizJNWc/dr8ZSbsEzWN5NNje
-Fv68fYnYqWiSTezKbzvRAMh5Ho3hY60wsc0gPXHCUOcucAjM21Z9a1yBqu0XWhL4
-UVCXI10sBICEyoSXwx0tnzmy8cO76wA0DlYC5PCmCGSKRBXFCpgbCPg+QRRWu4a8
-p4qqENmbYpz7zW6/PYRza52/6/Jj4wIDAQABo4IBRjCCAUIwCQYDVR0TBAIwADAs
-BglghkgBhvhCAQ0EHxYdIkNFUy1DQSBHZW5lcmF0ZSBDZXJ0aWZpY2F0ZSIwHQYD
-VR0OBBYEFP6DEaEgkaDlDyLok8ARpTwS0TZIMIG/BgNVHSMEgbcwgbSAFD4FJvYi
-YrQVW4jNZH6w1GKn5YZ0oYGQpIGNMIGKMQswCQYDVQQGEwJDTjESMBAGA1UECBMJ
-R3Vhbmdkb25nMREwDwYDVQQHEwhTaGVuemhlbjEQMA4GA1UEChMHVGVuY2VudDEM
-MAoGA1UECxMDV1hHMRMwEQYDVQQDEwpNbXBheW1jaENBMR8wHQYJKoZIhvcNAQkB
-FhBtbXBheW1jaEB0ZW5jZW50ggkAu1SXK7wA6FcwDgYDVR0PAQH/BAQDAgbAMBYG
-A1UdJQEB/wQMMAoGCCsGAQUFBwMCMA0GCSqGSIb3DQEBBQUAA4GBAEA1ND+JEyog
-Fd4+3De5voIHdyWKWF94EouysL9tCCngTeVHTQBlP+/QVwfbfCaRnmgwAmzHR49Q
-rh7tQltzTpNoNk0H4MZxck2xmtKKQqNWItPuJWCdGA9J38hIxjaeIiBVcsxt2ARP
-3JKPPOsWd3uJ8pSVMfolAi0738ToE2lm
+MIID8DCCAtigAwIBAgIUTyNrw3lKNYvGyZ7wr8ix1uOTeQAwDQYJKoZIhvcNAQEL
+BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT
+FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg
+Q0EwHhcNMTkxMjA1MDc0NzAxWhcNMjQxMjAzMDc0NzAxWjCBgTETMBEGA1UEAwwK
+MTU2MzA4NzM1MTEbMBkGA1UECgwS5b6u5L+h5ZWG5oi357O757ufMS0wKwYDVQQL
+DCTnlJjogoPok53np5Hnjq/kv53np5HmioDmnInpmZDlhazlj7gxCzAJBgNVBAYM
+AkNOMREwDwYDVQQHDAhTaGVuWmhlbjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBALluMyxhkjBQvV1xaZVAX83NjdhtOVP+GaMl8J/fgUAl9lLs2G3HeeWf
+o+9jYzTNwLPmOyotqAspEK1X3+7q3fANgs4b2APZbDUX7IXDCOKo1z8tnrvLmAdT
+RoFVIOHmP0Dl9bE0szuStFRWnQsofahNmAa2EepFZzbuRoxxlLP85X4wgX+5d8rD
+CFkrhdtg4IPOl1kIXymP7Pl3LFK/JrxFgXU6VK/4vBLa1qVih/tPn1EWQUdpJGb1
+rAhYRZLZ1FuuNSLKwtF6P/Z7tSehsjuBdRUXdTmIHoYQKjDFVBFSRS5ZFSGzBjtA
+zKu1fQ8XpixrN93J+CuWl3hE6h4efV8CAwEAAaOBgTB/MAkGA1UdEwQCMAAwCwYD
+VR0PBAQDAgTwMGUGA1UdHwReMFwwWqBYoFaGVGh0dHA6Ly9ldmNhLml0cnVzLmNv
+bS5jbi9wdWJsaWMvaXRydXNjcmw/Q0E9MUJENDIyMEU1MERCQzA0QjA2QUQzOTc1
+NDk4NDZDMDFDM0U4RUJEMjANBgkqhkiG9w0BAQsFAAOCAQEAuKWQLw1SbjIMtmtd
+zGgB3K3gcbB/129GlgvIE8p9U32zSSPKOPBSX61hzUOLNUsj5cWHhbtRF2+wFJz9
+XYKCwZ8w1BPImvkZZTz9Wk9iR4nUrZZbFDVo+ZwzHUk7zkUhSMjdXHBXoW35tvMf
+E3mPu1R93EvhK1BAEOB1tWZ1YGgJzjN1+ygTndR/vaygshbxE/2dHynRa+WVkMv0
+YVn3EkTbcUZtfOOFjz+nr413cwfCZAkZKvkNSgYneNa24y6udWv5CuHuh+DxBd0G
+WXUEhWeY+tUboHXMqbTlv07X8ZQRyBK5EO2YF8xONscoTylKV9DnbPA0QewhaOVu
+0kYS+g==
 -----END CERTIFICATE-----

 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCwskBFeu4PqMLx
-xyFw4Ueqxf0U8LKlVp+DilWtUwPCVc3OpaqWLNpFoZgc+wOGAm9Tdhf7Fajjdqhy
-w+RfD5iXbhKfADABTPWAvdEDXKtPVLa4VUxne4tVdOSqfFraJa2uN/jpDHrARf74
-XD30cJCV278HfNo6MrleLMk1Zz92vxlJuwTNY3k02N4W/rx9idipaJJN7MpvO9EA
-yHkejeFjrTCxzSA9ccJQ5y5wCMzbVn1rXIGq7RdaEvhRUJcjXSwEgITKhJfDHS2f
-ObLxw7vrADQOVgLk8KYIZIpEFcUKmBsI+D5BFFa7hryniqoQ2ZtinPvNbr89hHNr
-nb/r8mPjAgMBAAECggEAI4u4YkHYok3Q6dKlZ4/qWvB5eTzys1A5xryNf9CzcOTS
-AkBRkOR1BIz9jNbyXoMe4itfp6Mz1o6IVI4T4wvAJrZ+CH6BKcHRoZSN958s10iz
-eWGvfSHdZdOeLK3XmQr7ZZDdAgUArK1oHY5w6Du82mjahScYv5x0rf1UfOnIWprB
-Hk0kE6Q918zgwmuTuPhRc+YXXJyf++XnFEqi/ue6im/sBmKfqVu92qfk4jgxu5kw
-gsJc6f6rFLzZ4jRMc8oB++lIrS/4y2f4n7/fUWTY+w77AqdbGm+fTHIBZcn/cweS
-Q9IrzNmkKD6q3f4NkwAZ2S74lx5gY8X4HUxbIuHUAQKBgQDnAsGpIZLVboCecIh3
-f9sfq/CULyhhnbzirytaOC1cojyD0wYgzIQDEfuu3bo84dwWLZgZN+bHxj3c4DaQ
-wim9IftbYVTtuaGENcg+wxJ1HHcnXiByuAacRQcChXY/ZBkq75BUuewoRb5NPzJ1
-jhw7H9O/ZBhCU5g1Krn9DPfihQKBgQDDz2VtrOVtLAoaElbFhiXSOoavxsR5vX9+
-lj2ZvmbcA7jwKkx4/rAXqk2umTLVzcVaRXp4/G5KOtL1jqbJ82fTbhtxDV4mZgz7
-SAkVZoiv0XzQsgcBOmA30fElG5sSIqGhljaFghSWz9M/oLcMaZ6uD6nSqYNkBISO
-WGofKFudRwKBgQC1MYhM7LSLC91+aK3hbTumH+rXkBWQW3ToKJVMcnvCCM6GZ2KL
-H178OYK7qdaGInHKQ4DlZt9xGqEzOfoSmPi8DIdnKXS/8bYqSTUDZWZ4zRb4ne+9
-i3JD6DCTXbNeDVlgP/9pNVtySyH03PjrE8g458HigNQ2UfM04Ip5XU6hMQKBgE6L
-tkMddNarMM4uhxIq8qb3BSojkJLJGgh8We9/OiGNeLUWMqDigV6s2QZtu7+aEE1a
-y3sWv2MVX6RS+cLO2dotM+LQmvDKRPDTf5lPDQuB/BB3KWorsYcStynMfhLzQ2Tf
-LbW2bW3lpfbDEEpxX86wx82SY/tN+KJlAwTGmqFnAoGAJSnB0fyAhT2oB1+t6pax
-93CeBbEBXnrWSmGrUgHVFHcR2Vvq5O7A3F66VXNn88ij+TUsbjEa1XHg1kHwhP2m
-UoyF0imlaHH1kHFpT4okG1vLWSExAdSmgOwAKWd2QXrwVtn2rAzjnp527mWCuWx3
-SWZVYzS3kFSBxpHR+VWVezo=
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC5bjMsYZIwUL1d
+cWmVQF/NzY3YbTlT/hmjJfCf34FAJfZS7Nhtx3nln6PvY2M0zcCz5jsqLagLKRCt
+V9/u6t3wDYLOG9gD2Ww1F+yFwwjiqNc/LZ67y5gHU0aBVSDh5j9A5fWxNLM7krRU
+Vp0LKH2oTZgGthHqRWc27kaMcZSz/OV+MIF/uXfKwwhZK4XbYOCDzpdZCF8pj+z5
+dyxSvya8RYF1OlSv+LwS2talYof7T59RFkFHaSRm9awIWEWS2dRbrjUiysLRej/2
+e7UnobI7gXUVF3U5iB6GECowxVQRUkUuWRUhswY7QMyrtX0PF6Ysazfdyfgrlpd4
+ROoeHn1fAgMBAAECggEBAKP8hxkKuOQtoypOMBekNJWm4XizL23OXBHibaiVWpLG
+f87aUpTTQkQGKE5+0K9T/sWaKFymv+QOzwbdndaGsvumlzV7fk/5Ki7SF4Q79VGu
+C5191NEzviFMTh/2jvv4SZw1QlES0CcxGHU1m/DQQEBlTrswrStHcX4svwtZLy70
+SPUASYUKx0LSFJIazX0XOA/z/W378JksMY0ZoqDFA/lXlVXz3m89uLrMHqp0ubKD
+CV01B4l2GkgcaRHd8V4Ggiul1sbv/Y51q7RNQeEhMsSe2Utb0R71eHC2huuSAdtW
+dIPWEZwIDrKupqnRgW44Nlz5zoYHcT6YbC2OYEmrs7ECgYEA3n9EGuEQhjEPGQgJ
+vxZjRs0rirnmBYcwsBPsReJ+6IcGIirvvyL+vmjTqbEKMjs2ucAHv433mnRWbvfU
+rQ2Ze0VhtoggF3VOo29tlu7zT3puyfVHg7leVCH1XHTITgScn2vgVgSpNfa5s6Yp
+oBldOPdoMlUUa2u2Oe0PRKlQa8UCgYEA1VoaMaU0YMTeXfz9s0O4RmvkcPDBDxRR
+bVqqyH+SFil3CDu8iDKYaSvkhbK4V45OQSpFgz3d07OkOXoIEJMReVked7XRpsy6
+QMcmePihS1PH08uFt9Z6PElpuCA//yBvOUAkLmdMW1H1UDtjg0dLQdX3Wqi0vYNP
+5l1XUDVHotMCgYEAlXe1TsFHEn6+f7hQo9fsVVHbIFSF28zXvlGD9eaUDq02R5nE
+eQiPTWaqWmKeUORKfToteldqsI3ayq0eaCqsoo0XeUG1HU0myNBANJbNSOUcq/tk
+UW8jmS0+4R9quE6M0OPtTpvO+HuIgNDtQaoIYA6EJtvU3dz8C6nfCeccKWkCgYA2
+QwA+eCHmKqvTg7CSkzqeznn/L3wqdaRwB4tACxIAiPM5KNg+W3/f38XzKw0vV4YX
+lMSxKF7upNWzuJGshXsAPeY91ARKQ+9q4juqsLF1Ew3TlAOiSe40vwcgSTN9k6Y2
+DVYmZydIYoPdr/0TOmKtj9mlORsex/LeSAcY4zQg+QKBgH7FYIoL4EJPN9NcLqep
+JfE65+3th0UGXZ08S337QSBkunQMi4lGq6uzthN3v8Hzh+oCm/PRqqewkhhSEwMg
+d6yUqx5Pk4b/DDQRxjgSTZFx1swEASIBT7oVWCrdF1fcAnE1IoPkyveUk0wpvAEE
+8bW05R0HXalfMhPKA2NfjYlG
 -----END PRIVATE KEY-----

@@ -5,7 +5,7 @@
     证书pkcs12格式（apiclient_cert.p12）
         包含了私钥信息的证书文件，为p12(pfx)格式，由微信支付签发给您用来标识和界定您的身份
         部分安全性要求较高的API需要使用该证书来确认您的调用身份
-        windows上可以直接双击导入系统，导入过程中会提示输入证书密码，证书密码默认为您的商户ID（如：10010000）
+        windows上可以直接双击导入系统，导入过程中会提示输入证书密码，证书密码默认为您的商户号（如：1900006031）
     证书pem格式（apiclient_cert.pem）
         从apiclient_cert.p12中导出证书部分的文件，为pem格式，请妥善保管不要泄漏和被他人复制
         部分开发语言和环境，不能直接使用p12文件，而需要使用pem，所以为了方便您使用，已为您直接提供