lanxin_open 0.0.5 → 0.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTFmODQyN2ExNzIwZWQyZTEwZjE3NDM1YmYzNjgxYTUyYmExNGZjOA==
+    YTgyYzE2OGYyMjkzZTEzZGRiNzczZTMzMzdhYTIxOTdlNzg1NTZhZg==
   data.tar.gz: !binary |-
-    ZDc3ZWI4YmU4MDE2Yjg5NDM4YmFjMTQwNGExOTg4ZjM0Mjc0OGMxNw==
+    Yzc5M2ZmNWQ5MjdkZGY5YmIzNWNmODZlYWZmYjY3ODdlMDYwODdjOQ==
 SHA512:
   metadata.gz: !binary |-
-    MTlkYjU5NzAzMGE5ODQxNTIxZmMwMmQwNjIzNzFkM2NiMjJlODY2NjhkYzQ1
-    ZDk0NjM5MTEzMDBlYzI4NDM1Y2ZjYjdjYWJkYjhiNjFhODJlM2E4MWJlYzZm
-    MDA5OGI4YzRiOGMxM2JmMGUwM2Y2Mzc4OTg1MWIxZTk4OGFmYjI=
+    N2YzODUwZGJlM2RlYmM4ZTZmYjYyMmRjOGRlZGEwNzBiMzRhYTRlNzk1N2Ri
+    MGZlYTljOTk5NzFhZmQ0YTI1OThlYWY1ZGRhOGZlZTA5M2U5ZWZlYzg5YzNl
+    NDZjYmVjNDY5M2RkYTA2YzhjOTMyZDFmZmI0N2ViOGFjNmM1OWE=
   data.tar.gz: !binary |-
-    YzU0ZDg3MDA1YzUxNjI4NDY3Y2FjYzY0ZmI1ZWU2ODZjOGE0YmNjMTgyMjI3
-    NmE5MTM1NmI0ZmIxOWY0OTczMDI5Y2M5ZGE2NTAxN2EzNDg0ZWEwYjM3NDZj
-    Y2YxZTIyMGQyNTdmYjM5ZjE4N2IxYTI5ZGIzN2ZhZjlkOGYyMTA=
+    YjhlM2M3ZTQ2ZmRhYjQ0NWFiNTEzMzI2ODg5MDAzZjJhODBlYjg3ZWQxOWU0
+    YTI5YWU0ZDBlNWEzYzA0NTM2YWM3NmM0MjA1NTlhNDE0YmVmMzZmNzhiYjgz
+    OTJlOWJkYzc5Y2NkNzY1Y2Q2N2RkMDAwOGVlYmUzZWJmY2ZkYWI=

data/lib/lanxin_open/net_util.rb

@@ -0,0 +1,64 @@
+require 'addressable/uri'
+require 'net/https'
+require 'uri'
+
+module LanxinOpen
+
+	class NetUtil
+    def self.get_req(url)
+      return nil if not url
+      #Rails.logger.info("get_req request url:#{url}")
+      uri = URI(url)
+
+      https = Net::HTTP.new(uri.host, uri.port)
+      #just for now.FIXME
+      if uri.scheme == 'https'
+        https.use_ssl = true
+        https.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      end
+      response = https.get(uri.request_uri)
+    end
+
+    def self.dict2urlparam(params)
+      return if not params
+      uri = Addressable::URI.new
+      uri.query_values = params
+      uri.query
+    end
+
+    def self.force_encode(params,encoding_name)
+      params.each do |k,v|
+        if v.class == String #and v.encoding.name == "UTF-8"
+          begin
+            v_gbk = v.encode(encoding_name)
+            params[k] = v_gbk
+          rescue
+          end
+        end
+      end
+      return params
+    end
+
+    def self.post_req(url,params)
+      return if not url
+      uri = URI.parse(url)
+
+      need_uri_encode = false
+      if need_uri_encode
+        params.each do |k,v|
+          params[k] = URI.encode(v)
+        end
+      end
+
+      https = Net::HTTP.new(uri.host,uri.port)
+      if uri.scheme == 'https'
+        https.use_ssl = true
+        https.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      end
+      req = Net::HTTP::Post.new(uri.path)
+      req.set_form_data(params)
+      response = https.request(req)
+    end
+  end
+
+end

data/lib/lanxin_open/openplatform.rb

@@ -0,0 +1,211 @@
+require "lanxin_open/net_util"
+
+module LanxinOpen
+	module Platform
+    attr_accessor :skey
+    attr_accessor :host,:port,:use_new_json
+
+    def dump_config
+      puts "test_config #{host}, #{port}, #{use_new_json}"
+    end
+
+    def host_with_port
+      if port and port.length > 0
+        "#{host}:#{port}"
+      else
+        host
+      end
+    end
+
+    def lx_url(path)
+      unless path.start_with?("/")
+        path = "/" + path
+      end
+      "#{host_with_port}#{path}"
+    end
+
+    def content_utf8(content,source_charset="gbk")
+      return content unless source_charset
+      begin
+        # converter = Iconv.new 'UTF-8//IGNORE', source_charset
+        converter = Iconv.new 'UTF-8', source_charset
+        utf8_str = converter.iconv content
+      rescue Exception => e
+        return content
+      end
+    end
+
+    def encode_resbody(body)
+      source_charsets = ["gbk","gb2312"]
+      i = 0
+      begin
+        gbk = body.encode("utf-8", source_charsets[i])
+        return gbk
+      rescue Exception => e
+        if i < source_charsets.length
+          i +=1
+          retry
+        end
+      end
+      gbk = content_utf8(body,"gbk")
+    end
+
+    def fetch_skey(token,devkey)
+      req_url = lx_url("/opc/ishow")
+      params = {
+        "p_id"   => "131",
+        "t_id"   => "18", 
+        "d_id"   => "1",
+        "url"    => "/logintoskey.html", 
+        "token"  => token,
+        "devkey" => devkey
+      }
+      # body = encode_resbody(NetUtil.post_req(req_url,params).body)
+      begin
+        body = encode_resbody(NetUtil.post_req(req_url,params).body)
+        puts body
+        ret = JSON.parse(body.to_s)
+        if ret["state"] == "OK"
+          @skey= ret["sessionKey"]
+        end
+      rescue
+      end
+    end
+
+    #new interface use UTF-8 charset
+    def member_get(org_id,open_id)
+      req_url = lx_url("cgi-bin/member/get")
+      params = {
+        "access_token" => skey,
+        "orgId" => org_id,
+        "mobile" => open_id,
+      }
+      body = NetUtil.post_req(req_url,params).body
+    end
+
+    #new interface use UTF-8 charset
+    # query_type:
+    #     0:get struct node;  1: get user node;  -1:get all node
+    def org_get(org_id,struct_id,query_type)
+      req_url = lx_url("cgi-bin/org/struct/parent/get")
+      params = {
+        "access_token" => skey,
+        "orgId" => org_id,
+        "structId" => struct_id,
+        "orgStructType" => query_type
+      }
+      body = NetUtil.post_req(req_url,params).body
+    end
+
+  end
+
+	class OpenPlatformV1
+    include Platform
+
+    def initialize(args)
+      @host = args[:host] || LanxinOpen.host
+      @port = args[:port] || LanxinOpen.port
+      @use_new_json = args[:use_new_json] || LanxinOpen.use_new_json
+    end
+
+    def kehu_msg(fieldvalue,from_user)
+      req_url = lx_url("/opc/ishow")
+      params = {
+        "p_id"   => "131",
+        "t_id"   => "5",
+        "d_id"   => "0",
+        "url"    => "/customermessage/${docid}.shtml",
+        "skey"   => skey,
+        "_fieldvalue_msgcontent" => fieldvalue.to_json
+      }
+      body = encode_resbody(NetUtil.post_req(req_url,params).body)
+    end
+
+    def send_text_msg(txt_msg,open_id,from_user)
+      text_json = {"content" => txt_msg}
+      base_json = {
+        "ToUserName" => open_id,
+        "FromUserName" => from_user,
+        "msgtype" => "text",
+        "text" => text_json.to_json
+      }
+      base_json["text"] = text_json if use_new_json
+      body = kehu_msg(base_json,from_user)
+    end
+
+    def send_link_msg(url,open_id,from_user)
+      base_json = {
+        "ToUserName" => open_id,
+        "FromUserName" => from_user,
+        "msgtype" => "link",
+        "url" => url
+      }
+      body = kehu_msg(base_json,from_user)
+    end
+
+    def send_pictext_msg(url,open_id,title,from_user)
+      news_json = {"url" => url}
+      base_json = {
+        "ToUserName" => open_id,
+        "FromUserName" => from_user,
+        "msgtype" => "news",
+        "title" => title,
+        "news" => news_json
+      }
+      # base_json["news"] = news_json if use_new_json
+      body = kehu_msg(base_json,from_user)
+    end
+
+    def send_mail_msg(url,open_id,title,from_user)
+      news_json = {"url" => url}
+      base_json = {
+        "ToUserName" => open_id,
+        "FromUserName" => from_user,
+        "msgtype" => "mail",
+        "news" => news_json,
+        "title" => title
+      }
+      body = kehu_msg(base_json,from_user)
+    end
+
+    def create_menu(menu_json)
+      params = {
+        "p_id" => 131,
+        "t_id" => 15,
+        "d_id" => 1,
+        "url" => "/insert_menu.shtml",
+        "menucontent" => menu_json.to_json,
+        "skey" => skey
+      }
+      req_url = lx_url("/opc/ishow")
+      body = encode_resbody(NetUtil.post_req(req_url,params).body)
+    end
+
+    def show_menu(publicno)
+      params = {
+        "p_id" => 131,
+        "t_id" => 16,
+        "d_id" => 1,
+        "url" => "/query_menu.shtml",
+        "publicno" => publicno,
+        "skey" => skey
+      }
+      req_url = lx_url("/opc/ishow")
+      body = encode_resbody(NetUtil.post_req(req_url,params).body)
+    end
+
+    def del_menu
+      req_url = lx_url("/opc/ishow")
+      params = {
+        "p_id" => 131,
+        "t_id" => 17,
+        "d_id" => 1,
+        "url"  => "/delmenu.shtml",
+        "skey" => skey
+      }
+      body = encode_resbody(NetUtil.post_req(req_url,params).body)
+    end
+
+  end # End of OpenPlatformV1 class
+
+end

data/lib/lanxin_open/sig_verify.rb

@@ -1,13 +1,16 @@
 module SigVerify
 
-	def sig_verify(params)
-  	time = params["timestamp"].to_i
-  	time = time.to_i / 1000 if params["timestamp"].length >= 13
+	def sig_verify(time_str,nonce,token,signature)
+  	time = time_str.to_i
+  	time = time / 1000 if time_str.length >= 13
   	return false if (Time.now - Time.at(time)) > 120
 
-  	plain = [Rails.application.config.data_token,params["timestamp"],params["nonce"]].sort().join()
+    signature == sig_gen(time_str,nonce,token)
+  end
+
+  def sig_gen(time_str,nonce,token)
+  	plain = [token,time_str,nonce].sort().join()
   	sig = Digest::SHA1.hexdigest(plain)
-  	sig == params["signature"]
   end
 
 end

data/lib/lanxin_open/version.rb

@@ -1,3 +1,3 @@
 module LanxinOpen
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/lanxin_open.rb

@@ -1,9 +1,7 @@
 require "lanxin_open/version"
 require "lanxin_open/sig_verify"
-require 'uri'
+require "lanxin_open/openplatform"
 require "json"
-require 'addressable/uri'
-require 'net/https'
 
 module LanxinOpen
   extend self
@@ -62,270 +60,6 @@ module LanxinOpen
     end
   end
 
-  class NetUtil
-    def self.get_req(url)
-      return nil if not url
-      #Rails.logger.info("get_req request url:#{url}")
-      uri = URI(url)
-
-      https = Net::HTTP.new(uri.host, uri.port)
-      #just for now.FIXME
-      if uri.scheme == 'https'
-        https.use_ssl = true
-        https.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      end
-      response = https.get(uri.request_uri)
-    end
-
-    def self.dict2urlparam(params)
-      return if not params
-      uri = Addressable::URI.new
-      uri.query_values = params
-      uri.query
-    end
-
-    def self.force_encode(params,encoding_name)
-      params.each do |k,v|
-        if v.class == String #and v.encoding.name == "UTF-8"
-          begin
-            v_gbk = v.encode(encoding_name)
-            params[k] = v_gbk
-          rescue
-          end
-        end
-      end
-      return params
-    end
-
-    def self.post_req(url,params)
-      return if not url
-      uri = URI.parse(url)
-
-      need_uri_encode = false
-      if need_uri_encode
-        params.each do |k,v|
-          params[k] = URI.encode(v)
-        end
-      end
-
-      https = Net::HTTP.new(uri.host,uri.port)
-      if uri.scheme == 'https'
-        https.use_ssl = true
-        https.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      end
-      req = Net::HTTP::Post.new(uri.path)
-      req.set_form_data(params)
-      response = https.request(req)
-    end
-  end
-
-  module Platform
-    attr_accessor :skey
-    attr_accessor :host,:port,:use_new_json
-
-    def dump_config
-      puts "test_config #{host}, #{port}, #{use_new_json}"
-    end
-
-    def host_with_port
-      if port and port.length > 0
-        "#{host}:#{port}"
-      else
-        host
-      end
-    end
-
-    def lx_url(path)
-      unless path.start_with?("/")
-        path = "/" + path
-      end
-      "#{host_with_port}#{path}"
-    end
-
-    def content_utf8(content,source_charset="gbk")
-      return content unless source_charset
-      begin
-        # converter = Iconv.new 'UTF-8//IGNORE', source_charset
-        converter = Iconv.new 'UTF-8', source_charset
-        utf8_str = converter.iconv content
-      rescue Exception => e
-        return content
-      end
-    end
-
-    def encode_resbody(body)
-      source_charsets = ["gbk","gb2312"]
-      i = 0
-      begin
-        gbk = body.encode("utf-8", source_charsets[i])
-        return gbk
-      rescue Exception => e
-        if i < source_charsets.length
-          i +=1
-          retry
-        end
-      end
-      gbk = content_utf8(body,"gbk")
-    end
-
-    def fetch_skey(token,devkey)
-      req_url = lx_url("/opc/ishow")
-      params = {
-        "p_id"   => "131",
-        "t_id"   => "18", 
-        "d_id"   => "1",
-        "url"    => "/logintoskey.html", 
-        "token"  => token,
-        "devkey" => devkey
-      }
-      # body = encode_resbody(NetUtil.post_req(req_url,params).body)
-      begin
-        body = encode_resbody(NetUtil.post_req(req_url,params).body)
-        puts body
-        ret = JSON.parse(body.to_s)
-        if ret["state"] == "OK"
-          @skey= ret["sessionKey"]
-        end
-      rescue
-      end
-    end
-
-    #new interface use UTF-8 charset
-    def member_get(org_id,open_id)
-      req_url = lx_url("cgi-bin/member/get")
-      params = {
-        "access_token" => skey,
-        "orgId" => org_id,
-        "mobile" => open_id,
-      }
-      body = NetUtil.post_req(req_url,params).body
-    end
-
-    #new interface use UTF-8 charset
-    # query_type:
-    #     0:get struct node;  1: get user node;  -1:get all node
-    def org_get(org_id,struct_id,query_type)
-      req_url = lx_url("cgi-bin/org/struct/parent/get")
-      params = {
-        "access_token" => skey,
-        "orgId" => org_id,
-        "structId" => struct_id,
-        "orgStructType" => query_type
-      }
-      body = NetUtil.post_req(req_url,params).body
-    end
-
-  end
-
-  class OpenPlatformV1
-    include Platform
-
-    def initialize(args)
-      @host = args[:host] || LanxinOpen.host
-      @port = args[:port] || LanxinOpen.port
-      @use_new_json = args[:use_new_json] || LanxinOpen.use_new_json
-    end
-
-    def kehu_msg(fieldvalue,from_user)
-      req_url = lx_url("/opc/ishow")
-      params = {
-        "p_id"   => "131",
-        "t_id"   => "5",
-        "d_id"   => "0",
-        "url"    => "/customermessage/${docid}.shtml",
-        "skey"   => skey,
-        "_fieldvalue_msgcontent" => fieldvalue.to_json
-      }
-      body = encode_resbody(NetUtil.post_req(req_url,params).body)
-    end
-
-    def send_text_msg(txt_msg,open_id,from_user)
-      text_json = {"content" => txt_msg}
-      base_json = {
-        "ToUserName" => open_id,
-        "FromUserName" => from_user,
-        "msgtype" => "text",
-        "text" => text_json.to_json
-      }
-      base_json["text"] = text_json if use_new_json
-      body = kehu_msg(base_json,from_user)
-    end
-
-    def send_link_msg(url,open_id,from_user)
-      base_json = {
-        "ToUserName" => open_id,
-        "FromUserName" => from_user,
-        "msgtype" => "link",
-        "url" => url
-      }
-      body = kehu_msg(base_json,from_user)
-    end
-
-    def send_pictext_msg(url,open_id,title,from_user)
-      news_json = {"url" => url}
-      base_json = {
-        "ToUserName" => open_id,
-        "FromUserName" => from_user,
-        "msgtype" => "news",
-        "title" => title,
-        "news" => news_json
-      }
-      # base_json["news"] = news_json if use_new_json
-      body = kehu_msg(base_json,from_user)
-    end
-
-    def send_mail_msg(url,open_id,title,from_user)
-      news_json = {"url" => url}
-      base_json = {
-        "ToUserName" => open_id,
-        "FromUserName" => from_user,
-        "msgtype" => "mail",
-        "news" => news_json,
-        "title" => title
-      }
-      body = kehu_msg(base_json,from_user)
-    end
-
-    def create_menu(menu_json)
-      params = {
-        "p_id" => 131,
-        "t_id" => 15,
-        "d_id" => 1,
-        "url" => "/insert_menu.shtml",
-        "menucontent" => menu_json.to_json,
-        "skey" => skey
-      }
-      req_url = lx_url("/opc/ishow")
-      body = encode_resbody(NetUtil.post_req(req_url,params).body)
-    end
-
-    def show_menu(publicno)
-      params = {
-        "p_id" => 131,
-        "t_id" => 16,
-        "d_id" => 1,
-        "url" => "/query_menu.shtml",
-        "publicno" => publicno,
-        "skey" => skey
-      }
-      req_url = lx_url("/opc/ishow")
-      body = encode_resbody(NetUtil.post_req(req_url,params).body)
-    end
-
-    def del_menu
-      req_url = lx_url("/opc/ishow")
-      params = {
-        "p_id" => 131,
-        "t_id" => 17,
-        "d_id" => 1,
-        "url"  => "/delmenu.shtml",
-        "skey" => skey
-      }
-      body = encode_resbody(NetUtil.post_req(req_url,params).body)
-    end
-
-  end # End of OpenPlatformV1 class
-
 end
 
 LanxinOpen.config do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lanxin_open
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - wangdean
@@ -56,6 +56,8 @@ files:
 - Rakefile
 - lanxin_open.gemspec
 - lib/lanxin_open.rb
+- lib/lanxin_open/net_util.rb
+- lib/lanxin_open/openplatform.rb
 - lib/lanxin_open/sig_verify.rb
 - lib/lanxin_open/version.rb
 homepage: ''