diff --git a/crmeb/app/api/controller/v1/activity/StoreIntegralController.php b/crmeb/app/api/controller/v1/activity/StoreIntegralController.php index eec348f09..bdbc14b6b 100644 --- a/crmeb/app/api/controller/v1/activity/StoreIntegralController.php +++ b/crmeb/app/api/controller/v1/activity/StoreIntegralController.php @@ -29,7 +29,7 @@ class StoreIntegralController $where = ['is_show' => 1]; $where['is_host'] = 1; $data['list'] = $this->services->getIntegralList($where); - return app('json')->successful(get_thumb_water($data, 'mid')); + return app('json')->successful(get_thumb_water($data, 'big')); } /** diff --git a/crmeb/app/api/controller/v1/store/StoreProductController.php b/crmeb/app/api/controller/v1/store/StoreProductController.php index 62a54427d..ef7eedbca 100644 --- a/crmeb/app/api/controller/v1/store/StoreProductController.php +++ b/crmeb/app/api/controller/v1/store/StoreProductController.php @@ -69,10 +69,6 @@ class StoreProductController } $type = 'big'; $field = ['image', 'recommend_image']; - if ($where['store_name']) { - $type = 'big'; - $field = ['image']; - } $list = $this->services->getGoodsList($where, (int)$request->uid()); return app('json')->successful(get_thumb_water($list, $type, $field)); } @@ -205,7 +201,7 @@ class StoreProductController /** @var StoreProductReplyServices $replyService */ $replyService = app()->make(StoreProductReplyServices::class); $list = $replyService->getProductReplyList($id, $type); - return app('json')->successful(get_thumb_water($list, 'small', ['pics'])); + return app('json')->successful(get_thumb_water($list, 'mid', ['pics'])); } /** diff --git a/crmeb/app/services/message/service/StoreServiceLogServices.php b/crmeb/app/services/message/service/StoreServiceLogServices.php index 7f5f663c1..87ddc6b73 100644 --- a/crmeb/app/services/message/service/StoreServiceLogServices.php +++ b/crmeb/app/services/message/service/StoreServiceLogServices.php @@ -135,7 +135,7 @@ class StoreServiceLogServices extends BaseServices ['is_del', '=', 0], ['is_show', '=', 1], ]; - $productList = get_thumb_water($productServices->getProductArray($where, '*', 'id')); + $productList = get_thumb_water($productServices->getProductArray($where, '*', 'id'),'mid'); } /** @var StoreOrderServices $orderServices */ $orderServices = app()->make(StoreOrderServices::class); diff --git a/crmeb/app/services/pc/UserServices.php b/crmeb/app/services/pc/UserServices.php index e5df699a5..bf28d7d43 100644 --- a/crmeb/app/services/pc/UserServices.php +++ b/crmeb/app/services/pc/UserServices.php @@ -79,7 +79,7 @@ class UserServices extends BaseServices $list[$k]['price'] = $product['product']['price'] ?? 0; $list[$k]['ot_price'] = $product['product']['ot_price'] ?? 0; $list[$k]['sales'] = $product['product']['sales'] ?? 0; - $list[$k]['image'] = get_thumb_water($product['product']['image'] ?? 0); + $list[$k]['image'] = get_thumb_water($product['product']['image'] ?? 0, 'mid'); $list[$k]['is_del'] = $product['product']['is_del'] ?? 0; $list[$k]['is_show'] = $product['product']['is_show'] ?? 0; $list[$k]['is_fail'] = $product['product']['is_del'] && $product['product']['is_show']; diff --git a/crmeb/app/services/product/product/StoreProductServices.php b/crmeb/app/services/product/product/StoreProductServices.php index 3a5eca875..7b7e7e6fe 100644 --- a/crmeb/app/services/product/product/StoreProductServices.php +++ b/crmeb/app/services/product/product/StoreProductServices.php @@ -1668,7 +1668,7 @@ class StoreProductServices extends BaseServices * @param string $type * @return array[] */ - public function getRecommendProductArr(int $uid, array $fields, bool $is_num = true, string $type = 'small') + public function getRecommendProductArr(int $uid, array $fields, bool $is_num = true, string $type = 'mid') { $baseList = $firstList = $benefitList = $hotList = $vipList = []; $data = [$baseList, $firstList, $benefitList, $hotList, $vipList]; @@ -1756,7 +1756,7 @@ class StoreProductServices extends BaseServices * @throws \think\db\exception\DbException * @throws \think\db\exception\ModelNotFoundException */ - public function getRecommendProduct(int $uid, $field, int $num = 0, string $type = 'small') + public function getRecommendProduct(int $uid, $field, int $num = 0, string $type = 'mid') { [$page, $limit] = $this->getPageValue(); $where['vip_user'] = $uid ? app()->make(UserServices::class)->value(['uid' => $uid], 'is_money_level') : 0; diff --git a/crmeb/crmeb/utils/JwtAuth.php b/crmeb/crmeb/utils/JwtAuth.php index 26054cf73..3893fe4a6 100644 --- a/crmeb/crmeb/utils/JwtAuth.php +++ b/crmeb/crmeb/utils/JwtAuth.php @@ -95,11 +95,6 @@ class JwtAuth { $tokenInfo = $this->getToken($id, $type, $params); $exp = $tokenInfo['params']['exp'] - $tokenInfo['params']['iat'] + 60; - if (in_array($type, ['api', 'wechat', 'routine'])) { - $type = 'api' . $id; - } else { - $type = 'admin'; - } $res = CacheService::setTokenBucket(md5($tokenInfo['token']), ['uid' => $id, 'type' => $type, 'token' => $tokenInfo['token'], 'exp' => $exp], (int)$exp, $type); if (!$res) { throw new AdminException(ApiErrorCode::ERR_SAVE_TOKEN);