From 7ac3a7b7dcef094e09ba80f2104a6e985a0c7de0 Mon Sep 17 00:00:00 2001
From: Bretton <867057410@qq.com>
Date: Sun, 10 Nov 2019 08:29:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E4=B8=AA=E5=B0=8F=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.example                   |  1 -
 config/domains.php             |  3 ++-
 routes/web.php                 |  2 +-
 scripts/vnstat.sh              | 11 -----------
 sql/{update => }/Otaku_Mod.sql |  0
 sql/update/20190404.sql        |  4 ----
 sql/update/20190419.sql        |  1 -
 7 files changed, 3 insertions(+), 19 deletions(-)
 delete mode 100644 scripts/vnstat.sh
 rename sql/{update => }/Otaku_Mod.sql (100%)
 delete mode 100644 sql/update/20190419.sql

diff --git a/.env.example b/.env.example
index 0d579441..c0521e7c 100644
--- a/.env.example
+++ b/.env.example
@@ -14,7 +14,6 @@ DB_HOST=127.0.0.1
 DB_PORT=3306
 DB_DATABASE=SSRPanel_OtakuMod
 DB_USERNAME=root
-DB_USERNAME=root
 DB_PASSWORD=root
 DB_STRICT=false
 
diff --git a/config/domains.php b/config/domains.php
index 73b45e3a..f3e533a6 100644
--- a/config/domains.php
+++ b/config/domains.php
@@ -48,5 +48,6 @@ return [
     'digital', 'diet', 'design', 'dentist', 'dental', 'delivery', 'degree', 'deals', 'date', 'dance', 'cricket', 'creditcard',
     'credit', 'courses', 'coupons', 'condos', 'consulting', 'coach', 'cloud', 'clinic', 'click', 'claims', 'city', 'church',
     'chat', 'charity', 'casino', 'cafe', 'buzz', 'business', 'boston', 'blog', 'bio', 'bingo', 'bid', 'beer', 'band', 'audio',
-    'auction', 'attorney', 'art', 'army', 'apartments', 'airforce', 'accountants', 'accountant'
+    'auction', 'attorney', 'art', 'army', 'apartments', 'airforce', 'accountants', 'accountant', 'monster', 'dev', 'sydney', 'baby',
+    'melbourne', 'bible', 'yachts', 'motorcycles', 'autos', 'boats', 'homes'
 ];
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 89e5fd76..57a4ab9d 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -79,7 +79,7 @@ Route::group(['middleware' => ['isForbidden', 'isLogin', 'isAdmin']], function (
     Route::get('admin/userRebateList', 'AdminController@userRebateList'); // 返利流水记录
     Route::get('admin/userBanLogList', 'AdminController@userBanLogList'); // 用户封禁记录
     Route::get('admin/userOnlineIPList', 'AdminController@userOnlineIPList'); // 用户在线IP记录
-    Route::any('admin/export', 'AdminController@export'); // 导出(查看)配置信息
+    Route::get('admin/export', 'AdminController@export'); // 导出(查看)配置信息
     Route::get('admin/userMonitor', 'AdminController@userMonitor'); // 用户流量监控
     Route::post('admin/resetUserTraffic', 'AdminController@resetUserTraffic'); // 重置用户流量
     Route::post('admin/handleUserBalance', 'AdminController@handleUserBalance'); // 用户余额充值
diff --git a/scripts/vnstat.sh b/scripts/vnstat.sh
deleted file mode 100644
index 3c0417c9..00000000
--- a/scripts/vnstat.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-yum install -y wget sqlite-devel gcc
-wget https://github.com/vergoh/vnstat/releases/download/v2.1/vnstat-2.1.tar.gz
-tar zxvf vnstat-2.1.tar.gz
-cd vnstat-2.1
-./configure --prefix=/usr --sysconfdir=/etc && make
-make install
-cp -v examples/init.d/redhat/vnstat /etc/init.d/
-chkconfig vnstat on
-service vnstat start
-vnstat -l
\ No newline at end of file
diff --git a/sql/update/Otaku_Mod.sql b/sql/Otaku_Mod.sql
similarity index 100%
rename from sql/update/Otaku_Mod.sql
rename to sql/Otaku_Mod.sql
diff --git a/sql/update/20190404.sql b/sql/update/20190404.sql
index 7f0f438d..9f6af813 100644
--- a/sql/update/20190404.sql
+++ b/sql/update/20190404.sql
@@ -8,10 +8,6 @@ ALTER TABLE `coupon`
 ALTER TABLE `goods`
 	DROP COLUMN `is_del`;
 
-ALTER TABLE `invite`
-	DROP COLUMN `is_del`;
-
-
 ALTER TABLE `article`
 	ADD COLUMN `deleted_at` DATETIME NULL DEFAULT NULL COMMENT '删除时间' AFTER `updated_at`;
 
diff --git a/sql/update/20190419.sql b/sql/update/20190419.sql
deleted file mode 100644
index 0e98d2f1..00000000
--- a/sql/update/20190419.sql
+++ /dev/null
@@ -1 +0,0 @@
-INSERT INTO `config` VALUES ('98', 'admin_email', '');
\ No newline at end of file