ums 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 064961d8ca4ae8073ab7f3b042f19b023d2db79f
-  data.tar.gz: 1863125d14a533c676be160553898d060ce8eb04
+  metadata.gz: 7923f5094754722a2c451d3a951249487bab2668
+  data.tar.gz: f362e18f75cf1cd6dd74ecd2559fed18a8f8c100
 SHA512:
-  metadata.gz: 0ae519a7a351d85effb442f2769a46512b04e314a6e4474e38d1e500fe98f2d06388baeb479dd2d1ddffe940c40aec64bf7325a7d266967a991a0bb5b912570e
-  data.tar.gz: 46f7626fb5cc968e598e5a7624b988bcbd418b7b2045fddd485f5b970fbcecf9e0dcd76f1e1d9a66ed9c6c6228733b00820bdd7c2287531b64c1f41aad887ed1
+  metadata.gz: 898fdaa99bed7774ce6de88c9cd2930b886f0c5fb3bd8c00aee05cd5fa6d4e56f5bafff02541e0cc5bab982cef293ef6e9906004efe491a1a79336457a1d24ec
+  data.tar.gz: 4d26b8df5511a8165a1139361ace7bb3f884ecb04ba1c2be450d5311e24438857c8e23680cf1eef3f0a6825c2f0d943c3ac9d90887b7eab8b731754d777a4129

data/app/controllers/ums/functions_controller.rb

@@ -28,7 +28,7 @@ class Ums::FunctionsController < ApplicationController
 
     respond_to do |format|
       if @ums_function.save
-        format.html { redirect_to ums.functions_url, notice: 'Function was successfully created.' }
+        format.html { redirect_to ums.functions_url, notice: '功能创建创建成功.' }
         format.json { render action: 'show', status: :created, location: @ums_function }
       else
         format.html { render action: 'new' }
@@ -42,7 +42,7 @@ class Ums::FunctionsController < ApplicationController
   def update
     respond_to do |format|
       if @ums_function.update(ums_function_params)
-        format.html { redirect_to ums.functions_url, notice: 'Function was successfully updated.' }
+        format.html { redirect_to ums.functions_url, notice: '功能修改成功' }
         format.json { head :no_content }
       else
         format.html { render action: 'edit' }
@@ -56,7 +56,7 @@ class Ums::FunctionsController < ApplicationController
   def destroy
     @ums_function.destroy
     respond_to do |format|
-      format.html { redirect_to ums.functions_url }
+      format.html { redirect_to ums.functions_url , notice: '功能删除成功.'}
       format.json { head :no_content }
     end
   end

data/app/controllers/ums/roles_controller.rb

@@ -29,7 +29,7 @@ class Ums::RolesController < ApplicationController
 
     respond_to do |format|
       if @ums_role.save
-        format.html { redirect_to ums.roles_url, notice: 'Role was successfully created.' }
+        format.html { redirect_to ums.roles_url, notice: '角色创建成功.' }
         format.json { render action: 'show', status: :created, location: @ums_role }
       else
         format.html { render action: 'new' }
@@ -43,7 +43,7 @@ class Ums::RolesController < ApplicationController
   def update
     respond_to do |format|
       if @ums_role.update(ums_role_params)
-        format.html { redirect_to ums.roles_url, notice: 'Role was successfully updated.' }
+        format.html { redirect_to ums.roles_url, notice: '角色修改成功.' }
         format.json { head :no_content }
       else
         format.html { render action: 'edit' }
@@ -61,7 +61,7 @@ class Ums::RolesController < ApplicationController
       @ums_role.destroy
     end
     respond_to do |format|
-      format.html { redirect_to ums.roles_url }
+      format.html { redirect_to ums.roles_url , notice: '角色删除成功.'}
       format.json { head :no_content }
     end
   end

data/app/controllers/ums/users_controller.rb

@@ -1,34 +1,42 @@
 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,:profile,:password]
+  skip_before_filter :authorize, :only => [:login,:logout]
 
   before_action :set_ums_user, only: [:show, :edit, :update, :destroy]
   before_action :set_ums_roles, only: [:new,:edit,:update,:create]
   # GET /ums/users
   # GET /ums/users.json
 
- def login
+  def welcome    
+  end
+
+  def login
     if request.post?
-      #account = Account.authenticate(params[:login_name],params[:password])
-      user = Ums::User.authenticate(params[:login_name],params[:password])
+      user = Ums::User.authenticate(params[:account],params[:password])
       if user 
         login_count = user.login_count      
         login_count = 0 if login_count.nil?
         login_count += 1
+        
+        session[:last_login_time] = user.last_login_time
+        session[:last_login_ip] = user.last_login_ip
+        session[:login_count] = login_count
+
         user.last_login_time = Time.now
         user.last_login_ip = request.remote_ip
         user.login_count = login_count
         user.save(validate: false)
 
         session[:user_id] = user.id
+        session[:user_account] = user.account
         session[:user_name] = user.name
 
         uri = session[:original_uri]
         session[:original_uri] = nil
-        log_info("login",params[:login_name] + " login success",request.remote_ip)
+        log_info("login",params[:account] + " login success",request.remote_ip)
 
-        user_permission = '^redactor_rails|' # 上传组件
+        user_permission = '^redactor_rails|welcome|profile|password|' # 上传组件和用户基础操作默认许可
         user.role.functions.each do |function| 
           if function.action.blank?
             user_permission += '^' + function.controller
@@ -43,11 +51,11 @@ class Ums::UsersController < ApplicationController
 
         respond_to do |format|
           format.html { redirect_to  uri || main_index_path }
-          format.json { render json: {is_success:"true",message:""} }
+          format.json { render json: {is_success:"true",message:"登录成功",user:user} }
         end
 
       else
-        log_error("login",params[:login_name] + " login failed",request.remote_ip)
+        log_error("login",params[:account] + " login failed",request.remote_ip)
         respond_to do |format|
           error_info = "无效的账号或密码"
           format.html { flash.now[:notice] = error_info }
@@ -60,8 +68,11 @@ class Ums::UsersController < ApplicationController
 
   def logout
     session[:user_id] = nil
+    session[:user_account] = nil
     session[:user_name] = nil
-
+    session[:last_login_time] = nil
+    session[:last_login_ip] = nil
+    session[:login_count] = nil
     #flash[:notice] = "已退出"
     redirect_to  '/' #main_index_path
   end
@@ -127,7 +138,7 @@ class Ums::UsersController < ApplicationController
 
     respond_to do |format|
       if @ums_user.save
-        format.html { redirect_to ums.users_url, notice: 'User was successfully created.' }
+        format.html { redirect_to ums.users_url, notice: '用户创建成功.' }
         format.json { render action: 'show', status: :created, location: @ums_user }
       else
         format.html { render action: 'new' }
@@ -141,7 +152,7 @@ class Ums::UsersController < ApplicationController
   def update
     respond_to do |format|
       if @ums_user.update(ums_user_params)
-        format.html { redirect_to ums.users_url, notice: 'User was successfully updated.' }
+        format.html { redirect_to ums.users_url, notice: '用户修改成功.' }
         format.json { head :no_content }
       else
         format.html { render action: 'edit' }
@@ -155,7 +166,7 @@ class Ums::UsersController < ApplicationController
   def destroy
     @ums_user.destroy
     respond_to do |format|
-      format.html { redirect_to ums.users_url }
+      format.html { redirect_to ums.users_url, notice: '用户删除成功.' }
       format.json { head :no_content }
     end
   end
@@ -168,7 +179,7 @@ class Ums::UsersController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def ums_user_params
-      params.require(:user).permit(:name, :email, :password, :role_id, :is_enabled)
+      params.require(:user).permit(:account, :name,:email, :password, :role_id, :is_enabled)
     end
 
     def set_ums_roles

data/app/helpers/ums/application_helper.rb

@@ -12,7 +12,7 @@ module Ums
 
       path = params[:controller] + "/" + params[:action]
       unless validate_permission(path)
-         render status: :forbidden, text: "访问被拒绝"
+         render status: :forbidden, text: "对不起，您没有访问该地址的权限"
       end    
    end
 

data/app/models/ums/user.rb

@@ -1,16 +1,17 @@
 class Ums::User < ActiveRecord::Base
   belongs_to :role
 
-  validates_presence_of :name,:role,:email
-  validates_uniqueness_of :name
+  validates_presence_of :account,:role
+  validates_uniqueness_of :account,:name
 
   validate :password_non_blank
 
 
-    def self.authenticate(name,password)
-    	user = self.find_by_name(name)
+    def self.authenticate(account,password)
+    	user = self.find_by_account(account)
     	if user
       	expected_password = encrypted_password(password,user.salt)
+        #logger.debug("user.hashed_password:" + user.hashed_password + ",expected_password:" + expected_password)
       	if user.hashed_password != expected_password || !user.is_enabled
       		user = nil    		
       	end
@@ -38,6 +39,12 @@ class Ums::User < ActiveRecord::Base
 		create_salt
 		self.hashed_password = Ums::User.encrypted_password(pwd,self.salt)
 	end
+  
+  def as_json options=nil
+    options ||= {}
+    options[:except] = [:hashed_password,:salt]
+    super options
+  end
 
 	private
 	def password_non_blank

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

@@ -12,10 +12,13 @@
   <% end %>
 
   <div class="field">
-    <%= f.label :name ,'用户名'%>
+    <%= f.label :account ,'账号'%>
+    <%= f.text_field :account %>
+  </div>
+  <div class="field">
+    <%= f.label :name ,'姓名'%>
     <%= f.text_field :name %>
   </div>
-
   <div class="field">
     <%= f.label :password ,"密码" %>
     <%= f.text_field :password %>

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

@@ -8,8 +8,8 @@
 	<fieldset>
 		<legend>请登录</legend>
         <div>
-        	<label for="login_name">账号:</label>
-        	<%= text_field_tag :login_name,params[:login_name] %>
+        	<label for="account">账号:</label>
+        	<%= text_field_tag :account,params[:account] %>
         </div>
         <div>
         	<label for="password">密码:</label>

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

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

data/config/routes.rb

@@ -1,4 +1,6 @@
 Ums::Engine.routes.draw do
+
+    root :to => 'users#welcome'
 	get "users/login" 
     post "users/login"
     get "users/password"
@@ -6,6 +8,7 @@ Ums::Engine.routes.draw do
     get "users/profile"
     patch "users/profile"    
     get "users/logout" 
+    get "users/welcome" 
     resources :users
     resources :roles
     resources :functions

data/db/migrate/20131016015833_create_ums_users.rb

@@ -1,6 +1,7 @@
 class CreateUmsUsers < ActiveRecord::Migration
   def change
     create_table :ums_users do |t|
+      t.string :account
       t.string :name
       t.string :email
       t.string :hashed_password

data/db/seeds.rb

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

data/lib/ums/engine.rb

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

data/lib/ums/version.rb

@@ -1,3 +1,3 @@
 module Ums
-  VERSION = "0.0.4"
+  VERSION = "0.1.0"
 end

data/test/dummy/log/development.log

@@ -0,0 +1,72 @@
+   (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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ums
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - wangfuhai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-03 00:00:00.000000000 Z
+date: 2013-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -94,6 +94,7 @@ files:
 - app/views/ums/users/new.html.erb
 - app/views/ums/users/password.html.erb
 - app/views/ums/users/profile.html.erb
+- app/views/ums/users/welcome.html.erb
 - config/routes.rb
 - db/migrate/20131016015419_create_ums_functions.rb
 - db/migrate/20131016015456_create_ums_roles.rb
@@ -133,6 +134,7 @@ 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
@@ -191,6 +193,7 @@ 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