优化：代理配置优化

yoonper · yoonper · commit 10e9cb0403e1 · 2021-06-03T15:20:16.000+08:00
- 修改 config_common value 字段长度
- 修改代理测试超时时间
diff --git a/app/Http/Controllers/ConfigProxyController.php b/app/Http/Controllers/ConfigProxyController.php
@@ -3,7 +3,6 @@
 namespace App\Http\Controllers;
 
 use App\Models\ConfigCommon;
-use App\Services\GitHubService;
 use Illuminate\Http\Request;
 use Github\Client;
 use Github\HttpClient\Builder;
@@ -51,7 +50,7 @@ public function test(Request $request)
     {
         try {
             $builder = new Builder(GuzzleClient::createWithConfig([
-                'timeout' => GitHubService::HTTP_TIMEOUT,
+                'timeout' => 5,
                 'proxy' => $request->input('value'),
             ]));
             $client = new Client($builder, 'v3.text-match');
diff --git a/app/Http/Controllers/ConfigWhitelistFileController.php b/app/Http/Controllers/ConfigWhitelistFileController.php
@@ -15,10 +15,9 @@ class ConfigWhitelistFileController extends Controller
     public function index()
     {
         try {
-            return [
-                'success' => true,
-                'data' => implode("\n", json_decode(ConfigCommon::getValue(ConfigCommon::KEY_WHITELIST_FILE))),
-            ];
+            $data = ConfigCommon::getValue(ConfigCommon::KEY_WHITELIST_FILE);
+            $data = implode("\n", json_decode($data));
+            return ['success' => true, 'data' => $data];
         } catch (\Exception $e) {
             return ['success' => false, 'message' => $e->getMessage()];
         }
diff --git a/database/migrations/2021_06_01_111745_create_config_common_table.php b/database/migrations/2021_06_01_111745_create_config_common_table.php
@@ -18,7 +18,7 @@ public function up()
         Schema::create('config_common', function (Blueprint $table) {
             $table->id();
             $table->string('key', 255);
-            $table->string('value', 255);
+            $table->text('value');
             $table->unique(['key']);
         });
         $this->migrate();
@@ -30,8 +30,9 @@ public function up()
     private function migrate()
     {
         if (Schema::hasTable('config_whitelist_file')) {
-            $whitelistFile = DB::table('config_whitelist_file')->pluck('value');
-            ConfigCommon::create(['key' => ConfigCommon::KEY_WHITELIST_FILE, 'value' => json_encode($whitelistFile)]);
+            $values = DB::table('config_whitelist_file')->pluck('value');
+            $values = json_encode($values);
+            ConfigCommon::create(['key' => ConfigCommon::KEY_WHITELIST_FILE, 'value' => $values]);
             Schema::dropIfExists('config_whitelist_file');
         }
     }
diff --git a/resources/views/index/index.blade.php b/resources/views/index/index.blade.php
@@ -98,18 +98,16 @@
                                                 href: '/configNotify',
                                             },
                                             {
-                                                text: '白名单配置',
+                                                text: '代理配置',
                                                 align: 'left',
-                                                iconCls: 'icon-page-db',
-                                                href: '/configWhitelist',
+                                                iconCls: 'icon-page-lightning',
+                                                handler: winProxy,
                                             },
                                             {
-                                                text: '代理配置',
+                                                text: '白名单配置',
                                                 align: 'left',
-                                                iconCls: 'icon-page-wrench',
-                                                handler: function () {
-                                                    winForm([]);
-                                                }
+                                                iconCls: 'icon-page-db',
+                                                href: '/configWhitelist',
                                             }
                                         ]
                                     }
@@ -276,16 +274,17 @@
                 Ext.get('loading').setStyle('display', 'none');
             };
 
-            function winForm() {
-                tool.ajax('GET', '/api/configProxy', {}, function (rsp) {
+            // 代理配置
+            function winProxy() {
+                tool.ajax('GET', '/api/configProxy', null, function (rsp) {
                     if (!rsp.success) {
-                        tool.toast('读取配置错误！');
+                        tool.toast('读取代理配置失败！');
                         return false;
                     }
 
-                    var winProxy = Ext.create('Ext.window.Window', {
+                    var win = Ext.create('Ext.window.Window', {
                         title: '代理配置',
-                        iconCls: 'icon-page-wrench',
+                        iconCls: 'icon-page-lightning',
                         width: 300,
                         layout: 'fit',
                         items: [
@@ -298,40 +297,35 @@ function winForm() {
                                         xtype: 'textfield',
                                         name: 'value',
                                         value: rsp.data,
+                                        emptyText: '示例：127.0.0.1:1080',
                                     }
                                 ],
                                 buttons: [
                                     {
-                                        text: '代理测试',
+                                        text: '测试',
                                         handler: function () {
                                             var params = this.up('form').getValues();
                                             if (!params['value']) {
-                                                tool.toast('代理不能为空！', 'error');
+                                                tool.toast('请先配置代理！', 'error');
                                                 return;
                                             }
                                             tool.ajax('POST', '/api/configProxy/test', params, function (rsp) {
                                                 if (rsp.success) {
-                                                    tool.toast('测试成功！', 'success');
+                                                    tool.toast('代理测试可用！', 'success');
                                                 } else {
-                                                    tool.toast(rsp.message, 'error');
+                                                    tool.toast('代理不可用：' + rsp.message, 'error');
                                                 }
                                             });
                                         }
                                     },
-                                    {
-                                        text: '重置',
-                                        handler: function () {
-                                            this.up('form').getForm().reset();
-                                        }
-                                    },
                                     {
                                         text: '保存',
                                         formBind: true,
                                         handler: function () {
                                             var params = this.up('form').getValues();
                                             tool.ajax('POST', '/api/configProxy', params, function (rsp) {
                                                 if (rsp.success) {
-                                                    winProxy.close();
+                                                    win.close();
                                                     tool.toast('保存成功！', 'success');
                                                 } else {
                                                     tool.toast(rsp.message, 'error');

Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,9 @@ class ConfigWhitelistFileController extends Controller`
`15`	`15`	`public function index()`
`16`	`16`	`{`
`17`	`17`	`try {`
`18`		`- return [`
`19`		`- 'success' => true,`
`20`		`- 'data' => implode("\n", json_decode(ConfigCommon::getValue(ConfigCommon::KEY_WHITELIST_FILE))),`
`21`		`- ];`
	`18`	`+ $data = ConfigCommon::getValue(ConfigCommon::KEY_WHITELIST_FILE);`
	`19`	`+ $data = implode("\n", json_decode($data));`
	`20`	`+ return ['success' => true, 'data' => $data];`
`22`	`21`	`} catch (\Exception $e) {`
`23`	`22`	`return ['success' => false, 'message' => $e->getMessage()];`
`24`	`23`	`}`