Merge branch 'master' into dev

.gitignore

@@ -8,3 +8,4 @@ Homestead.yaml
 /lumen-api-starter-generator
 /laravel-logger
 /composer.lock
+**/.DS_Store

README.md

@@ -1,6 +1,7 @@
 # 大卫博士卖货学位争霸赛
 
 ## 上线前提准备
+
 ~~~php
 
 #1.配置
@@ -46,4 +47,11 @@ JWT_TTL=1440
 ### 3.数据库优化【加索引】
 
 ### 4.配置定时调度服务
+
 ### 5.配置队列
+
+### 6.php扩展
+
+* xlswriter
+
+## 项目修改日志

config/wechat.php

@@ -72,14 +72,14 @@ return [
      */
     'official_account' => [
         'default' => [
-//            'app_id' => env('WECHAT_OFFICIAL_ACCOUNT_APPID', 'your-app-id'),         // AppID
-            'app_id' => 'wx5eeae5f7b832b782',         // AppID
-//            'secret' => env('WECHAT_OFFICIAL_ACCOUNT_SECRET', 'your-app-secret'),    // AppSecret
-            'secret' => 'c985397f81f28e83830a0bd1cc7e6788',    // AppSecret
-//            'token' => env('WECHAT_OFFICIAL_ACCOUNT_TOKEN', 'your-token'),           // Token
-            'token' => 'fsdkDLlffeTg3RozsnreoTiEe',           // Token
-//            'aes_key' => env('WECHAT_OFFICIAL_ACCOUNT_AES_KEY', ''),                 // EncodingAESKey
-            'aes_key' => 'aiaPI44r3GnYt1jDaaGthfgrFU56tintbJB7aOpux6T',                 // EncodingAESKey
+            'app_id' => env('WECHAT_OFFICIAL_ACCOUNT_APPID', 'wx5eeae5f7b832b782'),         // AppID
+//            'app_id' => 'wx5eeae5f7b832b782',         // AppID
+            'secret' => env('WECHAT_OFFICIAL_ACCOUNT_SECRET', 'c985397f81f28e83830a0bd1cc7e6788'),    // AppSecret
+//            'secret' => 'c985397f81f28e83830a0bd1cc7e6788',    // AppSecret
+            'token' => env('WECHAT_OFFICIAL_ACCOUNT_TOKEN', 'fsdkDLlffeTg3RozsnreoTiEe'),           // Token
+//            'token' => 'fsdkDLlffeTg3RozsnreoTiEe',           // Token
+            'aes_key' => env('WECHAT_OFFICIAL_ACCOUNT_AES_KEY', 'aiaPI44r3GnYt1jDaaGthfgrFU56tintbJB7aOpux6T'),                 // EncodingAESKey
+//            'aes_key' => 'aiaPI44r3GnYt1jDaaGthfgrFU56tintbJB7aOpux6T',                 // EncodingAESKey
 
             /*
              * OAuth 配置