From 5635e5af9ebdf80301c8d49ab1a10f620a4b7d63 Mon Sep 17 00:00:00 2001
From: p31729568 <winse.wang@foxmail.com>
Date: Mon, 12 Aug 2019 14:31:26 +0800
Subject: [PATCH] add cate id to aliyun vod config

---
 app/libs/aliyun_vod.rb                      | 2 +-
 app/libs/aliyun_vod/service/video_upload.rb | 4 ++++
 config/aliyun_vod.yml.example               | 1 +
 config/initializers/aliyun_vod_init.rb      | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/libs/aliyun_vod.rb b/app/libs/aliyun_vod.rb
index 9ce44a87f..0ce159fb6 100644
--- a/app/libs/aliyun_vod.rb
+++ b/app/libs/aliyun_vod.rb
@@ -1,5 +1,5 @@
 module AliyunVod
   class << self
-    attr_accessor :access_key_id, :access_key_secret, :base_url, :callback_url, :signature_key
+    attr_accessor :access_key_id, :access_key_secret, :base_url, :cate_id, :callback_url, :signature_key
   end
 end
\ No newline at end of file
diff --git a/app/libs/aliyun_vod/service/video_upload.rb b/app/libs/aliyun_vod/service/video_upload.rb
index a16c87c3f..97ecd970b 100644
--- a/app/libs/aliyun_vod/service/video_upload.rb
+++ b/app/libs/aliyun_vod/service/video_upload.rb
@@ -8,6 +8,10 @@ module AliyunVod::Service::VideoUpload
       FileName: filename
     }.merge(base_params)
 
+    # 分类
+    cate_id = AliyunVod.cate_id
+    params[:CateId] = cate_id if cate_id.present?
+
     params = opts.merge(params)
 
     result = request(:post, params)
diff --git a/config/aliyun_vod.yml.example b/config/aliyun_vod.yml.example
index ec858982b..aa6547a62 100644
--- a/config/aliyun_vod.yml.example
+++ b/config/aliyun_vod.yml.example
@@ -2,6 +2,7 @@ defaults: &defaults
   access_key_id: 'test'
   access_key_secret: 'test'
   base_url: 'http://vod.cn-shanghai.aliyuncs.com'
+  cate_id: '-1'
   callback_url: 'http://47.96.87.25:48080/api/callbacks/aliyun_vod.json'
   signature_key: 'test12345678'
 
diff --git a/config/initializers/aliyun_vod_init.rb b/config/initializers/aliyun_vod_init.rb
index 655ce3df6..d133fffbf 100644
--- a/config/initializers/aliyun_vod_init.rb
+++ b/config/initializers/aliyun_vod_init.rb
@@ -2,5 +2,6 @@ config = Rails.application.config_for(:aliyun_vod)
 AliyunVod.access_key_id     = config['access_key_id']
 AliyunVod.access_key_secret = config['access_key_secret']
 AliyunVod.base_url          = config['base_url'] || 'http://vod.cn-shanghai.aliyuncs.com'.freeze
+AliyunVod.cate_id           = config['cate_id']
 AliyunVod.callback_url      = config['callback_url']
 AliyunVod.signature_key     = config['signature_key']