Skip to content

Commit 51bb277

Browse files
tokumeikoitokumeikoi
committed
update
1 parent 2f8f3af commit 51bb277

File tree

4 files changed

+95
-93
lines changed

4 files changed

+95
-93
lines changed

‎.env.example

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ APP_URL=http://localhost
77
LOG_CHANNEL=stack
88

99
DB_CONNECTION=mysql
10-
DB_HOST=db
10+
DB_HOST=localhost
1111
DB_PORT=3306
1212
DB_DATABASE=laravel
1313
DB_USERNAME=root
@@ -45,4 +45,4 @@ PUSHER_APP_SECRET=
4545
PUSHER_APP_CLUSTER=mt1
4646

4747
MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
48-
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
48+
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

‎app/Http/Controllers/Admin/ConfigController.php

+7-57
Original file line numberDiff line numberDiff line change
@@ -16,74 +16,24 @@ public function init()
1616
public function fetch()
1717
{
1818
return response([
19-
'data' => [
20-
'invite' => [
21-
'invite_force' => (int)config('v2board.invite_force', 0),
22-
'invite_commission' => config('v2board.invite_commission', 10),
23-
'invite_gen_limit' => config('v2board.invite_gen_limit', 5),
24-
'invite_never_expire' => config('v2board.invite_never_expire', 0)
25-
],
26-
'site' => [
27-
'stop_register' => (int)config('v2board.stop_register', 0),
28-
'email_verify' => (int)config('v2board.email_verify', 0),
29-
'app_name' => config('v2board.app_name', 'V2Board'),
30-
'app_url' => config('v2board.app_url'),
31-
'subscribe_url' => config('v2board.subscribe_url'),
32-
'plan_change_enable' => (int)config('v2board.plan_change_enable', 1),
33-
'plan_transfer_hour' => config('v2board.plan_transfer_hour', 12),
34-
'try_out_enable' => (int)config('v2board.try_out_enable', 0),
35-
'try_out_plan_id' => (int)config('v2board.try_out_plan_id'),
36-
'try_out_hour' => (int)config('v2board.try_out_hour', 1)
37-
],
38-
'pay' => [
39-
// alipay
40-
'alipay_enable' => (int)config('v2board.alipay_enable'),
41-
'alipay_appid' => config('v2board.alipay_appid'),
42-
'alipay_pubkey' => config('v2board.alipay_pubkey'),
43-
'alipay_privkey' => config('v2board.alipay_privkey'),
44-
// stripe
45-
'stripe_sk_live' => config('v2board.stripe_sk_live'),
46-
'stripe_pk_live' => config('v2board.stripe_pk_live'),
47-
'stripe_alipay_enable' => (int)config('v2board.stripe_alipay_enable'),
48-
'stripe_wepay_enable' => (int)config('v2board.stripe_wepay_enable'),
49-
'stripe_webhook_key' => config('v2board.stripe_webhook_key'),
50-
// bitpayx
51-
'bitpayx_enable' => config('v2board.bitpayx_enable'),
52-
'bitpayx_appsecret' => config('v2board.bitpayx_appsecret'),
53-
// paytaro
54-
'paytaro_enable' => config('v2board.paytaro_enable'),
55-
'paytaro_app_id' => config('v2board.paytaro_app_id'),
56-
'paytaro_app_secret' => config('v2board.paytaro_app_secret')
57-
],
58-
'frontend' => [
59-
'frontend_theme' => config('v2board.frontend_theme', 1),
60-
'frontend_background_url' => config('v2board.frontend_background_url')
61-
],
62-
'server' => [
63-
'server_token' => config('v2board.server_token'),
64-
'server_license' => config('v2board.server_license')
65-
],
66-
'tutorial' => [
67-
'apple_id' => config('v2board.apple_id')
68-
]
69-
]
19+
'data' => config('v2board')
7020
]);
7121
}
7222

7323
public function save(ConfigSave $request)
7424
{
7525
$data = $request->input();
76-
$array = \Config::get('v2board');
26+
// $array = \Config::get('v2board');
7727
foreach ($data as $k => $v) {
7828
if (!in_array($k, ConfigSave::filter())) {
7929
abort(500, '参数' . $k . '不在规则内，禁止修改');
8030
}
81-
$array[$k] = $v;
82-
}
83-
$data = var_export($array, 1);
84-
if (!\File::put(base_path() . '/config/v2board.php', "<?php\n return $data ;")) {
85-
abort(500, '修改失败');
31+
config(['v2board.' . $k => $v]);
8632
}
33+
// $data = var_export($array, 1);
34+
// if (!\File::put(base_path() . '/config/v2board.php', "<?php\n return $data ;")) {
35+
// abort(500, '修改失败');
36+
// }
8737
\Artisan::call('config:cache');
8838
return response([
8939
'data' => true

‎app/Http/Requests/Admin/ConfigSave.php

+34-34
Original file line numberDiff line numberDiff line change
@@ -7,47 +7,47 @@
77
class ConfigSave extends FormRequest
88
{
99
CONST RULES = [
10-
'invite_force' => 'in:0,1',
11-
'invite_commission' => 'integer',
12-
'invite_gen_limit' => 'integer',
13-
'invite_never_expire' => 'in:0,1',
14-
'stop_register' => 'in:0,1',
15-
'email_verify' => 'in:0,1',
16-
'app_name' => '',
17-
'app_url' => 'url',
18-
'subscribe_url' => 'url',
19-
'plan_transfer_hour' => 'numeric',
20-
'plan_change_enable' => 'in:0,1',
21-
'try_out_enable' => 'in:0,1',
22-
'try_out_plan_id' => 'integer',
23-
'try_out_hour' => 'numeric',
10+
'invite.invite_force' => 'in:0,1',
11+
'invite.invite_commission' => 'integer',
12+
'invite.invite_gen_limit' => 'integer',
13+
'invite.invite_never_expire' => 'in:0,1',
14+
'site.stop_register' => 'in:0,1',
15+
'site.email_verify' => 'in:0,1',
16+
'site.app_name' => '',
17+
'site.app_url' => 'url',
18+
'site.subscribe_url' => 'url',
19+
'site.plan_transfer_hour' => 'numeric',
20+
'site.plan_change_enable' => 'in:0,1',
21+
'site.try_out_enable' => 'in:0,1',
22+
'site.try_out_plan_id' => 'integer',
23+
'site.try_out_hour' => 'numeric',
2424
// server
25-
'server_token' => 'nullable|min:16',
26-
'server_license' => 'nullable',
25+
'server.server_token' => 'nullable|min:16',
26+
'server.server_license' => 'nullable',
2727
// alipay
28-
'alipay_enable' => 'in:0,1',
29-
'alipay_appid' => 'nullable|integer|min:16',
30-
'alipay_pubkey' => 'max:2048',
31-
'alipay_privkey' => 'max:2048',
28+
'pay.alipay_enable' => 'in:0,1',
29+
'pay.alipay_appid' => 'nullable|integer|min:16',
30+
'pay.alipay_pubkey' => 'max:2048',
31+
'pay.alipay_privkey' => 'max:2048',
3232
// stripe
33-
'stripe_alipay_enable' => 'in:0,1',
34-
'stripe_wepay_enable' => 'in:0,1',
35-
'stripe_sk_live' => '',
36-
'stripe_pk_live' => '',
37-
'stripe_webhook_key' => '',
33+
'pay.stripe_alipay_enable' => 'in:0,1',
34+
'pay.stripe_wepay_enable' => 'in:0,1',
35+
'pay.stripe_sk_live' => '',
36+
'pay.stripe_pk_live' => '',
37+
'pay.stripe_webhook_key' => '',
3838
// bitpayx
39-
'bitpayx_enable' => 'in:0,1',
40-
'bitpayx_appsecret' => '',
39+
'pay.bitpayx_enable' => 'in:0,1',
40+
'pay.bitpayx_appsecret' => '',
4141
// paytaro
42-
'paytaro_enable' => 'in:0,1',
43-
'paytaro_app_id' => '',
44-
'paytaro_app_secret' => '',
42+
'pay.paytaro_enable' => 'in:0,1',
43+
'pay.paytaro_app_id' => '',
44+
'pay.paytaro_app_secret' => '',
4545
// frontend
46-
'frontend_theme' => 'in:1,2',
47-
'frontend_background_url' => 'nullable|url',
46+
'frontend.frontend_theme' => 'in:1,2',
47+
'frontend.frontend_background_url' => 'nullable|url',
4848
// tutorial
49-
'apple_id' => 'email',
50-
'apple_id_password' => ''
49+
'tutorial.apple_id' => 'email',
50+
'tutorial.apple_id_password' => ''
5151
];
5252

5353
public static function filter()

‎config/v2board.php

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
<?php
2+
return [
3+
'invite' => [
4+
'invite_force' => 0,
5+
'invite_commission' => 10,
6+
'invite_gen_limit' => 5,
7+
'invite_never_expire' => 0
8+
],
9+
'site' => [
10+
'stop_register' => 0,
11+
'email_verify' => 0,
12+
'app_name' => 'V2Board',
13+
'app_url' => '',
14+
'subscribe_url' => '',
15+
'plan_change_enable' => 1,
16+
'plan_transfer_hour' => 12,
17+
'try_out_enable' => 0,
18+
'try_out_plan_id' => '',
19+
'try_out_hour' => 1
20+
],
21+
'pay' => [
22+
// alipay
23+
'alipay_enable' => '',
24+
'alipay_appid' => '',
25+
'alipay_pubkey' => '',
26+
'alipay_privkey' => '',
27+
// stripe
28+
'stripe_sk_live' => '',
29+
'stripe_pk_live' => '',
30+
'stripe_alipay_enable' => 0,
31+
'stripe_wepay_enable' => 0,
32+
'stripe_webhook_key' => '',
33+
// bitpayx
34+
'bitpayx_enable' => '',
35+
'bitpayx_appsecret' => '',
36+
// paytaro
37+
'paytaro_enable' => 0,
38+
'paytaro_app_id' => '',
39+
'paytaro_app_secret' => ''
40+
],
41+
'frontend' => [
42+
'frontend_theme' => 1,
43+
'frontend_background_url' => ''
44+
],
45+
'server' => [
46+
'server_token' => '',
47+
'server_license' => ''
48+
],
49+
'tutorial' => [
50+
'apple_id' => ''
51+
]
52+
];

0 commit comments

Comments
 (0)