pdkj
/
jiqu-library-server
6
0
Fork 0
Code Releases Activity

替换配置使用方式

release
vine_liutk 2021-12-25 16:28:00 +08:00
parent da8c21932d
commit 48ed0bbc6a
11 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Admin/Services/OrderPackageService.php
View File

@ -74,7 +74,7 @@ class OrderPackageService
'updated_at' => $package->created_at,
]);
}, $packageProducts));
if (config('settings.kuaidi100_is_use')) {
if (app_settings('kuaidi100_is_use')) {
$kuaidi100Service = new Kuaidi100Service();
$kuaidi100Service->poll($package->shipping_number, $package->shipping_code, $package->consignee_telephone);
}

12
app/Endpoint/Api/Http/Controllers/ArticleController.php
View File

@ -26,9 +26,9 @@ class ArticleController extends Controller
public function config(Request $request)
{
return response()->json([
'about_us'=>config('settings.article_about_us', ''),
'user_promotion_agreement'=> config('settings.article_user_promotion_agreement', ''),
'user_hide_agreement' => config('settings.article_user_hide_agreement', ),
'about_us'=>app_settings('article_about_us', ''),
'user_promotion_agreement'=> app_settings('article_user_promotion_agreement', ''),
'user_hide_agreement' => app_settings('article_user_hide_agreement', ),
]);
}
@ -43,9 +43,9 @@ class ArticleController extends Controller
$cate = (string) $request->query('cate');
$key = (string) $request->query('key');
$categoryId = Arr::get([
'help'=> config('settings.article_help'),
'agreement'=> config('settings.article_agreement'),
'health'=> config('settings.article_health'),
'help'=> app_settings('article_help'),
'agreement'=> app_settings('article_agreement'),
'health'=> app_settings('article_health'),
], $cate);
$query = Article::query()->with(['likesInfo'=>function ($q) use ($request) {
$user_id = $request->user()?->id;

6
app/Endpoint/Api/Http/Controllers/ClickController.php
View File

@ -63,12 +63,12 @@ class ClickController extends Controller
]);
//发放当天签到积分
$points = config('settings.sign_click_points');
$points = app_settings('sign_click_points');
$pointsService->sendPoints(1, $user, $points, '签到奖励');
//发放额外的奖励积分
$continueClickDays = config('settings.sign_click_continue', 0);
$continueClickPoints = config('settings.sign_click_continue_points');
$continueClickDays = app_settings('sign_click_continue', 0);
$continueClickPoints = app_settings('sign_click_continue_points');
if (($continueClickDays > 0 && $click->continue_click_times % $continueClickDays) == 0) {
$pointsService->sendPoints(1, $user, $continueClickPoints, '连续签到奖励');
}

2
app/Endpoint/Api/Http/Controllers/Product/ProductSkuController.php
View File

@ -45,7 +45,7 @@ class ProductSkuController extends Controller
public function searchHotKeys(Request $request)
{
return response()->json([
'keys' => explode(',', config('settings.search_hot_keys')),
'keys' => explode(',', app_settings('search_hot_keys')),
]);
}

2
app/Endpoint/Api/Http/Controllers/ShareBgController.php
View File

@ -22,7 +22,7 @@ class ShareBgController extends Controller
public function userQrCode(Request $request)
{
$inviteUri = config('settings.invite_uri').'/register?code=';
$inviteUri = app_settings('invite_uri').'/register?code=';
return response()->json([
'qr_code' => base64_encode(QrCode::format('png')->size(100)->margin(0)->generate($inviteUri.$request->user()->userInfo?->code)),
]);

4
app/Endpoint/Wap/Http/Controllers/ArticleController.php
View File

@ -20,13 +20,13 @@ class ArticleController extends Controller
$view = '';
//区分文章分类ID
switch ($article->category_id) {
case config('settings.article_agreement'): //如果是协议分类
case app_settings('article_agreement'): //如果是协议分类
$view = 'endpoint.article.agreement';
break;
default:
//区分文章的分类祖先ID
switch ($article->category->ancestors->first()?->id) {
case config('settings.article_agreement'): //如果是协议
case app_settings('article_agreement'): //如果是协议
$view = 'endpoint.article.agreement';
break;
default:

4
app/Models/Order.php
View File

@ -90,7 +90,7 @@ class Order extends Model
public function scopeExpired()
{
return $this->where('status', static::STATUS_PENDING)
->where('created_at', '<=', now()->subSeconds(config('settings.order_payment_expires_at')));
->where('created_at', '<=', now()->subSeconds(app_settings('order_payment_expires_at')));
}
/**
@ -320,7 +320,7 @@ class Order extends Model
}
$seconds = now()->diffInSeconds(
$this->created_at->addSeconds(config('settings.order_payment_expires_at')), false
$this->created_at->addSeconds(app_settings('order_payment_expires_at')), false
);
return $seconds > 0 ? $seconds : 0;

10
app/Services/Kuaidi100Service.php
View File

@ -1328,12 +1328,12 @@ class Kuaidi100Service
public function setAppKey($appKey = null)
{
$this->appKey = $appKey ??config('settings.kuaidi100_app_key');
$this->appKey = $appKey ??app_settings('kuaidi100_app_key');
}
public function setCustomer($customer = null)
{
$this->customer = $customer ??config('settings.kuaidi100_customer');
$this->customer = $customer ??app_settings('kuaidi100_customer');
}
/**
@ -1344,7 +1344,7 @@ class Kuaidi100Service
public function poll(string $number, string $code, string $phone)
{
$uri = '/poll';
$callbackUrl = config('settings.kuaidi100_callback');
$callbackUrl = app_settings('kuaidi100_callback');
if (empty($callbackUrl)) {
throw new BizException('未配置推送回调地址');
@ -1357,7 +1357,7 @@ class Kuaidi100Service
'key' => $this->appKey,
'parameters'=> [
'callbackurl'=> $callbackUrl,
'salt' => config('settings.kuaidi100_secret'),
'salt' => app_settings('kuaidi100_secret'),
'phone' => $phone,
'resultv2' => '1',
'autoCom' => empty($code) ? 1 : 0,
@ -1488,7 +1488,7 @@ class Kuaidi100Service
*/
public function unPollSign(string $sign, array $params)
{
return $sign === strtoupper(md5(json_encode($params, JSON_UNESCAPED_UNICODE).config('settings.kuaidi100_secret')));
return $sign === strtoupper(md5(json_encode($params, JSON_UNESCAPED_UNICODE).app_settings('kuaidi100_secret')));
}
public function getStatusName($state = 0)

2
app/Services/OrderPackageService.php
View File

@ -65,7 +65,7 @@ class OrderPackageService
// 更新商品的售后过期时间
$package->orderProducts()->update([
'after_expire_at'=> $package->checked_at->addDays(config('settings.sale_after_expire_days', 7)),
'after_expire_at'=> $package->checked_at->addDays(app_settings('sale_after_expire_days', 7)),
]);
}
}

2
app/Services/OrderService.php
View File

@ -713,7 +713,7 @@ class OrderService
'attach' => json_encode([
'pay_way' => $payWay,
]),
'body' => config('settings.app_name').'-商城订单',
'body' => app_settings('app_name').'-商城订单',
'out_trade_no' => $order->sn,
'total_fee' => $order->total_amount,
'notify_url' => url(route('wxpay.order_paid_notify', [], false), [], true),

8
app/Services/Push/MallUnipushService.php
View File

@ -16,10 +16,10 @@ class MallUnipushService extends UniPushService
public function __construct()
{
$this->appId = config('settings.mall_push_app_id', '');
$this->appKey = config('settings.mall_push_app_key', '');
$this->appSecret = config('settings.mall_push_app_secret', '');
$this->masterSecret = config('settings.mall_push_master_secret', '');
$this->appId = app_settings('mall_push_app_id', '');
$this->appKey = app_settings('mall_push_app_key', '');
$this->appSecret = app_settings('mall_push_app_secret', '');
$this->masterSecret = app_settings('mall_push_master_secret', '');
parent::__construct($this->appId, $this->appKey, $this->appSecret, $this->masterSecret);
}