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

fix: 同步更新常用插件代码

Browse Source
This commit is contained in:
邹景立 2024-08-08 23:36:47 +08:00
parent ff08376d9a
commit 327cffbe64
25 changed files with 56 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/wechat/controller/Config.php
View File

@ -14,6 +14,8 @@
// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat
// +----------------------------------------------------------------------
declare (strict_types=1);
namespace app\wechat\controller;
use app\wechat\service\WechatService;
@ -42,7 +44,7 @@ class Config extends Controller
try {
// 生成微信授权链接
$source = enbase64url(sysuri('admin/index/index', [], false, true) . '#' . $this->request->url());
$authurl = sysconf('wechat.service_authurl|raw') ?: "https://open.cuci.cc/service/api.push/auth?source=SOURCE";
$authurl = sysconf('wechat.service_authurl|raw') ?: "https://open.cuci.cc/plugin-wechat-service/api.push/auth?source=SOURCE";
$this->authurl = str_replace('source=SOURCE', "source={$source}", $authurl);
// 授权成功后的参数保存
if (input('?appid') && input('?appkey')) {
@ -93,8 +95,8 @@ class Config extends Controller
public function options_jsonrpc()
{
if ($this->request->isGet()) {
$authUrl = sysconf('wechat.service_authurl|raw') ?: "https://open.cuci.cc/service/api.push/auth?source=SOURCE";
$jsonRpc = sysconf('wechat.service_jsonrpc|raw') ?: 'https://open.cuci.cc/service/api.client/jsonrpc?token=TOKEN&not_init_session=1';
$authUrl = sysconf('wechat.service_authurl|raw') ?: "https://open.cuci.cc/plugin-wechat-service/api.push/auth?source=SOURCE";
$jsonRpc = sysconf('wechat.service_jsonrpc|raw') ?: 'https://open.cuci.cc/plugin-wechat-service/api.client/jsonrpc?token=TOKEN';
Builder::mk()
->addTextInput('auth_url', '公众号授权跳转入口', 'Getway', true, '进行微信授权时会跳转到这个页面，由微信管理员扫二维码进行授权。', '^https?://.*?auth.*?source=SOURCE')
->addTextInput('json_rpc', '第三方服务平台接口', 'JsonRpc', true, '由应用插件 <a target="_blank" href="https://thinkadmin.top/plugin/think-plugs-wechat-service.html">ThinkPlugsWechatService</a> 提供的第三方服务平台 JSON-RPC 接口地址。', '^https?://.*?jsonrpc.*?token=TOKEN')

2
app/wechat/controller/Fans.php
View File

@ -14,6 +14,8 @@
// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat
// +----------------------------------------------------------------------
declare (strict_types=1);
namespace app\wechat\controller;
use app\wechat\model\WechatFans;

2
app/wechat/controller/Keys.php
View File

@ -14,6 +14,8 @@
// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat
// +----------------------------------------------------------------------
declare (strict_types=1);
namespace app\wechat\controller;
use app\wechat\model\WechatKeys;

2
app/wechat/controller/Menu.php
View File

@ -14,6 +14,8 @@
// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat
// +----------------------------------------------------------------------
declare (strict_types=1);
namespace app\wechat\controller;
use app\wechat\service\WechatService;

2
app/wechat/controller/News.php
View File

@ -14,6 +14,8 @@
// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat
// +----------------------------------------------------------------------
declare (strict_types=1);
namespace app\wechat\controller;
use app\wechat\model\WechatNews;

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

@ -14,6 +14,8 @@
// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat
// +----------------------------------------------------------------------
declare (strict_types=1);
namespace app\wechat\controller\api;
use app\wechat\service\WechatService;

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

@ -14,6 +14,8 @@
// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat
// +----------------------------------------------------------------------
declare (strict_types=1);
namespace app\wechat\controller\api;
use app\wechat\service\LoginService;

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

@ -13,6 +13,8 @@
// | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-wechat
// +----------------------------------------------------------------------
declare (strict_types=1);
namespace app\wechat\controller\api;
use app\wechat\service\FansService;

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

@ -14,6 +14,8 @@
// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat
// +----------------------------------------------------------------------
declare (strict_types=1);
namespace app\wechat\controller\api;
use app\wechat\service\MediaService;

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

@ -14,6 +14,8 @@
// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat
// +----------------------------------------------------------------------
declare (strict_types=1);
namespace app\wechat\controller\api;
use app\wechat\model\WechatNewsArticle;

2
app/wechat/lang/en-us.php
View File

@ -14,6 +14,8 @@
// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat
// +----------------------------------------------------------------------
declare (strict_types=1);
$extra = [];
$extra['请选择微信对接方式，其中微信开放平台授权模式需要微信开放平台支持，还需要搭建第三方服务平台托管系统！'] = 'Please select WeChat docking mode, of which WeChat Open platform authorization mode needs WeChat Open platform support, and a third-party service platform hosting system needs to be built!';
$extra['使用微信开放平台授权模式时，微信将授权给第三方服务平台托管系统，消息数据使用 %s 通信协议转发。'] = 'When using WeChat Open platform authorization mode, WeChat will authorize the third-party service platform hosting system, and the message data will be forwarded using %s communication protocol.';

2
app/wechat/model/WechatAuto.php
View File

@ -14,6 +14,8 @@
// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat
// +----------------------------------------------------------------------
declare (strict_types=1);
namespace app\wechat\model;
use think\admin\Model;

2
app/wechat/model/WechatFans.php
View File

@ -14,6 +14,8 @@
// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat
// +----------------------------------------------------------------------
declare (strict_types=1);
namespace app\wechat\model;
use think\admin\Model;

2
app/wechat/model/WechatFansTags.php
View File

@ -14,6 +14,8 @@
// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat
// +----------------------------------------------------------------------
declare (strict_types=1);
namespace app\wechat\model;
use think\admin\Model;

2
app/wechat/model/WechatKeys.php
View File

@ -14,6 +14,8 @@
// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat
// +----------------------------------------------------------------------
declare (strict_types=1);
namespace app\wechat\model;
use think\admin\Model;

2
app/wechat/model/WechatMedia.php
View File

@ -14,6 +14,8 @@
// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat
// +----------------------------------------------------------------------
declare (strict_types=1);
namespace app\wechat\model;
use think\admin\Model;

2
app/wechat/model/WechatNews.php
View File

@ -14,6 +14,8 @@
// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat
// +----------------------------------------------------------------------
declare (strict_types=1);
namespace app\wechat\model;
use think\admin\Model;

2
app/wechat/model/WechatNewsArticle.php
View File

@ -14,6 +14,8 @@
// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat
// +----------------------------------------------------------------------
declare (strict_types=1);
namespace app\wechat\model;
use think\admin\Model;

6
app/wechat/model/WechatPaymentRecord.php
View File

@ -14,6 +14,8 @@
// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat
// +----------------------------------------------------------------------
declare (strict_types=1);
namespace app\wechat\model;
use app\wechat\service\PaymentService;
@ -78,6 +80,10 @@ class WechatPaymentRecord extends Model
return $value ? format_datetime($value) : '';
}
/**
* 转换数据类型
* @return array
*/
public function toArray(): array
{
$data = parent::toArray();

2
app/wechat/model/WechatPaymentRefund.php
View File

@ -14,6 +14,8 @@
// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat
// +----------------------------------------------------------------------
declare (strict_types=1);
namespace app\wechat\model;
use think\admin\Model;

2
app/wechat/service/AutoService.php
View File

@ -14,6 +14,8 @@
// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat
// +----------------------------------------------------------------------
declare (strict_types=1);
namespace app\wechat\service;
use app\wechat\model\WechatAuto;

2
app/wechat/service/FansService.php
View File

@ -14,6 +14,8 @@
// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat
// +----------------------------------------------------------------------
declare (strict_types=1);
namespace app\wechat\service;
use app\wechat\model\WechatFans;

2
app/wechat/service/LoginService.php
View File

@ -14,6 +14,8 @@
// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat
// +----------------------------------------------------------------------
declare (strict_types=1);
namespace app\wechat\service;
use think\admin\Library;

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

@ -14,6 +14,8 @@
// | github 代码仓库：https://github.com/zoujingli/think-plugs-wechat
// +----------------------------------------------------------------------
declare (strict_types=1);
namespace app\wechat\service;
use app\wechat\model\WechatMedia;

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

@ -129,7 +129,7 @@ class WechatService extends Service
$data['sign'] = md5("{$data['class']}#{$appid}#{$appkey}#{$data['time']}#{$data['nostr']}");
// 创建远程连接，默认使用 JSON-RPC 方式调用接口
$token = enbase64url(json_encode($data, JSON_UNESCAPED_UNICODE));
$jsonrpc = sysconf('wechat.service_jsonrpc|raw') ?: 'https://open.cuci.cc/service/api.client/jsonrpc?not_init_session=1&token=TOKEN';
$jsonrpc = sysconf('wechat.service_jsonrpc|raw') ?: 'https://open.cuci.cc/plugin-wechat-service/api.client/jsonrpc?token=TOKEN';
return new JsonRpcClient(str_replace('token=TOKEN', "token={$token}", $jsonrpc));
}
}