jieshun-parking 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cf30541d80208f34adca825b070430ab9c403a660ab8396041f3d03d6a9d297
-  data.tar.gz: 40f8577ec4775ac3bcd9377cf0efc3d7b9c1f9a2115549f55121c4acaa1e7ed9
+  metadata.gz: c033ed285f339fd38e1dd803c8c2c61c32d10336043d24f5d4128435f4161cfb
+  data.tar.gz: 07b4e10db0470a94edfec44d6d7b97be9ba4c266deadaeee3fe3817dc60490d7
 SHA512:
-  metadata.gz: 6d1b0b285e0dadaacbffdf3920abdc1044450716e89202ec4aa945697b90f445efd528f2576a3b1b30176f9864e707889549931ecd1bf0cad28aeafca8f6d0ef
-  data.tar.gz: e4e4c0aa60c3200aa0abaa1850354504aa8ac1b057a53d8a8755011230744d37848f5e019283f0a25562e4a1a872640c7364de02061615757b0dd9ed069d3b4c
+  metadata.gz: f6ef6744eb3bda44d4cc6c022002752c439a8af45ba5f392d75a85a14f3be63009eb5e5ba08090758d854c8d35c5f84d003f5b119fcd3634eb1e88ef4a0333fe
+  data.tar.gz: 5e9ea829f022a2fe9d3df947e6c105b36592284a2bb2d7dbdbfcab81752413dbe7da40abc3b704aee3cb912cf078925c28fcca96bc3e44f8fa2d231883b33b19

data/lib/jieshun/parking/client.rb

@@ -1,38 +1,114 @@
+require_relative "./redis/redis_client"
+require "json"
+require 'digest'
+
 module Jieshun
   module Parking
 
     class Client
 
+      REDIS_AUTH_KEY = 'jieshun.parking.auth.token'
+      @@max_notify_try_times = 10
+
       def initialize(configuration, http_client = StandardHttpClient.new)
         @configuration = configuration
         @http_client = http_client
+        @redis_client = RedisClient.new(@configuration.redis_config)
+      end
+
+
+      def get_auth_token
+        @redis_client.redis_get(REDIS_AUTH_KEY)
+      end
+
+      def login_if_required
+        auth_token = get_auth_token
+        if Jieshun::Parking.always_login || auth_token.nil? || auth_token.empty?
+          hash = { cid: @configuration.cid, usr: @configuration.usr, psw: @configuration.psw }
+          @http_client.post_form("#{@configuration.server_url}/jsaims/login", {}, hash) do |result|
+            auth_token = result.body['token']
+            @redis_client.redis_set(REDIS_AUTH_KEY, auth_token, 2 * 60 * 60 - 60) # token will be expired after 2 hours
+            yield(auth_token)
+          end
+        else
+          yield(auth_token)
+        end
       end
 
-      def create_payment_order(park_code, car_no)
-        headers = { }
-        hash = {
-          serviceId: '3c.pay.createorderbycarno',
-          requestType: 'DATA',
-          attributes: {
-            businesserCode: @configuration.businesser_code,
-            parkCode: park_code,
-            orderType: 'VNP',
-            carNo: car_no
+      def create_order_by_car_no(park_code, car_no)
+        payload = {
+          "serviceId": "3c.pay.createorderbycarno",
+          "requestType": "DATA",
+          "attributes": {
+            "businesserCode": @configuration.businesser_code,
+            "parkCode": park_code,
+            "orderType": "VNP",
+            "carNo": car_no
           }
-        }
-        @http_client.post_json(@configuration.server_url, headers, hash) do |result|
-          unless result.successful
-            message = "Error result : #{result.inspect}"
-            Jieshun::Parking.logger.error(message)
-            raise RuntimeError.new(message)
+        }.to_json
+        unify_call(payload) do |result|
+          # ０：正常，正常订单
+          # １：安装验证失败，前端设备异常
+          # ２：未入场
+          # ５：非临时卡
+          # ６：未设置收费标准，前端停车场异常
+          # ９：已缴费，超时滞留时间内
+          # １０：正常免费时间段内
+          # １１：打折免费时间段内
+          # １２：打折全免时间段内
+          # １３：打折减免时间段内
+          # ２０：超时收费不能使用卡券
+          # 3 1：已入场无需缴费
+          # ９９９９：其它未知错误
+          attributes = result.body['dataItems'].first['attributes']
+          retcode = attributes['retcode']
+          retmsg = attributes['retmsg']
+          raise RuntimeError.new(retmsg) if retcode != '0'
+          yield(result)
+        end
+      end
+
+      def unify_call(payload)
+        login_if_required do |auth_token|
+          sn = generate_signature("#{payload}#{@configuration.sign_key}")
+
+          hash = {
+            cid: @configuration.cid,
+            tn: auth_token,
+            v: 2,
+            sn: sn,
+            p: payload
+          }
+
+          @http_client.post_form("#{@configuration.server_url}/jsaims/as", { }, hash) do |result|
+            yield(result)
           end
-          result_code = result.body[:resultCode]
-          if result_code != 0
-            message = "Error resultCode #{result_code}, body: #{result[:body]}"
-            Jieshun::Parking.logger.error(message)
-            raise RuntimeError.new(message)
+
+        end
+      end
+
+      def generate_signature(payload)
+        md5_string = Digest::MD5.hexdigest(payload)
+        md5_string.upcase
+      end
+
+      def notify_order_result(order_no, pay_type, pay_time, transaction_id)
+        Retry.with_retries(max_tries: 10, sleep_seconds: 1, business_info: { order_no: order_no }) do
+          payload = {
+            "serviceId": "3c.pay.notifyorderresult",
+            "requestType":"DATA",
+            "attributes":{
+              "orderNo": order_no,
+              "tradeStatus": 0,
+              "isCallBack": 0,
+              "payType": pay_type,
+              "payTime": pay_time.strftime('%Y-%m-%d %H:%M:%S'),
+              "transactionId": transaction_id
+            }
+          }.to_json
+          unify_call(payload) do |result|
+            yield(result)
           end
-          yield(result)
         end
       end
 

data/lib/jieshun/parking/configuration.rb

@@ -3,11 +3,16 @@ module Jieshun
 
     class Configuration
       
-      attr_reader :server_url, :businesser_code
+      attr_reader :server_url, :businesser_code, :cid, :usr, :psw, :sign_key, :redis_config
 
-      def initialize(server_url, businesser_code)
+      def initialize(server_url, businesser_code, cid, usr, psw, sign_key, redis_config)
         @server_url = server_url
         @businesser_code = businesser_code
+        @cid = cid
+        @usr = usr
+        @psw = psw
+        @sign_key = sign_key
+        @redis_config = redis_config
       end
       
     end

data/lib/jieshun/parking/helpers/retry.rb

@@ -0,0 +1,29 @@
+class Retry
+
+  def self.with_retries(options)
+    sleep_seconds = options[:sleep_seconds]
+    sleep_seconds ||= 1
+    max_tries = options[:max_tries]
+    max_tries ||= 10
+    tried_times = 0
+    begin
+      yield
+    rescue Exception => e
+      if Jieshun::Parking.logger
+        Jieshun::Parking.logger.error("Failed to execute operation, business_info: #{options[:business_info]}, error: #{e}")
+      end
+      if tried_times < max_tries
+        sleep(sleep_seconds)
+        tried_times = tried_times + 1
+        if Jieshun::Parking.logger
+          Jieshun::Parking.logger.info("Retrying operation, business_info: #{options[:business_info]}, tried_times: #{tried_times}")
+        end
+        retry
+      else
+        Jieshun::Parking.logger.error("Retried #{tried_times} times, aborted.")
+      end
+    end
+  end
+
+
+end

data/lib/jieshun/parking/http/http_client.rb

@@ -4,6 +4,10 @@ module Jieshun
 
     class HttpClient
 
+      def post_form(server_url, headers, hash)
+        raise NotImplementedError.new("You must implement this method.")
+      end
+
       def post_json(server_url, headers, hash)
         raise NotImplementedError.new("You must implement this method.")
       end

data/lib/jieshun/parking/http/standard_http_client.rb

@@ -7,23 +7,42 @@ module Jieshun
       require 'uri'
       require 'json'
 
+      def post_form(server_url, headers, hash)
+        post(server_url, 'application/x-www-form-urlencoded', headers, hash) do |result|
+          yield(result)
+        end
+      end
+
       def post_json(server_url, headers, hash)
+        post(server_url, 'application/json', headers, hash) do |result|
+          yield(result)
+        end
+      end
+
+      def post(server_url, content_type, headers, hash)
         uri = URI.parse(server_url)
         req = Net::HTTP::Post.new(uri)
         headers.each { |k, v| req[k] = v }
-        req["Content-Type"] = "application/json"
+        req["Content-Type"] = content_type
         Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https') do |http|
           if Jieshun::Parking.debug_mode && Jieshun::Parking.logger
-            Jieshun::Parking.logger.debug("Jieshun Parking Request #{hash}")
+            Jieshun::Parking.logger.debug("Jieshun Parking Request, url: #{server_url}, body: #{JSON.pretty_generate(hash)}")
           end
-          req.body = hash.to_json
+          if content_type == 'application/json'
+            req.body = hash.to_json
+          elsif content_type == 'application/x-www-form-urlencoded'
+            req.set_form_data(hash)
+          else
+            raise RuntimeError.new("Unsupported content type #{content_type}")
+          end
+
           res = http.request(req)
           if Jieshun::Parking.debug_mode && Jieshun::Parking.logger
-            Jieshun::Parking.logger.debug("Jieshun Parking Response #{res}")
+            Jieshun::Parking.logger.debug("Jieshun Parking Response #{JSON.pretty_generate(JSON.parse(res.body))}")
           end
           successful = res.kind_of?(Net::HTTPSuccess)
           json = JSON.parse(res.body)
-          result = Jieshun::Parking::Result.new(successful, ActiveSupport::HashWithIndifferentAccess.new(json.to_hash))
+          result = Jieshun::Parking::Result.new(successful, json.to_hash)
           yield result
         end
       end

data/lib/jieshun/parking/redis/redis_client.rb

@@ -0,0 +1,40 @@
+require "redis"
+
+module Jieshun
+  module Parking
+    class RedisClient
+
+      def initialize(redis_config)
+        unless $redis
+          $redis = Redis.new(redis_config)
+        end
+        $redis
+      end
+
+      def redis_client
+        $redis
+      end
+
+      def redis_set(key, value, expire_time = 60)
+        # Rails.logger.debug "redis_client #{redis_client}"
+        redis_client.set key, value
+        if expire_time > 0
+          redis_client.expire key, expire_time
+        end
+      end
+
+      def redis_get(key)
+        redis_client.get key
+      end
+
+      def redis_del(key)
+        redis_client.del key
+      end
+
+      def redis_ttl(key)
+        redis_client.ttl key
+      end
+
+    end
+  end
+end

data/lib/jieshun/parking/version.rb

@@ -2,6 +2,6 @@
 
 module Jieshun
   module Parking
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/lib/jieshun/parking.rb

@@ -6,6 +6,8 @@ require_relative "parking/client"
 require_relative "parking/result"
 require_relative "parking/http/http_client"
 require_relative "parking/http/standard_http_client"
+require_relative "parking/redis/redis_client"
+require_relative "parking/helpers/retry"
 require 'logger'
 
 
@@ -13,8 +15,9 @@ module Jieshun
   module Parking
     @logger = Logger.new(STDOUT)
     @debug_mode = true
+    @always_login = false
     class<< self
-      attr_accessor :logger, :debug_mode
+      attr_accessor :logger, :debug_mode, :always_login
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jieshun-parking
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
-- JamesWang
+- LCola
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-09 00:00:00.000000000 Z
+date: 2023-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 description: 捷顺停车场 API, 非官方, Provided by 小可乐科技
 email:
 - james.wang.z81@gmail.com
@@ -36,8 +50,10 @@ files:
 - lib/jieshun/parking.rb
 - lib/jieshun/parking/client.rb
 - lib/jieshun/parking/configuration.rb
+- lib/jieshun/parking/helpers/retry.rb
 - lib/jieshun/parking/http/http_client.rb
 - lib/jieshun/parking/http/standard_http_client.rb
+- lib/jieshun/parking/redis/redis_client.rb
 - lib/jieshun/parking/result.rb
 - lib/jieshun/parking/version.rb
 homepage: http://rubygems.org/gems/jieshun-parking