Browse Source

'忽略文件'

aiyou 4 years ago
parent
commit
f4a0497ce5

+ 2 - 0
.gitignore

@@ -1,4 +1,6 @@
 thinkphp/
 application/database.php
+application/extra/site.php
 runtime
 public/uploads
+1600885158_20200729_cert

BIN
1600885158_20200729_cert/apiclient_cert.p12


+ 0 - 24
1600885158_20200729_cert/apiclient_cert.pem

@@ -1,24 +0,0 @@
------BEGIN CERTIFICATE-----
-MIID/DCCAuSgAwIBAgIUR+8rJcXsrb6FCTX7slnfHQPXjcswDQYJKoZIhvcNAQEL
-BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT
-FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg
-Q0EwHhcNMjAwNzI5MDgwNTE2WhcNMjUwNzI4MDgwNTE2WjCBjTETMBEGA1UEAwwK
-MTYwMDg4NTE1ODEbMBkGA1UECgwS5b6u5L+h5ZWG5oi357O757ufMTkwNwYDVQQL
-DDDmt4TljZrlkrvlkrvll5bovabnlLXlrZDllYbliqHmnInpmZDotKPku7vlhazl
-j7gxCzAJBgNVBAYMAkNOMREwDwYDVQQHDAhTaGVuWmhlbjCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAORBy3hULspJYPlA9fhyPa3qgY6rwRv50G/OlwVi
-c9pfzCLZypcULmmun8ivYHyBAhL43gxTLGuRcOA9w+gqQ66ITX4egKfprT/jlIjA
-G/Bi8Ul+kQ6kI4DUceMnnPMhR1n0aCddbJMd6TEGKkP0Lkrg24s9YHfLNdDX2ndz
-TZVa1qFshNZLLHr+lxi6XPXjL1l+VTbNq9xgFjdrtIMAnONo88WVqqnypIlT/8pN
-/r/k09SAcY1FFx+V3Zit5H9LkOYC1R4B3p0s8YrQdG7tNaYIDakI/F4MgTIOtx0F
-XITmLOejy6NY8qDHSs/FI24AcpIAf5LyviaL6a0dhAx4BAECAwEAAaOBgTB/MAkG
-A1UdEwQCMAAwCwYDVR0PBAQDAgTwMGUGA1UdHwReMFwwWqBYoFaGVGh0dHA6Ly9l
-dmNhLml0cnVzLmNvbS5jbi9wdWJsaWMvaXRydXNjcmw/Q0E9MUJENDIyMEU1MERC
-QzA0QjA2QUQzOTc1NDk4NDZDMDFDM0U4RUJEMjANBgkqhkiG9w0BAQsFAAOCAQEA
-Slev5LUruS3igl9CEu9iA+Ai6qs3i5ir+M6P3zEH9BDF1TdJbcxOgi4oZLQDltQF
-0VYdwuDn/Q+C3hYuGseYrD5hXgXKrOdlSEmmEQCAGjLyceYoA6ilQ2ktF/Oj4s18
-IE71kiUW0z13Bi75E5m3gepQGLN/fhucf2L/G9iuF1Z5lEfSXzXa5Fd6WFMGQqhI
-OfWL0Lfb4MQMUgxYCw5QwweMCCJUYU/yma851/wxMD7M6LHt6chWlZv++8rH+r+q
-egqPYMV829X3lN70dII/WeDCQlNzeLmo/DX3SZy/OQ1Ax+YLHFsyERJaHFs492UT
-xpWua8NcS77yGiQQK8hBEw==
------END CERTIFICATE-----

+ 0 - 28
1600885158_20200729_cert/apiclient_key.pem

@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDkQct4VC7KSWD5
-QPX4cj2t6oGOq8Eb+dBvzpcFYnPaX8wi2cqXFC5prp/Ir2B8gQIS+N4MUyxrkXDg
-PcPoKkOuiE1+HoCn6a0/45SIwBvwYvFJfpEOpCOA1HHjJ5zzIUdZ9GgnXWyTHekx
-BipD9C5K4NuLPWB3yzXQ19p3c02VWtahbITWSyx6/pcYulz14y9ZflU2zavcYBY3
-a7SDAJzjaPPFlaqp8qSJU//KTf6/5NPUgHGNRRcfld2YreR/S5DmAtUeAd6dLPGK
-0HRu7TWmCA2pCPxeDIEyDrcdBVyE5izno8ujWPKgx0rPxSNuAHKSAH+S8r4mi+mt
-HYQMeAQBAgMBAAECggEAdfNx+2o1C59Dl0n0UUBnkxmdfWZP0e8TwNMWw1eO2oeq
-a0/0GoH5Qe9U7lWCHJRlx/wGcoQAbk2n8Ji6RZyhgO06bjPA9AQS3PLzbH8pcN0Q
-JpRazSAQoKAngeSUfCb0Qg3ETKNAWf2Y5RZ0fM0Ppu3vRVKgKQc/df41DIjuzIA8
-PTED6274T7RlRpXkxNAnVXA9FvvWxEY7xEXnZrbaRtz9CgVCxkgZumAVM7UceXk0
-4iHL5qvUtQ3+7DoHLkD3RYyYcGipS3yRYUwJvRCKlQSZsv1EvWTHk6PVJBf4WYDM
-d3b1JloDJXAmHtg/yMUaT9bDqXN/lvKAXjsbutZ/4QKBgQD+/IBaPsfaX7ecH1Xd
-ybyEgj5IhPnTM3waEIXHEXM0KyaDkivprrlQNarRZOEWHl3Lm875hc0Z48npNgqr
-zJkeFsgxuC5lC5aF6mKQ50MiqoX8XhiecKAlPmOl0zIgzC2JTLaF4rZzi+kBxRMI
-5V+Vc4bbo5YEua/zU25clYe5RQKBgQDlKhdSLv4hJeZxIdsPaW8g9spZSlXCvLfm
-PdXUMO8z2lOsi79oogDsLChrw23nuC1glBQxGu2ZmLlnjj87mUBt1OZDNPR+54WK
-rk/2LX79Rpee+G4zD85hLfwBbgKcbEI/P0iNgnlkrH8DL+33wPAPl6A9zvwj2v8D
-DzMjXjAljQKBgBWh5mHBocLtC+662dYPH2c+hXoxjeBVJdowPKk+2b87SfEvnXod
-0Kr1YqCRJmdx/BMiDNUufNANezvF0fHxUawz0pglQApiiUqjL+mLNS7juKpIcV4/
-v9ZpDJss57vQlqxnTbTeHwx+ei4kQhEnJIzRWEeaAUg1WLAUC/De3rzhAoGBAKWW
-S3Gj6RcUprWajApP2e/Mw5vPXbav3IXuqmJ/1Wf3WzyzYeR+IwKESdTMSs8Dwy4k
-8Y4l8gdpVpbgLwqmiuqRyqxHSF+mdVUm7Tpp13e1mXtR8XbN9gc8TfrOfe5/P0Mq
-PAecfpDjH4ezC1VZQV1S54Oh24khBeE1C3OD7HBFAoGBAK8EFt4pXbj6QYeDa+AY
-zjCL9LZ+NKXZlZlLqxMD+YBrHCtAIZ+3AC+hEd+9nwljsJR9vZVZvBjvFhHxStPW
-uzLKp+ZQbf3aWTaBtsHrwdR3v6pcdXkp4t16O3XlUblkgBGIgJul3OFTzGc7bRV2
-DRqLXMNnUi0XqGTiIRaMH8X2
------END PRIVATE KEY-----

+ 0 - 18
1600885158_20200729_cert/证书使用说明.txt

@@ -1,18 +0,0 @@
-欢迎使用微信支付!
-附件中的三份文件(证书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)下载 

+ 18 - 2
application/admin/view/store/store_product/add.html

@@ -152,13 +152,28 @@
                 <ul class="row list-inline plupload-preview" id="p-image"></ul>
             </div>
         </div>
+<!--    <div class="form-group">-->
+<!--        <label class="control-label col-xs-12 col-sm-2">{:__('Slider_image')}:</label>-->
+<!--        <div class="col-xs-12 col-sm-8">-->
+<!--            <div class="input-group">-->
+<!--                <input id="c-slider_image" data-rule="required" class="form-control" size="50" name="row[slider_image]" type="text">-->
+<!--                <div class="input-group-addon no-border no-padding">-->
+<!--                    <span><button type="button" id="plupload-slider_image" class="btn btn-danger plupload" data-input-id="c-slider_image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-slider_image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>-->
+<!--                    <span><button type="button" id="fachoose-slider_image" class="btn btn-primary fachoose" data-input-id="c-slider_image" data-mimetype="image/*" data-multiple="true"><i class="fa fa-list"></i> {:__('Choose')}</button></span>-->
+<!--                </div>-->
+<!--                <span class="msg-box n-right" for="c-slider_image"></span>-->
+<!--            </div>-->
+<!--            <ul class="row list-inline plupload-preview" id="p-slider_image"></ul>-->
+<!--        </div>-->
+<!--    </div>-->
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Slider_image')}:</label>
         <div class="col-xs-12 col-sm-8">
             <div class="input-group">
-                <input id="c-slider_image" data-rule="required" class="form-control" size="50" name="row[slider_image]" type="text">
+                <input id="c-slider_image" data-rule="required" class="form-control" size="50" name="row[slider_image]" type="text" value="">
                 <div class="input-group-addon no-border no-padding">
-                    <span><button type="button" id="plupload-slider_image" class="btn btn-danger plupload" data-input-id="c-slider_image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-slider_image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+                    <span><button type="button" id="plupload-slider_image" class="btn btn-danger plupload" data-input-id="c-slider_image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="true" data-preview-id="p-slider_image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
                     <span><button type="button" id="fachoose-slider_image" class="btn btn-primary fachoose" data-input-id="c-slider_image" data-mimetype="image/*" data-multiple="true"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
                 </div>
                 <span class="msg-box n-right" for="c-slider_image"></span>
@@ -166,6 +181,7 @@
             <ul class="row list-inline plupload-preview" id="p-slider_image"></ul>
         </div>
     </div>
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Description')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 1 - 1
application/admin/view/store/store_product/edit.html

@@ -144,7 +144,7 @@
             <div class="input-group">
                 <input id="c-slider_image" data-rule="required" class="form-control" size="50" name="row[slider_image]" type="text" value="{$row.slider_image|htmlentities}">
                 <div class="input-group-addon no-border no-padding">
-                    <span><button type="button" id="plupload-slider_image" class="btn btn-danger plupload" data-input-id="c-slider_image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-slider_image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
+                    <span><button type="button" id="plupload-slider_image" class="btn btn-danger plupload" data-input-id="c-slider_image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="true" data-preview-id="p-slider_image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
                     <span><button type="button" id="fachoose-slider_image" class="btn btn-primary fachoose" data-input-id="c-slider_image" data-mimetype="image/*" data-multiple="true"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
                 </div>
                 <span class="msg-box n-right" for="c-slider_image"></span>

+ 0 - 47
application/extra/site.php

@@ -1,47 +0,0 @@
-<?php
-
-return array (
-  'name' => '汽车商城',
-  'beian' => '',
-  'cdnurl' => '',
-  'version' => '1.0.1',
-  'timezone' => 'Asia/Shanghai',
-  'forbiddenip' => '',
-  'languages' => 
-  array (
-    'backend' => 'zh-cn',
-    'frontend' => 'zh-cn',
-  ),
-  'fixedpage' => 'dashboard',
-  'categorytype' => 
-  array (
-    'default' => 'Default',
-    'page' => 'Page',
-    'article' => 'Article',
-    'test' => 'Test',
-  ),
-  'configgroup' => 
-  array (
-    'basic' => 'Basic',
-    'email' => 'Email',
-    'dictionary' => 'Dictionary',
-    'user' => 'User',
-    'example' => 'Example',
-  ),
-  'mail_type' => '1',
-  'mail_smtp_host' => 'smtp.qq.com',
-  'mail_smtp_port' => '465',
-  'mail_smtp_user' => '10000',
-  'mail_smtp_pass' => 'password',
-  'mail_verify_type' => '2',
-  'mail_from' => '10000@qq.com',
-  'car_info' => '<p style="margin-left: 160px;">购物车须知</p><p style="">哈哈哈哈dddd</p>',
-  'siteUrl' => 'http://test.yhcars.hdlkeji.com/',
-  'wxapp' => 
-  array (
-    'appid' => 'wxf11690b1dc5210d3',
-    'mch_id' => '1600885158',
-    'secret' => 'd3ae9d4426ccdaf913898c5a046ec9f6',
-    'appkey' => '913898c5a046ec9f6d3ae9d4426ccdaf',
-  ),
-);