Merge remote-tracking branch 'upstream/master'

application/admin/controller/wechat/Menu.php

@@ -64,7 +64,7 @@ class Menu extends Backend
     public function sync($ids = NULL)
     {
         $this->code = -1;
-        $app = new Application(Config::get('wechat')->toArray());
+        $app = new Application(Config::get('wechat'));
 
         try
         {

application/common.php

@@ -74,7 +74,7 @@ if (!function_exists('configvalue'))
      */
     function configvalue($id)
     {
-        $data = Configvalue::get('wechat');
+        $data = Configvalue::get($id);
         return $data ? $data->content : null;
     }
 

application/index/controller/Wechat.php

@@ -3,11 +3,12 @@
 namespace app\index\controller;
 
 use app\common\controller\Frontend;
+use app\common\model\WechatAutoreply;
 use app\common\model\WechatContext;
 use app\common\model\WechatResponse;
+use EasyWeChat\Foundation\Application;
 use EasyWeChat\Payment\Order;
 use fast\service\Wechat as WechatService;
-use fast\third\Application;
 use think\Config;
 use think\Log;
 
@@ -22,7 +23,7 @@ class Wechat extends Frontend
     public function _initialize()
     {
         parent::_initialize();
-        $this->app = new Application(Config::getSecret('wechat')->toArray());
+        $this->app = new Application(Config::get('wechat'));
     }
 
     /**
@@ -68,11 +69,11 @@ class Wechat extends Frontend
                             break;
                     }
 
-                    $response = $WechatResponse->where(["eventkey" => $eventkey, 'status' => FA_STATUS_NORMAL])->get();
+                    $response = $WechatResponse->where(["eventkey" => $eventkey, 'status' => 'normal'])->find();
                     if ($response)
                     {
                         $content = (array) json_decode($response['content'], TRUE);
-                        $context = $WechatContext->where(['openid' => $openid])->get();
+                        $context = $WechatContext->where(['openid' => $openid])->find();
                         $data = ['eventkey' => $eventkey, 'command' => '', 'refreshtime' => time(), 'openid' => $openid];
                         if ($context)
                         {
@@ -81,7 +82,7 @@ class Wechat extends Frontend
                         }
                         else
                         {
-                            $id = $WechatContext->data($data)->insert();
+                            $id = $WechatContext->data($data)->save();
                             $data['id'] = $id;
                         }
                         $result = $WechatService->response($this, $openid, $content, $data);
@@ -99,10 +100,10 @@ class Wechat extends Frontend
                 case 'link': //链接消息
                 default: //其它消息
                     //上下文事件处理
-                    $context = $WechatContext->where([['openid', $openid], ['refreshtime', '>=', time() - 1800]])->get();
+                    $context = $WechatContext->where(['openid' => ['=', $openid], 'refreshtime' => ['>=', time() - 1800]])->find();
                     if ($context && $context['eventkey'])
                     {
-                        $response = $WechatResponse->where(['eventkey' => $context['eventkey'], 'status' => FA_STATUS_NORMAL])->get();
+                        $response = $WechatResponse->where(['eventkey' => $context['eventkey'], 'status' => 'normal'])->find();
                         if ($response)
                         {
                             $WechatContext->data(array('refreshtime' => time()))->where('id', $context['id'])->update();
@@ -117,15 +118,15 @@ class Wechat extends Frontend
                     //自动回复处理
                     if ($message->MsgType == 'text')
                     {
-                        $wechat_autoreply = new Orm('wechat_autoreply');
-                        $autoreply = $wechat_autoreply->where(['text' => $message->Content, 'status' => FA_STATUS_NORMAL])->get();
+                        $wechat_autoreply = new WechatAutoreply();
+                        $autoreply = $wechat_autoreply->where(['text' => $message->Content, 'status' => 'normal'])->find();
                         if ($autoreply)
                         {
-                            $response = $WechatResponse->where(["eventkey" => $autoreply['eventkey'], 'status' => FA_STATUS_NORMAL])->get();
+                            $response = $WechatResponse->where(["eventkey" => $autoreply['eventkey'], 'status' => 'normal'])->find();
                             if ($response)
                             {
                                 $content = (array) json_decode($response['content'], TRUE);
-                                $context = $WechatContext->where(['openid' => $openid])->get();
+                                $context = $WechatContext->where(['openid' => $openid])->find();
                                 $result = $WechatService->response($this, $openid, $content, $context);
                                 if ($result)
                                 {

extend/fast/service/Wechat.php

@@ -9,6 +9,7 @@ use app\common\model\UserThird;
 use EasyWeChat\Message\News;
 use EasyWeChat\Message\Transfer;
 use fast\Date;
+use think\Config;
 
 /**
  * Wechat服务类
@@ -62,7 +63,6 @@ class Wechat
     // 微信输入交互内容指令
     public function command($obj, $openid, $content, $context)
     {
-        $content = [];
         $response = FALSE;
         if (isset($content['app']))
         {
@@ -131,7 +131,7 @@ class Wechat
     // 微信点击菜单event指令
     public function response($obj, $openid, $content, $context)
     {
-        $content = [];
+        $upload = Config::get('upload');
         $response = FALSE;
         if (isset($content['app']))
         {
@@ -176,8 +176,8 @@ class Wechat
                         {
                             $news = new News();
                             $news->title = $pageinfo['title'];
-                            $news->url = $pageinfo['outlink'] ? $pageinfo['outlink'] : url('page/show/' . $pageinfo['id'], 1);
-                            $news->image = cdn($pageinfo['image']);
+                            $news->url = $pageinfo['url'] ? $pageinfo['url'] : url('index/page/show', ['id' => $pageinfo['id']], true, true);
+                            $news->image = $upload['cdnurl'] . $pageinfo['image'];
                             $news->description = $pageinfo['description'];
                             $response[] = $news;
                         }
@@ -190,8 +190,8 @@ class Wechat
                     {
                         $news = new News();
                         $news->title = $pageinfo['title'];
-                        $news->url = $pageinfo['outlink'] ? $pageinfo['outlink'] : url('page/show/' . $pageinfo['id'], 1);
-                        $news->image = cdn($pageinfo['image']);
+                        $news->url = $pageinfo['url'] ? $pageinfo['url'] : url('index/page/show', ['id' => $pageinfo['id']], true, true);
+                        $news->image = $upload['cdnurl'] . $pageinfo['image'];
                         $news->description = $pageinfo['description'];
                         return $news;
                     }

public/assets/js/backend/index.js

@@ -54,11 +54,18 @@ define(['jquery', 'bootstrap', 'backend', 'addtabs', 'adminlte', 'validator'], f
                     dataType: 'json',
                     cache: false,
                     success: function (ret) {
-                        if (ret.code === 1) {
-                            Backend.api.toastr.success(__('Wipe cache completed'));
+                        if (ret.hasOwnProperty("code")) {
+                            var msg = ret.hasOwnProperty("msg") && ret.msg != "" ? ret.msg : "";
+                            if (ret.code === 1) {
+                                Toastr.success(msg ? msg : __('Wipe cache completed'));
+                            } else {
+                                Toastr.error(msg ? msg : __('Wipe cache failed'));
+                            }
                         } else {
-                            Backend.api.toastr.error(__('Wipe cache failed'));
+                            Toastr.error(__('Unknown data format'));
                         }
+                    }, error: function () {
+                        Toastr.error(__('Network error'));
                     }
                 });
             });