add issue_tokens table and successfully save data into this table
This commit is contained in:
parent
7e4849adbd
commit
fd3c6a1c36
|
|
@ -324,34 +324,38 @@ class IssuesController < ApplicationController
|
|||
# add by qiubing start
|
||||
token = params[:token]
|
||||
if Integer(token) > 0
|
||||
g = Gitlab.client
|
||||
gpid = Project.find(@issue.project_id).gpid
|
||||
path_with_namespace = g.project(gpid).path_with_namespace
|
||||
arr = path_with_namespace.split("/")
|
||||
channelName = arr[0] + "-" + arr[1]
|
||||
username = User.find(@issue.author_id).login
|
||||
issueToken = IssueToken.new
|
||||
issueToken.tokens = Integer(token)
|
||||
issueToken.issues_id = issue_id
|
||||
if issueToken.save!
|
||||
g = Gitlab.client
|
||||
gpid = Project.find(@issue.project_id).gpid
|
||||
path_with_namespace = g.project(gpid).path_with_namespace
|
||||
arr = path_with_namespace.split("/")
|
||||
channelName = arr[0] + "-" + arr[1]
|
||||
username = User.find(@issue.author_id).login
|
||||
|
||||
|
||||
Rails.logger.info("before executing minusToken command...")
|
||||
# Rails.logger.info(pushTXInfoJson)
|
||||
Rails.logger.info("before executing minusToken command...")
|
||||
# Rails.logger.info(pushTXInfoJson)
|
||||
|
||||
require 'base64'
|
||||
cmd = 'chain minusToken '+channelName+' '+username+' '+token
|
||||
Rails.logger.info(cmd)
|
||||
puts cmd
|
||||
require 'base64'
|
||||
cmd = 'chain minusToken '+channelName+' '+username+' '+token
|
||||
Rails.logger.info(cmd)
|
||||
puts cmd
|
||||
|
||||
# result = system # 执行失败了
|
||||
output = StringIO.new
|
||||
IO.popen(cmd) do |pipe|
|
||||
pipe.each do |line|
|
||||
Rails.logger.info(line)
|
||||
# result = system # 执行失败了
|
||||
output = StringIO.new
|
||||
IO.popen(cmd) do |pipe|
|
||||
pipe.each do |line|
|
||||
Rails.logger.info(line)
|
||||
end
|
||||
end
|
||||
Rails.logger.info(output.string)
|
||||
# puts output.string
|
||||
# Rails.logger.info(result)
|
||||
Rails.logger.info("after executing minusToken command...")
|
||||
end
|
||||
Rails.logger.info(output.string)
|
||||
# puts output.string
|
||||
# Rails.logger.info(result)
|
||||
Rails.logger.info("after executing minusToken command...")
|
||||
|
||||
end
|
||||
# add by qiubing end
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,4 @@
|
|||
class IssueToken < ActiveRecord::Base
|
||||
belongs_to :issues
|
||||
attr_accessible :tokens
|
||||
end
|
||||
|
|
@ -1,106 +1,4 @@
|
|||
#coding=utf-8
|
||||
# Redmine - project management software
|
||||
# Copyright (C) 2006-2013 Jean-Philippe Lang
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU General Public License
|
||||
# as published by the Free Software Foundation; either version 2
|
||||
# of the License, or (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program; if not, write to the Free Software
|
||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
#
|
||||
class Token < ActiveRecord::Base
|
||||
belongs_to :user
|
||||
validates_uniqueness_of :value
|
||||
|
||||
before_create :delete_previous_tokens, :generate_new_token
|
||||
|
||||
@@validity_time = 1.day
|
||||
|
||||
def generate_new_token
|
||||
self.value = Token.generate_token_value
|
||||
end
|
||||
|
||||
def self.get_or_create_permanent_login_token(user)
|
||||
token = Token.get_token_from_user(user, 'autologin')
|
||||
unless token
|
||||
token = Token.create(:user => user, :action => 'autologin')
|
||||
else
|
||||
token.update_attribute(:created_on, Time.now)
|
||||
end
|
||||
token
|
||||
end
|
||||
|
||||
def self.get_token_from_user(user, action)
|
||||
token = Token.where(:action => action, :user_id => user).first
|
||||
unless token
|
||||
token = Token.create(user: user, action: action)
|
||||
end
|
||||
token
|
||||
end
|
||||
|
||||
# Return true if token has expired
|
||||
def expired?
|
||||
return Time.now > self.created_on + @@validity_time
|
||||
end
|
||||
|
||||
# Delete all expired tokens
|
||||
def self.destroy_expired
|
||||
Token.delete_all ["action NOT IN (?) AND created_on < ?", ['feeds', 'api', 'autologin'], Time.now - @@validity_time]
|
||||
end
|
||||
|
||||
# Returns the active user who owns the key for the given action
|
||||
def self.find_active_user(action, key, validity_days=nil)
|
||||
user = find_user(action, key, validity_days)
|
||||
if user && user.active?
|
||||
user
|
||||
end
|
||||
end
|
||||
|
||||
# Returns the user who owns the key for the given action
|
||||
def self.find_user(action, key, validity_days=nil)
|
||||
token = find_token(action, key, validity_days)
|
||||
if token
|
||||
token.user
|
||||
end
|
||||
end
|
||||
|
||||
# Returns the token for action and key with an optional
|
||||
# validity duration (in number of days)
|
||||
def self.find_token(action, key, validity_days=nil)
|
||||
action = action.to_s
|
||||
key = key.to_s
|
||||
return nil unless action.present? && key =~ /\A[a-z0-9]+\z/i
|
||||
|
||||
token = Token.where(:action => action, :value => key).first
|
||||
if token && (token.action == action) && (token.value == key) && token.user
|
||||
if validity_days.nil? || (token.created_on > validity_days.days.ago)
|
||||
token
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def self.generate_token_value
|
||||
Redmine::Utils.random_hex(20)
|
||||
end
|
||||
|
||||
def self.delete_user_all_tokens(user)
|
||||
Token.delete_all(user_id: user.id)
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
# Removes obsolete tokens (same user and action)
|
||||
def delete_previous_tokens
|
||||
if user
|
||||
Token.delete_all(['user_id = ? AND action = ?', user.id, action])
|
||||
end
|
||||
end
|
||||
end
|
||||
class Token < ActiveRecord::Base
|
||||
belongs_to :issues
|
||||
attr_accessible :issueId, :tokens
|
||||
end
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
class CreateIssueTokens < ActiveRecord::Migration
|
||||
def change
|
||||
create_table :issue_tokens do |t|
|
||||
t.integer :tokens
|
||||
t.references :issues
|
||||
|
||||
t.timestamps
|
||||
end
|
||||
add_index :issue_tokens, :issues_id
|
||||
end
|
||||
end
|
||||
Loading…
Reference in New Issue