Skip to content

Commit 9d56d75

Browse files
committed
fixed
1 parent 029a49a commit 9d56d75

File tree

18 files changed

+72
-160
lines changed

18 files changed

+72
-160
lines changed

admin-business/config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: 后台开发,提供管理系统基础功能(首页,登录,退出登
44
keys: admin-business,phpzlc/admin-business,admin,后台
55
type: 业务组件
66
language:
7-
version: v2.0
7+
version: v3.0
88
status: newest
99
sort: 0
1010
links:

admin/config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: 后台内核,为后台业务提供底层策略,写法支持.(导航
44
keys: admin,phpzlc/admin,后台
55
type: 功能组件
66
language:
7-
version: v2.0
7+
version: v3.0
88
status: newest
99
sort: 0
1010
links:

admin/index.markdown

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ $this->adminStrategy
431431
/**
432432
* @var Connection $conn
433433
*/
434-
$conn = $this->getDoctrine()->getConnection();
434+
$conn = ActionLoad::$globalDoctrine->getConnection();
435435
$conn->beginTransaction();
436436

437437
try {
@@ -569,7 +569,7 @@ $this->adminStrategy
569569
'feedDayDaily' => $request->get('id')
570570
];
571571

572-
$daily = $this->getDoctrine()->getRepository('App:FeedDayDaily')->find($request->get('id'));
572+
$daily = ActionLoad::$globalDoctrine->getRepository('App:FeedDayDaily')->find($request->get('id'));
573573

574574
// 通过ex判断是否是导出数据, 如若ex的值为1,则导出数据,如若不是,则显示页面
575575
if($request->get('ex') != 1){
@@ -582,7 +582,7 @@ $this->adminStrategy
582582
$head = [];
583583

584584
// 获取需要导出的数据
585-
$list = $this->getDoctrine()->getRepository('App:FeedDayDailyInfo')->findAll($rules);
585+
$list = ActionLoad::$globalDoctrine->getRepository('App:FeedDayDailyInfo')->findAll($rules);
586586

587587
$data = [];
588588

area-business/index.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ keys: area-business,area,地址,省市区
88
省市区组件,内置完整的省市区数据及接口
99

1010
## 源码地址
11-
[phpzlc/area-business](https://github.com/phpzlc/area-business)
11+
[phpzlc/area-business](https://github.com/phpzlc/area-business) (未适配PHPZLC 3 陆续会升级 需要或参与开发技术群内告知)
1212

1313
## 安装
1414

auth-business/config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: 提供登录,修改密码等基础功能
44
keys: auth,auth-business,phpzlc/auth-business,登录,授权
55
type: 业务组件
66
language:
7-
version: v2.0
7+
version: v3.0
88
status: newest
99
sort: 0
1010
links:

auth-business/index.markdown

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ class AuthTag
208208
//根据不同的操作平台,进行不同的Session标记设置
209209
switch (PlatformClass::getPlatform()){
210210
case $container->get('parameter_bag')->get('platform_admin'):
211-
$container->get('session')->set(PlatformClass::getPlatform() . $container->get('parameter_bag')->get('login_tag_session_name'), $userAuth->getId());
211+
$container->get('request_stack')->getCurrentRequest()->getSession()->set(PlatformClass::getPlatform() . $container->get('parameter_bag')->get('login_tag_session_name'), $userAuth->getId());
212212
break;
213213
default:
214214
throw new \Exception('来源溢出');
@@ -229,17 +229,12 @@ class AuthTag
229229
public static function get(ContainerInterface $container)
230230
{
231231
$userAuth = null;
232-
233-
/**
234-
* @var ManagerRegistry $doctrine
235-
*/
236-
$doctrine = $container->get('doctrine');
237232

238233
// 根据不同的操作平台,进行对应平台的Session标记获取
239234
switch (PlatformClass::getPlatform()){
240235
case $container->get('parameter_bag')->get('platform_admin'):
241-
$user_auth_id = $container->get('session')->get(PlatformClass::getPlatform() . $container->get('parameter_bag')->get('login_tag_session_name'));
242-
$userAuth = $doctrine->getRepository('App:UserAuth')->find($user_auth_id);
236+
$user_auth_id = $container->get('request_stack')->getCurrentRequest()->getSession()->get(PlatformClass::getPlatform() . $container->get('parameter_bag')->get('login_tag_session_name'));
237+
$userAuth = ActionLoad::$globalDoctrine->getRepository('App:UserAuth')->find($user_auth_id);
243238
break;
244239
default:
245240
throw new \Exception('来源溢出');
@@ -260,7 +255,7 @@ class AuthTag
260255
{
261256
switch (PlatformClass::getPlatform()){
262257
case $container->get('parameter_bag')->get('platform_admin'):
263-
$container->get('session')->remove(PlatformClass::getPlatform() . $container->get('parameter_bag')->get('login_tag_session_name'));
258+
$container->get('request_stack')->getCurrentRequest()->getSession()->get('session')->remove(PlatformClass::getPlatform() . $container->get('parameter_bag')->get('login_tag_session_name'));
264259
break;
265260
default:
266261
throw new \Exception('来源溢出');

captcha-business/config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: 提供生成图形验证码接口,文档。
44
keys: captcha,captcha-business,phpzlc/captcha-business,图形验证码
55
type: 业务组件
66
language:
7-
version: v2.0
7+
version: v3.0
88
status: newest
99
sort: 0
1010
links:

captcha-business/index.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ captcha:
3636
# 验证码生成
3737
captcha_generate:
3838
path: /generate
39-
controller: App\Controller\Captcha\CaptchaController:generate
39+
controller: App\Controller\Captcha\CaptchaController::generate
4040
```
4141
4242
_如果使用,可以生成查看API文档。[文档知识](/document-bundle/index.markdown)_

document-bundle/config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: 用于编写接口文档,通过命令生成,在线的,可测试,可
44
keys: symfony,phpzlc,php,document,api,文档
55
type: 功能组件
66
language:
7-
version: v2.0
7+
version: v3.0
88
status: newest
99
sort: 0
1010
links:

phpzlc/db/edit.markdown

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ keys: symfony,phpzlc,orm,表,插入,更新,删除
2727
use Symfony\Component\HttpFoundation\Request;
2828
use Symfony\Component\HttpFoundation\Response;
2929
use Symfony\Component\Validator\Validator\ValidatorInterface;
30+
use PHPZlc\PHPZlc\Bundle\Safety\ActionLoad;
3031
```
3132

3233
2. Business 写法依赖
@@ -50,7 +51,7 @@ keys: symfony,phpzlc,orm,表,插入,更新,删除
5051

5152
public function createUser(ValidatorInterface $validator, Request $request)
5253
{
53-
$manager = $this->getDoctrine()->getManager();
54+
$manager = ActionLoad::$globalDoctrine->getManager();
5455

5556
$user = new User();
5657
$user->setName($request->get('name'));
@@ -98,9 +99,9 @@ keys: symfony,phpzlc,orm,表,插入,更新,删除
9899

99100
public function updateUser(ValidatorInterface $validator, Request $request)
100101
{
101-
$manager = $this->getDoctrine()->getManager();
102+
$manager = ActionLoad::$globalDoctrine->getManager();
102103

103-
$user = $this->getDoctrine()->getRepository('App:User')->find($request->get('id'));
104+
$user = ActionLoad::$globalDoctrine->getRepository('App:User')->find($request->get('id'));
104105

105106
$user->setName($request->get('name'));
106107

@@ -138,9 +139,9 @@ keys: symfony,phpzlc,orm,表,插入,更新,删除
138139
```php
139140
public function removeUser(Request $request)
140141
{
141-
$manager = $this->getDoctrine()->getManager();
142+
$manager = ActionLoad::$globalDoctrine->getManager();
142143

143-
$user = $this->getDoctrine()->getRepository('App:User')->find($request->get('id'));
144+
$user = ActionLoad::$globalDoctrine->getRepository('App:User')->find($request->get('id'));
144145

145146
$manager->remove($user);
146147
$manager->flush();

0 commit comments

Comments
 (0)