From 7597f1fd8f4d3de7f6656ca74f2b302093e29b4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”>
Date: Fri, 29 Jul 2022 16:30:56 +0800
Subject: [PATCH] =?UTF-8?q?fixed=20=E5=BB=BA=E6=9C=A8=E8=AE=A4=E8=AF=81cod?=
 =?UTF-8?q?e,=E9=A1=B9=E7=9B=AE=E6=88=90=E5=91=98=E5=8F=AF=E8=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/mark_files_controller.rb |  8 ++++++++
 app/helpers/projects_helper.rb           | 12 +++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/controllers/mark_files_controller.rb b/app/controllers/mark_files_controller.rb
index 53bd279e7..4668471e3 100644
--- a/app/controllers/mark_files_controller.rb
+++ b/app/controllers/mark_files_controller.rb
@@ -18,6 +18,14 @@ class MarkFilesController < ApplicationController
     end
   end
 
+  def mark_file_as_unread
+
+  end
+
+  def mark_file_as_read
+
+  end
+
   private 
   def review_params 
     params.require(:review).permit(:content, :commit_id, :status)
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index e19fb972c..5bed0950c 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -114,11 +114,13 @@ module ProjectsHelper
   # API：
   # GET：https://ci-v3.test.jianmuhub.com/oauth2/authorize?code=${encode(密文)}
   def jianmu_devops_code(project, user)
-    data = { userId: user.id, ref: project.identifier, owner: project.owner.login, timestamp: Time.now.to_i * 1000 }
-    uid = EduSetting.get("jianmu_oauth2_uid") || 'oedKx4v-WyAfu2oy_AsFpFQCH_-g91ms0PQKN7YcEuw'
-    app = Doorkeeper::Application.find_by(uid: uid)
-    key =  'bf3c199c2470cb477d907b1e0917c17b'
-    aes_encrypt(key, data.to_json)
+    if user.admin? || project.member?(user.id)
+      data = { userId: user.id, ref: project.identifier, owner: project.owner.login, timestamp: Time.now.to_i * 1000 }
+      # uid = EduSetting.get("jianmu_oauth2_uid") || 'oedKx4v-WyAfu2oy_AsFpFQCH_-g91ms0PQKN7YcEuw'
+      # app = Doorkeeper::Application.find_by(uid: uid)
+      key = 'bf3c199c2470cb477d907b1e0917c17b'
+      aes_encrypt(key, data.to_json)
+    end
   end
 
   def aes_encrypt(key, des_text)