ucenter 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39fb7334c69206eda4dc53352bc1761faa573f8d
-  data.tar.gz: 59c136c1cd60937283cd40c59ad738be9976ed33
+  metadata.gz: b5edfc93a65098a7c44d33b99473a523d2188f33
+  data.tar.gz: b44bf15c3d41881d85fa24c54176fc2536ad41ae
 SHA512:
-  metadata.gz: 5ab39a314f899cdaf779ba25b52dda6b9ad7b71b5e56aacbc95179c60c6cda71774b20c12325cb6a31e7329a1d673a4f200f34e6924eb741b64581cc21da16b7
-  data.tar.gz: 35d08c5f26b5c8b27b25fdcbd4cfe2f074a1a198a045a1de15a3ae6cf0427275a1ba7d694b0e25d66d256b9b6bfa699f821841e03f04e8abef21480029cba900
+  metadata.gz: 6c7b93cdad2cec9c19ec572d7eefa05e95553b82907714cfd5a5031019a52f58d6d3fc713f0d484a35c414989a6c3968ce47029e74992a9b828ac9d06c5cb22b
+  data.tar.gz: 865d3f7b7740bc1b30172f99d940e90fcd87c0a995254b0f9754807259023d661ecd71eeb6e963c27869bd356d218b7b49b0ef35e144f223f22323ddd37a2376

data/lib/ucenter/interface/app.rb

@@ -6,9 +6,12 @@ module Ucenter
         where = db_client.escape(where)
         data = db_client.query("SELECT #{col} FROM #{Ucenter::Config.uc_dbtablepre}applications #{where!="" ? " WHERE #{where} " : ""}").to_a
         data.each_with_index do |item,index|
-          item['extra'] = Ucenter::Tools::PHP.unserialize(item['extra'])
-          data[index] = item
+          if item['extra'] and item['extra'].strip!=""
+            item['extra'] = Ucenter::Tools::PHP.unserialize(item['extra'])
+            data[index] = item
+          end
         end
+        data
       end
     end
   end

data/lib/ucenter/interface/base.rb

@@ -4,6 +4,13 @@ module Ucenter
     class Base
       def initialize(client)
         @client = client
+        config = Hash.new
+        config[:host]     = Ucenter::Config.uc_dbhost unless Ucenter::Config.uc_dbhost.nil?
+        config[:username] = Ucenter::Config.uc_dbuser unless Ucenter::Config.uc_dbuser.nil?
+        config[:password] = Ucenter::Config.uc_dbpw unless Ucenter::Config.uc_dbpw.nil?
+        config[:database] = Ucenter::Config.uc_dbname unless Ucenter::Config.uc_dbname.nil?
+        config[:encoding] = Ucenter::Config.uc_dbcharset unless Ucenter::Config.uc_dbcharset.nil?
+        @db_client = Mysql2::Client.new(config)
       end
 
       def get(path, opts={}, &block)
@@ -15,13 +22,7 @@ module Ucenter
       end
 
       def db_client
-        config = Hash.new
-        config[:host]     = Ucenter::Config.uc_dbhost unless Ucenter::Config.uc_dbhost.nil?
-        config[:username] = Ucenter::Config.uc_dbuser unless Ucenter::Config.uc_dbuser.nil?
-        config[:password] = Ucenter::Config.uc_dbpw unless Ucenter::Config.uc_dbpw.nil?
-        config[:database] = Ucenter::Config.uc_dbname unless Ucenter::Config.uc_dbname.nil?
-        config[:encoding] = Ucenter::Config.uc_dbcharset unless Ucenter::Config.uc_dbcharset.nil?
-        Mysql2::Client.new(config)
+        @db_client
       end
 
     end

data/lib/ucenter/interface/user.rb

@@ -53,8 +53,20 @@ module Ucenter
         db_client.query("SELECT count(*) FROM #{Ucenter::Config.uc_dbtablepre}mergemembers WHERE appid='#{Ucenter::Config.app_id}' AND username='#{username}'").to_a[0]
       end
 
-      def add_user
+      def add_user (username, password, email, uid = 0, questionid = '', answer = '', regip = '', phone = '')
         # TODO: 注册
+        # Aaron 2014-08-28
+        salt = UUID.new.generate[1,6]
+        password = md5(md5(password)+salt)
+        sqladd = uid.to_i==0 ? "" : ("uid='" + uid.to_i.to_s + "', " )
+        sqladd += questionid.to_i > 0 ? (" secques='" + quescrypt(questionid,answer) + "', ") : " secques='', "
+        sqladd += phone.empty? ? " " : " phone='#{phone}', "
+        sql= "insert into #{Ucenter::Config.uc_dbtablepre}members  set  #{sqladd} username='#{username}', password='#{password}', email='#{email}', regip='#{regip}', regdate='#{Time.now.to_i}', salt='#{salt}'"
+        client = db_client
+        client.query(sql)
+        inserted_id = client.last_id
+        client.query("insert into #{Ucenter::Config.uc_dbtablepre}memberfields set uid='#{inserted_id}'")
+        inserted_id
       end
 
       def edit_user
@@ -82,6 +94,10 @@ module Ucenter
         db_client.query("SELECT * FROM #{Ucenter::Config.uc_dbtablepre}members WHERE phone='#{username}'").to_a[0]
       end
 
+      def quescrypt(questionid, answer)
+        return questionid > 0 && answer != '' ? md5(answer.md5(questionid))[16,8] : '';
+      end
+
       private
       def md5 str; Digest::MD5.hexdigest str.to_s end
     end

data/lib/ucenter/version.rb

@@ -1,3 +1,3 @@
 module Ucenter
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

data/ucenter.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~>0"
   spec.add_development_dependency "mysql2", "~>0"
   spec.add_development_dependency "nokogiri", "~>0"
+  spec.add_development_dependency "uuid", "~>0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ucenter
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Willin Wang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-28 00:00:00.000000000 Z
+date: 2014-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: uuid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 description: http://willin.wang visit for more info.
 email: willin@willin.org
 executables: []