Commit 4fd0c699 by xiongyuwen

no message

parent e6ff5d37
...@@ -141,12 +141,12 @@ class LoginController extends AbstractResourceController ...@@ -141,12 +141,12 @@ class LoginController extends AbstractResourceController
{ {
$url = 'https://qyapi.weixin.qq.com/cgi-bin/user/get?access_token='. $Token .'&userid='.$useid; $url = 'https://qyapi.weixin.qq.com/cgi-bin/user/get?access_token='. $Token .'&userid='.$useid;
}else{ }else{
$url = 'https://qyapi.weixin.qq.com/cgi-bin/user/get?access_token='. $Token .'&userid='.$usersinfo['UserId']; $url = 'https://qyapi.weixin.qq.com/cgi-bin/user/get?access_token='. $Token .'&userid='.$usersinfo['UserId'];
} }
$user = $this->https_request($url); $user = $this->https_request($url);
//print_r($user);die();
//判断获取成员信息是否成功 //判断获取成员信息是否成功
if ($usersinfo['errcode'] == 0||$useid!=null) { if ($usersinfo['errcode'] == 0||$useid!=null) {
...@@ -179,7 +179,6 @@ class LoginController extends AbstractResourceController ...@@ -179,7 +179,6 @@ class LoginController extends AbstractResourceController
$attributes['register_port'] = Arr::get($request->getServerParams(), 'REMOTE_PORT', 0); $attributes['register_port'] = Arr::get($request->getServerParams(), 'REMOTE_PORT', 0);
$attributes['wechat_info'] = json_encode($user,256); $attributes['wechat_info'] = json_encode($user,256);
$attributes['department'] =$this->Get_DepNames($deptoken,$user['department']); $attributes['department'] =$this->Get_DepNames($deptoken,$user['department']);
//注册新的用户 //注册新的用户
$user_data = $this->bus->dispatch( $user_data = $this->bus->dispatch(
new RegisterUser($request->getAttribute('actor'), $attributes) new RegisterUser($request->getAttribute('actor'), $attributes)
...@@ -188,7 +187,6 @@ class LoginController extends AbstractResourceController ...@@ -188,7 +187,6 @@ class LoginController extends AbstractResourceController
$data['mobileToken'] = 'filled'; $data['mobileToken'] = 'filled';
$data['username'] = $user['name']; $data['username'] = $user['name'];
$data['password'] = $user['userid']; $data['password'] = $user['userid'];
}else{ }else{
$depsecret = 'KUd3Dhhe9Oj7d-Qz4fNWvsZqRVUXA4jCKecpd4hjEns'; $depsecret = 'KUd3Dhhe9Oj7d-Qz4fNWvsZqRVUXA4jCKecpd4hjEns';
if($state=="4k") if($state=="4k")
......
...@@ -49,7 +49,6 @@ class OAuthServerExceptionHandler implements ExceptionHandlerInterface ...@@ -49,7 +49,6 @@ class OAuthServerExceptionHandler implements ExceptionHandlerInterface
public function handle(Exception $e) public function handle(Exception $e)
{ {
// TODO: Implement handle() method. // TODO: Implement handle() method.
$response = $e->generateHttpResponse(new Response()); $response = $e->generateHttpResponse(new Response());
$error = [ $error = [
......
...@@ -73,6 +73,7 @@ class RegisterUser ...@@ -73,6 +73,7 @@ class RegisterUser
*/ */
public function handle(Dispatcher $events, Censor $censor, SettingsRepository $settings, UserValidator $validator) public function handle(Dispatcher $events, Censor $censor, SettingsRepository $settings, UserValidator $validator)
{ {
$this->events = $events; $this->events = $events;
$password = Arr::get($this->data, 'password'); $password = Arr::get($this->data, 'password');
...@@ -116,13 +117,13 @@ class RegisterUser ...@@ -116,13 +117,13 @@ class RegisterUser
} }
// 付费模式,默认注册时即到期 // 付费模式,默认注册时即到期
if ($settings->get('site_mode') == 'pay') { // if ($settings->get('site_mode') == 'pay') {
$user->expired_at = Carbon::now(); // $user->expired_at = Carbon::now();
} // }
// 审核模式,设置注册为审核状态 // // 审核模式,设置注册为审核状态
if ($settings->get('register_validate') || $censor->isMod) { // if ($settings->get('register_validate') || $censor->isMod) {
$user->status = 2; // $user->status = 2;
} // }
$this->events->dispatch( $this->events->dispatch(
new Saving($user, $this->actor, $this->data) new Saving($user, $this->actor, $this->data)
...@@ -134,7 +135,7 @@ class RegisterUser ...@@ -134,7 +135,7 @@ class RegisterUser
unset($attrs_to_validate['password']); unset($attrs_to_validate['password']);
} }
unset($attrs_to_validate['register_reason']); unset($attrs_to_validate['register_reason']);
$validator->valid($attrs_to_validate); //$validator->valid($attrs_to_validate);
$user->save(); $user->save();
$user->raise(new Registered($user, $this->actor, $this->data)); $user->raise(new Registered($user, $this->actor, $this->data));
......
...@@ -34,7 +34,6 @@ class IndexController implements RequestHandlerInterface ...@@ -34,7 +34,6 @@ class IndexController implements RequestHandlerInterface
public function handle(ServerRequestInterface $request): ResponseInterface public function handle(ServerRequestInterface $request): ResponseInterface
{ {
$route = $request->getUri()->getPath(); $route = $request->getUri()->getPath();
if (Str::startsWith($route, '/admin')) { if (Str::startsWith($route, '/admin')) {
$file = 'admin.html'; $file = 'admin.html';
} else { } 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