优化服务，改为静态方法

app/data/controller/api/auth/News.php

@@ -27,7 +27,7 @@ class News extends Auth
             'reply.require' => '评论不能为空！',
         ]);
         if (DataNewsXCollect::mk()->insert($data) !== false) {
-            NewsService::instance()->syncNewsTotal($data['code']);
+            NewsService::syncNewsTotal($data['code']);
             $this->success('添加评论成功！');
         } else {
             $this->error('添加评论失败！');
@@ -44,7 +44,7 @@ class News extends Auth
     {
         $query = DataNewsXCollect::mQuery()->where(['uuid' => $this->uuid, 'type' => 4]);
         $result = $query->whereIn('status', [1, 2])->order('id desc')->page(true, false);
-        NewsService::instance()->buildListByUidAndCode($result);
+        NewsService::buildListByUidAndCode($result);
         $this->success('获取评论列表成功', $result);
     }
 
@@ -81,7 +81,7 @@ class News extends Auth
             $this->success('您已收藏！');
         }
         if (DataNewsXCollect::mk()->insert($data) !== false) {
-            NewsService::instance()->syncNewsTotal($data['code']);
+            NewsService::syncNewsTotal($data['code']);
             $this->success('收藏成功！');
         } else {
             $this->error('收藏失败！');
@@ -99,7 +99,7 @@ class News extends Auth
             'code.require' => '文章编号不能为空！',
         ]);
         if (DataNewsXCollect::mk()->where($data)->delete() !== false) {
-            NewsService::instance()->syncNewsTotal($data['code']);
+            NewsService::syncNewsTotal($data['code']);
             $this->success('取消收藏成功！');
         } else {
             $this->error('取消收藏失败！');
@@ -117,7 +117,7 @@ class News extends Auth
         $map = ['uuid' => $this->uuid, 'type' => 1];
         $query = DataNewsXCollect::mQuery()->where($map);
         $result = $query->order('id desc')->page(true, false, false, 15);
-        NewsService::instance()->buildListByUidAndCode($result['list']);
+        NewsService::buildListByUidAndCode($result['list']);
         $this->success('获取收藏记录成功！', $result);
     }
 
@@ -136,7 +136,7 @@ class News extends Auth
             $this->success('您已点赞！');
         }
         if (DataNewsXCollect::mk()->insert($data) !== false) {
-            NewsService::instance()->syncNewsTotal($data['code']);
+            NewsService::syncNewsTotal($data['code']);
             $this->success('点赞成功！');
         } else {
             $this->error('点赞失败！');
@@ -154,7 +154,7 @@ class News extends Auth
             'code.require' => '文章编号不能为空！',
         ]);
         if (DataNewsXCollect::mk()->where($data)->delete() !== false) {
-            NewsService::instance()->syncNewsTotal($data['code']);
+            NewsService::syncNewsTotal($data['code']);
             $this->success('取消点赞成功！');
         } else {
             $this->error('取消点赞失败！');
@@ -172,7 +172,7 @@ class News extends Auth
         $query = DataNewsXCollect::mQuery();
         $query->where(['uuid' => $this->uuid, 'type' => 2, 'status' => 2]);
         $result = $query->order('id desc')->page(true, false, false, 15);
-        NewsService::instance()->buildListByUidAndCode($result['list']);
+        NewsService::buildListByUidAndCode($result['list']);
         $this->success('获取点赞记录成功！', $result);
     }
 
@@ -203,7 +203,7 @@ class News extends Auth
         $query = DataNewsXCollect::mQuery();
         $query->where(['uuid' => $this->uuid, 'type' => 3, 'status' => 2]);
         $result = $query->order('id desc')->page(true, false, false, 15);
-        NewsService::instance()->buildListByUidAndCode($result['list']);
+        NewsService::buildListByUidAndCode($result['list']);
         $this->success('获取浏览历史成功！', $result);
     }
 }

app/data/controller/api/auth/Order.php

@@ -48,7 +48,7 @@ class Order extends Auth
         $map = ['uuid' => $this->uuid, 'deleted_status' => 0];
         $query = ShopOrder::mQuery()->in('status')->equal('order_no');
         $result = $query->where($map)->order('id desc')->page(true, false, false, 20);
-        if (count($result['list']) > 0) OrderService::instance()->buildData($result['list']);
+        if (count($result['list']) > 0) OrderService::buildData($result['list']);
         $this->success('获取订单数据成功！', $result);
     }
 
@@ -108,7 +108,7 @@ class Order extends Auth
                 $allowPayments = $_allowPayments;
             }
             // 商品折扣处理
-            [$discountId, $discountRate] = OrderService::instance()->discount($goodsInfo['discount_id'], $this->user['vip_code']);
+            [$discountId, $discountRate] = OrderService::discount($goodsInfo['discount_id'], $this->user['vip_code']);
             // 订单详情处理
             $items[] = [
                 'uuid'            => $order['uuid'],
@@ -165,7 +165,7 @@ class Order extends Auth
             // 优惠后的金额
             $order['amount_discount'] = array_sum(array_column($items, 'discount_amount'));
             // 订单随机免减
-            $order['amount_reduct'] = OrderService::instance()->getReduct();
+            $order['amount_reduct'] = OrderService::getReduct();
             if ($order['amount_reduct'] > $order['amount_goods']) {
                 $order['amount_reduct'] = $order['amount_goods'];
             }
@@ -200,7 +200,7 @@ class Order extends Auth
     public function discount()
     {
         $data = $this->_vali(['discount.require' => '折扣编号不能为空！']);
-        [, $rate] = OrderService::instance()->discount(intval($data['discount']), $this->user['vip_code']);
+        [, $rate] = OrderService::discount(intval($data['discount']), $this->user['vip_code']);
         $this->success('获取用户折扣', ['rate' => $rate]);
     }
 
@@ -230,7 +230,7 @@ class Order extends Auth
         // 根据地址计算运费
         $map = ['status' => 1, 'deleted' => 0, 'order_no' => $data['order_no']];
         $tCode = ShopOrderItem::mk()->where($map)->column('truck_code');
-        [$amount, , , $remark] = ExpressService::instance()->amount($tCode, $addr['province'], $addr['city'], $tCount);
+        [$amount, , , $remark] = ExpressService::amount($tCode, $addr['province'], $addr['city'], $tCount);
         $this->success('计算运费成功', ['amount' => $amount, 'remark' => $remark]);
     }
 
@@ -263,7 +263,7 @@ class Order extends Auth
         $map2 = ['status' => 1, 'deleted' => 0, 'order_no' => $data['order_no']];
         $tCount = ShopOrderItem::mk()->where($map1)->sum('truck_number');
         $tCodes = ShopOrderItem::mk()->where($map2)->column('truck_code');
-        [$amount, $tCount, $tCode, $remark] = ExpressService::instance()->amount($tCodes, $addr['province'], $addr['city'], $tCount);
+        [$amount, $tCount, $tCode, $remark] = ExpressService::amount($tCodes, $addr['province'], $addr['city'], $tCount);
 
         // 创建订单发货信息
         $express = [

app/data/controller/api/auth/Transfer.php

@@ -31,9 +31,9 @@ class Transfer extends Auth
             'amount.require' => '提现金额不能为空！',
             'remark.default' => '用户提交提现申请！',
         ]);
-        $state = UserTransferService::instance()->config('status');
+        $state = UserTransferService::config('status');
         if (empty($state)) $this->error('提现还没有开启！');
-        $transfers = UserTransferService::instance()->config('transfer');
+        $transfers = UserTransferService::config('transfer');
         if (empty($transfers[$data['type']]['state'])) $this->error('提现方式已停用！');
         // 提现数据补充
         $data['uuid'] = $this->uuid;
@@ -50,7 +50,7 @@ class Transfer extends Auth
             $data['audit_datetime'] = date('Y-m-d H:i:s');
         }
         // 扣除手续费
-        $chargeRate = floatval(UserTransferService::instance()->config('charge'));
+        $chargeRate = floatval(UserTransferService::config('charge'));
         $data['charge_rate'] = $chargeRate;
         $data['charge_amount'] = $chargeRate * $data['amount'] / 100;
         // 检查可提现余额

app/data/controller/news/Item.php

@@ -42,7 +42,7 @@ class Item extends Controller
      */
     protected function _page_filter(array &$data)
     {
-        NewsService::instance()->buildData($data);
+        NewsService::buildData($data);
     }
 
     /**

app/data/controller/shop/Goods.php

@@ -138,7 +138,7 @@ class Goods extends Controller
             // 其他表单数据
             $this->marks = ShopGoodsMark::items();
             $this->cates = ShopGoodsCate::treeTable(true);
-            $this->trucks = ExpressService::instance()->templates();
+            $this->trucks = ExpressService::templates();
             $this->upgrades = BaseUserUpgrade::items();
             $this->payments = BaseUserPayment::mk()->where(['status' => 1, 'deleted' => 0])->order('sort desc,id desc')->column('type,code,name', 'code');
             $this->discounts = BaseUserDiscount::mk()->where(['status' => 1, 'deleted' => 0])->order('sort desc,id desc')->column('id,name,items', 'id');

app/data/controller/shop/Send.php

@@ -71,7 +71,7 @@ class Send extends Controller
      */
     protected function _index_page_filter(array &$data)
     {
-        OrderService::instance()->buildData($data, false);
+        OrderService::buildData($data, false);
         $orders = array_unique(array_column($data, 'order_no'));
         $orderList = ShopOrder::mk()->whereIn('order_no', $orders)->column('*', 'order_no');
         foreach ($data as &$vo) $vo['order'] = $orderList[$vo['order_no']] ?? [];
@@ -149,7 +149,7 @@ class Send extends Controller
     {
         try {
             $data = $this->_vali(['code.require' => '快递不能为空！', 'number.require' => '单号不能为空！']);
-            $this->result = ExpressService::instance()->query($data['code'], $data['number']);
+            $this->result = ExpressService::query($data['code'], $data['number']);
             if (empty($this->result['code'])) $this->error($this->result['info']);
             $this->fetch('truck_query');
         } catch (HttpResponseException $exception) {

app/data/controller/user/Admin.php

@@ -105,7 +105,7 @@ class Admin extends Controller
         $map = $this->_vali(['id.require' => '用户ID不能为空！']);
         $user = DataUser::mk()->where($map)->find();
         if (empty($user) || empty($user['pid0'])) $this->error('用户不符合操作要求！');
-        [$status, $message] = UserUpgradeService::instance()->bindAgent($user['id'], $user['pid0']);
+        [$status, $message] = UserUpgradeService::bindAgent($user['id'], $user['pid0']);
         $status && sysoplog('前端用户管理', "修改用户[{$map['id']}]的代理为永久状态");
         empty($status) ? $this->error($message) : $this->success($message);
     }
@@ -125,7 +125,7 @@ class Admin extends Controller
         // 修改指定用户代理数据
         $user->save(['pid0' => 0, 'pid1' => 0, 'pid2' => 0, 'pids' => 1, 'path' => '-', 'layer' => 1]);
         // 刷新用户等级及上级等级
-        UserUpgradeService::instance()->upgrade($user['id'], true);
+        UserUpgradeService::upgrade($user['id'], true);
         sysoplog('前端用户管理', "设置用户[{$map['id']}]为总部用户");
         $this->success('设为总部用户成功！');
     }
@@ -156,7 +156,7 @@ class Admin extends Controller
             $query->like('phone,username|nickname#username')->whereRaw('vip_code>0')->equal('status,vip_code')->dateBetween('create_at')->page();
         } else {
             $data = $this->_vali(['pid.require' => '待绑定代理不能为空！', 'uuid.require' => '待操作用户不能为空！']);
-            [$status, $message] = UserUpgradeService::instance()->bindAgent($data['uuid'], $data['pid'], 2);
+            [$status, $message] = UserUpgradeService::bindAgent($data['uuid'], $data['pid'], 2);
             $status && sysoplog('前端用户管理', "修改用户[{$data['uuid']}]的代理为用户[{$data['pid']}]");
             empty($status) ? $this->error($message) : $this->success($message);
         }

app/data/controller/user/Balance.php

@@ -88,7 +88,7 @@ class Balance extends Controller
             $this->upgrades = BaseUserUpgrade::items();
         }
         if ($this->request->isPost()) {
-            $data['create_by'] = AdminService::instance()->getUserId();
+            $data['create_by'] = AdminService::getUserId();
             if (empty(floatval($data['amount'])) && empty($data['upgrade'])) {
                 $this->error('金额为零并且没有升级行为！');
             }
@@ -105,7 +105,7 @@ class Balance extends Controller
     {
         if ($state && isset($data['uuid'])) {
             UserBalanceService::amount($data['uuid']);
-            UserUpgradeService::instance()->upgrade($data['uuid']);
+            UserUpgradeService::upgrade($data['uuid']);
         }
     }
 
@@ -129,7 +129,7 @@ class Balance extends Controller
             $map = [['id', 'in', str2arr(input('id', ''))]];
             foreach (DataUserBalance::mk()->where($map)->cursor() as $vo) {
                 UserBalanceService::amount($vo['uuid']);
-                UserUpgradeService::instance()->upgrade($vo['uuid']);
+                UserUpgradeService::upgrade($vo['uuid']);
             }
         }
     }

app/data/controller/user/Rebate.php

@@ -56,7 +56,7 @@ class Rebate extends Controller
         $userItem = DataUser::mk()->whereIn('id', array_unique($uids))->select();
         $goodsItem = ShopOrderItem::mk()->whereIn('order_no', array_unique(array_column($data, 'order_no')))->select();
         foreach ($data as &$vo) {
-            $vo['type'] = RebateService::instance()->name($vo['type']);
+            $vo['type'] = RebateService::name($vo['type']);
             [$vo['user'], $vo['agent'], $vo['list']] = [[], [], []];
             foreach ($userItem as $user) {
                 if ($user['id'] === $vo['uuid']) $vo['agent'] = $user;

app/data/controller/user/Transfer.php

@@ -83,7 +83,7 @@ class Transfer extends Controller
     public function index()
     {
         $this->title = '用户提现管理';
-        $this->transfer = UserTransferService::instance()->amount(0);
+        $this->transfer = UserTransferService::amount(0);
         // 创建查询对象
         $query = DataUserTransfer::mQuery()->order('id desc');
         // 用户条件搜索
@@ -157,7 +157,7 @@ class Transfer extends Controller
                 $data['trade_no'] = CodeExtend::uniqidDate(20);
                 $data['trade_time'] = date('Y-m-d H:i:s');
                 $data['change_time'] = date('Y-m-d H:i:s');
-                $data['change_desc'] = ($data['remark'] ?: '线下打款成功') . ' By ' . AdminService::instance()->getUserName();
+                $data['change_desc'] = ($data['remark'] ?: '线下打款成功') . ' By ' . AdminService::getUserName();
             }
             if (DataUserTransfer::mk()->strict(false)->where($map)->update($data) !== false) {
                 $this->success('操作成功');

app/data/service/OrderService.php

@@ -63,7 +63,7 @@ class OrderService extends Service
         // 尝试绑定代理用户
         if (empty($user['pids']) && ($order['puid1'] > 0 || $user['pid1'] > 0)) {
             $puid1 = $order['puid1'] > 0 ? $order['puid1'] : $user['pid0'];
-            UserUpgradeService::instance()->bindAgent($user['id'], $puid1);
+            UserUpgradeService::bindAgent($user['id'], $puid1);
         }
         // 重置用户信息并绑定订单
         $user = DataUser::mk()->where(['id' => $order['uuid']])->find();
@@ -73,7 +73,7 @@ class OrderService extends Service
             ]);
         }
         // 重新计算用户等级
-        UserUpgradeService::instance()->upgrade($user['id'], true, $orderNo);
+        UserUpgradeService::upgrade($user['id'], true, $orderNo);
         return [$user, $order, $entry];
     }
 

app/data/service/UserRebateService.php

@@ -50,7 +50,7 @@ class UserRebateService extends Service
         if (empty($order)) return [0, '需处理的订单状态异常！'];
         $map = [['status', '=', 0], ['order_no', 'like', "{$orderNo}%"]];
         DataUserRebate::mk()->where($map)->update(['status' => 1]);
-        if (UserUpgradeService::instance()->upgrade($order['uuid'])) {
+        if (UserUpgradeService::upgrade($order['uuid'])) {
             return [1, '重新计算用户金额成功！'];
         } else {
             return [0, '重新计算用户金额失败！'];

app/wechat/command/Auto.php

@@ -89,17 +89,17 @@ class Auto extends Command
             $result = $this->sendMessage('text', ['content' => $data['content']]);
         }
         if ($type === 'voice' && !empty($data['voice_url'])) {
-            if ($mediaId = MediaService::instance()->upload($data['voice_url'], 'voice')) {
+            if ($mediaId = MediaService::upload($data['voice_url'], 'voice')) {
                 $result = $this->sendMessage('voice', ['media_id' => $mediaId]);
             }
         }
         if ($type === 'image' && !empty($data['image_url'])) {
-            if ($mediaId = MediaService::instance()->upload($data['image_url'], 'image')) {
+            if ($mediaId = MediaService::upload($data['image_url'], 'image')) {
                 $result = $this->sendMessage('image', ['media_id' => $mediaId]);
             }
         }
         if ($type === 'news') {
-            [$item, $news] = [MediaService::instance()->news($data['news_id']), []];
+            [$item, $news] = [MediaService::news($data['news_id']), []];
             if (isset($item['articles']) && is_array($item['articles'])) {
                 $host = sysconf('base.site_host') ?: true;
                 foreach ($item['articles'] as $vo) if (empty($news)) $news[] = [
@@ -110,7 +110,7 @@ class Auto extends Command
             }
         }
         if ($type === 'music' && !empty($data['music_url']) && !empty($data['music_title']) && !empty($data['music_desc'])) {
-            $mediaId = $data['music_image'] ? MediaService::instance()->upload($data['music_image'], 'image') : '';
+            $mediaId = $data['music_image'] ? MediaService::upload($data['music_image'], 'image') : '';
             $result = $this->sendMessage('music', [
                 'hqmusicurl'  => $data['music_url'], 'musicurl' => $data['music_url'],
                 'description' => $data['music_desc'], 'title' => $data['music_title'], 'thumb_media_id' => $mediaId,
@@ -118,7 +118,7 @@ class Auto extends Command
         }
         if ($type === 'video' && !empty($data['video_url']) && !empty($data['video_desc']) && !empty($data['video_title'])) {
             $video = ['title' => $data['video_title'], 'introduction' => $data['video_desc']];
-            if ($mediaId = MediaService::instance()->upload($data['video_url'], 'video', $video)) {
+            if ($mediaId = MediaService::upload($data['video_url'], 'video', $video)) {
                 $result = $this->sendMessage('video', ['media_id' => $mediaId, 'title' => $data['video_title'], 'description' => $data['video_desc']]);
             }
         }

app/wechat/command/Fans.php

@@ -66,7 +66,7 @@ class Fans extends Command
      */
     protected function _list(string $next = '', int $done = 0): string
     {
-        $appid = WechatService::instance()->getAppid();
+        $appid = WechatService::getAppid();
         $this->output->comment('开始获取微信用户数据');
         while (is_string($next)) {
             $result = WechatService::WeChatUser()->getUserList($next);
@@ -76,7 +76,7 @@ class Fans extends Command
                     if (is_array($info) && !empty($info['user_info_list'])) {
                         foreach ($info['user_info_list'] as $user) if (isset($user['nickname'])) {
                             $this->queue->message($result['total'], ++$done, "-> {$user['openid']} {$user['nickname']}");
-                            FansService::instance()->set($user, $appid);
+                            FansService::set($user, $appid);
                         }
                     }
                 }
@@ -137,7 +137,7 @@ class Fans extends Command
      */
     public function _tags(int $done = 0): string
     {
-        $appid = WechatService::instance()->getAppid();
+        $appid = WechatService::getAppid();
         $this->output->comment('开始获取微信用户标签数据');
         if (is_array($list = WechatService::WeChatTags()->getTags()) && !empty($list['tags'])) {
             $count = count($list['tags']);

app/wechat/controller/Fans.php

@@ -43,7 +43,7 @@ class Fans extends Controller
         WechatFans::mQuery()->layTable(function () {
             $this->title = '微信用户管理';
         }, function (QueryHelper $query) {
-            $query->where(['appid' => WechatService::instance()->getAppid()]);
+            $query->where(['appid' => WechatService::getAppid()]);
             $query->like('nickname')->equal('subscribe,is_black')->dateBetween('subscribe_at');
         });
     }

app/wechat/controller/News.php

@@ -53,7 +53,7 @@ class News extends Controller
     protected function _page_filter(array &$data)
     {
         foreach ($data as &$vo) {
-            $vo = MediaService::instance()->news($vo['id']);
+            $vo = MediaService::news($vo['id']);
         }
     }
 
@@ -77,7 +77,7 @@ class News extends Controller
             $this->fetch('form');
         } else {
             $update = [
-                'create_by'  => AdminService::instance()->getUserId(),
+                'create_by'  => AdminService::getUserId(),
                 'article_id' => $this->_buildArticle($this->request->post('data', [])),
             ];
             if (WechatNews::mk()->insert($update) !== false) {
@@ -101,7 +101,7 @@ class News extends Controller
         if (empty($this->id)) $this->error('参数错误，请稍候再试！');
         if ($this->request->isGet()) {
             if ($this->request->get('output') === 'json') {
-                $this->success('获取数据成功！', MediaService::instance()->news($this->id));
+                $this->success('获取数据成功！', MediaService::news($this->id));
             } else {
                 $this->title = '编辑图文';
                 $this->fetch('form');

app/wechat/controller/api/Js.php

@@ -50,12 +50,12 @@ class Js extends Controller
     {
         $mode = $this->request->get('mode', 1);
         $source = $this->request->server('http_referer') ?: $this->request->url(true);
-        $userinfo = WechatService::instance()->getWebOauthInfo($source, $mode, false);
+        $userinfo = WechatService::getWebOauthInfo($source, $mode, false);
         if (empty($userinfo['openid'])) {
             $content = 'alert("Wechat webOauth failed.")';
         } else {
             $this->openid = $userinfo['openid'];
-            $this->params = json_encode(WechatService::instance()->getWebJssdkSign($source));
+            $this->params = json_encode(WechatService::getWebJssdkSign($source));
             $this->fansinfo = json_encode($userinfo['fansinfo'] ?? [], JSON_UNESCAPED_UNICODE);
             // 生成数据授权令牌
             $this->token = uniqid('oauth') . rand(10000, 99999);
@@ -78,7 +78,7 @@ class Js extends Controller
     public function sdk()
     {
         $data = $this->_vali(['url.require' => '签名地址不能为空！']);
-        $this->success('获取签名参数', WechatService::instance()->getWebJssdkSign($data['url']));
+        $this->success('获取签名参数', WechatService::getWebJssdkSign($data['url']));
     }
 
     /**

app/wechat/controller/api/Login.php

@@ -72,7 +72,7 @@ class Login extends Controller
         $this->mode = input('mode', '0');
         if (stripos($this->code, $this->prefix) === 0) {
             $this->url = $this->request->url(true);
-            $this->fans = WechatService::instance()->getWebOauthInfo($this->url, $this->mode);
+            $this->fans = WechatService::getWebOauthInfo($this->url, $this->mode);
             if (is_array($this->fans) && isset($this->fans['openid'])) {
                 $this->fans['token'] = md5(uniqid('t', true) . rand(10000, 99999));
                 $this->app->cache->set("wxlogin{$this->code}", $this->fans, $this->expire);

app/wechat/controller/api/Push.php

@@ -93,7 +93,7 @@ class Push extends Controller
     public function index(): string
     {
         try {
-            if (WechatService::instance()->getType() === 'thr') {
+            if (WechatService::getType() === 'thr') {
                 $this->forceJson = true; // 直接返回JSON数据到SERVICE
                 $this->forceCustom = false; // 直接使用客服消息模式推送
                 $this->appid = $this->request->post('appid', '', null);
@@ -106,7 +106,7 @@ class Push extends Controller
             } else {
                 $this->forceJson = false; // 直接返回JSON对象数据
                 $this->forceCustom = false; // 直接使用客服消息推送
-                $this->appid = WechatService::instance()->getAppid();
+                $this->appid = WechatService::getAppid();
                 $this->wechat = WechatService::WeChatReceive();
                 $this->openid = $this->wechat->getOpenid();
                 $this->encrypt = $this->wechat->isEncrypt();
@@ -215,13 +215,13 @@ class Push extends Controller
             case 'customservice':
                 return $this->_sendMessage('customservice', ['content' => $data['content']], false);
             case 'voice':
-                if (empty($data['voice_url']) || !($mediaId = MediaService::instance()->upload($data['voice_url'], 'voice'))) return false;
+                if (empty($data['voice_url']) || !($mediaId = MediaService::upload($data['voice_url'], 'voice'))) return false;
                 return $this->_sendMessage('voice', ['media_id' => $mediaId], $custom);
             case 'image':
-                if (empty($data['image_url']) || !($mediaId = MediaService::instance()->upload($data['image_url'], 'image'))) return false;
+                if (empty($data['image_url']) || !($mediaId = MediaService::upload($data['image_url'], 'image'))) return false;
                 return $this->_sendMessage('image', ['media_id' => $mediaId], $custom);
             case 'news':
-                [$news, $articles] = [MediaService::instance()->news($data['news_id']), []];
+                [$news, $articles] = [MediaService::news($data['news_id']), []];
                 if (empty($news['articles'])) return false;
                 foreach ($news['articles'] as $vo) $articles[] = [
                     'url'   => url("@wechat/api.view/item/id/{$vo['id']}", [], false, true)->build(),
@@ -230,7 +230,7 @@ class Push extends Controller
                 return $this->_sendMessage('news', ['articles' => $articles], $custom);
             case 'music':
                 if (empty($data['music_url']) || empty($data['music_title']) || empty($data['music_desc'])) return false;
-                $mediaId = $data['music_image'] ? MediaService::instance()->upload($data['music_image'], 'image') : '';
+                $mediaId = $data['music_image'] ? MediaService::upload($data['music_image'], 'image') : '';
                 return $this->_sendMessage('music', [
                     'hqmusicurl'  => $data['music_url'], 'musicurl' => $data['music_url'],
                     'description' => $data['music_desc'], 'title' => $data['music_title'], 'thumb_media_id' => $mediaId,
@@ -238,7 +238,7 @@ class Push extends Controller
             case 'video':
                 if (empty($data['video_url']) || empty($data['video_desc']) || empty($data['video_title'])) return false;
                 $video = ['title' => $data['video_title'], 'introduction' => $data['video_desc']];
-                if (!($mediaId = MediaService::instance()->upload($data['video_url'], 'video', $video))) return false;
+                if (!($mediaId = MediaService::upload($data['video_url'], 'video', $video))) return false;
                 return $this->_sendMessage('video', ['media_id' => $mediaId, 'title' => $data['video_title'], 'description' => $data['video_desc']], $custom);
             default:
                 return false;
@@ -309,13 +309,13 @@ class Push extends Controller
         if ($state) {
             try {
                 $user = WechatService::WeChatUser()->getUserInfo($this->openid);
-                return FansService::instance()->set(array_merge($user, ['subscribe' => 1, 'appid' => $this->appid]));
+                return FansService::set(array_merge($user, ['subscribe' => 1, 'appid' => $this->appid]));
             } catch (\Exception $exception) {
                 $this->app->log->error(__METHOD__ . " {$this->openid} get userinfo faild. {$exception->getMessage()}");
                 return false;
             }
         } else {
-            return FansService::instance()->set(['subscribe' => 0, 'openid' => $this->openid, 'appid' => $this->appid]);
+            return FansService::set(['subscribe' => 0, 'openid' => $this->openid, 'appid' => $this->appid]);
         }
     }
 

app/wechat/controller/api/Test.php

@@ -115,7 +115,7 @@ class Test extends Controller
     public function oauth()
     {
         $this->url = $this->request->url(true);
-        $this->fans = WechatService::instance()->getWebOauthInfo($this->url, 1);
+        $this->fans = WechatService::getWebOauthInfo($this->url, 1);
         $this->fetch();
     }
 
@@ -130,7 +130,7 @@ class Test extends Controller
      */
     public function jssdk()
     {
-        $this->options = WechatService::instance()->getWebJssdkSign();
+        $this->options = WechatService::getWebJssdkSign();
         $this->fetch();
     }
 
@@ -188,7 +188,7 @@ class Test extends Controller
     {
         $this->url = $this->request->url(true);
         $this->pay = WechatService::WePayOrder();
-        $user = WechatService::instance()->getWebOauthInfo($this->url);
+        $user = WechatService::getWebOauthInfo($this->url);
         if (empty($user['openid'])) return '<h3>网页授权获取OPENID失败！</h3>';
         // 生成预支付码
         $result = $this->pay->create([
@@ -203,7 +203,7 @@ class Test extends Controller
         // 数据参数格式化
         $resultJson = var_export($result, true);
         $optionJson = json_encode($this->pay->jsapiParams($result['prepay_id']), JSON_UNESCAPED_UNICODE);
-        $configJson = json_encode(WechatService::instance()->getWebJssdkSign(), JSON_UNESCAPED_UNICODE);
+        $configJson = json_encode(WechatService::getWebJssdkSign(), JSON_UNESCAPED_UNICODE);
         return <<<HTML
 <pre>
     当前用户OPENID: {$user['openid']}

app/wechat/controller/api/View.php

@@ -38,7 +38,7 @@ class View extends Controller
     public function news($id = 0)
     {
         $this->id = $id ?: input('id', 0);
-        $this->news = MediaService::instance()->news($this->id);
+        $this->news = MediaService::news($this->id);
         $this->fetch();
     }
 

app/wechat/service/AutoService.php

@@ -35,11 +35,11 @@ class AutoService extends Service
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public function register(string $openid)
+    public static function register(string $openid)
     {
         foreach (WechatAuto::mk()->where(['status' => 1])->order('time asc')->cursor() as $vo) {
-            [$name, $time] = ["推送客服消息 {$vo['code']}#{$openid}", $this->parseTimeString($vo['time'])];
+            [$name, $time] = ["推送客服消息 {$vo['code']}#{$openid}", static::parseTimeString($vo['time'])];
-            QueueService::instance()->register($name, "xadmin:fansmsg {$openid} {$vo['code']}", $time, []);
+            QueueService::register($name, "xadmin:fansmsg {$openid} {$vo['code']}", $time, []);
         }
     }
 
@@ -48,7 +48,7 @@ class AutoService extends Service
      * @param string $time
      * @return int
      */
-    private function parseTimeString(string $time): int
+    private static function parseTimeString(string $time): int
     {
         if (preg_match('|^.*?(\d{2}).*?(\d{2}).*?(\d{2}).*?$|', $time, $vars)) {
             return intval($vars[1]) * 3600 * intval($vars[2]) * 60 + intval($vars[3]);

app/wechat/service/FansService.php

@@ -17,6 +17,7 @@
 namespace app\wechat\service;
 
 use app\wechat\model\WechatFans;
+use think\admin\Library;
 use think\admin\Service;
 
 /**
@@ -33,7 +34,7 @@ class FansService extends Service
      * @param string $appid 微信APPID
      * @return boolean
      */
-    public function set(array $user, string $appid = ''): bool
+    public static function set(array $user, string $appid = ''): bool
     {
         if (isset($user['subscribe_time'])) {
             $user['subscribe_at'] = date('Y-m-d H:i:s', $user['subscribe_time']);
@@ -44,7 +45,7 @@ class FansService extends Service
         if ($appid !== '') $user['appid'] = $appid;
         unset($user['privilege'], $user['groupid']);
         foreach ($user as $k => $v) if ($v === '') unset($user[$k]);
-        $this->app->event->trigger('WechatFansUpdate', $user);
+        Library::$sapp->event->trigger('WechatFansUpdate', $user);
         return !!WechatFans::mUpdate($user, 'openid');
     }
 
@@ -53,7 +54,7 @@ class FansService extends Service
      * @param string $openid
      * @return array
      */
-    public function get(string $openid): array
+    public static function get(string $openid): array
     {
         return WechatFans::mk()->where(['openid' => $openid])->findOrEmpty()->toArray();
     }

app/wechat/service/MediaService.php

@@ -39,7 +39,7 @@ class MediaService extends Service
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public function news($id, array $map = []): array
+    public static function news($id, array $map = []): array
     {
         // 文章主体数据
         $map1 = ['id' => $id, 'is_deleted' => 0];
@@ -68,12 +68,12 @@ class MediaService extends Service
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public function upload(string $url, string $type = 'image', array $video = []): string
+    public static function upload(string $url, string $type = 'image', array $video = []): string
     {
-        $map = ['md5' => md5($url), 'appid' => WechatService::instance()->getAppid()];
+        $map = ['md5' => md5($url), 'appid' => WechatService::getAppid()];
         if (($mediaId = WechatMedia::mk()->where($map)->value('media_id'))) return $mediaId;
         $result = WechatService::WeChatMedia()->addMaterial(self::buildCurlFile($url), $type, $video);
-        data_save(WechatMedia::class, [
+        WechatMedia::mUpdate([
             'local_url' => $url, 'md5' => $map['md5'], 'type' => $type, 'appid' => $map['appid'],
             'media_url' => $result['url'] ?? '', 'media_id' => $result['media_id'],
         ], 'type', $map);
@@ -86,7 +86,7 @@ class MediaService extends Service
      * @return MyCurlFile
      * @throws \WeChat\Exceptions\LocalCacheException
      */
-    private function buildCurlFile(string $local): MyCurlFile
+    private static function buildCurlFile(string $local): MyCurlFile
     {
         if (file_exists($local)) {
             return new MyCurlFile($local);

app/wechat/service/WechatService.php

@@ -18,6 +18,7 @@ namespace app\wechat\service;
 
 use think\admin\Exception;
 use think\admin\extend\JsonRpcClient;
+use think\admin\Library;
 use think\admin\Service;
 use think\admin\storage\LocalStorage;
 use think\exception\HttpResponseException;
@@ -104,7 +105,7 @@ class WechatService extends Service
         }
         if (sysconf('wechat.type') === 'api' || $type === 'WePay') {
             if (class_exists($class)) {
-                return new $class(static::instance()->getConfig());
+                return new $class(static::getConfig());
             } else {
                 throw new Exception("抱歉，接口模式无法实例 {$class} 对象！");
             }
@@ -142,9 +143,9 @@ class WechatService extends Service
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public function getAppid(): string
+    public static function getAppid(): string
     {
-        if ($this->getType() === 'api') {
+        if (static::getType() === 'api') {
             return sysconf('wechat.appid');
         } else {
             return sysconf('wechat.thr_appid');
@@ -159,7 +160,7 @@ class WechatService extends Service
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public function getType(): string
+    public static function getType(): string
     {
         $type = strtolower(sysconf('wechat.type'));
         if (in_array($type, ['api', 'thr'])) return $type;
@@ -174,16 +175,16 @@ class WechatService extends Service
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public function getConfig(): array
+    public static function getConfig(): array
     {
         $options = [
-            'appid'          => $this->getAppid(),
+            'appid'          => static::getAppid(),
             'token'          => sysconf('wechat.token'),
             'appsecret'      => sysconf('wechat.appsecret'),
             'encodingaeskey' => sysconf('wechat.encodingaeskey'),
             'mch_id'         => sysconf('wechat.mch_id'),
             'mch_key'        => sysconf('wechat.mch_key'),
-            'cache_path'     => $this->app->getRuntimePath() . 'wechat',
+            'cache_path'     => Library::$sapp->getRuntimePath() . 'wechat',
         ];
         $local = LocalStorage::instance();
         switch (strtolower(sysconf('wechat.mch_ssl_type'))) {
@@ -211,16 +212,16 @@ class WechatService extends Service
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public function getWebOauthInfo(string $source, int $isfull = 0, bool $redirect = true): array
+    public static function getWebOauthInfo(string $source, int $isfull = 0, bool $redirect = true): array
     {
-        $appid = $this->getAppid();
+        $appid = static::getAppid();
-        $openid = $this->app->session->get("{$appid}_openid");
+        $openid = Library::$sapp->session->get("{$appid}_openid");
-        $userinfo = $this->app->session->get("{$appid}_fansinfo");
+        $userinfo = Library::$sapp->session->get("{$appid}_fansinfo");
         if ((empty($isfull) && !empty($openid)) || (!empty($isfull) && !empty($openid) && !empty($userinfo))) {
-            empty($userinfo) || FansService::instance()->set($userinfo, $appid);
+            empty($userinfo) || FansService::set($userinfo, $appid);
             return ['openid' => $openid, 'fansinfo' => $userinfo];
         }
-        if ($this->getType() === 'api') {
+        if (static::getType() === 'api') {
             // 解析 GET 参数
             parse_str(parse_url($source, PHP_URL_QUERY), $params);
             $getVars = [
@@ -235,11 +236,11 @@ class WechatService extends Service
                 $oauthurl = $wechat->getOauthRedirect($location, $appid, $isfull ? 'snsapi_userinfo' : 'snsapi_base');
                 throw new HttpResponseException($redirect ? redirect($oauthurl, 301) : response("location.href='{$oauthurl}'"));
             } elseif (($token = $wechat->getOauthAccessToken($getVars['code'])) && isset($token['openid'])) {
-                $this->app->session->set("{$appid}_openid", $openid = $token['openid']);
+                Library::$sapp->session->set("{$appid}_openid", $openid = $token['openid']);
                 if ($isfull && isset($token['access_token'])) {
                     $userinfo = $wechat->getUserInfo($token['access_token'], $openid);
-                    $this->app->session->set("{$appid}_fansinfo", $userinfo);
+                    Library::$sapp->session->set("{$appid}_fansinfo", $userinfo);
-                    empty($userinfo) || FansService::instance()->set($userinfo, $appid);
+                    empty($userinfo) || FansService::set($userinfo, $appid);
                 }
             }
             if ($getVars['rcode']) {
@@ -251,11 +252,11 @@ class WechatService extends Service
                 throw new Exception('Query params [rcode] not find.');
             }
         } else {
-            $result = static::ThinkServiceConfig()->oauth($this->app->session->getId(), $source, $isfull);
+            $result = static::ThinkServiceConfig()->oauth(Library::$sapp->session->getId(), $source, $isfull);
-            $this->app->session->set("{$appid}_openid", $openid = $result['openid']);
+            Library::$sapp->session->set("{$appid}_openid", $openid = $result['openid']);
-            $this->app->session->set("{$appid}_fansinfo", $userinfo = $result['fans']);
+            Library::$sapp->session->set("{$appid}_fansinfo", $userinfo = $result['fans']);
             if ((empty($isfull) && !empty($openid)) || (!empty($isfull) && !empty($openid) && !empty($userinfo))) {
-                empty($userinfo) || FansService::instance()->set($userinfo, $appid);
+                empty($userinfo) || FansService::set($userinfo, $appid);
                 return ['openid' => $openid, 'fansinfo' => $userinfo];
             }
             if ($redirect) {
@@ -277,10 +278,10 @@ class WechatService extends Service
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public function getWebJssdkSign(?string $location = null): array
+    public static function getWebJssdkSign(?string $location = null): array
     {
-        $location = $location ?: $this->app->request->url(true);
+        $location = $location ?: Library::$sapp->request->url(true);
-        if ($this->getType() === 'api') {
+        if (static::getType() === 'api') {
             return static::WeChatScript()->getJsSign($location);
         } else {
             return static::ThinkServiceConfig()->jsSign($location);

app/wechat/sys.php

@@ -25,6 +25,6 @@ if (app()->request->isCli()) {
     });
 } else {
     app()->event->listen('WechatFansSubscribe', function ($openid) {
-        AutoService::instance()->register($openid);
+        AutoService::register($openid);
     });
 }