修改依赖包，jwt包改为firebase/php-jwt
This commit is contained in:
hdm
parent
e53a5098f8
commit
eb308c23f9
@ -13,8 +13,8 @@ use think\App;
|
||||
use think\exception\HttpResponseException;
|
||||
use think\facade\Request;
|
||||
use think\facade\Session;
|
||||
use think\Response;
|
||||
use think\facade\View;
|
||||
use think\Response;
|
||||
|
||||
/**
|
||||
* 控制器基础类
|
||||
@ -51,6 +51,17 @@ abstract class BaseController
|
||||
*/
|
||||
protected $pageSize = '';
|
||||
|
||||
/**
|
||||
* jwt配置
|
||||
* @var string
|
||||
*/
|
||||
protected $jwt_conf = [
|
||||
'secrect' => 'gouguoa',
|
||||
'iss' => 'www.gougucms.com', //签发者 可选
|
||||
'aud' => 'gouguoa', //接收该JWT的一方，可选
|
||||
'exptime' => 7200, //过期时间,这里设置2个小时
|
||||
];
|
||||
|
||||
/**
|
||||
* 构造方法
|
||||
* @access public
|
||||
@ -64,7 +75,7 @@ abstract class BaseController
|
||||
$this->controller = strtolower($this->request->controller());
|
||||
$this->action = strtolower($this->request->action());
|
||||
$this->uid = 0;
|
||||
|
||||
$this->jwt_conf = get_system_config('token');
|
||||
// 控制器初始化
|
||||
$this->initialize();
|
||||
}
|
||||
@ -83,14 +94,13 @@ abstract class BaseController
|
||||
*/
|
||||
protected function checkLogin()
|
||||
{
|
||||
$session_admin = get_config('app.session_admin');
|
||||
if (!Session::has($session_admin)) {
|
||||
$this->apiError('请先登录');
|
||||
}
|
||||
else{
|
||||
$this->uid = Session::get($session_admin)['id'];
|
||||
$session_admin = get_config('app.session_admin');
|
||||
if (!Session::has($session_admin)) {
|
||||
$this->apiError('请先登录');
|
||||
} else {
|
||||
$this->uid = Session::get($session_admin)['id'];
|
||||
View::assign('login_user', $this->uid);
|
||||
}
|
||||
}
|
||||
}
|
||||
/**
|
||||
* Api处理成功结果返回方法
|
||||
@ -100,9 +110,9 @@ abstract class BaseController
|
||||
* @return mixed
|
||||
* @throws ReturnException
|
||||
*/
|
||||
protected function apiSuccess($msg = 'success',$data=[])
|
||||
protected function apiSuccess($msg = 'success', $data = [])
|
||||
{
|
||||
return $this->apiReturn($data, 0, $msg);
|
||||
return $this->apiReturn($data, 0, $msg);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -114,7 +124,7 @@ abstract class BaseController
|
||||
* @return mixed
|
||||
* @throws ReturnException
|
||||
*/
|
||||
protected function apiError($msg = 'fail',$data=[], $code = 1)
|
||||
protected function apiError($msg = 'fail', $data = [], $code = 1)
|
||||
{
|
||||
return $this->apiReturn($data, $code, $msg);
|
||||
}
|
||||
|
||||
@ -146,14 +146,14 @@ class Index extends BaseController
|
||||
$content = $config['template'];
|
||||
//所有项目必须填写
|
||||
if (empty($config['smtp']) || empty($config['smtp_port']) || empty($config['smtp_user']) || empty($config['smtp_pwd'])) {
|
||||
return to_assign(1, '请完善邮件配置信息！');
|
||||
return to_assign(1, '请完善邮件配置信息');
|
||||
}
|
||||
|
||||
$send = send_email($sender, '测试邮件', $content);
|
||||
if ($send) {
|
||||
return to_assign(0, '邮件发送成功！');
|
||||
return to_assign(0, '邮件发送成功');
|
||||
} else {
|
||||
return to_assign(1, '邮件发送失败！');
|
||||
return to_assign(1, '邮件发送失败');
|
||||
}
|
||||
}
|
||||
|
||||
@ -429,8 +429,9 @@ class Index extends BaseController
|
||||
$v['check_time'] = 0;
|
||||
$v['content'] = '';
|
||||
$v['status'] = 0;
|
||||
$checked = Db::name('FlowRecord')->where(['check_user_id' => $v['id'],'step_id' => $val['id']])->find();
|
||||
if($checked){
|
||||
$check_array = Db::name('FlowRecord')->where(['check_user_id' => $v['id'],'step_id' => $val['id']])->order('check_time desc')->select()->toArray();
|
||||
if(!empty($check_array)){
|
||||
$checked = $check_array[0];
|
||||
$v['check_time'] = date('Y-m-d :H:i', $checked['check_time']);
|
||||
$v['content'] = $checked['content'];
|
||||
$v['status'] = $checked['status'];
|
||||
@ -451,6 +452,22 @@ class Index extends BaseController
|
||||
}
|
||||
return to_assign(0, '', $flows);
|
||||
}
|
||||
|
||||
//获取审核流程节点
|
||||
public function get_flow_record($id=0,$type=1)
|
||||
{
|
||||
$check_list = Db::name('FlowRecord')
|
||||
->field('f.*,a.name,a.thumb')
|
||||
->alias('f')
|
||||
->join('Admin a', 'a.id = f.check_user_id', 'left')
|
||||
->where(['f.action_id'=>$id,'f.type'=>$type])
|
||||
->order('check_time asc')
|
||||
->select()->toArray();
|
||||
foreach ($check_list as $kk => &$vv) {
|
||||
$vv['check_time_str'] = date('Y-m-d :H:i', $vv['check_time']);
|
||||
}
|
||||
return to_assign(0, '', $check_list);
|
||||
}
|
||||
|
||||
|
||||
//删除报销附件
|
||||
|
||||
131
app/api/controller/demo.php
Normal file
131
app/api/controller/demo.php
Normal file
@ -0,0 +1,131 @@
|
||||
<?php
|
||||
/**
|
||||
* @copyright Copyright (c) 2021 勾股工作室
|
||||
* @license https://opensource.org/licenses/Apache-2.0
|
||||
* @link https://www.gougucms.com
|
||||
*/
|
||||
declare (strict_types = 1);
|
||||
namespace app\api\controller;
|
||||
|
||||
use app\api\BaseController;
|
||||
use app\api\middleware\Auth;
|
||||
use Firebase\JWT\JWT;
|
||||
use Firebase\JWT\Key;
|
||||
use think\facade\Db;
|
||||
use think\facade\Request;
|
||||
|
||||
class Demo extends BaseController
|
||||
{
|
||||
/**
|
||||
* 控制器中间件 [登录、注册 不需要鉴权]
|
||||
* @var array
|
||||
*/
|
||||
protected $middleware = [
|
||||
Auth::class => ['except' => ['index','login'] ]
|
||||
];
|
||||
|
||||
/**
|
||||
* @param $user_id
|
||||
* @return string
|
||||
*/
|
||||
public function getToken($user_id){
|
||||
$time = time(); //当前时间
|
||||
$conf = $this->jwt_conf;
|
||||
$token = [
|
||||
'iss' => $conf['iss'], //签发者 可选
|
||||
'aud' => $conf['aud'], //接收该JWT的一方，可选
|
||||
'iat' => $time, //签发时间
|
||||
'nbf' => $time-1 , //(Not Before)：某个时间点后才能访问，比如设置time+30，表示当前时间30秒后才能使用
|
||||
'exp' => $time+$conf['exptime'], //过期时间,这里设置2个小时
|
||||
'data' => [
|
||||
//自定义信息，不要定义敏感信息
|
||||
'userid' =>$user_id,
|
||||
]
|
||||
];
|
||||
return JWT::encode($token, $conf['secrect'], 'HS256'); //输出Token 默认'HS256'
|
||||
}
|
||||
|
||||
/**
|
||||
* @param $token
|
||||
*/
|
||||
public static function checkToken($token){
|
||||
try {
|
||||
JWT::$leeway = 60;//当前时间减去60，把时间留点余地
|
||||
$decoded = JWT::decode($token, self::$config['secrect'], ['HS256']); //HS256方式，这里要和签发的时候对应
|
||||
return (array)$decoded;
|
||||
} catch(\Firebase\JWT\SignatureInvalidException $e) { //签名不正确
|
||||
return json(['code'=>403,'msg'=>'签名错误']);
|
||||
}catch(\Firebase\JWT\BeforeValidException $e) { // 签名在某个时间点之后才能用
|
||||
return json(['code'=>401,'msg'=>'token失效']);
|
||||
}catch(\Firebase\JWT\ExpiredException $e) { // token过期
|
||||
return json(['code'=>401,'msg'=>'token已过期']);
|
||||
}catch(Exception $e) { //其他错误
|
||||
return json(['code'=>404,'msg'=>'非法请求']);
|
||||
}catch(\UnexpectedValueException $e) { //其他错误
|
||||
return json(['code'=>404,'msg'=>'非法请求']);
|
||||
} catch(\DomainException $e) { //其他错误
|
||||
return json(['code'=>404,'msg'=>'非法请求']);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* @api {post} /demo/login 会员登录
|
||||
* @apiDescription 系统登录接口，返回 token 用于操作需验证身份的接口
|
||||
|
||||
* @apiParam (请求参数：) {string} username 登录用户名
|
||||
* @apiParam (请求参数：) {string} password 登录密码
|
||||
|
||||
* @apiParam (响应字段：) {string} token Token
|
||||
|
||||
* @apiSuccessExample {json} 成功示例
|
||||
* {"code":0,"msg":"登录成功","time":1627374739,"data":{"token":"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJhcGkuZ291Z3VjbXMuY29tIiwiYXVkIjoiZ291Z3VjbXMiLCJpYXQiOjE2MjczNzQ3MzksImV4cCI6MTYyNzM3ODMzOSwidWlkIjoxfQ.gjYMtCIwKKY7AalFTlwB2ZVWULxiQpsGvrz5I5t2qTs"}}
|
||||
* @apiErrorExample {json} 失败示例
|
||||
* {"code":1,"msg":"帐号或密码错误","time":1627374820,"data":[]}
|
||||
*/
|
||||
|
||||
public function login()
|
||||
{
|
||||
$param = get_params();
|
||||
if (empty($param['username']) || empty($param['password'])) {
|
||||
$this->apiError('参数错误');
|
||||
}
|
||||
// 校验用户名密码
|
||||
$user = Db::name('Admin')->where(['username' => $param['username']])->find();
|
||||
if (empty($user)) {
|
||||
$this->apiError('帐号或密码错误');
|
||||
}
|
||||
$param['pwd'] = set_password($param['password'], $user['salt']);
|
||||
if ($param['pwd'] !== $user['pwd']) {
|
||||
$this->apiError('帐号或密码错误');
|
||||
}
|
||||
if ($user['status'] == -1) {
|
||||
$this->apiError('该用户禁止登录,请于平台联系');
|
||||
}
|
||||
$data = [
|
||||
'last_login_time' => time(),
|
||||
'last_login_ip' => request()->ip(),
|
||||
'login_num' => $user['login_num'] + 1,
|
||||
];
|
||||
$res = Db::name('Admin')->where(['id' => $user['id']])->update($data);
|
||||
if ($res) {
|
||||
$token = self::getToken($user['id']);
|
||||
$this->apiSuccess('登录成功', ['token' => $token]);
|
||||
}
|
||||
}
|
||||
/**
|
||||
* @api {post} /index/demo 测试页面
|
||||
* @apiDescription 返回文章列表信息
|
||||
|
||||
* @apiParam (请求参数：) {string} token Token
|
||||
|
||||
* @apiSuccessExample {json} 响应数据样例
|
||||
* {"code":1,"msg":"","time":1563517637,"data":{"id":13,"email":"test110@qq.com","password":"e10adc3949ba59abbe56e057f20f883e","sex":1,"last_login_time":1563517503,"last_login_ip":"127.0.0.1","qq":"123455","mobile":"","mobile_validated":0,"email_validated":0,"type_id":1,"status":1,"create_ip":"127.0.0.1","update_time":1563507130,"create_time":1563503991,"type_name":"注册会员"}}
|
||||
*/
|
||||
public function test(Request $request)
|
||||
{
|
||||
$uid = JWT_UID;
|
||||
$userInfo = Db::name('Admin')->where(['id' => $uid])->find();
|
||||
$this->apiSuccess('请求成功', ['user' => $userInfo]);
|
||||
}
|
||||
}
|
||||
@ -7,8 +7,8 @@
|
||||
|
||||
namespace app\api\middleware;
|
||||
|
||||
use app\api\service\JwtAuth;
|
||||
use think\exception\HttpResponseException;
|
||||
use Firebase\JWT\JWT;
|
||||
use Firebase\JWT\Key;
|
||||
use think\facade\Request;
|
||||
use think\Response;
|
||||
|
||||
@ -19,44 +19,37 @@ class Auth
|
||||
$token = Request::header('Token');
|
||||
if ($token) {
|
||||
if (count(explode('.', $token)) != 3) {
|
||||
$this->result([], 110, 'token格式错误');
|
||||
}
|
||||
$jwtAuth = JwtAuth::getInstance();
|
||||
$jwtAuth->setToken($token);
|
||||
if ($jwtAuth->validate() && $jwtAuth->verify()) {
|
||||
return $next($request);
|
||||
} else {
|
||||
$this->result([], 111, 'token已过期');
|
||||
return json(['code'=>404,'msg'=>'非法请求']);
|
||||
}
|
||||
$config = get_system_config('token');
|
||||
//var_dump($config);exit;
|
||||
try {
|
||||
JWT::$leeway = 60;//当前时间减去60，把时间留点余地
|
||||
$decoded = JWT::decode($token, new Key($config['secrect'], 'HS256')); //HS256方式，这里要和签发的时候对应
|
||||
//return (array)$decoded;
|
||||
$decoded_array = json_decode(json_encode($decoded),TRUE);
|
||||
$jwt_data = $decoded_array['data'];
|
||||
//$request->uid = $jwt_data['userid'];
|
||||
define('JWT_UID', $jwt_data['userid']);
|
||||
$response = $next($request);
|
||||
return $response;
|
||||
//return $next($request);
|
||||
} catch(\Firebase\JWT\SignatureInvalidException $e) { //签名不正确
|
||||
return json(['code'=>403,'msg'=>'签名错误']);
|
||||
}catch(\Firebase\JWT\BeforeValidException $e) { // 签名在某个时间点之后才能用
|
||||
return json(['code'=>401,'msg'=>'token失效']);
|
||||
}catch(\Firebase\JWT\ExpiredException $e) { // token过期
|
||||
return json(['code'=>401,'msg'=>'token已过期']);
|
||||
}catch(Exception $e) { //其他错误
|
||||
return json(['code'=>404,'msg'=>'非法请求']);
|
||||
}catch(\UnexpectedValueException $e) { //其他错误
|
||||
return json(['code'=>404,'msg'=>'非法请求']);
|
||||
} catch(\DomainException $e) { //其他错误
|
||||
return json(['code'=>404,'msg'=>'非法请求']);
|
||||
}
|
||||
} else {
|
||||
$this->result([], 112, 'token不能为空');
|
||||
return json(['code'=>404,'msg'=>'token不能为空']);
|
||||
}
|
||||
|
||||
return $next($request);
|
||||
}
|
||||
|
||||
/**
|
||||
* 返回封装后的API数据到客户端
|
||||
* @param mixed $data 要返回的数据
|
||||
* @param integer $code 返回的code
|
||||
* @param mixed $msg 提示信息
|
||||
* @param string $type 返回数据格式
|
||||
* @param array $header 发送的Header信息
|
||||
* @return Response
|
||||
*/
|
||||
protected function result($data, int $code = 0, $msg = '', string $type = '', array $header = []): Response
|
||||
{
|
||||
$result = [
|
||||
'code' => $code,
|
||||
'msg' => $msg,
|
||||
'time' => time(),
|
||||
'data' => $data,
|
||||
];
|
||||
|
||||
$type = $type ?: 'json';
|
||||
$response = Response::create($result, $type)->header($header);
|
||||
|
||||
throw new HttpResponseException($response);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -1,143 +0,0 @@
|
||||
<?php
|
||||
/**
|
||||
* @copyright Copyright (c) 2021 勾股工作室
|
||||
* @license https://opensource.org/licenses/GPL-2.0
|
||||
* @link https://www.gougucms.com
|
||||
*/
|
||||
|
||||
namespace app\api\service;
|
||||
|
||||
use Lcobucci\JWT\Builder;
|
||||
use Lcobucci\JWT\Parser;
|
||||
use Lcobucci\JWT\Signer\Hmac\Sha256;
|
||||
use Lcobucci\JWT\ValidationData;
|
||||
|
||||
/**
|
||||
* 单例 一次请求中所有出现jwt的地方都是一个用户
|
||||
* Class JwtAuth
|
||||
* @package app\api\service
|
||||
*/
|
||||
class JwtAuth
|
||||
{
|
||||
// jwt token
|
||||
private $token;
|
||||
|
||||
// jwt 过期时间
|
||||
private $expTime = 3600;
|
||||
|
||||
// claim iss 签发组织
|
||||
private $iss = 'wwww.gougucms.com';
|
||||
|
||||
// claim aud签发作者
|
||||
private $aud = 'gougucms';
|
||||
|
||||
// secrect
|
||||
private $secrect = 'GOUGUCMS';
|
||||
|
||||
// claim uid
|
||||
private $uid;
|
||||
|
||||
// decode token
|
||||
private $decodeToken;
|
||||
|
||||
// 单例模式JwtAuth句柄
|
||||
private static $instance;
|
||||
|
||||
// 获取JwtAuth的句柄
|
||||
public static function getInstance()
|
||||
{
|
||||
if (is_null(self::$instance)) {
|
||||
self::$instance = new self();
|
||||
}
|
||||
return self::$instance;
|
||||
}
|
||||
|
||||
// 私有化构造函数
|
||||
private function __construct()
|
||||
{
|
||||
// jwt 过期时间
|
||||
$this->expTime = get_system_config('token','exptime');
|
||||
// claim iss 签发组织
|
||||
$this->iss = get_system_config('token','iss');
|
||||
// claim aud签发作者
|
||||
$this->aud = get_system_config('token','aud');
|
||||
// secrect
|
||||
$this->secrect = get_system_config('token','secrect');
|
||||
}
|
||||
|
||||
// 私有化clone函数
|
||||
private function __clone()
|
||||
{
|
||||
// TODO: Implement __clone() method.
|
||||
}
|
||||
|
||||
// 获取token
|
||||
public function getToken()
|
||||
{
|
||||
return (string) $this->token;
|
||||
}
|
||||
|
||||
// 设置token
|
||||
public function setToken($token)
|
||||
{
|
||||
$this->token = $token;
|
||||
return $this;
|
||||
}
|
||||
|
||||
// 设置uid
|
||||
public function setUid($uid)
|
||||
{
|
||||
$this->uid = $uid;
|
||||
return $this;
|
||||
}
|
||||
|
||||
// 获取uid
|
||||
public function getUid()
|
||||
{
|
||||
return $this->uid;
|
||||
}
|
||||
|
||||
// 编码jwt token
|
||||
public function encode()
|
||||
{
|
||||
$time = time(); //签发时间
|
||||
$this->token = (new Builder())->setHeader('alg', 'HS256')
|
||||
->setIssuer($this->iss)
|
||||
->setAudience($this->aud)
|
||||
->setIssuedAt($time)
|
||||
->setExpiration($time + $this->expTime)
|
||||
->set('uid', $this->uid)
|
||||
->sign(new Sha256(), $this->secrect)
|
||||
->getToken();
|
||||
|
||||
return $this;
|
||||
}
|
||||
|
||||
public function decode()
|
||||
{
|
||||
if (!$this->decodeToken) {
|
||||
$this->decodeToken = (new Parser())->parse((string) $this->token); // Parses from a string
|
||||
$this->uid = $this->decodeToken->getClaim('uid');
|
||||
}
|
||||
return $this->decodeToken;
|
||||
}
|
||||
|
||||
// validate
|
||||
public function validate()
|
||||
{
|
||||
$data = new ValidationData(); // It will use the current time to validate (iat, nbf and exp)
|
||||
$data->setIssuer($this->iss);
|
||||
$data->setAudience($this->aud);
|
||||
$data->setId($this->uid);
|
||||
|
||||
return $this->decode()->validate($data);
|
||||
}
|
||||
|
||||
// verify token
|
||||
public function verify()
|
||||
{
|
||||
$signer = new Sha256();
|
||||
return $this->decode()->verify($signer, $this->secrect);
|
||||
}
|
||||
|
||||
}
|
||||
@ -315,7 +315,7 @@ function get_file($id)
|
||||
* @param int $param_id 操作类型
|
||||
* @param array $param 提交的参数
|
||||
*/
|
||||
function add_log($type, $param_id = '', $param = [])
|
||||
function add_log($type, $param_id = '', $param = [],$subject='')
|
||||
{
|
||||
$action = '未知操作';
|
||||
$type_action = get_config('log.type_action');
|
||||
@ -350,7 +350,12 @@ function add_log($type, $param_id = '', $param = [])
|
||||
}
|
||||
else{
|
||||
$data['title'] = '';
|
||||
$data['subject'] ='系统';
|
||||
if($subject!=''){
|
||||
$data['subject'] =$subject;
|
||||
}
|
||||
else{
|
||||
$data['subject'] ='系统';
|
||||
}
|
||||
}
|
||||
$content = $login_admin['name'] . '在' . date('Y-m-d H:i:s') . $data['action'] . '了' . $data['subject'];
|
||||
$data['content'] = $content;
|
||||
@ -1500,60 +1505,6 @@ function getAddress($ip)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 下载服务器文件
|
||||
*
|
||||
* @param string $file 文件路径
|
||||
* @param string $name 下载名称
|
||||
* @param boolean $del 下载后删除
|
||||
* @return void
|
||||
*/
|
||||
function download($file, $name = '', $del = false)
|
||||
{
|
||||
if (!file_exists($file)) {
|
||||
return resultArray([
|
||||
'error' => '文件不存在',
|
||||
]);
|
||||
}
|
||||
// 仅允许下载 public 目录下文件
|
||||
$res = strpos(realpath($file), realpath('./public'));
|
||||
if ($res !== 0) {
|
||||
return resultArray([
|
||||
'error' => '文件路径错误',
|
||||
]);
|
||||
}
|
||||
|
||||
$fp = fopen($file, 'r');
|
||||
$size = filesize($file);
|
||||
|
||||
//下载文件需要的头
|
||||
header("Content-type: application/octet-stream");
|
||||
header("Accept-Ranges: bytes");
|
||||
header('ResponseType: blob');
|
||||
header("Accept-Length: $size");
|
||||
$file_name = $name != '' ? $name : pathinfo($file, PATHINFO_BASENAME);
|
||||
// urlencode 处理中文乱码
|
||||
header("Content-Disposition:attachment; filename=" . urlencode($file_name));
|
||||
|
||||
// 导出数据时 csv office Excel 需要添加bom头
|
||||
if (pathinfo($file, PATHINFO_EXTENSION) == 'csv') {
|
||||
echo "\xEF\xBB\xBF"; // UTF-8 BOM
|
||||
}
|
||||
|
||||
$fileCount = 0;
|
||||
$fileUnit = 1024;
|
||||
while (!feof($fp) && $size - $fileCount > 0) {
|
||||
$fileContent = fread($fp, $fileUnit);
|
||||
echo $fileContent;
|
||||
$fileCount += $fileUnit;
|
||||
}
|
||||
fclose($fp);
|
||||
|
||||
// 删除
|
||||
if ($del) @unlink($file);
|
||||
die();
|
||||
}
|
||||
|
||||
/**
|
||||
* 导出数据为excel表格
|
||||
* @param $data 一个二维数组,结构如同从数据库查出来的数组
|
||||
|
||||
@ -38,8 +38,7 @@
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="4">
|
||||
<span
|
||||
style="color: red; font-size: 12px;">注意：新增配置项以后，需要对应新增模板文件，模板文件名称需与标识名称一致，建议复制现有的配置模板文件，然后根据需求修改对应的表单即可。</span>
|
||||
<span class="red">注意：新增配置项以后，需要对应新增模板文件，模板文件名称需与标识名称一致，建议复制现有的配置模板文件，然后根据需求修改对应的表单即可。</span>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
@ -70,7 +70,8 @@
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="layui-td-gray">邮件模板</td>
|
||||
<td><textarea name="template" placeholder="" class="layui-textarea" id="container">{notempty name="$config.template"}{$config.template}{/notempty}</textarea>
|
||||
<td><textarea name="template" placeholder="" class="layui-textarea"
|
||||
id="container">{notempty name="$config.template"}{$config.template}{/notempty}</textarea>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
@ -86,13 +87,13 @@
|
||||
<!-- 脚本 -->
|
||||
{block name="script"}
|
||||
<script>
|
||||
const moduleInit = ['tool','tinymce'];
|
||||
const moduleInit = ['tool', 'tinymce'];
|
||||
function gouguInit() {
|
||||
var form = layui.form, tool = layui.tool, tinymce = layui.tinymce;
|
||||
|
||||
|
||||
var edit = tinymce.render({
|
||||
selector: "#container",
|
||||
height: 300
|
||||
height: 320
|
||||
});
|
||||
//监听提交
|
||||
form.on('submit(webform)', function (data) {
|
||||
@ -120,7 +121,7 @@
|
||||
return false;
|
||||
}
|
||||
$.ajax({
|
||||
url: "/home/api/email_test",
|
||||
url: "/api/index/email_test",
|
||||
data: { email: value },
|
||||
type: "post",
|
||||
beforeSend: function () {
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
</script>
|
||||
<script type="text/html" id="toolbarDemo">
|
||||
<div class="layui-btn-container">
|
||||
<button class="layui-btn layui-btn-normal layui-btn-sm" lay-event="add">+ 添加配置项</button>
|
||||
<button class="layui-btn layui-btn-sm" lay-event="add">+ 添加配置项</button>
|
||||
</div>
|
||||
</script>
|
||||
{/block}
|
||||
@ -27,7 +27,7 @@
|
||||
title: '配置列表',
|
||||
toolbar: '#toolbarDemo',
|
||||
url: "/home/conf/index",
|
||||
cellMinWidth: 300,
|
||||
cellMinWidth: 360,
|
||||
page: true, //开启分页
|
||||
limit: 20,
|
||||
cols: [
|
||||
@ -42,7 +42,7 @@
|
||||
title: '配置名称'
|
||||
}, {
|
||||
field: 'name',
|
||||
title: '配置标识（新增的模板文件名称需与标识名称一致）'
|
||||
title: '配置标识<span class="red">（新增的模板文件名称需与标识名称一致）</span>'
|
||||
}, {
|
||||
field: 'status',
|
||||
width: 80,
|
||||
@ -68,7 +68,7 @@
|
||||
return;
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
//监听行工具事件
|
||||
table.on('tool(conf)', function (obj) {
|
||||
var data = obj.data;
|
||||
@ -96,18 +96,6 @@
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
//监听搜索提交
|
||||
form.on('submit(webform)', function (data) {
|
||||
if (data.field.keywords) {
|
||||
tableIns.reload({
|
||||
where: { keywords: data.field.keywords }, page: { curr: 1 }
|
||||
});
|
||||
} else {
|
||||
location.reload();
|
||||
}
|
||||
return false;
|
||||
});
|
||||
}
|
||||
</script>
|
||||
{/block}
|
||||
|
||||
@ -32,19 +32,20 @@
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<div style="padding:20px 0;">
|
||||
<span class="layui-btn layui-btn-sm" onclick="testReg();">Api测试注册</span>
|
||||
<div class="py-3">
|
||||
<button class="layui-btn layui-btn-normal" lay-submit="" lay-filter="webform">立即提交</button>
|
||||
<button type="reset" class="layui-btn layui-btn-primary">重置</button>
|
||||
</div>
|
||||
|
||||
<div style="padding:30px 0;">
|
||||
<span class="layui-btn layui-btn-sm" onclick="testLogin();">Api测试登录</span>
|
||||
<span class="layui-btn layui-btn-sm" onclick="testToken();">Token测试</span>
|
||||
</div>
|
||||
<div style="padding:12px 0;word-wrap:break-word">
|
||||
<p class="red">先点击登录，在点击测试，会有好的结果哦！</p>
|
||||
测试结果：
|
||||
<div id="res"></div>
|
||||
</div>
|
||||
<div class="p-y3">
|
||||
<button class="layui-btn layui-btn-normal" lay-submit="" lay-filter="webform">立即提交</button>
|
||||
<button type="reset" class="layui-btn layui-btn-primary">重置</button>
|
||||
</div>
|
||||
</form>
|
||||
{/block}
|
||||
<!-- /主体 -->
|
||||
@ -74,7 +75,7 @@
|
||||
headers: {
|
||||
Token: token
|
||||
},
|
||||
url: "/home/api/index/demo",
|
||||
url: "/api/demo/test",
|
||||
type: "get",
|
||||
success: function (res) {
|
||||
$('#res').html(JSON.stringify(res));
|
||||
@ -85,61 +86,10 @@
|
||||
});
|
||||
}
|
||||
|
||||
function testReg() {
|
||||
var content = '<form class="layui-form" style="width:400px"><div style="padding:10px 15px">\
|
||||
<p style="padding:10px 0">用户名：</p>\
|
||||
<p><input name="username" type="text" class="layui-input" value=""/></p>\
|
||||
<p style="padding:10px 0">密 码：</p>\
|
||||
<p><input name="password" type="password" class="layui-input" value=""/></p>\
|
||||
<p style="padding:10px 0">重复密码：</p>\
|
||||
<p><input name="newpassword" type="password" class="layui-input" value=""/></p>\
|
||||
</div>\
|
||||
</form>';
|
||||
layer.open({
|
||||
type: 1,
|
||||
title: 'API测试用户注册',
|
||||
area: ['432px', '360px'],
|
||||
content: content,
|
||||
btnAlign: 'c',
|
||||
btn: ['注册'],
|
||||
yes: function (idx) {
|
||||
var username = $('[name="username"]').val();
|
||||
var password = $('[name="password"]').val();
|
||||
var newpassword = $('[name="newpassword"]').val();
|
||||
if (username == '') {
|
||||
layer.msg('请填写用户名');
|
||||
return;
|
||||
}
|
||||
if (password == '') {
|
||||
layer.msg('请填写密码');
|
||||
return;
|
||||
}
|
||||
if (password != newpassword) {
|
||||
layer.msg('两次密码填写不一致');
|
||||
return;
|
||||
}
|
||||
$.ajax({
|
||||
url: "/home/api/index/reg",
|
||||
type: 'post',
|
||||
data: { username: username, pwd: password },
|
||||
success: function (res) {
|
||||
$('#res').html(JSON.stringify(res));
|
||||
layer.msg(res.msg);
|
||||
if (res.code == 0) {
|
||||
token = res.data.token;
|
||||
layer.close(idx);
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
function testLogin() {
|
||||
var content = '<form class="layui-form" style="width:400px"><div style="padding:10px 15px">\
|
||||
<p style="padding:10px 0">用户名：</p>\
|
||||
<p><input name="username" type="text" class="layui-input" value="hdm58"/></p>\
|
||||
<p><input name="username" type="text" class="layui-input" value="admin"/></p>\
|
||||
<p style="padding:10px 0">密 码：</p>\
|
||||
<p><input name="password" type="password" class="layui-input" value="123456"/></p>\
|
||||
</div>\
|
||||
@ -163,7 +113,7 @@
|
||||
return;
|
||||
}
|
||||
$.ajax({
|
||||
url: "/home/api/index/login",
|
||||
url: "/api/demo/login",
|
||||
type: 'post',
|
||||
data: { username: username, password: password },
|
||||
success: function (res) {
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
<h3 class="pb-3">系统配置</h3>
|
||||
<table class="layui-table layui-table-form">
|
||||
<tr>
|
||||
<td class="layui-td-gray-2">系统名称<font>*</font>
|
||||
<td class="layui-td-gray">系统名称<font>*</font>
|
||||
</td>
|
||||
<td>
|
||||
<input type="hidden" name="id" value="{$id}">
|
||||
@ -23,14 +23,13 @@
|
||||
<td rowspan="3" class="layui-td-gray">系统LOGO</td>
|
||||
<td rowspan="3" style="width: 240px;">
|
||||
<div class="layui-upload" style="width: 240px;">
|
||||
<div class="layui-upload-list" id="demo1" style="width: 100%; height:100px; overflow: hidden;">
|
||||
<div class="layui-upload-list" id="logo" style="width: 100%; height:100px; overflow: hidden;">
|
||||
<img src='{notempty name="$config.logo"}{$config.logo}{/notempty}'
|
||||
style="max-width: 100%; width: 100%;" />
|
||||
<input type="hidden" name="logo" {notempty name="$config.logo" } value="{$config.logo}"
|
||||
{/notempty}>
|
||||
</div>
|
||||
<button type="button" class="layui-btn layui-btn-normal" style="width: 100%;"
|
||||
id="uploadBtn">上传LOGO</button>
|
||||
<button type="button" class="layui-btn" style="width: 100%;" id="uploadBtn">上传LOGO</button>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
@ -49,7 +48,7 @@
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="layui-td-gray">SEO关键词<font>*</font>
|
||||
<td class="layui-td-gray-2">SEO关键词<font>*</font>
|
||||
</td>
|
||||
<td>
|
||||
<input type="text" name="keywords" lay-verify="required" autocomplete="off" placeholder="多个关键词用“,”隔开"
|
||||
@ -127,8 +126,8 @@
|
||||
layer.msg(res.msg);
|
||||
if (res.code == 0) {
|
||||
//上传成功
|
||||
$('#demo1 input').attr('value', res.data.id);
|
||||
$('#demo1 img').attr('src', res.data.filepath);
|
||||
$('#logo input').attr('value', res.data.id);
|
||||
$('#logo img').attr('src', res.data.filepath);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
@ -21,7 +21,7 @@ class Schedule extends BaseController
|
||||
if (request()->isAjax()) {
|
||||
$param = get_params();
|
||||
//按时间检索
|
||||
$start_time = isset($param['start_time']) ? strtotime($param['start_time']) : 0;
|
||||
$start_time = isset($param['start_time']) ? strtotime($param['start_time']) : 0;
|
||||
$end_time = isset($param['end_time']) ? strtotime($param['end_time']) : 0;
|
||||
$tid = isset($param['tid']) ? $param['tid'] : 0;
|
||||
$where = [];
|
||||
|
||||
@ -11,7 +11,7 @@ use think\Validate;
|
||||
|
||||
class AdminCheck extends Validate
|
||||
{
|
||||
protected $regex = [ 'checkUser' => '/^[A-Za-z]{1}[A-Za-z0-9_-]{4,19}$/'];
|
||||
protected $regex = [ 'checkUser' => '/^[A-Za-z]{1}[A-Za-z0-9_-]{3,19}$/'];
|
||||
|
||||
protected $rule = [
|
||||
'name' => 'require|chs',
|
||||
@ -32,7 +32,7 @@ class AdminCheck extends Validate
|
||||
'name.require' => '员工姓名不能为空',
|
||||
'name.chs' => '员工姓名只能是汉字',
|
||||
'username.require' => '登录账号不能为空',
|
||||
'username.regex' => '登录账号必须是以字母开头，只能包含字母数字下划线和减号，5到20位',
|
||||
'username.regex' => '登录账号必须是以字母开头，只能包含字母数字下划线和减号，4到20位',
|
||||
'username.unique' => '同样的登录账号已经存在，建议增加数字，如：xxx123',
|
||||
'mobile.require' => '手机不能为空',
|
||||
'mobile.mobile' => '手机格式错误',
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
"topthink/think-view": "^1.0",
|
||||
"topthink/think-captcha": "^3.0",
|
||||
"phpmailer/phpmailer": "^6.6",
|
||||
"lcobucci/jwt": "3.3.3",
|
||||
"firebase/php-jwt": "6.1.2",
|
||||
"overtrue/pinyin": "^4.0"
|
||||
},
|
||||
"require-dev": {
|
||||
|
||||
@ -70,6 +70,7 @@ return [
|
||||
'leave' => '离职',
|
||||
'get' => '获取',
|
||||
'allot' => '分配',
|
||||
'remove' => '移除',
|
||||
'tosea' => '公海移入',
|
||||
'reset' => '重新设置',
|
||||
'install' => '安装',
|
||||
|
||||
@ -61,6 +61,21 @@ return [
|
||||
'title' => '您提交的『发票申请』已被驳回拒绝',
|
||||
'content' => '您在{create_time}提交的『发票申请』已于{date}被驳回拒绝。',
|
||||
'link' => '<a class="link-a" data-href="/oa/approve/view/id/{action_id}">查看详情</a>',
|
||||
],
|
||||
51 => [
|
||||
'title' => '{from_user}提交了一个『合同审核』，请及时审批',
|
||||
'content' => '您有一个新的『合同审核』需要处理。',
|
||||
'link' => '<a class="link-a" data-href="/oa/approve/view/id/{action_id}">去审批</a>',
|
||||
],
|
||||
52 => [
|
||||
'title' => '您提交的『合同审核』已被审批通过',
|
||||
'content' => '您在{create_time}提交的『合同审核』已于{date}被审批通过。',
|
||||
'link' => '<a class="link-a" data-href="/oa/approve/view/id/{action_id}">查看详情</a>',
|
||||
],
|
||||
53 => [
|
||||
'title' => '您提交的『合同审核』已被驳回拒绝',
|
||||
'content' => '您在{create_time}提交的『合同审核』已于{date}被驳回拒绝。',
|
||||
'link' => '<a class="link-a" data-href="/oa/approve/view/id/{action_id}">查看详情</a>',
|
||||
],
|
||||
]
|
||||
];
|
||||
|
||||
@ -18,7 +18,7 @@ require __DIR__ . '/../vendor/autoload.php';
|
||||
define('CMS_VERSION','3.7.12');
|
||||
|
||||
// 定义Layui版本号
|
||||
define('LAYUI_VERSION','2.7.4');
|
||||
define('LAYUI_VERSION','2.7.5');
|
||||
|
||||
// 定义项目目录
|
||||
define('CMS_ROOT', __DIR__ . '/../');
|
||||
|
||||
@ -63,7 +63,8 @@ a.tab-a:hover,a:hover,a.open-a:hover,a.link-a:hover,a.right-a:hover{color:#187FD
|
||||
.right{float:right;}
|
||||
.h1,h1{font-size:24px; font-weight: 600;}
|
||||
.h2,h2{font-size:20px; font-weight: 600;}
|
||||
.h3,h3{font-size:16px; font-weight: 600;}
|
||||
.h3,h3{font-size:18px; font-weight: 600;}
|
||||
.h4,h4{font-size:16px; font-weight: 600;}
|
||||
|
||||
.m-0{margin:0}
|
||||
.m-1{margin:4px}
|
||||
@ -187,10 +188,10 @@ a.tab-a:hover,a:hover,a.open-a:hover,a.link-a:hover,a.right-a:hover{color:#187FD
|
||||
.CodeMirror-gutters{background-color:#fafafa!important;}
|
||||
/* 滚动条 */
|
||||
::-webkit-scrollbar {
|
||||
width: 8px;
|
||||
width: 8px;
|
||||
}
|
||||
::-webkit-scrollbar-thumb {
|
||||
background-color:rgba(0,0,0,.15);background-clip:content-box;border:1px solid transparent;border-radius:8px
|
||||
background-color:rgba(0,0,0,.15);background-clip:content-box;border:1px solid transparent;border-radius:8px
|
||||
}
|
||||
|
||||
::-webkit-scrollbar-track{background-color:transparent}
|
||||
@ -199,12 +200,12 @@ background-color:rgba(0,0,0,.15);background-clip:content-box;border:1px solid tr
|
||||
::-webkit-scrollbar-thumb:active{background-color:rgba(0,0,0,.65)}
|
||||
|
||||
::-moz-scrollbar {
|
||||
width: 8px;
|
||||
background-color: transparent;
|
||||
width: 8px;
|
||||
background-color: transparent;
|
||||
}
|
||||
::-moz-scrollbar-thumb {
|
||||
background-color: #c1c1c1;
|
||||
border-radius: 8px;
|
||||
background-color: #c1c1c1;
|
||||
border-radius: 8px;
|
||||
}
|
||||
body.right-open{overflow-y:clip;}
|
||||
div.layui-table-main::-webkit-scrollbar{width:12px;height:12px}
|
||||
|
||||
File diff suppressed because one or more lines are too long
Loading…
x
Reference in New Issue
Block a user