diff --git a/CHANGELOG.md b/CHANGELOG.md index da9c4738..b2af237b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,10 @@ - 升级layui-v2.8.8 - 使用本地图像验证码 -- 清理无用的计划任务 +- 优化计划任务脚本 +- 优化日志清理脚本 +- 优化钉钉webhook +- 修正图文分享参数问题 ### [v1.6.4](https://gitee.com/koogua/course-tencent-cloud/releases/v1.6.4)(2023-06-15) diff --git a/app/Console/Tasks/CleanLogTask.php b/app/Console/Tasks/CleanLogTask.php index 2a874bf6..c5d62424 100644 --- a/app/Console/Tasks/CleanLogTask.php +++ b/app/Console/Tasks/CleanLogTask.php @@ -19,7 +19,6 @@ class CleanLogTask extends Task $this->cleanHttpLog(); $this->cleanSqlLog(); $this->cleanListenLog(); - $this->cleanCaptchaLog(); $this->cleanWeChatLog(); $this->cleanMailLog(); $this->cleanSmsLog(); @@ -96,18 +95,6 @@ class CleanLogTask extends Task $this->whitelist[] = $type; } - /** - * 清理验证码服务日志 - */ - protected function cleanCaptchaLog() - { - $type = 'captcha'; - - $this->cleanLog($type, 7); - - $this->whitelist[] = $type; - } - /** * 清理点播服务日志 */ @@ -268,13 +255,12 @@ class CleanLogTask extends Task * 清理其它日志 * * @param int $keepDays - * @return mixed */ protected function cleanOtherLog($keepDays = 7) { $files = glob(log_path() . "/*.log"); - if (!$files) return false; + if (!$files) return; foreach ($files as $file) { $name = str_replace(log_path() . '/', '', $file); @@ -287,9 +273,9 @@ class CleanLogTask extends Task if (strtotime($today) - strtotime($date) >= $keepDays * 86400) { $deleted = unlink($file); if ($deleted) { - echo "delete {$file} success" . PHP_EOL; + $this->successPrint("remove {$file} success"); } else { - echo "delete {$file} failed" . PHP_EOL; + $this->errorPrint("remove {$file} failed"); } } } @@ -300,13 +286,12 @@ class CleanLogTask extends Task * * @param string $prefix * @param int $keepDays 保留天数 - * @return mixed */ protected function cleanLog($prefix, $keepDays) { $files = glob(log_path() . "/{$prefix}-*.log"); - if (!$files) return false; + if (!$files) return; foreach ($files as $file) { $date = substr($file, -14, 10); @@ -314,9 +299,9 @@ class CleanLogTask extends Task if (strtotime($today) - strtotime($date) >= $keepDays * 86400) { $deleted = unlink($file); if ($deleted) { - echo "------ delete {$file} success ------" . PHP_EOL; + $this->successPrint("remove {$file} success"); } else { - echo "------ delete {$file} failed -------" . PHP_EOL; + $this->errorPrint("remove {$file} failed"); } } } diff --git a/app/Console/Tasks/Task.php b/app/Console/Tasks/Task.php index a4cf06fd..59a9b853 100644 --- a/app/Console/Tasks/Task.php +++ b/app/Console/Tasks/Task.php @@ -11,5 +11,17 @@ use App\Traits\Service as ServiceTrait; class Task extends \Phalcon\Cli\Task { + use ServiceTrait; + + protected function successPrint($text) + { + echo "\033[32m {$text} \033[0m" . PHP_EOL; + } + + protected function errorPrint($text) + { + echo "\033[31m {$text} \033[0m" . PHP_EOL; + } + } diff --git a/app/Http/Admin/Views/refund/macro.volt b/app/Http/Admin/Views/refund/macro.volt index 6320281f..0208de49 100644 --- a/app/Http/Admin/Views/refund/macro.volt +++ b/app/Http/Admin/Views/refund/macro.volt @@ -12,22 +12,4 @@ {% elseif value == 6 %} 已失败 {% endif %} -{%- endmacro %} - -{%- macro refund_status_history(items) %} - {% for item in items %} - {% if item.status == 1 %} -

创建时间:{{ date('Y-m-d H:i:s',item.create_time) }}

- {% elseif item.status == 2 %} -

取消时间:{{ date('Y-m-d H:i:s',item.create_time) }}

- {% elseif item.status == 3 %} -

过审时间:{{ date('Y-m-d H:i:s',item.create_time) }}

- {% elseif item.status == 4 %} -

拒绝时间:{{ date('Y-m-d H:i:s',item.create_time) }}

- {% elseif item.status == 5 %} -

完成时间:{{ date('Y-m-d H:i:s',item.create_time) }}

- {% elseif item.status == 6 %} -

失败时间:{{ date('Y-m-d H:i:s',item.create_time) }}

- {% endif %} - {% endfor %} {%- endmacro %} \ No newline at end of file diff --git a/app/Http/Admin/Views/trade/macro.volt b/app/Http/Admin/Views/trade/macro.volt index 331f7ad3..38ec2095 100644 --- a/app/Http/Admin/Views/trade/macro.volt +++ b/app/Http/Admin/Views/trade/macro.volt @@ -16,18 +16,4 @@ {% elseif value == 4 %} 已退款 {% endif %} -{%- endmacro %} - -{%- macro trade_status_history(items) %} - {% for item in items %} - {% if item.status == 1 %} -

创建时间:{{ date('Y-m-d H:i:s',item.create_time) }}

- {% elseif item.status == 2 %} -

完成时间:{{ date('Y-m-d H:i:s',item.create_time) }}

- {% elseif item.status == 3 %} -

关闭时间:{{ date('Y-m-d H:i:s',item.create_time) }}

- {% elseif item.status == 4 %} -

退款时间:{{ date('Y-m-d H:i:s',item.create_time) }}

- {% endif %} - {% endfor %} {%- endmacro %} \ No newline at end of file diff --git a/app/Http/Api/Controllers/PublicController.php b/app/Http/Api/Controllers/PublicController.php index c350a69c..05158ea4 100644 --- a/app/Http/Api/Controllers/PublicController.php +++ b/app/Http/Api/Controllers/PublicController.php @@ -76,20 +76,6 @@ class PublicController extends Controller return $this->jsonSuccess(['site' => $site]); } - /** - * @Get("/captcha/info", name="api.public.captcha_info") - */ - public function captchaInfoAction() - { - $service = new AppService(); - - $captcha = $service->getSettings('captcha'); - - unset($captcha['secret_key']); - - return $this->jsonSuccess(['captcha' => $captcha]); - } - /** * @Get("/payment/info", name="api.public.payment_info") */ diff --git a/app/Http/Home/Views/course/show_meta.volt b/app/Http/Home/Views/course/show_meta.volt index ff79b74d..13559c68 100644 --- a/app/Http/Home/Views/course/show_meta.volt +++ b/app/Http/Home/Views/course/show_meta.volt @@ -65,7 +65,7 @@ 市场价格 {{ '¥%0.2f'|format(course.market_price) }} {% else %} - 优惠价格 + 市场价格 免费 {% endif %} {% if course.vip_price > 0 %} diff --git a/app/Http/Home/Views/macros/order.volt b/app/Http/Home/Views/macros/order.volt index dd1a954b..5fe4b32d 100644 --- a/app/Http/Home/Views/macros/order.volt +++ b/app/Http/Home/Views/macros/order.volt @@ -4,7 +4,7 @@

课程名称:{{ course.title }}

- 优惠价格:{{ '¥%0.2f'|format(course.market_price) }} + 市场价格:{{ '¥%0.2f'|format(course.market_price) }} 会员价格:{{ '¥%0.2f'|format(course.vip_price) }}

{% if course.model in [1,2,3] %} @@ -23,7 +23,7 @@

课程名称:{{ course.title }}

- 优惠价格:{{ '¥%0.2f'|format(course.market_price) }} + 市场价格:{{ '¥%0.2f'|format(course.market_price) }} 会员价格:{{ '¥%0.2f'|format(course.vip_price) }}

{% if course.model in [1,2,3] %} diff --git a/app/Library/Cache/Backend/Redis.php b/app/Library/Cache/Backend/Redis.php index 0b5679c1..d9951ea7 100644 --- a/app/Library/Cache/Backend/Redis.php +++ b/app/Library/Cache/Backend/Redis.php @@ -99,7 +99,7 @@ class Redis extends \Phalcon\Cache\Backend\Redis if ($lifetime === null) { $tmp = $this->_lastLifetime; - $ttl = $tmp ? $tmp : $frontend->getLifetime(); + $ttl = $tmp ?: $frontend->getLifetime(); } else { $ttl = $lifetime; } @@ -157,7 +157,7 @@ class Redis extends \Phalcon\Cache\Backend\Redis $redis = $this->getRedis(); - $pattern = "{$this->_prefix}" . ($prefix ? $prefix : '') . '*'; + $pattern = "{$this->_prefix}" . ($prefix ?: '') . '*'; $redis->setOption(\Redis::OPT_SCAN, \Redis::SCAN_RETRY); @@ -255,7 +255,7 @@ class Redis extends \Phalcon\Cache\Backend\Redis */ public function flush(): bool { - + return true; } /** diff --git a/app/Models/Order.php b/app/Models/Order.php index 8f89eb57..cf8e3f5b 100644 --- a/app/Models/Order.php +++ b/app/Models/Order.php @@ -258,7 +258,7 @@ class Order extends Model if (!$order) return $sn; - $this->getOrderSn(); + return $this->getOrderSn(); } } diff --git a/app/Models/Refund.php b/app/Models/Refund.php index 0b53e770..2a40c230 100644 --- a/app/Models/Refund.php +++ b/app/Models/Refund.php @@ -182,7 +182,7 @@ class Refund extends Model if (!$order) return $sn; - $this->getRefundSn(); + return $this->getRefundSn(); } } diff --git a/app/Models/Trade.php b/app/Models/Trade.php index 3d1148e5..9033f698 100644 --- a/app/Models/Trade.php +++ b/app/Models/Trade.php @@ -185,7 +185,7 @@ class Trade extends Model if (!$order) return $sn; - $this->getTradeSn(); + return $this->getTradeSn(); } }