diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index bb0d83cb7..c93b3bcdb 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -2,7 +2,8 @@ class RepositoriesController < ApplicationController
   include ApplicationHelper
   include OperateProjectAbilityAble
   before_action :require_login, only: %i[edit update create_file update_file delete_file sync_mirror]
-  before_action :find_project, except: [:tags, :commit, :sync_mirror]
+  before_action :find_project_with_includes, only: :show
+  before_action :find_project, except: [:tags, :commit, :sync_mirror, :show]
   before_action :authorizate!, except: [:sync_mirror, :tags, :commit]
   before_action :find_repository_by_id, only: %i[commit sync_mirror tags]
   before_action :authorizate_user_can_edit_repo!, only: %i[sync_mirror]
@@ -10,6 +11,7 @@ class RepositoriesController < ApplicationController
   before_action :get_latest_commit, :get_ref, only: %i[entries sub_entries]
 
   def show
+    @user = current_user
     @branches_count = Gitea::Repository::Branches::ListService.new(@project.owner, @project.identifier).call&.size
     @commits_count = Gitea::Repository::Commits::ListService.new(@project.owner.login, @project.identifier,
       sha: params[:sha], page: params[:page], limit: params[:limit], token: current_user&.gitea_token).call[:total_count]
@@ -27,8 +29,8 @@ class RepositoriesController < ApplicationController
 
   def entries
     @project.increment!(:visits)
-
-    @entries = Gitea::Repository::Entries::ListService.new(@project.owner, @project.identifier, ref: @ref).call
+    @project_owner = @project.owner
+    @entries = Gitea::Repository::Entries::ListService.new(@project_owner, @project.identifier, ref: @ref).call
     @entries = @entries.sort_by{ |hash| hash['type'] }
   end
 
@@ -124,6 +126,10 @@ class RepositoriesController < ApplicationController
     render_not_found("未找到相关的仓库") unless @project
   end
 
+  def find_project_with_includes
+    @project = Project.includes(:repository, :owner, :watchers, :praise_treads).find params[:id]
+  end
+
   def authorizate!
     if @project.repository.hidden? && !@project.member?(current_user)
       render_forbidden
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index a475f2601..11752809c 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -23,13 +23,6 @@ module ProjectsHelper
     Gitea.gitea_config[:domain]
   end
 
-  def render_edit_project_permission(user, project)
-    permission = "Reporter"
-    member = project.members.includes(:roles).find_by(user: user)
-
-    member&.roles&.last&.name || permission
-  end
-
   def find_user_by_login_or_mail(identifier)
     (User.find_by_login identifier) || (User.find_by_mail identifier)
   end
diff --git a/app/models/project.rb b/app/models/project.rb
index 742f89580..9c7c8d241 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -143,4 +143,19 @@ class Project < ApplicationRecord
     self.class.name.constantize.project_types["#{self.project_type}"]
   end
 
+  def watched_by? user
+    watchers.pluck(:user_id).include? user&.id
+  end
+
+  def praised_by? user
+    praise_treads.pluck(:user_id).include? user&.id
+  end
+
+  def get_premission user
+    permission = "Reporter"
+    member = members.find_by(user: user)
+
+    member&.roles&.last&.name || permission
+  end
+
 end
diff --git a/app/views/repositories/show.json.jbuilder b/app/views/repositories/show.json.jbuilder
index de647addd..4e1cf0c7f 100644
--- a/app/views/repositories/show.json.jbuilder
+++ b/app/views/repositories/show.json.jbuilder
@@ -9,19 +9,19 @@ json.praises_count @project.praises_count.to_i
 json.forked_count @project.forked_count.to_i
 json.watchers_count @project.watchers_count.to_i
 json.versions_count @project.versions_count  #里程碑数量
-json.version_releases_count @project.releases_size(current_user.try(:id), "all")
-json.version_releasesed_count @project.releases_size(current_user.try(:id), "released")  #已发行的版本
+json.version_releases_count @project.releases_size(@user.try(:id), "all")
+json.version_releasesed_count @project.releases_size(@user.try(:id), "released")  #已发行的版本
 json.contributor_users_count @project.contributor_users
 json.issue_tags_count @tags_count
 json.branches_count @branches_count
 json.commits_count @commits_count
-json.permission render_edit_project_permission(current_user, @project) if current_user
+json.permission  @project.get_premission(@user)
 json.mirror_url @project&.repository.mirror_url
 json.mirror @project&.repository.mirror_url.present?
 json.type @project.numerical_for_project_type
 json.mirror_status @project.repository&.mirror&.numerical_for_status if @project.sync_mirror?
-json.watched current_user&.watched?(@project)
-json.praised current_user&.liked?(@project)
+json.watched @project.watched_by? @user
+json.praised @project.praised_by? @user
 json.status @project.status
 json.forked_from_project_id @project_fork_id
 json.fork_info do