cmcc_hxy 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fb88fb013d37aa1c68af48069e2ff7bb17524e87631d193b0b972de348156b3
-  data.tar.gz: 475e8a7cf30323319b15ccf2013ca3af53ef63f3e2904883f3ed9b9ebf342570
+  metadata.gz: 5bd2ac9ea657119d886c6603654661fb99c666ab06dac227bd3091b6560c11db
+  data.tar.gz: 38eebbbde7b839491f5cff2c5313254c96cef521d38ba62475c6aff0c6e33e96
 SHA512:
-  metadata.gz: 3e4d355eee59a81ac6d1cdc1d85f9582cfc8b2da67b7bfd72e292d03dfc1f59432f2a4adbd6812e13f6e80cfea86ac5e3d04d7910dd9d13fc52e1bb6ca6f7bab
-  data.tar.gz: 94befb5770ca74f4a67707e3fdaf02b7ab6bc561c99550649e21889611a4d9966fdb95048655ba6e3bde858e9eb110b18f8e8e9b7ac57eb8f354f95a06a1c30e
+  metadata.gz: f39de22d0ac1140f48731ecc4bbbc1ee5a4e60360094d97c01a1bebe2dd6b85586fb920b7d27f4639f53bcc2ee6509c4d3a74be8d592c8044e0c07528e8dc4fa
+  data.tar.gz: 228abea7a4f295108eaf8238f021a593431a9aea333b5d4c0e1c957cdb66bbcf3d6eb79fac312c13cc777ca78bd7fe1ce12328338960184aebe6068b57bf3e2e

data/.gitignore

@@ -6,3 +6,5 @@
 /pkg/
 /spec/reports/
 /tmp/
+
+/Gemfile.lock

data/cmcc_hxy.gemspec

@@ -6,12 +6,12 @@ require "cmcc_hxy/version"
 Gem::Specification.new do |spec|
   spec.name          = "cmcc_hxy"
   spec.version       = CmccHxy::VERSION
-  spec.authors       = ["lumuy"]
-  spec.email         = ["dxgnaw@gmail.com"]
+  spec.authors       = ["zidcn"]
+  spec.email         = ["zd@zidcn.com"]
 
   spec.summary       = %q{CMCC hxy.}
   spec.description   = %q{CMCC hexiaoyuan API.}
-  spec.homepage      = "https://github.com/Lumuy/cmcc_hxy.git"
+  spec.homepage      = "https://github.com/zidcn/cmcc_hxy.git"
   spec.license       = "MIT"
 
 
@@ -27,5 +27,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency "webmock", "~> 3.8.3"
   spec.add_development_dependency "rest-client", "~> 2.0.2"
 end

data/lib/cmcc_hxy.rb

@@ -1,11 +1,7 @@
+class CmccHxy
+end
+
 require "cmcc_hxy/client"
+require "cmcc_hxy/sms_client"
 require "cmcc_hxy/config"
 require "cmcc_hxy/version"
-
-module CmccHxy
-  class << self
-    attr_accessor :config
-  end
-
-  self.config ||= Config.new
-end

data/lib/cmcc_hxy/client.rb

@@ -1,12 +1,15 @@
-require 'json'
-require 'rest-client'
-require 'cmcc_hxy/error'
+require 'cmcc_hxy/rest_client'
+require 'cmcc_hxy/config'
 
 class CmccHxy::Client
   def initialize(token)
     @token = token
   end
 
+  def host
+    @host ||= CmccHxy::Config.hxy_host
+  end
+
   def get_users
     chk_oauth
   end
@@ -42,7 +45,7 @@ class CmccHxy::Client
     params = {
       data: "{accesstoken: #{@token}}"
     }
-    request("#{CmccHxy.config.hxy_host}/typtOauth/typt/chk_oauth", {params: params})
+    request("#{self.host}/typtOauth/typt/chk_oauth", {params: params})
   end
 
   #     第三方应用调用此接口查询业务的开通情况.第三方应用只能查询到有关自己的业务开通情况。
@@ -73,25 +76,12 @@ class CmccHxy::Client
     params = {
       data: "{accesstoken:#{@token}, userid:#{uid}}"
     }
-    request("#{CmccHxy.config.hxy_host}/typtOauth/typt/qry_order", {params: params})
+    request("#{self.host}/typtOauth/typt/qry_order", {params: params})
   end
 
   private
 
   def request(url, params)
-    begin
-      response = RestClient.get(url, params)
-      result = JSON.parse(response)
-    rescue JSON::ParserError
-      raise CmccHxy::Error.new("移动和校园 JSON 解析出错")
-    rescue RestClient::ExceptionWithResponse => e
-      raise CmccHxy::Error.new("移动和校园请求出错 #{e.response.code}")
-    end
-
-    if response.code == 200 && result.is_a?(Hash) && result.key?('error_code')
-      raise CmccHxy::Error.new(result.fetch('error_msg'))
-    end
-
-    result
+    CmccHxy::RestClient.new(:get, url, params).request
   end
 end

data/lib/cmcc_hxy/config.rb

@@ -1,9 +1,8 @@
-module CmccHxy
-  class Config
-    attr_accessor :hxy_host
-
-    def initialize
-      @hxy_host = "http://223.86.3.124:8081"
-    end
+class CmccHxy::Config
+  class << self
+    attr_accessor :hxy_host, :hxy_sms_host
   end
+
+  self.hxy_host = "http://223.86.3.124:8081"
+  self.hxy_sms_host = "http://223.86.3.124:8082"
 end

data/lib/cmcc_hxy/rest_client.rb

@@ -0,0 +1,24 @@
+require 'json'
+require 'rest-client'
+require 'cmcc_hxy/error'
+
+class CmccHxy::RestClient
+  def initialize(method, url, params)
+    @method, @url, @params = method, url, params
+  end
+
+  def request
+    response = RestClient::Request.execute(method: @method, url: @url, headers: {params: @params})
+    result = JSON.parse(response)
+  rescue JSON::ParserError
+    raise CmccHxy::Error.new("移动和校园 JSON 解析出错")
+  rescue RestClient::ExceptionWithResponse => e
+    raise CmccHxy::Error.new("移动和校园请求出错 #{e.response.code}")
+  else
+    if response.code == 200 && result.is_a?(Hash) && result.key?('error_code')
+      raise CmccHxy::Error.new(result.fetch('error_msg'))
+    end
+
+    result
+  end
+end

data/lib/cmcc_hxy/sms_client.rb

@@ -0,0 +1,80 @@
+require 'cmcc_hxy/rest_client'
+require 'cmcc_hxy/config'
+
+class CmccHxy::SmsClient
+  def initialize(appid)
+    @appid = appid
+  end
+
+  # 接口权限：系统接口，需要分配IP鉴权才能调用
+  # MsgType：SYS_SEND_SMS_BYMOBILE
+  # 接口地址：http:// IP:PORT /typtInterface/interface/SmsSendServlet
+  #
+  # 请求：第三方应用–>开放平台
+  # 参数名称            类型    是否必需    描述
+  # ---------------------------------------------------------------
+  # appid            String     是     第三方应用ID
+  # sendmobile       String     是     发送人手机号
+  # smstype          int        是     0:系统 1考勤 2通知 3 消费
+  # smscontent       String     是     短信内容
+  # receivermobile   String     是     接收人手机号
+  # receivers        [{"receivermobile": receivermobile}]
+  #
+  # 响应：开放平台–>第三方应用
+  # 参数名称           类型    是否必需    描述
+  # ---------------------------------------------------------------
+  # smssn            String     是     短信标示唯一码（用于短信报告查询）
+  def sys_send_sms(smstype: 0, sendmobile:, smscontent:, phones:)
+    params = {
+      MsgType: "SYS_SEND_SMS_BYMOBILE",
+      Data: {
+        appid: @appid,
+        smstype: smstype,
+        sendmobile: sendmobile,
+        smscontent: smscontent,
+        receivers: phones.map { |phone| {receivermobile: phone} }
+      }.to_json
+    }
+
+    CmccHxy::RestClient.new(:post, url, params).request
+  end
+
+  # 接口权限：系统接口，需要分配权限才能调用
+  # MsgType：QRY_SMS_RESULT
+  # 接口地址：http:// IP:PORT /typtInterface/interface/SmsSendServlet
+  #
+  # 请求：第三方应用–>开放平台
+  # 参数名称           类型    是否必需     描述
+  # ---------------------------------------------------------------
+  # smssn            String    是      短信标示唯一码（用于短信报告查询）
+  #
+  # 响应：开放平台–>第三方应用
+  # 参数名称           类型    是否必需     描述
+  # ---------------------------------------------------------------
+  # smssn            String    是      短信标示唯一码（用于短信报告查询）
+  # sendid           int       是      发送人ID
+  # sendmobile       String            发送人手机号
+  # username         String            发送人姓名
+  # sendcount        Int               接收人条数
+  # sendtime         String            发送时间
+  # sends
+  # receiverid       Int       是      接收人ID
+  # receivermobile   String    是      接收人手机号
+  # receivername     String            接收人姓名
+  # ismgstatus       String            状态报告状态
+  # rpttime          String            状态报告时间
+  def qry_sms_result(smssn)
+    params = {
+      MsgType: "QRY_SMS_RESULT",
+      Data: {appid: @appid, smssn: smssn}.to_json
+    }
+
+    CmccHxy::RestClient.new(:post, url, params).request
+  end
+
+  private
+
+  def url
+    @url ||= "#{CmccHxy::Config.hxy_sms_host}/typtInterface/sms/smsSend"
+  end
+end

data/lib/cmcc_hxy/version.rb

@@ -1,3 +1,3 @@
-module CmccHxy
-  VERSION = "0.1.1".freeze
+class CmccHxy
+  VERSION = "0.2.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmcc_hxy
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
-- lumuy
+- zidcn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-15 00:00:00.000000000 Z
+date: 2020-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.8.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.8.3
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -68,7 +82,7 @@ dependencies:
         version: 2.0.2
 description: CMCC hexiaoyuan API.
 email:
-- dxgnaw@gmail.com
+- zd@zidcn.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -76,7 +90,6 @@ files:
 - ".gitignore"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -87,8 +100,10 @@ files:
 - lib/cmcc_hxy/client.rb
 - lib/cmcc_hxy/config.rb
 - lib/cmcc_hxy/error.rb
+- lib/cmcc_hxy/rest_client.rb
+- lib/cmcc_hxy/sms_client.rb
 - lib/cmcc_hxy/version.rb
-homepage: https://github.com/Lumuy/cmcc_hxy.git
+homepage: https://github.com/zidcn/cmcc_hxy.git
 licenses:
 - MIT
 metadata: {}
@@ -107,8 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
 summary: CMCC hxy.

data/Gemfile.lock

@@ -1,38 +0,0 @@
-PATH
-  remote: .
-  specs:
-    cmcc_hxy (0.1.1)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    domain_name (0.5.20180417)
-      unf (>= 0.0.5, < 1.0.0)
-    http-cookie (1.0.3)
-      domain_name (~> 0.5)
-    mime-types (3.2.2)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2018.0812)
-    minitest (5.11.3)
-    netrc (0.11.0)
-    rake (10.5.0)
-    rest-client (2.0.2)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 4.0)
-      netrc (~> 0.8)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.5)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.16)
-  cmcc_hxy!
-  minitest (~> 5.0)
-  rake (~> 10.0)
-  rest-client (~> 2.0.2)
-
-BUNDLED WITH
-   1.16.2