From 4682457b6b036890f417b902e167f5faa3503fd3 Mon Sep 17 00:00:00 2001 From: nigel007 <609441862@qq.com> Date: Mon, 26 Apr 2021 17:03:45 +0800 Subject: [PATCH] change logs --- Gemfile.lock | 2 - app/controllers/application_controller.rb | 2 +- app/controllers/users_controller.rb | 20 +-- app/models/attachment.rb | 8 +- app/models/ci/user.rb | 12 +- app/models/laboratory.rb | 6 - app/models/organization.rb | 12 +- app/models/project.rb | 146 ++++++++++---------- app/models/project_category.rb | 5 + app/models/repository.rb | 1 + app/models/token.rb | 31 +++-- app/models/user.rb | 12 +- app/models/user_action.rb | 4 +- app/models/user_agent.rb | 5 +- app/models/user_extension.rb | 3 - app/services/blockchain/transfer_service.rb | 4 +- app/services/projects/create_service.rb | 2 +- 17 files changed, 131 insertions(+), 144 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 70b931fc..e63a06db 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -52,7 +52,6 @@ GEM activerecord (>= 3.0) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) - alipay (0.15.2) ancestry (3.0.7) activerecord (>= 3.2.0) annotate (2.6.5) @@ -435,7 +434,6 @@ DEPENDENCIES active_decorator acts-as-taggable-on (~> 6.0) acts_as_list - alipay (~> 0.15.1) ancestry annotate (~> 2.6.0) awesome_print diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index b8172b24..564a34fc 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -343,7 +343,7 @@ class ApplicationController < ActionController::Base User.current = User.find 8686 elsif params[:debug] == 'admin' logger.info "@@@@@@@@@@@@@@@@@@@@@@ debug mode....." - user = User.find 35 + user = User.find 36 User.current = user cookies.signed[:user_id] = user.id end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 4cd9d8e6..2bcaf8ee 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -240,14 +240,14 @@ class UsersController < ApplicationController if is_current_admin_user owner = User.find_by(login: params['owner_login']) if owner.nil? - raise Error, "项目创建者无法找到" + normal_status(-1, "创建者无法找到") else p = Project.find_by(user_id: owner.id, name: params['project_name']) results = Blockchain::BalanceQueryOneProject.call({"user_id": params['user_id'].to_i, "project_id": p.id.to_i}) render json: { status: results[:status], balance: results[:balance]} end else - raise Error, '没有权限' + normal_status(-1, "缺少权限") end end @@ -260,10 +260,10 @@ class UsersController < ApplicationController if results == true render json: { status: 2 } # 重新查询余额 else - raise Error, "转账失败" + normal_status(-1, "转账失败") end else - raise Error, "缺少权限" + normal_status(-1, "缺少权限") end end @@ -317,7 +317,7 @@ class UsersController < ApplicationController # 锁仓 result = Blockchain::CreateTrade.call({user_id: user_id, project_id: project_id, token_num: token_num}) if result == false - raise Error, "创建交易失败" + normal_status(-1, "创建交易失败") else bt = BlockchainTrade.new(user_id: user_id, project_id: project_id, token_num: token_num, money: money, state: 0) # state=0表示创建交易; state=1表示执行中; state=2表示执行完成 bt.save() @@ -325,7 +325,7 @@ class UsersController < ApplicationController render json: { status: status } end else - raise Error, "没有权限" + normal_status(-1, "缺少权限") end end @@ -359,7 +359,7 @@ class UsersController < ApplicationController BlockchainTrade.find(trade_id).update(user_id2: user_id2, state: 1) # state=1表示锁定了，等待线下卖家发货 render json: {status: 2} # window.location.reload() else - raise Error, "没有权限" + normal_status(-1, "缺少权限") end end @@ -371,7 +371,7 @@ class UsersController < ApplicationController BlockchainTrade.find(trade_id).update(state: 2) # state=2表示确认收货 render json: {status: 2} # window.location.reload() else - raise Error, "没有权限" + normal_status(-1, "缺少权限") end end @@ -399,7 +399,7 @@ class UsersController < ApplicationController end render json: { results: results } else - raise Error, "没有权限" + normal_status(-1, "缺少权限") end end @@ -427,7 +427,7 @@ class UsersController < ApplicationController end render json: { results: results } else - raise Error, "没有权限" + normal_status(-1, "缺少权限") end end diff --git a/app/models/attachment.rb b/app/models/attachment.rb index 1ca17345..461c835f 100644 --- a/app/models/attachment.rb +++ b/app/models/attachment.rb @@ -17,7 +17,7 @@ # disk_directory :string(255) # attachtype :integer default("1") # is_public :integer default("1") -# copy_from :string(255) +# copy_from :integer # quotes :integer default("0") # is_publish :integer default("1") # publish_time :datetime @@ -26,15 +26,15 @@ # cloud_url :string(255) default("") # course_second_category_id :integer default("0") # delay_publish :boolean default("0") -# link :string(255) -# clone_id :integer # # Indexes # # index_attachments_on_author_id (author_id) -# index_attachments_on_clone_id (clone_id) # index_attachments_on_container_id_and_container_type (container_id,container_type) +# index_attachments_on_course_second_category_id (course_second_category_id) # index_attachments_on_created_on (created_on) +# index_attachments_on_is_public (is_public) +# index_attachments_on_quotes (quotes) # class Attachment < ApplicationRecord diff --git a/app/models/ci/user.rb b/app/models/ci/user.rb index fc82596c..cd624675 100644 --- a/app/models/ci/user.rb +++ b/app/models/ci/user.rb @@ -39,14 +39,13 @@ # business :boolean default("0") # profile_completed :boolean default("0") # laboratory_id :integer -# is_shixun_marker :boolean default("0") -# admin_visitable :boolean default("0") -# collaborator :boolean default("0") +# platform :string(255) default("0") +# gitea_token :string(255) # gitea_uid :integer +# is_shixun_marker :boolean default("0") # is_sync_pwd :boolean default("1") # watchers_count :integer default("0") # devops_step :integer default("0") -# gitea_token :string(255) # # Indexes # @@ -54,9 +53,8 @@ # index_users_on_homepage_engineer (homepage_engineer) # index_users_on_homepage_teacher (homepage_teacher) # index_users_on_laboratory_id (laboratory_id) -# index_users_on_login (login) UNIQUE -# index_users_on_mail (mail) UNIQUE -# index_users_on_phone (phone) UNIQUE +# index_users_on_login (login) +# index_users_on_mail (mail) # index_users_on_type (type) # diff --git a/app/models/laboratory.rb b/app/models/laboratory.rb index a25b94fb..699800c9 100644 --- a/app/models/laboratory.rb +++ b/app/models/laboratory.rb @@ -10,12 +10,6 @@ # sync_course :boolean default("0") # sync_subject :boolean default("0") # sync_shixun :boolean default("0") -# is_local :boolean default("0") -# -# Indexes -# -# index_laboratories_on_identifier (identifier) UNIQUE -# index_laboratories_on_school_id (school_id) # # Indexes # diff --git a/app/models/organization.rb b/app/models/organization.rb index fbf3def7..48dab55a 100644 --- a/app/models/organization.rb +++ b/app/models/organization.rb @@ -39,14 +39,13 @@ # business :boolean default("0") # profile_completed :boolean default("0") # laboratory_id :integer -# is_shixun_marker :boolean default("0") -# admin_visitable :boolean default("0") -# collaborator :boolean default("0") +# platform :string(255) default("0") +# gitea_token :string(255) # gitea_uid :integer +# is_shixun_marker :boolean default("0") # is_sync_pwd :boolean default("1") # watchers_count :integer default("0") # devops_step :integer default("0") -# gitea_token :string(255) # # Indexes # @@ -54,9 +53,8 @@ # index_users_on_homepage_engineer (homepage_engineer) # index_users_on_homepage_teacher (homepage_teacher) # index_users_on_laboratory_id (laboratory_id) -# index_users_on_login (login) UNIQUE -# index_users_on_mail (mail) UNIQUE -# index_users_on_phone (phone) UNIQUE +# index_users_on_login (login) +# index_users_on_mail (mail) # index_users_on_type (type) # diff --git a/app/models/project.rb b/app/models/project.rb index 0d8b532c..12b03995 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -1,75 +1,77 @@ -# == Schema Information -# -# Table name: projects -# -# id :integer not null, primary key -# name :string(255) default(""), not null -# description :text(4294967295) -# homepage :string(255) default("") -# is_public :boolean default("1"), not null -# parent_id :integer -# created_on :datetime -# updated_on :datetime -# identifier :string(255) -# status :integer default("1"), not null -# lft :integer -# rgt :integer -# inherit_members :boolean default("0"), not null -# project_type :integer default("0") -# hidden_repo :boolean default("0"), not null -# attachmenttype :integer default("1") -# user_id :integer -# dts_test :integer default("0") -# enterprise_name :string(255) -# organization_id :integer -# project_new_type :integer -# gpid :integer -# forked_from_project_id :integer -# forked_count :integer default("0") -# publish_resource :integer default("0") -# visits :integer default("0") -# hot :integer default("0") -# invite_code :string(255) -# qrcode :string(255) -# qrcode_expiretime :integer default("0") -# script :text(65535) -# training_status :integer default("0") -# rep_identifier :string(255) -# project_category_id :integer -# project_language_id :integer -# praises_count :integer default("0") -# watchers_count :integer default("0") -# issues_count :integer default("0") -# pull_requests_count :integer default("0") -# language :string(255) -# versions_count :integer default("0") -# issue_tags_count :integer default("0") -# closed_issues_count :integer default("0") -# open_devops :boolean default("0") -# gitea_webhook_id :integer -# open_devops_count :integer default("0") -# recommend :boolean default("0") -# platform :integer default("0") -# license_id :integer -# ignore_id :integer -# default_branch :string(255) default("master") -# website :string(255) -# lesson_url :string(255) -# -# Indexes -# -# index_projects_on_forked_from_project_id (forked_from_project_id) -# index_projects_on_identifier (identifier) -# index_projects_on_is_public (is_public) -# index_projects_on_lft (lft) -# index_projects_on_name (name) -# index_projects_on_platform (platform) -# index_projects_on_project_type (project_type) -# index_projects_on_recommend (recommend) -# index_projects_on_rgt (rgt) -# index_projects_on_status (status) -# index_projects_on_updated_on (updated_on) -# +# == Schema Information +# +# Table name: projects +# +# id :integer not null, primary key +# name :string(255) default(""), not null +# description :text(4294967295) +# homepage :string(255) default("") +# is_public :boolean default("1"), not null +# parent_id :integer +# created_on :datetime +# updated_on :datetime +# identifier :string(255) +# status :integer default("1"), not null +# lft :integer +# rgt :integer +# inherit_members :boolean default("0"), not null +# project_type :integer default("0") +# hidden_repo :boolean default("0"), not null +# attachmenttype :integer default("1") +# user_id :integer +# dts_test :integer default("0") +# enterprise_name :string(255) +# organization_id :integer +# project_new_type :integer +# gpid :integer +# forked_from_project_id :integer +# forked_count :integer default("0") +# publish_resource :integer default("0") +# visits :integer default("0") +# hot :integer default("0") +# invite_code :string(255) +# qrcode :string(255) +# qrcode_expiretime :integer default("0") +# script :text(65535) +# training_status :integer default("0") +# rep_identifier :string(255) +# project_category_id :integer +# project_language_id :integer +# license_id :integer +# ignore_id :integer +# praises_count :integer default("0") +# watchers_count :integer default("0") +# issues_count :integer default("0") +# pull_requests_count :integer default("0") +# language :string(255) +# versions_count :integer default("0") +# issue_tags_count :integer default("0") +# closed_issues_count :integer default("0") +# open_devops :boolean default("0") +# gitea_webhook_id :integer +# open_devops_count :integer default("0") +# recommend :boolean default("0") +# platform :integer default("0") +# use_blockchain :boolean default("0") +# default_branch :string(255) default("master") +# website :string(255) +# lesson_url :string(255) +# +# Indexes +# +# index_projects_on_forked_from_project_id (forked_from_project_id) +# index_projects_on_identifier (identifier) +# index_projects_on_is_public (is_public) +# index_projects_on_lft (lft) +# index_projects_on_name (name) +# index_projects_on_platform (platform) +# index_projects_on_project_type (project_type) +# index_projects_on_recommend (recommend) +# index_projects_on_rgt (rgt) +# index_projects_on_status (status) +# index_projects_on_updated_on (updated_on) +# + class Project < ApplicationRecord include Matchable diff --git a/app/models/project_category.rb b/app/models/project_category.rb index 67b80299..3a981981 100644 --- a/app/models/project_category.rb +++ b/app/models/project_category.rb @@ -8,6 +8,11 @@ # projects_count :integer default("0") # created_at :datetime not null # updated_at :datetime not null +# ancestry :string(255) +# +# Indexes +# +# index_project_categories_on_ancestry (ancestry) # class ProjectCategory < ApplicationRecord diff --git a/app/models/repository.rb b/app/models/repository.rb index 978bc3c5..b6d2321f 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -25,6 +25,7 @@ # # Indexes # +# index_repositories_on_identifier (identifier) # index_repositories_on_project_id (project_id) # index_repositories_on_user_id (user_id) # diff --git a/app/models/token.rb b/app/models/token.rb index db778c6b..c9e45a86 100644 --- a/app/models/token.rb +++ b/app/models/token.rb @@ -1,18 +1,19 @@ -# == Schema Information -# -# Table name: tokens -# -# id :integer not null, primary key -# user_id :integer default("0"), not null -# action :string(30) default(""), not null -# value :string(40) default(""), not null -# created_on :datetime not null -# -# Indexes -# -# index_tokens_on_user_id (user_id) -# tokens_value (value) UNIQUE -# +# == Schema Information +# +# Table name: tokens +# +# id :integer not null, primary key +# user_id :integer default("0"), not null +# action :string(30) default(""), not null +# value :string(40) default(""), not null +# created_on :datetime not null +# +# Indexes +# +# index_tokens_on_user_id (user_id) +# tokens_value (value) UNIQUE +# + # # This program is free software; you can redistribute it and/or diff --git a/app/models/user.rb b/app/models/user.rb index 2317c402..6ffa7954 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -39,14 +39,13 @@ # business :boolean default("0") # profile_completed :boolean default("0") # laboratory_id :integer -# is_shixun_marker :boolean default("0") -# admin_visitable :boolean default("0") -# collaborator :boolean default("0") +# platform :string(255) default("0") +# gitea_token :string(255) # gitea_uid :integer +# is_shixun_marker :boolean default("0") # is_sync_pwd :boolean default("1") # watchers_count :integer default("0") # devops_step :integer default("0") -# gitea_token :string(255) # # Indexes # @@ -54,9 +53,8 @@ # index_users_on_homepage_engineer (homepage_engineer) # index_users_on_homepage_teacher (homepage_teacher) # index_users_on_laboratory_id (laboratory_id) -# index_users_on_login (login) UNIQUE -# index_users_on_mail (mail) UNIQUE -# index_users_on_phone (phone) UNIQUE +# index_users_on_login (login) +# index_users_on_mail (mail) # index_users_on_type (type) # diff --git a/app/models/user_action.rb b/app/models/user_action.rb index 17935969..3ad8010e 100644 --- a/app/models/user_action.rb +++ b/app/models/user_action.rb @@ -12,9 +12,7 @@ # # Indexes # -# index_user_actions_on_ip (ip) -# index_user_actions_on_user_id (user_id) -# index_user_actions_on_user_id_and_action_type (user_id,action_type) +# index_user_actions_on_ip (ip) # class UserAction < ApplicationRecord diff --git a/app/models/user_agent.rb b/app/models/user_agent.rb index ba519d6f..49d7b35a 100644 --- a/app/models/user_agent.rb +++ b/app/models/user_agent.rb @@ -10,13 +10,10 @@ # updated_at :datetime not null # register_status :integer default("0") # action_status :integer default("0") -# is_delete :boolean default("0") -# user_id :integer # # Indexes # -# index_user_agents_on_ip (ip) -# index_user_agents_on_user_id (user_id) +# index_user_agents_on_ip (ip) UNIQUE # class UserAgent < ApplicationRecord diff --git a/app/models/user_extension.rb b/app/models/user_extension.rb index 4afd89bd..20e2b5c4 100644 --- a/app/models/user_extension.rb +++ b/app/models/user_extension.rb @@ -22,9 +22,6 @@ # school_id :integer # description :string(255) default("") # department_id :integer -# honor :text(65535) -# edu_background :integer -# edu_entry_year :integer # # Indexes # diff --git a/app/services/blockchain/transfer_service.rb b/app/services/blockchain/transfer_service.rb index fe61477d..5f072987 100644 --- a/app/services/blockchain/transfer_service.rb +++ b/app/services/blockchain/transfer_service.rb @@ -13,7 +13,7 @@ class Blockchain::TransferService < ApplicationService payer = params['payer_id'].to_s payee = User.find_by(login: transfer_login) if payee.nil? - raise Error, "未找到用户" + normal_status(-1, "未找到用户") else payee = payee.id.to_s token_name = params['project_id'].to_s @@ -24,7 +24,7 @@ class Blockchain::TransferService < ApplicationService end rescue => e puts "转账失败: #{e.message}" - raise Error, e.message + normal_status(-1, e.message) end private diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb index 8aae77a8..3fa18fc7 100644 --- a/app/services/projects/create_service.rb +++ b/app/services/projects/create_service.rb @@ -26,7 +26,7 @@ class Projects::CreateService < ApplicationService @project rescue => e puts "create project service error: #{e.message}" - raise Error, e.message + normal_status(-1, e.message) end private