Commit 4fd0c699 by xiongyuwen

no message

parent e6ff5d37
......@@ -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")
......
......@@ -49,7 +49,6 @@ class OAuthServerExceptionHandler implements ExceptionHandlerInterface
public function handle(Exception $e)
{
// TODO: Implement handle() method.
$response = $e->generateHttpResponse(new Response());
$error = [
......
......@@ -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));
......
......@@ -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 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment