blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2025-04-06 03:58:04 +08:00
Code Issues Projects Releases Wiki Activity

微信代码调整

Browse Source
This commit is contained in:
Anyon 2020-12-12 14:20:41 +08:00
parent 2322341602
commit 0c340143ca
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/wechat/command/Fans.php
View File

@ -72,7 +72,7 @@ class Fans extends Command
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
protected function _list(string $next = '', int $done = 0)
protected function _list(string $next = '', int $done = 0): string
{
$appid = WechatService::instance()->getAppid();
$this->output->comment('开始获取微信用户数据');
@ -112,7 +112,7 @@ class Fans extends Command
* @throws \WeChat\Exceptions\LocalCacheException
* @throws \think\db\exception\DbException
*/
public function _black(string $next = '', int $done = 0)
public function _black(string $next = '', int $done = 0): string
{
$wechat = WechatService::WeChatUser();
$this->output->comment('开始更新黑名单的微信用户');
@ -148,7 +148,7 @@ class Fans extends Command
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
public function _tags(int $done = 0)
public function _tags(int $done = 0): string
{
$appid = WechatService::instance()->getAppid();
$this->output->comment('开始获取微信用户标签数据');

2
app/wechat/controller/api/Js.php
View File

@ -79,7 +79,7 @@ class Js extends Controller
* 生成授权内容
* @return string
*/
private function _buildContent()
private function _buildContent(): string
{
return <<<EOF
if(typeof wx === 'object'){

6
app/wechat/service/MediaService.php
View File

@ -29,16 +29,16 @@ class MediaService extends Service
/**
* 通过图文ID读取图文信息
* @param mixed $id 本地图文ID
* @param array $where 额外的查询条件
* @param array $map 额外的查询条件
* @return array
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
public function news($id, $where = []): array
public function news($id, $map = []): array
{
// 文章主体数据
$data = $this->app->db->name('WechatNews')->where(['id' => $id])->where($where)->find();
$data = $this->app->db->name('WechatNews')->where(['id' => $id])->where($map)->find();
if (empty($data)) return [];
[$data['articles'], $articleIds] = [[], explode(',', $data['article_id'])];
if (empty($data['article_id']) || empty($articleIds)) return $data;

12
app/wechat/service/WechatService.php
View File

@ -122,7 +122,9 @@ class WechatService extends Service
} catch (\Exception $exception) {
$exception = null;
}
if ($exception instanceof \Exception) throw $exception;
if ($exception instanceof \Exception) {
throw $exception;
}
return $client;
}
}
@ -145,13 +147,13 @@ class WechatService extends Service
/**
* 获取当前微信APPID
* @return bool|string
* @return string
* @throws \think\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
public function getAppid()
public function getAppid(): string
{
if ($this->getType() === 'api') {
return sysconf('wechat.appid');
@ -187,8 +189,8 @@ class WechatService extends Service
public function getConfig(): array
{
$options = [
'token' => sysconf('wechat.token'),
'appid' => $this->getAppid(),
'token' => sysconf('wechat.token'),
'appsecret' => sysconf('wechat.appsecret'),
'encodingaeskey' => sysconf('wechat.encodingaeskey'),
'mch_id' => sysconf('wechat.mch_id'),
@ -268,7 +270,7 @@ class WechatService extends Service
}
/**
* 获取微信网页JSSDK
* 获取微信网页JSSDK签名参数
* @param null|string $location 签名地址
* @return array
* @throws \WeChat\Exceptions\InvalidResponseException