From 3e352d3c7c51b63f72a276a8047fe4e0cc8c5c4a Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 12 Aug 2022 17:23:19 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E4=BB=A3=E7=A0=81=E6=BA=AF=E6=BA=90=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/trace/system_info_service.rb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 app/services/trace/system_info_service.rb diff --git a/app/services/trace/system_info_service.rb b/app/services/trace/system_info_service.rb new file mode 100644 index 000000000..0ffbae7ae --- /dev/null +++ b/app/services/trace/system_info_service.rb @@ -0,0 +1,18 @@ +class Trace::SystemInfoService < Trace::ClientService + + attr_accessor :token + + def initialize(token) + @token = token + end + + def call + result = authed_get(token, url) + response = render_response(result) + end + + private + def url + '/user/systemInfo'.freeze + end +end \ No newline at end of file From 04cd427c5f88424611f69ac44c813871c3ec466a Mon Sep 17 00:00:00 2001 From: yystopf Date: Fri, 12 Aug 2022 18:15:59 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=BA=AF=E6=BA=90=E9=9C=80=E6=8F=90=E5=89=8D=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=9C=8D=E5=8A=A1=E5=99=A8=E6=98=AF=E5=90=A6=E5=9C=A8?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/traces/base_controller.rb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/controllers/traces/base_controller.rb b/app/controllers/traces/base_controller.rb index 2b857d232..3a59ad08f 100644 --- a/app/controllers/traces/base_controller.rb +++ b/app/controllers/traces/base_controller.rb @@ -1,7 +1,7 @@ class Traces::BaseController < ApplicationController helper_method :observed_logged_user?, :observed_user - + before_action :check_trace_system def observed_user @_observed_user ||= (User.find_by_login(params[:user_id]) || User.find_by_id(params[:user_id])) @@ -15,4 +15,12 @@ class Traces::BaseController < ApplicationController def check_auth return render_forbidden unless current_user.admin? || observed_logged_user? end + + def check_trace_system + code, data, error = Trace::SystemInfoService.call(current_user.trace_token) + return render_ok({status: 501, data: {operate_time: data['operate_time']}, message: '系统维护中'}) if data['status'] === 0 + rescue + # 这里根据需求跳转到404 + return render_not_found + end end \ No newline at end of file From 467d722d25950ed48c95581efbd835551de56312 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”> Date: Mon, 15 Aug 2022 14:03:27 +0800 Subject: [PATCH 03/15] =?UTF-8?q?fixed=20reposyncer=20job=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=A2=9E=E5=8A=A0=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/ob_repository_syncs_controller.rb | 15 +++++++++------ app/services/ob_repository_sync/api_service.rb | 4 ++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/app/controllers/ob_repository_syncs_controller.rb b/app/controllers/ob_repository_syncs_controller.rb index ebae8e427..90f7fd6fd 100644 --- a/app/controllers/ob_repository_syncs_controller.rb +++ b/app/controllers/ob_repository_syncs_controller.rb @@ -34,7 +34,7 @@ class ObRepositorySyncsController < ApplicationController def delete service = ObRepositorySync::ApiService.new(@ob_repository_sync.name) res = service.delete_project @ob_repository_sync.sync_id - tip_exception "保存失败: #{res["msg"]}" if res["code"].to_s != "200" + tip_exception "删除失败: #{res["msg"]}" if res["code"].to_s != "200" if res["code"].to_s == "200" @ob_repository_sync.destroy! end @@ -43,14 +43,17 @@ class ObRepositorySyncsController < ApplicationController def jobs tip_exception "该项目未创建同步任务" if @ob_repository_sync.blank? + page = params[:page] || 1 + limit = params[:limit] || 10 service = ObRepositorySync::ApiService.new(@ob_repository_sync.name) - res = service.get_projects_jobs - data = res["data"]["list"] + source = "" if params[:type] && params[:type].to_s.downcase == "github" - data = data.select { |row| row["github_branch"].present? } + source = "github_branch" elsif params[:type] && params[:type].to_s.downcase == "gitee" - data = data.select { |row| row["gitee_branch"].present? } + source = "gitee_branch" end + res = service.get_projects_jobs(source, page, limit) + data = res["data"]["list"] render_ok(count: res["data"]["total"], data: data) end @@ -83,7 +86,7 @@ class ObRepositorySyncsController < ApplicationController tip_exception "缺少参数job_id" if params[:job_id].blank? service = ObRepositorySync::ApiService.new(@ob_repository_sync.name) res = service.delete_job params[:job_id] - tip_exception "保存失败: #{res["msg"]}" if res["code"].to_s != "200" + tip_exception "删除失败: #{res["msg"]}" if res["code"].to_s != "200" job = ObRepositorySyncJob.find_by(ob_repository_sync_id: @ob_repository_sync.id, job_id: params[:job_id]) job.destroy! if job.present? render_ok diff --git a/app/services/ob_repository_sync/api_service.rb b/app/services/ob_repository_sync/api_service.rb index 5ecd48afa..293a65928 100644 --- a/app/services/ob_repository_sync/api_service.rb +++ b/app/services/ob_repository_sync/api_service.rb @@ -42,8 +42,8 @@ class ObRepositorySync::ApiService < ApplicationService res end - def get_projects_jobs - url = URI("#{domain}/cerobot/projects/#{@project_name}/jobs?pageSize=100&pageNum=1") + def get_projects_jobs(source, pageNum = 1, pageSize = 100) + url = URI("#{domain}/cerobot/projects/#{@project_name}/jobs?pageSize=#{pageSize}&pageNum=#{pageNum}&source=#{source}") http = Net::HTTP.new(url.host, url.port) request = Net::HTTP::Get.new(url) request["Content-Type"] = "application/json" From e5989b219f30abbde141ac5fbfe4d7e80ba35187 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”> Date: Mon, 15 Aug 2022 14:03:27 +0800 Subject: [PATCH 04/15] =?UTF-8?q?fixed=20reposyncer=20job=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=A2=9E=E5=8A=A0=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/ob_repository_syncs_controller.rb | 15 +++++++++------ app/services/ob_repository_sync/api_service.rb | 4 ++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/app/controllers/ob_repository_syncs_controller.rb b/app/controllers/ob_repository_syncs_controller.rb index ebae8e427..90f7fd6fd 100644 --- a/app/controllers/ob_repository_syncs_controller.rb +++ b/app/controllers/ob_repository_syncs_controller.rb @@ -34,7 +34,7 @@ class ObRepositorySyncsController < ApplicationController def delete service = ObRepositorySync::ApiService.new(@ob_repository_sync.name) res = service.delete_project @ob_repository_sync.sync_id - tip_exception "保存失败: #{res["msg"]}" if res["code"].to_s != "200" + tip_exception "删除失败: #{res["msg"]}" if res["code"].to_s != "200" if res["code"].to_s == "200" @ob_repository_sync.destroy! end @@ -43,14 +43,17 @@ class ObRepositorySyncsController < ApplicationController def jobs tip_exception "该项目未创建同步任务" if @ob_repository_sync.blank? + page = params[:page] || 1 + limit = params[:limit] || 10 service = ObRepositorySync::ApiService.new(@ob_repository_sync.name) - res = service.get_projects_jobs - data = res["data"]["list"] + source = "" if params[:type] && params[:type].to_s.downcase == "github" - data = data.select { |row| row["github_branch"].present? } + source = "github_branch" elsif params[:type] && params[:type].to_s.downcase == "gitee" - data = data.select { |row| row["gitee_branch"].present? } + source = "gitee_branch" end + res = service.get_projects_jobs(source, page, limit) + data = res["data"]["list"] render_ok(count: res["data"]["total"], data: data) end @@ -83,7 +86,7 @@ class ObRepositorySyncsController < ApplicationController tip_exception "缺少参数job_id" if params[:job_id].blank? service = ObRepositorySync::ApiService.new(@ob_repository_sync.name) res = service.delete_job params[:job_id] - tip_exception "保存失败: #{res["msg"]}" if res["code"].to_s != "200" + tip_exception "删除失败: #{res["msg"]}" if res["code"].to_s != "200" job = ObRepositorySyncJob.find_by(ob_repository_sync_id: @ob_repository_sync.id, job_id: params[:job_id]) job.destroy! if job.present? render_ok diff --git a/app/services/ob_repository_sync/api_service.rb b/app/services/ob_repository_sync/api_service.rb index 5ecd48afa..293a65928 100644 --- a/app/services/ob_repository_sync/api_service.rb +++ b/app/services/ob_repository_sync/api_service.rb @@ -42,8 +42,8 @@ class ObRepositorySync::ApiService < ApplicationService res end - def get_projects_jobs - url = URI("#{domain}/cerobot/projects/#{@project_name}/jobs?pageSize=100&pageNum=1") + def get_projects_jobs(source, pageNum = 1, pageSize = 100) + url = URI("#{domain}/cerobot/projects/#{@project_name}/jobs?pageSize=#{pageSize}&pageNum=#{pageNum}&source=#{source}") http = Net::HTTP.new(url.host, url.port) request = Net::HTTP::Get.new(url) request["Content-Type"] = "application/json" From 12cc870dc78660dca3ee5eb3fe0ffc25435378fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”> Date: Mon, 15 Aug 2022 15:47:30 +0800 Subject: [PATCH 05/15] =?UTF-8?q?fixed=20time=20ago=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 25b642d73..936452470 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -95,21 +95,31 @@ module ApplicationHelper timePassed = currentTime - lastUpdateTime timeIntoFormat = 0 updateAtValue = "" - if timePassed < 0 + + if timePassed <= 0 updateAtValue = "刚刚" + elsif timePassed < 2 * 1000 + updateAtValue = "1秒前" elsif timePassed < ONE_MINUTE updateAtValue = "1分钟前" elsif timePassed < ONE_HOUR timeIntoFormat = timePassed / ONE_MINUTE updateAtValue = timeIntoFormat.to_s + "分钟前" elsif (timePassed < ONE_DAY) - timeIntoFormat = (timePassed.to_f / ONE_HOUR).ceil + timeIntoFormat = (timePassed.to_f / ONE_HOUR).round + timeIntoFormat == 1 if timeIntoFormat.to_i == 0 updateAtValue = timeIntoFormat.to_s + "小时前" elsif (timePassed < ONE_MONTH) - timeIntoFormat = (timePassed.to_f / ONE_DAY).ceil + timeIntoFormat = (timePassed.to_f / ONE_DAY).round + timeIntoFormat == 1 if timeIntoFormat.to_i == 0 + updateAtValue = timeIntoFormat.to_s + "天前" + elsif (timePassed < ONE_MONTH) + timeIntoFormat = (timePassed.to_f / ONE_DAY).round + timeIntoFormat == 1 if timeIntoFormat.to_i == 0 updateAtValue = timeIntoFormat.to_s + "天前" elsif (timePassed < ONE_YEAR) - timeIntoFormat = (timePassed.to_f / ONE_MONTH).ceil + timeIntoFormat = (timePassed.to_f / ONE_MONTH).round + timeIntoFormat == 1 if timeIntoFormat.to_i == 0 updateAtValue = timeIntoFormat.to_s + "个月前" else timeIntoFormat = timePassed / ONE_YEAR From c0ee0a694ceabfb920b92f10ff0ad257cb1ba4e4 Mon Sep 17 00:00:00 2001 From: yystopf Date: Mon, 15 Aug 2022 15:55:33 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=BA=AF=E6=BA=90status=E6=94=B9=E4=B8=BAcode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/traces/base_controller.rb | 26 +++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 app/controllers/traces/base_controller.rb diff --git a/app/controllers/traces/base_controller.rb b/app/controllers/traces/base_controller.rb new file mode 100644 index 000000000..30970a5b8 --- /dev/null +++ b/app/controllers/traces/base_controller.rb @@ -0,0 +1,26 @@ +class Traces::BaseController < ApplicationController + + helper_method :observed_logged_user?, :observed_user + before_action :check_trace_system + + def observed_user + @_observed_user ||= (User.find_by_login(params[:user_id]) || User.find_by_id(params[:user_id])) + end + + def observed_logged_user? + observed_user.id == User.current&.id + end + + protected + def check_auth + return render_forbidden unless current_user.admin? || observed_logged_user? + end + + def check_trace_system + code, data, error = Trace::SystemInfoService.call(current_user.trace_token) + return render_ok({code: 501, data: {operate_time: data['operate_time']}, message: '系统维护中'}) if data['status'] === 0 + rescue + # 这里根据需求跳转到404 + return render_not_found + end +end \ No newline at end of file From 14c1be1bea8e9e370ae5fc96009a541ae5968a93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”> Date: Tue, 16 Aug 2022 11:29:33 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BB=BA=E6=9C=A8devop?= =?UTF-8?q?s=E5=9C=B0=E5=9D=80=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/projects_helper.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 5bed0950c..6206f2baa 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -64,6 +64,7 @@ module ProjectsHelper project_language_id: project.project_language_id, license_id: project.license_id, jianmu_devops: jianmu_devops_code(project, user), + jianmu_devops_url: jianmu_devops_url(jianmu_devops_code(project, user)), ignore_id: project.ignore_id }).compact @@ -123,6 +124,11 @@ module ProjectsHelper end end + def jianmu_devops_url(token) + url = EduSetting.get("jianmu_devops_url") || "https://ci-v3.test.jianmuhub.com/oauth2/authorize?code=" + "#{url}#{token}" + end + def aes_encrypt(key, des_text) # des_text='{"access_key_id":"STS.NTuC9RVmWfJqj3JkcMzPnDf7X","access_key_secret":"E8NxRZWGNxxMfwgt5nFLnBFgg6AzgXCZkSNCyqygLuHM","end_point":"oss-accelerate.aliyuncs.com","security_token":"CAIS8gF1q6Ft5B2yfSjIr5fACIPmu7J20YiaaBX7j2MYdt9Cq6Ocujz2IHhMenVhA+8Wv/02n2hR7PcYlq9IS55VWEqc/VXLaywQo22beIPkl5Gfz95t0e+IewW6Dxr8w7WhAYHQR8/cffGAck3NkjQJr5LxaTSlWS7OU/TL8+kFCO4aRQ6ldzFLKc5LLw950q8gOGDWKOymP2yB4AOSLjIx6lAt2T8vs/7hmZPFukSFtjCglL9J/baWC4O/csxhMK14V9qIx+FsfsLDqnUIs0YWpf0p3P0doGyf54vMWUM05A6dduPS7txkLAJwerjVl1/ADxc0/hqAASXhPeiktbmDjwvnSn4iKcSGQ+xoQB468eHXNdvf13dUlbbE1+JhRi0pZIB2UCtN9oTsLHcwIHt+EJaoMd3+hGwPVmvHSXzECDFHylZ8l/pzTwlE/aCtZyVmI5cZEvmWu2xBa3GRbULo7lLvyeX1cHTVmVWf4Nk6D09PzTU8qlAj","bucket":"edu-bigfiles1","region":"oss-cn-hangzhou","callback_url":"https://data.educoder.net/api/buckets/callback.json","bucket_host":"data.educoder.net"}' # des = OpenSSL::Cipher::Cipher.new('aes-256-ctr') From f211fbaec374b9ff880a743bfb99aee2bbc74e58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”> Date: Tue, 16 Aug 2022 11:31:43 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BB=BA=E6=9C=A8devop?= =?UTF-8?q?s=E5=9C=B0=E5=9D=80=E9=85=8D=E7=BD=AEURI.encode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/projects_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 6206f2baa..f60fa5290 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -126,7 +126,7 @@ module ProjectsHelper def jianmu_devops_url(token) url = EduSetting.get("jianmu_devops_url") || "https://ci-v3.test.jianmuhub.com/oauth2/authorize?code=" - "#{url}#{token}" + "#{url}#{URI.encode(token)}" end def aes_encrypt(key, des_text) From b2af43ee2ab84c0cd21cfc0bba32b321892bd088 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”> Date: Tue, 16 Aug 2022 11:34:20 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BB=BA=E6=9C=A8devop?= =?UTF-8?q?s=E5=9C=B0=E5=9D=80=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/projects_helper.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index f60fa5290..c9ea87f9a 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -64,7 +64,7 @@ module ProjectsHelper project_language_id: project.project_language_id, license_id: project.license_id, jianmu_devops: jianmu_devops_code(project, user), - jianmu_devops_url: jianmu_devops_url(jianmu_devops_code(project, user)), + jianmu_devops_url: jianmu_devops_url, ignore_id: project.ignore_id }).compact @@ -124,9 +124,8 @@ module ProjectsHelper end end - def jianmu_devops_url(token) - url = EduSetting.get("jianmu_devops_url") || "https://ci-v3.test.jianmuhub.com/oauth2/authorize?code=" - "#{url}#{URI.encode(token)}" + def jianmu_devops_url + EduSetting.get("jianmu_devops_url") || "https://ci-v3.test.jianmuhub.com" end def aes_encrypt(key, des_text) From 4618f4effa6456c7861c1be722149f1632bd86a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”> Date: Tue, 16 Aug 2022 11:46:58 +0800 Subject: [PATCH 10/15] =?UTF-8?q?fixed=20=E5=8F=91=E8=A1=8C=E7=89=88git?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=B6=EF=BC=8C=E4=B8=8D=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/version_release.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/version_release.rb b/app/models/version_release.rb index 3c97420ea..5585cee24 100644 --- a/app/models/version_release.rb +++ b/app/models/version_release.rb @@ -33,6 +33,6 @@ class VersionRelease < ApplicationRecord def update_sha git_release = Gitea::Versions::GetService.call(user.gitea_token, repository&.owner&.login, repository&.identifier, version_gid) - self.update(sha: git_release["sha"]) + self.update(sha: git_release["sha"]) if git_release.present? && git_release["status"].to_s != "-1" end end From c6034ed33f0fb4151365a0b23e907fa689ba5013 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”> Date: Tue, 16 Aug 2022 11:48:39 +0800 Subject: [PATCH 11/15] =?UTF-8?q?fixed=20=E5=8F=91=E8=A1=8C=E7=89=88git?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=B6=EF=BC=8C=E4=B8=8D=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=A4=84=E7=90=86test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/version_release.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/version_release.rb b/app/models/version_release.rb index 5585cee24..c2a8caf8d 100644 --- a/app/models/version_release.rb +++ b/app/models/version_release.rb @@ -33,6 +33,7 @@ class VersionRelease < ApplicationRecord def update_sha git_release = Gitea::Versions::GetService.call(user.gitea_token, repository&.owner&.login, repository&.identifier, version_gid) + puts "git_release======#{git_release}" self.update(sha: git_release["sha"]) if git_release.present? && git_release["status"].to_s != "-1" end end From 0c10f3ff109e02e0d3eb56e0f44d2af9f7e7577b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”> Date: Tue, 16 Aug 2022 11:50:09 +0800 Subject: [PATCH 12/15] =?UTF-8?q?fixed=20=E5=8F=91=E8=A1=8C=E7=89=88git?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=B6=EF=BC=8C=E4=B8=8D=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=A4=84=E7=90=86log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/version_release.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/version_release.rb b/app/models/version_release.rb index c2a8caf8d..66acc36e0 100644 --- a/app/models/version_release.rb +++ b/app/models/version_release.rb @@ -33,7 +33,7 @@ class VersionRelease < ApplicationRecord def update_sha git_release = Gitea::Versions::GetService.call(user.gitea_token, repository&.owner&.login, repository&.identifier, version_gid) - puts "git_release======#{git_release}" + Rails.logger.info "git_release======#{git_release}" self.update(sha: git_release["sha"]) if git_release.present? && git_release["status"].to_s != "-1" end end From 81b64c18b6fd5c908c4d6a985ec33bcebbeff71d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”> Date: Tue, 16 Aug 2022 14:03:05 +0800 Subject: [PATCH 13/15] =?UTF-8?q?fixed=20=E5=8F=91=E8=A1=8C=E7=89=88git?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=B6=EF=BC=8C=E4=B8=8D=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=A4=84=E7=90=86log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/version_release.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/version_release.rb b/app/models/version_release.rb index 66acc36e0..00119f806 100644 --- a/app/models/version_release.rb +++ b/app/models/version_release.rb @@ -32,8 +32,8 @@ class VersionRelease < ApplicationRecord has_many :attachments, as: :container, dependent: :destroy def update_sha + return if version_gid.blank? git_release = Gitea::Versions::GetService.call(user.gitea_token, repository&.owner&.login, repository&.identifier, version_gid) - Rails.logger.info "git_release======#{git_release}" - self.update(sha: git_release["sha"]) if git_release.present? && git_release["status"].to_s != "-1" + self.update(sha: git_release["sha"]) if git_release.present? && git_release.is_a?(Hash) end end From 68a38e75bc597a6a45aa305694c42a31ce690b2c Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 16 Aug 2022 14:07:37 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E4=BF=AE=E5=A4=8D:=20=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=8E=A5=E5=8F=A3=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/messages/_message.json.jbuilder | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/users/messages/_message.json.jbuilder b/app/views/users/messages/_message.json.jbuilder index 075613ce9..07040dfe5 100644 --- a/app/views/users/messages/_message.json.jbuilder +++ b/app/views/users/messages/_message.json.jbuilder @@ -6,6 +6,7 @@ json.status message["status"] json.content message["content"] json.notification_url message["notification_url"] json.source message["source"] +json.created_at message["created_at"] json.time_ago time_from_now(message["created_at"].to_time) case message["type"] From dbdb860bb7e4d54a41b0fe3eec69131d35c1c7d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cxxq250=E2=80=9D?= <“xxq250@qq.com”> Date: Tue, 16 Aug 2022 15:33:15 +0800 Subject: [PATCH 15/15] =?UTF-8?q?fixed=20commit=E6=97=A5=E5=BF=97=E5=90=8C?= =?UTF-8?q?=E6=97=B6=E6=9B=B4=E6=96=B0=E9=A1=B9=E7=9B=AE=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/commit_logs_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/commit_logs_controller.rb b/app/controllers/commit_logs_controller.rb index c62c13000..3be1794a7 100644 --- a/app/controllers/commit_logs_controller.rb +++ b/app/controllers/commit_logs_controller.rb @@ -15,6 +15,7 @@ class CommitLogsController < ApplicationController owner = User.find_by(login: owner_name) project = Project.where(identifier: repository_name).where(user_id: owner&.id)&.first project = Project.where(identifier: repository_name).where(gpid: repository_id)&.first if project.blank? + project.update_column(:updated_on, Time.now) if project.present? params[:commits].each do |commit| commit_id = commit[:id] message = commit[:message]