From 28b353a552602de06a8762c6e5552b2b58682bb6 Mon Sep 17 00:00:00 2001 From: wispx <1591788658@qq.com> Date: Wed, 2 Jan 2019 17:36:49 +0800 Subject: [PATCH 1/3] up md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 9c0b7c84..224b07b0 100644 --- a/README.md +++ b/README.md @@ -9,9 +9,9 @@ [官网](https://www.lsky.pro) [手册](https://www.kancloud.cn/wispx/lsky-pro) -[![License](https://img.shields.io/badge/license-GPL_V3.0-yellowgreen.svg?style=flat-square)](https://github.com/wisp-x/lsky-pro/blob/master/LICENSE) -[![PHP](https://img.shields.io/badge/PHP->=5.6-orange.svg?style=flat-square)](http://php.net) -[![GitHub code size in bytes](https://img.shields.io/github/languages/code-size/wisp-x/lsky-pro.svg?style=flat-square)](https://github.com/wisp-x/lsky-pro) +[![License](https://img.shields.io/badge/license-GPL_V3.0-yellowgreen.svg)](https://github.com/wisp-x/lsky-pro/blob/master/LICENSE) +[![PHP](https://img.shields.io/badge/PHP->=5.6-orange.svg)](http://php.net) +[![GitHub code size in bytes](https://img.shields.io/github/languages/code-size/wisp-x/lsky-pro.svg)](https://github.com/wisp-x/lsky-pro) [![Join the chat at https://gitter.im/wisp-x/lsky-pro](https://badges.gitter.im/wisp-x/lsky-pro.svg)](https://gitter.im/wisp-x/lsky-pro?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge&style=flat-square) > master分支为最新版，其他版本请点击[这里](https://github.com/wisp-x/lsky-pro/releases) From 5d083713473f9b27b3eed62e56cb47bc98f65483 Mon Sep 17 00:00:00 2001 From: WispX <1591788658@qq.com> Date: Wed, 2 Jan 2019 22:05:03 +0800 Subject: [PATCH 2/3] remove .env --- .env | 4 ---- .gitignore | 1 + config/app.php | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) delete mode 100644 .env diff --git a/.env b/.env deleted file mode 100644 index 6acdc4bd..00000000 --- a/.env +++ /dev/null @@ -1,4 +0,0 @@ -[APP] -NAME = Lsky Pro -DEBUG = false -TRACE = false diff --git a/.gitignore b/.gitignore index eb7a8180..689d3ce8 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ runtime /config/db.php +.env # Icon must end with two \r Icon diff --git a/config/app.php b/config/app.php index 3935997d..61dc0dd6 100644 --- a/config/app.php +++ b/config/app.php @@ -15,7 +15,7 @@ return [ // 应用名称 - 'app_name' => Env::get('app.name'), + 'app_name' => Env::get('app.name', 'Lsky Pro'), // 应用地址 'app_host' => '', // 应用调试模式 From b0aaa7e6a33f51f7ca7f706a263f7d720a299ef0 Mon Sep 17 00:00:00 2001 From: WispX <1591788658@qq.com> Date: Wed, 2 Jan 2019 22:09:24 +0800 Subject: [PATCH 3/3] fix --- install.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/install.sql b/install.sql index 982913e2..8817edff 100644 --- a/install.sql +++ b/install.sql @@ -124,6 +124,7 @@ CREATE TABLE IF NOT EXISTS `lsky_users` ( `email` varchar(100) NOT NULL COMMENT '邮箱', `password` varchar(32) NOT NULL COMMENT '密码', `quota` decimal(20,2) NOT NULL DEFAULT '0.00' COMMENT '可用配额容量(字节：b)', + `default_folder` varchar(32) DEFAULT NULL COMMENT '默认上传文件夹', `is_admin` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否为管理员', `state` tinyint(1) NOT NULL DEFAULT '1' COMMENT '0：冻结，1：正常', `token` varchar(32) DEFAULT NULL COMMENT 'Token',