From 9a46c6821dad9390357b7dad8b6cecde7789d9ba Mon Sep 17 00:00:00 2001 From: fengyuexingzi Date: Mon, 13 Aug 2018 16:59:01 +0800 Subject: [PATCH] first --- app/Admin/Controllers/UploadController.php | 2 +- .../Commands/{XiaoTInstall.php => MiniInstall.php} | 6 +++--- app/Http/Controllers/Api/IndexController.php | 1 - app/Logics/AddressLogic.php | 5 +---- config/filesystems.php | 12 ++++++------ mini/app.js | 4 ++-- mini/pages/index/index.js | 4 ++-- 7 files changed, 15 insertions(+), 19 deletions(-) rename app/Console/Commands/{XiaoTInstall.php => MiniInstall.php} (83%) diff --git a/app/Admin/Controllers/UploadController.php b/app/Admin/Controllers/UploadController.php index b5204db..3142f7d 100644 --- a/app/Admin/Controllers/UploadController.php +++ b/app/Admin/Controllers/UploadController.php @@ -8,7 +8,7 @@ use Illuminate\Support\Facades\Storage; class UploadController extends Controller { const MAX_UPLOAD_NUM = 25; - const UPLOAD_PATH = 'XiaoT'; + const UPLOAD_PATH = 'Mini'; // 待优化 function uploadImg(Request $request) diff --git a/app/Console/Commands/XiaoTInstall.php b/app/Console/Commands/MiniInstall.php similarity index 83% rename from app/Console/Commands/XiaoTInstall.php rename to app/Console/Commands/MiniInstall.php index 074840e..cc57b01 100644 --- a/app/Console/Commands/XiaoTInstall.php +++ b/app/Console/Commands/MiniInstall.php @@ -4,21 +4,21 @@ namespace App\Console\Commands; use Illuminate\Console\Command; -class XiaoTInstall extends Command +class MiniInstall extends Command { /** * The name and signature of the console command. * * @var string */ - protected $signature = 'XiaoT:install'; + protected $signature = 'Mini:install'; /** * The console command description. * * @var string */ - protected $description = 'Install XiaoT Shop'; + protected $description = 'Install MiniShop'; /** * Create a new command instance. diff --git a/app/Http/Controllers/Api/IndexController.php b/app/Http/Controllers/Api/IndexController.php index 19e8474..f49a202 100644 --- a/app/Http/Controllers/Api/IndexController.php +++ b/app/Http/Controllers/Api/IndexController.php @@ -11,7 +11,6 @@ use App\Http\Resources\ShopTopic as ShopTopicResource; class IndexController extends ApiController { /** - * xiaoT技术首页信息 * @return mixed */ public function index() diff --git a/app/Logics/AddressLogic.php b/app/Logics/AddressLogic.php index a32268e..21ed6a3 100644 --- a/app/Logics/AddressLogic.php +++ b/app/Logics/AddressLogic.php @@ -1,8 +1,5 @@ [ 'driver' => 'oss', - 'access_id' => 'LTAIPBwk3qMhHat5', - 'access_key' => 'HjAzFWe5ngFdU7n3hwb0Q3UGJoXBoj', - 'bucket' => 'xiaot-static', - 'endpoint' => 'oss-cn-hangzhou.aliyuncs.com', // OSS 外网节点或自定义外部域名 + 'access_id' => 'YREDxBwk3qMhHat5', + 'access_key' => 'sjAzFWe5ngFdU3e3hwb0d3UGJoXBoj', + 'bucket' => 'static', + 'endpoint' => 'oss-.aliyuncs.com', // OSS 外网节点或自定义外部域名 //'endpoint_internal' => '', // v2.0.4 新增配置属性,如果为空,则默认使用 endpoint 配置(由于内网上传有点小问题未解决,请大家暂时不要使用内网节点上传,正在与阿里技术沟通中) //'cdnDomain' => '', // 如果isCName为true, getUrl会判断cdnDomain是否设定来决定返回的url,如果cdnDomain未设置,则使用endpoint来生成url,否则使用cdn // 'debug' => true, - 'url' => 'https://xiaot-static.oss-cn-hangzhou.aliyuncs.com' + 'url' => 'https://oss.aliyuncs.com' ], 's3' => [ @@ -79,7 +79,7 @@ return [ 'driver' => 'local', 'root' => public_path('uploads'), 'visibility' => 'public', - 'url' => env('API_URL','https://xiaocheng.xuezhangbang.me').'/uploads', + 'url' => env('API_URL','').'/uploads', ], ], diff --git a/mini/app.js b/mini/app.js index bd01176..ca4660a 100644 --- a/mini/app.js +++ b/mini/app.js @@ -16,8 +16,8 @@ App({ globalData: { userInfo: { - nickname: 'Hi,游客', - username: '点击去登录', + nickname: '游客', + username: '去登录', avatar: 'http://mp.fengyuexingzi.top/images/default_head.png' }, token: '', diff --git a/mini/pages/index/index.js b/mini/pages/index/index.js index 39152f9..69ff653 100644 --- a/mini/pages/index/index.js +++ b/mini/pages/index/index.js @@ -16,8 +16,8 @@ Page({ }, onShareAppMessage: function () { return { - title: 'XiaoTShop', - desc: 'XiaoT科技商城', + title: 'MiniShop', + desc: 'MiniShop', path: '/pages/index/index' } },