---------------------------------------------------------------------------------------------------- jshoter 在2020-08-06 16:20:12向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' cbb1e88..ea136df master -> origin/master', 3 => 'Updating cbb1e88..ea136df', 4 => 'error: The following untracked working tree files would be overwritten by merge:', 5 => ' public/autobuild.php', 6 => 'Please move or remove them before you merge.', 7 => 'Aborting', ) $return:1 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-07 02:35:41向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'Warning: Permanently added the ECDSA host key for IP address \'180.97.125.228\' to the list of known hosts.', 1 => 'From gitee.com:jshoter/Sinologist', 2 => ' * branch master -> FETCH_HEAD', 3 => ' ea136df..0bc8ece master -> origin/master', 4 => 'Updating ea136df..0bc8ece', 5 => 'Fast-forward', 6 => ' config/database.php | 2 +-', 7 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-07 03:43:10向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 0bc8ece..22b9313 master -> origin/master', 3 => 'Updating 0bc8ece..22b9313', 4 => 'Fast-forward', 5 => ' app/Imports/SinologistImport.php | 9 ++++++---', 6 => ' 1 file changed, 6 insertions(+), 3 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-07 04:00:55向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 22b9313..ca0ced1 master -> origin/master', 3 => 'Updating 22b9313..ca0ced1', 4 => 'Fast-forward', 5 => ' app/Imports/SinologistImport.php | 3 +++', 6 => ' 1 file changed, 3 insertions(+)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-07 08:05:12向Sinologist项目的refs/heads/master分支push了2个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' ca0ced1..b234a28 master -> origin/master', 3 => 'Updating ca0ced1..b234a28', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SearchController.php | 10 +++++++---', 6 => ' 1 file changed, 7 insertions(+), 3 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-07 10:08:12向Sinologist项目的refs/heads/master分支push了2个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' b234a28..7274bb1 master -> origin/master', 3 => 'Updating b234a28..7274bb1', 4 => 'Fast-forward', 5 => ' app/Admin/Controllers/GetGisController.php | 2 +-', 6 => ' app/Imports/SinologistImport.php | 9 ++++++++-', 7 => ' 2 files changed, 9 insertions(+), 2 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-07 11:07:00向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 7274bb1..b76c1bb master -> origin/master', 3 => 'Updating 7274bb1..b76c1bb', 4 => 'Fast-forward', 5 => ' app/Console/Commands/test.php | 22 ++++++++++-', 6 => ' app/Http/Controllers/MoreInfoController.php | 49 ++++++++++++++++++++++++', 7 => ' app/Http/Controllers/SinologistController.php | 1 +', 8 => ' app/Models/Sinologist.php | 15 ++++++--', 9 => ' public/css/all.css | 6 ++-', 10 => ' resources/sass/style.css | 8 ++--', 11 => ' resources/views/moreinfo/list.blade.php | 55 +++++++++++++++++++++++++++', 12 => ' resources/views/sinologist/detail.blade.php | 10 ++---', 13 => ' resources/views/works/list.blade.php | 2 +-', 14 => ' routes/web.php | 1 +', 15 => ' 10 files changed, 152 insertions(+), 17 deletions(-)', 16 => ' create mode 100644 app/Http/Controllers/MoreInfoController.php', 17 => ' create mode 100644 resources/views/moreinfo/list.blade.php', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-07 11:45:12向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' b76c1bb..eaab7bb master -> origin/master', 3 => 'Updating b76c1bb..eaab7bb', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SearchController.php | 2 +-', 6 => ' resources/views/layouts/search.blade.php | 4 ++--', 7 => ' resources/views/sinologist/list1.blade.php | 2 +-', 8 => ' 3 files changed, 4 insertions(+), 4 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-07 14:13:10向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' eaab7bb..191836e master -> origin/master', 3 => 'Updating eaab7bb..191836e', 4 => 'Fast-forward', 5 => ' app/Imports/SinologistImport.php | 22 +++++++++++-----------', 6 => ' 1 file changed, 11 insertions(+), 11 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-07 14:15:36向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 191836e..9d5d152 master -> origin/master', 3 => 'Updating 191836e..9d5d152', 4 => 'Fast-forward', 5 => ' app/Imports/SinologistImport.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-07 15:04:00向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 9d5d152..28bc951 master -> origin/master', 3 => 'Updating 9d5d152..28bc951', 4 => 'Fast-forward', 5 => ' app/Console/Commands/test.php | 27 ++--------', 6 => ' app/Imports/SinologistImport.php | 107 ++++++++++++++++++++-------------------', 7 => ' app/Models/Sinologist.php | 9 ++++', 8 => ' 3 files changed, 69 insertions(+), 74 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-07 15:33:21向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 28bc951..43ece91 master -> origin/master', 3 => 'Updating 28bc951..43ece91', 4 => 'Fast-forward', 5 => ' app/Imports/SinologistImport.php | 6 +++---', 6 => ' 1 file changed, 3 insertions(+), 3 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-07 16:22:46向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 43ece91..0e01185 master -> origin/master', 3 => 'Updating 43ece91..0e01185', 4 => 'Fast-forward', 5 => ' app/Console/Commands/test.php | 7 ++++---', 6 => ' 1 file changed, 4 insertions(+), 3 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-08 04:32:36向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 0e01185..3f7ee76 master -> origin/master', 3 => 'Updating 0e01185..3f7ee76', 4 => 'Fast-forward', 5 => ' app/Imports/SinologistImport.php | 4 ++--', 6 => ' public/js/all.js | 6 ++++--', 7 => ' resources/js/js.js | 6 ++++--', 8 => ' 3 files changed, 10 insertions(+), 6 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-08 05:24:01向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 3f7ee76..c9e70d5 master -> origin/master', 3 => 'Updating 3f7ee76..c9e70d5', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SearchController.php | 7 +++++--', 6 => ' resources/views/sinologist/list1.blade.php | 8 +++++++-', 7 => ' 2 files changed, 12 insertions(+), 3 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-08 05:35:09向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' c9e70d5..f5a13ba master -> origin/master', 3 => 'Updating c9e70d5..f5a13ba', 4 => 'Fast-forward', 5 => ' .gitignore | 1 -', 6 => ' app/Admin/Controllers/GetGisController.php | 6 +-', 7 => ' app/Jobs/CreatePosterJob.php | 9 +-', 8 => ' public/xml/US.xml | 645 +++++++++++++++++++++++++++++', 9 => ' 4 files changed, 658 insertions(+), 3 deletions(-)', 10 => ' create mode 100644 public/xml/US.xml', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-08 05:59:57向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' f5a13ba..451fe48 master -> origin/master', 3 => 'Updating f5a13ba..451fe48', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SearchController.php | 9 ++++++++-', 6 => ' resources/views/admin/getgisbiying.blade.php | 4 +++-', 7 => ' 2 files changed, 11 insertions(+), 2 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-08 06:52:51向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 451fe48..d387fe9 master -> origin/master', 3 => 'Updating 451fe48..d387fe9', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SearchController.php | 39 ++++++++++++++++++++++++-------', 6 => ' 1 file changed, 30 insertions(+), 9 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-08 07:07:52向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' d387fe9..8e54083 master -> origin/master', 3 => 'Updating d387fe9..8e54083', 4 => 'Fast-forward', 5 => ' app/Admin/Controllers/GetGisController.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-08 07:17:23向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 8e54083..a051e86 master -> origin/master', 3 => 'Updating 8e54083..a051e86', 4 => 'Fast-forward', 5 => ' resources/views/admin/getgisbiying.blade.php | 7 ++++---', 6 => ' 1 file changed, 4 insertions(+), 3 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-08 10:43:16向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' a051e86..2089e19 master -> origin/master', 3 => 'Updating a051e86..2089e19', 4 => 'Fast-forward', 5 => ' app/Imports/SinologistImport.php | 3 ++-', 6 => ' app/Models/Sinologist.php | 13 +++++++------', 7 => ' 2 files changed, 9 insertions(+), 7 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-08 10:59:39向Sinologist项目的refs/heads/master分支push了2个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 2089e19..6c3d240 master -> origin/master', 3 => 'Updating 2089e19..6c3d240', 4 => 'Fast-forward', 5 => ' resources/views/sinologist/detail.blade.php | 62 +++++++++++++++++++++++++++++', 6 => ' 1 file changed, 62 insertions(+)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-08 11:17:38向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 6c3d240..653a5d6 master -> origin/master', 3 => 'Updating 6c3d240..653a5d6', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SearchController.php | 3 ++-', 6 => ' 1 file changed, 2 insertions(+), 1 deletion(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-08 13:35:31向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 653a5d6..137538c master -> origin/master', 3 => 'Updating 653a5d6..137538c', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/DownloadController.php | 44 ++++++++', 6 => ' app/Http/Controllers/SearchController.php | 29 ++++-', 7 => ' app/Http/Controllers/SinologistController.php | 8 +-', 8 => ' app/Models/Sinologist.php | 10 +-', 9 => ' public/js/forward.js | 10 +-', 10 => ' resources/views/layouts/forward.blade.php | 4 +-', 11 => ' resources/views/sinologist/detail.blade.php | 55 ++++++++-', 12 => ' resources/views/sinologist/list.blade.php | 154 +++++++++++++++++++++++---', 13 => ' routes/web.php | 3 +', 14 => ' 9 files changed, 289 insertions(+), 28 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-09 04:34:01向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 137538c..1c32c84 master -> origin/master', 3 => 'Updating 137538c..1c32c84', 4 => 'error: Your local changes to the following files would be overwritten by merge:', 5 => ' public/xml/US.xml', 6 => 'Please commit your changes or stash them before you merge.', 7 => 'Aborting', ) $return:1 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-09 05:46:53向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 1c32c84..a2fa0e5 master -> origin/master', 3 => 'Updating 137538c..a2fa0e5', 4 => 'error: Your local changes to the following files would be overwritten by merge:', 5 => ' public/xml/US.xml', 6 => 'Please commit your changes or stash them before you merge.', 7 => 'Aborting', ) $return:1 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-09 06:18:31向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' a2fa0e5..e855d11 master -> origin/master', 3 => 'Updating 137538c..e855d11', 4 => 'error: Your local changes to the following files would be overwritten by merge:', 5 => ' public/xml/US.xml', 6 => 'Please commit your changes or stash them before you merge.', 7 => 'Aborting', ) $return:1 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-09 06:34:54向Sinologist项目的refs/heads/master分支push了2个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' e855d11..5720c82 master -> origin/master', 3 => 'Updating e855d11..5720c82', 4 => 'Fast-forward', 5 => ' app/Admin/Controllers/GetGisController.php | 6 +++++-', 6 => ' public/css/all.css | 2 +-', 7 => ' resources/sass/style.css | 2 +-', 8 => ' 3 files changed, 7 insertions(+), 3 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-09 10:27:42向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 5720c82..c98bc5f master -> origin/master', 3 => 'Updating 5720c82..c98bc5f', 4 => 'Fast-forward', 5 => ' app/Admin/Controllers/GetGisController.php | 2 +-', 6 => ' app/Http/Controllers/SearchController.php | 2 -', 7 => ' public/css/all.css | 2 +-', 8 => ' public/xml/US.xml | 461 ++-------------------------', 9 => ' resources/sass/style.css | 2 +-', 10 => ' resources/views/admin/getgisbiying.blade.php | 9 +-', 11 => ' resources/views/sinologist/list.blade.php | 2 +-', 12 => ' 7 files changed, 40 insertions(+), 440 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-09 13:58:01向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' c98bc5f..3d819c5 master -> origin/master', 3 => 'Updating c98bc5f..3d819c5', 4 => 'Fast-forward', 5 => ' app/Admin/Controllers/WorksController.php | 19 ++++++-', 6 => ' app/Admin/routes.php | 1 +', 7 => ' app/Console/Commands/GetYear.php | 55 +++++++++++++++++++', 8 => ' app/Console/Commands/test.php | 30 +++++++++--', 9 => ' app/Jobs/GetYearJob.php | 61 ++++++++++++++++++++++', 10 => ' app/Providers/ViewServiceProvider.php | 2 +-', 11 => ' config/database.php | 5 +-', 12 => ' .../2020_06_16_084545_create_Works_table.php | 1 +', 13 => ' resources/views/layouts/search.blade.php | 9 ++--', 14 => ' 9 files changed, 171 insertions(+), 12 deletions(-)', 15 => ' create mode 100644 app/Console/Commands/GetYear.php', 16 => ' create mode 100644 app/Jobs/GetYearJob.php', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-09 15:36:41向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 3d819c5..456698c master -> origin/master', 3 => 'Updating 3d819c5..456698c', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SearchController.php | 6 +++---', 6 => ' config/database.php | 2 +-', 7 => ' resources/views/sinologist/list.blade.php | 3 ++-', 8 => ' 3 files changed, 6 insertions(+), 5 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-10 04:59:18向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 456698c..934c962 master -> origin/master', 3 => 'Updating 456698c..934c962', 4 => 'Fast-forward', 5 => ' public/css/all.css | 2 +-', 6 => ' resources/sass/style.css | 2 +-', 7 => ' resources/views/home.blade.php | 2 +-', 8 => ' resources/views/sinologist/list.blade.php | 2 +-', 9 => ' 4 files changed, 4 insertions(+), 4 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-10 05:03:24向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 934c962..8b56fd3 master -> origin/master', 3 => 'Updating 934c962..8b56fd3', 4 => 'Fast-forward', 5 => ' app/Admin/Controllers/GetGisController.php | 47 +---', 6 => ' app/Admin/Controllers/GetGisIndexController.php | 232 ++++++++++++++++++', 7 => ' app/Admin/Controllers/JobsController.php | 2 +-', 8 => ' app/Admin/Controllers/LntController.php | 5 +-', 9 => ' app/Admin/Controllers/SinologistController.php | 5 +-', 10 => ' app/Admin/routes.php | 11 +-', 11 => ' app/Models/Nocountry.php | 11 +', 12 => ' public/images/detail.png | Bin 0 -> 59889 bytes', 13 => ' public/images/detail_1.png | Bin 0 -> 3439 bytes', 14 => ' public/images/detail_2.png | Bin 0 -> 3287 bytes', 15 => ' public/xml/US.xml | 157 +++---------', 16 => ' resources/views/admin/getgis.blade.php | 265 ++++++++++++++-------', 17 => ' ...etgisbiying.blade.php => getgisindex.blade.php} | 9 +-', 18 => ' 13 files changed, 481 insertions(+), 263 deletions(-)', 19 => ' create mode 100644 app/Admin/Controllers/GetGisIndexController.php', 20 => ' create mode 100644 app/Models/Nocountry.php', 21 => ' create mode 100644 public/images/detail.png', 22 => ' create mode 100644 public/images/detail_1.png', 23 => ' create mode 100644 public/images/detail_2.png', 24 => ' rename resources/views/admin/{getgisbiying.blade.php => getgisindex.blade.php} (98%)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-10 06:19:51向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 8b56fd3..aedfece master -> origin/master', 3 => 'Updating 8b56fd3..aedfece', 4 => 'Fast-forward', 5 => ' app/Console/Commands/test.php | 26 +-------------------------', 6 => ' app/Jobs/GetYearJob.php | 2 +-', 7 => ' public/css/all.css | 5 +++--', 8 => ' resources/sass/style.css | 5 +++--', 9 => ' resources/views/sinologist/detail.blade.php | 9 ++++++++-', 10 => ' 5 files changed, 16 insertions(+), 31 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-10 06:27:05向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' aedfece..968ddec master -> origin/master', 3 => 'Updating aedfece..968ddec', 4 => 'Fast-forward', 5 => ' app/Admin/Controllers/WorksController.php | 3 ++-', 6 => ' 1 file changed, 2 insertions(+), 1 deletion(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-10 06:48:33向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 968ddec..930c7aa master -> origin/master', 3 => 'Updating 968ddec..930c7aa', 4 => 'Fast-forward', 5 => ' resources/views/sinologist/list.blade.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-10 07:42:47向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 930c7aa..9244d85 master -> origin/master', 3 => 'Updating 930c7aa..9244d85', 4 => 'Fast-forward', 5 => ' public/css/all.css | 2 +-', 6 => ' resources/sass/style.css | 2 +-', 7 => ' 2 files changed, 2 insertions(+), 2 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-10 13:14:59向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 9244d85..4794b32 master -> origin/master', 3 => 'Updating 9244d85..4794b32', 4 => 'Fast-forward', 5 => ' app/Admin/Controllers/WorksController.php | 19 +++++-', 6 => ' app/Admin/routes.php | 1 +', 7 => ' app/Console/Commands/test.php | 34 ++++++++++-', 8 => ' app/Http/Controllers/SearchController.php | 53 +++++++++--------', 9 => ' app/Jobs/GetNewTitleJob.php | 67 ++++++++++++++++++++++', 10 => ' app/Observers/WorksObserver.php | 58 +++++++++++++++++++', 11 => ' app/Providers/AppServiceProvider.php | 1 +', 12 => ' .../2020_06_16_084545_create_Works_table.php | 1 +', 13 => ' 8 files changed, 206 insertions(+), 28 deletions(-)', 14 => ' create mode 100644 app/Jobs/GetNewTitleJob.php', 15 => ' create mode 100644 app/Observers/WorksObserver.php', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-10 13:20:55向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 4794b32..8a1b00b master -> origin/master', 3 => 'Updating 4794b32..8a1b00b', 4 => 'Fast-forward', 5 => ' app/Admin/Controllers/WorksController.php | 1 +', 6 => ' 1 file changed, 1 insertion(+)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-11 04:08:52向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 8a1b00b..12b7b4c master -> origin/master', 3 => 'Updating 8a1b00b..12b7b4c', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SearchController.php | 65 ++++++++++++++++++++++++++-----', 6 => ' 1 file changed, 56 insertions(+), 9 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-11 07:25:38向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 12b7b4c..6ae4f57 master -> origin/master', 3 => 'Updating 12b7b4c..6ae4f57', 4 => 'Fast-forward', 5 => ' public/js/all.js | 6 +++++-', 6 => ' resources/js/js.js | 6 +++++-', 7 => ' 2 files changed, 10 insertions(+), 2 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-12 02:43:02向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 6ae4f57..f23c0ff master -> origin/master', 3 => 'Updating 6ae4f57..f23c0ff', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SearchController.php | 16 ++++++++--------', 6 => ' resources/views/layouts/search.blade.php | 16 ++++++++++++++--', 7 => ' 2 files changed, 22 insertions(+), 10 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-12 03:25:28向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' f23c0ff..4f85108 master -> origin/master', 3 => 'Updating f23c0ff..4f85108', 4 => 'Fast-forward', 5 => ' app/Http/Api/Controllers/GetRelationAuthorController.php | 9 +++++----', 6 => ' app/Http/Controllers/SearchController.php | 2 +-', 7 => ' resources/views/layouts/search.blade.php | 8 ++++----', 8 => ' 3 files changed, 10 insertions(+), 9 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-12 03:36:41向Sinologist项目的refs/heads/master分支push了2个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 4f85108..29ab909 master -> origin/master', 3 => 'Updating 4f85108..29ab909', 4 => 'Fast-forward', 5 => ' app/Http/Api/Controllers/GetRelationAuthorController.php | 14 +++++++++++++-', 6 => ' resources/views/sinologist/list.blade.php | 4 ++--', 7 => ' routes/api.php | 2 +-', 8 => ' 3 files changed, 16 insertions(+), 4 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-12 05:39:41向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 29ab909..bc38602 master -> origin/master', 3 => 'Updating 29ab909..bc38602', 4 => 'Fast-forward', 5 => ' resources/views/layouts/search.blade.php | 4 ++--', 6 => ' 1 file changed, 2 insertions(+), 2 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-12 05:45:29向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' bc38602..96ecfb2 master -> origin/master', 3 => 'Updating bc38602..96ecfb2', 4 => 'Fast-forward', 5 => ' app/Http/Api/Controllers/GetRelationAuthorController.php | 8 +++++++-', 6 => ' 1 file changed, 7 insertions(+), 1 deletion(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-12 06:49:01向Sinologist项目的refs/heads/master分支push了2个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 96ecfb2..08e0770 master -> origin/master', 3 => 'Updating 96ecfb2..08e0770', 4 => 'Fast-forward', 5 => ' app/Models/MoreInfo.php | 2 +-', 6 => ' app/Models/Sinologist.php | 3 ++', 7 => ' public/css/all.css | 29 +++++++++-', 8 => ' public/images/detail_3.png | Bin 0 -> 7783 bytes', 9 => ' public/images/detail_4.png | Bin 0 -> 3241 bytes', 10 => ' public/images/detail_5.png | Bin 0 -> 3260 bytes', 11 => ' public/images/forward.png | Bin 0 -> 5800 bytes', 12 => ' resources/sass/style.css | 31 +++++++++--', 13 => ' resources/views/sinologist/detail.blade.php | 61 +---------------------', 14 => ' resources/views/sinologist/namecenter.blade.1.php | 60 +++++++++++++++++++++', 15 => ' resources/views/sinologist/namecenter.blade.php | 58 ++++++++++++++++++++', 16 => ' 11 files changed, 178 insertions(+), 66 deletions(-)', 17 => ' create mode 100644 public/images/detail_3.png', 18 => ' create mode 100644 public/images/detail_4.png', 19 => ' create mode 100644 public/images/detail_5.png', 20 => ' create mode 100644 public/images/forward.png', 21 => ' create mode 100644 resources/views/sinologist/namecenter.blade.1.php', 22 => ' create mode 100644 resources/views/sinologist/namecenter.blade.php', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-13 01:55:30向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 08e0770..7f41cbe master -> origin/master', 3 => 'Updating 08e0770..7f41cbe', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SinologistController.php | 8 +++++---', 6 => ' app/Models/Sinologist.php | 11 +++++++----', 7 => ' app/Models/Works.php | 2 +-', 8 => ' public/css/all.css | 2 +-', 9 => ' resources/sass/style.css | 2 +-', 10 => ' resources/views/sinologist/detail.blade.php | 2 +-', 11 => ' 6 files changed, 16 insertions(+), 11 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-13 02:09:56向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 7f41cbe..ee28909 master -> origin/master', 3 => 'Updating 7f41cbe..ee28909', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SearchController.php | 5 ++++-', 6 => ' 1 file changed, 4 insertions(+), 1 deletion(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-13 03:18:24向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' ee28909..e179723 master -> origin/master', 3 => 'Updating ee28909..e179723', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SearchController.php | 69 ++++++++-----------------------', 6 => ' 1 file changed, 17 insertions(+), 52 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-13 06:14:16向Sinologist项目的refs/heads/master分支push了2个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' e179723..1a9200a master -> origin/master', 3 => 'Updating e179723..1a9200a', 4 => 'Fast-forward', 5 => ' app/Models/Sinologist.php | 2 +-', 6 => ' public/css/all.css | 2 +-', 7 => ' resources/sass/style.css | 2 +-', 8 => ' resources/views/sinologist/detail.blade.php | 2 +-', 9 => ' resources/views/sinologist/list1.blade.php | 2 +-', 10 => ' 5 files changed, 5 insertions(+), 5 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-13 06:42:29向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 1a9200a..8c77983 master -> origin/master', 3 => 'Updating 1a9200a..8c77983', 4 => 'Fast-forward', 5 => ' public/css/all.css | 4 ++--', 6 => ' resources/sass/style.css | 4 ++--', 7 => ' 2 files changed, 4 insertions(+), 4 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-13 14:15:51向Sinologist项目的refs/heads/master分支push了2个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 8c77983..1b55fd5 master -> origin/master', 3 => 'Updating 8c77983..1b55fd5', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SearchController.php | 4 +-', 6 => ' public/css/all.css | 22 ++++--', 7 => ' public/images/icon_1.png | Bin 0 -> 3729 bytes', 8 => ' public/images/icon_2.png | Bin 0 -> 3768 bytes', 9 => ' public/images/icon_3.png | Bin 0 -> 3857 bytes', 10 => ' public/images/search_result_background.png | Bin 0 -> 118626 bytes', 11 => ' public/images/website.png | Bin 0 -> 5826 bytes', 12 => ' resources/sass/style.css | 24 +++++--', 13 => ' resources/views/auth/login.blade.php | 19 +++---', 14 => ' resources/views/auth/passwords/email.blade.php | 6 +-', 15 => ' resources/views/auth/passwords/reset.blade.php | 6 +-', 16 => ' resources/views/auth/register.blade.php | 19 +++---', 17 => ' resources/views/sinologist/list.blade.php | 2 +-', 18 => ' resources/views/sinologist/list1.blade.php | 86 +++++++++++++++---------', 19 => ' resources/views/sinologist/namecenter.blade.php | 1 +', 20 => ' 15 files changed, 123 insertions(+), 66 deletions(-)', 21 => ' create mode 100644 public/images/icon_1.png', 22 => ' create mode 100644 public/images/icon_2.png', 23 => ' create mode 100644 public/images/icon_3.png', 24 => ' create mode 100644 public/images/search_result_background.png', 25 => ' create mode 100644 public/images/website.png', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-14 06:07:44向Sinologist项目的refs/heads/master分支push了2个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 1b55fd5..7c7ee0c master -> origin/master', 3 => 'Updating 1b55fd5..7c7ee0c', 4 => 'Fast-forward', 5 => ' app/Http/Api/Controllers/KongfzController.php | 33 +++++++', 6 => ' app/Http/Controllers/Auth/SocialAuthController.php | 7 ++', 7 => ' app/Http/Controllers/MyController.php | 44 +++++++++', 8 => ' app/Http/Controllers/SinologistController.php | 1 +', 9 => ' composer.lock | 4 +-', 10 => ' config/app.php | 3 +-', 11 => ' ...020_08_14_115745_add_company_to_users_table.php | 37 ++++++++', 12 => ' resources/views/auth/login.blade.1.php | 104 ---------------------', 13 => ' resources/views/auth/login.blade.php | 2 +-', 14 => ' resources/views/auth/register.blade.1.php | 77 ---------------', 15 => ' resources/views/my.blade.php | 62 ++++++++++++', 16 => ' routes/web.php | 3 +', 17 => ' 12 files changed, 192 insertions(+), 185 deletions(-)', 18 => ' create mode 100644 app/Http/Api/Controllers/KongfzController.php', 19 => ' create mode 100644 app/Http/Controllers/MyController.php', 20 => ' create mode 100644 database/migrations/2020_08_14_115745_add_company_to_users_table.php', 21 => ' delete mode 100644 resources/views/auth/login.blade.1.php', 22 => ' delete mode 100644 resources/views/auth/register.blade.1.php', 23 => ' create mode 100644 resources/views/my.blade.php', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-14 06:10:16向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 7c7ee0c..e685085 master -> origin/master', 3 => 'Updating 7c7ee0c..e685085', 4 => 'Fast-forward', 5 => ' config/moderation.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-14 06:12:34向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' e685085..3ae8cd7 master -> origin/master', 3 => 'Updating e685085..3ae8cd7', 4 => 'Fast-forward', 5 => ' resources/views/auth/register.blade.php | 4 ++--', 6 => ' 1 file changed, 2 insertions(+), 2 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-14 06:43:24向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 3ae8cd7..6d4d08b master -> origin/master', 3 => 'Updating 3ae8cd7..6d4d08b', 4 => 'Fast-forward', 5 => ' resources/views/auth/register.blade.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-14 07:16:00向Sinologist项目的refs/heads/master分支push了2个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 6d4d08b..75198c5 master -> origin/master', 3 => 'Updating 6d4d08b..75198c5', 4 => 'Fast-forward', 5 => ' app/Admin/Controllers/SinologistController.php | 2 +-', 6 => ' app/Models/Sinologist.php | 7 ++++++-', 7 => ' .../upload/avatar/0c2ba87c26998648b11b2536af5740c3.png | Bin 0 -> 4808 bytes', 8 => ' public/upload/avatar/logo2.png | Bin 0 -> 4808 bytes', 9 => ' resources/views/sinologist/namecenter.blade.php | 5 +++--', 10 => ' 5 files changed, 10 insertions(+), 4 deletions(-)', 11 => ' create mode 100644 public/upload/avatar/0c2ba87c26998648b11b2536af5740c3.png', 12 => ' create mode 100644 public/upload/avatar/logo2.png', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-14 07:49:21向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 75198c5..c5e2799 master -> origin/master', 3 => 'Updating 75198c5..c5e2799', 4 => 'Fast-forward', 5 => ' resources/views/layouts/pc_nav.blade.php | 4 ++--', 6 => ' resources/views/my.blade.php | 2 +-', 7 => ' 2 files changed, 3 insertions(+), 3 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-14 08:28:43向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' c5e2799..095fba4 master -> origin/master', 3 => 'Updating c5e2799..095fba4', 4 => 'Fast-forward', 5 => ' resources/views/sinologist/namecenter.blade.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-14 12:41:28向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 095fba4..fb10c85 master -> origin/master', 3 => 'Updating 095fba4..fb10c85', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SearchController.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-14 12:54:11向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' fb10c85..8a4f24c master -> origin/master', 3 => 'Updating fb10c85..8a4f24c', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/Auth/SocialAuthController.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-14 14:00:30向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 8a4f24c..51ee63a master -> origin/master', 3 => 'Updating 8a4f24c..51ee63a', 4 => 'Fast-forward', 5 => ' app/Admin/Controllers/InfoController.php | 59 ++++++++++++++++++++++', 6 => ' app/Admin/routes.php | 2 +', 7 => ' app/Http/Controllers/MyController.php | 47 ++++++++++-------', 8 => ' app/Models/Info.php | 10 ++++', 9 => ' app/Observers/InfosObserver.php | 19 +++++++', 10 => ' app/Providers/AppServiceProvider.php | 4 ++', 11 => ' ...020_08_14_115745_add_company_to_users_table.php | 37 --------------', 12 => ' .../2020_08_14_170711_create_infos_table.php | 36 +++++++++++++', 13 => ' public/upload/improve/.gitignore | 2 +', 14 => ' resources/views/layouts/pc_nav.blade.php | 3 +-', 15 => ' resources/views/my.blade.php | 27 ++++++----', 16 => ' 11 files changed, 180 insertions(+), 66 deletions(-)', 17 => ' create mode 100644 app/Admin/Controllers/InfoController.php', 18 => ' create mode 100644 app/Models/Info.php', 19 => ' create mode 100644 app/Observers/InfosObserver.php', 20 => ' delete mode 100644 database/migrations/2020_08_14_115745_add_company_to_users_table.php', 21 => ' create mode 100644 database/migrations/2020_08_14_170711_create_infos_table.php', 22 => ' create mode 100644 public/upload/improve/.gitignore', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-14 14:08:31向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 51ee63a..d5e1c53 master -> origin/master', 3 => 'Updating 51ee63a..d5e1c53', 4 => 'Fast-forward', 5 => ' resources/views/layouts/mobile_nav.blade.php | 7 ++++---', 6 => ' resources/views/layouts/pc_nav.blade.php | 2 +-', 7 => ' 2 files changed, 5 insertions(+), 4 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-15 02:33:41向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' d5e1c53..0a4198d master -> origin/master', 3 => 'Updating d5e1c53..0a4198d', 4 => 'Fast-forward', 5 => ' app/Models/Zan.php | 5 +----', 6 => ' 1 file changed, 1 insertion(+), 4 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-15 02:46:13向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 0a4198d..c06d774 master -> origin/master', 3 => 'Updating 0a4198d..c06d774', 4 => 'Fast-forward', 5 => ' resources/views/comments/comment.blade.php | 6 ++----', 6 => ' 1 file changed, 2 insertions(+), 4 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-15 05:53:29向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' c06d774..1cea359 master -> origin/master', 3 => 'Updating c06d774..1cea359', 4 => 'Fast-forward', 5 => ' config/moderation.php | 2 +-', 6 => ' resources/views/comments/form.blade.php | 2 +-', 7 => ' resources/views/layouts/mobile_nav.blade.php | 2 +-', 8 => ' resources/views/layouts/pc_nav.blade.php | 2 +-', 9 => ' 4 files changed, 4 insertions(+), 4 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-15 06:18:57向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 1cea359..9d22a49 master -> origin/master', 3 => 'Updating 1cea359..9d22a49', 4 => 'Fast-forward', 5 => ' app/Admin/Controllers/InfoController.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-15 06:40:02向Sinologist项目的refs/heads/master分支push了2个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 9d22a49..e4f7b65 master -> origin/master', 3 => 'Updating 9d22a49..e4f7b65', 4 => 'Fast-forward', 5 => ' app/Admin/Controllers/CommentsController.php | 2 +-', 6 => ' app/Libs/Emoji.php | 4312 ++++++++++++++++++++++++++', 7 => ' app/Providers/ViewServiceProvider.php | 5 +', 8 => ' public/css/all.css | 4 +-', 9 => ' resources/sass/style.css | 6 +-', 10 => ' resources/views/comments/emoji.blade.php | 27 +', 11 => ' resources/views/my.blade.php | 9 +-', 12 => ' 7 files changed, 4356 insertions(+), 9 deletions(-)', 13 => ' create mode 100644 app/Libs/Emoji.php', 14 => ' create mode 100644 resources/views/comments/emoji.blade.php', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-15 07:02:07向Sinologist项目的refs/heads/master分支push了2个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' e4f7b65..73b15c4 master -> origin/master', 3 => 'Updating e4f7b65..73b15c4', 4 => 'Fast-forward', 5 => ' public/css/all.css | 4 ++--', 6 => ' resources/sass/style.css | 4 ++--', 7 => ' resources/views/my.blade.php | 14 ++++++--------', 8 => ' 3 files changed, 10 insertions(+), 12 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-15 08:25:46向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 73b15c4..1ab0a95 master -> origin/master', 3 => 'Updating 73b15c4..1ab0a95', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/CommentsController.php | 29 +++++++++++++++++++', 6 => ' app/Http/Controllers/SinologistController.php | 25 +++++++++++++----', 7 => ' app/Models/Sinologist.php | 9 ++++--', 8 => ' app/Models/Zan.php | 2 +-', 9 => ' public/css/all.css | 2 +-', 10 => ' resources/sass/style.css | 2 +-', 11 => ' resources/views/comments/all.blade.php | 40 +++++++++++++++++++++++++++', 12 => ' resources/views/comments/emoji.blade.php | 2 +-', 13 => ' resources/views/comments/list.blade.php | 34 +++++++++++++++++------', 14 => ' resources/views/comments/listall.blade.php | 8 ++++++', 15 => ' resources/views/sinologist/detail.blade.php | 14 +++++++---', 16 => ' routes/web.php | 4 +--', 17 => ' 12 files changed, 143 insertions(+), 28 deletions(-)', 18 => ' create mode 100644 app/Http/Controllers/CommentsController.php', 19 => ' create mode 100644 resources/views/comments/all.blade.php', 20 => ' create mode 100644 resources/views/comments/listall.blade.php', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-15 09:40:40向Sinologist项目的refs/heads/master分支push了2个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 1ab0a95..6e19212 master -> origin/master', 3 => 'Updating 1ab0a95..6e19212', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SinologistController.php | 10 +++', 6 => ' public/js/all.js | 20 ++---', 7 => ' public/js/forward.js | 66 ++------------', 8 => ' resources/js/js.js | 20 ++---', 9 => ' resources/views/comments/emoji.blade.php | 15 ++--', 10 => ' resources/views/comments/form.blade.php | 2 +-', 11 => ' resources/views/comments/list.blade.php | 13 ++-', 12 => ' resources/views/layouts/forward.blade.php | 2 +-', 13 => ' resources/views/layouts/sinogo_forward.blade.php | 105 +++++++++++++++++++++++', 14 => ' resources/views/sinologist/detail.blade.php | 26 +-----', 15 => ' routes/web.php | 10 ++-', 16 => ' 11 files changed, 170 insertions(+), 119 deletions(-)', 17 => ' create mode 100644 resources/views/layouts/sinogo_forward.blade.php', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-15 09:45:13向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 6e19212..e1e2b54 master -> origin/master', 3 => 'Updating 6e19212..e1e2b54', 4 => 'Fast-forward', 5 => ' public/js/forward.js | 11 +++++++----', 6 => ' 1 file changed, 7 insertions(+), 4 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-15 09:53:46向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' e1e2b54..13ffef9 master -> origin/master', 3 => 'Updating e1e2b54..13ffef9', 4 => 'Fast-forward', 5 => ' public/js/forward.js | 5 +++--', 6 => ' 1 file changed, 3 insertions(+), 2 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-16 03:11:38向Sinologist项目的refs/heads/master分支push了2个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 13ffef9..38456ac master -> origin/master', 3 => 'Updating 13ffef9..38456ac', 4 => 'Fast-forward', 5 => ' resources/views/layouts/sinogo_forward.blade.php | 4 +---', 6 => ' resources/views/sinologist/detail.blade.php | 4 ++--', 7 => ' 2 files changed, 3 insertions(+), 5 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-16 03:18:08向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 38456ac..bd88d1f master -> origin/master', 3 => 'Updating 38456ac..bd88d1f', 4 => 'Fast-forward', 5 => ' resources/views/layouts/sinogo_forward.blade.php | 14 +++++++-------', 6 => ' 1 file changed, 7 insertions(+), 7 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-16 04:04:45向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' bd88d1f..1feb708 master -> origin/master', 3 => 'Updating bd88d1f..1feb708', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SinologistController.php | 2 +-', 6 => ' app/Models/Sinologist.php | 6 ++++--', 7 => ' app/Models/Works.php | 5 +++--', 8 => ' resources/views/sinologist/detail.blade.php | 4 ++--', 9 => ' 4 files changed, 10 insertions(+), 7 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-16 04:46:09向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 1feb708..8e1d171 master -> origin/master', 3 => 'Updating 1feb708..8e1d171', 4 => 'Fast-forward', 5 => ' public/css/all.css | 2 ++', 6 => ' public/images/countryflag.jpg | Bin 0 -> 292701 bytes', 7 => ' public/images/usa.jpg | Bin 0 -> 9331 bytes', 8 => ' resources/sass/style.css | 4 +++-', 9 => ' resources/views/home.blade.php | 17 +++++------------', 10 => ' 5 files changed, 10 insertions(+), 13 deletions(-)', 11 => ' create mode 100644 public/images/countryflag.jpg', 12 => ' create mode 100644 public/images/usa.jpg', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-16 06:14:01向Sinologist项目的refs/heads/master分支push了2个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 8e1d171..e0f6dbd master -> origin/master', 3 => 'Updating 8e1d171..e0f6dbd', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SinologistController.php | 2 +-', 6 => ' public/js/forward.js | 6 +++---', 7 => ' resources/views/home.blade.php | 2 +-', 8 => ' resources/views/layouts/forward.blade.php | 2 +-', 9 => ' resources/views/layouts/sinogo_forward.blade.php | 4 ++--', 10 => ' 5 files changed, 8 insertions(+), 8 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-16 06:31:27向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' e0f6dbd..e1af0dd master -> origin/master', 3 => 'Updating e0f6dbd..e1af0dd', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SinologistController.php | 4 +++-', 6 => ' resources/views/layouts/sinogo_forward.blade.php | 8 ++++----', 7 => ' 2 files changed, 7 insertions(+), 5 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-16 06:37:06向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' e1af0dd..f081fd2 master -> origin/master', 3 => 'Updating e1af0dd..f081fd2', 4 => 'Fast-forward', 5 => ' resources/views/layouts/sinogo_forward.blade.php | 1 +', 6 => ' resources/views/sinologist/detail.blade.php | 2 +-', 7 => ' 2 files changed, 2 insertions(+), 1 deletion(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-16 06:55:42向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' f081fd2..225c95a master -> origin/master', 3 => 'Updating f081fd2..225c95a', 4 => 'Fast-forward', 5 => ' resources/views/layouts/sinogo_forward.blade.php | 5 +++--', 6 => ' 1 file changed, 3 insertions(+), 2 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-16 07:26:46向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 225c95a..663e654 master -> origin/master', 3 => 'Updating 225c95a..663e654', 4 => 'Fast-forward', 5 => ' public/MP_verify_71PtRAzk7mvCa0oA.txt | 1 +', 6 => ' 1 file changed, 1 insertion(+)', 7 => ' create mode 100644 public/MP_verify_71PtRAzk7mvCa0oA.txt', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-16 07:54:20向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 663e654..5b36a07 master -> origin/master', 3 => 'Updating 663e654..5b36a07', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/WeixinController.php | 3 +--', 6 => ' config/firewall.php | 2 +-', 7 => ' resources/views/layouts/sinogo_forward.blade.php | 2 +-', 8 => ' routes/web.php | 2 +-', 9 => ' 4 files changed, 4 insertions(+), 5 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-16 07:58:26向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 5b36a07..8f94dfc master -> origin/master', 3 => 'Updating 5b36a07..8f94dfc', 4 => 'Fast-forward', 5 => ' resources/views/layouts/sinogo_forward.blade.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-16 10:09:50向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 8f94dfc..e7331b9 master -> origin/master', 3 => 'Updating 8f94dfc..e7331b9', 4 => 'Fast-forward', 5 => ' app/Http/Api/Controllers/DoubanController.php | 41 +++++++++++++++++++', 6 => ' app/Http/Services/APIHelper.php | 2 +-', 7 => ' public/css/all.css | 2 +', 8 => ' resources/sass/style.css | 2 +', 9 => ' resources/views/sinologist/detail.blade.php | 58 +++++++++++++++++++++++++++', 10 => ' routes/api.php | 1 +', 11 => ' 6 files changed, 105 insertions(+), 1 deletion(-)', 12 => ' create mode 100644 app/Http/Api/Controllers/DoubanController.php', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-16 10:19:01向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' e7331b9..62003d3 master -> origin/master', 3 => 'Updating e7331b9..62003d3', 4 => 'Fast-forward', 5 => ' resources/views/sinologist/detail.blade.php | 3 +++', 6 => ' 1 file changed, 3 insertions(+)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-17 05:26:02向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 62003d3..3ce6bcc master -> origin/master', 3 => 'Updating 62003d3..3ce6bcc', 4 => 'Fast-forward', 5 => ' app/Http/Api/Controllers/DoubanController.php | 9 +++++---', 6 => ' public/css/all.css | 5 +++-', 7 => ' resources/sass/style.css | 5 +++-', 8 => ' resources/views/sinologist/detail.blade.php | 33 ++++++++++++++++++++-------', 9 => ' 4 files changed, 39 insertions(+), 13 deletions(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-17 07:09:28向Sinologist项目的refs/heads/master分支push了2个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 3ce6bcc..d932b4a master -> origin/master', 3 => 'Updating 3ce6bcc..d932b4a', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/CommentsController.php | 2 +-', 6 => ' app/Http/Controllers/MoreInfoController.php | 16 ++++++++++', 7 => ' app/Http/Controllers/SinologistController.php | 7 ++---', 8 => ' app/Http/Controllers/WorksController.php | 19 ++++++++++++', 9 => ' app/Models/Sinologist.php | 26 +++++++++-------', 10 => ' app/Models/Works.php | 1 +', 11 => ' app/Models/Zan.php | 19 +++++++++++-', 12 => ' ...2020_08_17_134005_add_mid_wid_to_zans_table.php | 36 ++++++++++++++++++++++', 13 => ' public/css/all.css | 8 ++---', 14 => ' resources/sass/style.css | 8 ++---', 15 => ' resources/views/layouts/forward.blade.php | 1 -', 16 => ' resources/views/layouts/sinogo_forward.blade.php | 5 +--', 17 => ' resources/views/sinologist/detail.blade.php | 16 +++++-----', 18 => ' routes/web.php | 2 ++', 19 => ' 14 files changed, 130 insertions(+), 36 deletions(-)', 20 => ' create mode 100644 database/migrations/2020_08_17_134005_add_mid_wid_to_zans_table.php', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-17 07:12:19向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' d932b4a..fdce364 master -> origin/master', 3 => 'Updating d932b4a..fdce364', 4 => 'Fast-forward', 5 => ' public/autobuild.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-17 07:24:41向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' fdce364..d8351d6 master -> origin/master', 3 => 'Updating fdce364..d8351d6', 4 => 'Fast-forward', 5 => ' app/Models/Zan.php | 1 +', 6 => ' resources/views/sinologist/list.blade.php | 50 +++----------------------------', 7 => ' 2 files changed, 5 insertions(+), 46 deletions(-)', 8 => '**************************************', 9 => '* Application In Production! *', 10 => '**************************************', 11 => '', 12 => ' Do you really wish to run this command? (yes/no) [no]:', 13 => ' > Command Canceled!', ) $return:1 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-17 07:34:12向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' d8351d6..7f96ee6 master -> origin/master', 3 => 'Updating d8351d6..7f96ee6', 4 => 'Fast-forward', 5 => ' public/autobuild.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => '**************************************', 8 => '* Application In Production! *', 9 => '**************************************', 10 => '', 11 => ' Do you really wish to run this command? (yes/no) [no]:', 12 => ' > Command Canceled!', ) $return:1 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-17 10:11:09向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 7f96ee6..72d2b66 master -> origin/master', 3 => 'Updating 7f96ee6..72d2b66', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/CommentsController.php | 2 +-', 6 => ' app/Http/Controllers/MoreInfoController.php | 2 +-', 7 => ' app/Http/Controllers/SinologistController.php | 4 +-', 8 => ' app/Http/Controllers/WorksController.php | 6 +-', 9 => ' app/Models/Sinologist.php | 2 +-', 10 => ' public/js/all.js | 68 +++++++++++++++', 11 => ' resources/js/js.js | 69 +++++++++++++++', 12 => ' resources/views/comments/comment.blade.php | 4 +-', 13 => ' resources/views/sinologist/detail.blade.php | 111 +++++++++---------------', 14 => ' resources/views/sinologist/namecenter.blade.php | 2 +-', 15 => ' 10 files changed, 188 insertions(+), 82 deletions(-)', 16 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-17 10:21:50向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 72d2b66..4937fa7 master -> origin/master', 3 => 'Updating 72d2b66..4937fa7', 4 => 'Fast-forward', 5 => ' resources/views/sinologist/detail.blade.php | 15 +++++++++------', 6 => ' 1 file changed, 9 insertions(+), 6 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-17 13:25:41向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 4937fa7..12962e8 master -> origin/master', 3 => 'Updating 4937fa7..12962e8', 4 => 'Fast-forward', 5 => ' public/css/all.css | 12 ++++++------', 6 => ' resources/sass/style.css | 12 ++++++------', 7 => ' resources/views/layouts/pc_nav.blade.php | 2 --', 8 => ' 3 files changed, 12 insertions(+), 14 deletions(-)', 9 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-17 14:40:54向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 12962e8..7515ad1 master -> origin/master', 3 => 'Updating 12962e8..7515ad1', 4 => 'Fast-forward', 5 => ' public/images/icon/logo.png | Bin 5835 -> 9458 bytes', 6 => ' public/images/icon/logo_old.png | Bin 0 -> 5835 bytes', 7 => ' resources/views/explain.blade.php | 2 +-', 8 => ' 3 files changed, 1 insertion(+), 1 deletion(-)', 9 => ' create mode 100644 public/images/icon/logo_old.png', 10 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-17 14:46:00向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 7515ad1..4a68b6c master -> origin/master', 3 => 'Updating 7515ad1..4a68b6c', 4 => 'Fast-forward', 5 => ' public/css/all.css | 2 +-', 6 => ' resources/sass/style.css | 2 +-', 7 => ' resources/views/layouts/pc_nav.blade.php | 2 +-', 8 => ' resources/views/my.blade.php | 2 +-', 9 => ' 4 files changed, 4 insertions(+), 4 deletions(-)', 10 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-17 14:53:18向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 4a68b6c..4aad082 master -> origin/master', 3 => 'Updating 4a68b6c..4aad082', 4 => 'Fast-forward', 5 => ' public/css/all.css | 14 +++++++-------', 6 => ' resources/sass/style.css | 14 +++++++-------', 7 => ' 2 files changed, 14 insertions(+), 14 deletions(-)', 8 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-17 15:01:37向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 4aad082..5452175 master -> origin/master', 3 => 'Updating 4aad082..5452175', 4 => 'Fast-forward', 5 => ' public/css/all.css | 2 +-', 6 => ' public/images/icon/logo.png | Bin 9458 -> 10180 bytes', 7 => ' resources/sass/style.css | 2 +-', 8 => ' 3 files changed, 2 insertions(+), 2 deletions(-)', 9 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-17 15:11:53向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 5452175..3d769f3 master -> origin/master', 3 => 'Updating 5452175..3d769f3', 4 => 'Fast-forward', 5 => ' public/css/all.css | 4 ++--', 6 => ' resources/sass/style.css | 4 ++--', 7 => ' 2 files changed, 4 insertions(+), 4 deletions(-)', 8 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-18 08:54:19向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 3d769f3..41b5f70 master -> origin/master', 3 => 'Updating 3d769f3..41b5f70', 4 => 'Fast-forward', 5 => ' public/css/all.css | 4 +++-', 6 => ' resources/sass/style.css | 6 +++--', 7 => ' resources/views/explain.blade.php | 37 ++++++++++++++++++++++++-------', 8 => ' resources/views/my.blade.php | 11 ++++++++-', 9 => ' resources/views/sinologist/list.blade.php | 4 ++--', 10 => ' 5 files changed, 48 insertions(+), 14 deletions(-)', 11 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-18 09:13:23向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 41b5f70..3e589e5 master -> origin/master', 3 => 'Updating 41b5f70..3e589e5', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SearchController.php | 23 ++++++++++++++---------', 6 => ' resources/views/sinologist/list.blade.php | 10 ++++++++--', 7 => ' 2 files changed, 22 insertions(+), 11 deletions(-)', 8 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-18 10:57:01向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 3e589e5..1fb19af master -> origin/master', 3 => 'Updating 3e589e5..1fb19af', 4 => 'Fast-forward', 5 => ' public/css/all.css | 6 +++---', 6 => ' resources/sass/style.css | 6 +++---', 7 => ' resources/views/my.blade.php | 2 +-', 8 => ' resources/views/sinologist/list.blade.php | 2 +-', 9 => ' 4 files changed, 8 insertions(+), 8 deletions(-)', 10 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-19 01:45:13向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 1fb19af..c171c17 master -> origin/master', 3 => 'Updating 1fb19af..c171c17', 4 => 'Fast-forward', 5 => ' resources/views/sinologist/detail.blade.php | 4 ++--', 6 => ' 1 file changed, 2 insertions(+), 2 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-19 01:48:12向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' c171c17..983f03a master -> origin/master', 3 => 'Updating c171c17..983f03a', 4 => 'Fast-forward', 5 => ' resources/views/sinologist/detail.blade.php | 2 ++', 6 => ' 1 file changed, 2 insertions(+)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-19 01:49:40向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 983f03a..abb7451 master -> origin/master', 3 => 'Updating 983f03a..abb7451', 4 => 'Fast-forward', 5 => ' resources/views/sinologist/detail.blade.php | 63 ++++++++++++++---------------', 6 => ' 1 file changed, 31 insertions(+), 32 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-19 01:58:29向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' abb7451..cbe2374 master -> origin/master', 3 => 'Updating abb7451..cbe2374', 4 => 'Fast-forward', 5 => ' public/js/all.js | 37 ++++++++++++++++++++++++++++-', 6 => ' resources/js/js.js | 37 ++++++++++++++++++++++++++++-', 7 => ' resources/views/sinologist/detail.blade.php | 37 +----------------------------', 8 => ' resources/views/sinologist/list.blade.php | 5 ++--', 9 => ' 4 files changed, 76 insertions(+), 40 deletions(-)', 10 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-19 03:03:51向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' cbe2374..74f27b6 master -> origin/master', 3 => 'Updating cbe2374..74f27b6', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/MoreInfoController.php | 10 +++++++---', 6 => ' app/Http/Controllers/SearchController.php | 4 ++--', 7 => ' app/Http/Controllers/WorksController.php | 6 ++++--', 8 => ' app/Models/Zan.php | 2 +-', 9 => ' resources/views/moreinfo/list.blade.php | 16 ++++++++++++++--', 10 => ' resources/views/sinologist/list.blade.php | 2 +-', 11 => ' resources/views/works/list.blade.php | 1 +', 12 => ' 7 files changed, 30 insertions(+), 11 deletions(-)', 13 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-19 03:45:09向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 74f27b6..55e7efe master -> origin/master', 3 => 'Updating 74f27b6..55e7efe', 4 => 'Fast-forward', 5 => ' app/Notifications/LeaveMessage.php | 63 ++++++++++++++++++++++++++++++++++++++', 6 => ' app/Observers/CommentsObserver.php | 8 ++++-', 7 => ' 2 files changed, 70 insertions(+), 1 deletion(-)', 8 => ' create mode 100644 app/Notifications/LeaveMessage.php', 9 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-19 07:46:49向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 55e7efe..7cdc616 master -> origin/master', 3 => 'Updating 55e7efe..7cdc616', 4 => 'Fast-forward', 5 => ' resources/views/sinologist/detail.blade.php | 4 ++--', 6 => ' resources/views/sinologist/list.blade.php | 2 +-', 7 => ' 2 files changed, 3 insertions(+), 3 deletions(-)', 8 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-19 13:33:13向Sinologist项目的refs/heads/master分支push了2个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 7cdc616..04ee363 master -> origin/master', 3 => 'Updating 7cdc616..04ee363', 4 => 'Fast-forward', 5 => ' .gitignore | 3 +', 6 => ' app/Admin/Actions/Post/BatchUpdateSinologist.php | 31 +', 7 => ' app/Admin/Actions/Post/ImportPost.php | 2 +-', 8 => ' app/Admin/Controllers/ChineseNameController.php | 166 +', 9 => ' app/Admin/Controllers/SinologistController.php | 8 +-', 10 => ' .../Controllers/UploadChineseNameController.php | 20 +', 11 => ' app/Admin/Forms/UploadChineseName.php | 92 +', 12 => ' app/Admin/routes.php | 3 +', 13 => ' app/Http/Services/APIHelper.php | 1 +', 14 => ' app/Jobs/GetChineseNameJob.php | 73 +', 15 => ' app/Models/ChineseName.php | 10 +', 16 => ' composer.lock | 107 +-', 17 => ' .../2020_08_19_163121_create_ChineseName_table.php | 34 +', 18 => ' public/upload/chinesename.txt | 13651 +++++++++++++++++++', 19 => ' resources/views/sinologist/namecenter.blade.php | 2 +-', 20 => ' 15 files changed, 14156 insertions(+), 47 deletions(-)', 21 => ' create mode 100644 app/Admin/Actions/Post/BatchUpdateSinologist.php', 22 => ' create mode 100644 app/Admin/Controllers/ChineseNameController.php', 23 => ' create mode 100644 app/Admin/Controllers/UploadChineseNameController.php', 24 => ' create mode 100644 app/Admin/Forms/UploadChineseName.php', 25 => ' create mode 100644 app/Jobs/GetChineseNameJob.php', 26 => ' create mode 100644 app/Models/ChineseName.php', 27 => ' create mode 100644 database/migrations/2020_08_19_163121_create_ChineseName_table.php', 28 => ' create mode 100644 public/upload/chinesename.txt', 29 => 'Migrating: 2020_08_19_163121_create_ChineseName_table', 30 => 'Migrated: 2020_08_19_163121_create_ChineseName_table (0.12 seconds)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-20 06:21:56向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 04ee363..7c6053d master -> origin/master', 3 => 'Updating 04ee363..7c6053d', 4 => 'Fast-forward', 5 => ' public/css/all.css | 6 +++---', 6 => ' resources/sass/style.css | 6 +++---', 7 => ' resources/views/my.blade.php | 32 ++++++++++++++++++++++++--------', 8 => ' 3 files changed, 30 insertions(+), 14 deletions(-)', 9 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-21 03:05:09向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 7c6053d..572720d master -> origin/master', 3 => 'Updating 7c6053d..572720d', 4 => 'Fast-forward', 5 => ' app/Admin/Controllers/GetGisIndexController.php | 2 +-', 6 => ' app/Console/Commands/GetInternetWorks.php | 98 +++++++++++++++++++++', 7 => ' app/Models/Sinologist.php | 18 ++--', 8 => ' composer.json | 2 +', 9 => ' composer.lock | 2 +-', 10 => ' public/css/all.css | 108 +++++++++++++++++++-----', 11 => ' public/images/detail.png | Bin 59889 -> 0 bytes', 12 => ' public/images/detail_1.png | Bin 3439 -> 0 bytes', 13 => ' public/images/detail_2.png | Bin 3287 -> 0 bytes', 14 => ' public/images/detail_3.png | Bin 7783 -> 0 bytes', 15 => ' public/images/detail_4.png | Bin 3241 -> 0 bytes', 16 => ' public/images/detail_5.png | Bin 3260 -> 0 bytes', 17 => ' public/images/dtq.png | Bin 0 -> 2847 bytes', 18 => ' public/images/give01.png | Bin 0 -> 1528 bytes', 19 => ' public/images/give02.png | Bin 0 -> 1444 bytes', 20 => ' public/images/give03.png | Bin 0 -> 1394 bytes', 21 => ' public/images/icon_1.png | Bin 3729 -> 0 bytes', 22 => ' public/images/icon_2.png | Bin 3768 -> 0 bytes', 23 => ' public/images/icon_3.png | Bin 3857 -> 0 bytes', 24 => ' public/images/naic01.png | Bin 0 -> 2178 bytes', 25 => ' public/images/naic02.png | Bin 0 -> 2041 bytes', 26 => ' public/images/naic03.png | Bin 0 -> 2089 bytes', 27 => ' public/images/perbg.jpg | Bin 0 -> 227253 bytes', 28 => ' public/images/search_result_background.png | Bin 118626 -> 0 bytes', 29 => ' public/images/share01.png | Bin 0 -> 1455 bytes', 30 => ' public/images/share02.png | Bin 0 -> 1298 bytes', 31 => ' public/images/share03.png | Bin 0 -> 1545 bytes', 32 => ' public/images/share04.png | Bin 0 -> 1655 bytes', 33 => ' public/js/forward.js | 85 ++++++++++---------', 34 => ' resources/sass/style-rel.css | 19 +++--', 35 => ' resources/sass/style.css | 89 ++++++++++++++++---', 36 => ' resources/views/sinologist/namecenter.blade.php | 70 ++++++++-------', 37 => ' 32 files changed, 377 insertions(+), 116 deletions(-)', 38 => ' create mode 100644 app/Console/Commands/GetInternetWorks.php', 39 => ' delete mode 100644 public/images/detail.png', 40 => ' delete mode 100644 public/images/detail_1.png', 41 => ' delete mode 100644 public/images/detail_2.png', 42 => ' delete mode 100644 public/images/detail_3.png', 43 => ' delete mode 100644 public/images/detail_4.png', 44 => ' delete mode 100644 public/images/detail_5.png', 45 => ' create mode 100644 public/images/dtq.png', 46 => ' create mode 100644 public/images/give01.png', 47 => ' create mode 100644 public/images/give02.png', 48 => ' create mode 100644 public/images/give03.png', 49 => ' delete mode 100644 public/images/icon_1.png', 50 => ' delete mode 100644 public/images/icon_2.png', 51 => ' delete mode 100644 public/images/icon_3.png', 52 => ' create mode 100644 public/images/naic01.png', 53 => ' create mode 100644 public/images/naic02.png', 54 => ' create mode 100644 public/images/naic03.png', 55 => ' create mode 100644 public/images/perbg.jpg', 56 => ' delete mode 100644 public/images/search_result_background.png', 57 => ' create mode 100644 public/images/share01.png', 58 => ' create mode 100644 public/images/share02.png', 59 => ' create mode 100644 public/images/share03.png', 60 => ' create mode 100644 public/images/share04.png', 61 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-21 04:35:35向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 572720d..85a4340 master -> origin/master', 3 => 'Updating 572720d..85a4340', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SearchController.php | 4 +-', 6 => ' public/css/all.css | 11 +--', 7 => ' resources/sass/style.css | 11 +--', 8 => ' resources/views/sinologist/list1.blade.php | 135 +++++++++++++++++++----------', 9 => ' 4 files changed, 102 insertions(+), 59 deletions(-)', 10 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-21 06:14:38向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 85a4340..3e3da26 master -> origin/master', 3 => 'Updating 85a4340..3e3da26', 4 => 'Fast-forward', 5 => ' public/css/all.css | 2 +-', 6 => ' public/images/nobody.jpg | Bin 4177 -> 27961 bytes', 7 => ' resources/sass/style.css | 2 +-', 8 => ' resources/views/sinologist/list1.blade.php | 36 ++++-------------------------', 9 => ' 4 files changed, 6 insertions(+), 34 deletions(-)', 10 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-22 01:55:15向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 3e3da26..369c9b3 master -> origin/master', 3 => 'Updating 3e3da26..369c9b3', 4 => 'Fast-forward', 5 => ' resources/views/sinologist/list1.blade.php | 5 ++++-', 6 => ' 1 file changed, 4 insertions(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-22 02:05:49向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 369c9b3..a6c4c58 master -> origin/master', 3 => 'Updating 369c9b3..a6c4c58', 4 => 'Fast-forward', 5 => ' public/js/forward.js | 3 ++-', 6 => ' 1 file changed, 2 insertions(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-22 02:33:31向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' a6c4c58..c8959e2 master -> origin/master', 3 => 'Updating a6c4c58..c8959e2', 4 => 'Fast-forward', 5 => ' public/css/all.css | 4 ++--', 6 => ' resources/sass/style.css | 4 ++--', 7 => ' 2 files changed, 4 insertions(+), 4 deletions(-)', 8 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-23 03:25:41向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' c8959e2..14e73ed master -> origin/master', 3 => 'Updating c8959e2..14e73ed', 4 => 'Fast-forward', 5 => ' app/Admin/Controllers/WorksController.php | 138 ++++++++', 6 => ' app/Admin/routes.php | 2 +', 7 => ' app/Console/Commands/GetInternetWorks.php | 38 +--', 8 => ' app/Http/Controllers/CommentsController.php | 28 +-', 9 => ' app/Http/Controllers/MoreInfoController.php | 27 +-', 10 => ' app/Http/Controllers/SinologistController.php | 28 +-', 11 => ' app/Http/Controllers/WorksController.php | 29 +-', 12 => ' composer.json | 3 +-', 13 => ' composer.lock | 460 +++++++++++++++++++++++++-', 14 => ' public/css/all.css | 214 +-----------', 15 => ' public/images/jtico.png | Bin 0 -> 1303 bytes', 16 => ' public/js/all.js | 191 ++++-------', 17 => ' public/js/forward.js | 44 +--', 18 => ' resources/js/jquery.cookie.min.js | 2 +', 19 => ' resources/js/js.js | 81 ++++-', 20 => ' resources/sass/style.css | 2 +-', 21 => ' resources/views/comments/form.blade.php | 11 +-', 22 => ' webpack.mix.js | 7 +-', 23 => ' 18 files changed, 826 insertions(+), 479 deletions(-)', 24 => ' create mode 100644 public/images/jtico.png', 25 => ' create mode 100644 resources/js/jquery.cookie.min.js', 26 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-23 04:04:25向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 14e73ed..dace1b9 master -> origin/master', 3 => 'Updating 14e73ed..dace1b9', 4 => 'Fast-forward', 5 => ' resources/views/sinologist/list1.blade.php | 6 +++---', 6 => ' 1 file changed, 3 insertions(+), 3 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-23 12:55:26向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' dace1b9..1e4e677 master -> origin/master', 3 => 'Updating dace1b9..1e4e677', 4 => 'Fast-forward', 5 => ' app/Admin/Actions/Post/BatchNewWorksIn.php | 34 +++', 6 => ' app/Admin/Controllers/NewWorksController.php | 164 +++++++++++++', 7 => ' app/Admin/Controllers/WorksController.php | 139 +----------', 8 => ' app/Admin/routes.php | 3 +-', 9 => ' app/Console/Commands/GetInternetWorks.php | 29 ++-', 10 => ' app/Jobs/GetNewWorks.php | 273 +++++++++++++++++++++', 11 => ' app/Models/NewWorks.php | 11 +', 12 => ' composer.json | 1 +', 13 => ' composer.lock | 53 +++-', 14 => ' .../2020_08_23_121954_create_newworks_table.php | 40 +++', 15 => ' 10 files changed, 605 insertions(+), 142 deletions(-)', 16 => ' create mode 100644 app/Admin/Actions/Post/BatchNewWorksIn.php', 17 => ' create mode 100644 app/Admin/Controllers/NewWorksController.php', 18 => ' create mode 100644 app/Jobs/GetNewWorks.php', 19 => ' create mode 100644 app/Models/NewWorks.php', 20 => ' create mode 100644 database/migrations/2020_08_23_121954_create_newworks_table.php', 21 => 'Migrating: 2020_08_23_121954_create_newworks_table', 22 => 'Migrated: 2020_08_23_121954_create_newworks_table (0.16 seconds)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-23 13:10:25向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 1e4e677..686f521 master -> origin/master', 3 => 'Updating 1e4e677..686f521', 4 => 'Fast-forward', 5 => ' public/css/all.css | 2 +-', 6 => ' public/images/perbg.jpg | Bin 227253 -> 220395 bytes', 7 => ' resources/sass/style.css | 2 +-', 8 => ' 3 files changed, 2 insertions(+), 2 deletions(-)', 9 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-24 14:49:07向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 686f521..39cd104 master -> origin/master', 3 => 'Updating 686f521..39cd104', 4 => 'Fast-forward', 5 => ' resources/views/sinologist/namecenter.blade.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-27 15:55:04向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 39cd104..dd7dc8c master -> origin/master', 3 => 'Updating 39cd104..dd7dc8c', 4 => 'Fast-forward', 5 => ' app/Imports/SinologistImport.php | 22 +++-', 6 => ' app/Jobs/GetNewWorks.php | 18 ++-', 7 => ' app/Jobs/GetNewWorksPage.php | 270 +++++++++++++++++++++++++++++++++++++++', 8 => ' 3 files changed, 299 insertions(+), 11 deletions(-)', 9 => ' create mode 100644 app/Jobs/GetNewWorksPage.php', 10 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-31 05:14:43向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' dd7dc8c..55211a5 master -> origin/master', 3 => 'Updating dd7dc8c..55211a5', 4 => 'Fast-forward', 5 => ' app/Admin/Controllers/GetGisIndexController.php | 1 +', 6 => ' 1 file changed, 1 insertion(+)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-31 05:15:50向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 55211a5..be5705b master -> origin/master', 3 => 'Updating 55211a5..be5705b', 4 => 'Fast-forward', 5 => ' app/Admin/Controllers/GetGisIndexController.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-31 05:20:53向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' be5705b..b831d5a master -> origin/master', 3 => 'Updating be5705b..b831d5a', 4 => 'Fast-forward', 5 => ' app/Admin/Controllers/GetGisIndexController.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-31 05:31:04向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' b831d5a..e15faae master -> origin/master', 3 => 'Updating b831d5a..e15faae', 4 => 'Fast-forward', 5 => ' app/Admin/Controllers/GetGisIndexController.php | 7 ++-----', 6 => ' 1 file changed, 2 insertions(+), 5 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-31 05:33:29向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' e15faae..109a9c2 master -> origin/master', 3 => 'Updating e15faae..109a9c2', 4 => 'Fast-forward', 5 => ' public/css/all.css | 2 +-', 6 => ' public/images/nz.jpg | Bin 0 -> 2213 bytes', 7 => ' resources/sass/style.css | 2 +-', 8 => ' resources/views/home.blade.php | 1 +', 9 => ' 4 files changed, 3 insertions(+), 2 deletions(-)', 10 => ' create mode 100644 public/images/nz.jpg', 11 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-31 05:44:44向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 109a9c2..ce3cb0c master -> origin/master', 3 => 'Updating 109a9c2..ce3cb0c', 4 => 'Fast-forward', 5 => ' app/Admin/Controllers/GetGisIndexController.php | 2 +-', 6 => ' resources/views/admin/getgisindex.blade.php | 2 +-', 7 => ' 2 files changed, 2 insertions(+), 2 deletions(-)', 8 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-31 06:49:47向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' ce3cb0c..18a2550 master -> origin/master', 3 => 'Updating ce3cb0c..18a2550', 4 => 'Fast-forward', 5 => ' app/Models/Works.php | 1 +', 6 => ' public/css/all.css | 2 +-', 7 => ' public/images/jp.jpg | Bin 0 -> 1697 bytes', 8 => ' resources/sass/style.css | 3 ++-', 9 => ' resources/views/home.blade.php | 4 ++--', 10 => ' 5 files changed, 6 insertions(+), 4 deletions(-)', 11 => ' create mode 100644 public/images/jp.jpg', 12 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-31 07:14:09向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 18a2550..29901d4 master -> origin/master', 3 => 'Updating 18a2550..29901d4', 4 => 'Fast-forward', 5 => ' public/css/all.css | 2 +-', 6 => ' public/images/perbg.jpg | Bin 220395 -> 201536 bytes', 7 => ' resources/sass/style.css | 2 +-', 8 => ' 3 files changed, 2 insertions(+), 2 deletions(-)', 9 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-31 07:25:58向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 29901d4..ed6d92c master -> origin/master', 3 => 'Updating 29901d4..ed6d92c', 4 => 'Fast-forward', 5 => ' public/css/all.css | 4 ++--', 6 => ' resources/sass/style.css | 5 +++--', 7 => ' resources/views/sinologist/list1.blade.php | 6 +++---', 8 => ' 3 files changed, 8 insertions(+), 7 deletions(-)', 9 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-31 07:26:58向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' ed6d92c..99b2906 master -> origin/master', 3 => 'Updating ed6d92c..99b2906', 4 => 'Fast-forward', 5 => ' public/css/all.css | 2 +-', 6 => ' resources/sass/style.css | 2 +-', 7 => ' 2 files changed, 2 insertions(+), 2 deletions(-)', 8 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-31 07:34:57向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 99b2906..57d3917 master -> origin/master', 3 => 'Updating 99b2906..57d3917', 4 => 'Fast-forward', 5 => ' resources/views/sinologist/list1.blade.php | 10 +++++-----', 6 => ' 1 file changed, 5 insertions(+), 5 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-31 07:38:01向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 57d3917..b5b34b3 master -> origin/master', 3 => 'Updating 57d3917..b5b34b3', 4 => 'Fast-forward', 5 => ' resources/views/sinologist/list1.blade.php | 6 +++---', 6 => ' 1 file changed, 3 insertions(+), 3 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-31 07:42:38向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' b5b34b3..7ee5d54 master -> origin/master', 3 => 'Updating b5b34b3..7ee5d54', 4 => 'Fast-forward', 5 => ' public/css/all.css | 2 +-', 6 => ' resources/sass/style.css | 2 +-', 7 => ' 2 files changed, 2 insertions(+), 2 deletions(-)', 8 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-31 07:45:09向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 7ee5d54..528309b master -> origin/master', 3 => 'Updating 7ee5d54..528309b', 4 => 'Fast-forward', 5 => ' public/css/all.css | 2 +-', 6 => ' resources/sass/style.css | 2 +-', 7 => ' 2 files changed, 2 insertions(+), 2 deletions(-)', 8 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-31 07:46:18向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 528309b..32b5304 master -> origin/master', 3 => 'Updating 528309b..32b5304', 4 => 'Fast-forward', 5 => ' resources/views/sinologist/list1.blade.php | 4 ++--', 6 => ' 1 file changed, 2 insertions(+), 2 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-31 07:57:28向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 32b5304..c71e43a master -> origin/master', 3 => 'Updating 32b5304..c71e43a', 4 => 'Fast-forward', 5 => ' public/css/all.css | 6 +++---', 6 => ' resources/sass/style.css | 6 +++---', 7 => ' 2 files changed, 6 insertions(+), 6 deletions(-)', 8 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-31 08:03:29向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' c71e43a..68171f7 master -> origin/master', 3 => 'Updating c71e43a..68171f7', 4 => 'Fast-forward', 5 => ' resources/views/sinologist/list1.blade.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-31 08:08:50向Sinologist项目的refs/heads/master分支push了2个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 68171f7..2014a6e master -> origin/master', 3 => 'Updating 68171f7..2014a6e', 4 => 'Fast-forward', 5 => ' public/css/all.css | 19 ++++++++++---------', 6 => ' resources/sass/lib.css | 7 +++----', 7 => ' resources/sass/style-rel.css | 26 ++++++++++++++++++--------', 8 => ' 3 files changed, 31 insertions(+), 21 deletions(-)', 9 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-31 08:54:06向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 2014a6e..524cb80 master -> origin/master', 3 => 'Updating 2014a6e..524cb80', 4 => 'Fast-forward', 5 => ' app/Admin/Actions/Post/BatchNewWorksIn.php | 25 +++---', 6 => ' app/Admin/Actions/Post/NewWorksInfo.php | 123 +++++++++++++++++++++++++++', 7 => ' app/Admin/Controllers/NewWorksController.php | 7 +-', 8 => ' app/Imports/NewWorksImport.php | 80 +++++++++++++++++', 9 => ' public/upload/newworks.xlsx | Bin 0 -> 13365 bytes', 10 => ' 5 files changed, 223 insertions(+), 12 deletions(-)', 11 => ' create mode 100644 app/Admin/Actions/Post/NewWorksInfo.php', 12 => ' create mode 100644 app/Imports/NewWorksImport.php', 13 => ' create mode 100644 public/upload/newworks.xlsx', 14 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-31 08:57:17向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 524cb80..eda93d3 master -> origin/master', 3 => 'Updating 524cb80..eda93d3', 4 => 'Fast-forward', 5 => ' app/Admin/Controllers/NewWorksController.php | 1 +', 6 => ' 1 file changed, 1 insertion(+)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-31 08:59:57向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' eda93d3..175f04e master -> origin/master', 3 => 'Updating eda93d3..175f04e', 4 => 'Fast-forward', 5 => ' app/Admin/Controllers/NewWorksController.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-31 09:19:07向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 175f04e..a710f67 master -> origin/master', 3 => 'Updating 175f04e..a710f67', 4 => 'Fast-forward', 5 => ' app/Imports/NewWorksImport.php | 8 ++++----', 6 => ' 1 file changed, 4 insertions(+), 4 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-31 09:23:17向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' a710f67..681637e master -> origin/master', 3 => 'Updating a710f67..681637e', 4 => 'Fast-forward', 5 => ' app/Admin/Actions/Post/NewWorksInfo.php | 2 +-', 6 => ' app/Imports/NewWorksImport.php | 7 +------', 7 => ' 2 files changed, 2 insertions(+), 7 deletions(-)', 8 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-31 09:24:00向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 681637e..cdeb29c master -> origin/master', 3 => 'Updating 681637e..cdeb29c', 4 => 'Fast-forward', 5 => ' app/Imports/NewWorksImport.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-31 09:26:11向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' cdeb29c..edb867d master -> origin/master', 3 => 'Updating cdeb29c..edb867d', 4 => 'Fast-forward', 5 => ' app/Admin/Controllers/NewWorksController.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-31 09:28:50向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' edb867d..5e6d6d5 master -> origin/master', 3 => 'Updating edb867d..5e6d6d5', 4 => 'Fast-forward', 5 => ' app/Admin/Controllers/NewWorksController.php | 7 +++++--', 6 => ' 1 file changed, 5 insertions(+), 2 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-31 09:33:37向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 5e6d6d5..e154e5b master -> origin/master', 3 => 'Updating 5e6d6d5..e154e5b', 4 => 'Fast-forward', 5 => ' app/Admin/Actions/Post/BatchNewWorksIn.php | 9 ++++++---', 6 => ' 1 file changed, 6 insertions(+), 3 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-31 09:38:02向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' e154e5b..e496270 master -> origin/master', 3 => 'Updating e154e5b..e496270', 4 => 'Fast-forward', 5 => ' app/Admin/Actions/Post/BatchNewWorksIn.php | 7 ++++++-', 6 => ' 1 file changed, 6 insertions(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-31 09:38:41向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' e496270..2bab08a master -> origin/master', 3 => 'Updating e496270..2bab08a', 4 => 'Fast-forward', 5 => ' app/Admin/Actions/Post/BatchNewWorksIn.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-31 09:40:20向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 2bab08a..d0c49a4 master -> origin/master', 3 => 'Updating 2bab08a..d0c49a4', 4 => 'Fast-forward', 5 => ' app/Admin/Actions/Post/BatchNewWorksIn.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-31 09:40:49向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' d0c49a4..654b4f7 master -> origin/master', 3 => 'Updating d0c49a4..654b4f7', 4 => 'Fast-forward', 5 => ' app/Admin/Actions/Post/BatchNewWorksIn.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-31 09:42:09向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 654b4f7..fcfcf15 master -> origin/master', 3 => 'Updating 654b4f7..fcfcf15', 4 => 'Fast-forward', 5 => ' app/Admin/Actions/Post/BatchNewWorksIn.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-31 09:43:03向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' fcfcf15..7432426 master -> origin/master', 3 => 'Updating fcfcf15..7432426', 4 => 'Fast-forward', 5 => ' app/Admin/Actions/Post/BatchNewWorksIn.php | 1 +', 6 => ' 1 file changed, 1 insertion(+)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-31 09:44:23向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 7432426..eb7b706 master -> origin/master', 3 => 'Updating 7432426..eb7b706', 4 => 'Fast-forward', 5 => ' public/upload/newworks.xlsx | Bin 13365 -> 13693 bytes', 6 => ' 1 file changed, 0 insertions(+), 0 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-31 09:49:22向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' eb7b706..0ee5444 master -> origin/master', 3 => 'Updating eb7b706..0ee5444', 4 => 'Fast-forward', 5 => ' app/Admin/Controllers/NewWorksController.php | 2 +-', 6 => ' app/Admin/Controllers/SinologistController.php | 2 +-', 7 => ' 2 files changed, 2 insertions(+), 2 deletions(-)', 8 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-31 09:52:24向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 0ee5444..e6a3456 master -> origin/master', 3 => 'Updating 0ee5444..e6a3456', 4 => 'Fast-forward', 5 => ' app/Admin/Controllers/WorksController.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-08-31 09:53:08向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' e6a3456..da6213a master -> origin/master', 3 => 'Updating e6a3456..da6213a', 4 => 'Fast-forward', 5 => ' app/Admin/Controllers/WorksController.php | 4 ++--', 6 => ' 1 file changed, 2 insertions(+), 2 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-01 00:59:26向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' da6213a..f01c28c master -> origin/master', 3 => 'Updating da6213a..f01c28c', 4 => 'Fast-forward', 5 => ' public/css/all.css | 2 +-', 6 => ' resources/sass/style.css | 2 +-', 7 => ' 2 files changed, 2 insertions(+), 2 deletions(-)', 8 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-01 01:56:35向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' f01c28c..9b8f3cf master -> origin/master', 3 => 'Updating f01c28c..9b8f3cf', 4 => 'Fast-forward', 5 => ' resources/views/layouts/app.blade.php | 11 +----------', 6 => ' resources/views/sinologist/detail.blade.php | 10 +---------', 7 => ' resources/views/sinologist/list.blade.php | 11 +----------', 8 => ' resources/views/works/list.blade.php | 10 +---------', 9 => ' 4 files changed, 4 insertions(+), 38 deletions(-)', 10 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-01 04:01:10向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 9b8f3cf..1688f02 master -> origin/master', 3 => 'Updating 9b8f3cf..1688f02', 4 => 'Fast-forward', 5 => ' public/css/all.css | 4 ++--', 6 => ' resources/sass/style.css | 4 ++--', 7 => ' resources/views/layouts/app.blade.php | 2 +-', 8 => ' resources/views/layouts/footer.blade.php | 1 +', 9 => ' resources/views/sinologist/detail.blade.php | 12 +++---------', 10 => ' resources/views/sinologist/list.blade.php | 2 +-', 11 => ' resources/views/works/list.blade.php | 2 +-', 12 => ' 7 files changed, 11 insertions(+), 16 deletions(-)', 13 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-01 04:03:18向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 1688f02..34bb906 master -> origin/master', 3 => 'Updating 1688f02..34bb906', 4 => 'Fast-forward', 5 => ' public/css/all.css | 2 +-', 6 => ' resources/sass/style.css | 2 +-', 7 => ' 2 files changed, 2 insertions(+), 2 deletions(-)', 8 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-02 01:23:08向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 34bb906..07a7de1 master -> origin/master', 3 => 'Updating 34bb906..07a7de1', 4 => 'Fast-forward', 5 => ' app/Jobs/CreatePosterJob.php | 11 ++++++-----', 6 => ' app/Libs/charsetAdapt.php | 15 +++++++++++++++', 7 => ' 2 files changed, 21 insertions(+), 5 deletions(-)', 8 => ' create mode 100644 app/Libs/charsetAdapt.php', 9 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-03 03:29:33向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' a1addbc..63c6f2f master -> origin/master', 3 => 'Updating a1addbc..63c6f2f', 4 => 'Fast-forward', 5 => ' app/Observers/JobsObserver.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-04 03:12:31向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 63c6f2f..7eea58c master -> origin/master', 3 => 'Updating 63c6f2f..7eea58c', 4 => 'Fast-forward', 5 => ' public/images/au.jpg | Bin 0 -> 2064 bytes', 6 => ' resources/sass/style.css | 3 ++-', 7 => ' resources/views/home.blade.php | 1 +', 8 => ' 3 files changed, 3 insertions(+), 1 deletion(-)', 9 => ' create mode 100644 public/images/au.jpg', 10 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-04 03:13:00向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 7eea58c..9163b32 master -> origin/master', 3 => 'Updating 7eea58c..9163b32', 4 => 'Fast-forward', 5 => ' public/css/all.css | 1 +', 6 => ' 1 file changed, 1 insertion(+)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-04 04:42:42向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 9163b32..6a80d7e master -> origin/master', 3 => 'Updating 9163b32..6a80d7e', 4 => 'Fast-forward', 5 => ' resources/views/layouts/search.blade.php | 5 +----', 6 => ' 1 file changed, 1 insertion(+), 4 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-04 04:45:29向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 6a80d7e..5acb430 master -> origin/master', 3 => 'Updating 6a80d7e..5acb430', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SearchController.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-04 04:54:42向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 5acb430..7771fa0 master -> origin/master', 3 => 'Updating 5acb430..7771fa0', 4 => 'Fast-forward', 5 => ' public/js/all.js | 4 ++--', 6 => ' resources/js/js.js | 4 ++--', 7 => ' 2 files changed, 4 insertions(+), 4 deletions(-)', 8 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-04 05:00:38向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 7771fa0..e30aee3 master -> origin/master', 3 => 'Updating 7771fa0..e30aee3', 4 => 'Fast-forward', 5 => ' public/js/all.js | 1 +', 6 => ' 1 file changed, 1 insertion(+)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-04 05:02:05向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' e30aee3..6f2035b master -> origin/master', 3 => 'Updating e30aee3..6f2035b', 4 => 'Fast-forward', 5 => ' public/js/all.js | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-04 05:10:41向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 6f2035b..4f3c78e master -> origin/master', 3 => 'Updating 6f2035b..4f3c78e', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SearchController.php | 25 ++++++++++++++-----------', 6 => ' public/js/all.js | 5 +++--', 7 => ' resources/js/js.js | 5 +++--', 8 => ' 3 files changed, 20 insertions(+), 15 deletions(-)', 9 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-04 05:24:32向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 4f3c78e..4f0795c master -> origin/master', 3 => 'Updating 4f3c78e..4f0795c', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SearchController.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-04 05:26:41向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 4f0795c..998f22f master -> origin/master', 3 => 'Updating 4f0795c..998f22f', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SearchController.php | 4 ++--', 6 => ' 1 file changed, 2 insertions(+), 2 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-04 05:27:23向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 998f22f..eba78f0 master -> origin/master', 3 => 'Updating 998f22f..eba78f0', 4 => 'Fast-forward', 5 => ' public/js/all.js | 6 +++---', 6 => ' resources/js/js.js | 6 +++---', 7 => ' 2 files changed, 6 insertions(+), 6 deletions(-)', 8 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-04 05:28:02向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' eba78f0..6160f5e master -> origin/master', 3 => 'Updating eba78f0..6160f5e', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SearchController.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-04 05:34:16向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 6160f5e..7cb6f98 master -> origin/master', 3 => 'Updating 6160f5e..7cb6f98', 4 => 'Fast-forward', 5 => ' public/css/all.css | 4 ++--', 6 => ' resources/sass/style.css | 4 ++--', 7 => ' 2 files changed, 4 insertions(+), 4 deletions(-)', 8 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-04 05:37:15向Sinologist项目的refs/heads/master分支push了2个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 7cb6f98..88dfa98 master -> origin/master', 3 => 'Updating 7cb6f98..88dfa98', 4 => 'Fast-forward', 5 => ' public/css/all.css | 2 +-', 6 => ' resources/sass/style.css | 2 +-', 7 => ' 2 files changed, 2 insertions(+), 2 deletions(-)', 8 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-04 05:39:53向Sinologist项目的refs/heads/master分支push了2个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 88dfa98..4445f5a master -> origin/master', 3 => 'Updating 88dfa98..4445f5a', 4 => 'Fast-forward', 5 => ' public/css/all.css | 2 +-', 6 => ' public/js/all.js | 2 +-', 7 => ' resources/js/js.js | 2 +-', 8 => ' resources/sass/style.css | 2 +-', 9 => ' 4 files changed, 4 insertions(+), 4 deletions(-)', 10 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-08 14:18:08向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 4445f5a..f6e822f master -> origin/master', 3 => 'Updating 4445f5a..f6e822f', 4 => 'Fast-forward', 5 => ' app/Imports/SinologistImport.php | 4 +++-', 6 => ' 1 file changed, 3 insertions(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-12 07:26:20向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' f6e822f..19805d0 master -> origin/master', 3 => 'Updating f6e822f..19805d0', 4 => 'Fast-forward', 5 => ' app/Admin/Controllers/NewWorksController.php | 2 ++', 6 => ' app/Imports/NewWorksImport.php | 7 +++--', 7 => ' .../2020_09_12_071005_add_cbs_to_newworks.php | 34 +++++++++++++++++++++', 8 => ' public/upload/newworks.xlsx | Bin 13693 -> 11021 bytes', 9 => ' 4 files changed, 41 insertions(+), 2 deletions(-)', 10 => ' create mode 100644 database/migrations/2020_09_12_071005_add_cbs_to_newworks.php', 11 => 'Migrating: 2020_09_12_071005_add_cbs_to_newworks', 12 => 'Migrated: 2020_09_12_071005_add_cbs_to_newworks (0.4 seconds)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-12 08:21:24向Sinologist项目的refs/heads/master分支push了2个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 19805d0..e0b60ae master -> origin/master', 3 => 'Updating 19805d0..e0b60ae', 4 => 'Fast-forward', 5 => ' app/Imports/NewWorksImport.php | 10 ++++++++--', 6 => ' public/images/bilishi.jpg | Bin 0 -> 12021 bytes', 7 => ' public/images/ca.jpg | Bin 0 -> 12559 bytes', 8 => ' public/images/de.jpg | Bin 0 -> 11935 bytes', 9 => ' public/images/en.jpg | Bin 0 -> 12906 bytes', 10 => ' public/images/fa.jpg | Bin 0 -> 12004 bytes', 11 => ' public/images/han.jpg | Bin 0 -> 11841 bytes', 12 => ' public/images/helan.jpg | Bin 0 -> 11719 bytes', 13 => ' public/images/hk.jpg | Bin 0 -> 13021 bytes', 14 => ' public/images/italy.jpg | Bin 0 -> 11902 bytes', 15 => ' public/images/ruishi.jpg | Bin 0 -> 12460 bytes', 16 => ' public/images/si.jpg | Bin 0 -> 11901 bytes', 17 => ' public/images/taiwan.jpg | Bin 0 -> 12602 bytes', 18 => ' 13 files changed, 8 insertions(+), 2 deletions(-)', 19 => ' create mode 100644 public/images/bilishi.jpg', 20 => ' create mode 100644 public/images/ca.jpg', 21 => ' create mode 100644 public/images/de.jpg', 22 => ' create mode 100644 public/images/en.jpg', 23 => ' create mode 100644 public/images/fa.jpg', 24 => ' create mode 100644 public/images/han.jpg', 25 => ' create mode 100644 public/images/helan.jpg', 26 => ' create mode 100644 public/images/hk.jpg', 27 => ' create mode 100644 public/images/italy.jpg', 28 => ' create mode 100644 public/images/ruishi.jpg', 29 => ' create mode 100644 public/images/si.jpg', 30 => ' create mode 100644 public/images/taiwan.jpg', 31 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-12 08:51:44向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' e0b60ae..d0064d4 master -> origin/master', 3 => 'Updating e0b60ae..d0064d4', 4 => 'Fast-forward', 5 => ' app/Imports/NewWorksImport.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-12 09:06:02向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' d0064d4..48c1c0c master -> origin/master', 3 => 'Updating d0064d4..48c1c0c', 4 => 'Fast-forward', 5 => ' app/Imports/NewWorksImport.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-12 09:13:35向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 48c1c0c..57ae564 master -> origin/master', 3 => 'Updating 48c1c0c..57ae564', 4 => 'Fast-forward', 5 => ' app/Imports/NewWorksImport.php | 10 ++--------', 6 => ' 1 file changed, 2 insertions(+), 8 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-12 09:30:44向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 57ae564..76880dc master -> origin/master', 3 => 'Updating 57ae564..76880dc', 4 => 'Fast-forward', 5 => ' app/Imports/NewWorksImport.php | 9 ++++++---', 6 => ' 1 file changed, 6 insertions(+), 3 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-12 10:00:18向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 76880dc..86cb54d master -> origin/master', 3 => 'Updating 76880dc..86cb54d', 4 => 'Fast-forward', 5 => ' app/Admin/Actions/Post/BatchNewWorksIn.php | 6 +++---', 6 => ' 1 file changed, 3 insertions(+), 3 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-12 10:00:56向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 86cb54d..b603a59 master -> origin/master', 3 => 'Updating 86cb54d..b603a59', 4 => 'Fast-forward', 5 => ' app/Admin/Actions/Post/BatchNewWorksIn.php | 4 +++-', 6 => ' 1 file changed, 3 insertions(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-12 10:11:06向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' b603a59..a00787b master -> origin/master', 3 => 'Updating b603a59..a00787b', 4 => 'Fast-forward', 5 => ' app/Admin/Controllers/NewWorksController.php | 25 ++++++++++++++++++++++++-', 6 => ' 1 file changed, 24 insertions(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-12 10:16:52向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' a00787b..7883f36 master -> origin/master', 3 => 'Updating a00787b..7883f36', 4 => 'Fast-forward', 5 => ' app/Imports/NewWorksImport.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-12 10:24:12向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 7883f36..683bae1 master -> origin/master', 3 => 'Updating 7883f36..683bae1', 4 => 'Fast-forward', 5 => ' app/Imports/NewWorksImport.php | 1 +', 6 => ' 1 file changed, 1 insertion(+)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-12 10:26:51向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 683bae1..76ed809 master -> origin/master', 3 => 'Updating 683bae1..76ed809', 4 => 'Fast-forward', 5 => ' app/Imports/NewWorksImport.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-12 10:41:01向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 76ed809..80099f8 master -> origin/master', 3 => 'Updating 76ed809..80099f8', 4 => 'Fast-forward', 5 => ' app/Imports/NewWorksImport.php | 5 ++++-', 6 => ' 1 file changed, 4 insertions(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-12 10:45:50向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 80099f8..218de39 master -> origin/master', 3 => 'Updating 80099f8..218de39', 4 => 'Fast-forward', 5 => ' app/Imports/NewWorksImport.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-12 10:59:38向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 218de39..484f7cf master -> origin/master', 3 => 'Updating 218de39..484f7cf', 4 => 'Fast-forward', 5 => ' app/Admin/Actions/Post/BatchNewWorksIn.php | 8 +++--', 6 => ' .../2020_09_12_105602_add_cbs_to_works.php | 34 ++++++++++++++++++++++', 7 => ' 2 files changed, 40 insertions(+), 2 deletions(-)', 8 => ' create mode 100644 database/migrations/2020_09_12_105602_add_cbs_to_works.php', 9 => 'Migrating: 2020_09_12_105602_add_cbs_to_works', 10 => 'Migrated: 2020_09_12_105602_add_cbs_to_works (5.14 seconds)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-12 11:00:18向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 484f7cf..d7ad68c master -> origin/master', 3 => 'Updating 484f7cf..d7ad68c', 4 => 'Fast-forward', 5 => ' app/Admin/Actions/Post/BatchNewWorksIn.php | 1 +', 6 => ' 1 file changed, 1 insertion(+)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-12 12:04:27向Sinologist项目的refs/heads/master分支push了2个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' d7ad68c..7499eff master -> origin/master', 3 => 'Updating d7ad68c..7499eff', 4 => 'Fast-forward', 5 => ' app/Admin/Controllers/WorksController.php | 2 +-', 6 => ' app/Console/Commands/test.php | 46 ++++++++---------------------', 7 => ' app/Http/Controllers/MoreInfoController.php | 8 +++--', 8 => ' app/Http/Controllers/WorksController.php | 9 ++++--', 9 => ' public/css/all.css | 32 +++++++++++++-------', 10 => ' public/js/all.js | 12 +++++++-', 11 => ' resources/js/js.js | 11 +++++++', 12 => ' resources/sass/style.css | 6 ++--', 13 => ' resources/views/moreinfo/list.blade.php | 10 +++++++', 14 => ' resources/views/works/list.blade.php | 10 +++++++', 15 => ' 10 files changed, 95 insertions(+), 51 deletions(-)', 16 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-12 12:39:12向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 7499eff..2fd03d5 master -> origin/master', 3 => 'Updating 7499eff..2fd03d5', 4 => 'Fast-forward', 5 => ' public/upload/newworks.xlsx | Bin 11021 -> 10985 bytes', 6 => ' 1 file changed, 0 insertions(+), 0 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-15 09:19:51向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 2fd03d5..c0c26c5 master -> origin/master', 3 => 'Updating 2fd03d5..c0c26c5', 4 => 'Fast-forward', 5 => ' app/Models/Sinologist.php | 8 ++++++--', 6 => ' 1 file changed, 6 insertions(+), 2 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-15 09:34:10向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' c0c26c5..3b76d1f master -> origin/master', 3 => 'Updating c0c26c5..3b76d1f', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SinologistController.php | 2 +-', 6 => ' app/Models/Sinologist.php | 2 +-', 7 => ' 2 files changed, 2 insertions(+), 2 deletions(-)', 8 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-15 09:38:43向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 3b76d1f..1717d6c master -> origin/master', 3 => 'Updating 3b76d1f..1717d6c', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SinologistController.php | 2 +-', 6 => ' app/Models/Sinologist.php | 2 +-', 7 => ' 2 files changed, 2 insertions(+), 2 deletions(-)', 8 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-15 09:40:33向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 1717d6c..5f49c9e master -> origin/master', 3 => 'Updating 1717d6c..5f49c9e', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SinologistController.php | 3 +++', 6 => ' 1 file changed, 3 insertions(+)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-15 09:41:53向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 5f49c9e..0f8709d master -> origin/master', 3 => 'Updating 5f49c9e..0f8709d', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SinologistController.php | 4 +---', 6 => ' 1 file changed, 1 insertion(+), 3 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-15 09:43:56向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 0f8709d..edaede7 master -> origin/master', 3 => 'Updating 0f8709d..edaede7', 4 => 'Fast-forward', 5 => ' resources/views/sinologist/detail.blade.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-15 09:47:31向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' edaede7..b1b40fc master -> origin/master', 3 => 'Updating edaede7..b1b40fc', 4 => 'Fast-forward', 5 => ' app/Admin/Actions/Post/BatchNewWorksIn.php | 7 +++----', 6 => ' resources/views/sinologist/detail.blade.php | 2 +-', 7 => ' 2 files changed, 4 insertions(+), 5 deletions(-)', 8 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-19 13:49:01向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' b1b40fc..e9022c7 master -> origin/master', 3 => 'Updating b1b40fc..e9022c7', 4 => 'Fast-forward', 5 => ' app/Imports/SinologistImport.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-20 08:25:25向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' e9022c7..446e2f6 master -> origin/master', 3 => 'Updating e9022c7..446e2f6', 4 => 'Fast-forward', 5 => ' app/Http/Api/Controllers/GetSchoolController.php | 31 +', 6 => ' app/Http/Controllers/HomeController.php | 32 +-', 7 => ' app/Http/Controllers/WorldMapController.php | 34 +', 8 => ' public/css/all.css | 2 +-', 9 => ' public/js/ChartJs/Chart.bundle.js | 20755 +++++++++++++++++++', 10 => ' public/js/ChartJs/Chart.bundle.min.js | 7 +', 11 => ' public/js/ChartJs/Chart.css | 47 +', 12 => ' public/js/ChartJs/Chart.js | 16151 +++++++++++++++', 13 => ' public/js/ChartJs/Chart.min.css | 1 +', 14 => ' public/js/ChartJs/Chart.min.js | 7 +', 15 => ' public/js/ChartJs/LICENSE.md | 9 +', 16 => ' .../samples/advanced/content-security-policy.css | 20 +', 17 => ' .../samples/advanced/content-security-policy.html | 27 +', 18 => ' .../samples/advanced/content-security-policy.js | 54 +', 19 => ' .../js/ChartJs/samples/advanced/progress-bar.html | 96 +', 20 => ' public/js/ChartJs/samples/charts/area/analyser.js | 66 +', 21 => ' .../samples/charts/area/line-boundaries.html | 121 +', 22 => ' .../ChartJs/samples/charts/area/line-datasets.html | 160 +', 23 => ' .../ChartJs/samples/charts/area/line-stacked.html | 183 +', 24 => ' public/js/ChartJs/samples/charts/area/radar.html | 139 +', 25 => ' .../js/ChartJs/samples/charts/bar/horizontal.html | 149 +', 26 => ' .../js/ChartJs/samples/charts/bar/multi-axis.html | 108 +', 27 => ' .../ChartJs/samples/charts/bar/stacked-group.html | 105 +', 28 => ' public/js/ChartJs/samples/charts/bar/stacked.html | 102 +', 29 => ' public/js/ChartJs/samples/charts/bar/vertical.html | 144 +', 30 => ' public/js/ChartJs/samples/charts/bubble.html | 191 +', 31 => ' .../js/ChartJs/samples/charts/combo-bar-line.html | 101 +', 32 => ' public/js/ChartJs/samples/charts/doughnut.html | 157 +', 33 => ' public/js/ChartJs/samples/charts/line/basic.html | 163 +', 34 => ' .../samples/charts/line/interpolation-modes.html | 103 +', 35 => ' .../ChartJs/samples/charts/line/line-styles.html | 111 +', 36 => ' .../js/ChartJs/samples/charts/line/multi-axis.html | 104 +', 37 => ' .../ChartJs/samples/charts/line/point-sizes.html | 129 +', 38 => ' .../ChartJs/samples/charts/line/point-styles.html | 96 +', 39 => ' .../ChartJs/samples/charts/line/skip-points.html | 95 +', 40 => ' public/js/ChartJs/samples/charts/line/stepped.html | 107 +', 41 => ' public/js/ChartJs/samples/charts/pie.html | 97 +', 42 => ' public/js/ChartJs/samples/charts/polar-area.html | 117 +', 43 => ' .../ChartJs/samples/charts/radar-skip-points.html | 109 +', 44 => ' public/js/ChartJs/samples/charts/radar.html | 146 +', 45 => ' .../js/ChartJs/samples/charts/scatter/basic.html | 76 +', 46 => ' .../ChartJs/samples/charts/scatter/multi-axis.html | 139 +', 47 => ' public/js/ChartJs/samples/favicon.ico | Bin 0 -> 32988 bytes', 48 => ' public/js/ChartJs/samples/index.html | 58 +', 49 => ' public/js/ChartJs/samples/legend/callbacks.html | 124 +', 50 => ' public/js/ChartJs/samples/legend/point-style.html | 116 +', 51 => ' public/js/ChartJs/samples/legend/positioning.html | 121 +', 52 => ' public/js/ChartJs/samples/logo.svg | 1 +', 53 => ' public/js/ChartJs/samples/samples.js | 211 +', 54 => ' .../ChartJs/samples/scales/filtering-labels.html | 91 +', 55 => ' .../ChartJs/samples/scales/gridlines-display.html | 124 +', 56 => ' .../js/ChartJs/samples/scales/gridlines-style.html | 69 +', 57 => ' .../samples/scales/linear/min-max-suggested.html | 67 +', 58 => ' .../js/ChartJs/samples/scales/linear/min-max.html | 64 +', 59 => ' .../ChartJs/samples/scales/linear/step-size.html | 175 +', 60 => ' .../ChartJs/samples/scales/logarithmic/line.html | 97 +', 61 => ' .../samples/scales/logarithmic/scatter.html | 171 +', 62 => ' .../ChartJs/samples/scales/multiline-labels.html | 86 +', 63 => ' .../js/ChartJs/samples/scales/non-numeric-y.html | 72 +', 64 => ' public/js/ChartJs/samples/scales/time/combo.html | 175 +', 65 => ' .../js/ChartJs/samples/scales/time/financial.html | 200 +', 66 => ' .../samples/scales/time/line-point-data.html | 149 +', 67 => ' public/js/ChartJs/samples/scales/time/line.html | 203 +', 68 => ' .../ChartJs/samples/scales/toggle-scale-type.html | 99 +', 69 => ' public/js/ChartJs/samples/scriptable/bar.html | 95 +', 70 => ' public/js/ChartJs/samples/scriptable/bubble.html | 131 +', 71 => ' public/js/ChartJs/samples/scriptable/line.html | 115 +', 72 => ' public/js/ChartJs/samples/scriptable/pie.html | 110 +', 73 => ' public/js/ChartJs/samples/scriptable/polar.html | 98 +', 74 => ' public/js/ChartJs/samples/scriptable/radar.html | 118 +', 75 => ' public/js/ChartJs/samples/style.css | 191 +', 76 => ' public/js/ChartJs/samples/tooltips/border.html | 85 +', 77 => ' public/js/ChartJs/samples/tooltips/callbacks.html | 107 +', 78 => ' .../js/ChartJs/samples/tooltips/custom-line.html | 166 +', 79 => ' public/js/ChartJs/samples/tooltips/custom-pie.html | 146 +', 80 => ' .../js/ChartJs/samples/tooltips/custom-points.html | 128 +', 81 => ' .../js/ChartJs/samples/tooltips/interactions.html | 125 +', 82 => ' .../js/ChartJs/samples/tooltips/positioning.html | 86 +', 83 => ' public/js/ChartJs/samples/utils.js | 147 +', 84 => ' resources/sass/style.css | 2 +-', 85 => ' resources/views/home.blade.php | 149 +-', 86 => ' resources/views/layouts/mobile_nav.blade.php | 6 +-', 87 => ' resources/views/layouts/pc_nav.blade.php | 1 +', 88 => ' resources/views/worldmap.blade.php | 81 +', 89 => ' routes/api.php | 1 +', 90 => ' routes/web.php | 1 +', 91 => ' 86 files changed, 45094 insertions(+), 59 deletions(-)', 92 => ' create mode 100644 app/Http/Api/Controllers/GetSchoolController.php', 93 => ' create mode 100644 app/Http/Controllers/WorldMapController.php', 94 => ' create mode 100644 public/js/ChartJs/Chart.bundle.js', 95 => ' create mode 100644 public/js/ChartJs/Chart.bundle.min.js', 96 => ' create mode 100644 public/js/ChartJs/Chart.css', 97 => ' create mode 100644 public/js/ChartJs/Chart.js', 98 => ' create mode 100644 public/js/ChartJs/Chart.min.css', 99 => ' create mode 100644 public/js/ChartJs/Chart.min.js', 100 => ' create mode 100644 public/js/ChartJs/LICENSE.md', 101 => ' create mode 100644 public/js/ChartJs/samples/advanced/content-security-policy.css', 102 => ' create mode 100644 public/js/ChartJs/samples/advanced/content-security-policy.html', 103 => ' create mode 100644 public/js/ChartJs/samples/advanced/content-security-policy.js', 104 => ' create mode 100644 public/js/ChartJs/samples/advanced/progress-bar.html', 105 => ' create mode 100644 public/js/ChartJs/samples/charts/area/analyser.js', 106 => ' create mode 100644 public/js/ChartJs/samples/charts/area/line-boundaries.html', 107 => ' create mode 100644 public/js/ChartJs/samples/charts/area/line-datasets.html', 108 => ' create mode 100644 public/js/ChartJs/samples/charts/area/line-stacked.html', 109 => ' create mode 100644 public/js/ChartJs/samples/charts/area/radar.html', 110 => ' create mode 100644 public/js/ChartJs/samples/charts/bar/horizontal.html', 111 => ' create mode 100644 public/js/ChartJs/samples/charts/bar/multi-axis.html', 112 => ' create mode 100644 public/js/ChartJs/samples/charts/bar/stacked-group.html', 113 => ' create mode 100644 public/js/ChartJs/samples/charts/bar/stacked.html', 114 => ' create mode 100644 public/js/ChartJs/samples/charts/bar/vertical.html', 115 => ' create mode 100644 public/js/ChartJs/samples/charts/bubble.html', 116 => ' create mode 100644 public/js/ChartJs/samples/charts/combo-bar-line.html', 117 => ' create mode 100644 public/js/ChartJs/samples/charts/doughnut.html', 118 => ' create mode 100644 public/js/ChartJs/samples/charts/line/basic.html', 119 => ' create mode 100644 public/js/ChartJs/samples/charts/line/interpolation-modes.html', 120 => ' create mode 100644 public/js/ChartJs/samples/charts/line/line-styles.html', 121 => ' create mode 100644 public/js/ChartJs/samples/charts/line/multi-axis.html', 122 => ' create mode 100644 public/js/ChartJs/samples/charts/line/point-sizes.html', 123 => ' create mode 100644 public/js/ChartJs/samples/charts/line/point-styles.html', 124 => ' create mode 100644 public/js/ChartJs/samples/charts/line/skip-points.html', 125 => ' create mode 100644 public/js/ChartJs/samples/charts/line/stepped.html', 126 => ' create mode 100644 public/js/ChartJs/samples/charts/pie.html', 127 => ' create mode 100644 public/js/ChartJs/samples/charts/polar-area.html', 128 => ' create mode 100644 public/js/ChartJs/samples/charts/radar-skip-points.html', 129 => ' create mode 100644 public/js/ChartJs/samples/charts/radar.html', 130 => ' create mode 100644 public/js/ChartJs/samples/charts/scatter/basic.html', 131 => ' create mode 100644 public/js/ChartJs/samples/charts/scatter/multi-axis.html', 132 => ' create mode 100644 public/js/ChartJs/samples/favicon.ico', 133 => ' create mode 100644 public/js/ChartJs/samples/index.html', 134 => ' create mode 100644 public/js/ChartJs/samples/legend/callbacks.html', 135 => ' create mode 100644 public/js/ChartJs/samples/legend/point-style.html', 136 => ' create mode 100644 public/js/ChartJs/samples/legend/positioning.html', 137 => ' create mode 100644 public/js/ChartJs/samples/logo.svg', 138 => ' create mode 100644 public/js/ChartJs/samples/samples.js', 139 => ' create mode 100644 public/js/ChartJs/samples/scales/filtering-labels.html', 140 => ' create mode 100644 public/js/ChartJs/samples/scales/gridlines-display.html', 141 => ' create mode 100644 public/js/ChartJs/samples/scales/gridlines-style.html', 142 => ' create mode 100644 public/js/ChartJs/samples/scales/linear/min-max-suggested.html', 143 => ' create mode 100644 public/js/ChartJs/samples/scales/linear/min-max.html', 144 => ' create mode 100644 public/js/ChartJs/samples/scales/linear/step-size.html', 145 => ' create mode 100644 public/js/ChartJs/samples/scales/logarithmic/line.html', 146 => ' create mode 100644 public/js/ChartJs/samples/scales/logarithmic/scatter.html', 147 => ' create mode 100644 public/js/ChartJs/samples/scales/multiline-labels.html', 148 => ' create mode 100644 public/js/ChartJs/samples/scales/non-numeric-y.html', 149 => ' create mode 100644 public/js/ChartJs/samples/scales/time/combo.html', 150 => ' create mode 100644 public/js/ChartJs/samples/scales/time/financial.html', 151 => ' create mode 100644 public/js/ChartJs/samples/scales/time/line-point-data.html', 152 => ' create mode 100644 public/js/ChartJs/samples/scales/time/line.html', 153 => ' create mode 100644 public/js/ChartJs/samples/scales/toggle-scale-type.html', 154 => ' create mode 100644 public/js/ChartJs/samples/scriptable/bar.html', 155 => ' create mode 100644 public/js/ChartJs/samples/scriptable/bubble.html', 156 => ' create mode 100644 public/js/ChartJs/samples/scriptable/line.html', 157 => ' create mode 100644 public/js/ChartJs/samples/scriptable/pie.html', 158 => ' create mode 100644 public/js/ChartJs/samples/scriptable/polar.html', 159 => ' create mode 100644 public/js/ChartJs/samples/scriptable/radar.html', 160 => ' create mode 100644 public/js/ChartJs/samples/style.css', 161 => ' create mode 100644 public/js/ChartJs/samples/tooltips/border.html', 162 => ' create mode 100644 public/js/ChartJs/samples/tooltips/callbacks.html', 163 => ' create mode 100644 public/js/ChartJs/samples/tooltips/custom-line.html', 164 => ' create mode 100644 public/js/ChartJs/samples/tooltips/custom-pie.html', 165 => ' create mode 100644 public/js/ChartJs/samples/tooltips/custom-points.html', 166 => ' create mode 100644 public/js/ChartJs/samples/tooltips/interactions.html', 167 => ' create mode 100644 public/js/ChartJs/samples/tooltips/positioning.html', 168 => ' create mode 100644 public/js/ChartJs/samples/utils.js', 169 => ' create mode 100644 resources/views/worldmap.blade.php', 170 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-20 08:37:48向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 446e2f6..05f3bcd master -> origin/master', 3 => 'Updating 446e2f6..05f3bcd', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/HomeController.php | 5 ++++-', 6 => ' 1 file changed, 4 insertions(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-20 08:46:18向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 05f3bcd..d0bb1b1 master -> origin/master', 3 => 'Updating 05f3bcd..d0bb1b1', 4 => 'Fast-forward', 5 => ' app/Http/Api/Controllers/GetSchoolController.php | 1 +', 6 => ' app/Http/Controllers/HomeController.php | 1 +', 7 => ' 2 files changed, 2 insertions(+)', 8 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-20 09:00:14向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' d0bb1b1..b692fa8 master -> origin/master', 3 => 'Updating d0bb1b1..b692fa8', 4 => 'Fast-forward', 5 => ' resources/views/layouts/mobile_nav.blade.php | 2 +-', 6 => ' resources/views/layouts/pc_nav.blade.php | 2 +-', 7 => ' 2 files changed, 2 insertions(+), 2 deletions(-)', 8 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-21 08:46:26向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' b692fa8..0fd9966 master -> origin/master', 3 => 'Updating b692fa8..0fd9966', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/HomeController.php | 26 +++++++--', 6 => ' public/js/chart_home.js | 41 ++++++++++++++', 7 => ' resources/views/home.blade.php | 98 ++-------------------------------', 8 => ' 3 files changed, 68 insertions(+), 97 deletions(-)', 9 => ' create mode 100644 public/js/chart_home.js', 10 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-21 08:48:14向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 0fd9966..85a7b18 master -> origin/master', 3 => 'Updating 0fd9966..85a7b18', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/HomeController.php | 3 +--', 6 => ' 1 file changed, 1 insertion(+), 2 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-21 08:49:12向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 85a7b18..173452f master -> origin/master', 3 => 'Updating 85a7b18..173452f', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/HomeController.php | 4 ++--', 6 => ' 1 file changed, 2 insertions(+), 2 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-21 08:50:15向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 173452f..a631e19 master -> origin/master', 3 => 'Updating 173452f..a631e19', 4 => 'Fast-forward', 5 => ' resources/views/home.blade.php | 2 ++', 6 => ' 1 file changed, 2 insertions(+)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-21 08:52:37向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' a631e19..3dda89e master -> origin/master', 3 => 'Updating a631e19..3dda89e', 4 => 'Fast-forward', 5 => ' resources/views/home.blade.php | 1 +', 6 => ' 1 file changed, 1 insertion(+)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-21 08:57:49向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 3dda89e..58281e8 master -> origin/master', 3 => 'Updating 3dda89e..58281e8', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/HomeController.php | 12 +++++++-----', 6 => ' 1 file changed, 7 insertions(+), 5 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-21 08:59:21向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 58281e8..daf81cd master -> origin/master', 3 => 'Updating 58281e8..daf81cd', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/HomeController.php | 2 ++', 6 => ' 1 file changed, 2 insertions(+)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-21 09:00:28向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' daf81cd..07a47ae master -> origin/master', 3 => 'Updating daf81cd..07a47ae', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/HomeController.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-21 09:01:57向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 07a47ae..6e856cf master -> origin/master', 3 => 'Updating 07a47ae..6e856cf', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/HomeController.php | 7 ++++---', 6 => ' 1 file changed, 4 insertions(+), 3 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-21 09:07:36向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 6e856cf..cf855ae master -> origin/master', 3 => 'Updating 6e856cf..cf855ae', 4 => 'Fast-forward', 5 => ' public/js/chart_home.js | 12 ++++++++++--', 6 => ' 1 file changed, 10 insertions(+), 2 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-21 09:09:53向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' cf855ae..c57ceae master -> origin/master', 3 => 'Updating cf855ae..c57ceae', 4 => 'Fast-forward', 5 => ' public/js/chart_home.js | 1 +', 6 => ' 1 file changed, 1 insertion(+)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-21 09:10:55向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' c57ceae..c89a1bf master -> origin/master', 3 => 'Updating c57ceae..c89a1bf', 4 => 'Fast-forward', 5 => ' public/js/chart_home.js | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-21 09:11:57向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' c89a1bf..15f2149 master -> origin/master', 3 => 'Updating c89a1bf..15f2149', 4 => 'Fast-forward', 5 => ' public/js/chart_home.js | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-21 09:13:38向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 15f2149..16629bb master -> origin/master', 3 => 'Updating 15f2149..16629bb', 4 => 'Fast-forward', 5 => ' public/js/chart_home.js | 6 +++---', 6 => ' 1 file changed, 3 insertions(+), 3 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-21 09:14:25向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 16629bb..07295f2 master -> origin/master', 3 => 'Updating 16629bb..07295f2', 4 => 'Fast-forward', 5 => ' public/js/chart_home.js | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-21 09:17:23向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 07295f2..8c69f08 master -> origin/master', 3 => 'Updating 07295f2..8c69f08', 4 => 'Fast-forward', 5 => ' public/js/chart_home.js | 21 ++++++++++++++++++++-', 6 => ' 1 file changed, 20 insertions(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-21 09:20:26向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 8c69f08..bf030a6 master -> origin/master', 3 => 'Updating 8c69f08..bf030a6', 4 => 'Fast-forward', 5 => ' public/js/chart_home.js | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-25 06:20:39向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 1e534d7..652f8a6 master -> origin/master', 3 => 'Updating 1e534d7..652f8a6', 4 => 'Fast-forward', 5 => ' app/Models/Sinologist.php | 1 +', 6 => ' app/Models/Works.php | 2 +', 7 => ' composer.json | 2 +', 8 => ' public/css/all.css | 85 ++++++++++++++++', 9 => ' resources/sass/page.css | 85 ++++++++++++++++', 10 => ' resources/views/sinologist/detail.blade.php | 144 ++++++++++++++--------------', 11 => ' 6 files changed, 246 insertions(+), 73 deletions(-)', 12 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-25 06:29:13向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 652f8a6..377a1c0 master -> origin/master', 3 => 'Updating 652f8a6..377a1c0', 4 => 'Fast-forward', 5 => ' public/css/all.css | 2 +-', 6 => ' public/images/icon-jt.png | Bin 0 -> 4898 bytes', 7 => ' resources/sass/style.css | 2 +-', 8 => ' resources/views/sinologist/detail.blade.php | 4 ++--', 9 => ' 4 files changed, 4 insertions(+), 4 deletions(-)', 10 => ' create mode 100644 public/images/icon-jt.png', 11 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-25 06:35:41向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 377a1c0..0135f93 master -> origin/master', 3 => 'Updating 377a1c0..0135f93', 4 => 'Fast-forward', 5 => ' resources/views/sinologist/detail.blade.php | 10 +++++++++-', 6 => ' 1 file changed, 9 insertions(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-25 06:37:04向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 0135f93..547b86b master -> origin/master', 3 => 'Updating 0135f93..547b86b', 4 => 'Fast-forward', 5 => ' resources/views/sinologist/detail.blade.php | 10 +++++-----', 6 => ' 1 file changed, 5 insertions(+), 5 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-25 06:37:54向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 547b86b..5024173 master -> origin/master', 3 => 'Updating 547b86b..5024173', 4 => 'Fast-forward', 5 => ' resources/views/sinologist/detail.blade.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-26 13:19:26向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 5024173..a47038d master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' app/Http/Controllers/MoreInfoController.php | 7 +-', 5 => ' app/Http/Controllers/SinologistController.php | 21 ++-', 6 => ' app/Http/Controllers/WorksController.php | 23 +++-', 7 => ' public/css/all.css | 12 +-', 8 => ' resources/sass/page.css | 10 +-', 9 => ' resources/sass/style.css | 4 +-', 10 => ' resources/views/moreinfo/list.blade.php | 6 +-', 11 => ' resources/views/sinologist/chart.blade.php | 21 +++', 12 => ' resources/views/sinologist/detail.blade.php | 94 +------------', 13 => ' resources/views/sinologist/nav.blade.php | 190 ++++++++++++++++++++++++++', 14 => ' resources/views/works/list.blade.php | 9 +-', 15 => ' routes/web.php | 2 +-', 16 => ' 12 files changed, 284 insertions(+), 115 deletions(-)', 17 => ' create mode 100644 resources/views/sinologist/chart.blade.php', 18 => ' create mode 100644 resources/views/sinologist/nav.blade.php', 19 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-26 13:24:51向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' a47038d..abe3d1b master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' resources/views/sinologist/nav.blade.php | 2 +-', 5 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 6 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-26 13:44:33向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' abe3d1b..83d7fc9 master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' resources/views/sinologist/nav.blade.php | 10 +++++++++-', 5 => ' 1 file changed, 9 insertions(+), 1 deletion(-)', 6 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-26 13:45:19向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 83d7fc9..c03f97d master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' resources/views/sinologist/nav.blade.php | 4 ++--', 5 => ' 1 file changed, 2 insertions(+), 2 deletions(-)', 6 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-26 13:50:48向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' c03f97d..dd43d06 master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' resources/views/sinologist/detail.blade.php | 20 ++++++++++----------', 5 => ' resources/views/sinologist/nav.blade.php | 3 ++-', 6 => ' 2 files changed, 12 insertions(+), 11 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-27 12:50:41向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' dd43d06..da1f906 master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' public/css/all.css | 2 +-', 5 => ' resources/sass/style.css | 2 +-', 6 => ' 2 files changed, 2 insertions(+), 2 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-27 12:52:14向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' da1f906..4c60ba7 master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' app/Http/Controllers/MoreInfoController.php | 1 +', 5 => ' 1 file changed, 1 insertion(+)', 6 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-27 12:55:41向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 4c60ba7..7e0837a master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' resources/views/moreinfo/list.blade.php | 2 +-', 5 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 6 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-27 12:58:23向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 7e0837a..ccf9b14 master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' resources/views/moreinfo/list.blade.php | 2 +-', 5 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 6 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-27 13:01:35向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' ccf9b14..c6a807e master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' resources/views/sinologist/nav.blade.php | 4 ++--', 5 => ' 1 file changed, 2 insertions(+), 2 deletions(-)', 6 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-27 13:14:12向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' c6a807e..3e492a8 master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' resources/views/sinologist/nav.blade.php | 2 +-', 5 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 6 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-27 13:19:10向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 3e492a8..6c2b8d5 master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' resources/views/sinologist/nav.blade.php | 4 ++--', 5 => ' 1 file changed, 2 insertions(+), 2 deletions(-)', 6 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-27 13:23:44向Sinologist项目的refs/heads/master分支push了3个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 6c2b8d5..009f891 master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' resources/views/sinologist/nav.blade.php | 20 ++++++++++----------', 5 => ' 1 file changed, 10 insertions(+), 10 deletions(-)', 6 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-27 13:29:09向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 009f891..aca58bb master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' resources/views/sinologist/nav.blade.php | 2 +-', 5 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 6 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-27 13:32:11向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' aca58bb..7bb7eb0 master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' resources/views/works/list.blade.php | 2 +-', 5 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 6 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-27 13:35:49向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 7bb7eb0..34e1482 master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' resources/views/sinologist/nav.blade.php | 2 +-', 5 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 6 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-27 13:55:45向Sinologist项目的refs/heads/master分支push了3个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 34e1482..b2c2a9a master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' resources/views/moreinfo/list.blade.php | 2 +-', 5 => ' resources/views/sinologist/detail.blade.php | 11 +----------', 6 => ' resources/views/sinologist/nav.blade.php | 17 +++++++++++++++--', 7 => ' resources/views/works/list.blade.php | 2 +-', 8 => ' 4 files changed, 18 insertions(+), 14 deletions(-)', 9 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-29 05:59:03向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' b2c2a9a..7e22842 master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' app/Admin/Actions/Post/BatchNewWorksIn.php | 2 +-', 5 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 6 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-29 06:31:44向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 7e22842..e340aa4 master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' app/Models/Works.php | 5 ++---', 5 => ' 1 file changed, 2 insertions(+), 3 deletions(-)', 6 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-29 06:41:24向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' e340aa4..9e5d0bf master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' app/Http/Controllers/MoreInfoController.php | 6 ++++++', 5 => ' app/Http/Controllers/SinologistController.php | 7 ++++++-', 6 => ' app/Http/Controllers/WorksController.php | 6 ++++++', 7 => ' resources/views/sinologist/nav.blade.php | 6 +++---', 8 => ' 4 files changed, 21 insertions(+), 4 deletions(-)', 9 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-29 06:43:33向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 9e5d0bf..f8113da master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' resources/views/comments/all.blade.php | 6 +++---', 5 => ' 1 file changed, 3 insertions(+), 3 deletions(-)', 6 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-29 06:48:01向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' f8113da..d5c6f87 master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' app/Http/Controllers/SinologistController.php | 11 ++++++++---', 5 => ' 1 file changed, 8 insertions(+), 3 deletions(-)', 6 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-29 06:49:26向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' d5c6f87..c33519b master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' resources/views/comments/all.blade.php | 2 +-', 5 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 6 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-09-30 06:44:36向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' c33519b..501e2c6 master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' app/Admin/Actions/Post/BatchNewWorksIn.php | 2 +-', 5 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 6 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-03 06:20:54向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 501e2c6..f18b377 master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' app/Admin/Actions/Post/ImportBooku.php | 123 ++++++++++++', 5 => ' app/Admin/Controllers/BookuClassController.php | 158 +++++++++++++++', 6 => ' app/Admin/Controllers/BookuController.php | 125 ++++++++++++', 7 => ' .../Controllers/api/GetBookuClassController.php | 25 +++', 8 => ' app/Admin/routes.php | 4 +', 9 => ' app/Http/Controllers/BookuController.php | 49 +++++', 10 => ' app/Http/Controllers/SinologistController.php | 28 ++-', 11 => ' app/Imports/BookuImport.php | 81 ++++++++', 12 => ' app/Models/Booku.php | 18 ++', 13 => ' app/Models/BookuClass.php | 14 ++', 14 => ' .../2020_10_02_091633_create_booku_class_table.php | 35 ++++', 15 => ' .../2020_10_02_093855_create_booku_table.php | 36 ++++', 16 => ' public/css/all.css | 56 +++++-', 17 => ' public/js/all.js | 37 +++-', 18 => ' public/upload/booku_muban.xls | Bin 0 -> 268800 bytes', 19 => ' resources/js/js.js | 37 +++-', 20 => ' resources/sass/style.css | 58 +++++-', 21 => ' resources/views/booku/list.blade.php | 213 +++++++++++++++++++++', 22 => ' resources/views/sinologist/booku.blade.php | 45 +++++', 23 => ' resources/views/sinologist/detail.blade.php | 19 +-', 24 => ' routes/api.php | 1 +', 25 => ' routes/web.php | 1 +', 26 => ' 22 files changed, 1144 insertions(+), 19 deletions(-)', 27 => ' create mode 100644 app/Admin/Actions/Post/ImportBooku.php', 28 => ' create mode 100644 app/Admin/Controllers/BookuClassController.php', 29 => ' create mode 100644 app/Admin/Controllers/BookuController.php', 30 => ' create mode 100644 app/Admin/Controllers/api/GetBookuClassController.php', 31 => ' create mode 100644 app/Http/Controllers/BookuController.php', 32 => ' create mode 100644 app/Imports/BookuImport.php', 33 => ' create mode 100644 app/Models/Booku.php', 34 => ' create mode 100644 app/Models/BookuClass.php', 35 => ' create mode 100644 database/migrations/2020_10_02_091633_create_booku_class_table.php', 36 => ' create mode 100644 database/migrations/2020_10_02_093855_create_booku_table.php', 37 => ' create mode 100644 public/upload/booku_muban.xls', 38 => ' create mode 100644 resources/views/booku/list.blade.php', 39 => ' create mode 100644 resources/views/sinologist/booku.blade.php', 40 => 'Migrating: 2020_10_02_091633_create_booku_class_table', 41 => 'Migrated: 2020_10_02_091633_create_booku_class_table (0.05 seconds)', 42 => 'Migrating: 2020_10_02_093855_create_booku_table', 43 => 'Migrated: 2020_10_02_093855_create_booku_table (0.02 seconds)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-03 06:39:01向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' f18b377..1f6cd9a master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' public/upload/booku_muban.xls | Bin 268800 -> 268800 bytes', 5 => ' resources/views/booku/list.blade.php | 2 +-', 6 => ' 2 files changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-08 10:51:30向Sinologist项目的refs/heads/master分支push了2个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 1f6cd9a..eee11c5 master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' .env.example | 2 +', 5 => ' app/Admin/Controllers/BookuClassController.php | 30 +-', 6 => ' app/Admin/Controllers/BookuController.php | 2 +-', 7 => ' app/Admin/Controllers/WorksController.php | 15 +-', 8 => ' app/Admin/Controllers/WorksWordsController.php | 128 +++++', 9 => ' .../Controllers/api/GetBookuClassController.php | 2 +-', 10 => ' app/Admin/routes.php | 5 +-', 11 => ' app/Console/Commands/GetCipin.php | 107 ++++', 12 => ' app/Console/Commands/test.php | 26 +-', 13 => ' app/Console/Kernel.php | 1 +', 14 => ' app/Http/Api/Controllers/KongfzController.php | 2 +-', 15 => ' app/Http/Controllers/SinologistController.php | 55 +-', 16 => ' app/Jobs/GetCipinJob.php | 58 ++', 17 => ' app/Jobs/SetCipinJob.php | 90 ++++', 18 => ' app/Models/BookuClass.php | 8 +-', 19 => ' app/Models/Sinologist.php | 24 +', 20 => ' app/Models/Works.php | 16 +-', 21 => ' app/Models/WorksWords.php | 15 +', 22 => ' app/Observers/WorksWordsObserver.php | 26 +', 23 => ' app/Providers/AppServiceProvider.php | 3 +', 24 => ' composer.json | 5 +-', 25 => ' composer.lock | 599 ++++++++++++++++++++-', 26 => ' config/app.php | 4 +-', 27 => ' config/scout.php | 106 ++++', 28 => ' .../2020_10_06_003930_create_works_words_table.php | 37 ++', 29 => ' public/js/chart.js | 53 +-', 30 => ' resources/views/sinologist/chart.blade.php | 7 +-', 31 => ' 27 files changed, 1377 insertions(+), 49 deletions(-)', 32 => ' create mode 100644 app/Admin/Controllers/WorksWordsController.php', 33 => ' create mode 100644 app/Console/Commands/GetCipin.php', 34 => ' create mode 100644 app/Jobs/GetCipinJob.php', 35 => ' create mode 100644 app/Jobs/SetCipinJob.php', 36 => ' create mode 100644 app/Models/WorksWords.php', 37 => ' create mode 100644 app/Observers/WorksWordsObserver.php', 38 => ' create mode 100644 config/scout.php', 39 => ' create mode 100644 database/migrations/2020_10_06_003930_create_works_words_table.php', 40 => '', 41 => 'In ProviderRepository.php line 208:', 42 => '', 43 => ' Class \'Laravel\\Scout\\ScoutServiceProvider\' not found', 44 => '', 45 => '', ) $return:1 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-08 12:10:29向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' eee11c5..95011ba master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' app/Http/Controllers/SinologistController.php | 113 +++++++++++++++-----------', 5 => ' public/js/chart.js | 52 +-----------', 6 => ' public/js/chart_column.js | 54 ++++++++++++', 7 => ' resources/views/sinologist/chart.blade.php | 7 +-', 8 => ' resources/views/sinologist/column.blade.php | 26 ++++++', 9 => ' resources/views/sinologist/nav.blade.php | 8 +-', 10 => ' routes/web.php | 1 +', 11 => ' 7 files changed, 155 insertions(+), 106 deletions(-)', 12 => ' create mode 100644 public/js/chart_column.js', 13 => ' create mode 100644 resources/views/sinologist/column.blade.php', 14 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-08 14:48:42向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 95011ba..7866d3d master -> origin/master', 3 => 'Removing app/Observers/WorksWordsObserver.php', 4 => 'Removing app/Jobs/GetCipinJob.php', 5 => 'Removing app/Console/Commands/GetCipin.php', 6 => 'Merge made by the \'recursive\' strategy.', 7 => ' .env.example | 2 +-', 8 => ' app/Admin/Controllers/WorksController.php | 8 +-', 9 => ' app/Admin/Controllers/WorksWordsController.php | 21 +++-', 10 => ' app/Console/Commands/GetCipin.php | 107 ---------------------', 11 => ' app/Console/Commands/test.php | 97 +++++++++++++++++--', 12 => ' app/Http/Controllers/SinologistController.php | 8 +-', 13 => ' app/Jobs/GetCipinJob.php | 58 -----------', 14 => ' app/Jobs/SetCipinJob.php | 54 +++++++++--', 15 => ' app/Models/WorksWords.php | 1 +', 16 => ' app/Observers/WorksWordsObserver.php | 26 -----', 17 => ' app/Providers/AppServiceProvider.php | 6 +-', 18 => ' .../2020_10_06_003930_create_works_words_table.php | 1 +', 19 => ' 12 files changed, 170 insertions(+), 219 deletions(-)', 20 => ' delete mode 100644 app/Console/Commands/GetCipin.php', 21 => ' delete mode 100644 app/Jobs/GetCipinJob.php', 22 => ' delete mode 100644 app/Observers/WorksWordsObserver.php', 23 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-08 15:01:08向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 7866d3d..d7c8f9b master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' app/Http/Controllers/SinologistController.php | 17 ++++-------------', 5 => ' app/Jobs/SetCipinJob.php | 2 +-', 6 => ' app/Models/Sinologist.php | 26 +-------------------------', 7 => ' 3 files changed, 6 insertions(+), 39 deletions(-)', 8 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-08 15:16:37向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' d7c8f9b..4472344 master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' app/Admin/Controllers/WorksWordsController.php | 8 +++++++-', 5 => ' 1 file changed, 7 insertions(+), 1 deletion(-)', 6 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-08 15:18:31向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 4472344..d3bf833 master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' app/Jobs/SetCipinJob.php | 2 +-', 5 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 6 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-08 15:24:29向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' d3bf833..c94f207 master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' app/Jobs/SetCipinJob.php | 2 +-', 5 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 6 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-09 11:48:41向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' c94f207..0239e00 master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' resources/views/sinologist/chart.blade.php | 2 +-', 5 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 6 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-09 11:55:33向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 0239e00..3065c02 master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' .env.example | 6 +++++-', 5 => ' resources/views/sinologist/detail.blade.php | 2 +-', 6 => ' 2 files changed, 6 insertions(+), 2 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-09 12:03:19向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 3065c02..cd4c73e master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' resources/views/booku/list.blade.php | 2 +-', 5 => ' resources/views/moreinfo/list.blade.php | 2 +-', 6 => ' resources/views/sinologist/detail.blade.php | 2 +-', 7 => ' resources/views/sinologist/list.blade.php | 2 +-', 8 => ' resources/views/works/list.blade.php | 2 +-', 9 => ' 5 files changed, 5 insertions(+), 5 deletions(-)', 10 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-12 05:59:10向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' cd4c73e..1a31e2d master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' app/Console/Commands/test.php | 92 ++-----------------------------------------', 5 => ' routes/api.php | 6 +--', 6 => ' 2 files changed, 6 insertions(+), 92 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-12 06:26:02向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 1a31e2d..3ff001f master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' app/Http/Controllers/HomeController.php | 100 ++++++++++++++------------', 5 => ' app/Http/Controllers/SinologistController.php | 96 +++++++++++++------------', 6 => ' 2 files changed, 102 insertions(+), 94 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-12 06:47:04向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 3ff001f..11ffc4e master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' app/Http/Controllers/SinologistController.php | 2 +-', 5 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 6 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-12 06:48:43向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 11ffc4e..441d6b7 master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' app/Http/Controllers/SinologistController.php | 3 +++', 5 => ' 1 file changed, 3 insertions(+)', 6 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-12 06:54:41向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 441d6b7..94e866d master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' app/Http/Controllers/SinologistController.php | 9 ++-------', 5 => ' 1 file changed, 2 insertions(+), 7 deletions(-)', 6 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-12 06:55:52向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 94e866d..0cea0cb master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' app/Http/Controllers/SinologistController.php | 9 +++++++--', 5 => ' 1 file changed, 7 insertions(+), 2 deletions(-)', 6 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-12 06:57:26向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 0cea0cb..a6cc8a0 master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' app/Http/Controllers/SinologistController.php | 11 ++++-------', 5 => ' 1 file changed, 4 insertions(+), 7 deletions(-)', 6 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-14 01:23:43向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' a6cc8a0..69c9489 master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' app/Console/Commands/test.php | 2 +-', 5 => ' app/Http/Controllers/HomeController.php | 19 +-', 6 => ' app/Http/Controllers/SinologistController.php | 65 ++--', 7 => ' app/Http/Services/HtmlHelper.php | 22 ++', 8 => ' app/Models/Jobs.php | 14 +-', 9 => ' app/Models/Sinologist.php | 14 +-', 10 => ' composer.json | 3 +-', 11 => ' config/filesystems.php | 6 +', 12 => ' public/js/all.js | 435 --------------------------', 13 => ' {resources => public}/js/js.js | 0', 14 => ' resources/views/booku/list.blade.php | 2 +-', 15 => ' resources/views/layouts/app.blade.php | 2 +-', 16 => ' resources/views/sinologist/detail.blade.php | 4 +-', 17 => ' resources/views/sinologist/list.blade.php | 2 +-', 18 => ' webpack.mix.js | 2 +-', 19 => ' 15 files changed, 112 insertions(+), 480 deletions(-)', 20 => ' create mode 100644 app/Http/Services/HtmlHelper.php', 21 => ' rename {resources => public}/js/js.js (100%)', 22 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-14 01:53:20向Sinologist项目的refs/heads/master分支push了2个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 69c9489..2e96d7b master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' .gitignore | 1 +', 5 => ' app/Observers/JobsObserver.php | 4 +-', 6 => ' app/Observers/SinologistObserver.php | 9 +-', 7 => ' app/Observers/WorksObserver.php | 4 +-', 8 => ' resources/views/sinologist/nav.blade.php | 4 +-', 9 => ' storage/html/index.html | 196 +++++++++++++++++++++++++++++++', 10 => ' 6 files changed, 212 insertions(+), 6 deletions(-)', 11 => ' create mode 100644 storage/html/index.html', 12 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-14 02:04:48向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 2e96d7b..6c16cf1 master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' public/js/all.js | 6 ------', 5 => ' resources/views/booku/list.blade.php | 2 +-', 6 => ' resources/views/layouts/app.blade.php | 2 +-', 7 => ' resources/views/sinologist/detail.blade.php | 2 +-', 8 => ' resources/views/sinologist/list.blade.php | 2 +-', 9 => ' resources/views/works/list.blade.php | 4 ++--', 10 => ' webpack.mix.js | 2 +-', 11 => ' 7 files changed, 7 insertions(+), 13 deletions(-)', 12 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-14 02:07:45向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 6c16cf1..be97d68 master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' resources/views/sinologist/nav.blade.php | 4 ++--', 5 => ' 1 file changed, 2 insertions(+), 2 deletions(-)', 6 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-14 02:09:19向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' be97d68..5fa3a36 master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' resources/views/sinologist/nav.blade.php | 2 +-', 5 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 6 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-14 02:11:23向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 5fa3a36..4be334b master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' resources/views/sinologist/nav.blade.php | 1 +', 5 => ' 1 file changed, 1 insertion(+)', 6 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-14 02:11:39向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 4be334b..aab3b44 master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' resources/views/sinologist/nav.blade.php | 4 ++--', 5 => ' 1 file changed, 2 insertions(+), 2 deletions(-)', 6 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-14 02:16:49向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' aab3b44..4503fe0 master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' resources/views/sinologist/nav.blade.php | 7 +++----', 5 => ' 1 file changed, 3 insertions(+), 4 deletions(-)', 6 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-14 02:21:11向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 4503fe0..0ad6739 master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' public/js/all.js | 6 ++++++', 5 => ' resources/views/booku/list.blade.php | 6 +++---', 6 => ' resources/views/layouts/app.blade.php | 6 +++---', 7 => ' resources/views/sinologist/detail.blade.php | 6 +++---', 8 => ' resources/views/sinologist/list.blade.php | 6 +++---', 9 => ' resources/views/works/list.blade.php | 6 +++---', 10 => ' webpack.mix.js | 4 ++--', 11 => ' 7 files changed, 23 insertions(+), 17 deletions(-)', 12 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-14 02:23:51向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 0ad6739..df3f326 master -> origin/master', 3 => 'Merge made by the \'recursive\' strategy.', 4 => ' resources/views/sinologist/nav.blade.php | 4 ++--', 5 => ' 1 file changed, 2 insertions(+), 2 deletions(-)', 6 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-14 02:34:38向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' df3f326..d13bd11 master -> origin/master', 3 => 'Updating df3f326..d13bd11', 4 => 'Fast-forward', 5 => ' storage/html/index.html | 196 ------------------------------------------------', 6 => ' 1 file changed, 196 deletions(-)', 7 => ' delete mode 100644 storage/html/index.html', 8 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-14 02:52:28向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' d13bd11..7c55cc6 master -> origin/master', 3 => 'Updating d13bd11..7c55cc6', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SearchController.php | 4 ++--', 6 => ' 1 file changed, 2 insertions(+), 2 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-14 02:59:04向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 7c55cc6..03044c0 master -> origin/master', 3 => 'Updating 7c55cc6..03044c0', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SearchController.php | 4 ++--', 6 => ' 1 file changed, 2 insertions(+), 2 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-14 03:01:27向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 03044c0..9ba9ebf master -> origin/master', 3 => 'Updating 03044c0..9ba9ebf', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SearchController.php | 11 ++++++++---', 6 => ' 1 file changed, 8 insertions(+), 3 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-14 03:02:35向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 9ba9ebf..d290438 master -> origin/master', 3 => 'Updating 9ba9ebf..d290438', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SearchController.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-14 10:56:04向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' d290438..ee838ad master -> origin/master', 3 => 'Updating d290438..ee838ad', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SearchController.php | 3 +++', 6 => ' 1 file changed, 3 insertions(+)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-15 01:14:25向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' ee838ad..e17d410 master -> origin/master', 3 => 'Updating ee838ad..e17d410', 4 => 'Fast-forward', 5 => ' public/js/all.js | 435 +++++++++++++++++++++++++++++++++++++++++', 6 => ' public/js/jquery.js | 5 -', 7 => ' {public => resources}/js/js.js | 0', 8 => ' 3 files changed, 435 insertions(+), 5 deletions(-)', 9 => ' delete mode 100644 public/js/jquery.js', 10 => ' rename {public => resources}/js/js.js (100%)', 11 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-15 06:31:15向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' e17d410..9a5f7a2 master -> origin/master', 3 => 'Updating e17d410..9a5f7a2', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SearchController.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-15 08:16:44向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 9a5f7a2..45ab73b master -> origin/master', 3 => 'Updating 9a5f7a2..45ab73b', 4 => 'Fast-forward', 5 => ' resources/views/sinologist/list.blade.php | 6 ++++++', 6 => ' 1 file changed, 6 insertions(+)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-16 09:36:51向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 45ab73b..15c2471 master -> origin/master', 3 => 'Updating 45ab73b..15c2471', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SinologistController.php | 24 ++--', 6 => ' public/css/all.css | 167 +++++++++++++++++++++++', 7 => ' resources/sass/style.css | 169 +++++++++++++++++++++++-', 8 => ' resources/views/sinologist/booku.blade copy.php | 45 +++++++', 9 => ' resources/views/sinologist/booku.blade.php | 85 ++++++------', 10 => ' resources/views/sinologist/detail.blade.php | 6 +-', 11 => ' 6 files changed, 435 insertions(+), 61 deletions(-)', 12 => ' create mode 100644 resources/views/sinologist/booku.blade copy.php', 13 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-16 09:37:36向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 15c2471..28be4c8 master -> origin/master', 3 => 'Updating 15c2471..28be4c8', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SinologistController.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-16 09:38:37向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 28be4c8..5463c7d master -> origin/master', 3 => 'Updating 28be4c8..5463c7d', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SinologistController.php | 6 +++---', 6 => ' 1 file changed, 3 insertions(+), 3 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-16 09:39:51向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 5463c7d..45258db master -> origin/master', 3 => 'Updating 5463c7d..45258db', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SinologistController.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-16 09:40:49向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 45258db..56687f7 master -> origin/master', 3 => 'Updating 45258db..56687f7', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SinologistController.php | 13 ++++++++-----', 6 => ' 1 file changed, 8 insertions(+), 5 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-16 09:41:37向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 56687f7..7481fc0 master -> origin/master', 3 => 'Updating 56687f7..7481fc0', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SinologistController.php | 1 +', 6 => ' 1 file changed, 1 insertion(+)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-16 09:43:04向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 7481fc0..66c95a4 master -> origin/master', 3 => 'Updating 7481fc0..66c95a4', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SinologistController.php | 18 ++++++++++--------', 6 => ' 1 file changed, 10 insertions(+), 8 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-16 09:43:42向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 66c95a4..e55698e master -> origin/master', 3 => 'Updating 66c95a4..e55698e', 4 => 'Fast-forward', 5 => ' resources/views/sinologist/booku.blade.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-16 09:47:49向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' e55698e..0fae2eb master -> origin/master', 3 => 'Updating e55698e..0fae2eb', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SinologistController.php | 18 ++++--------------', 6 => ' public/images/2211111.png | Bin 0 -> 1392 bytes', 7 => ' public/images/Facebook.png | Bin 0 -> 802 bytes', 8 => ' public/images/Twitter.png | Bin 0 -> 769 bytes', 9 => ' public/images/a1.png | Bin 0 -> 594 bytes', 10 => ' public/images/fz.png | Bin 0 -> 415 bytes', 11 => ' public/images/jx.png | Bin 0 -> 534 bytes', 12 => ' public/images/vb.png | Bin 0 -> 1297 bytes', 13 => ' public/images/vx.png | Bin 0 -> 1501 bytes', 14 => ' resources/views/sinologist/booku.blade.php | 12 ++++++------', 15 => ' 10 files changed, 10 insertions(+), 20 deletions(-)', 16 => ' create mode 100644 public/images/2211111.png', 17 => ' create mode 100644 public/images/Facebook.png', 18 => ' create mode 100644 public/images/Twitter.png', 19 => ' create mode 100644 public/images/a1.png', 20 => ' create mode 100644 public/images/fz.png', 21 => ' create mode 100644 public/images/jx.png', 22 => ' create mode 100644 public/images/vb.png', 23 => ' create mode 100644 public/images/vx.png', 24 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-16 09:49:45向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 0fae2eb..8f28ffa master -> origin/master', 3 => 'Updating 0fae2eb..8f28ffa', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SinologistController.php | 2 +-', 6 => ' resources/views/sinologist/booku.blade.php | 4 +++-', 7 => ' 2 files changed, 4 insertions(+), 2 deletions(-)', 8 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-16 09:50:57向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 8f28ffa..7a7f87c master -> origin/master', 3 => 'Updating 8f28ffa..7a7f87c', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SinologistController.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-16 10:00:18向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 7a7f87c..8850558 master -> origin/master', 3 => 'Updating 7a7f87c..8850558', 4 => 'Fast-forward', 5 => ' public/css/all.css | 17 ++++++++---------', 6 => ' resources/sass/style.css | 17 ++++++++---------', 7 => ' resources/views/sinologist/booku.blade.php | 10 +++++++++-', 8 => ' resources/views/sinologist/detail.blade.php | 2 +-', 9 => ' 4 files changed, 26 insertions(+), 20 deletions(-)', 10 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-16 10:01:11向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 8850558..d0ee861 master -> origin/master', 3 => 'Updating 8850558..d0ee861', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SinologistController.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-16 10:05:32向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' d0ee861..82b7735 master -> origin/master', 3 => 'Updating d0ee861..82b7735', 4 => 'Fast-forward', 5 => ' public/css/all.css | 5 +++++', 6 => ' resources/sass/style.css | 5 +++++', 7 => ' resources/views/sinologist/booku.blade.php | 4 ++--', 8 => ' 3 files changed, 12 insertions(+), 2 deletions(-)', 9 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-16 10:08:40向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 82b7735..ce2e51d master -> origin/master', 3 => 'Updating 82b7735..ce2e51d', 4 => 'Fast-forward', 5 => ' public/css/all.css | 662 -----------------------------', 6 => ' resources/sass/style.css | 2 +-', 7 => ' resources/views/sinologist/booku.blade.php | 4 +-', 8 => ' 3 files changed, 3 insertions(+), 665 deletions(-)', 9 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-16 10:15:56向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' ce2e51d..56d9fc1 master -> origin/master', 3 => 'Updating ce2e51d..56d9fc1', 4 => 'Fast-forward', 5 => ' resources/views/sinologist/booku.blade.php | 3 ++-', 6 => ' 1 file changed, 2 insertions(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-16 10:19:46向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 56d9fc1..7a824c4 master -> origin/master', 3 => 'Updating 56d9fc1..7a824c4', 4 => 'Fast-forward', 5 => ' resources/views/sinologist/booku.blade.php | 76 +++++++++++++++---------------', 6 => ' 1 file changed, 38 insertions(+), 38 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-16 10:21:11向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 7a824c4..9099f99 master -> origin/master', 3 => 'Updating 7a824c4..9099f99', 4 => 'Fast-forward', 5 => ' resources/views/sinologist/booku.blade.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-16 10:25:44向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 9099f99..02ae37a master -> origin/master', 3 => 'Updating 9099f99..02ae37a', 4 => 'Fast-forward', 5 => ' resources/views/sinologist/detail.blade.php | 6 +++---', 6 => ' 1 file changed, 3 insertions(+), 3 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-16 10:27:19向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 02ae37a..24d5e4c master -> origin/master', 3 => 'Updating 02ae37a..24d5e4c', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SinologistController.php | 8 ++++----', 6 => ' 1 file changed, 4 insertions(+), 4 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-16 10:27:48向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 24d5e4c..6ea6eff master -> origin/master', 3 => 'Updating 24d5e4c..6ea6eff', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SinologistController.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-16 10:30:26向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 6ea6eff..bb8e92f master -> origin/master', 3 => 'Updating 6ea6eff..bb8e92f', 4 => 'Fast-forward', 5 => ' public/css/all.css | 662 +++++++++++++++++++++++++++++++++++++++++++++++++++++', 6 => ' 1 file changed, 662 insertions(+)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-16 10:35:16向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' bb8e92f..1110c73 master -> origin/master', 3 => 'Updating bb8e92f..1110c73', 4 => 'Fast-forward', 5 => ' public/css/all.css | 4 ++--', 6 => ' resources/sass/style.css | 4 ++--', 7 => ' resources/views/sinologist/booku.blade.php | 9 +++++----', 8 => ' 3 files changed, 9 insertions(+), 8 deletions(-)', 9 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-16 10:38:24向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 1110c73..02fda97 master -> origin/master', 3 => 'Updating 1110c73..02fda97', 4 => 'Fast-forward', 5 => ' resources/views/sinologist/booku.blade.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-16 10:41:28向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 02fda97..f5aef93 master -> origin/master', 3 => 'Updating 02fda97..f5aef93', 4 => 'Fast-forward', 5 => ' resources/views/sinologist/booku.blade.php | 3 ++-', 6 => ' 1 file changed, 2 insertions(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-17 10:57:07向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 48d4cde..e9b3c86 master -> origin/master', 3 => 'Updating 48d4cde..e9b3c86', 4 => 'Fast-forward', 5 => ' public/css/all.css | 45 +++++++++++++-----------------', 6 => ' resources/sass/style.css | 45 +++++++++++++-----------------', 7 => ' resources/views/sinologist/booku.blade.php | 21 +++++++-------', 8 => ' 3 files changed, 50 insertions(+), 61 deletions(-)', 9 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-17 11:14:39向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' e9b3c86..07c4ed6 master -> origin/master', 3 => 'Updating e9b3c86..07c4ed6', 4 => 'Fast-forward', 5 => ' public/css/all.css | 12 +++++++++---', 6 => ' resources/sass/style.css | 12 +++++++++---', 7 => ' resources/views/sinologist/detail.blade.php | 4 ++--', 8 => ' 3 files changed, 20 insertions(+), 8 deletions(-)', 9 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-17 11:23:17向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 07c4ed6..e4c4343 master -> origin/master', 3 => 'Updating 07c4ed6..e4c4343', 4 => 'Fast-forward', 5 => ' public/css/all.css | 6 +++---', 6 => ' resources/sass/style.css | 6 +++---', 7 => ' resources/views/sinologist/booku.blade.php | 5 +++--', 8 => ' 3 files changed, 9 insertions(+), 8 deletions(-)', 9 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-17 11:25:32向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' e4c4343..a689dba master -> origin/master', 3 => 'Updating e4c4343..a689dba', 4 => 'Fast-forward', 5 => ' public/css/all.css | 2 +-', 6 => ' resources/sass/style.css | 2 +-', 7 => ' 2 files changed, 2 insertions(+), 2 deletions(-)', 8 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-17 11:45:20向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' a689dba..3d6cab8 master -> origin/master', 3 => 'Updating a689dba..3d6cab8', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SinologistController.php | 6 +++---', 6 => ' 1 file changed, 3 insertions(+), 3 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-17 11:52:20向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 3d6cab8..4521370 master -> origin/master', 3 => 'Updating 3d6cab8..4521370', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/SinologistController.php | 12 ++++++------', 6 => ' 1 file changed, 6 insertions(+), 6 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-20 03:12:48向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 4521370..5e91228 master -> origin/master', 3 => 'Updating 4521370..5e91228', 4 => 'Fast-forward', 5 => ' app/Admin/Actions/Post/BatchDisable.php | 29 ++++++++++++++++++++++++++', 6 => ' app/Admin/Controllers/WorksWordsController.php | 3 +++', 7 => ' app/Jobs/SetCipinJob.php | 2 +-', 8 => ' 3 files changed, 33 insertions(+), 1 deletion(-)', 9 => ' create mode 100644 app/Admin/Actions/Post/BatchDisable.php', 10 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-20 03:15:23向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 5e91228..b9b697c master -> origin/master', 3 => 'Updating 5e91228..b9b697c', 4 => 'Fast-forward', 5 => ' README.md | 5 +++++', 6 => ' 1 file changed, 5 insertions(+)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-20 03:16:11向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' b9b697c..24bd6a8 master -> origin/master', 3 => 'Updating b9b697c..24bd6a8', 4 => 'Fast-forward', 5 => ' app/Admin/Controllers/WorksWordsController.php | 1 +', 6 => ' 1 file changed, 1 insertion(+)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-20 08:45:44向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 24bd6a8..d10f380 master -> origin/master', 3 => 'Updating 24bd6a8..d10f380', 4 => 'Fast-forward', 5 => ' public/upload/booku_muban.xls | Bin 268800 -> 268800 bytes', 6 => ' 1 file changed, 0 insertions(+), 0 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-22 01:43:47向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' d10f380..ae45978 master -> origin/master', 3 => 'Updating d10f380..ae45978', 4 => 'Fast-forward', 5 => ' resources/views/sinologist/booku.blade.php | 4 ++--', 6 => ' 1 file changed, 2 insertions(+), 2 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-22 01:45:23向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' ae45978..4c5aaee master -> origin/master', 3 => 'Updating ae45978..4c5aaee', 4 => 'Fast-forward', 5 => ' resources/views/sinologist/booku.blade.php | 4 ++--', 6 => ' 1 file changed, 2 insertions(+), 2 deletions(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-22 04:30:12向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 4c5aaee..cb400ca master -> origin/master', 3 => 'Updating 4c5aaee..cb400ca', 4 => 'Fast-forward', 5 => ' resources/views/sinologist/booku.blade.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-22 04:31:20向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' cb400ca..bc22c11 master -> origin/master', 3 => 'Updating cb400ca..bc22c11', 4 => 'Fast-forward', 5 => ' resources/views/sinologist/booku.blade.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-10-22 08:00:11向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' bc22c11..2cd48c5 master -> origin/master', 3 => 'Updating bc22c11..2cd48c5', 4 => 'Fast-forward', 5 => ' resources/views/sinologist/booku.blade.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-11-05 09:49:33向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 22d939f..ff4aa9b master -> origin/master', 3 => 'Updating 22d939f..ff4aa9b', 4 => 'Fast-forward', 5 => ' app/Admin/Actions/Post/BatchNewWorksIn.php | 2 ++', 6 => ' app/Admin/Controllers/NewWorksController.php | 5 ++-', 7 => ' app/Admin/Controllers/WorksController.php | 6 ++++', 8 => ' app/Imports/NewWorksImport.php | 6 +++-', 9 => ' ...020_11_05_174048_add_qici_and_page_to_works.php | 36 +++++++++++++++++++++', 10 => ' ..._11_05_174206_add_qici_and_page_to_newworks.php | 36 +++++++++++++++++++++', 11 => ' public/upload/newworks.xlsx | Bin 10985 -> 11211 bytes', 12 => ' 7 files changed, 89 insertions(+), 2 deletions(-)', 13 => ' create mode 100644 database/migrations/2020_11_05_174048_add_qici_and_page_to_works.php', 14 => ' create mode 100644 database/migrations/2020_11_05_174206_add_qici_and_page_to_newworks.php', 15 => 'Migrating: 2020_11_05_174048_add_qici_and_page_to_works', 16 => 'Migrated: 2020_11_05_174048_add_qici_and_page_to_works (4.18 seconds)', 17 => 'Migrating: 2020_11_05_174206_add_qici_and_page_to_newworks', 18 => 'Migrated: 2020_11_05_174206_add_qici_and_page_to_newworks (0.03 seconds)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-11-06 09:30:20向Sinologist项目的refs/heads/master分支push了2个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' ff4aa9b..43b9f2e master -> origin/master', 3 => 'Updating ff4aa9b..43b9f2e', 4 => 'Fast-forward', 5 => ' app/Imports/NewWorksImport.php | 29 ++++++++++++++---------------', 6 => ' public/upload/newworks.xlsx | Bin 11211 -> 11977 bytes', 7 => ' 2 files changed, 14 insertions(+), 15 deletions(-)', 8 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-11-09 03:26:34向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 43b9f2e..3a83271 master -> origin/master', 3 => 'Updating 43b9f2e..3a83271', 4 => 'Fast-forward', 5 => ' app/Observers/SinologistObserver.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-11-14 13:08:20向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 3a83271..3b595e8 master -> origin/master', 3 => 'Updating 3a83271..3b595e8', 4 => 'Fast-forward', 5 => ' app/Admin/Controllers/SinologistController.php | 8 +++', 6 => ' app/Admin/Controllers/UserController.php | 29 ++++++++++-', 7 => ' app/Admin/Controllers/api/SinologistController.php | 2 +-', 8 => ' app/Admin/Models/Comments.php | 4 +-', 9 => ' app/Admin/routes.php | 7 +--', 10 => ' app/Http/Api/Controllers/DisubscribeController.php | 26 ++++++++++', 11 => ' app/Models/Comments.php | 7 ++-', 12 => ' app/Notifications/InvoicePaid.php | 58 ++++++++++++++++++++++', 13 => ' app/Notifications/LeaveMessage.php | 16 ++++--', 14 => ' app/Observers/CommentsObserver.php | 27 ++++++++--', 15 => ' ...20_11_14_121437_add_subscribe_to_sinologist.php | 34 +++++++++++++', 16 => ' resources/views/mail/comments/alert.blade.php | 27 ++++++++++', 17 => ' resources/views/mail/comments/subscribe.blade.php | 17 +++++++', 18 => ' routes/api.php | 2 +-', 19 => ' 14 files changed, 248 insertions(+), 16 deletions(-)', 20 => ' create mode 100644 app/Http/Api/Controllers/DisubscribeController.php', 21 => ' create mode 100644 app/Notifications/InvoicePaid.php', 22 => ' create mode 100644 database/migrations/2020_11_14_121437_add_subscribe_to_sinologist.php', 23 => ' create mode 100644 resources/views/mail/comments/alert.blade.php', 24 => ' create mode 100644 resources/views/mail/comments/subscribe.blade.php', 25 => 'Migrating: 2020_11_14_121437_add_subscribe_to_sinologist', 26 => 'Migrated: 2020_11_14_121437_add_subscribe_to_sinologist (0.22 seconds)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-11-15 06:44:14向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 3b595e8..d14d746 master -> origin/master', 3 => 'Updating 3b595e8..d14d746', 4 => 'Fast-forward', 5 => ' public/css/all.css | 12 ++++++------', 6 => ' public/images/icon/logo.png | Bin 10180 -> 9910 bytes', 7 => ' public/images/icon/logo_20201115.png | Bin 0 -> 10180 bytes', 8 => ' resources/sass/page.css | 6 +++---', 9 => ' resources/sass/style.css | 6 +++---', 10 => ' resources/views/sinologist/nav.blade.php | 2 +-', 11 => ' 6 files changed, 13 insertions(+), 13 deletions(-)', 12 => ' create mode 100644 public/images/icon/logo_20201115.png', 13 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-11-21 09:54:42向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' d14d746..69d96fa master -> origin/master', 3 => 'Updating d14d746..69d96fa', 4 => 'Fast-forward', 5 => ' app/Admin/Controllers/WorksController.php | 31 ++++-', 6 => ' app/Models/Works.php | 19 ++-', 7 => ' ...2020_11_21_171044_add_cbdate_to_works_table.php | 39 ++++++', 8 => ' ...0_11_21_172356_add_cbdate_to_newworks_table.php | 36 +++++', 9 => ' public/css/all.css | 73 +++++++++-', 10 => ' resources/sass/add.css | 71 ++++++++++', 11 => ' resources/views/sinologist/detail.blade.php | 152 +++++++++++++--------', 12 => ' resources/views/works/list.blade.php | 99 ++++++++++----', 13 => ' webpack.mix.js | 3 +-', 14 => ' 9 files changed, 425 insertions(+), 98 deletions(-)', 15 => ' create mode 100644 database/migrations/2020_11_21_171044_add_cbdate_to_works_table.php', 16 => ' create mode 100644 database/migrations/2020_11_21_172356_add_cbdate_to_newworks_table.php', 17 => ' create mode 100644 resources/sass/add.css', 18 => 'Migrating: 2020_11_21_171044_add_cbdate_to_works_table', 19 => 'Migrated: 2020_11_21_171044_add_cbdate_to_works_table (3.65 seconds)', 20 => 'Migrating: 2020_11_21_172356_add_cbdate_to_newworks_table', 21 => 'Migrated: 2020_11_21_172356_add_cbdate_to_newworks_table (0.05 seconds)', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-11-21 10:08:38向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 69d96fa..10413b0 master -> origin/master', 3 => 'Updating 69d96fa..10413b0', 4 => 'Fast-forward', 5 => ' app/Admin/Actions/Post/BatchNewWorksIn.php | 13 ++++++++-----', 6 => ' app/Admin/Controllers/NewWorksController.php | 26 +++++++++++++++++---------', 7 => ' app/Imports/NewWorksImport.php | 8 ++++++--', 8 => ' public/upload/newworks.xlsx | Bin 11977 -> 11486 bytes', 9 => ' 4 files changed, 31 insertions(+), 16 deletions(-)', 10 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-11-29 07:10:52向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 10413b0..a5ee507 master -> origin/master', 3 => 'Updating 10413b0..a5ee507', 4 => 'Fast-forward', 5 => ' app/Console/Commands/OneWorksDeal.php | 294 +', 6 => ' app/Console/Commands/test.php | 52 -', 7 => ' app/Console/Commands/works.csv | 121508 +++++++++++++++++++++++++', 8 => ' app/Http/Controllers/WorksController.php | 14 +-', 9 => ' app/Models/Works.php | 97 +-', 10 => ' composer.json | 2 +-', 11 => ' public/autobuild.php | 2 +-', 12 => ' public/upload/newworks.xlsx | Bin 11486 -> 11977 bytes', 13 => ' resources/views/sinologist/detail.blade.php | 70 +-', 14 => ' resources/views/works/list.blade.php | 99 +-', 15 => ' resources/views/works/list_table.blade.php | 205 +', 16 => ' webpack.mix.js | 4 +-', 17 => ' 12 files changed, 122176 insertions(+), 171 deletions(-)', 18 => ' create mode 100644 app/Console/Commands/OneWorksDeal.php', 19 => ' delete mode 100644 app/Console/Commands/test.php', 20 => ' create mode 100644 app/Console/Commands/works.csv', 21 => ' create mode 100644 resources/views/works/list_table.blade.php', 22 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-11-29 07:15:00向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' a5ee507..eb4b2e5 master -> origin/master', 3 => 'Updating a5ee507..eb4b2e5', 4 => 'Fast-forward', 5 => ' app/Observers/WorksObserver.php | 4 ++--', 6 => ' 1 file changed, 2 insertions(+), 2 deletions(-)', 7 => 'Nothing to migrate.', ) $return:255 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-11-29 07:17:00向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' eb4b2e5..fd1070a master -> origin/master', 3 => 'Updating eb4b2e5..fd1070a', 4 => 'Fast-forward', 5 => ' public/autobuild.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:255 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-11-29 07:29:24向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' fd1070a..af1d0c0 master -> origin/master', 3 => 'Updating fd1070a..af1d0c0', 4 => 'Fast-forward', 5 => ' app/Console/Commands/OneWorksDeal.php | 14 +++++++++-----', 6 => ' public/autobuild.php | 2 +-', 7 => ' 2 files changed, 10 insertions(+), 6 deletions(-)', 8 => 'Nothing to migrate.', ) $return:0 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-11-29 08:02:14向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' af1d0c0..7175954 master -> origin/master', 3 => 'Updating af1d0c0..7175954', 4 => 'error: Your local changes to the following files would be overwritten by merge:', 5 => ' app/Http/Controllers/WorksController.php', 6 => 'Please commit your changes or stash them before you merge.', 7 => 'Aborting', ) $return:1 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-11-29 08:06:39向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 7175954..f100c38 master -> origin/master', 3 => 'Updating 7175954..f100c38', 4 => 'Fast-forward', 5 => ' app/Console/Commands/OneWorksDeal.php | 37 +++++++++++++++++++++++++++++------', 6 => ' 1 file changed, 31 insertions(+), 6 deletions(-)', 7 => 'Nothing to migrate.', 8 => '', 9 => ' Symfony\\Component\\ErrorHandler\\Error\\FatalError', 10 => '', 11 => ' Allowed memory size of 134217728 bytes exhausted (tried to allocate 4096 bytes)', 12 => '', 13 => ' at C:\\laragon\\www\\Sinologist\\vendor\\doctrine\\dbal\\lib\\Doctrine\\DBAL\\Driver\\PDOStatement.php:173', 14 => ' 169| $args = [$fetchMode, $fetchArgument, $ctorArgs];', 15 => ' 170| }', 16 => ' 171|', 17 => ' 172| try {', 18 => ' > 173| $data = parent::fetchAll(...$args);', 19 => ' 174| assert(is_array($data));', 20 => ' 175|', 21 => ' 176| return $data;', 22 => ' 177| } catch (\\PDOException $exception) {', 23 => '', 24 => '', 25 => ' Whoops\\Exception\\ErrorException', 26 => '', 27 => ' Allowed memory size of 134217728 bytes exhausted (tried to allocate 4096 bytes)', 28 => '', 29 => ' at C:\\laragon\\www\\Sinologist\\vendor\\doctrine\\dbal\\lib\\Doctrine\\DBAL\\Driver\\PDOStatement.php:173', 30 => ' 169| $args = [$fetchMode, $fetchArgument, $ctorArgs];', 31 => ' 170| }', 32 => ' 171|', 33 => ' 172| try {', 34 => ' > 173| $data = parent::fetchAll(...$args);', 35 => ' 174| assert(is_array($data));', 36 => ' 175|', 37 => ' 176| return $data;', 38 => ' 177| } catch (\\PDOException $exception) {', 39 => '', 40 => ' 1 C:\\laragon\\www\\Sinologist\\vendor\\filp\\whoops\\src\\Whoops\\Run.php:408', 41 => ' Whoops\\Run::handleError("Allowed memory size of 134217728 bytes exhausted (tried to allocate 4096 bytes)", "C:\\laragon\\www\\Sinologist\\vendor\\doctrine\\dbal\\lib\\Doctrine\\DBAL\\Driver\\PDOStatement.php")', 42 => '', 43 => ' 2 [internal]:0', 44 => ' Whoops\\Run::handleShutdown()', ) $return:255 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-11-29 08:30:35向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' f100c38..39d9cf4 master -> origin/master', 3 => 'Updating f100c38..39d9cf4', 4 => 'Fast-forward', 5 => ' app/Console/Commands/OneWorksDeal.php | 79 ++++++++++++++++++-----------------', 6 => ' 1 file changed, 41 insertions(+), 38 deletions(-)', 7 => 'Nothing to migrate.', ) $return:255 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-12-04 05:47:31向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 39d9cf4..6645bec master -> origin/master', 3 => 'Updating 39d9cf4..6645bec', 4 => 'Fast-forward', 5 => ' config/admin.php | 2 +-', 6 => ' 1 file changed, 1 insertion(+), 1 deletion(-)', 7 => 'Nothing to migrate.', ) $return:255 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-12-05 03:30:05向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 6645bec..a3cc8b5 master -> origin/master', 3 => 'Updating 6645bec..a3cc8b5', 4 => 'Fast-forward', 5 => ' resources/views/layouts/search.blade.php | 1 +', 6 => ' 1 file changed, 1 insertion(+)', 7 => 'Nothing to migrate.', ) $return:255 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-12-05 03:40:44向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' a3cc8b5..ec74b18 master -> origin/master', 3 => 'Updating a3cc8b5..ec74b18', 4 => 'Fast-forward', 5 => ' public/css/all.css | 2 ++', 6 => ' resources/sass/style.css | 4 +++-', 7 => ' resources/views/layouts/search.blade.php | 3 ++-', 8 => ' 3 files changed, 7 insertions(+), 2 deletions(-)', 9 => 'Nothing to migrate.', ) $return:255 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-12-05 04:00:56向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' ec74b18..cadc8f4 master -> origin/master', 3 => 'Updating ec74b18..cadc8f4', 4 => 'Fast-forward', 5 => ' public/css/all.css | 3 ++-', 6 => ' resources/sass/style.css | 3 ++-', 7 => ' 2 files changed, 4 insertions(+), 2 deletions(-)', 8 => 'Nothing to migrate.', ) $return:255 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-12-05 04:04:37向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' cadc8f4..26e3b95 master -> origin/master', 3 => 'Updating cadc8f4..26e3b95', 4 => 'Fast-forward', 5 => ' public/css/all.css | 2 +-', 6 => ' resources/sass/style.css | 2 +-', 7 => ' 2 files changed, 2 insertions(+), 2 deletions(-)', 8 => 'Nothing to migrate.', ) $return:255 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-12-05 09:39:27向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 26e3b95..331619e master -> origin/master', 3 => 'Updating 26e3b95..331619e', 4 => 'Fast-forward', 5 => ' app/Admin/Actions/Post/ImportUniversityCountry.php | 123 +++++++++++++++++++++', 6 => ' .../Controllers/UniversityCountryController.php | 92 +++++++++++++++', 7 => ' app/Admin/routes.php | 1 +', 8 => ' app/Http/Api/Controllers/GetSchoolController.php | 19 +++-', 9 => ' app/Imports/UniversityCountryImport.php | 63 +++++++++++', 10 => ' app/Models/UniversityCountry.php | 10 ++', 11 => ' ...2_05_120730_create_university_country_table.php | 33 ++++++', 12 => ' resources/views/sinologist/detail.blade.php | 2 +-', 13 => ' 8 files changed, 336 insertions(+), 7 deletions(-)', 14 => ' create mode 100644 app/Admin/Actions/Post/ImportUniversityCountry.php', 15 => ' create mode 100644 app/Admin/Controllers/UniversityCountryController.php', 16 => ' create mode 100644 app/Imports/UniversityCountryImport.php', 17 => ' create mode 100644 app/Models/UniversityCountry.php', 18 => ' create mode 100644 database/migrations/2020_12_05_120730_create_university_country_table.php', 19 => 'Migrating: 2020_12_05_120730_create_university_country_table', 20 => 'Migrated: 2020_12_05_120730_create_university_country_table (0.03 seconds)', 21 => '', 22 => ' Symfony\\Component\\ErrorHandler\\Error\\FatalError', 23 => '', 24 => ' Allowed memory size of 134217728 bytes exhausted (tried to allocate 4096 bytes)', 25 => '', 26 => ' at C:\\laragon\\www\\Sinologist\\vendor\\doctrine\\dbal\\lib\\Doctrine\\DBAL\\Driver\\PDOStatement.php:173', 27 => ' 169| $args = [$fetchMode, $fetchArgument, $ctorArgs];', 28 => ' 170| }', 29 => ' 171|', 30 => ' 172| try {', 31 => ' > 173| $data = parent::fetchAll(...$args);', 32 => ' 174| assert(is_array($data));', 33 => ' 175|', 34 => ' 176| return $data;', 35 => ' 177| } catch (\\PDOException $exception) {', 36 => '', 37 => '', 38 => ' Whoops\\Exception\\ErrorException', 39 => '', 40 => ' Allowed memory size of 134217728 bytes exhausted (tried to allocate 4096 bytes)', 41 => '', 42 => ' at C:\\laragon\\www\\Sinologist\\vendor\\doctrine\\dbal\\lib\\Doctrine\\DBAL\\Driver\\PDOStatement.php:173', 43 => ' 169| $args = [$fetchMode, $fetchArgument, $ctorArgs];', 44 => ' 170| }', 45 => ' 171|', 46 => ' 172| try {', 47 => ' > 173| $data = parent::fetchAll(...$args);', 48 => ' 174| assert(is_array($data));', 49 => ' 175|', 50 => ' 176| return $data;', 51 => ' 177| } catch (\\PDOException $exception) {', 52 => '', 53 => ' 1 C:\\laragon\\www\\Sinologist\\vendor\\filp\\whoops\\src\\Whoops\\Run.php:408', 54 => ' Whoops\\Run::handleError("Allowed memory size of 134217728 bytes exhausted (tried to allocate 4096 bytes)", "C:\\laragon\\www\\Sinologist\\vendor\\doctrine\\dbal\\lib\\Doctrine\\DBAL\\Driver\\PDOStatement.php")', 55 => '', 56 => ' 2 [internal]:0', 57 => ' Whoops\\Run::handleShutdown()', ) $return:255 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-12-06 07:54:29向Sinologist项目的refs/heads/master分支push了2个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 331619e..b05ac32 master -> origin/master', 3 => 'Updating 331619e..b05ac32', 4 => 'error: Your local changes to the following files would be overwritten by merge:', 5 => ' routes/web.php', 6 => 'Please commit your changes or stash them before you merge.', 7 => 'Aborting', ) $return:1 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2020-12-07 06:22:22向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' b05ac32..1e300d4 master -> origin/master', 3 => 'Updating 331619e..1e300d4', 4 => 'error: Your local changes to the following files would be overwritten by merge:', 5 => ' routes/web.php', 6 => 'Please commit your changes or stash them before you merge.', 7 => 'Aborting', ) $return:1 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2021-01-02 02:03:54向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 1e300d4..53b77bb master -> origin/master', 3 => 'Updating 331619e..53b77bb', 4 => 'error: Your local changes to the following files would be overwritten by merge:', 5 => ' routes/web.php', 6 => 'Please commit your changes or stash them before you merge.', 7 => 'Aborting', ) $return:1 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2021-01-13 04:41:40向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 53b77bb..cd5d185 master -> origin/master', 3 => 'Updating 331619e..cd5d185', 4 => 'error: Your local changes to the following files would be overwritten by merge:', 5 => ' routes/web.php', 6 => 'Please commit your changes or stash them before you merge.', 7 => 'Aborting', ) $return:1 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2021-01-17 13:02:24向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' cd5d185..55e15e2 master -> origin/master', 3 => 'Updating 331619e..55e15e2', 4 => 'error: Your local changes to the following files would be overwritten by merge:', 5 => ' routes/web.php', 6 => 'Please commit your changes or stash them before you merge.', 7 => 'Aborting', ) $return:1 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2021-01-17 13:24:28向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' 55e15e2..eba3c0a master -> origin/master', 3 => 'Updating 55e15e2..eba3c0a', 4 => 'Fast-forward', 5 => ' public/robots.txt | 5 +++--', 6 => ' robots.txt | 3 ---', 7 => ' 2 files changed, 3 insertions(+), 5 deletions(-)', 8 => ' delete mode 100644 robots.txt', 9 => 'Nothing to migrate.', 10 => '', 11 => ' Symfony\\Component\\ErrorHandler\\Error\\FatalError', 12 => '', 13 => ' Allowed memory size of 134217728 bytes exhausted (tried to allocate 4096 bytes)', 14 => '', 15 => ' at C:\\laragon\\www\\Sinologist\\vendor\\doctrine\\dbal\\lib\\Doctrine\\DBAL\\Driver\\PDOStatement.php:173', 16 => ' 169| $args = [$fetchMode, $fetchArgument, $ctorArgs];', 17 => ' 170| }', 18 => ' 171|', 19 => ' 172| try {', 20 => ' > 173| $data = parent::fetchAll(...$args);', 21 => ' 174| assert(is_array($data));', 22 => ' 175|', 23 => ' 176| return $data;', 24 => ' 177| } catch (\\PDOException $exception) {', 25 => '', 26 => '', 27 => ' Whoops\\Exception\\ErrorException', 28 => '', 29 => ' Allowed memory size of 134217728 bytes exhausted (tried to allocate 4096 bytes)', 30 => '', 31 => ' at C:\\laragon\\www\\Sinologist\\vendor\\doctrine\\dbal\\lib\\Doctrine\\DBAL\\Driver\\PDOStatement.php:173', 32 => ' 169| $args = [$fetchMode, $fetchArgument, $ctorArgs];', 33 => ' 170| }', 34 => ' 171|', 35 => ' 172| try {', 36 => ' > 173| $data = parent::fetchAll(...$args);', 37 => ' 174| assert(is_array($data));', 38 => ' 175|', 39 => ' 176| return $data;', 40 => ' 177| } catch (\\PDOException $exception) {', 41 => '', 42 => ' 1 C:\\laragon\\www\\Sinologist\\vendor\\filp\\whoops\\src\\Whoops\\Run.php:408', 43 => ' Whoops\\Run::handleError("Allowed memory size of 134217728 bytes exhausted (tried to allocate 4096 bytes)", "C:\\laragon\\www\\Sinologist\\vendor\\doctrine\\dbal\\lib\\Doctrine\\DBAL\\Driver\\PDOStatement.php")', 44 => '', 45 => ' 2 [internal]:0', 46 => ' Whoops\\Run::handleShutdown()', ) $return:255 pull end -------- ---------------------------------------------------------------------------------------------------- jshoter 在2021-01-17 13:42:05向Sinologist项目的refs/heads/master分支push了1个commit： pull start -------- $output:array ( 0 => 'From gitee.com:jshoter/Sinologist', 1 => ' * branch master -> FETCH_HEAD', 2 => ' eba3c0a..dbae8ba master -> origin/master', 3 => 'Updating eba3c0a..dbae8ba', 4 => 'Fast-forward', 5 => ' app/Http/Controllers/HomeController.php | 14 +++++++-------', 6 => ' 1 file changed, 7 insertions(+), 7 deletions(-)', 7 => 'Nothing to migrate.', 8 => '', 9 => ' Symfony\\Component\\ErrorHandler\\Error\\FatalError', 10 => '', 11 => ' Allowed memory size of 134217728 bytes exhausted (tried to allocate 4096 bytes)', 12 => '', 13 => ' at C:\\laragon\\www\\Sinologist\\vendor\\doctrine\\dbal\\lib\\Doctrine\\DBAL\\Driver\\PDOStatement.php:173', 14 => ' 169| $args = [$fetchMode, $fetchArgument, $ctorArgs];', 15 => ' 170| }', 16 => ' 171|', 17 => ' 172| try {', 18 => ' > 173| $data = parent::fetchAll(...$args);', 19 => ' 174| assert(is_array($data));', 20 => ' 175|', 21 => ' 176| return $data;', 22 => ' 177| } catch (\\PDOException $exception) {', 23 => '', 24 => '', 25 => ' Whoops\\Exception\\ErrorException', 26 => '', 27 => ' Allowed memory size of 134217728 bytes exhausted (tried to allocate 4096 bytes)', 28 => '', 29 => ' at C:\\laragon\\www\\Sinologist\\vendor\\doctrine\\dbal\\lib\\Doctrine\\DBAL\\Driver\\PDOStatement.php:173', 30 => ' 169| $args = [$fetchMode, $fetchArgument, $ctorArgs];', 31 => ' 170| }', 32 => ' 171|', 33 => ' 172| try {', 34 => ' > 173| $data = parent::fetchAll(...$args);', 35 => ' 174| assert(is_array($data));', 36 => ' 175|', 37 => ' 176| return $data;', 38 => ' 177| } catch (\\PDOException $exception) {', 39 => '', 40 => ' 1 C:\\laragon\\www\\Sinologist\\vendor\\filp\\whoops\\src\\Whoops\\Run.php:408', 41 => ' Whoops\\Run::handleError("Allowed memory size of 134217728 bytes exhausted (tried to allocate 4096 bytes)", "C:\\laragon\\www\\Sinologist\\vendor\\doctrine\\dbal\\lib\\Doctrine\\DBAL\\Driver\\PDOStatement.php")', 42 => '', 43 => ' 2 [internal]:0', 44 => ' Whoops\\Run::handleShutdown()', ) $return:255 pull end --------