Skip to content

Commit 4f23c50

Browse files
deatildeatil
committed
优化事件命名
1 parent 0da207d commit 4f23c50

File tree

6 files changed

+26
-26
lines changed

6 files changed

+26
-26
lines changed

‎src/Admin.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ class Admin
1818
/**
1919
* 版本号
2020
*/
21-
const VERSION = "2.1.1";
21+
const VERSION = "2.2.0";
2222

2323
/**
2424
* 发布号
2525
*/
26-
const RELEASE = "20250317";
26+
const RELEASE = "20250402";
2727

2828
/**
2929
* 扩展

‎src/Controller/Config.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ public function create(Request $request)
229229
}
230230

231231
// 监听事件
232-
do_action("config_created", $config);
232+
do_action("admin.config.created", $config);
233233

234234
return $this->success(__('larke-admin::config.create_success'), [
235235
'id' => $config->id,
@@ -309,7 +309,7 @@ public function update(string $id, Request $request)
309309
}
310310

311311
// 监听事件
312-
do_action("config_updated", $info);
312+
do_action("admin.config.updated", $info);
313313

314314
return $this->success(__('larke-admin::config.update_success'));
315315
}
@@ -364,13 +364,13 @@ public function lists()
364364
public function setting(Request $request)
365365
{
366366
$fields = $request->input('fields');
367-
$fields = apply_filters("config_setting_before", $fields);
367+
$fields = apply_filters("admin.config.setting_before", $fields);
368368

369369
if (!empty($fields)) {
370370
ConfigModel::setMany($fields);
371371
}
372372

373-
do_action("config_setting_after", $fields);
373+
do_action("admin.config.setting_after", $fields);
374374

375375
return $this->success(__('larke-admin::config.setting_update_success'));
376376
}
@@ -389,7 +389,7 @@ public function setting(Request $request)
389389
public function settings()
390390
{
391391
$settings = ConfigModel::getSettings();
392-
$settings = apply_filters("config_settings_after", $settings);
392+
$settings = apply_filters("admin.config.settings_after", $settings);
393393

394394
return $this->success(__('larke-admin::common.get_success'), [
395395
'settings' => $settings,

‎src/Controller/Extension.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,7 @@ public function config(string $name, Request $request)
655655
$config = $request->input('config');
656656

657657
// 过滤配置
658-
$config = apply_filters("extension_config_before", $config, $name);
658+
$config = apply_filters("admin.extension.config_before", $config, $name);
659659

660660
$info = ExtensionModel::where(['name' => $name])
661661
->first();

‎src/Controller/Passport.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public function passkey(Request $request)
135135
public function login(Request $request)
136136
{
137137
// 监听事件
138-
do_action("passport_login_before", $request);
138+
do_action("admin.passport.login_before", $request);
139139

140140
$data = $request->all();
141141
$validator = Validator::make($data, [
@@ -200,20 +200,20 @@ public function login(Request $request)
200200
$password = $rsakey->withPadding(RSA::ENCRYPTION_PKCS1)
201201
->decrypt($password);
202202
} catch(\Exception $e) {
203-
do_action("passport_login_key_error", $e->getMessage());
203+
do_action("admin.passport.login_key_error", $e->getMessage());
204204

205205
return $this->error(__('larke-admin::passport.password_error'), \ResponseCode::LOGIN_ERROR);
206206
}
207207

208208
$encryptPassword = AdminModel::checkPassword($adminInfo, $password);
209209
if (! $encryptPassword) {
210-
do_action("passport_login_password_error", $admin);
210+
do_action("admin.passport.login_password_error", $admin);
211211

212212
return $this->error(__('larke-admin::passport.password_check_fail'), \ResponseCode::LOGIN_ERROR);
213213
}
214214

215215
if ($adminInfo['status'] != 1) {
216-
do_action("passport_login_inactive", $admin);
216+
do_action("admin.passport.login_inactive", $admin);
217217

218218
return $this->error(__('larke-admin::passport.passport_disabled_or_not_exists'), \ResponseCode::LOGIN_ERROR);
219219
}
@@ -225,7 +225,7 @@ public function login(Request $request)
225225
'adminid' => $adminInfo['id'],
226226
]);
227227
} catch(\Exception $e) {
228-
do_action("passport_login_access_token_error", $e->getMessage());
228+
do_action("admin.passport.login_access_token_error", $e->getMessage());
229229

230230
return $this->error(__('larke-admin::passport.login_fail'), \ResponseCode::LOGIN_ERROR);
231231
}
@@ -241,7 +241,7 @@ public function login(Request $request)
241241
'adminid' => $adminInfo['id'],
242242
]);
243243
} catch(\Exception $e) {
244-
do_action("passport_login_refresh_token_error", $e->getMessage());
244+
do_action("admin.passport.login_refresh_token_error", $e->getMessage());
245245

246246
return $this->error($e->getMessage(), \ResponseCode::LOGIN_ERROR);
247247
}
@@ -264,7 +264,7 @@ public function login(Request $request)
264264
];
265265

266266
// 监听事件
267-
do_action("passport_login_after", $admin, $data);
267+
do_action("admin.passport.login_after", $admin, $data);
268268

269269
return $this->success(__('larke-admin::passport.login_success'), $data);
270270
}
@@ -350,7 +350,7 @@ public function refreshToken(Request $request)
350350
];
351351

352352
// 监听事件
353-
do_action("passport_refresh_token_after", $data);
353+
do_action("admin.passport.refresh_token_after", $data);
354354

355355
return $this->success(__('larke-admin::auth.refresh_token_success'), $data);
356356
}
@@ -409,7 +409,7 @@ public function logout(Request $request)
409409
app('larke-admin.cache')->add(md5($refreshToken), time(), $refreshTokenExpiresIn);
410410

411411
// 监听事件
412-
do_action("passport_logout_after", [
412+
do_action("admin.passport.logout_after", [
413413
'access_token' => $accessToken,
414414
'expires_in' => $refreshTokenExpiresIn,
415415
'refresh_token' => $refreshToken,

‎src/Controller/System.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public function info()
4949
'system' => $this->getSysInfo(),
5050
];
5151

52-
$info = apply_filters("system_info", $info);
52+
$info = apply_filters("admin.system.info", $info);
5353

5454
return $this->success(__('larke-admin::common.get_success'), $info);
5555
}
@@ -76,7 +76,7 @@ public function clearCache()
7676
// > php artisan config:clear
7777
// Artisan::call('config:clear');
7878

79-
do_action("system_clear_cache");
79+
do_action("admin.system.clear_cache");
8080

8181
return $this->success(__('larke-admin::system.clear_cache_success'));
8282
}
@@ -97,7 +97,7 @@ public function cache()
9797
Artisan::call('route:cache');
9898
Artisan::call('config:cache');
9999

100-
do_action("system_cache");
100+
do_action("admin.system.cache");
101101

102102
return $this->success(__('larke-admin::system.routes_and_config_chache_success'));
103103
}

‎src/Provider/EventServiceProvider.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,22 @@ class EventServiceProvider extends BaseServiceProvider
1919
public function register()
2020
{
2121
// 登陆密钥错误
22-
add_action('passport_login_key_error', Listener\PassportLoginKeyError::class);
22+
add_action('admin.passport.login_key_error', Listener\PassportLoginKeyError::class);
2323

2424
// 登陆权限 Token 错误
25-
add_action('passport_login_access_token_error', Listener\PassportLoginAccessTokenError::class);
25+
add_action('admin.passport.login_access_token_error', Listener\PassportLoginAccessTokenError::class);
2626

2727
// 登陆刷新 Token 错误
28-
add_action('passport_login_refresh_token_error', Listener\PassportLoginRefreshTokenError::class);
28+
add_action('admin.passport.login_refresh_token_error', Listener\PassportLoginRefreshTokenError::class);
2929

3030
// 登陆
31-
add_action('passport_login_after', Listener\PassportLoginAfter::class);
31+
add_action('admin.passport.login_after', Listener\PassportLoginAfter::class);
3232

3333
// 刷新 token
34-
add_action('passport_refresh_token_after', Listener\PassportRefreshTokenAfter::class);
34+
add_action('admin.passport.refresh_token_after', Listener\PassportRefreshTokenAfter::class);
3535

3636
// 退出
37-
add_action('passport_logout_after', Listener\PassportLogoutAfter::class);
37+
add_action('admin.passport.logout_after', Listener\PassportLogoutAfter::class);
3838
}
3939

4040
/**

0 commit comments

Comments
 (0)