Merge branch 'dev_nanda' into dev_blockchain

Gemfile

@@ -136,8 +136,6 @@ gem 'harmonious_dictionary', '~> 0.0.1'
 
 gem 'parallel', '~> 1.19', '>= 1.19.1'
 
-# log
-gem 'multi_logger'
 
 gem 'letter_avatar'
 

app/controllers/application_controller.rb

@@ -19,7 +19,6 @@ class ApplicationController < ActionController::Base
 	before_action :check_sign
 	before_action :user_setup
 	#before_action :check_account
-  after_action :user_trace_log
 
 	# TODO
 	# check sql query time
@@ -379,18 +378,6 @@ class ApplicationController < ActionController::Base
 		# User.current = User.find(2) # need to remove this statement before running in production
   end
 
-  def user_trace_log
-    user = current_user
-    # print("*********************url:", request.url, "****routes", request.request_method)
-    # Rails.logger.user_trace.info("{id: #{user.id}, login: #{user.login}, url: #{request.url}, method: #{request.method}, params: #{params}, response_code: #{response.code}, time: #{Time.now}}")
-  end
-
-  def user_trace_update_log(old_value_hash)
-    user = current_user
-    str = "{id: #{user.id}, login: #{user.login}, url: #{request.url}, method: #{request.method}, params: #{params.merge(old_value: old_value_hash)}, response_code: #{response.code}, time: #{Time.now}}"
-    # Rails.logger.user_trace.info(str)
-  end
-
 	def try_to_autologin
 		if cookies[autologin_cookie_name]
 			# auto-login feature starts a new session

app/controllers/forks_controller.rb

@@ -3,7 +3,6 @@ class ForksController < ApplicationController
   before_action :require_profile_completed, only: [:create]
   before_action :load_project
   before_action :authenticate_project!, :authenticate_user!
-  skip_after_action :user_trace_log, only: [:create]
 
   def create
     @new_project = Projects::ForkService.new(current_user, @project, params[:organization]).call

app/controllers/issues_controller.rb

@@ -11,8 +11,6 @@ class IssuesController < ApplicationController
   before_action :set_issue, only: [:edit, :update, :destroy, :show, :copy, :close_issue, :lock_issue]
   before_action :check_token_enough, :find_atme_receivers, only: [:create, :update]
 
-  skip_after_action :user_trace_log, only: [:update]
-
   include ApplicationHelper
   include TagChosenHelper
 
@@ -242,9 +240,6 @@ class IssuesController < ApplicationController
       issue_params = issue_send_params(params).except(:issue_classify, :author_id, :project_id)
       Issues::UpdateForm.new({subject: issue_params[:subject], description: issue_params[:description].blank? ? issue_params[:description] : issue_params[:description].b}).validate!
       if @issue.update_attributes(issue_params)
-
-        user_trace_update_log(issue_hash)
-
         if @issue&.pull_request.present?
           SendTemplateMessageJob.perform_later('PullRequestChanged', current_user.id, @issue&.pull_request&.id, @issue.previous_changes.slice(:assigned_to_id, :priority_id, :fixed_version_id, :issue_tags_value)) if Site.has_notice_menu?
           SendTemplateMessageJob.perform_later('PullRequestAssigned', current_user.id, @issue&.pull_request&.id ) if @issue.previous_changes[:assigned_to_id].present? && Site.has_notice_menu?

app/controllers/journals_controller.rb

@@ -4,7 +4,6 @@ class JournalsController < ApplicationController
   before_action :set_issue
   before_action :check_issue_permission
   before_action :set_journal, only: [:destroy, :edit, :update]
-  skip_after_action :user_trace_log, only: [:update]
 
   def index
     @page  = params[:page]  || 1
@@ -84,7 +83,6 @@ class JournalsController < ApplicationController
       old_value = old_value_to_hash(@journal, params)
       Journals::UpdateForm.new({notes: notes.to_s.strip.blank? ? notes.to_s.strip : notes.to_s.strip.b}).validate!
       if @journal.update_attribute(:notes, content)
-        user_trace_update_log(old_value)
         normal_status(0, "更新成功")
       else
         normal_status(-1, "更新失败")

app/controllers/members_controller.rb

@@ -6,7 +6,6 @@ class MembersController < ApplicationController
   before_action :operate!
   before_action :check_member_exists!, only: %i[create]
   before_action :check_member_not_exists!, only: %i[remove change_role]
-  skip_after_action :user_trace_log, only: [:change_role]
 
   def create
     interactor = Projects::AddMemberInteractor.call(@project.owner, @project, @user)
@@ -45,7 +44,6 @@ class MembersController < ApplicationController
   def change_role
     old_value = @project.members.where(user_id: params[:user_id])[0].roles.last.name
     interactor = Projects::ChangeMemberRoleInteractor.call(@project.owner, @project, @user, params[:role])
-    user_trace_update_log(old_value)
     SendTemplateMessageJob.perform_later('ProjectRole', current_user.id, @user.id, @project.id, message_role_name) if Site.has_notice_menu?
     render_response(interactor)
   rescue Exception => e

app/controllers/pull_requests_controller.rb

@@ -7,7 +7,6 @@ class PullRequestsController < ApplicationController
   before_action :load_pull_request, only: [:files, :commits]
   before_action :find_atme_receivers, only: [:create, :update]
 
-  skip_after_action :user_trace_log, only: [:update]
   include TagChosenHelper
   include ApplicationHelper
 
@@ -116,7 +115,6 @@ class PullRequestsController < ApplicationController
 
           if @issue.update_attributes(@issue_params)
             if @pull_request.update_attributes(@local_params.compact)
-              user_trace_update_log(old_value)
               gitea_pull = Gitea::PullRequest::UpdateService.call(@owner.login, @repository.identifier,
                   @pull_request.gitea_number, @requests_params, current_user.gitea_token)
 

app/controllers/sponsor_tiers_controller.rb

@@ -42,7 +42,6 @@ class SponsorTiersController < ApplicationController
     old_value = old_value_to_hash(@sponsor_tier, params)
     respond_to do |format|
       if User.current.id == @sponsor_tier.user_id && @sponsor_tier.update(sponsor_tier_update_params)
-        user_trace_update_log(old_value)
         format.html { redirect_to @sponsor_tier, notice: 'Sponsor tier was successfully updated.' }
         format.json { render :show, status: :ok, location: @sponsor_tier }
         # render json: {status: 1, message: '修改成功' }

app/controllers/sponsorships_controller.rb

@@ -2,8 +2,6 @@ class SponsorshipsController < ApplicationController
   before_action :set_sponsorship, only: [:show, :edit, :update, :destroy]
   # before_action :require_login, except: [:index, :stopped, :sponsored, :sponsoring, :stopped_sponsored, :stopped_sponsoring]
   before_action :require_login, only: [:create, :edit, :update, :destroy]
-  skip_after_action :user_trace_log, only: [:update]
-  
   # GET /sponsorships
   # GET /sponsorships.json
   def index
@@ -126,7 +124,6 @@ class SponsorshipsController < ApplicationController
     old_value = old_value_to_hash(@sponsorship, params)
 
     if @sponsorship.update(sponsorship_params)
-      user_trace_update_log(old_value)
       render json: {status: 1, message: '修改成功' }
     else
       render json: {status: -1, message: '修改失败' }

app/controllers/version_releases_controller.rb

@@ -4,7 +4,6 @@ class VersionReleasesController < ApplicationController
   before_action :require_login, except: [:index, :show]
   before_action :check_release_authorize, except: [:index, :show]
   before_action :find_version , only: [:show, :edit, :update, :destroy]
-  skip_after_action :user_trace_log, only: [:update]
 
   def index
     @version_releases = kaminari_paginate(@repository.version_releases.order(created_at: :desc))
@@ -91,7 +90,6 @@ class VersionReleasesController < ApplicationController
             unless git_version_release
               raise Error, "更新失败"
             end
-            user_trace_update_log(old_value)
             normal_status(0, "更新成功")
           else
             normal_status(-1, "更新失败")

config/initializers/user_trace_logger.rb

@@ -1,9 +1,9 @@
-require 'multi_logger'
-formatter = Proc.new{|severity, time, progname, msg|
-  formatted_severity = sprintf("%-5s",severity.to_s)
-  formatted_time = time.strftime("%Y-%m-%d %H:%M:%S")
-  # "[#{formatted_severity} #{formatted_time} #{$$}] #{msg.to_s.strip}\n"
-  "#{msg.to_s.strip}\n"
-}
+# require 'multi_logger'
+# formatter = Proc.new{|severity, time, progname, msg|
+#   formatted_severity = sprintf("%-5s",severity.to_s)
+#   formatted_time = time.strftime("%Y-%m-%d %H:%M:%S")
+#   # "[#{formatted_severity} #{formatted_time} #{$$}] #{msg.to_s.strip}\n"
+#   "#{msg.to_s.strip}\n"
+# }
 # MultiLogger.add_logger('user_trace', formatter: formatter, shift_age: 'daily')
 # Rails.logger.user_trace.level = Logger::INFO