wordfilter_client 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c81273157226f3fc6768fee385ee70124ef2e37
-  data.tar.gz: 71bc69d5245443c996892fd647021910c2add7f5
+  metadata.gz: 09d9bda4af57fe26fe37c2eaa8b643b5d0fa48cb
+  data.tar.gz: d0fb998d66b0ada52027700a381d7b0832cfda00
 SHA512:
-  metadata.gz: 3e5f38a21b9383c74b56b6f73291fda7581769bfd0fac7a521ef313676810cae8721ce0214be1732444408fe955fe562e9b3aad0ffd9c5b2685e25c0d980a809
-  data.tar.gz: de28821c470908cae293391187b753204aa9052a2c25370148c9262026bafa01e2470ce424db595d3f0e4b45a9d7a24a1bc0aef220330310af96cc24bb466740
+  metadata.gz: 3c1a48e46c4986f8cc0de7e9defa0b366222e7d609938f3ebc922051be48fb9374e6fe88ab0c0a011eb24ad9fde57f2e1163a5a82c8a01ddbacb31bd3ee47b75
+  data.tar.gz: 25b96d78220ee436ea24efc565c7e6576528929dd1530982009267234a3463a1e4fdc70d8f6390e395b64bf1076ce11928ef5e2297b70933b917797e43eb3089

data/doc/gen.txt

@@ -1 +1 @@
-thrift -out /workspaces/ruby/wordfilter-client/lib/wordfilter-client --gen rb /workspaces/ruby/wordfilter-client/doc/wordfilter.thrift
+thrift -out /workspaces/ruby/wordfilter-client/lib/ --gen rb /workspaces/ruby/wordfilter-client/doc/wordfilter.thrift

data/doc/wordfilter.thrift

@@ -6,7 +6,7 @@ namespace rb wordfilter.thrift
  */
 struct PartResult{
 	1:i32 error,
-	2:string part
+	2:optional string part
 }
 
 /**
@@ -46,6 +46,8 @@ service WordFiltersService {
 	 *         -13：IP对应的主机重复发帖过于频繁 <br />
 	 *         -14：因为用户之前重复发帖，而被禁止操作 <br />
 	 *         -15：因为该IP对应主机重复发帖，而被禁止操作 <br />
+	 *         -17 用户违反验证码限制 <br/>
+	 *         -18 IP违反验证码限制 <br/>
 	 *         -99：未知的应用
 	 * @throws IOException
 	 */
@@ -98,5 +100,24 @@ service WordFiltersService {
 	 */
     i32 onlyWordFilter(1:i32 application, 2:i64 userId, 3:string ip,
 			4:string txtData);
+	
+	/**
+	 * 验证应用是否需要提示验证码，违反了频率控制
+	 * @param application
+	 * @param userId
+	 * @param ip
+	 * @return
+	 */
+    bool checkCaptcha(1:i32 application, 2:i64 userId, 3:string ip);
+
+	/**
+	 * 清空用户，IP的调用记录
+	 * @param application
+	 * @param userId
+	 * @param ip
+	 */
+	oneway void clearCaptcha(1:i32 application, 2:i64 userId, 3:string ip);
 }
 
+
+

data/lib/word_filters_service.rb

@@ -88,6 +88,28 @@ module Wordfilter
           raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'onlyWordFilter failed: unknown result')
         end
 
+        def checkCaptcha(application, userId, ip)
+          send_checkCaptcha(application, userId, ip)
+          return recv_checkCaptcha()
+        end
+
+        def send_checkCaptcha(application, userId, ip)
+          send_message('checkCaptcha', CheckCaptcha_args, :application => application, :userId => userId, :ip => ip)
+        end
+
+        def recv_checkCaptcha()
+          result = receive_message(CheckCaptcha_result)
+          return result.success unless result.success.nil?
+          raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'checkCaptcha failed: unknown result')
+        end
+
+        def clearCaptcha(application, userId, ip)
+          send_clearCaptcha(application, userId, ip)
+        end
+
+        def send_clearCaptcha(application, userId, ip)
+          send_message('clearCaptcha', ClearCaptcha_args, :application => application, :userId => userId, :ip => ip)
+        end
       end
 
       class Processor
@@ -128,6 +150,19 @@ module Wordfilter
           write_result(result, oprot, 'onlyWordFilter', seqid)
         end
 
+        def process_checkCaptcha(seqid, iprot, oprot)
+          args = read_args(iprot, CheckCaptcha_args)
+          result = CheckCaptcha_result.new()
+          result.success = @handler.checkCaptcha(args.application, args.userId, args.ip)
+          write_result(result, oprot, 'checkCaptcha', seqid)
+        end
+
+        def process_clearCaptcha(seqid, iprot, oprot)
+          args = read_args(iprot, ClearCaptcha_args)
+          @handler.clearCaptcha(args.application, args.userId, args.ip)
+          return
+        end
+
       end
 
       # HELPER FUNCTIONS AND STRUCTURES
@@ -322,6 +357,77 @@ module Wordfilter
         ::Thrift::Struct.generate_accessors self
       end
 
+      class CheckCaptcha_args
+        include ::Thrift::Struct, ::Thrift::Struct_Union
+        APPLICATION = 1
+        USERID = 2
+        IP = 3
+
+        FIELDS = {
+          APPLICATION => {:type => ::Thrift::Types::I32, :name => 'application'},
+          USERID => {:type => ::Thrift::Types::I64, :name => 'userId'},
+          IP => {:type => ::Thrift::Types::STRING, :name => 'ip'}
+        }
+
+        def struct_fields; FIELDS; end
+
+        def validate
+        end
+
+        ::Thrift::Struct.generate_accessors self
+      end
+
+      class CheckCaptcha_result
+        include ::Thrift::Struct, ::Thrift::Struct_Union
+        SUCCESS = 0
+
+        FIELDS = {
+          SUCCESS => {:type => ::Thrift::Types::BOOL, :name => 'success'}
+        }
+
+        def struct_fields; FIELDS; end
+
+        def validate
+        end
+
+        ::Thrift::Struct.generate_accessors self
+      end
+
+      class ClearCaptcha_args
+        include ::Thrift::Struct, ::Thrift::Struct_Union
+        APPLICATION = 1
+        USERID = 2
+        IP = 3
+
+        FIELDS = {
+          APPLICATION => {:type => ::Thrift::Types::I32, :name => 'application'},
+          USERID => {:type => ::Thrift::Types::I64, :name => 'userId'},
+          IP => {:type => ::Thrift::Types::STRING, :name => 'ip'}
+        }
+
+        def struct_fields; FIELDS; end
+
+        def validate
+        end
+
+        ::Thrift::Struct.generate_accessors self
+      end
+
+      class ClearCaptcha_result
+        include ::Thrift::Struct, ::Thrift::Struct_Union
+
+        FIELDS = {
+
+        }
+
+        def struct_fields; FIELDS; end
+
+        def validate
+        end
+
+        ::Thrift::Struct.generate_accessors self
+      end
+
     end
 
   end

data/lib/wordfilter_client/version.rb

@@ -1,5 +1,5 @@
 module WordFilter
     module Client
-      VERSION = "0.0.1"
+      VERSION = "0.0.2"
     end
 end

data/lib/wordfilter_types.rb

@@ -16,7 +16,7 @@ module Wordfilter
 
       FIELDS = {
         ERROR => {:type => ::Thrift::Types::I32, :name => 'error'},
-        PART => {:type => ::Thrift::Types::STRING, :name => 'part'}
+        PART => {:type => ::Thrift::Types::STRING, :name => 'part', :optional => true}
       }
 
       def struct_fields; FIELDS; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wordfilter_client
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - gavin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-05 00:00:00.000000000 Z
+date: 2013-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thrift-client