From c283c7ed58771fa59721c285b00a4cd2fdd667da Mon Sep 17 00:00:00 2001
From: Sylor-huang <sylor_huang@126.com>
Date: Mon, 30 Nov 2020 19:36:30 +0800
Subject: [PATCH] add: dun_check text and image

---
 app/models/concerns/dun_check_able.rb       | 19 +++++----
 app/models/concerns/dun_check_image_able.rb | 43 ++++++++++-----------
 2 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/app/models/concerns/dun_check_able.rb b/app/models/concerns/dun_check_able.rb
index 615cf6be..c0d95eb4 100644
--- a/app/models/concerns/dun_check_able.rb
+++ b/app/models/concerns/dun_check_able.rb
@@ -6,16 +6,15 @@ module DunCheckAble
   end
 
   def check_text_able
-    return true
-    # dun_check_params = get_model    
-    # if dun_check_params[:is_change]
-    #   dun_check_params.delete(:is_change)
-    #   check_result = DunCheck::TextCheck.new(dun_check_params).call
-    #   if check_result[:status].to_i == -1
-    #     errors.add(:base, "内容含有：#{check_result[:extra_params][:infos]}，请修改")
-    #     # raise ActiveRecord::RecordInvalid.new(self)
-    #   end
-    # end
+    dun_check_params = get_model    
+    if dun_check_params[:is_change]
+      dun_check_params.delete(:is_change)
+      check_result = DunCheck::TextCheck.new(dun_check_params).call
+      if check_result[:status].to_i == -1
+        errors.add(:base, "内容含有：#{check_result[:extra_params][:infos]}，请修改")
+        # raise ActiveRecord::RecordInvalid.new(self)
+      end
+    end
   end
 
   def get_model
diff --git a/app/models/concerns/dun_check_image_able.rb b/app/models/concerns/dun_check_image_able.rb
index edca66ba..471d3b33 100644
--- a/app/models/concerns/dun_check_image_able.rb
+++ b/app/models/concerns/dun_check_image_able.rb
@@ -3,29 +3,28 @@ module DunCheckImageAble
 
   included do
     def self.check_image_able(file)
-      return {status: 1}
-      # original_filename = file.original_filename
-      # file_extention = original_filename.split(".").last
-      # check_include = %w(jpg png bmp gif webp tiff jpeg)
+      original_filename = file.original_filename
+      file_extention = original_filename.split(".").last
+      check_include = %w(jpg png bmp gif webp tiff jpeg)
       
-      # if file_extention && check_include.include?(file_extention)
-      #   base64_file = Base64.encode64(file.open.read.force_encoding(Encoding::UTF_8))
-      #   check_params = [
-      #     {
-      #       name: original_filename,
-      #       type: 2,
-      #       data: base64_file,
-      #     }
-      #   ]
-      #   check_result = DunCheck::ImageCheck.new(check_params).call
-      #   if check_result[:status].to_i == -1
-      #     return {status: -1, message: check_result[:message]}
-      #   else
-      #     return {status: 1}
-      #   end
-      # else
-      #   return {status: 1}
-      # end
+      if file_extention && check_include.include?(file_extention)
+        base64_file = Base64.encode64(file.open.read.force_encoding(Encoding::UTF_8))
+        check_params = [
+          {
+            name: original_filename,
+            type: 2,
+            data: base64_file,
+          }
+        ]
+        check_result = DunCheck::ImageCheck.new(check_params).call
+        if check_result[:status].to_i == -1
+          return {status: -1, message: check_result[:message]}
+        else
+          return {status: 1}
+        end
+      else
+        return {status: 1}
+      end
     end
   end