mini_program 1.2.4 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfba91664e79dd0e121021812a5bc5bbca9011ba21ea74955b6b15dd54f86562
-  data.tar.gz: 908efc23be5f5b65f48a4cbad44e1cc70b0c6ff9c6f8bd851d5498d52523fe8a
+  metadata.gz: 1b1e4460a9570de402edbdd27100de5f8a8b0ff0c8504d0e7d60e8793e2c2812
+  data.tar.gz: ca92b1aa3fb0c4300a9eda802716d9344367c8e10397c230bf089ca402915b02
 SHA512:
-  metadata.gz: 9c3c3406c1f4d9ea80e527a981b51a804488baccefec0620672ce53828fe8ca653c2f0db03811fd1605028c280b6afd8d645e542250bee6cfaccf3db6dcaea30
-  data.tar.gz: b728b6b149c4ae436b8eafe9167e6fdf0d5a8e6e15c7e7888ee3df2d4c459de7cb12d747a75c313ff8a5af111008815abe73b79cc790ba2cf637a66d10bdbcba
+  metadata.gz: c8e4983df571af674fa5359d976a735494fcb03bd797a6705a304a042d2eb0928b4857fcfbdaa745059b9e56328886b44a6ae98ade0907eac0ccead6e03540cd
+  data.tar.gz: dc368f66b72e0013b52b116dc61e6b3ef3f960e9a5cc52eacfd13bdf5150e6dedaf8de0a04fd945771b6db9715545bb285eb0f0c25afc01b3f0181539b517584

data/README.md

@@ -48,7 +48,7 @@ code = "041PuvGa1rysrB0noDJa1n7RBv2PuvGe"
 encrypted_data = "3G/+Fh6kCBaQszXFTxz3h3HFSbu0UuVW/4aLbz8WGzrKfmbGpvnxYHAa4QrKXJvHpB++3ogOYoU6iiG+1HW18Lkt9qEJE9GyRw5OnuXSjTnUIPSRROT3sxeAYnT1kf4ngTAfrD3f4TFtLXkRIrrc1MzSqx/LV8iXA8Lu5Y+7kZx26eulz3yVrlXDH3BOIX6zcGOeprsK5XzDx2ltmf3j5w=="
 iv = "5tiyfVEHNVgHN4n8lzDrUA=="
 
-result = mp.get_phone_num(code: code, encrypted_data: encrypted_data, iv: iv)
+result = mp.decrypt_phone_num(code: code, encrypted_data: encrypted_data, iv: iv)
 
 if result.success?
   phone_num = result.data[:phone] 

data/app/controllers/mini_program/wechat_controller.rb

@@ -27,7 +27,7 @@ module MiniProgram
     # POST /wechat/phone_num
     def phone_num
       client = MiniProgram::Client.new
-      result = client.get_phone_num(code: params[:code], encrypted_data: params[:encrypted_data], iv: params[:iv])
+      result = client.decrypt_phone_num(code: params[:code], encrypted_data: params[:encrypted_data], iv: params[:iv])
 
       if result.success?
         cookies.signed[:phone_num] = result.data[:phone_num]

data/lib/exceptions/initialize_denied.rb

@@ -0,0 +1,2 @@
+
+class InitializeDenied < StandardError; end

data/lib/exceptions/unsupported_param_type.rb

@@ -0,0 +1,2 @@
+
+class UnsupportedParamType < StandardError; end

data/lib/mini_program/client.rb

@@ -62,11 +62,13 @@ module MiniProgram
       result = JSON.parse(response)
 
       if result["errcode"] && result["errcode"].to_s != "0"
-        logger.error <<~ERROR
+        logger.tagged "request access token" do
+          logger.error <<~ERROR
           Get access token failed.
           api: #{api} 
           error: #{result}
-        ERROR
+          ERROR
+        end
 
         MiniProgram::ServiceResult.new(success: false,
                                        error: result,
@@ -97,6 +99,7 @@ module MiniProgram
       result = JSON.parse(response)
 
       if result["errcode"] && result["errcode"].to_s != "0"
+        logger.tagged "login mini program"
         logger.error <<~ERROR
           Get session key failed.
           api: #{api}
@@ -135,15 +138,23 @@ module MiniProgram
       result = post(api, payload)
 
       if result["errcode"].to_s != "0"
-        msg_logger.error { "{params: #{payload}, response: #{result}}" }
+        logger.tagged "Subscribe Message" do
+          logger.error { "{params: #{payload}, response: #{result}}" }
+        end
+
         MiniProgram::ServiceResult.new(success: false,
                                        error: result,
                                        message: "发送订阅消息失败",
                                        message_kind: :send_subscribed_message_failed)
       else
-        msg_logger.info { "{params: #{payload}, response: #{result}}" }
+        logger.tagged "Subscribe Message" do
+          logger.info { "{params: #{payload}, response: #{result}}" }
+        end
+
         MiniProgram::ServiceResult.new(success: true,
-                                       data: result,
+                                       data: {
+                                         msgid: result.data["msgid"]
+                                       },
                                        message: "发送订阅消息成功",
                                        message_kind: :send_subscribed_message_success)
       end
@@ -171,7 +182,10 @@ module MiniProgram
       })
 
       if result["errcode"].to_s != "0"
-        msg_logger.error { "{params: #{payload}, response: #{result}}" }
+        logger.tagged "uniform message" do
+          logger.error { "{params: #{payload}, response: #{result}}" }
+        end
+
         MiniProgram::ServiceResult.new(success: false,
                                        error: result["errmsg"],
                                        message: "发送统一服务消息失败",
@@ -187,7 +201,7 @@ module MiniProgram
     end
 
     # 获取用户手机号
-    def get_phone_num(code:, encrypted_data:, iv:)
+    def decrypt_phone_num(code:, encrypted_data:, iv:)
       login_result = login(code)
       return login_result if login_result.failure?
 
@@ -200,12 +214,19 @@ module MiniProgram
 
       MiniProgram::ServiceResult.new(
         success: true,
-        message: "获取手机号成功",
-        message_kind: :get_phone_number_success,
+        message: "解密手机号成功",
+        message_kind: :decrypt_phone_number_success,
         data: {
           openid: openid,
           phone_num: phone_num
         })
+    rescue OpenSSL::Cipher::CipherError, ArgumentError => e
+      MiniProgram::ServiceResult.new(
+        success: false,
+        message: "解密手机号失败",
+        message_kind: :decrypt_phone_data_failed,
+        error: e
+      )
     end
 
     def config
@@ -224,30 +245,24 @@ module MiniProgram
 
     #获取小程序二维码
     def qrcode_unlimited(scene:, page:, width: 280, check_path: true, env_version: "release")
-      get_token_result = get_access_token
-      if get_access_token.failure?
-        return get_token_result
+      get_token_result = get_access_token.on_failure do |result|
+        return result
       end
 
       api = "https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=#{get_token_result["access_token"]}"
 
-      params = {
-        scene:,
-        page:,
-        width:,
-        check_path:,
-        env_version:
-      }
+      params = { scene:, page:, width:, check_path:, env_version: }
 
       result = post(api, params)
 
       if result["errcode"]
-        msg_logger.error { "{params: #{params}, response: #{result}}" }
+        logger.error { "{ action: 'generate qrcode', params: #{params}, response: #{result}}" }
         MiniProgram::ServiceResult.new(success: false,
                                        error: result,
                                        message: "获取二维码失败",
                                        message_kind: :get_unlimited_qrcode_failed)
       else
+        logger.info { "{ action: 'generate qrcode',  params: #{params}, response: #{result} }" }
         MiniProgram::ServiceResult.new(success: true,
                                        data: { image: result },
                                        message: "获取二维码成功",

data/lib/mini_program/r_logger.rb

@@ -0,0 +1,34 @@
+module MiniProgram
+  class RLogger
+    def initialize
+      raise Exceptions::InitializeDenied.new("please use 'RLogger.make' instead of 'RLogger.new'")
+    end
+
+    class << self
+      def make(given_filename)
+        filename = log_filename(given_filename)
+
+        # 如果已经存在日志对象，则返回已有的日志对象
+        logger = Logger.new(filename)
+        ActiveSupport::TaggedLogging.new(logger)
+      end
+
+      def log_filename(given_filename)
+        return STDOUT if ENV["RAILS_LOG_TO_STDOUT"].present?
+
+        if given_filename.class.in? [String, Symbol]
+          unless given_filename.end_with? ".log"
+            given_filename = "#{given_filename}.log"
+          end
+
+          Rails.root.join("log/#{given_filename}")
+        elsif given_filename.respond_to? :to_path
+          given_filename.to_path
+        else
+          raise Exception::UnsupportedParamType.new("\"log filename parameter must be a String type or a Symbol\"")
+        end
+      end
+    end
+
+  end
+end

data/lib/mini_program/request_result.rb

@@ -0,0 +1,4 @@
+
+class MiniProgram::RequestResult
+
+end

data/lib/mini_program/version.rb

@@ -1,3 +1,3 @@
 module MiniProgram
-  VERSION = '1.2.4'
+  VERSION = '1.3.2'
 end

data/lib/mini_program.rb

@@ -4,8 +4,8 @@ require "mini_program/client"
 require "mini_program/msg"
 require "mini_program/user"
 require "application_controller_ext"
-require "r_logger"
-require "service_result"
+require "mini_program/r_logger"
+require "mini_program/service_result"
 require "mocha"
 
 module MiniProgram

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mini_program
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.3.2
 platform: ruby
 authors:
 - ian
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-14 00:00:00.000000000 Z
+date: 2022-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -63,6 +63,8 @@ files:
 - app/views/mini_program/wechat/login.html.erb
 - config/routes.rb
 - lib/application_controller_ext.rb
+- lib/exceptions/initialize_denied.rb
+- lib/exceptions/unsupported_param_type.rb
 - lib/generators/mini_program/install/USAGE
 - lib/generators/mini_program/install/install_generator.rb
 - lib/generators/mini_program/install/templates/initializer.rb
@@ -73,10 +75,11 @@ files:
 - lib/mini_program/client.rb
 - lib/mini_program/engine.rb
 - lib/mini_program/msg.rb
+- lib/mini_program/r_logger.rb
+- lib/mini_program/request_result.rb
+- lib/mini_program/service_result.rb
 - lib/mini_program/user.rb
 - lib/mini_program/version.rb
-- lib/r_logger.rb
-- lib/service_result.rb
 - lib/tasks/mini_program_tasks.rake
 homepage: https://github.com/bkyz/mini_program
 licenses:

data/lib/r_logger.rb

@@ -1,36 +0,0 @@
-module MiniProgram
-  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