Merge branch 'dev'

app/Controller/TestController.php

@@ -3,13 +3,14 @@
 namespace App\Controller;
 
 use App\Amqp\Producer\AssignDoctorDelayDirectProducer;
-use App\Amqp\Producer\AssignDoctorProducer;
 use App\Amqp\Producer\AutoCompleteInquiryDelayDirectProducer;
 use App\Amqp\Producer\AutoFinishInquiryDelayDirectProducer;
 use App\Amqp\Producer\CancelUnpayOrdersDelayDirectProducer;
 use App\Amqp\Producer\SendSmsMessageProducer;
 use App\Constants\HttpEnumCode;
 use App\Exception\BusinessException;
+use App\Factory\CacheFactory;
+use App\Factory\ProdRedisFactory;
 use App\Model\DoctorInquiryTime;
 use App\Model\HospitalDepartmentCustom;
 use App\Model\OrderInquiryCase;
@@ -49,6 +50,7 @@ use Hyperf\Redis\Redis;
 use Hyperf\Utils\ApplicationContext;
 use Hyperf\Utils\Coroutine\Concurrent;
 use Intervention\Image\ImageManager;
+use Psr\SimpleCache\CacheInterface;
 use Spatie\PdfToImage\Pdf;
 use Swoole\Coroutine;
 use Swoole\Coroutine\Channel;
@@ -331,5 +333,8 @@ class TestController extends AbstractController
     }
 
     public function test_15(){
+//        $wechat = new Wechat(1);
+//        $a = $wechat->getAccessToken();
+//        dump($a);
     }
 }

app/Driver/ProdRedisDriver.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Driver;
+
+use App\Factory\ProdRedisFactory;
+use Hyperf\Cache\Driver\RedisDriver;
+use Hyperf\Redis\Redis;
+use Psr\Container\ContainerInterface;
+
+class ProdRedisDriver extends RedisDriver
+{
+    public function __construct(ContainerInterface $container, array $config)
+    {
+        parent::__construct($container, $config);
+
+        $this->redis = $container->get(ProdRedisFactory::class);
+    }
+
+}

app/Factory/ProdRedisFactory.php

@@ -2,6 +2,7 @@
 
 namespace App\Factory;
 
+use Hyperf\Redis\Pool\PoolFactory;
 use Hyperf\Redis\Redis;
 
 class ProdRedisFactory extends Redis

app/Services/IndexService.php

@@ -111,7 +111,7 @@ class IndexService extends BaseService
         $info['is_img_welfare_reception'] = $doctor['is_img_welfare_reception'];// 是否参加公益图文问诊（0:否 1:是）
         $info['is_img_quick_reception'] = $doctor['is_img_quick_reception'];// 是否参加快速图文接诊（0:否 1:是）
         $info['praise_rate'] = $doctor['praise_rate'];// 好评率（百分制。回复质量占4、服务态度占3、回复速度占3。每周计算一次）
-        $info['avg_response_time'] = (float)floor($doctor['avg_response_time'] * 10) / 10;;// 平均响应时间（分钟制）
+        $info['avg_response_time'] = (float)ceil($doctor['avg_response_time'] * 10) / 10;;// 平均响应时间（分钟制）
         $info['number_of_fans'] = $doctor['number_of_fans'];// 被关注数量
         $info['inquiry_price'] = $doctor_inquiry_config['inquiry_price'] ?? "";// 在线问诊价格
         $info['not_accepted_inquiry_num'] = $not_accepted_inquiry_num ?? 0;// 获取未接诊患者个数

config/autoload/cache.php

@@ -9,10 +9,19 @@ declare(strict_types=1);
  * @contact  group@hyperf.io
  * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
  */
+
+use App\Driver\ProdRedisDriver;
+use App\Factory\ProdRedisFactory;
+
 return [
     'default' => [
         'driver' => Hyperf\Cache\Driver\RedisDriver::class,
         'packer' => Hyperf\Utils\Packer\PhpSerializerPacker::class,
         'prefix' => 'c:',
     ],
+    'prod' => [
+        'driver' => ProdRedisDriver::class,
+        'packer' => Hyperf\Utils\Packer\PhpSerializerPacker::class,
+        'prefix' => 'c:',
+    ],
 ];

extend/Wechat/Wechat.php

@@ -5,11 +5,13 @@ namespace Extend\Wechat;
 use App\Constants\HttpEnumCode;
 use App\Exception\BusinessException;
 use App\Factory\CacheFactory;
+use App\Factory\ProdRedisFactory;
 use EasyWeChat\Kernel\Exceptions\BadResponseException;
 use EasyWeChat\Kernel\Exceptions\InvalidArgumentException;
 use EasyWeChat\Kernel\HttpClient\AccessTokenAwareClient;
 use EasyWeChat\MiniApp\Application;
 use Hyperf\Cache\Cache;
+use Hyperf\Redis\Redis;
 use Hyperf\Utils\ApplicationContext;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
@@ -85,7 +87,7 @@ class Wechat
             $this->app = new Application($config);
 
             // 替换缓存
-            $this->app->setCache(make(Cache::class,['driver' => 'prod']));
+            $this->app->setCache(ApplicationContext::getContainer()->get(CacheFactory::class));
 
         } catch (InvalidArgumentException $e) {
             throw new BusinessException('实例化EasyWeChat类失败:' . $e->getMessage(), HttpEnumCode::SERVER_ERROR);
@@ -106,7 +108,6 @@ class Wechat
             $this->createApp($appId, $appSecret);
 
             return $this->app->getClient();
-
         } catch (NotFoundExceptionInterface|ContainerExceptionInterface $e) {
             throw new BusinessException('实例化EasyWeChat类失败:' . $e->getMessage(), HttpEnumCode::SERVER_ERROR);
         }