Merge branch 'develop' of http://git.caihongxingqiu.net/rainbow/config-manage into develop

app/Http/Controllers/ConfigController.php

@@ -45,6 +45,7 @@ class ConfigController extends Controller
                 //对应模板
                 'apply_type' => [
                     '1' => '菜市场',
+                    '2' => '兑换商城',
                     '0' => '团购',
                 ],
                 //版块类型:
@@ -52,12 +53,15 @@ class ConfigController extends Controller
                     '1' => '专题广告',
                     '2' => '商品楼层',
                     '3' => '分类专题(菜市场)',
+                    '4' => '左一右二',
+                    '5' => '上一下三',
                     '0' => 'banner',
                 ],
                 //商品展示方式
                 'show_type' => [
                     '1' => '通栏大图',
                     '2' => '左右滑动',
+                    '3' => '左右两列',
                     '0' => '左图右字',
                 ],
                 //接货方式：
@@ -75,8 +79,10 @@ class ConfigController extends Controller
                 //链接方式
                 'link_type' => [
                     '1' => '专题',
-                    '0' => '仅展示',
                     '2' => '链接',
+                    '3' => '活动',
+                    '4' => '商品',
+                    '0' => '仅展示'
                 ],
                 //社区-banner类型
                 'type' => [
@@ -102,6 +108,11 @@ class ConfigController extends Controller
                     'star' => '星球活动消息',
                     'system' => '系统通知消息'
                 ],
+                //对应商城
+                'used_mall' =>[
+                    '1' => '电商商城',
+                    '0' => '兑换商城'
+                ],
                 //展示类型
                 'message_show_type' =>[
                     'only_show' => '纯展示',

app/Http/Controllers/UploadController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers;
 
+use Acekyd\LaravelMP3\LaravelMP3;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
@@ -58,6 +59,8 @@ class UploadController extends Controller
                 $height = Image::make($filePath)->height();
                 //要保存的文件名 时间+扩展名
                 $filename = time() . '_' . uniqid() . '*' . $width . '_' . $height . '.' . $kuoname;
+                //todo 等待客户端更新后替换为下列规则
+                //$filename = time() . '_' . uniqid() . '.' . $kuoname . '?' . $width . '_' . $height;
             } else {
                 //要保存的文件名 时间+扩展名
                 $filename = time() . '_' . uniqid() . '.' . $kuoname;
@@ -78,4 +81,33 @@ class UploadController extends Controller
         }
 
     }
+
+    public function uploadMp3(Request $request)
+    {
+        if ($request->hasFile('mp3') && $request->file('mp3')->isValid()) {
+            $path = 'music' . '/';
+            //获取文件的扩展名
+            $kuoname = $request->file('mp3')->getClientOriginalExtension();
+
+            //获取文件的绝对路径，但是获取到的在本地不能打开
+            $filePath = $request->file('mp3')->getRealPath();
+            //计算音乐时长
+            $laravel_mp3 = new LaravelMP3();
+            $details = $laravel_mp3->getDuration($filePath);
+            Log::debug('文件类型'.$kuoname);
+            //要保存的文件名 时间+扩展名
+            $filename = time() . '_' . uniqid() . '*' . $kuoname;
+
+            $mp3Url = Storage::put($path . $filename, file_get_contents($filePath));
+            Log::debug('upload_url:' . $mp3Url);
+            if ($mp3Url) {
+                $data = ['url' => config('customer.chxq_oss_url') . $path . $filename,'music_duration' => $details];
+                return $data;
+            } else {
+                return 'mp3上传失败,请重试';
+            }
+        } else {
+            return '仅支持mp3上传,请重试';
+        }
+    }
 }

app/Http/Controllers/V2/StarNewsController.php

@@ -35,7 +35,7 @@ class StarNewsController extends BaseController
         $data['extra'] = [
             'filters' => [
                 'id',
-                'sort',
+                'title',
                 'status'
             ],
             'columns' => [

app/Repositories/BannerRepository.php

@@ -54,6 +54,11 @@ class BannerRepository
             if (!is_int($request['link_content_id'])){
                 throw new HttpException(500, '链接内容必须是数字');
             }
+            $strlen = mb_strlen($request['name'], "utf-8");
+            if ($strlen > 20) {
+                throw new HttpException(500, '名称不能超过20字');
+            }
+
             $banner = [
                 'name' => $request['name'],
                 'link_content_id' => $request['link_content_id'],
@@ -107,6 +112,11 @@ class BannerRepository
             if (!is_int($request['link_content_id'])){
                 throw new HttpException(500, '链接内容必须是数字');
             }
+            $strlen = mb_strlen($request['name'], "utf-8");
+            if ($strlen > 20) {
+                throw new HttpException(500, '名称不能超过20字');
+            }
+
             $banner->name = $request['name'];
             $banner->link_content_id = $request['link_content_id'];
             $banner->image = $request['image'];

app/Transformers/MessageRuleDetailTransformer.php

@@ -33,6 +33,7 @@ class MessageRuleDetailTransformer extends TransformerAbstract
             'message_status' => $messageStatus,
             'message_show_type' => $messageRule['message_show_type'],
             'activity_time' => $messageRule['activity_time'],
+            'activity_url' => $messageRule['activity_url'],
         ];
     }
 }

bootstrap/app.php

@@ -86,6 +86,7 @@ $app->register(Dingo\Api\Provider\LumenServiceProvider::class);
 $app->register(Tymon\JWTAuth\Providers\LumenServiceProvider::class);
 $app->register(\Junliuxian\AliOSS\AliOssServiceProvider::class);
 $app->register(\Intervention\Image\ImageServiceProvider::class);
+$app->register(Acekyd\LaravelMP3\LaravelMP3ServiceProvider::class);
 
 /*
 |--------------------------------------------------------------------------

composer.json

@@ -6,18 +6,19 @@
     "type": "project",
     "require": {
         "php": ">=7.1.3",
+        "acekyd/laravelmp3": "^1.0",
         "dingo/api": "^2.2",
         "doctrine/dbal": "^2.9",
+        "guzzlehttp/guzzle": "^6.3",
         "hhxsv5/laravel-s": "~3.4.0",
+        "intervention/image": "^2.4",
         "jeroendesloovere/distance": "1.0.2.1",
         "junliuxian/ali-oss-storage": "~2.0",
-        "intervention/image": "^2.4",
         "laravel/lumen-framework": "5.8.*",
-        "tymon/jwt-auth": "1.0.0-rc.4.1",
         "multilinguals/apollo-client": "^0.1.2",
-        "vlucas/phpdotenv": "^3.3",
         "php-amqplib/php-amqplib": "^2.9",
-        "guzzlehttp/guzzle": "^6.3"
+        "tymon/jwt-auth": "1.0.0-rc.4.1",
+        "vlucas/phpdotenv": "^3.3"
     },
     "require-dev": {
         "fzaninotto/faker": "^1.4",

public/config.json

@@ -10,18 +10,18 @@
     "imageInsertAlign": "none", /* 插入的图片浮动方式 */
     "imageUrlPrefix": "", /* 图片访问路径前缀 */
     "imagePathFormat": "/ueditor/php/upload/image/{yyyy}{mm}{dd}/{time}{rand:6}", /* 上传保存路径,可以自定义保存路径和文件名格式 */
-                                /* {filename} 会替换成原文件名,配置这项需要注意中文乱码问题 */
-                                /* {rand:6} 会替换成随机数,后面的数字是随机数的位数 */
-                                /* {time} 会替换成时间戳 */
-                                /* {yyyy} 会替换成四位年份 */
-                                /* {yy} 会替换成两位年份 */
-                                /* {mm} 会替换成两位月份 */
-                                /* {dd} 会替换成两位日期 */
-                                /* {hh} 会替换成两位小时 */
-                                /* {ii} 会替换成两位分钟 */
-                                /* {ss} 会替换成两位秒 */
-                                /* 非法字符 \ : * ? " < > | */
-                                /* 具请体看线上文档: fex.baidu.com/ueditor/#use-format_upload_filename */
+    /* {filename} 会替换成原文件名,配置这项需要注意中文乱码问题 */
+    /* {rand:6} 会替换成随机数,后面的数字是随机数的位数 */
+    /* {time} 会替换成时间戳 */
+    /* {yyyy} 会替换成四位年份 */
+    /* {yy} 会替换成两位年份 */
+    /* {mm} 会替换成两位月份 */
+    /* {dd} 会替换成两位日期 */
+    /* {hh} 会替换成两位小时 */
+    /* {ii} 会替换成两位分钟 */
+    /* {ss} 会替换成两位秒 */
+    /* 非法字符 \ : * ? " < > | */
+    /* 具请体看线上文档: fex.baidu.com/ueditor/#use-format_upload_filename */
 
     /* 涂鸦图片上传配置项 */
     "scrawlActionName": "uploadscrawl", /* 执行上传涂鸦的action名称 */

routes/api.php

@@ -26,6 +26,7 @@ $api->version('v1', [
         //上传
         $api->post('upload', 'UploadController@uploadImage');
         $api->post('multi_upload', 'UploadController@uploadImages');
+        $api->post('upload/mp3', 'UploadController@uploadMp3');
 
         //自提点列表
         $api->get('/pickupNode/index', 'ConfigPickupNodeController@index');