Browse Source

Merge branch 'master' into develop

whj 4 years ago
parent
commit
fb775de3db
2 changed files with 3 additions and 2 deletions
  1. 1 1
      config/admin.php
  2. 2 1
      config/app.php

+ 1 - 1
config/admin.php

@@ -95,7 +95,7 @@ return [
     | If your page is going to be accessed via https, set it to `true`.
     | If your page is going to be accessed via https, set it to `true`.
     |
     |
     */
     */
-    'https' => env('ADMIN_HTTPS', true),
+    'https' => env('ADMIN_HTTPS', false),
 
 
     /*
     /*
     |--------------------------------------------------------------------------
     |--------------------------------------------------------------------------

+ 2 - 1
config/app.php

@@ -30,7 +30,8 @@ return [
 
 
     //迭代版本
     //迭代版本
     'version'=>env('APP_VERSION',1.0),
     'version'=>env('APP_VERSION',1.0),
-    'power_by'=>env('APP_POWERBY','宝妈'),
+
+    'power_by'=>env('APP_POWERBY','熙宝HMO'),
 
 
     /*
     /*
     |--------------------------------------------------------------------------
     |--------------------------------------------------------------------------