confirmation_code 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63473014936b6960558487eaf990e292c17ee52c
-  data.tar.gz: 09f30ef7b776ea0fff8a5bb8efdbf9a3b8df8f6b
+  metadata.gz: 48e76ee1c36726f5269b0dfbee8f2d685f4d5a63
+  data.tar.gz: c54079ec1f5d17dfa12bc4adf8c17e106129bf83
 SHA512:
-  metadata.gz: 1cb8c55fac8444d3a48015717d4c02ef1c394d787ec99988daa041b65772f5d9ad82c4abc58c9ba68a18572e8ed89f99c67b93e7a969ef02ef58911f237707c9
-  data.tar.gz: 3239f42c7625df029e2cc706cc6743c39aa4e14ce055c69ad94264efadcf5d6bd3be91c32a9c55fad4e62854144b33ed5b15b29bd7d6b750faecc301442999c5
+  metadata.gz: 70a95fa035db2b647cf7e23e795185a736cf883199fd2adfaa5d55fbbbd63f5ba326fd17514103ff16d618fa8b1f448dc4694849137367a3315161043eccc6cc
+  data.tar.gz: e0098bc3e49827735c6e925138b67735efd70e4c18773e7d069638a7f5ca499a554396a2e4c4bba7471c80282c870351b611fa9234b8b5a7f72e0dbc5930fa85

data/damatu.paw

@@ -344,7 +344,7 @@
         <attribute name="redirectauthorization" type="bool">0</attribute>
         <attribute name="method" type="string">POST</attribute>
         <attribute name="followredirects" type="bool">0</attribute>
-        <attribute name="body" type="string">[{"data":{"keyValues":[[["file"],[{"data":{"environmentVariable":"EAA39355-4AEE-4E2E-A045-F581429182EC"},"identifier":"com.luckymarmot.EnvironmentVariableDynamicValue"}],true]]},"identifier":"com.luckymarmot.BodyMultipartFormDataDynamicValue"}]</attribute>
+        <attribute name="body" type="string">[{"data":{"keyValues":[[["file"],[{"data":{"environmentVariable":"EAA39355-4AEE-4E2E-A045-F581429182EC"},"identifier":"com.luckymarmot.EnvironmentVariableDynamicValue"}],true]]},"identifier":"com.luckymarmot.BodyFormKeyValueDynamicValue"}]</attribute>
         <attribute name="order" type="int64">2</attribute>
         <attribute name="name" type="string">上传本地图片</attribute>
         <relationship name="parent" type="0/1" destination="LMREQUESTTREEITEM" idrefs="z111"></relationship>

data/lib/confirmation_code.rb

@@ -17,9 +17,13 @@ module ConfirmationCode
     @service
   end
 
-  def upload(image_url, options = {})
+  def upload(image_path, options = {})
     options = default_options.merge options
-    @service.upload image_url, options if @service
+    if image_path.start_with?('http')
+      @service.upload image_path, options if @service
+    else
+      @service.upload_local image_path, options if @service
+    end
   end
 
   def account

data/lib/confirmation_code/service/damatu.rb

@@ -15,6 +15,7 @@ module ConfirmationCode
       HOST = 'http://api.dama2.com:7766'
 
       UPLOAD_URL = File.join(HOST, 'app/d2Url?')
+      UPLOAD_LOCAL_URL = File.join(HOST, 'app/d2File?')
       ACCOUNT_URL = File.join(HOST, 'app/d2Balance?')
       RECOGNITION_ERROR_URL = File.join(HOST, 'app/d2ReportError?')
 
@@ -41,9 +42,6 @@ module ConfirmationCode
       end
 
       def get_pwd(user, pwd)
-        ap md5(user)
-        ap md5(pwd)
-        ap md5(md5(user) + md5(pwd))
         return md5(@app_key + md5(md5(user) + md5(pwd)))
       end
 
@@ -61,6 +59,18 @@ module ConfirmationCode
         result(JSON.parse(response.body))
       end
 
+      def upload_local(image_path, options = {})
+        upload_options = damatu_options(options)
+        upload_options['type'] = 200 if upload_options['type'].nil?
+        byte_data = File.read(image_path)
+        File.open(image_path) do |file|
+          upload_options['file'] = file
+          upload_options['sign'] = sign(upload_options['user'], byte_data.bytes)
+          response = client.post(UPLOAD_LOCAL_URL, upload_options)
+          result(JSON.parse(response.body))
+        end
+      end
+
       def account(options = {})
         account_options = damatu_options(options)
         account_options['sign'] = sign(account_options['user'])
@@ -72,9 +82,7 @@ module ConfirmationCode
         recognition_options = damatu_options(options)
         recognition_options['id'] = ret_id.to_s
         recognition_options['sign'] = sign(recognition_options['user'], ret_id.to_s.bytes)
-        ap recognition_options
         response = client.post(RECOGNITION_ERROR_URL, recognition_options)
-        ap response.body
         result(JSON.parse(response.body))
       end
 

data/lib/confirmation_code/service/lianzhong.rb

@@ -34,6 +34,15 @@ module ConfirmationCode
         end
       end
 
+      def upload_local(image_path, options = {})
+        options = lianzhong_options.merge options
+        File.open(image_path) do |file|
+          options['upload'] = file
+          response = client.post(UPLOAD_URL, options)
+          result(JSON.parse(response.body))
+        end
+      end
+
       def account(options = {})
         options = lianzhong_options.merge options
         print options

data/lib/confirmation_code/version.rb

@@ -1,3 +1,3 @@
 module ConfirmationCode
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/run.rb

@@ -4,16 +4,16 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'confirmation_code'
 
 #result = ConfirmationCode.upload 'https://passport.58.com/validatecode?temp=123i1knr04o'
-
 ConfirmationCode.use :lianzhong, 'seaify', '67c86225'
 ap ConfirmationCode.account
-result = ConfirmationCode.upload('http://captcha.qq.com/getimage')
+result = ConfirmationCode.upload('0349.bmp')
+ap ConfirmationCode.upload('http://captcha.qq.com/getimage')
 ap result
 ap ConfirmationCode.recognition_error result['data']['id']
-return
 
 ConfirmationCode.use :damatu, 'seaify', 'lsm123', {app_key: '0f80784a5ff20d38df3977e461e3d82a', app_id: '41635'}
-ap ConfirmationCode.account
+#ap ConfirmationCode.account
 result = ConfirmationCode.upload('http://captcha.qq.com/getimage')
+#result = ConfirmationCode.upload('0349.bmp')
 ap result
 ap ConfirmationCode.recognition_error result['data']['id']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: confirmation_code
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - seaify