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

同步插件代码

Browse Source
This commit is contained in:
邹景立 2023-04-02 15:04:57 +08:00
parent 79c2b7c494
commit 06679ba6f5
29 changed files with 76 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/index/controller/Index.php
View File

@ -3,7 +3,7 @@
// +----------------------------------------------------------------------
// | Static Plugin for ThinkAdmin
// +----------------------------------------------------------------------
// | 版权所有 2014~2023 Anyon <zoujingli@qq.com>
// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
// +----------------------------------------------------------------------
// | 官方网站: https://thinkadmin.top
// +----------------------------------------------------------------------
@ -17,12 +17,11 @@
namespace app\index\controller;
use think\admin\Controller;
use think\admin\extend\ToolsExtend;
class Index extends Controller
{
public function index()
{
ToolsExtend::removeEmptyDirectory(syspath('database'), true);
$this->redirect(sysuri('admin/login/index'));
}
}

2
app/wechat/Service.php
View File

@ -23,7 +23,7 @@ use think\admin\Plugin;
/**
* 组件注册服务
* Class Service
* @class Service
* @package app\wechat
*/
class Service extends Plugin

2
app/wechat/command/Auto.php
View File

@ -26,7 +26,7 @@ use think\console\Output;
/**
* 向指定用户推送消息
* Class Auto
* @class Auto
* @package app\wechat\command
*/
class Auto extends Command

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

@ -24,7 +24,7 @@ use think\admin\Command;
/**
* 微信粉丝管理指令
* Class Fans
* @class Fans
* @package app\wechat\command
*/
class Fans extends Command
@ -60,9 +60,6 @@ class Fans extends Command
* @throws \WeChat\Exceptions\InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
* @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
protected function _list(string $next = '', int $done = 0): string
{
@ -132,9 +129,6 @@ class Fans extends Command
* @throws \WeChat\Exceptions\InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
* @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
public function _tags(int $done = 0): string
{

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

@ -24,7 +24,7 @@ use think\admin\service\SystemService;
/**
* 关注自动回复
* Class Auto
* @class Auto
* @package app\wechat\controller
*/
class Auto extends Controller

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

@ -23,7 +23,7 @@ use think\admin\storage\LocalStorage;
/**
* 微信授权绑定
* Class Config
* @class Config
* @package app\wechat\controller
*/
class Config extends Controller
@ -32,9 +32,7 @@ class Config extends Controller
* 微信授权配置
* @auth true
* @menu true
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\admin\Exception
*/
public function options()
{
@ -90,10 +88,7 @@ class Config extends Controller
/**
* 微信第三方平台接口配置
* @auth true
* @return void
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\admin\Exception
*/
public function options_jsonrpc()
{
@ -121,9 +116,6 @@ class Config extends Controller
* @auth true
* @menu true
* @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
public function payment()
{
@ -155,9 +147,6 @@ class Config extends Controller
* 微信支付修改
* @auth true
* @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
public function payment_save()
{

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

@ -25,7 +25,7 @@ use think\exception\HttpResponseException;
/**
* 微信用户管理
* Class Fans
* @class Fans
* @package app\wechat\controller
*/
class Fans extends Controller

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

@ -25,7 +25,7 @@ use think\exception\HttpResponseException;
/**
* 回复规则管理
* Class Keys
* @class Keys
* @package app\wechat\controller
*/
class Keys extends Controller

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

@ -22,7 +22,7 @@ use think\exception\HttpResponseException;
/**
* 微信菜单管理
* Class Menu
* @class Menu
* @package app\wechat\controller
*/
class Menu extends Controller
@ -54,6 +54,7 @@ class Menu extends Controller
* 微信菜单管理
* @auth true
* @menu true
* @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException

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

@ -25,7 +25,7 @@ use think\admin\service\AdminService;
/**
* 微信图文管理
* Class News
* @class News
* @package app\wechat\controller
*/
class News extends Controller

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

@ -22,7 +22,7 @@ use think\Response;
/**
* 前端JS获取控制器
* Class Js
* @class Js
* @package app\wechat\controller\api
*/
class Js extends Controller
@ -42,9 +42,6 @@ class Js extends Controller
* @throws \WeChat\Exceptions\InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
* @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
public function index(): Response
{
@ -71,9 +68,6 @@ class Js extends Controller
* @throws \WeChat\Exceptions\InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
* @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
public function sdk()
{

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

@ -21,7 +21,7 @@ use think\admin\Controller;
/**
* 微信扫码登录
* Class Login
* @class Login
* @package app\wechat\controller\api
*/
class Login extends Controller
@ -42,9 +42,6 @@ class Login extends Controller
* @throws \WeChat\Exceptions\InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
* @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
public function oauth()
{

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

@ -22,7 +22,7 @@ use think\admin\Controller;
/**
* 微信消息推送处理
* Class Push
* @class Push
* @package app\wechat\controller\api
*/
class Push extends Controller
@ -78,9 +78,9 @@ class Push extends Controller
/**
* 获取网络出口IP
* @return mixed
* @return string
*/
public function geoip()
public function geoip(): string
{
return $this->request->ip();
}

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

@ -25,7 +25,7 @@ use WeChat\Contracts\Tools;
/**
* 微信测试工具
* Class Test
* @class Test
* @package app\wechat\controller\api
*/
class Test extends Controller
@ -94,9 +94,6 @@ class Test extends Controller
* @throws \WeChat\Exceptions\InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
* @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
public function oauth()
{
@ -110,9 +107,6 @@ class Test extends Controller
* @throws \WeChat\Exceptions\InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
* @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
public function jssdk()
{
@ -163,12 +157,9 @@ class Test extends Controller
/**
* 微信JSAPI支付测试
* @return string
* @throws \WeChat\Exceptions\InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
* @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
* @throws \WeChat\Exceptions\InvalidResponseException
*/
public function jsapi(): string
{

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

@ -22,7 +22,7 @@ use think\admin\Controller;
/**
* 微信图文显示
* Class View
* @class View
* @package app\wechat\controller\api
*/
class View extends Controller

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

@ -20,7 +20,7 @@ use think\admin\Model;
/**
* 微信自动回复模型
* Class WechatAuto
* @class WechatAuto
* @package app\wechat\model
*/
class WechatAuto extends Model

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

@ -20,7 +20,7 @@ use think\admin\Model;
/**
* 微信粉丝用户模型
* Class WechatFans
* @class WechatFans
* @package app\wechat\model
*/
class WechatFans extends Model

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

@ -20,7 +20,7 @@ use think\admin\Model;
/**
* 微信粉丝标签模型
* Class WechatFansTags
* @class WechatFansTags
* @package app\wechat\model
*/
class WechatFansTags extends Model

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

@ -20,7 +20,7 @@ use think\admin\Model;
/**
* 微信回复关键词模型
* Class WechatKeys
* @class WechatKeys
* @package app\wechat\model
*/
class WechatKeys extends Model

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

@ -20,7 +20,7 @@ use think\admin\Model;
/**
* 微信媒体文件模型
* Class WechatMedia
* @class WechatMedia
* @package app\wechat\model
*/
class WechatMedia extends Model

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

@ -20,7 +20,7 @@ use think\admin\Model;
/**
* 微信图文主模型
* Class WechatNews
* @class WechatNews
* @package app\wechat\model
*/
class WechatNews extends Model

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

@ -20,7 +20,7 @@ use think\admin\Model;
/**
* 微信图文详细模型
* Class WechatNewsArticle
* @class WechatNewsArticle
* @package app\wechat\model
*/
class WechatNewsArticle extends Model

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

@ -22,7 +22,7 @@ use think\admin\service\QueueService;
/**
* 关注自动回复服务
* Class AutoService
* @class AutoService
* @package app\wechat\service
*/
class AutoService extends Service
@ -31,9 +31,6 @@ class AutoService extends Service
* 注册微信用户推送任务
* @param string $openid
* @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
public static function register(string $openid)
{

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

@ -22,7 +22,7 @@ use think\admin\Service;
/**
* 微信粉丝信息
* Class FansService
* @class FansService
* @package app\wechat\service
*/
class FansService extends Service

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

@ -51,12 +51,13 @@ class LoginService
* 生成授权二维码
* @param string $code 请求编号
* @param integer $mode 授权模式
* @param boolean|string $domain
* @return array
*/
public static function qrcode(string $code, int $mode = 0): array
public static function qrcode(string $code, int $mode = 0, $domain = true): array
{
$data = ['auth' => self::gauth($code), 'mode' => $mode];
$image = MediaService::getQrcode(sysuri('wechat/api.login/oauth', $data, false, true));
$image = MediaService::getQrcode(sysuri('wechat/api.login/oauth', $data, false, $domain));
return ['code' => $code, 'auth' => $data['auth'], 'image' => $image->getDataUri()];
}
@ -68,9 +69,6 @@ class LoginService
* @throws \WeChat\Exceptions\InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
* @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
public static function oauth(string $auth = '', int $mode = 0): bool
{

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

@ -31,7 +31,7 @@ use WeChat\Contracts\MyCurlFile;
/**
* 微信素材管理
* Class MediaService
* @class MediaService
* @package app\wechat\service
*/
class MediaService extends Service
@ -73,9 +73,6 @@ class MediaService extends Service
* @throws \WeChat\Exceptions\InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
* @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
public static function upload(string $url, string $type = 'image', array $video = []): string
{

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

@ -24,7 +24,8 @@ use think\admin\storage\LocalStorage;
use think\exception\HttpResponseException;
/**
* Class WechatService
* 微信接口调度服务
* @class WechatService
* @package app\wechat\serivce
*
* @method \WeChat\Card WeChatCard() static 微信卡券管理
@ -77,6 +78,10 @@ use think\exception\HttpResponseException;
* @method \WePay\Transfers WePayTransfers() static 微信商户打款到零钱
* @method \WePay\TransfersBank WePayTransfersBank() static 微信商户打款到银行卡
*
* ----- WePayV3 -----
* @method \WePayV3\Transfers WePayV3Transfers() static 微信商家转账到零钱
* @method \WePayV3\ProfitSharing WePayV3ProfitSharing() static 微信商户分账
*
* ----- WeOpen -----
* @method \WeOpen\Login WeOpenLogin() static 第三方微信登录
* @method \WeOpen\Service WeOpenService() static 第三方服务
@ -93,9 +98,6 @@ class WechatService extends Service
* @param array $arguments
* @return mixed
* @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
public static function __callStatic(string $name, array $arguments)
{
@ -127,7 +129,7 @@ class WechatService extends Service
*/
private static function parseName(string $name): array
{
foreach (['WeChat', 'WeMini', 'WeOpen', 'WePay', 'ThinkService'] as $type) {
foreach (['WeChat', 'WeMini', 'WeOpen', 'WePayV3', 'WePay', 'ThinkService'] as $type) {
if (strpos($name, $type) === 0) {
[, $base] = explode($type, $name);
return [$type, $base, "\\{$type}\\{$base}"];
@ -140,9 +142,6 @@ class WechatService extends Service
* 获取当前微信APPID
* @return string
* @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
public static function getAppid(): string
{
@ -157,9 +156,6 @@ class WechatService extends Service
* 获取接口授权模式
* @return string
* @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
public static function getType(): string
{
@ -172,9 +168,6 @@ class WechatService extends Service
* 获取公众号配置参数
* @return array
* @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
public static function getConfig(): array
{
@ -185,6 +178,7 @@ class WechatService extends Service
'encodingaeskey' => sysconf('wechat.encodingaeskey'),
'mch_id' => sysconf('wechat.mch_id'),
'mch_key' => sysconf('wechat.mch_key'),
'mch_v3_key' => sysconf('wechat.mch_v3_key'),
'cache_path' => syspath('runtime/wechat'),
];
$local = LocalStorage::instance();
@ -193,8 +187,10 @@ class WechatService extends Service
$options['ssl_p12'] = $local->path(sysconf('wechat.mch_ssl_p12'), true);
break;
case 'pem':
$options['ssl_key'] = $local->path(sysconf('wechat.mch_ssl_key'), true);
$options['ssl_cer'] = $local->path(sysconf('wechat.mch_ssl_cer'), true);
$options['ssl_key'] = $local->path(sysconf('wechat.mch_ssl_key'), true);
$options['cert_public'] = $local->path(sysconf('wechat.mch_ssl_cer'), true);
$options['cert_private'] = $local->path(sysconf('wechat.mch_ssl_key'), true);
break;
}
return $options;
@ -209,9 +205,6 @@ class WechatService extends Service
* @throws \WeChat\Exceptions\InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
* @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
public static function getWebOauthInfo(string $source, int $isfull = 0, bool $redirect = true): array
{
@ -275,9 +268,6 @@ class WechatService extends Service
* @throws \WeChat\Exceptions\InvalidResponseException
* @throws \WeChat\Exceptions\LocalCacheException
* @throws \think\admin\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
public static function getWebJssdkSign(?string $location = null): array
{
@ -288,4 +278,4 @@ class WechatService extends Service
return static::ThinkServiceConfig()->jsSign($location);
}
}
}
}

8
app/wechat/view/config/payment.html
View File

@ -34,6 +34,14 @@
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label"><b>MCH_V3_KEY</b><br><span class="nowrap color-desc">微信商户V3密钥</span></label>
<div class="layui-input-block">
<input name="wechat.mch_v3_key" vali-name="微信商户V3密钥" placeholder="请输入微信商户V3密钥（必填）" maxlength="32" pattern=".{32}" required value="{:sysconf('wechat.mch_v3_key')}" class="layui-input">
<p class="help-block">微信商户密钥，需要在微信商户平台操作设置操作密码并获取商户接口密钥</p>
</div>
</div>
<div class="hr-line-dashed"></div>
<div class="layui-form-item">

39
app/wechat/view/menu/index.html
View File

@ -8,13 +8,13 @@
<ul class='mobile-footer notselect'>
<li class="parent-menu" style="{{getItemStyle(list)}}" ng-repeat="one in list">
<a ng-click="setActiveItem(one)" ng-class="{true:'active'}[one.active]">
<i class="icon-sub" ng-if="one.sub_button.length>0"></i> <span ng-bind="one.name"></span>
<i class="icon-sub" ng-if="one.sub_button.length>0"></i> <span ng-bind="one.name||'-'"></span>
</a>
<i class="close layui-bg-gray layui-icon" ng-click="delItem(one)">&#x1006;</i>
<div class="sub-menu text-center" ng-if="one.active||one.show">
<ul>
<li ng-repeat="two in one.sub_button">
<a class="bottom-border" ng-click="setActiveItem(one,two)" ng-class="{true:'active'}[two.active]"><span ng-bind="two.name"></span></a>
<a class="bottom-border" ng-click="setActiveItem(one,two)" ng-class="{true:'active'}[two.active]"><span ng-bind="two.name||'-'"></span></a>
<i class="close layui-bg-gray layui-icon" ng-click="delItem(one,two)">&#x1006;</i>
</li>
<li class="menu-add" ng-if="one.sub_button.length<5"><a ng-click="addItem(one.sub_button)"><i class="icon-add"></i></a></li>
@ -152,16 +152,16 @@
if (one.sub_button[i].active) _two = one.sub_button[i];
}
one.sub_button = tmp;
return $rootScope.setActiveItem(one, _two);
return $rootScope.setActiveItem(one, _two, true);
}
for (var i in $rootScope.list) if (one !== $rootScope.list[i]) tmp.push($rootScope.list[i]);
$rootScope.list = tmp;
if ($rootScope.list.length > 1) $rootScope.setActiveItem($rootScope.list[0])
if ($rootScope.list.length > 1) $rootScope.setActiveItem($rootScope.list[0], null, false)
};
// 切换选择菜单
$rootScope.setActiveItem = function (one, two) {
if (!vali.checkAllInput()) return;
$rootScope.setActiveItem = function (one, two, force) {
if (!force && !vali.checkAllInput()) return;
$rootScope.list.forEach(function (item) {
item.show = item === one;
item.active = two ? false : (item === one)
@ -171,30 +171,33 @@
});
$rootScope.item = two || one || {};
$rootScope.item.type = $rootScope.item.type || 'click';
if ($rootScope.item.type === 'click') setTimeout(function () {
layui.form.render('select'), ($rootScope.item.key = $('[lay-filter="key"]').val());
}, 50);
$rootScope.item.type === 'click' && syncActiveItem();
};
// 下拉列表处理
// 列表处理
$rootScope.$watch('item', function () {
if ($rootScope.item.type === 'click') setTimeout(function () {
layui.form.render('select'), ($rootScope.item.key = $('[lay-filter="key"]').val());
}, 50)
$rootScope.item.type === 'click' && syncActiveItem();
}, true);
layui.form.on('select(key)', function (data) {
$rootScope.item.key = data.value;
});
// 提交数据
$rootScope.submit = function () {
if (!vali.checkAllInput()) return false;
$.form.load('{:url("push")}', {data: angular.toJson($rootScope.list)}, 'post');
}
// 同步选择项值
function syncActiveItem() {
setTimeout(function () {
layui.form.render('select');
$rootScope.item.key = $('[lay-filter="key"]').val();
}, 50);
}
layui.form.on('select(key)', function (data) {
$rootScope.item.key = data.value;
});
}
});
});
</script>
{/block}