github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2025-12-11 01:52:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

修改缓存异常获取问题

Browse Source
This commit is contained in:
liaofei 2019-12-21 14:32:49 +08:00
parent 1e95864e93
commit a01b47fd94
6 changed files with 150 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
crmeb/app/models/system/Cache.php
View File

@ -1,4 +1,5 @@
<?php
namespace app\models\system;
use crmeb\traits\ModelTrait;
@ -23,13 +24,29 @@ class Cache extends BaseModel
/**
* 获取数据缓存
* @param string $key
* @return result
* @param $default 默认值不存在则写入
* @return mixed|null
*/
public static function getDbCache(string $key)
public static function getDbCache(string $key, $default, int $expire = self::EXPIRE)
{
self::delectDeOverdueDbCache();
$result = self::where('key',$key)->value('result');
return json_decode($result,true);
$result = self::where('key', $key)->value('result');
if ($result) {
return json_decode($result, true);
} else {
if ($default instanceof \Closure) {
// 获取缓存数据
$value = $default();
if ($value) {
self::setDbCache($key, $value, $expire);
return $value;
}
} else {
self::setDbCache($key, $default, $expire);
return $default;
}
return null;
}
}
/**
@ -39,14 +56,23 @@ class Cache extends BaseModel
* @param int $expire
* @return void
*/
public static function setDbCache(string $key,$result,$expire = self::EXPIRE)
public static function setDbCache(string $key, $result, $expire = self::EXPIRE)
{
self::delectDeOverdueDbCache();
$addTime = $expire ? time() + $expire : 0;
if(self::be(['key'=>$key])){
return self::where(['key'=>$key])->update(['result'=>json_encode($result),'add_time'=>$addTime]);
}else{
return self::create(['key'=>$key,'result'=>json_encode($result),'add_time'=>$addTime]);
if (self::be(['key' => $key])) {
return self::where(['key' => $key])->update([
'result' => json_encode($result),
'expire_time' => $addTime,
'add_time' => time()
]);
} else {
return self::create([
'key' => $key,
'result' => json_encode($result),
'expire_time' => $addTime,
'add_time' => time()
]);
}
}
@ -55,6 +81,7 @@ class Cache extends BaseModel
*/
public static function delectDeOverdueDbCache()
{
self::where('expire_time', '<>', 0)->where('expire_time', '<', time())->delete();
}
/**
@ -63,8 +90,8 @@ class Cache extends BaseModel
*/
public static function delectDbCache(string $key = '')
{
if($key)
return self::where('key',$key)->delete();
if ($key)
return self::where('key', $key)->delete();
else
return self::delete();
}

57
crmeb/crmeb/services/GroupDataService.php
View File

@ -23,23 +23,26 @@ class GroupDataService
*/
public static function getGroupData(string $config_name, $limit = 0, bool $isCaChe = false): array
{
$callable = function () use ($config_name, $limit) {
$data = SystemGroupData::getGroupData($config_name, $limit);
if (is_object($data))
$data = $data->toArray();
return $data;
};
try {
$cacheName = $limit ? "group_data_{$config_name}_{$limit}" : "data_{$config_name}";
$callable = function () use ($config_name, $limit) {
$data = SystemGroupData::getGroupData($config_name, $limit);
if (is_object($data))
$data = $data->toArray();
return $data;
};
if ($isCaChe)
return $callable();
return CacheService::get($cacheName, $callable);
} catch (\Throwable $e) {
return [];
try {
return $callable();
} catch (\Exception $e) {
return [];
}
}
}
@ -52,23 +55,26 @@ class GroupDataService
*/
public static function getData(string $config_name, int $limit = 0, bool $isCaChe = false): array
{
$callable = function () use ($config_name, $limit) {
$data = SystemGroupData::getAllValue($config_name, $limit);
if (is_object($data))
$data = $data->toArray();
return $data;
};
try {
$cacheName = $limit ? "data_{$config_name}_{$limit}" : "data_{$config_name}";
$callable = function () use ($config_name, $limit) {
$data = SystemGroupData::getAllValue($config_name, $limit);
if (is_object($data))
$data = $data->toArray();
return $data;
};
if ($isCaChe)
return $callable();
return CacheService::get($cacheName, $callable);
} catch (\Throwable $e) {
return [];
try {
return $callable();
} catch (\Exception $e) {
return [];
}
}
}
@ -80,23 +86,26 @@ class GroupDataService
*/
public static function getDataNumber(int $id, bool $isCaChe = false): array
{
$callable = function () use ($id) {
$data = SystemGroupData::getDateValue($id);
if (is_object($data))
$data = $data->toArray();
return $data;
};
try {
$cacheName = "data_number_{$id}";
$callable = function () use ($id) {
$data = SystemGroupData::getDateValue($id);
if (is_object($data))
$data = $data->toArray();
return $data;
};
if ($isCaChe)
return $callable();
return CacheService::get($cacheName, $callable);
} catch (\Throwable $e) {
return [];
try {
return $callable();
} catch (\Exception $e) {
return [];
}
}
}
}

21
crmeb/crmeb/services/SystemConfigService.php
View File

@ -25,9 +25,18 @@ class SystemConfigService
*/
protected static function init()
{
self::$configList = CacheService::get(self::CACHE_SYSTEM, function () {
$confingFun = function () {
return self::getAll();
});
};
try {
self::$configList = CacheService::get(self::CACHE_SYSTEM, $confingFun);
} catch (\Throwable $e) {
try {
self::$configList = $confingFun();
} catch (\Exception $e) {
self::$configList = [];
}
}
}
/**获取系统配置
@ -48,12 +57,12 @@ class SystemConfigService
* @param bool $isCaChe 是否获取缓存配置
* @return bool|mixed|string
*/
public static function get($key,$default = '',bool $isCaChe = false)
public static function get($key, $default = '', bool $isCaChe = false)
{
if($isCaChe){
try{
if ($isCaChe) {
try {
return SystemConfig::getConfigValue($key);
}catch (\Throwable $e){
} catch (\Throwable $e) {
return $default;
}
}

45
crmeb/crmeb/services/UploadService.php
View File

@ -75,7 +75,17 @@ class UploadService
* 上传图片的大小 2MB 单位字节
* @var string
*/
protected $imageValidate = 'filesize:2097152|fileExt:jpg,jpeg,png,gif,pem|fileMime:image/jpeg,image/gif,image/png,text/plain';
protected $imageValidate = null;
/**
* 上传规则
* @var array
*/
protected $imageValidateArray = [
'filesize' => 2097152,
'fileExt' => ['jpg', 'jpeg', 'png', 'gif', 'pem', 'mp3', 'wma', 'wav', 'amr', 'mp4'],
'fileMime' => ['image/jpeg', 'image/gif', 'image/png', 'text/plain', 'audio/mpeg'],
];
protected $propsRule = [
'returnErr' => false,
@ -86,15 +96,44 @@ class UploadService
protected function __construct()
{
self::init();
$this->init();
}
/**
* 初始化
*/
private static function init()
protected function init()
{
self::$uploadStatus = new \StdClass();
$this->extractValidate();
}
/**
* 提取上传验证
*/
protected function extractValidate()
{
$imageValidate = [];
foreach ($this->imageValidateArray as $key => $value) {
$imageValidate[] = $key . ':' . (is_array($value) ? implode(',', $value) : $value);
}
$this->imageValidate = implode('|', $imageValidate);
unset($imageValidate);
}
/**
* 设置上传验证
* @param array $imageValidateArray
* @return $this
*/
public function setImageValidateArray(array $imageValidateArray)
{
if (isset($imageValidateArray['filesize']) && !is_int($imageValidateArray['filesize'])) {
$imageValidateArray['filesize'] = 2097152;
}
$this->imageValidateArray = array_merge($this->imageValidateArray, $imageValidateArray);
$this->extractValidate();
return $this;
}
/**

28
crmeb/crmeb/services/YLYService.php
View File

@ -86,8 +86,7 @@ class YLYService extends HttpService implements ProviderInterface
* */
protected function getAccessToken()
{
$token = CacheModel::getDbCache('YLY_access_token');
if (!$token) {
$this->access_token = CacheModel::getDbCache('YLY_access_token', function () {
$request = self::postRequest($this->apiUrl . 'oauth/oauth', [
'client_id' => $this->client_id,
'grant_type' => 'client_credentials',
@ -100,11 +99,12 @@ class YLYService extends HttpService implements ProviderInterface
$request['error'] = $request['error'] ?? 0;
$request['error_description'] = $request['error_description'] ?? '';
if ($request['error'] == 0 && $request['error_description'] == 'success') {
$token = $request['body']['access_token'] ?? '';
CacheModel::setDbCache('YLY_access_token', $token);
return $request['body']['access_token'] ?? '';
}
}
$this->access_token = $token;
return '';
}, 20 * 86400);
if (!$this->access_token)
throw new AuthException('获取access_token获取失败');
}
/**
@ -123,7 +123,7 @@ class YLYService extends HttpService implements ProviderInterface
* @param string $order_id
* @return bool|mixed
*/
public function orderPrinting(string $order_id = '')
public function orderPrinting(string $order_id = '', int $errorCount = 0)
{
$request = self::postRequest($this->apiUrl . 'print/index', [
'client_id' => $this->client_id,
@ -136,7 +136,13 @@ class YLYService extends HttpService implements ProviderInterface
'timestamp' => time()
]);
if ($request === false) return false;
return json_decode($request, true);
$request = json_decode($request, true);
if (isset($request['error']) && in_array($request['error'], [18, 14]) && $errorCount == 0) {
CacheModel::delectDbCache('YLY_access_token');
$this->getAccessToken();
return $this->orderPrinting($order_id, 1);
}
return $request;
}
/**
@ -172,7 +178,11 @@ class YLYService extends HttpService implements ProviderInterface
$goodsStr = '<table><tr><td>商品名称</td><td>数量</td><td>单价</td><td>金额</td></tr>';
foreach ($product as $item) {
$goodsStr .= '<tr>';
$goodsStr .= "<td>{$item['productInfo']['store_name']}</td><td>{$item['cart_num']}</td><td>{$item['productInfo']['price']}</td><td>{$item['truePrice']}</td>";
if (isset($item['productInfo']['attrInfo'])) {
$price = $item['productInfo']['attrInfo']['price'] ?? $item['productInfo']['price'] ?? 0;
$goodsStr .= "<td>{$item['productInfo']['store_name']}</td><td>{$item['cart_num']}</td><td>{$price}</td><td>{$item['truePrice']}</td>";
} else
$goodsStr .= "<td>{$item['productInfo']['store_name']}</td><td>{$item['cart_num']}</td><td>{$item['productInfo']['price']}</td><td>{$item['truePrice']}</td>";
$goodsStr .= '</tr>';
}
$goodsStr .= '</table>';

4
crmeb/public/install/crmeb.sql
View File

@ -90,8 +90,10 @@ CREATE TABLE IF NOT EXISTS `eb_article_content` (
CREATE TABLE IF NOT EXISTS `eb_cache` (
`key` varchar(32) NOT NULL,
`result` text COMMENT '缓存数据',
`expire_time` int(10) NOT NULL DEFAULT '0' COMMENT '失效时间0=永久',
`add_time` int(10) DEFAULT NULL COMMENT '缓存时间',
PRIMARY KEY (`key`) USING BTREE
PRIMARY KEY (`key`) USING BTREE,
KEY `key` (`key`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='微信缓存表';
-- --------------------------------------------------------