ums 0.1.2 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5101be15cbdf7965aaee189cb36a08c9562daec7
-  data.tar.gz: e8a1c75f9569e1a5eb75c6f912995b40199decde
+SHA256:
+  metadata.gz: 168c81adc44f02cbff580af61a72f4326c8f9b5da643c0b2b7f86f89e80f2291
+  data.tar.gz: 42314bb532ee6006e7ff7cfdb6683cadb572b7a01a756a12768deb6a7f8ad1e1
 SHA512:
-  metadata.gz: 7a17f81f6c8d738582086e90a32b2beaa83e9eab64b762a0fcc7f513a945d123b6fe59b475baa28bf7e04cb8e3513128267eedfbe0fe560cf87b3eacb9fa33b0
-  data.tar.gz: c023ec6279fc0492952656e8dc1075455daf956152c4372436b6ce2295261a407890aa5aeee510fcd01a37e7f120bc8a2395b9e0c4997468572b5b9050033ee8
+  metadata.gz: a29d6eae1d8e5506febf29f05efc55f85bd5ea9ea44accd1a46814ec75ca3ea8bdc08bf2d969d9b209739d013243dc74eb652c74d81abc70b68ab1b0e431e07d
+  data.tar.gz: aaed192e3ee9eb00cdce7751c398587f4a68144702fca5024089b599fc81f751310368cde785712c4699c86a53df8c2abfb2839a04f9201b8005ac39c9d46409

data/app/assets/javascripts/ums/sha256.min.js

@@ -0,0 +1,16 @@
+/*
+CryptoJS v3.1.2
+code.google.com/p/crypto-js
+(c) 2009-2013 by Jeff Mott. All rights reserved.
+code.google.com/p/crypto-js/wiki/License
+*/
+var CryptoJS=CryptoJS||function(h,s){var f={},t=f.lib={},g=function(){},j=t.Base={extend:function(a){g.prototype=this;var c=new g;a&&c.mixIn(a);c.hasOwnProperty("init")||(c.init=function(){c.$super.init.apply(this,arguments)});c.init.prototype=c;c.$super=this;return c},create:function(){var a=this.extend();a.init.apply(a,arguments);return a},init:function(){},mixIn:function(a){for(var c in a)a.hasOwnProperty(c)&&(this[c]=a[c]);a.hasOwnProperty("toString")&&(this.toString=a.toString)},clone:function(){return this.init.prototype.extend(this)}},
+q=t.WordArray=j.extend({init:function(a,c){a=this.words=a||[];this.sigBytes=c!=s?c:4*a.length},toString:function(a){return(a||u).stringify(this)},concat:function(a){var c=this.words,d=a.words,b=this.sigBytes;a=a.sigBytes;this.clamp();if(b%4)for(var e=0;e<a;e++)c[b+e>>>2]|=(d[e>>>2]>>>24-8*(e%4)&255)<<24-8*((b+e)%4);else if(65535<d.length)for(e=0;e<a;e+=4)c[b+e>>>2]=d[e>>>2];else c.push.apply(c,d);this.sigBytes+=a;return this},clamp:function(){var a=this.words,c=this.sigBytes;a[c>>>2]&=4294967295<<
+32-8*(c%4);a.length=h.ceil(c/4)},clone:function(){var a=j.clone.call(this);a.words=this.words.slice(0);return a},random:function(a){for(var c=[],d=0;d<a;d+=4)c.push(4294967296*h.random()|0);return new q.init(c,a)}}),v=f.enc={},u=v.Hex={stringify:function(a){var c=a.words;a=a.sigBytes;for(var d=[],b=0;b<a;b++){var e=c[b>>>2]>>>24-8*(b%4)&255;d.push((e>>>4).toString(16));d.push((e&15).toString(16))}return d.join("")},parse:function(a){for(var c=a.length,d=[],b=0;b<c;b+=2)d[b>>>3]|=parseInt(a.substr(b,
+2),16)<<24-4*(b%8);return new q.init(d,c/2)}},k=v.Latin1={stringify:function(a){var c=a.words;a=a.sigBytes;for(var d=[],b=0;b<a;b++)d.push(String.fromCharCode(c[b>>>2]>>>24-8*(b%4)&255));return d.join("")},parse:function(a){for(var c=a.length,d=[],b=0;b<c;b++)d[b>>>2]|=(a.charCodeAt(b)&255)<<24-8*(b%4);return new q.init(d,c)}},l=v.Utf8={stringify:function(a){try{return decodeURIComponent(escape(k.stringify(a)))}catch(c){throw Error("Malformed UTF-8 data");}},parse:function(a){return k.parse(unescape(encodeURIComponent(a)))}},
+x=t.BufferedBlockAlgorithm=j.extend({reset:function(){this._data=new q.init;this._nDataBytes=0},_append:function(a){"string"==typeof a&&(a=l.parse(a));this._data.concat(a);this._nDataBytes+=a.sigBytes},_process:function(a){var c=this._data,d=c.words,b=c.sigBytes,e=this.blockSize,f=b/(4*e),f=a?h.ceil(f):h.max((f|0)-this._minBufferSize,0);a=f*e;b=h.min(4*a,b);if(a){for(var m=0;m<a;m+=e)this._doProcessBlock(d,m);m=d.splice(0,a);c.sigBytes-=b}return new q.init(m,b)},clone:function(){var a=j.clone.call(this);
+a._data=this._data.clone();return a},_minBufferSize:0});t.Hasher=x.extend({cfg:j.extend(),init:function(a){this.cfg=this.cfg.extend(a);this.reset()},reset:function(){x.reset.call(this);this._doReset()},update:function(a){this._append(a);this._process();return this},finalize:function(a){a&&this._append(a);return this._doFinalize()},blockSize:16,_createHelper:function(a){return function(c,d){return(new a.init(d)).finalize(c)}},_createHmacHelper:function(a){return function(c,d){return(new w.HMAC.init(a,
+d)).finalize(c)}}});var w=f.algo={};return f}(Math);
+(function(h){for(var s=CryptoJS,f=s.lib,t=f.WordArray,g=f.Hasher,f=s.algo,j=[],q=[],v=function(a){return 4294967296*(a-(a|0))|0},u=2,k=0;64>k;){var l;a:{l=u;for(var x=h.sqrt(l),w=2;w<=x;w++)if(!(l%w)){l=!1;break a}l=!0}l&&(8>k&&(j[k]=v(h.pow(u,0.5))),q[k]=v(h.pow(u,1/3)),k++);u++}var a=[],f=f.SHA256=g.extend({_doReset:function(){this._hash=new t.init(j.slice(0))},_doProcessBlock:function(c,d){for(var b=this._hash.words,e=b[0],f=b[1],m=b[2],h=b[3],p=b[4],j=b[5],k=b[6],l=b[7],n=0;64>n;n++){if(16>n)a[n]=
+c[d+n]|0;else{var r=a[n-15],g=a[n-2];a[n]=((r<<25|r>>>7)^(r<<14|r>>>18)^r>>>3)+a[n-7]+((g<<15|g>>>17)^(g<<13|g>>>19)^g>>>10)+a[n-16]}r=l+((p<<26|p>>>6)^(p<<21|p>>>11)^(p<<7|p>>>25))+(p&j^~p&k)+q[n]+a[n];g=((e<<30|e>>>2)^(e<<19|e>>>13)^(e<<10|e>>>22))+(e&f^e&m^f&m);l=k;k=j;j=p;p=h+r|0;h=m;m=f;f=e;e=r+g|0}b[0]=b[0]+e|0;b[1]=b[1]+f|0;b[2]=b[2]+m|0;b[3]=b[3]+h|0;b[4]=b[4]+p|0;b[5]=b[5]+j|0;b[6]=b[6]+k|0;b[7]=b[7]+l|0},_doFinalize:function(){var a=this._data,d=a.words,b=8*this._nDataBytes,e=8*a.sigBytes;
+d[e>>>5]|=128<<24-e%32;d[(e+64>>>9<<4)+14]=h.floor(b/4294967296);d[(e+64>>>9<<4)+15]=b;a.sigBytes=4*d.length;this._process();return this._hash},clone:function(){var a=g.clone.call(this);a._hash=this._hash.clone();return a}});s.SHA256=g._createHelper(f);s.HmacSHA256=g._createHmacHelper(f)})(Math);

data/app/controllers/ums/application_controller.rb

@@ -1,4 +1,7 @@
 module Ums
   class ApplicationController < ActionController::Base
+
+	  before_action :set_current_session
+    after_action :operate_log
   end
 end

data/app/controllers/ums/functions_controller.rb

@@ -31,7 +31,7 @@ class Ums::FunctionsController < ApplicationController
         format.html { redirect_to ums.functions_url, notice: '功能创建创建成功.' }
         format.json { render action: 'show', status: :created, location: @ums_function }
       else
-        format.html { render action: 'new' }
+        format.html { render action: 'new' , status: :unprocessable_entity}
         format.json { render json: @ums_function.errors, status: :unprocessable_entity }
       end
     end
@@ -45,7 +45,7 @@ class Ums::FunctionsController < ApplicationController
         format.html { redirect_to ums.functions_url, notice: '功能修改成功' }
         format.json { head :no_content }
       else
-        format.html { render action: 'edit' }
+        format.html { render action: 'edit' , status: :unprocessable_entity}
         format.json { render json: @ums_function.errors, status: :unprocessable_entity }
       end
     end

data/app/controllers/ums/logs_controller.rb

@@ -3,7 +3,15 @@ class Ums::LogsController < ApplicationController
   # GET /ums/logs
   # GET /ums/logs.json
   def index
-    @ums_logs = Ums::Log.all.page(params[:page]).order("id DESC")
+  	where = "1"
+  	where += " AND level = '#{params[:level]}'" unless params[:level].blank? 
+    where += " AND log_type = '#{params[:log_type]}'" unless params[:log_type].blank?
+    where += " AND operator = '#{params[:operator]}'" unless params[:operator].blank? 
+    where += " AND model_class like '#{params[:model_class]}%'" unless params[:model_class].blank? 
+    where += " AND model_id = #{params[:model_id]}" unless params[:model_id].blank? 
+    where += " AND ip like '#{params[:ip]}%'" unless params[:ip].blank? 
+    where += " AND created_at like '#{params[:created_at]}%'" unless params[:created_at].blank? 
+    @ums_logs = Ums::Log.where(where).page(params[:page]).order("id DESC")
   end
 
 end

data/app/controllers/ums/roles_controller.rb

@@ -32,7 +32,7 @@ class Ums::RolesController < ApplicationController
         format.html { redirect_to ums.roles_url, notice: '角色创建成功.' }
         format.json { render action: 'show', status: :created, location: @ums_role }
       else
-        format.html { render action: 'new' }
+        format.html { render action: 'new' , status: :unprocessable_entity}
         format.json { render json: @ums_role.errors, status: :unprocessable_entity }
       end
     end
@@ -46,7 +46,7 @@ class Ums::RolesController < ApplicationController
         format.html { redirect_to ums.roles_url, notice: '角色修改成功.' }
         format.json { head :no_content }
       else
-        format.html { render action: 'edit' }
+        format.html { render action: 'edit' , status: :unprocessable_entity}
         format.json { render json: @ums_role.errors, status: :unprocessable_entity }
       end
     end

data/app/controllers/ums/users_controller.rb

@@ -1,7 +1,7 @@
 class Ums::UsersController < ApplicationController
 
-  skip_before_filter :verify_authenticity_token, :if => Proc.new { |c| c.request.format == 'application/json' }
-  skip_before_filter :authorize, :only => [:login,:logout]
+  skip_before_action :verify_authenticity_token, :if => Proc.new { |c| c.request.format == 'application/json' }
+  skip_before_action :authorize, :only => [:login,:logout]
 
   before_action :set_ums_user, only: [:show, :edit, :update, :destroy]
   before_action :set_ums_roles, only: [:new,:edit,:update,:create]
@@ -34,7 +34,7 @@ class Ums::UsersController < ApplicationController
 
         uri = session[:original_uri]
         session[:original_uri] = nil
-        log_info("login",params[:account] + " login success",request.remote_ip)
+        log_info("login",params[:account] + "登录成功")
 
         user_permission = '^redactor_rails|welcome|profile|password|' # 上传组件和用户基础操作默认许可
         user.role.functions.each do |function| 
@@ -55,7 +55,7 @@ class Ums::UsersController < ApplicationController
         end
 
       else
-        log_error("login",params[:account] + " login failed",request.remote_ip)
+        log_error("login",params[:account] + "登录失败")
         respond_to do |format|
           error_info = "无效的账号或密码"
           format.html { flash.now[:notice] = error_info }
@@ -67,6 +67,7 @@ class Ums::UsersController < ApplicationController
   end
 
   def logout
+    log_info("logout",session[:user_account].to_s + "退出登录")
     session[:user_id] = nil
     session[:user_account] = nil
     session[:user_name] = nil
@@ -74,7 +75,7 @@ class Ums::UsersController < ApplicationController
     session[:last_login_ip] = nil
     session[:login_count] = nil
     #flash[:notice] = "已退出"
-    redirect_to  '/' 
+    redirect_to  root_path 
   end
 
   def password
@@ -91,28 +92,33 @@ class Ums::UsersController < ApplicationController
         flash.now[:error] = "新密码不能为空"
         return
       end
-      user = Ums::User.find_by_id(session[:user_id])
+      user = Ums::User.find_by_id(session[:user_id])      
       if user.verify_password(params[:old_password])
         user.password=params[:new_password]
-        user.save
-        flash.now[:notice] = "密码修改成功"
-        params.delete(:new_password)
-        params.delete(:old_password)
-        params.delete(:re_password)
+        if user.save
+          flash.now[:notice] = "密码修改成功"
+          params.delete(:new_password)
+          params.delete(:old_password)
+          params.delete(:re_password)
+        else
+          flash.now[:error] = user.errors.full_messages.to_s
+        end
       else 
         flash.now[:error] = "旧密码输入错误"
-      end  
+      end
+      render status: :unprocessable_entity   
     end
   end
 
   def profile
     @ums_user = Ums::User.find_by_id(session[:user_id])
     if request.patch?
-     if @ums_user.update(params.require(:user).permit(:email))
-       flash.now[:notice] = "资料修改成功"
-     else
-       flash.now[:error] = "资料修改失败"
-     end
+       if @ums_user.update(params.require(:user).permit(:email))
+         flash.now[:notice] = "资料修改成功"
+       else
+         flash.now[:error] = "资料修改失败"       
+       end
+       render status: :unprocessable_entity 
     end
   end
 
@@ -141,7 +147,7 @@ class Ums::UsersController < ApplicationController
         format.html { redirect_to ums.users_url, notice: '用户创建成功.' }
         format.json { render action: 'show', status: :created, location: @ums_user }
       else
-        format.html { render action: 'new' }
+        format.html { render action: 'new' , status: :unprocessable_entity }
         format.json { render json: @ums_user.errors, status: :unprocessable_entity }
       end
     end
@@ -155,7 +161,7 @@ class Ums::UsersController < ApplicationController
         format.html { redirect_to ums.users_url, notice: '用户修改成功.' }
         format.json { head :no_content }
       else
-        format.html { render action: 'edit' }
+        format.html { render action: 'edit', status: :unprocessable_entity  }
         format.json { render json: @ums_user.errors, status: :unprocessable_entity }
       end
     end

data/app/helpers/ums/application_helper.rb

@@ -1,7 +1,46 @@
 module Ums
   module ApplicationHelper
 
-   def authorize
+    #为ActiveRecord类设置session变量
+    def set_current_session
+      # Define an accessor. The session is always in the current controller
+      # instance in @_request.session. So we need a way to access this in
+      # our model
+      accessor = instance_variable_get(:@_request)
+
+      # This defines a method session in ActiveRecord::Base. If your model
+      # inherits from another Base Class (when using MongoMapper or similar),
+      # insert the class here.
+      ActiveRecord::Base.send(:define_method, "session", proc {accessor.session})
+    end
+
+    #操作日志，主要针对model的增删改
+    def operate_log    
+       log = Ums::Log.new
+       log.level="info"
+       log.log_type= action_name
+       log.ip= request.remote_ip       
+       log.operator = session[:user_account] unless session[:user_account].blank?
+       model_class = self.class.name.sub("Controller", "")
+       #logger.debug("model_class:"+ model_class)
+       log.model_class = model_class
+       model_var_name = model_class.singularize.sub("::", "_").downcase
+       model_var = instance_variable_get("@"+model_var_name)
+       if model_var && model_var.kind_of?(ActiveRecord::Base)
+         log.model_id = model_var.id
+         log.data = ""
+         log.data = model_var.name if model_var.has_attribute?(:name) && model_var.name
+         log.data = model_var.title if model_var.has_attribute?(:title) && model_var.title
+         if !model_var.errors.blank?
+           log.level="error" 
+           log.data += model_var.errors.full_messages.to_s
+         end
+       end
+       log.save
+    end
+
+    #用户访问权限检查
+    def authorize
       #unless Account.find_by_id(session[:account_id])
       if session[:user_id].nil?
         session[:original_uri] = request.url
@@ -12,35 +51,44 @@ module Ums
 
       path = params[:controller] + "/" + params[:action]
       unless validate_permission(path)
-         render status: :forbidden, text: "对不起，您没有访问该地址的权限"
+         render status: :forbidden,plain: "对不起，您没有访问该地址的权限"
       end    
-   end
-
-   def log_info(log_type,log_content,log_ip)
-		log = Ums::Log.new
-		log.level="info"
-		log.log_type=log_type
-		log.data=log_content
-		log.ip=log_ip
-		log.save
-  end
+    end
+    
+    #根据访问路径判断访问权限
+    def validate_permission(path)
+      permission = session[:user_permission]
 
-  def log_error(log_type,log_content,log_ip)
-		log = Ums::Log.new
-		log.level="error"
-		log.log_type=log_type
-		log.data=log_content
-		log.ip=log_ip
-		log.save
-  end
+      logger.debug("user_permission:" + permission.to_s)
+      logger.debug("user_path:" + path.to_s)
+      return false if permission.nil? || path.nil?
+      is_validated = path.match(permission)
+      is_validated = (path + "/index").match(permission) unless is_validated #增加模块默认地址检测
 
-  def validate_permission(path)
-    permission = session[:user_permission]
+      return is_validated
+    end
+
+    #记录信息日志
+    def log_info(log_type,log_content)
+      log = Ums::Log.new
+      log.level="info"
+      log.log_type=log_type
+      log.data=log_content
+      log.ip=request.remote_ip
+      log.operator = session[:user_account] unless session[:user_account].blank?
+      log.save
+    end
+
+    #记录错误日志
+    def log_error(log_type,log_content)
+      log = Ums::Log.new
+      log.level="error"
+      log.log_type=log_type
+      log.data=log_content
+      log.ip=request.remote_ip
+      log.operator = session[:user_account] unless session[:user_account].blank?
+      log.save
+    end
 
-    logger.debug("user_permission:" + permission) unless permission.nil?
-    logger.debug("user_path:" + path) unless path.nil?
-    return false if permission.nil? || path.nil?
-    return path.match(permission)
-  end
   end
 end

data/app/models/ums/function.rb

@@ -3,4 +3,18 @@ class Ums::Function < ActiveRecord::Base
     validates_presence_of :name
     validates_presence_of :controller
     validates_uniqueness_of :name
+    
+    belongs_to :created_by, class_name: "Ums::User"
+    belongs_to :updated_by, class_name: "Ums::User"
+
+    before_validation :record_operator
+
+    #记录操作人员
+    def record_operator
+
+      if self.respond_to?(:session) && session[:user_id]
+        self.created_by_id = session[:user_id] if new_record?
+        self.updated_by_id = session[:user_id]
+      end
+    end
 end

data/app/models/ums/log.rb

@@ -1,2 +1,26 @@
 class Ums::Log < ActiveRecord::Base
+
+  def level_name
+  	 name = level
+     name = '错误' if self.level == 'error'
+     name = '信息' if self.level == 'info'
+     name
+  end
+  def self.level_options
+     [['错误', 'error'], ['信息', 'info']]
+  end
+
+  def log_type_name
+  	 name = log_type
+     name = '登录' if self.log_type == 'login'
+     name = '退出' if self.log_type == 'logout'
+     name = '新建' if self.log_type == 'create'
+     name = '修改' if self.log_type == 'update'
+     name = '删除' if self.log_type == 'destroy'     
+     name
+  end
+  def self.log_type_options
+     [['登录', 'login'], ['退出', 'logout'], ['新建', 'create'], ['修改', 'update'],
+      ['删除', 'destroy']]
+  end
 end

data/app/models/ums/role.rb

@@ -2,4 +2,17 @@ class Ums::Role < ActiveRecord::Base
 	has_and_belongs_to_many :functions
 	validates_presence_of :name
 	validates_uniqueness_of :name
+
+    belongs_to :created_by, class_name: "Ums::User"
+    belongs_to :updated_by, class_name: "Ums::User"
+
+	before_validation :record_operator    
+
+    #记录操作人员
+    def record_operator
+      if self.respond_to?(:session) && session[:user_id]
+        self.created_by_id = session[:user_id] if new_record?
+        self.updated_by_id = session[:user_id]
+      end
+    end
 end

data/app/models/ums/user.rb

@@ -6,6 +6,18 @@ class Ums::User < ActiveRecord::Base
 
   validate :password_non_blank
 
+  belongs_to :created_by, class_name: "Ums::User"
+  belongs_to :updated_by, class_name: "Ums::User"
+
+  before_validation :record_operator
+
+    #记录操作人员
+    def record_operator
+      if self.respond_to?(:session) && session[:user_id]
+        self.created_by_id = session[:user_id] if new_record?
+        self.updated_by_id = session[:user_id]
+      end
+    end
 
     def self.authenticate(account,password)
     	user = self.find_by_account(account)
@@ -48,11 +60,10 @@ class Ums::User < ActiveRecord::Base
 
 	private
 	def password_non_blank
-		errors.add(:password,"missing password") if hashed_password.blank?
-		
+		errors.add(:password,"missing password") if hashed_password.blank?		
 	end
-	def self.encrypted_password(password,slat)
-		Digest::SHA1.hexdigest(password+slat)
+	def self.encrypted_password(password,slat)		
+    Digest::SHA2.hexdigest(password.to_s + slat.to_s)    
 	end
 	def create_salt
 	    self.salt =  rand.to_s

data/app/views/ums/functions/index.html.erb

@@ -13,6 +13,9 @@
       <th>功能名称</th>
       <th>模块名称</th>
       <th>操作名称</th>
+      <th>创建人</th>
+      <th>修改人</th>            
+      <th>修改时间</th>           
       <th></th>
       <th></th>
     </tr>
@@ -24,8 +27,11 @@
         <td><%= ums_function.name %></td>
         <td><%= ums_function.controller %></td>
         <td><%= ums_function.action %></td>
+        <td><%= ums_function.created_by.account if ums_function.created_by %></td>   
+        <td><%= ums_function.updated_by.account if ums_function.updated_by %></td>   
+        <td><%= ums_function.updated_at.strftime('%Y-%m-%d %H:%M:%S') %></td>              
         <td><%= link_to '修改', ums.edit_function_path(ums_function) %></td>
-        <td><%= link_to '删除', ums_function, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+        <td><%= link_to '删除', ums_function, method: :delete, data: { confirm: '您确定要删除?' } %></td>
       </tr>
     <% end %>
   </tbody>

data/app/views/ums/logs/index.html.erb

@@ -1,11 +1,36 @@
+<%= form_tag nil,method: :get,id:"search_form" do %>  
+<div class="row">
+<div class="col-md-2">
 <h1>日志列表</h1>
+</div>
+  <div class="col-md-1" style="margin-top: 30px;margin-bottom: 0px;line-height:34px;">
+     <%= select_tag :level, options_for_select(Ums::Log.level_options,params[:level]), prompt: "日志级别" %>
+  </div>
+  <div class="col-md-1" style="margin-top: 30px;margin-bottom: 0px;line-height:34px;">
+     <%= select_tag :log_type, options_for_select(Ums::Log.log_type_options,params[:log_type]), prompt: "日志类型" %>
+  </div>  
+  <div class="col-md-2" style="margin-top: 30px;margin-bottom: 0px;">
+     <%= text_field_tag :operator,params[:operator],class:"form-control",placeholder:"操作人员"%>
+  </div>
+  <div class="col-md-2" style="margin-top: 30px;margin-bottom: 0px;">
+     <%= text_field_tag :ip,params[:ip],class:"form-control",placeholder:"操作IP"%>
+  </div>  
+    <div class="col-md-2" style="margin-top: 30px;margin-bottom: 0px;">
+     <%= text_field_tag :created_at,params[:created_at],class:"form-control",placeholder:"操作时间"%>
+  </div>  
+    <div class="col-md-1" style="margin-top: 30px;margin-bottom: 0px; ">
+     <%= submit_tag "搜索" ,:class => "btn btn-info" %>     
+  </div>
+</div>
+<% end %> 
 
 <table class="table table-striped table-bordered table-condensed">
   <thead>
     <tr>
+      <th>日志级别</th>      
       <th>日志类型</th>
-      <th>日志级别</th>
       <th>日志内容</th>
+      <th>操作人员</th>      
       <th>操作IP</th>
       <th>操作时间</th>
     </tr>
@@ -14,9 +39,12 @@
   <tbody>
     <% @ums_logs.each do |ums_log| %>
       <tr>
-        <td><%= ums_log.log_type %></td>
-        <td><%= ums_log.level %></td>
-        <td><%= ums_log.data %></td>
+        <td><%= ums_log.level_name %></td>        
+        <td><%= ums_log.log_type_name %></td>
+        <td><%= ums_log.model_class + "(" +  ums_log.model_id.to_s + ")" +
+                                  ":" unless ums_log.model_class.blank? %>
+            <%= ums_log.data %></td>        
+        <td><%= ums_log.operator %></td> 
         <td><%= ums_log.ip %></td> 
         <td><%= ums_log.created_at.strftime('%Y-%m-%d %H:%M:%S') %></td>      
       </tr>

data/app/views/ums/roles/_form.html.erb

@@ -12,7 +12,7 @@
   <% end %>
 
   <div class="field">
-    <%= f.label :name %>
+    <%= f.label :name,'角色名称' %>
     <%= f.text_field :name %>
   </div>
     <div class="field">

data/app/views/ums/roles/index.html.erb

@@ -12,6 +12,9 @@
     <tr>
       <th>角色名称</th>
       <th>相关功能</th>
+      <th>创建人</th>
+      <th>修改人</th>            
+      <th>修改时间</th>            
       <th></th>      
       <th></th>
     </tr>
@@ -28,8 +31,11 @@
           end
           %>
         </td>
+        <td><%= ums_role.created_by.account if ums_role.created_by %></td>   
+        <td><%= ums_role.updated_by.account if ums_role.updated_by %></td>     
+        <td><%= ums_role.updated_at.strftime('%Y-%m-%d %H:%M:%S') %></td>                 
         <td><%= link_to '修改', ums.edit_role_path(ums_role) %></td>
-        <td><%= link_to '删除', ums_role, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+        <td><%= link_to '删除', ums_role, method: :delete, data: { confirm: '您确定要删除?' } %></td>
       </tr>
     <% end %>
   </tbody>

data/app/views/ums/users/_form.html.erb

@@ -1,3 +1,4 @@
+<%= javascript_include_tag "ums/application" %>
 <%= form_for(@ums_user) do |f| %>
   <% if @ums_user.errors.any? %>
     <div id="error_explanation">
@@ -36,9 +37,26 @@
     <%= f.check_box :is_enabled %>
   </div>
   <div class="actions">
-    <%= f.submit ' 保存 ',:class => 'btn btn-primary',data: { disable_with: '正在保存...' }%>
+    <%= f.submit ' 保存 ',:class => 'btn btn-primary',data: { disable_with: '正在保存...' } ,:onclick => "return validate_form();"%>
     &nbsp;&nbsp;
     <%= link_to ' 返回 ', ums.users_path,:class => "btn btn-default" %>
   </div>
 <% end %>
 
+ <script type="text/javascript">
+function validate_form (){
+    var account = $("#user_account").val();
+    var password = $("#user_password").val();
+    if (account == "") {
+        alert("请输入账号");
+        $("#user_account").focus();
+        return false;
+    };
+    if (password != "") {
+       password = CryptoJS.SHA256(account +  CryptoJS.SHA256(password)).toString(CryptoJS.enc.Hex);
+       $("#user_password").val(password);
+    };
+
+    return true;
+}
+</script>

data/app/views/ums/users/index.html.erb

@@ -18,6 +18,9 @@
       <th>登录次数</th>
       <th>角色</th>
       <th>是否可用</th>
+      <th>创建人</th>
+      <th>修改人</th>            
+      <th>修改时间</th>          
       <th></th>
       <th></th>
     </tr>
@@ -36,8 +39,11 @@
         <td><span class="label <%= ums_user.is_enabled ? 'label-success' : 'label-default' %>">
              <%= ums_user.is_enabled ? '是' : '否' %>
           </span></td>
+        <td><%= ums_user.created_by.account if ums_user.created_by %></td>   
+        <td><%= ums_user.updated_by.account if ums_user.updated_by %></td>     
+        <td><%= ums_user.updated_at.strftime('%Y-%m-%d %H:%M:%S') %></td>            
         <td><%= link_to '修改', ums.edit_user_path(ums_user) %></td>
-        <td><%= link_to '删除', ums_user, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+        <td><%= link_to '删除', ums_user, method: :delete, data: { confirm: '您确定要删除?' } %></td>
       </tr>
     <% end %>
   </tbody>

data/app/views/ums/users/login.html.erb

@@ -1,3 +1,5 @@
+<%= javascript_include_tag "ums/application" %>
+
 <% if flash[:notice] || flash[:error]  %>
 <div class="alert <%= "alert-success" if flash[:notice] %> <%= "alert-error" if flash[:error] %>">
   <a class="close" data-dismiss="alert">×</a>
@@ -16,7 +18,28 @@
         	<%= password_field_tag :password,params[:password] %>        	
         </div>
         <div>
-                <%= submit_tag "登录" ,:class => "btn btn-primary" %>
+                <%= submit_tag "登录" ,:class => "btn btn-primary" ,:onclick => "return validate_form();"%>
         </div>
 	</fieldset>
-<% end %>
+<% end %>
+ <script type="text/javascript">
+function validate_form (){
+    var account = $("#account").val();
+    var password = $("#password").val();
+    if (account == "") {
+        alert("请输入账号");
+        $("#account").focus();
+        return false;
+    };
+    if (password == "") {
+        alert("输入密码");
+        $("#password").focus();
+        return false;
+    };
+
+    password = CryptoJS.SHA256(account +  CryptoJS.SHA256(password)).toString(CryptoJS.enc.Hex);
+    $("#password").val(password);
+
+    return true;
+}
+</script>

data/app/views/ums/users/password.html.erb

@@ -1,3 +1,5 @@
+<%= javascript_include_tag "ums/application" %>
+
 <h1>修改密码</h1>
 <% if flash[:notice] || flash[:error]  %>
 <div class="alert <%= "alert-success" if flash[:notice] %> <%= "alert-danger" if flash[:error] %>">
@@ -6,21 +8,58 @@
 </div>
 <% end %>
 <%= form_tag do %>
+   <%= hidden_field_tag :account,session[:user_account] %>
 	<fieldset>
         <div>
         	<label for="old_password">输入旧密码:</label>
-        	<%= password_field_tag :old_password,params[:old_password] %>
+        	<%= password_field_tag :old_password %>
         </div>
         <div>
         	<label for="new_password">输入新密码:</label>
-        	<%= password_field_tag :new_password,params[:new_password] %>        	
+        	<%= password_field_tag :new_password %>        	
         </div>
        <div>
                 <label for="re_password">重复新密码:</label>
-                <%= password_field_tag :re_password,params[:re_password] %>           
+                <%= password_field_tag :re_password %>           
         </div>
         <div>
-        	<%= submit_tag "修改" ,:class => "btn btn-primary" %>
+        	<%= button_tag "修改" ,:class => "btn btn-primary",:onclick => "return validate_form();"%>
         </div>
 	</fieldset>
-<% end %>
+<% end %>
+
+ <script type="text/javascript">
+function validate_form (){
+    var account = $("#account").val();
+    var old_password = $("#old_password").val();
+    var new_password = $("#new_password").val();
+    var re_password = $("#re_password").val();
+    if (old_password == "") {
+        alert("请输入旧密码");
+        $("#old_password").focus();
+        return false;
+    };
+    if (new_password == "") {
+        alert("输入新密码");
+        $("#new_password").focus();
+        return false;
+    };
+    if (new_password != re_password) {
+        alert("两次输入的新密码不一致");
+        $("#re_password").focus();
+        return false;
+    };
+
+    old_password = CryptoJS.SHA256(account +  CryptoJS.SHA256(old_password)).toString(CryptoJS.enc.Hex);
+    new_password = CryptoJS.SHA256(account +  CryptoJS.SHA256(new_password)).toString(CryptoJS.enc.Hex);
+    re_password = CryptoJS.SHA256(account +  CryptoJS.SHA256(re_password)).toString(CryptoJS.enc.Hex);
+
+    //alert(old_password);
+
+    $("#old_password").val(old_password);
+    $("#new_password").val(new_password);
+    $("#re_password").val(re_password);
+
+    return true;
+}
+</script>

data/app/views/ums/users/welcome.html.erb

@@ -4,7 +4,7 @@
         <div>
         	这是您第<%= session[:login_count]%>次登录.
             <% if session[:login_count] > 1 %>
-            您上次登录时间是: <%= session[:last_login_time].strftime('%Y-%m-%d %H:%M') %>，登录IP为: <%= session[:last_login_ip]%>
+            您上次登录时间是: <%= session[:last_login_time].to_time.strftime('%Y-%m-%d %H:%M') %>，登录IP为: <%= session[:last_login_ip]%>
             <% end %>
         </div>
 	</fieldset>

data/db/migrate/20141113071450_add_operator_for_ums_users.rb

@@ -0,0 +1,10 @@
+class AddOperatorForUmsUsers < ActiveRecord::Migration
+  def change
+  	 add_column :ums_users , :created_by_id, :integer
+  	 add_column :ums_users , :updated_by_id, :integer
+  	 add_column :ums_functions , :created_by_id, :integer
+  	 add_column :ums_functions , :updated_by_id, :integer
+  	 add_column :ums_roles , :created_by_id, :integer
+  	 add_column :ums_roles , :updated_by_id, :integer  	   	 
+  end
+end

data/db/migrate/20141113071900_add_operator_for_ums_logs.rb

@@ -0,0 +1,7 @@
+class AddOperatorForUmsLogs < ActiveRecord::Migration
+  def change
+  	add_column :ums_logs , :operator, :string
+  	add_column :ums_logs , :model_class, :string  	
+  	add_column :ums_logs , :model_id, :integer
+  end
+end

data/db/seeds.rb

@@ -8,5 +8,5 @@
 functions = Ums::Function.create([{name:"用户管理",controller:'ums'}])
 role = Ums::Role.create(name:'系统管理员',functions:functions)
 #初始账号:admin 密码:admin
-Ums::User.create(account: "admin",name: "系统管理员",hashed_password: "4b1323850c4283da817ef95f32e0b00f2f31a4b2",
+Ums::User.create(account: "admin",name: "系统管理员",hashed_password: "4ef71e780c4381a5c6bae8cad6c88b356f526128ae19d2f1cfacfc4f05c6e14f",
 	             salt: "0.8575214227141923",login_count:0,is_enabled:true,role:role)

data/lib/ums/engine.rb

@@ -2,7 +2,7 @@ module Ums
   class Engine < ::Rails::Engine
     isolate_namespace Ums
     config.to_prepare do
-      Dir.glob(Rails.root + "app/decorators/**/*_decorator*.rb").each do |c|
+      Dir.glob(Rails.root + "app/decorators/**/*.rb").each do |c|
         require_dependency(c)
       end
     end

data/lib/ums/version.rb

@@ -1,3 +1,3 @@
 module Ums
-  VERSION = "0.1.2"
+  VERSION = "0.3.5"
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: ums
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.3.5
 platform: ruby
 authors:
 - wangfuhai
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-02-22 00:00:00.000000000 Z
+date: 2025-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   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: user manage system with rails
@@ -59,7 +59,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- MIT-LICENSE
+- README.rdoc
+- Rakefile
 - app/assets/javascripts/ums/application.js
+- app/assets/javascripts/ums/sha256.min.js
 - app/assets/stylesheets/ums/application.css
 - app/controllers/ums/application_controller.rb
 - app/controllers/ums/functions_controller.rb
@@ -71,11 +75,11 @@ files:
 - app/helpers/ums/logs_helper.rb
 - app/helpers/ums/roles_helper.rb
 - app/helpers/ums/users_helper.rb
+- app/models/ums.rb
 - app/models/ums/function.rb
 - app/models/ums/log.rb
 - app/models/ums/role.rb
 - app/models/ums/user.rb
-- app/models/ums.rb
 - app/views/layouts/ums/application.html.erb
 - app/views/ums/functions/_form.html.erb
 - app/views/ums/functions/edit.html.erb
@@ -101,14 +105,15 @@ files:
 - db/migrate/20131016015833_create_ums_users.rb
 - db/migrate/20131016020202_create_ums_logs.rb
 - db/migrate/20131016020423_create_ums_functions_roles.rb
+- db/migrate/20141113071450_add_operator_for_ums_users.rb
+- db/migrate/20141113071900_add_operator_for_ums_logs.rb
 - db/seeds.rb
 - lib/tasks/ums_tasks.rake
+- lib/ums.rb
 - lib/ums/engine.rb
 - lib/ums/version.rb
-- lib/ums.rb
-- MIT-LICENSE
-- Rakefile
-- README.rdoc
+- test/dummy/README.rdoc
+- test/dummy/Rakefile
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
@@ -117,6 +122,7 @@ files:
 - test/dummy/bin/bundle
 - test/dummy/bin/rails
 - test/dummy/bin/rake
+- test/dummy/config.ru
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
 - test/dummy/config/database.yml
@@ -133,41 +139,39 @@ files:
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
-- test/dummy/config.ru
-- test/dummy/log/development.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
-- test/dummy/Rakefile
-- test/dummy/README.rdoc
 - test/integration/navigation_test.rb
 - test/test_helper.rb
 - test/ums_test.rb
 homepage: https://github.com/wangfuhai2013/ums-rails
-licenses: []
+licenses:
+- MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.5
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: user manage system with rails
 test_files:
+- test/dummy/README.rdoc
+- test/dummy/Rakefile
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
@@ -193,13 +197,10 @@ test_files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/config.ru
-- test/dummy/log/development.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
-- test/dummy/Rakefile
-- test/dummy/README.rdoc
 - test/integration/navigation_test.rb
 - test/test_helper.rb
 - test/ums_test.rb

data/test/dummy/log/development.log

@@ -1,72 +0,0 @@
-   (2.1ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
-   (0.8ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
-  ActiveRecord::SchemaMigration Load (0.3ms)  SELECT "schema_migrations".* FROM "schema_migrations"
-Migrating to CreateUmsFunctions (20131016015419)
-   (0.1ms)  begin transaction
-   (0.8ms)  CREATE TABLE "ums_functions" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "controller" varchar(255), "action" varchar(255), "created_at" datetime, "updated_at" datetime) 
-  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20131016015419"]]
-   (0.7ms)  commit transaction
-Migrating to CreateUmsRoles (20131016015456)
-   (0.1ms)  begin transaction
-   (0.4ms)  CREATE TABLE "ums_roles" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "created_at" datetime, "updated_at" datetime) 
-  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20131016015456"]]
-   (0.8ms)  commit transaction
-Migrating to CreateUmsUsers (20131016015833)
-   (0.1ms)  begin transaction
-   (1.0ms)  CREATE TABLE "ums_users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "email" varchar(255), "hashed_password" varchar(255), "salt" varchar(255), "last_login_time" datetime, "last_login_ip" varchar(255), "login_count" integer, "role_id" integer, "is_enabled" boolean, "created_at" datetime, "updated_at" datetime) 
-   (0.2ms)  CREATE INDEX "index_ums_users_on_role_id" ON "ums_users" ("role_id")
-  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20131016015833"]]
-   (1.8ms)  commit transaction
-Migrating to CreateUmsLogs (20131016020202)
-   (0.1ms)  begin transaction
-   (0.4ms)  CREATE TABLE "ums_logs" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "log_type" varchar(255), "level" varchar(255), "data" text, "ip" varchar(255), "created_at" datetime, "updated_at" datetime) 
-  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20131016020202"]]
-   (0.8ms)  commit transaction
-Migrating to CreateUmsFunctionsRoles (20131016020423)
-   (0.1ms)  begin transaction
-   (0.5ms)  CREATE TABLE "ums_functions_roles" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "function_id" integer, "role_id" integer) 
-   (0.2ms)  CREATE INDEX "index_ums_functions_roles_on_function_id" ON "ums_functions_roles" ("function_id")
-   (0.1ms)  CREATE INDEX "index_ums_functions_roles_on_role_id" ON "ums_functions_roles" ("role_id")
-  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20131016020423"]]
-   (0.8ms)  commit transaction
-Migrating to CreateUmsProductCategories (20131106063317)
-   (0.1ms)  begin transaction
-   (0.6ms)  CREATE TABLE "ums_product_categories" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "code" varchar(255), "picture" varchar(255), "created_at" datetime, "updated_at" datetime) 
-  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20131106063317"]]
-   (1.0ms)  commit transaction
-Migrating to CreateUmsProductColors (20131106063633)
-   (0.1ms)  begin transaction
-   (0.3ms)  CREATE TABLE "ums_product_colors" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "created_at" datetime, "updated_at" datetime) 
-  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20131106063633"]]
-   (0.8ms)  commit transaction
-Migrating to CreateUmsProductMaterials (20131106063658)
-   (0.2ms)  begin transaction
-   (0.7ms)  CREATE TABLE "ums_product_materials" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "created_at" datetime, "updated_at" datetime) 
-  SQL (0.3ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20131106063658"]]
-   (1.2ms)  commit transaction
-Migrating to CreateUmsProductBrands (20131106063719)
-   (0.1ms)  begin transaction
-   (0.7ms)  CREATE TABLE "ums_product_brands" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "created_at" datetime, "updated_at" datetime) 
-  SQL (0.3ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20131106063719"]]
-   (0.8ms)  commit transaction
-Migrating to CreateUmsProductSurfaces (20131106064312)
-   (0.1ms)  begin transaction
-   (0.4ms)  CREATE TABLE "ums_product_surfaces" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "code" varchar(255), "material" varchar(255), "color" varchar(255), "created_at" datetime, "updated_at" datetime) 
-  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20131106064312"]]
-   (0.6ms)  commit transaction
-Migrating to CreateUmsProductItems (20131106071449)
-   (0.1ms)  begin transaction
-   (0.7ms)  CREATE TABLE "ums_product_items" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255), "code" varchar(255), "category_id" integer, "material_id" integer, "length" integer, "width" integer, "height" integer, "depth" integer, "diameter" integer, "brand_id" integer, "stock_price" integer, "sell_price" integer, "description" text, "picture_id" integer, "created_at" datetime, "updated_at" datetime) 
-   (0.2ms)  CREATE INDEX "index_ums_product_items_on_category_id" ON "ums_product_items" ("category_id")
-   (0.2ms)  CREATE INDEX "index_ums_product_items_on_material_id" ON "ums_product_items" ("material_id")
-   (0.2ms)  CREATE INDEX "index_ums_product_items_on_brand_id" ON "ums_product_items" ("brand_id")
-   (0.3ms)  CREATE INDEX "index_ums_product_items_on_picture_id" ON "ums_product_items" ("picture_id")
-  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20131106071449"]]
-   (1.4ms)  commit transaction
-Migrating to CreateUmsProductPictrues (20131106071729)
-   (0.2ms)  begin transaction
-   (0.8ms)  CREATE TABLE "ums_product_pictrues" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "item_id" integer, "path" varchar(255), "description" text, "created_at" datetime, "updated_at" datetime) 
-   (0.3ms)  CREATE INDEX "index_ums_product_pictrues_on_item_id" ON "ums_product_pictrues" ("item_id")
-  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20131106071729"]]
-   (0.9ms)  commit transaction
-  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"