Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 5652a8b

Browse filesBrowse files
ezhuoezhuo
committed
重构
1 parent 1579070 commit 5652a8b
Copy full SHA for 5652a8b
Expand file treeCollapse file tree

33 files changed

+609
-357
lines changed

‎.gitignore

Copy file name to clipboardExpand all lines: .gitignore
+3Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,6 @@ npm-debug.log
1111
yarn-error.log
1212
.env
1313
/public/uploads
14+
/storage
15+
/doc
16+
/app/mysql

‎app/Helpers/array.php

Copy file name to clipboardExpand all lines: app/Helpers/array.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ function arrayToArrayByType($arr) {
137137
if (check_empty($result, $v->type)) {
138138
$result[$v->type] = [];
139139
}
140-
$result[$v->type][] = ['key' => $v->code, 'val' => $v->name];
140+
$result[$v->type][] = ['label' => $v->name, 'value' => $v->code];
141141
}
142142
return $result;
143143
}

‎app/Http/Controllers/Auth/AuthController.php

Copy file name to clipboardExpand all lines: app/Http/Controllers/Auth/AuthController.php
+21-10Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,24 @@
33
namespace App\Http\Controllers\Auth;
44

55
use App\Models\Data\SysLogs;
6+
use App\Models\Data\SysLoginLogs;
67
use Illuminate\Http\Request;
78
use App\Models\Auth\Auth;
89
use App\Models\Auth\Tokens;
910
use App\Models\Data\SysMenu;
1011
use App\Http\Controllers\Frame\AppDataController;
1112

12-
class AuthController extends AppDataController {
13-
public function __construct(Request $request, Auth $model) {
13+
class AuthController extends AppDataController
14+
{
15+
public function __construct(Request $request, Auth $model)
16+
{
1417
parent::__construct($request, $model);
1518

1619
$this->middleware('auth', ['except' => ['login_pc', 'login_mobi_org']]);
1720
}
1821

19-
public function checktoken(Request $request) {
22+
public function checktoken(Request $request)
23+
{
2024
$token = $request['token'];
2125
$res = Tokens::read($token);
2226
if ($res) {
@@ -26,7 +30,8 @@ public function checktoken(Request $request) {
2630
}
2731
}
2832

29-
public function userinfo(Request $request) {
33+
public function userinfo(Request $request)
34+
{
3035
$res = token_decode($request->header('token'));
3136
if ($res) {
3237
return return_json($res);
@@ -37,10 +42,11 @@ public function userinfo(Request $request) {
3742

3843
// --------------------------------
3944

40-
protected function user_login($request, $login_type) {
45+
protected function user_login($request, $login_type)
46+
{
4147
if ($login_type == 'sys') {
4248
$res = Auth::login_pc_sys($request);
43-
} else if ($login_type == 'org') {
49+
} elseif ($login_type == 'org') {
4450
$res = Auth::login_pc_org($request);
4551
}
4652

@@ -50,7 +56,7 @@ protected function user_login($request, $login_type) {
5056
if ($res['code'] == 202) {
5157
return return_json([], '帐号和密码无效！', HTTP_NOAUTH);
5258
}
53-
if ($res['code'] == 203) {
59+
if ($res['code'] == 203) {
5460
return return_json([], '帐号因未验证、已禁用或该员工已离职等原因，故而登录失败！', HTTP_NOAUTH);
5561
}
5662
if ($res['code'] != 200) {
@@ -72,23 +78,28 @@ protected function user_login($request, $login_type) {
7278

7379
$request->__user = $res['account'];
7480
SysLogs::write($request, '登录');
81+
SysLoginLogs::write($request, '登录');
7582
return return_json($list, $loginInfo);
7683
}
7784

78-
public function login_pc(Request $request) {
85+
public function login_pc(Request $request)
86+
{
7987
$request->__source = $request['login_type'];
8088
return $this->user_login($request, $request['login_type']);
8189
}
8290

83-
public function login_mobi_org(Request $request) {
91+
public function login_mobi_org(Request $request)
92+
{
8493
return $this->user_login($request, 'org');
8594
}
8695

87-
public function logout(Request $request) {
96+
public function logout(Request $request)
97+
{
8898
$res = Tokens::destroy($request->header('token'));
8999
if ($res != false) {
90100
$request->__source = $request->__user->style;
91101
SysLogs::write($request, '登出');
102+
SysLoginLogs::write($request, '登出');
92103
return return_json([], '注销成功...');
93104
} else {
94105
return return_json([], '注销失败', HTTP_NOAUTH);

‎app/Http/Controllers/Data/CantonController.php

Copy file name to clipboardExpand all lines: app/Http/Controllers/Data/CantonController.php
+22-12Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,30 @@
77
use DB;
88
use App\Http\Controllers\Frame\AppDataController;
99

10-
class CantonController extends AppDataController {
11-
public function __construct(Request $request, Canton $model) {
10+
class CantonController extends AppDataController
11+
{
12+
public function __construct(Request $request, Canton $model)
13+
{
1214
parent::__construct($request, $model);
1315
$this->middleware('auth', ['except' => ['get_selectselectselect']]);
1416
}
1517

16-
public function index(Request $request) {
18+
public function index(Request $request)
19+
{
1720
$data['list'] = $this->model->canton_data($request);
1821
$data['count'] = count($data['list']);
19-
// dd( $data['list'] );
2022
return return_json($data);
2123
}
2224

23-
public function get_selectselectselect(Request $request, $id) {
25+
public function get_selectselectselect(Request $request, $id)
26+
{
2427
$data = $this->model->canton_selectselectselect($request, $id);
2528
return return_json($data);
2629
}
2730

2831

29-
public function destroy(Request $request, $id) {
32+
public function destroy(Request $request, $id)
33+
{
3034
$http_code = HTTP_WRONG;
3135
$num = 0;
3236
if (empty($id)) {
@@ -36,13 +40,16 @@ public function destroy(Request $request, $id) {
3640
if (!empty($dataset)) {
3741
$num = DB::delete("delete from " . $this->model_table . " where fdn like ? ", [$dataset->fdn . "%"]);
3842
$http_code = ($num ? HTTP_OK : HTTP_WRONG);
39-
if ($num) canton_cache_clear();
43+
if ($num) {
44+
canton_cache_clear();
45+
}
4046
return return_json(['result' => $num], ($http_code == HTTP_OK ? "删除成功" : "删除失败"), $http_code);
4147
}
4248
return return_json(null, "未找到要删除的数据！", HTTP_WRONG);
4349
}
4450

45-
protected function after_update($request, $dataset, $id) {
51+
protected function after_update($request, $dataset, $id)
52+
{
4653
$pk = $this->model_key;
4754
$canton_id = $id;
4855
if ((!empty($dataset->parent_id)) && (!empty($canton_id))) {
@@ -61,7 +68,8 @@ protected function after_update($request, $dataset, $id) {
6168
return true;
6269
}
6370

64-
protected function after_store($request, $dataset, $id) {
71+
protected function after_store($request, $dataset, $id)
72+
{
6573
$pk = $this->model_key;
6674
$canton_id = $id;
6775
if (empty($dataset->parent_id)) {
@@ -91,17 +99,19 @@ protected function after_store($request, $dataset, $id) {
9199
return true;
92100
}
93101

94-
public function getSelectTree(Request $request) {
102+
public function getSelectTree(Request $request)
103+
{
95104
$fdn = $request['fdn'];
105+
$label = $request['label'];
96106
$id = 0;
97107
$rootid = 3520;
98108
if (!empty($fdn)) {
99109
$arr = explode('.', $fdn);
100110
$id = (int)$arr[sizeof($arr) - 2];
101111
$rootid = $id;
102112
}
103-
$data = $this->model->canton_selectTree($request, $fdn, $id);
113+
$data = $this->model->canton_selectTree($request, $fdn, $id, $label);
104114
$data = getTree($data, $rootid, 'id', 'parent_id', 'children');
105-
return return_json($data);
115+
return return_json($data, '');
106116
}
107117
}

‎app/Http/Controllers/Data/DictDicController.php

Copy file name to clipboardExpand all lines: app/Http/Controllers/Data/DictDicController.php
+25-2Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,36 @@
55
use Illuminate\Http\Request;
66
use App\Models\Data\DictDic;
77
use App\Http\Controllers\Frame\AppDataController;
8+
use DB;
89

9-
class DictDicController extends AppDataController {
10+
class DictDicController extends AppDataController
11+
{
1012

11-
public function __construct(Request $request, DictDic $model) {
13+
public function __construct(Request $request, DictDic $model)
14+
{
1215
parent::__construct($request, $model);
1316
$this->middleware('auth');
1417
}
1518

19+
public function tree(Request $request, $id)
20+
{
21+
$ds = $this->model;
22+
$map = ['org_id' => $request->__user->org_id];
23+
$result = $ds->where($map)->select([
24+
"type", "type_name"
25+
])->whereRaw("type_name != ''")->distinct()->orderBy('order', 'asc')->orderBy('type_name', 'desc')->get();
26+
27+
$data['list'] = $result;
28+
$data['total'] = sizeof($data['list']);
29+
return return_json($data);
30+
}
31+
32+
protected function get_where($request, $dataset)
33+
{
34+
$where = parent::get_where($request, $dataset);
35+
$where['order'] = ['order' => 'asc', 'code' => 'asc'];
36+
return $where;
37+
}
38+
1639

1740
}

‎app/Http/Controllers/Data/PublicController.php

Copy file name to clipboardExpand all lines: app/Http/Controllers/Data/PublicController.php
+21-13Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,47 +2,55 @@
22

33
namespace App\Http\Controllers\Data;
44

5+
use App\Http\Controllers\Frame\AppDataController;
56
use App\Models\Frame\Base;
6-
use Illuminate\Http\Request;
7-
use DB;
7+
use App\Models\Data\Canton;
88
use Cache;
9-
use App\Http\Controllers\Frame\AppDataController;
10-
11-
class PublicController extends AppDataController {
9+
use Illuminate\Http\Request;
1210

13-
public function __construct(Request $request, Base $model) {
11+
class PublicController extends AppDataController
12+
{
13+
public function __construct(Request $request, Base $model)
14+
{
1415
parent::__construct($request, $model);
15-
$this->middleware('auth');
16+
$this->middleware('auth', ['except' => ['getCantonTree']]);
1617
}
1718

1819
/**
1920
* 清除缓存
2021
* @param Request $request
2122
* @return \Illuminate\Contracts\Routing\ResponseFactory|\Symfony\Component\HttpFoundation\Response
2223
*/
23-
public function cache_clear(Request $request) {
24+
public function cache_clear(Request $request)
25+
{
2426
Cache::flush();
25-
return return_json([], '缓存清理完毕！', HTTP_DONE);
27+
return return_json([], '缓存清理完毕！', HTTP_OK);
2628
}
2729

28-
public function get_sys_dict(Request $request) {
30+
public function get_sys_dict(Request $request)
31+
{
2932
return return_json(
3033
[
3134
'sys_dic' => $this->get_sys_dic($request),
3235
'sys_setting' => $this->get_setting($request),
3336
'app_canton_fdn' => APP_CANTON_FDN,
3437
'app_canton_name' => APP_CANTON_NAME,
35-
'app_canton_id' => APP_CANTON_ID
38+
'app_canton_id' => APP_CANTON_ID,
3639
]
3740
);
3841
}
3942

40-
public function get_dict_dict(Request $request) {
43+
public function get_dict_dict(Request $request)
44+
{
4145
return return_json([
4246
'dict_dic' => $this->get_dict_dic($request),
4347
'dict_setting' => $this->get_setting($request, 'dic'),
4448
]);
4549
}
4650

47-
51+
public function getCantonTree(Request $request)
52+
{
53+
$canton = new CantonController($request, new Canton());
54+
return $canton->getSelectTree($request);
55+
}
4856
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.