Compare commits

..

No commits in common. "d8577d7350ab92327b5d0bc7d2bb1feb3110e577" and "a44ee531c7f43f0c582726e61994b98ba97f5464" have entirely different histories.

6 changed files with 18 additions and 129 deletions

View File

@ -4,10 +4,6 @@ namespace app\controller;
use support\Request;
use support\Db;
use app\result\Result;
use Carbon\Carbon;
use app\model\Timetable;
class IndexController
{
@ -15,48 +11,28 @@ class IndexController
{
static $readme;
if (!$readme) {
$readme = '700';
$readme = '70';
// $readme = file_get_contents(base_path('README.md'));
}
return $readme;
}
/**
* 更新时间
*/
public function updated($whether_manual = 1)
public function view(Request $request)
{
// 获取当前时间
$current = Carbon::now();
return view('index/view', ['name' => 'webman']);
}
public function json(Request $request)
{
$assets = Db::table('asset')->where('scan_time', null)->count();
// 添加 21 天到当前时间
$trialExpires = $current->addDays(21);
$timetable=new Timetable;
$timetable->date=$trialExpires->toDateString();
$timetable->tip=$whether_manual==0?'自动提交':'手动提交';
$timetable->save();
return Result::show(200, 'ok', ['time' => $timetable]);
return json(['code' => 0, 'msg' => 'ok','data'=>$assets]);
}
/**
* 每天访问一次的任务
*/
public function scheduled_tasks($name = 'ThinkPHP6')
{
$db_time = Timetable::where('id', Timetable::where('id','>',0)->max('id'))->first();
$time = $db_time['date'];
// 获取当前时间
$current = Carbon::now();
for ($i = 0; $i < 8; $i++) {
$current->subDay($i);
if (strcmp($current->toDateString(), $time) == 0) {
$i == 7 ? $this->updated(0) : '';
return Result::show(200, 'ok', ['time' => $current->toDateString(), 'time2' => $time]);
}
}
return Result::show(200,'ok','');
}
public function send_msg($title, $body)
public function text(Request $request)
{
return json(['code' => 0, 'msg' => 'ok','data'=>'text']);
}
}

View File

@ -1,29 +0,0 @@
<?php
namespace app\model;
use support\Model;
class Timetable extends Model
{
/**
* The table associated with the model.
*
* @var string
*/
protected $table = 'timetable';
/**
* The primary key associated with the table.
*
* @var string
*/
protected $primaryKey = 'id';
/**
* Indicates if the model should be timestamped.
*
* @var bool
*/
public $timestamps = true;
}

View File

@ -1,57 +0,0 @@
<?php
/*
统一格式的返回json数据
*/
namespace app\result;
class Result
{
//success:code值为0,data数据
static public function Success($data)
{
$rs = [
'code' => 0,
'msg' => "",
'data' => $data,
];
return json($rs);
}
//ErrorCode需要code/msg参数
static public function ErrorCode($code, $msg)
{
$rs = [
'code' => $code,
'msg' => $msg,
'data' => "",
];
return json($rs);
}
//error,传入定义的数组常量
static public function Error($arr)
{
$rs = [
'code' => $arr['code'],
'msg' => $arr['msg'],
'data' => "",
];
return json($rs);
}
/**
* 通用化API数据格式输出
* @param $status
* @param string $message
* @param array $data
* @param int $httpStatus
* @return \think\response\Json
*/
static public function show($status, $message = 'error', $data = [], $httpStatus = 200)
{
$result = [
"status" => $status,
"message" => $message,
"result" => $data
];
return json($result, $httpStatus);
}
}

View File

@ -30,8 +30,7 @@
"illuminate/database": "^8.83",
"illuminate/pagination": "^8.83",
"illuminate/events": "^8.83",
"symfony/var-dumper": "^5.4",
"nesbot/carbon": "^2.72"
"symfony/var-dumper": "^5.4"
},
"suggest": {
"ext-event": "For better performance. "

2
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "ccc5378ed1f0e86d78b011265d36f7cf",
"content-hash": "d19de0b71c97f1ea3e3daa830cd58c6a",
"packages": [
{
"name": "carbonphp/carbon-doctrine-types",

View File

@ -22,9 +22,9 @@
'driver' => 'mysql',
'host' => '127.0.0.1',
'port' => 3306,
'database' => 'sql',
'username' => 'sql',
'password' => 'arxYBLyp3nMePn5C',
'database' => 'kunkun_shagain_c',
'username' => 'kunkun_shagain_c',
'password' => 'JcAT8frcGfrrrJBN',
'unix_socket' => '',
'charset' => 'utf8',
'collation' => 'utf8_unicode_ci',