Просмотр исходного кода

:wrench: 任务执行使用配置文件

visuddhinanda 3 лет назад
Родитель
Сommit
89ea0d96d2
3 измененных файлов с 67 добавлено и 37 удалено
  1. 2 3
      app/Console/Kernel.php
  2. 52 33
      change-logs.md
  3. 13 1
      config/app.php

+ 2 - 3
app/Console/Kernel.php

@@ -15,12 +15,11 @@ class Kernel extends ConsoleKernel
      */
     protected function schedule(Schedule $schedule)
     {
-        // $schedule->command('inspire')->hourly();
         $schedule->timezone('Asia/Shanghai')
                  ->command('upgrade:daily')
                  ->dailyAt('00:00')
-                 ->emailOutputTo('kosalla1987@126.com');
-				 //->emailOutputOnFailure()
+                 ->emailOutputTo(config("app.email.ScheduleEmailOutputTo"))
+				 ->emailOutputOnFailure(config("app.email.ScheduleEmailOutputOnFailure"));
     }
 
     /**

+ 52 - 33
change-logs.md

@@ -6,6 +6,58 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.0.9] - 2022-02-24
+
+- add SCHEDULE_EMAIL_OUTPUTTO to .env
+- add SCHEDULE_EMAIL_OUTPUTONFAILURE to .env
+
+## [1.0.8] - 2022-02-24
+
+- 优化打印显示效果 去掉channel列表 逐句首字母大写
+
+## [1.0.7] - 2022-02-01
+
+- add REDIS_NAMESPACE to .env.example
+- add redis namespace to config.sample.php
+
+## [1.0.6]- 2022-01-27
+
+- remove HELP_SERVER GRAMMAR_SERVER from .env.example
+- remove HELP_SERVER GRAMMAR_SERVER from config.sample.php
+- remove HELP_SERVER GRAMMAR_SERVER from config.sample.php
+
+## [1.0.5] - 2022-01-24
+
+- add 帮助文件路径 URL_HELP to config.dir.php
+- add 巴利语手册路径 URL_PALI_HANDBOOK to config.dir.php
+
+## [1.0.4] - 2022-01-21
+
+- add SNOWFLAKE to .env.example
+- add SnowFlake to config.sample.php
+- add SnowFlakeDate to config.table.php
+- add dependency godruoyi/php-snowflake
+- add help & handbook link 
+
+## [1.0.3] - 2022-01-16
+
+- remove WWW_DOMAIN_PROTOCOL WWW_DOMAIN_NAME from config.sample.php
+- rename RPC_DOMAIN_NAME -> RPC_SERVER in config.sample.php
+- remove WWW_DOMAIN_NAME  from config.sample.js
+- rename RPC_DOMAIN_NAME -> RPC_SERVER in config.sample.js
+- add RPC_SERVER to .env.example
+
+## [1.0.2] - 2022-01-15
+
+- add HELP_SERVER to .env.example /public/app/config.sample.js /public/app/config.sample.php
+- add GRAMMAR_SERVER to .env.example /public/app/config.sample.js /public/app/config.sample.php
+
+## [1.0.1] - 2022-01-14
+- /public/app/config.sample.php 变更 移动 config.dir.php 到其他设置的下面 跟其他的 dev config 放在一起 看着比较整齐。
+- remove config.migrate in config.sample.php
+- remove file config.migrate.sample.php
+- finish command Install:wordbook
+
 ## [1.0.0] - 2022-01-13
 - add redis setting to README.md
 - add .env-global/.env
@@ -15,49 +67,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - add ASSETS_SERVER to .env.example
 - add ASSETS_SERVER to /public/app/config.sample.js
 
-## [1.0.1] - 2022-01-14
-- /public/app/config.sample.php 变更 移动 config.dir.php 到其他设置的下面 跟其他的 dev config 放在一起 看着比较整齐。
-- remove config.migrate in config.sample.php
-- remove file config.migrate.sample.php
-- finish command Install:wordbook
-
-## [1.0.2] - 2022-01-15
 
-- add HELP_SERVER to .env.example /public/app/config.sample.js /public/app/config.sample.php
-- add GRAMMAR_SERVER to .env.example /public/app/config.sample.js /public/app/config.sample.php
 
-## [1.0.3] - 2022-01-16
 
-- remove WWW_DOMAIN_PROTOCOL WWW_DOMAIN_NAME from config.sample.php
-- rename RPC_DOMAIN_NAME -> RPC_SERVER in config.sample.php
-- remove WWW_DOMAIN_NAME  from config.sample.js
-- rename RPC_DOMAIN_NAME -> RPC_SERVER in config.sample.js
-- add RPC_SERVER to .env.example
 
-## [1.0.4] - 2022-01-21
 
-- add SNOWFLAKE to .env.example
-- add SnowFlake to config.sample.php
-- add SnowFlakeDate to config.table.php
-- add dependency godruoyi/php-snowflake
 
-## [1.0.5] - 2022-01-24
 
-- add 帮助文件路径 URL_HELP to config.dir.php
-- add 巴利语手册路径 URL_PALI_HANDBOOK to config.dir.php
-- add help & handbook link 
 
-## [1.0.6]- 2022-01-27
 
-- remove HELP_SERVER GRAMMAR_SERVER from .env.example
-- remove HELP_SERVER GRAMMAR_SERVER from config.sample.php
-- remove HELP_SERVER GRAMMAR_SERVER from config.sample.php
 
-## [1.0.7] - 2022-02-01
 
-- add REDIS_NAMESPACE to .env.example
-- add redis namespace to config.sample.php
 
-## [1.0.8] - 2022-02-24
 
-- 优化打印显示效果 去掉channel列表 逐句首字母大写

+ 13 - 1
config/app.php

@@ -240,7 +240,7 @@ return [
     |
     */
 	'path' => [
-		'dependence' => public_path('depandence'),
+		'dependence' => storage_path('depandence'),
 		'palitext' => public_path('palihtml'),
 		'palitext_filelist' => public_path('palihtml').'/filelist.csv',
 		'palicsv' => public_path('tmp').'/palicsv',
@@ -256,4 +256,16 @@ return [
 		'robot_uuid' => '6e12f8ea-ee4d-4e0f-a6b0-472f2d99a814',
 		'cs6_channel' => '1e4b926d-54d7-4932-b8a6-7cdc65abd992',
 	],
+
+	'dependence' => [
+		[
+			'url' => 'https://www.github.com/iapt-platform/wipali-globle',
+			'path' => 'wipali-globle',
+		],
+	],
+
+	'email' => [
+		'ScheduleEmailOutputTo' => env('SCHEDULE_EMAIL_OUTPUTTO', 'kosalla1987@126.com'),
+		'ScheduleEmailOutputOnFailure' => env('SCHEDULE_EMAIL_OUTPUTONFAILURE', 'kosalla1987@126.com'),
+	]
 ];