yystopf
/
forgeplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change is_current_admin_user

This commit is contained in:
nigel007 2021-05-13 12:40:02 +08:00
parent c069bb0544
commit 2d8fd93994
4 changed files with 90 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/application_controller.rb
View File

@ -348,7 +348,7 @@ class ApplicationController < ActionController::Base
cookies.signed[:user_id] = user.id cookies.signed[:user_id] = user.id
end end
end end
User.current = User.find 35 #User.current = User.find 35
end end
# Returns the current user or nil if no user is logged in # Returns the current user or nil if no user is logged in

21
app/controllers/users_controller.rb
View File

@ -233,7 +233,8 @@ class UsersController < ApplicationController
# query all projects with tokens by a user # query all projects with tokens by a user
def blockchain_balance def blockchain_balance
is_current_admin_user = User.current.logged? && (current_user&.admin? || current_user.id == params['user_id'].to_i) #is_current_admin_user = User.current.logged? && (current_user&.admin? || current_user.id == params['user_id'].to_i)
is_current_admin_user = User.current.logged?
results = Blockchain::BalanceQuery.call(params, is_current_admin_user) results = Blockchain::BalanceQuery.call(params, is_current_admin_user)
if results[:status] == 0 if results[:status] == 0
@total_count = results[:projects].size @total_count = results[:projects].size
@ -248,7 +249,8 @@ class UsersController < ApplicationController
# query one balance # query one balance
def blockchain_balance_one_project def blockchain_balance_one_project
is_current_admin_user = User.current.logged? && (current_user&.admin? || current_user.id == params['user_id'].to_i) #is_current_admin_user = User.current.logged? && (current_user&.admin? || current_user.id == params['user_id'].to_i)
is_current_admin_user = User.current.logged?
if is_current_admin_user if is_current_admin_user
owner = User.find_by(login: params['owner_login']) owner = User.find_by(login: params['owner_login'])
if owner.nil? if owner.nil?
@ -321,7 +323,8 @@ class UsersController < ApplicationController
end end
def blockchain_create_trade def blockchain_create_trade
is_current_admin_user = User.current.logged? && (current_user&.admin? || current_user.id == params['user_id'].to_i) #is_current_admin_user = User.current.logged? && (current_user&.admin? || current_user.id == params['user_id'].to_i)
is_current_admin_user = User.current.logged?
if is_current_admin_user if is_current_admin_user
user_id = params['user_id'].to_i user_id = params['user_id'].to_i
project_id = params['project_id'].to_i project_id = params['project_id'].to_i
@ -366,7 +369,8 @@ class UsersController < ApplicationController
end end
def blockchain_trade def blockchain_trade
is_current_admin_user = User.current.logged? && (current_user&.admin? || current_user.id == params['user_id'].to_i) #is_current_admin_user = User.current.logged? && (current_user&.admin? || current_user.id == params['user_id'].to_i)
is_current_admin_user = User.current.logged?
if is_current_admin_user if is_current_admin_user
user_id2 = params['user_id2'].to_i user_id2 = params['user_id2'].to_i
trade_id = params['trade_id'].to_i trade_id = params['trade_id'].to_i
@ -379,7 +383,8 @@ class UsersController < ApplicationController
def blockchain_verify_trade def blockchain_verify_trade
is_current_admin_user = User.current.logged? && (current_user&.admin? || current_user.id == params['user_id'].to_i) #is_current_admin_user = User.current.logged? && (current_user&.admin? || current_user.id == params['user_id'].to_i)
is_current_admin_user = User.current.logged?
if is_current_admin_user if is_current_admin_user
trade_id = params['trade_id'].to_i trade_id = params['trade_id'].to_i
BlockchainTrade.find(trade_id).update(state: 2) # state=2表示确认收货 BlockchainTrade.find(trade_id).update(state: 2) # state=2表示确认收货
@ -390,7 +395,8 @@ class UsersController < ApplicationController
end end
def blockchain_get_verify_trades def blockchain_get_verify_trades
is_current_admin_user = User.current.logged? && (current_user&.admin? || current_user.id == params['user_id'].to_i) #is_current_admin_user = User.current.logged? && (current_user&.admin? || current_user.id == params['user_id'].to_i)
is_current_admin_user = User.current.logged?
if is_current_admin_user if is_current_admin_user
trades = BlockchainTrade.where(state: 1).all() trades = BlockchainTrade.where(state: 1).all()
results = [] results = []
@ -418,7 +424,8 @@ class UsersController < ApplicationController
end end
def blockchain_get_history_trades def blockchain_get_history_trades
is_current_admin_user = User.current.logged? && (current_user&.admin? || current_user.id == params['user_id'].to_i) #is_current_admin_user = User.current.logged? && (current_user&.admin? || current_user.id == params['user_id'].to_i)
is_current_admin_user = User.current.logged?
if is_current_admin_user if is_current_admin_user
trades = BlockchainTrade.where(state: 2).all() trades = BlockchainTrade.where(state: 2).all()
results = [] results = []

147
app/models/project.rb
View File

@ -1,76 +1,77 @@
# == Schema Information # == Schema Information
# #
# Table name: projects # Table name: projects
# #
# id :integer not null, primary key # id :integer not null, primary key
# name :string(255) default(""), not null # name :string(255) default(""), not null
# description :text(4294967295) # description :text(4294967295)
# homepage :string(255) default("") # homepage :string(255) default("")
# is_public :boolean default("1"), not null # is_public :boolean default("1"), not null
# parent_id :integer # parent_id :integer
# created_on :datetime # created_on :datetime
# updated_on :datetime # updated_on :datetime
# identifier :string(255) # identifier :string(255)
# status :integer default("1"), not null # status :integer default("1"), not null
# lft :integer # lft :integer
# rgt :integer # rgt :integer
# inherit_members :boolean default("0"), not null # inherit_members :boolean default("0"), not null
# project_type :integer default("0") # project_type :integer default("0")
# hidden_repo :boolean default("0"), not null # hidden_repo :boolean default("0"), not null
# attachmenttype :integer default("1") # attachmenttype :integer default("1")
# user_id :integer # user_id :integer
# dts_test :integer default("0") # dts_test :integer default("0")
# enterprise_name :string(255) # enterprise_name :string(255)
# organization_id :integer # organization_id :integer
# project_new_type :integer # project_new_type :integer
# gpid :integer # gpid :integer
# forked_from_project_id :integer # forked_from_project_id :integer
# forked_count :integer default("0") # forked_count :integer default("0")
# publish_resource :integer default("0") # publish_resource :integer default("0")
# visits :integer default("0") # visits :integer default("0")
# hot :integer default("0") # hot :integer default("0")
# invite_code :string(255) # invite_code :string(255)
# qrcode :string(255) # qrcode :string(255)
# qrcode_expiretime :integer default("0") # qrcode_expiretime :integer default("0")
# script :text(65535) # script :text(65535)
# training_status :integer default("0") # training_status :integer default("0")
# rep_identifier :string(255) # rep_identifier :string(255)
# project_category_id :integer # project_category_id :integer
# project_language_id :integer # project_language_id :integer
# praises_count :integer default("0") # license_id :integer
# watchers_count :integer default("0") # ignore_id :integer
# issues_count :integer default("0") # praises_count :integer default("0")
# pull_requests_count :integer default("0") # watchers_count :integer default("0")
# language :string(255) # issues_count :integer default("0")
# versions_count :integer default("0") # pull_requests_count :integer default("0")
# issue_tags_count :integer default("0") # language :string(255)
# closed_issues_count :integer default("0") # versions_count :integer default("0")
# open_devops :boolean default("0") # issue_tags_count :integer default("0")
# gitea_webhook_id :integer # closed_issues_count :integer default("0")
# open_devops_count :integer default("0") # open_devops :boolean default("0")
# recommend :boolean default("0") # gitea_webhook_id :integer
# platform :integer default("0") # open_devops_count :integer default("0")
# use_blockchain :boolean default("0") # recommend :boolean default("0")
# license_id :integer # platform :integer default("0")
# ignore_id :integer # use_blockchain :boolean default("0")
# default_branch :string(255) default("master") # default_branch :string(255) default("master")
# website :string(255) # website :string(255)
# lesson_url :string(255) # lesson_url :string(255)
# #
# Indexes # Indexes
# #
# index_projects_on_forked_from_project_id (forked_from_project_id) # index_projects_on_forked_from_project_id (forked_from_project_id)
# index_projects_on_identifier (identifier) # index_projects_on_identifier (identifier)
# index_projects_on_is_public (is_public) # index_projects_on_is_public (is_public)
# index_projects_on_lft (lft) # index_projects_on_lft (lft)
# index_projects_on_name (name) # index_projects_on_name (name)
# index_projects_on_platform (platform) # index_projects_on_platform (platform)
# index_projects_on_project_type (project_type) # index_projects_on_project_type (project_type)
# index_projects_on_recommend (recommend) # index_projects_on_recommend (recommend)
# index_projects_on_rgt (rgt) # index_projects_on_rgt (rgt)
# index_projects_on_status (status) # index_projects_on_status (status)
# index_projects_on_updated_on (updated_on) # index_projects_on_updated_on (updated_on)
# #
class Project < ApplicationRecord class Project < ApplicationRecord

2
app/services/application_service.rb
View File

@ -57,7 +57,7 @@ class ApplicationService
username = params['user_id'].to_s username = params['user_id'].to_s
token_name = project.id.to_s token_name = project.id.to_s
total_supply = params['blockchain_token_all'].to_i total_supply = params['blockchain_token_all'].to_i
token_balance = [[username, params['blockchain_init_token'].to_i]] token_balance = [[username, (total_supply * params['blockchain_init_token'].to_i / 100).to_i]]
param = { param = {
"request-type": "create repo", "request-type": "create repo",