Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
DiscuzPHP
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Discuz
DiscuzPHP
Commits
4fd0c699
Commit
4fd0c699
authored
Mar 09, 2021
by
xiongyuwen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
e6ff5d37
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
14 deletions
+11
-14
LoginController.php
app/Api/Controller/Users/LoginController.php
+2
-4
OAuthServerExceptionHandler.php
app/Api/Exceptions/OAuthServerExceptionHandler.php
+0
-1
RegisterUser.php
app/Commands/Users/RegisterUser.php
+9
-8
IndexController.php
app/Http/Controller/IndexController.php
+0
-1
No files found.
app/Api/Controller/Users/LoginController.php
View file @
4fd0c699
...
...
@@ -141,12 +141,12 @@ class LoginController extends AbstractResourceController
{
$url
=
'https://qyapi.weixin.qq.com/cgi-bin/user/get?access_token='
.
$Token
.
'&userid='
.
$useid
;
}
else
{
$url
=
'https://qyapi.weixin.qq.com/cgi-bin/user/get?access_token='
.
$Token
.
'&userid='
.
$usersinfo
[
'UserId'
];
}
$user
=
$this
->
https_request
(
$url
);
//print_r($user);die();
//判断获取成员信息是否成功
if
(
$usersinfo
[
'errcode'
]
==
0
||
$useid
!=
null
)
{
...
...
@@ -179,7 +179,6 @@ class LoginController extends AbstractResourceController
$attributes
[
'register_port'
]
=
Arr
::
get
(
$request
->
getServerParams
(),
'REMOTE_PORT'
,
0
);
$attributes
[
'wechat_info'
]
=
json_encode
(
$user
,
256
);
$attributes
[
'department'
]
=
$this
->
Get_DepNames
(
$deptoken
,
$user
[
'department'
]);
//注册新的用户
$user_data
=
$this
->
bus
->
dispatch
(
new
RegisterUser
(
$request
->
getAttribute
(
'actor'
),
$attributes
)
...
...
@@ -188,7 +187,6 @@ class LoginController extends AbstractResourceController
$data
[
'mobileToken'
]
=
'filled'
;
$data
[
'username'
]
=
$user
[
'name'
];
$data
[
'password'
]
=
$user
[
'userid'
];
}
else
{
$depsecret
=
'KUd3Dhhe9Oj7d-Qz4fNWvsZqRVUXA4jCKecpd4hjEns'
;
if
(
$state
==
"4k"
)
...
...
app/Api/Exceptions/OAuthServerExceptionHandler.php
View file @
4fd0c699
...
...
@@ -49,7 +49,6 @@ class OAuthServerExceptionHandler implements ExceptionHandlerInterface
public
function
handle
(
Exception
$e
)
{
// TODO: Implement handle() method.
$response
=
$e
->
generateHttpResponse
(
new
Response
());
$error
=
[
...
...
app/Commands/Users/RegisterUser.php
View file @
4fd0c699
...
...
@@ -73,6 +73,7 @@ class RegisterUser
*/
public
function
handle
(
Dispatcher
$events
,
Censor
$censor
,
SettingsRepository
$settings
,
UserValidator
$validator
)
{
$this
->
events
=
$events
;
$password
=
Arr
::
get
(
$this
->
data
,
'password'
);
...
...
@@ -116,13 +117,13 @@ class RegisterUser
}
// 付费模式,默认注册时即到期
if
(
$settings
->
get
(
'site_mode'
)
==
'pay'
)
{
$user
->
expired_at
=
Carbon
::
now
();
}
// 审核模式,设置注册为审核状态
if
(
$settings
->
get
(
'register_validate'
)
||
$censor
->
isMod
)
{
$user
->
status
=
2
;
}
//
if ($settings->get('site_mode') == 'pay') {
//
$user->expired_at = Carbon::now();
//
}
//
// 审核模式,设置注册为审核状态
//
if ($settings->get('register_validate') || $censor->isMod) {
//
$user->status = 2;
//
}
$this
->
events
->
dispatch
(
new
Saving
(
$user
,
$this
->
actor
,
$this
->
data
)
...
...
@@ -134,7 +135,7 @@ class RegisterUser
unset
(
$attrs_to_validate
[
'password'
]);
}
unset
(
$attrs_to_validate
[
'register_reason'
]);
$validator
->
valid
(
$attrs_to_validate
);
//
$validator->valid($attrs_to_validate);
$user
->
save
();
$user
->
raise
(
new
Registered
(
$user
,
$this
->
actor
,
$this
->
data
));
...
...
app/Http/Controller/IndexController.php
View file @
4fd0c699
...
...
@@ -34,7 +34,6 @@ class IndexController implements RequestHandlerInterface
public
function
handle
(
ServerRequestInterface
$request
)
:
ResponseInterface
{
$route
=
$request
->
getUri
()
->
getPath
();
if
(
Str
::
startsWith
(
$route
,
'/admin'
))
{
$file
=
'admin.html'
;
}
else
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment