Commit 8f705622 by xiongyuwen

no message

parent 7abe9d78
...@@ -119,6 +119,7 @@ class ListPostsController extends AbstractListController ...@@ -119,6 +119,7 @@ class ListPostsController extends AbstractListController
*/ */
public function __construct(PostRepository $posts, UrlGenerator $url) public function __construct(PostRepository $posts, UrlGenerator $url)
{ {
$this->posts = $posts; $this->posts = $posts;
$this->url = $url; $this->url = $url;
$this->tablePrefix = config('database.connections.mysql.prefix'); $this->tablePrefix = config('database.connections.mysql.prefix');
...@@ -132,6 +133,8 @@ class ListPostsController extends AbstractListController ...@@ -132,6 +133,8 @@ class ListPostsController extends AbstractListController
*/ */
protected function data(ServerRequestInterface $request, Document $document) protected function data(ServerRequestInterface $request, Document $document)
{ {
$actor = $request->getAttribute('actor'); $actor = $request->getAttribute('actor');
$params = $request->getQueryParams(); $params = $request->getQueryParams();
$filter = $this->extractFilter($request); $filter = $this->extractFilter($request);
...@@ -139,8 +142,10 @@ class ListPostsController extends AbstractListController ...@@ -139,8 +142,10 @@ class ListPostsController extends AbstractListController
//设置评论列表第一页缓存 //设置评论列表第一页缓存
list($cacheKey, $posts) = $this->getCache($params,$filter, $document); list($cacheKey, $posts) = $this->getCache($params,$filter, $document);
if ($posts) { if ($posts) {
return $posts; return $posts;
} }
$limit = $this->extractLimit($request); $limit = $this->extractLimit($request);
$offset = $this->extractOffset($request); $offset = $this->extractOffset($request);
$include = $this->extractInclude($request); $include = $this->extractInclude($request);
...@@ -186,6 +191,7 @@ class ListPostsController extends AbstractListController ...@@ -186,6 +191,7 @@ class ListPostsController extends AbstractListController
$this->postCache->setPosts($posts); $this->postCache->setPosts($posts);
$this->cache->put($cacheKey, serialize( $this->postCache), 5*60); $this->cache->put($cacheKey, serialize( $this->postCache), 5*60);
} }
return $posts; return $posts;
} }
......
...@@ -95,14 +95,19 @@ class LoginController extends AbstractResourceController ...@@ -95,14 +95,19 @@ class LoginController extends AbstractResourceController
protected function data(ServerRequestInterface $request, Document $document) protected function data(ServerRequestInterface $request, Document $document)
{ {
$data = Arr::get($request->getParsedBody(), 'data.attributes', []); $data = Arr::get($request->getParsedBody(), 'data.attributes', []);
$state = $_GET['state'];
$name=$data['username']; $name=$data['username'];
$isExitsUser=false; $isExitsUser=false;
if($name!="admin")//管理员 if($name!="admin")//管理员
{ {
$appid = 'ww833808f6b8dc0745'; $appid = 'ww833808f6b8dc0745';
$secret = 'lpy1DpI0oaZvtNMHCJnRtalA1Xdgicv8iNhfos0lzWs'; $secret = 'lpy1DpI0oaZvtNMHCJnRtalA1Xdgicv8iNhfos0lzWs';
if($state=="4k")
{
$appid = 'ww4e7dd5ae312eb101';
$secret= 'zFapHiE52HEMarYNxKBcuWG2rGBThvPvC1kzyWW03Wk';
}
$url = 'https://qyapi.weixin.qq.com/cgi-bin/gettoken?corpid='.$appid.'&corpsecret='.$secret; $url = 'https://qyapi.weixin.qq.com/cgi-bin/gettoken?corpid='.$appid.'&corpsecret='.$secret;
$token = $this->https_request($url); $token = $this->https_request($url);
...@@ -110,6 +115,7 @@ class LoginController extends AbstractResourceController ...@@ -110,6 +115,7 @@ class LoginController extends AbstractResourceController
$Token = $token['access_token']; $Token = $token['access_token'];
$useid=$_GET['useid']; $useid=$_GET['useid'];
//$usersinfo['UserId'] = 'xiongyuwen'; //$usersinfo['UserId'] = 'xiongyuwen';
if($useid!=null)//判斷是否存在对应得用户信息,如果存在则直接返回 if($useid!=null)//判斷是否存在对应得用户信息,如果存在则直接返回
{ {
...@@ -148,11 +154,16 @@ class LoginController extends AbstractResourceController ...@@ -148,11 +154,16 @@ class LoginController extends AbstractResourceController
$param['userid'] = $user['userid']; $param['userid'] = $user['userid'];
$info = User::where($param)->first(); $info = User::where($param)->first();
if(empty($info)){ if(empty($info)){
//获取部门 //获取部门
//获取部门token //获取部门token
$depsecret = 'KUd3Dhhe9Oj7d-Qz4fNWvsZqRVUXA4jCKecpd4hjEns'; $depsecret = 'KUd3Dhhe9Oj7d-Qz4fNWvsZqRVUXA4jCKecpd4hjEns';
if($state=="4k")
{
$depsecret="zFapHiE52HEMarYNxKBcuWG2rGBThvPvC1kzyWW03Wk";
}
$depurl = 'https://qyapi.weixin.qq.com/cgi-bin/gettoken?corpid='.$appid.'&corpsecret='.$depsecret; $depurl = 'https://qyapi.weixin.qq.com/cgi-bin/gettoken?corpid='.$appid.'&corpsecret='.$depsecret;
$deptokenRes = $this->https_request($depurl); $deptokenRes = $this->https_request($depurl);
$deptoken = $deptokenRes['access_token']; $deptoken = $deptokenRes['access_token'];
...@@ -168,6 +179,7 @@ class LoginController extends AbstractResourceController ...@@ -168,6 +179,7 @@ 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)
...@@ -179,6 +191,10 @@ class LoginController extends AbstractResourceController ...@@ -179,6 +191,10 @@ class LoginController extends AbstractResourceController
}else{ }else{
$depsecret = 'KUd3Dhhe9Oj7d-Qz4fNWvsZqRVUXA4jCKecpd4hjEns'; $depsecret = 'KUd3Dhhe9Oj7d-Qz4fNWvsZqRVUXA4jCKecpd4hjEns';
if($state=="4k")
{
$depsecret="zFapHiE52HEMarYNxKBcuWG2rGBThvPvC1kzyWW03Wk";
}
$depurl = 'https://qyapi.weixin.qq.com/cgi-bin/gettoken?corpid='.$appid.'&corpsecret='.$depsecret; $depurl = 'https://qyapi.weixin.qq.com/cgi-bin/gettoken?corpid='.$appid.'&corpsecret='.$depsecret;
$deptokenRes = $this->https_request($depurl); $deptokenRes = $this->https_request($depurl);
$deptoken = $deptokenRes['access_token']; $deptoken = $deptokenRes['access_token'];
...@@ -189,7 +205,6 @@ class LoginController extends AbstractResourceController ...@@ -189,7 +205,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'];
} }
......
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