Merge branch 'master' into develop

composer.json

@@ -11,9 +11,6 @@
         "php": "^7.2",
         "alibabacloud/client": "^1.5",
         "alibabacloud/sdk": "^1.8",
-        "encore/laravel-admin": "1.*",
-        "alibabacloud/client": "^1.5",
-        "alibabacloud/sdk": "^1.8",
         "encore/laravel-admin": "^1.8",
         "fideloper/proxy": "^4.0",
         "jxlwqq/wang-editor2": "^1.0",

public/.htaccess

@@ -1,21 +0,0 @@
-#<IfModule mod_rewrite.c>
-#    <IfModule mod_negotiation.c>
-#        Options -MultiViews -Indexes
-#    </IfModule>
-#
-#    RewriteEngine On
-#
-#    # Handle Authorization Header
-#    RewriteCond %{HTTP:Authorization} .
-#    RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
-#
-#    # Redirect Trailing Slashes If Not A Folder...
-#    RewriteCond %{REQUEST_FILENAME} !-d
-#    RewriteCond %{REQUEST_URI} (.+)/$
-#    RewriteRule ^ %1 [L,R=301]
-#
-#    # Handle Front Controller...
-#    RewriteCond %{REQUEST_FILENAME} !-d
-#    RewriteCond %{REQUEST_FILENAME} !-f
-#    RewriteRule ^ index.php [L]
-#</IfModule>

public/.user.ini

@@ -1 +0,0 @@
-open_basedir=/www/wwwroot/BaoMa/:/tmp/

public/robots.txt

@@ -1,2 +0,0 @@
-User-agent: *
-Disallow: