wechat_payment 2.1.0 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c976e72ae7aec4d893bb8682f324f69759ee2c42a62efa19d7363931798c21bb
-  data.tar.gz: 1069c1c332dc0253a3e57b9c3301ff293e6accbdb279791892623d09db23d361
+  metadata.gz: 553d692e4ca6343ab5659e22bf5cf76c734dc1d4109cae1ceeb5426b4f1bff9a
+  data.tar.gz: dc9290c8e36be4e101600126b8080676fc86a5145582e7272081819c826bc5dd
 SHA512:
-  metadata.gz: '09eb12bc79a0dbd83e6dba6c3f2d67becd956b28665013e77ca30bfddd3ec51be79b6473b287096b7c1fe055014e532b8fb3133af146575c06190f56dbacfdcd'
-  data.tar.gz: 12228e2ea147aca00e1ee29e25c6d30956e4519fd98645cbec05f1de6e3057ae0d8a77ccac6eac6cae9ebb50f14bd88334f50a1e2ae43e2be6f4da3865d09612
+  metadata.gz: 874bce827cb9a321d398ae57cfb3a073c5a6368bccdcc44e0092c8a972cbf14bb248aa183ae560cf2b4532a2178d67f460d51400a4e04ebcf02a04cf57316cbd
+  data.tar.gz: 6bfd37db07f20ca87bfb210249e36170e4cad6fef2904106d46034e6c539b1cfae3a6e891f4cabb1276aaa5f2976592969b79667dbc94584aeab6d543f5a9f62

data/lib/wechat_payment/client.rb

@@ -21,11 +21,13 @@ module WechatPayment
 
       if order_result.success?
         message = "发起支付成功"
-        WechatPayment::PaymentLogger.info { "{ msg: '#{message}', params: #{order_params}, result: #{order_result} }" }
+        log_content = { message:, params: order_params, result: order_result }.to_json
+        WechatPayment::PaymentLogger.info { log_content }
         WechatPayment::SuccessResult.new(data: order_result, message:, message_kind: :payment_apply_success)
       else
         message = "发起支付失败"
-        WechatPayment::PaymentLogger.error { "{ msg: '#{message}', params: #{order_params}, result: #{order_result} }" }
+        log_content = { message: , params: order_params, result: order_result }.to_json
+        WechatPayment::PaymentLogger.error { log_content }
         WechatPayment::FailureResult.new(error: order_result, message:, message_kind: :payment_apply_failed)
       end
     end
@@ -46,11 +48,13 @@ module WechatPayment
 
       if refund_result.success?
         message = '发起退款成功'
-        WechatPayment::RefundLogger.info { "{ msg: '#{message}', params: #{refund_params}, result: #{refund_result}" }
+        log_content = { message:, params: refund_params, result: refund_result}.to_json
+        WechatPayment::RefundLogger.info { log_content }
         WechatPayment::SuccessResult.new(data: refund_result, message:, message_kind: :refund_apply_success)
       else
         message = "发起退款失败"
-        WechatPayment::RefundLogger.error { "{ msg: '#{message}', params: #{refund_params}, result: #{refund_result}" }
+        log_content = { message:, params: refund_params, result: refund_result }.to_json
+        WechatPayment::RefundLogger.error { log_content }
         WechatPayment::FailureResult.new(error: refund_result, message:, message_kind: :refund_apply_failed)
       end
     end
@@ -64,18 +68,20 @@ module WechatPayment
     def self.handle_payment_notify(notify_data)
       if !WechatPayment::Sign.verify?(notify_data)
         message = "回调签名验证失败"
-        WechatPayment::PaymentLogger.error { "{ msg: '#{message}', error: #{notify_data} }" }
+        WechatPayment::PaymentLogger.error { { message: , error: notify_data }.to_json }
         WechatPayment::FailureResult.new(error: notify_data, message:, message_kind: :validate_sign_failed)
       end
 
       result = WechatPayment::InvokeResult.new(notify_data)
       if result.success?
         message = "支付执行成功"
-        WechatPayment::PaymentLogger.info { "{ msg: '#{message}', callback: #{notify_data} }" }
+        log_content = { message:, callback: notify_data }.to_json
+        WechatPayment::PaymentLogger.info { log_content }
         WechatPayment::SuccessResult.new(data: notify_data, message:, message_kind: :payment_exec_success)
       else
         message = "支付执行失败"
-        WechatPayment::PaymentLogger.error{ "{ msg: '#{message}', callback: #{notify_data} }" }
+        log_content = { message:, callback: notify_data }.to_json
+        WechatPayment::PaymentLogger.error { log_content }
         WechatPayment::FailureResult.new(error: notify_data, message:, message_kind: :payment_exec_failed)
       end
     end
@@ -87,11 +93,13 @@ module WechatPayment
       result = WechatPayment::InvokeResult.new(notify_data)
       if result.success?
         message = "退款执行成功"
-        WechatPayment::RefundLogger.info { "{ msg: '#{message}', callback: #{notify_data} }" }
+        log_content = { message:, callback: notify_data }.to_json
+        WechatPayment::RefundLogger.info { log_content }
         WechatPayment::SuccessResult.new(data: notify_data, message:, message_kind: :refund_exec_success)
       else
         message = "退款执行失败"
-        WechatPayment::RefundLogger.error { "{ msg: '#{message}', callback: #{notify_data} }" }
+        log_content = { message:, callback: notify_data}.to_json
+        WechatPayment::RefundLogger.error { log_content }
         WechatPayment::FailureResult.new(error: notify_data, message:, message_kind: :refund_exec_failed)
       end
     end

data/lib/wechat_payment/concern/goods.rb

@@ -42,7 +42,13 @@ module WechatPayment
         )
 
         unless user_goods.save
-          return WechatPayment::FailureResult.new(error: user_goods.error,
+          log_content = {
+            message: "商品中间表 #{user_goods_model.table_name} 插入数据失败",
+            error: user_goods.errors.full_messages
+          }.to_json
+
+          WechatPayment::Logger.info { log_content }
+          return WechatPayment::FailureResult.new(error: user_goods.errors.full_messages,
                                                   message: "商品中间表 #{user_goods_model.table_name} 插入数据失败",
                                                   message_kind: :create_user_goods_failed)
         end
@@ -59,7 +65,9 @@ module WechatPayment
           WechatPayment::SuccessResult.new(data: payment_order, message:, message_kind: :create_payment_order_success)
         else
           message = "支付订单创建失败"
-          WechatPayment::FailureResult.new(error: user_goods.error, message:, message_kind: :create_payment_order_failed)
+          log_content = { message:, error: payment_order.errors.full_messages }.to_json
+          WechatPayment::Logger.error { log_content }
+          WechatPayment::FailureResult.new(error: user_goods.errors.full_messages, message:, message_kind: :create_payment_order_failed)
         end
       end
 

data/lib/wechat_payment/logger.rb

@@ -1,5 +1,9 @@
 
 class WechatPayment::Logger
+  def self.tags
+    ["WechatPayment"]
+  end
+
   %w{ info error warn fatal }.each do |level|
     define_singleton_method level do |content = "", &block|
       Rails.logger.tagged *self.tags do

data/lib/wechat_payment/service_result.rb

@@ -15,7 +15,7 @@ module WechatPayment
                    message_type: nil)
 
       self.success = success
-      self.data = data
+      self.data = (data || {}).with_indifferent_access
       self.error = error
       self.message = message
       self.message_type = message_type

data/lib/wechat_payment/version.rb

@@ -1,3 +1,3 @@
 module WechatPayment
-  VERSION = '2.1.0'
+  VERSION = '2.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wechat_payment
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.3
 platform: ruby
 authors:
 - ian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-16 00:00:00.000000000 Z
+date: 2022-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -98,7 +98,6 @@ files:
 - lib/wechat_payment/logger.rb
 - lib/wechat_payment/missing_key_error.rb
 - lib/wechat_payment/payment_logger.rb
-- lib/wechat_payment/r_logger.rb
 - lib/wechat_payment/refund_logger.rb
 - lib/wechat_payment/service_result.rb
 - lib/wechat_payment/sign.rb
@@ -126,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.13
 signing_key:
 specification_version: 4
 summary: Summary of WechatPayment.

data/lib/wechat_payment/r_logger.rb

@@ -1,36 +0,0 @@
-module WechatPayment
-  class RLogger
-    def initialize
-      raise Exceptions::InitializeDenied.new("please use 'ILogger.make' instead of 'ILogger.new'")
-    end
-
-    class << self
-      def make(log_file)
-        @logger ||= {}
-
-        log_file_name = if log_file.class.in? [String, Symbol]
-                          log_file_name = log_file.to_sym
-
-                          unless log_file_name.to_s.end_with? ".log"
-                            log_file_name = "#{log_file_name}.log"
-                          end
-
-                          "#{root_path}/#{log_file_name}"
-                        elsif log_file.respond_to? :to_path
-                          log_file.to_path
-                        else
-                          raise Exceptions::UnsupportdParamType.new("log file parameter only support 'File' or 'String' Type.")
-                        end
-
-        # 如果已经存在日志对象，则返回已有的日志对象
-        @logger[log_file_name] ||= ::Logger.new(log_file_name)
-      end
-
-      def root_path
-        @root ||= "#{Rails.root}/log"
-      end
-    end
-
-
-  end
-end