证书

@@ -2,6 +2,11 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
+      <change afterPath="$PROJECT_DIR$/public/assets/img/wechat_pay.png" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/public/wechat/cert/apiclient_cert.p12" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/public/wechat/cert/apiclient_cert.pem" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/public/wechat/cert/apiclient_key.pem" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/public/wechat/cert/证书使用说明.txt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/application/admin/view/pay_view/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/view/pay_view/index.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/public/assets/js/backend/pay_view.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/js/backend/pay_view.js" afterDir="false" />
@@ -45,8 +50,8 @@
       <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/application/admin/view/pay_view/index.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="623">
-              <caret line="62" column="50" lean-forward="true" selection-start-line="62" selection-start-column="50" selection-end-line="62" selection-end-column="50" />
+            <state relative-caret-position="589">
+              <caret line="61" column="76" selection-start-line="61" selection-start-column="76" selection-end-line="61" selection-end-column="76" />
               <folding>
                 <element signature="n#style#0;n#td#0;n#tr#3;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
                 <element signature="n#style#0;n#input#0;n#b#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
@@ -55,6 +60,7 @@
                 <element signature="e#2151#2157#0" expanded="true" />
                 <element signature="e#2157#2163#0" expanded="true" />
                 <element signature="n#style#0;n#span#0;n#div#0;n#b#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
+                <element signature="n#style#0;n#td#1;n#tr#5;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -73,7 +79,7 @@
         <entry file="file://$PROJECT_DIR$/public/assets/js/backend/pay_view.js">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="544">
-              <caret line="44" column="62" selection-start-line="44" selection-start-column="62" selection-end-line="44" selection-end-column="62" />
+              <caret line="44" column="47" selection-start-line="44" selection-start-column="47" selection-end-line="44" selection-end-column="47" />
             </state>
           </provider>
         </entry>
@@ -282,6 +288,32 @@
               <item name="advertising" type="462c0819:PsiDirectoryNode" />
               <item name="public" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="advertising" type="b2602c69:ProjectViewProjectNode" />
+              <item name="advertising" type="462c0819:PsiDirectoryNode" />
+              <item name="public" type="462c0819:PsiDirectoryNode" />
+              <item name="assets" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="advertising" type="b2602c69:ProjectViewProjectNode" />
+              <item name="advertising" type="462c0819:PsiDirectoryNode" />
+              <item name="public" type="462c0819:PsiDirectoryNode" />
+              <item name="assets" type="462c0819:PsiDirectoryNode" />
+              <item name="img" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="advertising" type="b2602c69:ProjectViewProjectNode" />
+              <item name="advertising" type="462c0819:PsiDirectoryNode" />
+              <item name="public" type="462c0819:PsiDirectoryNode" />
+              <item name="wechat" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="advertising" type="b2602c69:ProjectViewProjectNode" />
+              <item name="advertising" type="462c0819:PsiDirectoryNode" />
+              <item name="public" type="462c0819:PsiDirectoryNode" />
+              <item name="wechat" type="462c0819:PsiDirectoryNode" />
+              <item name="cert" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -301,11 +333,11 @@
       <recent name="D:\wamp\www\advertising\public\assets\js\backend" />
     </key>
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\wamp\www\advertising\public\assets\img" />
+      <recent name="D:\wamp\www\advertising\public\wechat\cert" />
+      <recent name="D:\wamp\www\advertising\public" />
       <recent name="D:\wamp\www\advertising\public\assets\js\backend\wechat" />
       <recent name="D:\wamp\www\advertising\application\admin\view\pay" />
-      <recent name="D:\wamp\www\advertising\public" />
-      <recent name="D:\wamp\www\advertising" />
-      <recent name="D:\wamp\www\advertising\application\home\controller" />
     </key>
   </component>
   <component name="RunDashboard">
@@ -343,7 +375,7 @@
       <workItem from="1572050747518" duration="29776000" />
       <workItem from="1572087949120" duration="1641000" />
       <workItem from="1572223206994" duration="28857000" />
-      <workItem from="1572309778506" duration="15341000" />
+      <workItem from="1572309778506" duration="17281000" />
     </task>
     <task id="LOCAL-00001" summary="数据库配置">
       <created>1571972429395</created>
@@ -422,11 +454,18 @@
       <option name="project" value="LOCAL" />
       <updated>1572329583925</updated>
     </task>
-    <option name="localTasksCounter" value="12" />
+    <task id="LOCAL-00012" summary="调试授权">
+      <created>1572329761583</created>
+      <option name="number" value="00012" />
+      <option name="presentableId" value="LOCAL-00012" />
+      <option name="project" value="LOCAL" />
+      <updated>1572329761584</updated>
+    </task>
+    <option name="localTasksCounter" value="13" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="174449000" />
+    <option name="totallyTimeSpent" value="176389000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -439,7 +478,7 @@
       <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
       <window_info anchor="bottom" id="Terminal" order="7" weight="0.32997763" />
       <window_info anchor="bottom" id="运行" order="7" />
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.13539445" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.13539445" />
       <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
       <window_info anchor="right" id="Database" order="3" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
@@ -492,13 +531,6 @@
     <option name="LAST_COMMIT_MESSAGE" value="调试授权" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/application/admin/view/merchant_audit/edit.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1037">
-          <caret line="106" column="23" selection-start-line="106" selection-start-column="23" selection-end-line="106" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/application/extra/site.php">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -823,10 +855,13 @@
         <state relative-caret-position="-1213" />
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/public/wechat/cert/证书使用说明.txt">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
     <entry file="file://$PROJECT_DIR$/application/admin/view/pay_view/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="623">
-          <caret line="62" column="50" lean-forward="true" selection-start-line="62" selection-start-column="50" selection-end-line="62" selection-end-column="50" />
+        <state relative-caret-position="589">
+          <caret line="61" column="76" selection-start-line="61" selection-start-column="76" selection-end-line="61" selection-end-column="76" />
           <folding>
             <element signature="n#style#0;n#td#0;n#tr#3;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#input#0;n#b#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
@@ -835,6 +870,7 @@
             <element signature="e#2151#2157#0" expanded="true" />
             <element signature="e#2157#2163#0" expanded="true" />
             <element signature="n#style#0;n#span#0;n#div#0;n#b#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#td#1;n#tr#5;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
           </folding>
         </state>
       </provider>
@@ -842,7 +878,7 @@
     <entry file="file://$PROJECT_DIR$/public/assets/js/backend/pay_view.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="544">
-          <caret line="44" column="62" selection-start-line="44" selection-start-column="62" selection-end-line="44" selection-end-column="62" />
+          <caret line="44" column="47" selection-start-line="44" selection-start-column="47" selection-end-line="44" selection-end-column="47" />
         </state>
       </provider>
     </entry>

@@ -59,8 +59,9 @@
                                 </tr>
                                 <tr>
                                     <td></td>
-                                    <td class="qrcode">
-                                        <img src=""/>
+                                    <td class="qrcode" style="display: none;">
+                                        <img src="http://advertising.w.brotop.cn/admin/pay_view/pay/order_id/8"/>
+                                        <img src="__CDN__/assets/img/wechat_pay.png"/>
                                     </td>
                                 </tr>
                             </tbody>

@@ -42,7 +42,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     data:{'admin_id':admin_id,'total':total},
                     success:function(res){
                         if(res.code == 1){
-                            $('.qrcode').find('img').attr('src',window.location.protocol+"//"+window.location.host+"/admin/pay_view/pay/order_id/"+res.data.order_id);
+                            $('.qrcode').show().find('img').attr('src',window.location.protocol+"//"+window.location.host+"/admin/pay_view/pay/order_id/"+res.data.order_id);
                         }else{
                             top.window.Layer.open({
                                 title:'温馨提示',

+-----BEGIN CERTIFICATE-----
+MIID9jCCAt6gAwIBAgIUVDjo9WYTJD9/JpXTQBtaCIqvQFIwDQYJKoZIhvcNAQEL
+BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT
+FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg
+Q0EwHhcNMTkxMDIxMDMzOTM2WhcNMjQxMDE5MDMzOTM2WjCBhzETMBEGA1UEAwwK
+MTU1OTU5ODA0MTEbMBkGA1UECgwS5b6u5L+h5ZWG5oi357O757ufMTMwMQYDVQQL
+DCrlpKnmtKXkuInnnJ/mlZnogrLkv6Hmga/lkqjor6LmnInpmZDlhazlj7gxCzAJ
+BgNVBAYMAkNOMREwDwYDVQQHDAhTaGVuWmhlbjCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBALrIaPQkxHAS0eMvTQF+8tnQx9f3eXcyYLt11MQupr/GgdHV
+OcvPICHKOrn3+t8icVtc5X0Qs/yQHyhxa643WPNZPjXTRIszr7qCRHWSVoYaMvRB
+JTUqTqQq1Mac9sEdkRvoVmdCvmmnyXhF3Mo23yzjoBDzpExMf/Fbcb1cK9yjGS6M
+58yXKYW28Y0iGRn5+EG/nRU339BgYkQpeKuW3uIw1JWNmHLRCY8DrzPsiHkEARVE
+TMYiKhUh+YUslKrjtcooGAnK2OkGD7Z8ip4j1cUgrsbqc8oqEC1ROPOyzpgzrbgz
+K3gan6+2Ph2MNar4aPCql+3xjIhRT5lx5UIONI0CAwEAAaOBgTB/MAkGA1UdEwQC
+MAAwCwYDVR0PBAQDAgTwMGUGA1UdHwReMFwwWqBYoFaGVGh0dHA6Ly9ldmNhLml0
+cnVzLmNvbS5jbi9wdWJsaWMvaXRydXNjcmw/Q0E9MUJENDIyMEU1MERCQzA0QjA2
+QUQzOTc1NDk4NDZDMDFDM0U4RUJEMjANBgkqhkiG9w0BAQsFAAOCAQEAuRhDMQOE
+QkjoFnSve/O2AV+FAtuYN6FFyYjFRx+PgXr8XlUOhE3GPaeZCacymicp8pJ25r2v
+jXS3iDvUxYQmAVhjidkj6/TJqps4f1EPdOqSiFvPJE981Z+R4dTqXuVyxiQbFsfm
+bRqSR7ta540qneXezA4WCrMGKKgwvKanhTbKHyImzlj1U9xmqd3w4r60uujsrJ5D
+pmFzNMow+vICwE1wPb+liHHsKVLT60FhicyowznWK8HSuU5KtrynZ8apjl0/PgNr
+tKiqB+RKu9l6WaSd/k69mHZZ6GOvA5V/tbrWq68o4Us7H9cUH+yVnuU2olrB7L2d
+dOFp9O9DRVwC0w==
+-----END CERTIFICATE-----

+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC6yGj0JMRwEtHj
+L00BfvLZ0MfX93l3MmC7ddTELqa/xoHR1TnLzyAhyjq59/rfInFbXOV9ELP8kB8o
+cWuuN1jzWT4100SLM6+6gkR1klaGGjL0QSU1Kk6kKtTGnPbBHZEb6FZnQr5pp8l4
+RdzKNt8s46AQ86RMTH/xW3G9XCvcoxkujOfMlymFtvGNIhkZ+fhBv50VN9/QYGJE
+KXirlt7iMNSVjZhy0QmPA68z7Ih5BAEVREzGIioVIfmFLJSq47XKKBgJytjpBg+2
+fIqeI9XFIK7G6nPKKhAtUTjzss6YM624Myt4Gp+vtj4djDWq+Gjwqpft8YyIUU+Z
+ceVCDjSNAgMBAAECggEBALqI7xfzqCJtCSOj13nI+GtDMHGkeq/ppeVQ9d2+4VTg
+wEF4erHp9qMIPcH/v5Eb6q1dhupxxe5TWGqhavKf37uXwqMqjGeghLz0372zGanv
+fDem36vKxqL5C2oW0+9kwchnLfMOGu+VW4U78BYa2qMP6IlFaS2xsIyv0FVWOY+r
+teKCYqaB3U+Ea+Q4Sl/cYtbfEzPrWdzgL8tjBOd1aVa6mBs87Fu90vehH0UvWZjs
+wGgFI6JJgdHb69YTaVDSKQHdwogiZpSSt/VQbJi33rh5lNgCNS4Vk0a18olFuTdP
+6dEc6SfgR9FeQ/UmQ8VfD3KCWxLgfyedyafoW5ME64ECgYEA3p8e8E0HPite8wzQ
+Wa4PiABtgo902wIN67csTwDW9Zhx2Lx2NWNP35gIJB8QLL7ov9yMo/MjET3kLKaU
+T4/vH9CdjtsT4j/RLFIhLvrUCzBQus00Mp1PuwFDDqxUfJeObjzb2iQTdrOhZvpe
+am1l/TNfJH+zTEu54jogVdViBlECgYEA1smxRPKwFFa7DF5WJk5TvO3SI3XFF7hz
+ENU+n13Pv8+sCqY7RYTqbJ3riM3J3LsrQ0SiHe7pVWw6G+8oljH21udTplieG5ik
+BjIEEGblB0bbdoX6Utp/6W+Tn92mi8cEwnBO4jnq89CSI+eNinwun2UUAzlQ5nhS
+jPY8Psg0b30CgYBdobc1gnBFaaBpwT3wOhE2NlfYzdVsN5T7SvNL1yKR8SgQ7FMb
+aUWy2RKzfo0jBLiH2Y8ddamOGuXZEcbXH8aHLwrVhrb6NbUYWwKx67U7b3rE1oHZ
+t+hM0t8NUNXIAUZafyZIvVuiVTLRSQRk5tY6hFzD0SHsOP1ZdPEcqL6twQKBgAq6
+5Lo3DYjWlF2X0OH1A8Xqc5cF6SS4ODddD9XST/CbJVMa3tcoPrXSZdPdw/nc99pS
+cW7hYpK752NB3Vszf8tYnxsuTie+xmLw2LchDMwCRDB1nP3KoJ0+z7cq0YkmFhzI
+k4hFsHEhuEtG5BFJBuM7n3ZRxLLey/Dy1CumwMfZAoGBALxc1mq2KaK+xmstDDfH
+UKYhZ1yvLIcrgc0K7JTncpkJ1WMUu2gG+oqRR7OP+4xtoBeal5i4SYemXynyhTtm
+JWlGAjiOc65Hm4oKfJUKDnae16KdjbCkpWzREBo0wYejJ6YWqBwZYZejHgVzD/27
+ZEFRFw5h7MdpYJ9Lp55qRVkb
+-----END PRIVATE KEY-----

+欢迎使用微信支付！
+附件中的三份文件（证书pkcs12格式、证书pem格式、证书密钥pem格式）,为接口中强制要求时需携带的证书文件。
+证书属于敏感信息，请妥善保管不要泄露和被他人复制。
+不同开发语言下的证书格式不同，以下为说明指引：
+    证书pkcs12格式（apiclient_cert.p12）
+        包含了私钥信息的证书文件，为p12(pfx)格式，由微信支付签发给您用来标识和界定您的身份
+        部分安全性要求较高的API需要使用该证书来确认您的调用身份
+        windows上可以直接双击导入系统，导入过程中会提示输入证书密码，证书密码默认为您的商户号（如：1900006031）
+    证书pem格式（apiclient_cert.pem）
+        从apiclient_cert.p12中导出证书部分的文件，为pem格式，请妥善保管不要泄漏和被他人复制
+        部分开发语言和环境，不能直接使用p12文件，而需要使用pem，所以为了方便您使用，已为您直接提供
+        您也可以使用openssl命令来自己导出：openssl pkcs12 -clcerts -nokeys -in apiclient_cert.p12 -out apiclient_cert.pem
+    证书密钥pem格式（apiclient_key.pem）
+        从apiclient_cert.p12中导出密钥部分的文件，为pem格式
+        部分开发语言和环境，不能直接使用p12文件，而需要使用pem，所以为了方便您使用，已为您直接提供
+        您也可以使用openssl命令来自己导出：openssl pkcs12 -nocerts -in apiclient_cert.p12 -out apiclient_key.pem
+备注说明：  
+        由于绝大部分操作系统已内置了微信支付服务器证书的根CA证书,  2018年3月6日后, 不再提供CA证书文件（rootca.pem）下载 
\ No newline at end of file