forked from Gitlink/forgeplus
Compare commits
51 Commits
| Author | SHA1 | Date |
|---|---|---|
jasder
|
21b55eba83 | |
|
jasder
|
273a17861b | |
|
jasder
|
9f8a55fe12 | |
|
jasder
|
529e8e5fe6 | |
|
jasder
|
f38e01edaf | |
|
Jasder
|
1be0a918a6 | |
|
Jasder
|
82bd15d4ec | |
 sylor_huang@126.com
|
441589b7f2 | |
|
sylor_huang@126.com
|
3c5e6effc9 | |
|
sylor_huang@126.com
|
15565e513e | |
|
sylor_huang@126.com
|
38abe195c5 | |
|
sylor_huang@126.com
|
1809e580b7 | |
|
sylor_huang@126.com
|
c3c9f24e22 | |
|
sylor_huang@126.com
|
dffb859c38 | |
|
sylor_huang@126.com
|
31a9b14639 | |
|
sylor_huang@126.com
|
f196977cd6 | |
|
sylor_huang@126.com
|
6b7b6b9a66 | |
|
sylor_huang@126.com
|
a956d3d7ed | |
|
sylor_huang@126.com
|
f4ed8086d4 | |
|
sylor_huang@126.com
|
075100e468 | |
|
sylor_huang@126.com
|
458e7147c5 | |
|
sylor_huang@126.com
|
e404843eb7 | |
|
sylor_huang@126.com
|
9143a96894 | |
|
sylor_huang@126.com
|
5ee88ee7d8 | |
|
sylor_huang@126.com
|
921655567a | |
|
sylor_huang@126.com
|
598571e8f4 | |
|
sylor_huang@126.com
|
5ae9c9bebc | |
|
sylor_huang@126.com
|
79b61913c5 | |
|
sylor_huang@126.com
|
61e7091ece | |
|
sylor_huang@126.com
|
e9c118fb77 | |
|
sylor_huang@126.com
|
84ff2e4bf5 | |
|
sylor_huang@126.com
|
3062528fb0 | |
|
sylor_huang@126.com
|
3fd76d2f9e | |
|
sylor_huang@126.com
|
d5e57da6d4 | |
|
Jasder
|
ae8b6b82f1 | |
|
Jasder
|
4cd459ce58 | |
|
sylor_huang@126.com
|
1f42076d20 | |
|
sylor_huang@126.com
|
20dd1aeedf | |
|
sylor_huang@126.com
|
8ad3160ab7 | |
|
sylor_huang@126.com
|
93e887e0e5 | |
|
sylor_huang@126.com
|
f3b88d77b0 | |
|
sylor_huang@126.com
|
5639a69f78 | |
|
sylor_huang@126.com
|
141bf1a488 | |
|
Jasder
|
2383a0d21e | |
|
sylor_huang@126.com
|
fbec7a6e35 | |
|
sylor_huang@126.com
|
ce2deaf543 | |
|
sylor_huang@126.com
|
dba0303428 | |
|
sylor_huang@126.com
|
d656e3c3b7 | |
|
sylor_huang@126.com
|
4fa4e7493c | |
|
sylor_huang@126.com
|
4d3a6c4811 | |
|
sylor_huang@126.com
|
7c290482aa |
|
|
@ -36,8 +36,6 @@ public/react/yarn.lock
|
|||
/.idea/*
|
||||
|
||||
# Ignore react node_modules
|
||||
public/system/*
|
||||
public/react/*
|
||||
/public/react/.cache
|
||||
/public/react/node_modules/
|
||||
/public/react/config/stats.json
|
||||
|
|
@ -83,5 +81,4 @@ docker/
|
|||
educoder.sql
|
||||
redis_data/
|
||||
Dockerfile
|
||||
dump.rdb
|
||||
.tags*
|
||||
dump.rdb
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
kind: pipeline
|
||||
name: default
|
||||
|
||||
platform:
|
||||
os: linux
|
||||
arch: arm64
|
||||
|
||||
steps:
|
||||
- name: install
|
||||
image: ruby:2.4.5
|
||||
commands:
|
||||
- gem install bundler
|
||||
- bundle -v
|
||||
- bundle install --jobs=1 --retry=1
|
||||
|
||||
- name: test
|
||||
image: ruby:2.4.5
|
||||
volumes:
|
||||
- name: bundle
|
||||
path: /usr/local/bundle
|
||||
commands:
|
||||
- rake
|
||||
98
CHANGELOG.md
98
CHANGELOG.md
|
|
@ -1,98 +0,0 @@
|
|||
# Changelog
|
||||
## [v3.1.0](https://forgeplus.trustie.net/projects/jasder/forgeplus/releases) - 2021-06-09
|
||||
|
||||
* ENHANCEMENTS
|
||||
* ADD 用户活动统计图表功能
|
||||
* ADD 用户精选项目功能
|
||||
* ADD 用户贡献度统计图表功能
|
||||
* ADD 用户开发能力数据统计工
|
||||
* ADD 用户角色定位展示功能
|
||||
* ADD 用户专业定位标签展示功能
|
||||
* ADD 修改用户基本资料功能
|
||||
* ADD 更改密码功能
|
||||
* ADD 用户个人主页基本现在展示可配置功能
|
||||
|
||||
* BUGFIXES
|
||||
* Fix 解决一些bug
|
||||
* Fix 优化美化页面
|
||||
|
||||
|
||||
* BUGFIXES
|
||||
* Fix 在线修改文件，页面文件显不及时的问题(46049)
|
||||
* Fix Fork项目，接口多次调用问题(45052)
|
||||
* FIX 页面置顶功能区域排版问题(45825)
|
||||
* Fix 其他样式显示问题
|
||||
|
||||
* ENHANCEMENTS
|
||||
* ADD 合并请求页面显示有冲突文件状态(46016)
|
||||
* ADD 创建组织各属性添加规则匹配功能(45707)
|
||||
* ADD 微信分享功能(45707)
|
||||
|
||||
## [v3.0.3](https://forgeplus.trustie.net/projects/jasder/forgeplus/releases) - 2021-05-08
|
||||
|
||||
* BUGFIXES
|
||||
* Fix 解决易修标题过长导致的排版问题(45469)
|
||||
* Fix 解决合并请求详情页面排版错误的问题(45457)
|
||||
* FIX 解决转移仓库界面专有名词描述错误的问题(45455)
|
||||
* Fix 解决markdown格式文件自动生成数字排序的问题(45454)
|
||||
* Fix 解决镜像项目源地址不显示的问题(45403)
|
||||
* Fix 解决镜像项目导航显示错误问题(45398)
|
||||
* Fix 解决其他相关bug
|
||||
|
||||
* ENHANCEMENTS
|
||||
* UPDATE 用户注册时，账号和密码正则匹配调整(45336) (45318) (45290)
|
||||
* ADD 创建组织各属性添加规则匹配功能(45313) (45289)
|
||||
* ADD 创建团建各属性添加规则匹配功能(45334) (45325) (45287)
|
||||
* ADD 仓库转移功能(45017) (45015)
|
||||
|
||||
## [v3.0.2](https://forgeplus.trustie.net/projects/jasder/forgeplus/releases) - 2021-04-23
|
||||
|
||||
* BUGFIXES
|
||||
* Fix 解决部分用户头像不显示问题
|
||||
* Fix 解决代码库模块中最左侧目录中的文件定位加载不准确的问题
|
||||
* FIX 解决团队管理页面中项目链接错误问题
|
||||
* Fix 解决markdown格式文件显示问题
|
||||
* Fix 解决组织名下创建项目报错的问题
|
||||
* Fix 解决组织名下的项目，创建issue报错的问题
|
||||
* Fix 解决组织名下创建团队提示信息信息显示错误问题
|
||||
* Fix 解决点击组织图片时，链接加载错误问题
|
||||
* Fix 修复查询版本库信息安全漏洞
|
||||
* Fix 解决修复团队成员操作访问组织仓库报403错误的问题
|
||||
* Fix 解决owners团队成员对仓库添加成功失败的问题
|
||||
|
||||
* ENHANCEMENTS
|
||||
* ADD 自动生产用户头像功能
|
||||
* ADD 创建组织支持中文名称
|
||||
* ADD 创建团建支持中文名称
|
||||
* ADD 组织名称统一显示中文名
|
||||
* ADD 团队名称统一显示中文名
|
||||
* ADD 用户头像悬浮时展示相关信息
|
||||
* ADD 项目详情页添加实践课程链接入口
|
||||
* ADD README文件页面添加添加目录导航功能
|
||||
* UPDATE 升级改版底部footer信息
|
||||
* UPDATE 升级用户操作版本库权限
|
||||
|
||||
## [v3.0.1](https://forgeplus.trustie.net/projects/jasder/forgeplus/releases) - 2021-03-19
|
||||
|
||||
* BUGFIXES
|
||||
* Fix pull reqeust模块中用户头像显示问题
|
||||
* Fix 解决issue模块中，指派用户的问题
|
||||
* Fix 解决合并请求失败的后显示message信息不正确
|
||||
* Fix 代码目录页面，readme文件提供单独的api
|
||||
|
||||
* ENHANCEMENTS
|
||||
* 重构项目详情页面
|
||||
|
||||
## [v3.0.0](https://forgeplus.trustie.net/projects/jasder/forgeplus/releases) - 2020-12-29
|
||||
|
||||
* BUGFIXES
|
||||
* Fix pull reqeust的访问权限问题 (#14156) (#14171)
|
||||
* Fix 部分页面访问403的问题
|
||||
* Fix 合并请求失败的问题
|
||||
* Fix 代码目录页面，文件夹和文件图片不显示的问题
|
||||
* Fix Issue列表中按‘负责人’过滤筛选时，部分项目成员不在搜索范围没的问题
|
||||
* Fix 项目更新时间不同步的问题, 添加了定时任务
|
||||
* ENHANCEMENTS
|
||||
* 提升获取版本库目录代码查询速度 (#43296)
|
||||
* tag 列表慢查询速度问题 (#43332)
|
||||
* API builder 模版中 render partial builder的性能问题
|
||||
10
Gemfile
10
Gemfile
|
|
@ -1,6 +1,8 @@
|
|||
source 'https://gems.ruby-china.com'
|
||||
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
|
||||
|
||||
ruby '2.3.7'
|
||||
|
||||
gem 'rails', '~> 5.2.0'
|
||||
gem 'mysql2', '>= 0.4.4', '< 0.6.0'
|
||||
gem 'puma', '~> 3.11'
|
||||
|
|
@ -12,11 +14,14 @@ gem 'turbolinks', '~> 5'
|
|||
gem 'jbuilder', '~> 2.5'
|
||||
gem 'groupdate', '~> 4.1.0'
|
||||
gem 'chartkick'
|
||||
# gem 'grape', '~> 0.9.0'
|
||||
gem 'grape-entity', '~> 0.7.1'
|
||||
gem 'kaminari', '~> 1.1', '>= 1.1.1'
|
||||
|
||||
gem 'bootsnap', '>= 1.1.0', require: false
|
||||
|
||||
gem 'gitlab', path: 'lib/gitlab-cli'
|
||||
|
||||
gem 'chinese_pinyin'
|
||||
|
||||
gem 'rack-cors'
|
||||
|
|
@ -43,7 +48,7 @@ gem 'redcarpet', '~> 3.4'
|
|||
|
||||
gem 'rqrcode', '~> 0.10.1'
|
||||
gem 'rqrcode_png'
|
||||
|
||||
gem 'acts_as_tree', '~> 2.9', '>= 2.9.1'
|
||||
gem 'acts-as-taggable-on', '~> 6.0'
|
||||
|
||||
# a tree structure
|
||||
|
|
@ -70,7 +75,6 @@ group :development do
|
|||
gem 'listen', '>= 3.0.5', '< 3.2'
|
||||
gem 'spring'
|
||||
gem 'spring-watcher-listen', '~> 2.0.0'
|
||||
gem "annotate", "~> 2.6.0"
|
||||
end
|
||||
|
||||
group :test do
|
||||
|
|
@ -100,7 +104,6 @@ gem 'rails-i18n', '~> 5.1'
|
|||
# job
|
||||
gem 'sidekiq'
|
||||
gem 'sinatra'
|
||||
gem "sidekiq-cron", "~> 1.1"
|
||||
|
||||
# batch insert
|
||||
gem 'bulk_insert'
|
||||
|
|
@ -127,4 +130,3 @@ gem 'harmonious_dictionary', '~> 0.0.1'
|
|||
|
||||
gem 'parallel', '~> 1.19', '>= 1.19.1'
|
||||
|
||||
gem 'letter_avatar'
|
||||
|
|
|
|||
42
Gemfile.lock
42
Gemfile.lock
|
|
@ -1,3 +1,10 @@
|
|||
PATH
|
||||
remote: lib/gitlab-cli
|
||||
specs:
|
||||
gitlab (3.2.0)
|
||||
httparty
|
||||
terminal-table
|
||||
|
||||
GEM
|
||||
remote: https://gems.ruby-china.com/
|
||||
specs:
|
||||
|
|
@ -50,13 +57,12 @@ GEM
|
|||
activerecord (>= 5.0, < 6.1)
|
||||
acts_as_list (0.9.19)
|
||||
activerecord (>= 3.0)
|
||||
acts_as_tree (2.9.1)
|
||||
activerecord (>= 3.0.0)
|
||||
addressable (2.7.0)
|
||||
public_suffix (>= 2.0.2, < 5.0)
|
||||
ancestry (3.0.7)
|
||||
activerecord (>= 3.2.0)
|
||||
annotate (2.6.5)
|
||||
activerecord (>= 2.3.0)
|
||||
rake (>= 0.8.7)
|
||||
archive-zip (0.12.0)
|
||||
io-like (~> 0.3.0)
|
||||
arel (9.0.0)
|
||||
|
|
@ -118,17 +124,12 @@ GEM
|
|||
enumerize (2.3.1)
|
||||
activesupport (>= 3.2)
|
||||
erubi (1.9.0)
|
||||
et-orbi (1.2.4)
|
||||
tzinfo
|
||||
execjs (2.7.0)
|
||||
faraday (0.15.4)
|
||||
multipart-post (>= 1.2, < 3)
|
||||
ffi (1.12.2)
|
||||
font-awesome-sass (4.7.0)
|
||||
sass (>= 3.2)
|
||||
fugit (1.4.1)
|
||||
et-orbi (~> 1.1, >= 1.1.8)
|
||||
raabro (~> 1.4)
|
||||
globalid (0.4.2)
|
||||
activesupport (>= 4.2.0)
|
||||
grape-entity (0.7.1)
|
||||
|
|
@ -139,6 +140,9 @@ GEM
|
|||
harmonious_dictionary (0.0.1)
|
||||
hashie (3.6.0)
|
||||
htmlentities (4.3.4)
|
||||
httparty (0.18.0)
|
||||
mime-types (~> 3.0)
|
||||
multi_xml (>= 0.5.2)
|
||||
i18n (1.8.2)
|
||||
concurrent-ruby (~> 1.0)
|
||||
io-like (0.3.1)
|
||||
|
|
@ -162,7 +166,6 @@ GEM
|
|||
activerecord
|
||||
kaminari-core (= 1.2.0)
|
||||
kaminari-core (1.2.0)
|
||||
letter_avatar (0.3.8)
|
||||
listen (3.1.5)
|
||||
rb-fsevent (~> 0.9, >= 0.9.4)
|
||||
rb-inotify (~> 0.9, >= 0.9.7)
|
||||
|
|
@ -176,9 +179,10 @@ GEM
|
|||
mimemagic (~> 0.3.2)
|
||||
maruku (0.7.3)
|
||||
method_source (0.9.2)
|
||||
mimemagic (0.3.10)
|
||||
nokogiri (~> 1)
|
||||
rake
|
||||
mime-types (3.3.1)
|
||||
mime-types-data (~> 3.2015)
|
||||
mime-types-data (3.2019.1009)
|
||||
mimemagic (0.3.4)
|
||||
mini_mime (1.0.2)
|
||||
mini_portile2 (2.4.0)
|
||||
minitest (5.14.0)
|
||||
|
|
@ -219,7 +223,6 @@ GEM
|
|||
prettier (0.18.2)
|
||||
public_suffix (4.0.3)
|
||||
puma (3.12.2)
|
||||
raabro (1.4.0)
|
||||
rack (2.0.9)
|
||||
rack-cors (1.1.1)
|
||||
rack (>= 2.0.0)
|
||||
|
|
@ -362,9 +365,6 @@ GEM
|
|||
rack (< 2.1.0)
|
||||
rack-protection (>= 1.5.0)
|
||||
redis (>= 3.3.5, < 5)
|
||||
sidekiq-cron (1.2.0)
|
||||
fugit (~> 1.1)
|
||||
sidekiq (>= 4.2.1)
|
||||
simple_form (5.0.2)
|
||||
actionpack (>= 5.0)
|
||||
activemodel (>= 5.0)
|
||||
|
|
@ -404,6 +404,8 @@ GEM
|
|||
actionpack (>= 4.0)
|
||||
activesupport (>= 4.0)
|
||||
sprockets (>= 3.0.0)
|
||||
terminal-table (1.8.0)
|
||||
unicode-display_width (~> 1.1, >= 1.1.1)
|
||||
thor (1.0.1)
|
||||
thread_safe (0.3.6)
|
||||
tilt (2.0.10)
|
||||
|
|
@ -436,8 +438,8 @@ DEPENDENCIES
|
|||
active_decorator
|
||||
acts-as-taggable-on (~> 6.0)
|
||||
acts_as_list
|
||||
acts_as_tree (~> 2.9, >= 2.9.1)
|
||||
ancestry
|
||||
annotate (~> 2.6.0)
|
||||
awesome_print
|
||||
axlsx (~> 3.0.0.pre)
|
||||
axlsx_rails (~> 0.5.2)
|
||||
|
|
@ -453,13 +455,13 @@ DEPENDENCIES
|
|||
enumerize
|
||||
faraday (~> 0.15.4)
|
||||
font-awesome-sass (= 4.7.0)
|
||||
gitlab!
|
||||
grape-entity (~> 0.7.1)
|
||||
groupdate (~> 4.1.0)
|
||||
harmonious_dictionary (~> 0.0.1)
|
||||
jbuilder (~> 2.5)
|
||||
jquery-rails
|
||||
kaminari (~> 1.1, >= 1.1.1)
|
||||
letter_avatar
|
||||
listen (>= 3.0.5, < 3.2)
|
||||
mysql2 (>= 0.4.4, < 0.6.0)
|
||||
oauth2
|
||||
|
|
@ -490,7 +492,6 @@ DEPENDENCIES
|
|||
searchkick
|
||||
selenium-webdriver
|
||||
sidekiq
|
||||
sidekiq-cron (~> 1.1)
|
||||
simple_form
|
||||
simple_xlsx_reader
|
||||
sinatra
|
||||
|
|
@ -504,5 +505,8 @@ DEPENDENCIES
|
|||
web-console (>= 3.3.0)
|
||||
wkhtmltopdf-binary
|
||||
|
||||
RUBY VERSION
|
||||
ruby 2.3.7p456
|
||||
|
||||
BUNDLED WITH
|
||||
2.1.4
|
||||
|
|
|
|||
137
LICENSE
137
LICENSE
|
|
@ -1,124 +1,21 @@
|
|||
木兰宽松许可证， 第2版
|
||||
MIT License
|
||||
|
||||
2020年1月 http://license.coscl.org.cn/MulanPSL2
|
||||
Copyright (c) [year] [fullname]
|
||||
|
||||
您对“软件”的复制、使用、修改及分发受木兰宽松许可证，第2版（“本许可证”）的如下条款的约束：
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
0. 定义
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
“软件” 是指由“贡献”构成的许可在“本许可证”下的程序和相关文档的集合。
|
||||
|
||||
“贡献” 是指由任一“贡献者”许可在“本许可证”下的受版权法保护的作品。
|
||||
|
||||
“贡献者” 是指将受版权法保护的作品许可在“本许可证”下的自然人或“法人实体”。
|
||||
|
||||
“法人实体” 是指提交贡献的机构及其“关联实体”。
|
||||
|
||||
“关联实体” 是指，对“本许可证”下的行为方而言，控制、受控制或与其共同受控制的机构，此处的控制是指有受控方或共同受控方至少50%直接或间接的投票权、资金或其他有价证券。
|
||||
|
||||
1. 授予版权许可
|
||||
|
||||
每个“贡献者”根据“本许可证”授予您永久性的、全球性的、免费的、非独占的、不可撤销的版权许可，您可以复制、使用、修改、分发其“贡献”，不论修改与否。
|
||||
|
||||
2. 授予专利许可
|
||||
|
||||
每个“贡献者”根据“本许可证”授予您永久性的、全球性的、免费的、非独占的、不可撤销的（根据本条规定撤销除外）专利许可，供您制造、委托制造、使用、许诺销售、销售、进口其“贡献”或以其他方式转移其“贡献”。前述专利许可仅限于“贡献者”现在或将来拥有或控制的其“贡献”本身或其“贡献”与许可“贡献”时的“软件”结合而将必然会侵犯的专利权利要求，不包括对“贡献”的修改或包含“贡献”的其他结合。如果您或您的“关联实体”直接或间接地，就“软件”或其中的“贡献”对任何人发起专利侵权诉讼（包括反诉或交叉诉讼）或其他专利维权行动，指控其侵犯专利权，则“本许可证”授予您对“软件”的专利许可自您提起诉讼或发起维权行动之日终止。
|
||||
|
||||
3. 无商标许可
|
||||
|
||||
“本许可证”不提供对“贡献者”的商品名称、商标、服务标志或产品名称的商标许可，但您为满足第4条规定的声明义务而必须使用除外。
|
||||
|
||||
4. 分发限制
|
||||
|
||||
您可以在任何媒介中将“软件”以源程序形式或可执行形式重新分发，不论修改与否，但您必须向接收者提供“本许可证”的副本，并保留“软件”中的版权、商标、专利及免责声明。
|
||||
|
||||
5. 免责声明与责任限制
|
||||
|
||||
“软件”及其中的“贡献”在提供时不带任何明示或默示的担保。在任何情况下，“贡献者”或版权所有者不对任何人因使用“软件”或其中的“贡献”而引发的任何直接或间接损失承担责任，不论因何种原因导致或者基于何种法律理论,即使其曾被建议有此种损失的可能性。
|
||||
|
||||
6. 语言
|
||||
|
||||
“本许可证”以中英文双语表述，中英文版本具有同等法律效力。如果中英文版本存在任何冲突不一致，以中文版为准。
|
||||
|
||||
条款结束
|
||||
|
||||
如何将木兰宽松许可证，第2版，应用到您的软件
|
||||
|
||||
如果您希望将木兰宽松许可证，第2版，应用到您的新软件，为了方便接收者查阅，建议您完成如下三步：
|
||||
|
||||
1， 请您补充如下声明中的空白，包括软件名、软件的首次发表年份以及您作为版权人的名字；
|
||||
|
||||
2， 请您在软件包的一级目录下创建以“LICENSE”为名的文件，将整个许可证文本放入该文件中；
|
||||
|
||||
3， 请将如下声明文本放入每个源文件的头部注释中。
|
||||
|
||||
Copyright (c) [Year] [name of copyright holder]
|
||||
[Software Name] is licensed under Mulan PSL v2.
|
||||
You can use this software according to the terms and conditions of the Mulan PSL v2.
|
||||
You may obtain a copy of Mulan PSL v2 at:
|
||||
http://license.coscl.org.cn/MulanPSL2
|
||||
THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
|
||||
EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
|
||||
MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
|
||||
See the Mulan PSL v2 for more details.
|
||||
Mulan Permissive Software License，Version 2
|
||||
Mulan Permissive Software License，Version 2 (Mulan PSL v2)
|
||||
|
||||
January 2020 http://license.coscl.org.cn/MulanPSL2
|
||||
|
||||
Your reproduction, use, modification and distribution of the Software shall be subject to Mulan PSL v2 (this License) with the following terms and conditions:
|
||||
|
||||
0. Definition
|
||||
|
||||
Software means the program and related documents which are licensed under this License and comprise all Contribution(s).
|
||||
|
||||
Contribution means the copyrightable work licensed by a particular Contributor under this License.
|
||||
|
||||
Contributor means the Individual or Legal Entity who licenses its copyrightable work under this License.
|
||||
|
||||
Legal Entity means the entity making a Contribution and all its Affiliates.
|
||||
|
||||
Affiliates means entities that control, are controlled by, or are under common control with the acting entity under this License, ‘control’ means direct or indirect ownership of at least fifty percent (50%) of the voting power, capital or other securities of controlled or commonly controlled entity.
|
||||
|
||||
1. Grant of Copyright License
|
||||
|
||||
Subject to the terms and conditions of this License, each Contributor hereby grants to you a perpetual, worldwide, royalty-free, non-exclusive, irrevocable copyright license to reproduce, use, modify, or distribute its Contribution, with modification or not.
|
||||
|
||||
2. Grant of Patent License
|
||||
|
||||
Subject to the terms and conditions of this License, each Contributor hereby grants to you a perpetual, worldwide, royalty-free, non-exclusive, irrevocable (except for revocation under this Section) patent license to make, have made, use, offer for sale, sell, import or otherwise transfer its Contribution, where such patent license is only limited to the patent claims owned or controlled by such Contributor now or in future which will be necessarily infringed by its Contribution alone, or by combination of the Contribution with the Software to which the Contribution was contributed. The patent license shall not apply to any modification of the Contribution, and any other combination which includes the Contribution. If you or your Affiliates directly or indirectly institute patent litigation (including a cross claim or counterclaim in a litigation) or other patent enforcement activities against any individual or entity by alleging that the Software or any Contribution in it infringes patents, then any patent license granted to you under this License for the Software shall terminate as of the date such litigation or activity is filed or taken.
|
||||
|
||||
3. No Trademark License
|
||||
|
||||
No trademark license is granted to use the trade names, trademarks, service marks, or product names of Contributor, except as required to fulfill notice requirements in section 4.
|
||||
|
||||
4. Distribution Restriction
|
||||
|
||||
You may distribute the Software in any medium with or without modification, whether in source or executable forms, provided that you provide recipients with a copy of this License and retain copyright, patent, trademark and disclaimer statements in the Software.
|
||||
|
||||
5. Disclaimer of Warranty and Limitation of Liability
|
||||
|
||||
THE SOFTWARE AND CONTRIBUTION IN IT ARE PROVIDED WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED. IN NO EVENT SHALL ANY CONTRIBUTOR OR COPYRIGHT HOLDER BE LIABLE TO YOU FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO ANY DIRECT, OR INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING FROM YOUR USE OR INABILITY TO USE THE SOFTWARE OR THE CONTRIBUTION IN IT, NO MATTER HOW IT’S CAUSED OR BASED ON WHICH LEGAL THEORY, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
|
||||
|
||||
6. Language
|
||||
|
||||
THIS LICENSE IS WRITTEN IN BOTH CHINESE AND ENGLISH, AND THE CHINESE VERSION AND ENGLISH VERSION SHALL HAVE THE SAME LEGAL EFFECT. IN THE CASE OF DIVERGENCE BETWEEN THE CHINESE AND ENGLISH VERSIONS, THE CHINESE VERSION SHALL PREVAIL.
|
||||
|
||||
END OF THE TERMS AND CONDITIONS
|
||||
|
||||
How to Apply the Mulan Permissive Software License，Version 2 (Mulan PSL v2) to Your Software
|
||||
|
||||
To apply the Mulan PSL v2 to your work, for easy identification by recipients, you are suggested to complete following three steps:
|
||||
|
||||
Fill in the blanks in following statement, including insert your software name, the year of the first publication of your software, and your name identified as the copyright owner;
|
||||
Create a file named "LICENSE" which contains the whole context of this License in the first directory of your software package;
|
||||
Attach the statement to the appropriate annotated syntax at the beginning of each source file.
|
||||
Copyright (c) [Year] [name of copyright holder]
|
||||
[Software Name] is licensed under Mulan PSL v2.
|
||||
You can use this software according to the terms and conditions of the Mulan PSL v2.
|
||||
You may obtain a copy of Mulan PSL v2 at:
|
||||
http://license.coscl.org.cn/MulanPSL2
|
||||
THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
|
||||
EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
|
||||
MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
|
||||
See the Mulan PSL v2 for more details.
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
|
|
|
|||
5062
api_document.md
5062
api_document.md
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,4 @@
|
|||
$(document).on('turbolinks:load', function() {
|
||||
var $addSectionModal = $('.admin-import-user-modal');
|
||||
|
||||
});
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
// Place all the behaviors and hooks related to the matching controller here.
|
||||
// All this logic will automatically be available in application.js.
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
// .admins-banned-users-index-page {
|
||||
// .width240 {
|
||||
// width: 240px;
|
||||
// }
|
||||
// .mr15{margin-right: 15px;}
|
||||
// .mt2{margin-top: 2px;}
|
||||
// }
|
||||
|
|
@ -136,5 +136,36 @@
|
|||
background: #fff;
|
||||
}
|
||||
.mt-10{margin-top: 10px;}
|
||||
.nav_blueline_status{
|
||||
list-style-type: none;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
li {
|
||||
padding: 0px 15px;
|
||||
border-radius: 15px;
|
||||
border: 1px solid #CDCDCD;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
float: left;
|
||||
margin-right: 30px;
|
||||
a {
|
||||
color: #CDCDCD!important;
|
||||
display: block;
|
||||
}
|
||||
};
|
||||
li.active {
|
||||
border: 1px solid #4CACFF;
|
||||
a {
|
||||
color: #4CACFF!important;
|
||||
}
|
||||
}
|
||||
}
|
||||
.fr{float: right;}
|
||||
.width240 {
|
||||
width: 240px;
|
||||
}
|
||||
.mr15{margin-right: 15px;}
|
||||
.mt2{margin-top: 2px;}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
// Place all the styles related to the admins/faqs controller here.
|
||||
// They will automatically be included in application.css.
|
||||
// You can use Sass (SCSS) here: http://sass-lang.com/
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
.admins-forum-moderators-index-page {
|
||||
.df{
|
||||
display: flex;
|
||||
}
|
||||
.flex1 {
|
||||
flex: 1;
|
||||
}
|
||||
.text-center {
|
||||
text-align: center;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,128 @@
|
|||
.admins-forum-sections-index-page {
|
||||
.color-grey{color: #888;}
|
||||
.grid-item-top {
|
||||
display: grid;
|
||||
grid-template-columns: max-content 1fr;
|
||||
align-self: start;
|
||||
}
|
||||
.mt20{margin-top: 20px;}
|
||||
.none{display: none;}
|
||||
.color-red{color: red!important;}
|
||||
.upload-image-100 {
|
||||
height: 100px;
|
||||
width: 100px;
|
||||
border-radius: 8px;
|
||||
text-align: center;
|
||||
/* line-height: 100px; */
|
||||
background: #f5f5f5;
|
||||
color: #999;
|
||||
position: relative;
|
||||
}
|
||||
.pointer {
|
||||
cursor: pointer;
|
||||
}
|
||||
.avatar100{
|
||||
height: 100px;
|
||||
width: 100px;
|
||||
border-radius: 8px;
|
||||
}
|
||||
.upload-image-100:hover .admin-show-again-upload{display: block;}
|
||||
.admin-show-again-upload {
|
||||
bottom: 0;
|
||||
width: 100px;
|
||||
height: 100%;
|
||||
line-height: 100px;
|
||||
/* top: 0; */
|
||||
background: rgba(0,0,0,0.6);
|
||||
color: #fff;
|
||||
position: absolute;
|
||||
border-radius: 8px;
|
||||
}
|
||||
.menu_operate {
|
||||
position: relative;
|
||||
cursor: pointer;
|
||||
.operateList {
|
||||
position: absolute;
|
||||
right: -110px;
|
||||
top: 9px;
|
||||
background: #fff;
|
||||
width: 100px;
|
||||
color: #999;
|
||||
box-shadow: 0px 0px 9px rgba(0,0,0,0.2);
|
||||
z-index: 100;
|
||||
display: none;
|
||||
a {
|
||||
display: block;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
padding: 0px 10px;
|
||||
}
|
||||
|
||||
}
|
||||
.operateList.active {
|
||||
display: block !important;
|
||||
}
|
||||
}
|
||||
.color-grey-6 {
|
||||
color: #666!important;
|
||||
}
|
||||
.set_l_submenu {
|
||||
padding-left: 50px;
|
||||
display: none;
|
||||
width: 180px;
|
||||
list-style-type: none;
|
||||
li{
|
||||
padding: 4px 0;
|
||||
}
|
||||
}
|
||||
.set_l_submenu.active {
|
||||
display: block;
|
||||
}
|
||||
.set_l_premenu {
|
||||
position: relative;
|
||||
display: flex;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
cursor: pointer;
|
||||
}
|
||||
.df{
|
||||
display: flex;
|
||||
}
|
||||
.flex1 {
|
||||
flex: 1;
|
||||
}
|
||||
.text-center {
|
||||
text-align: center;
|
||||
}
|
||||
.grid-item-left {
|
||||
display: grid;
|
||||
grid-template-columns:1fr max-content;
|
||||
align-self: start;
|
||||
}
|
||||
.ml20{margin-left: 20px;}
|
||||
|
||||
.forum-moderators-items {
|
||||
padding: 10px 30px;
|
||||
max-height: 175px;
|
||||
overflow-y: auto;
|
||||
background: #F4FAFF;
|
||||
margin-top: 20px;
|
||||
}
|
||||
.mr4 {margin-right: 4px;}
|
||||
.blue-user-btn {
|
||||
margin: 0 5px;
|
||||
padding: 2px 8px;
|
||||
background: #F4F8FA!important;
|
||||
color: #fff!important;
|
||||
border: 1px solid #4CACFF;
|
||||
border-radius: 4px;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.mr5 {
|
||||
margin-right: 5px;
|
||||
}
|
||||
.moderator-list-content{
|
||||
display: inline-block;
|
||||
margin: 5px 0;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
.admins-memos-index-page {
|
||||
.users-list-container {
|
||||
text-align: center;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,3 +1,3 @@
|
|||
// Place all the styles related to the helps/faqs controller here.
|
||||
// Place all the styles related to the customers controller here.
|
||||
// They will automatically be included in application.css.
|
||||
// You can use Sass (SCSS) here: http://sass-lang.com/
|
||||
|
|
@ -110,33 +110,33 @@ class AccountsController < ApplicationController
|
|||
# params[:login] 邮箱或者手机号
|
||||
# params[:code] 验证码
|
||||
# code_type 1：注册手机验证码 8：邮箱注册验证码
|
||||
# 本地forge注册入口
|
||||
def register
|
||||
begin
|
||||
# 查询验证码是否正确;type只可能是1或者8
|
||||
type = phone_mail_type(params[:login].strip)
|
||||
# code = params[:code].strip
|
||||
code = params[:code].strip
|
||||
|
||||
if type == 1
|
||||
uid_logger("start register by phone: type is #{type}")
|
||||
pre = 'p'
|
||||
email = nil
|
||||
phone = params[:login]
|
||||
# verifi_code = VerificationCode.where(phone: phone, code: code, code_type: 1).last
|
||||
# TODO: 暂时限定邮箱注册
|
||||
return normal_status(-1, '只支持邮箱注册')
|
||||
verifi_code = VerificationCode.where(phone: phone, code: code, code_type: 1).last
|
||||
else
|
||||
uid_logger("start register by email: type is #{type}")
|
||||
pre = 'm'
|
||||
email = params[:login]
|
||||
phone = nil
|
||||
return normal_status(-1, "该邮箱已注册") if User.exists?(mail: params[:login])
|
||||
return normal_status(-1, "邮箱格式错误") unless params[:login] =~ CustomRegexp::EMAIL
|
||||
# verifi_code = VerificationCode.where(email: email, code: code, code_type: 8).last
|
||||
verifi_code = VerificationCode.where(email: email, code: code, code_type: 8).last
|
||||
end
|
||||
# uid_logger("start register: verifi_code is #{verifi_code}, code is #{code}, time is #{Time.now.to_i - verifi_code.try(:created_at).to_i}")
|
||||
uid_logger("start register: verifi_code is #{verifi_code}, code is #{code}, time is #{Time.now.to_i - verifi_code.try(:created_at).to_i}")
|
||||
# check_code = (verifi_code.try(:code) == code.strip && (Time.now.to_i - verifi_code.created_at.to_i) <= 10*60)
|
||||
# todo 上线前请删除万能验证码"513231"
|
||||
unless code == "513231" && request.subdomain == "test-newweb"
|
||||
return normal_status(-2, "验证码不正确") if verifi_code.try(:code) != code.strip
|
||||
return normal_status(-2, "验证码已失效") if !verifi_code&.effective?
|
||||
end
|
||||
|
||||
return normal_status(-1, "8~16位密码，支持字母数字和符号") unless params[:password] =~ CustomRegexp::PASSWORD
|
||||
|
||||
code = generate_identifier User, 8, pre
|
||||
|
|
@ -146,20 +146,23 @@ class AccountsController < ApplicationController
|
|||
# 现在因为是验证码，所以在注册的时候就可以激活
|
||||
@user.activate
|
||||
# 必须要用save操作，密码的保存是在users中
|
||||
|
||||
interactor = Gitea::RegisterInteractor.call({username: login, email: email, password: params[:password]})
|
||||
if interactor.success?
|
||||
gitea_user = interactor.result
|
||||
result = Gitea::User::GenerateTokenService.new(login, params[:password]).call
|
||||
@user.gitea_token = result['sha1']
|
||||
@user.gitea_uid = gitea_user[:body]['id']
|
||||
if @user.save!
|
||||
UserExtension.create!(user_id: @user.id)
|
||||
successful_authentication(@user)
|
||||
normal_status("注册成功")
|
||||
end
|
||||
else
|
||||
tip_exception(-1, interactor.error)
|
||||
if @user.save!
|
||||
# todo user_extension
|
||||
UserExtension.create!(user_id: @user.id)
|
||||
# 注册完成，手机号或邮箱想可以奖励500金币
|
||||
# RewardGradeService.call(
|
||||
# @user,
|
||||
# container_id: @user.id,
|
||||
# container_type: pre == 'p' ? 'Phone' : 'Mail',
|
||||
# score: 500
|
||||
# )
|
||||
# 注册时，记录是否是引流用户
|
||||
ip = request.remote_ip
|
||||
ua = UserAgent.find_by_ip(ip)
|
||||
ua.update_column(:agent_type, UserAgent::USER_REGISTER) if ua
|
||||
successful_authentication(@user)
|
||||
# session[:user_id] = @user.id
|
||||
normal_status("注册成功")
|
||||
end
|
||||
rescue Exception => e
|
||||
uid_logger_error(e.message)
|
||||
|
|
@ -169,7 +172,6 @@ class AccountsController < ApplicationController
|
|||
|
||||
# 用户登录
|
||||
def login
|
||||
Users::LoginForm.new(account_params).validate!
|
||||
@user = User.try_to_login(params[:login], params[:password])
|
||||
|
||||
return normal_status(-2, "错误的账号或密码") if @user.blank?
|
||||
|
|
@ -196,25 +198,6 @@ class AccountsController < ApplicationController
|
|||
# session[:user_id] = @user.id
|
||||
end
|
||||
|
||||
def change_password
|
||||
@user = User.find_by(login: params[:login])
|
||||
return render_error("未找到相关用户!") if @user.blank?
|
||||
return render_error("旧密码不正确") unless @user.check_password?(params[:old_password])
|
||||
|
||||
sync_params = {
|
||||
password: params[:password].to_s,
|
||||
email: @user.mail
|
||||
}
|
||||
|
||||
interactor = Gitea::User::UpdateInteractor.call(@user.login, sync_params)
|
||||
if interactor.success?
|
||||
@user.update_attribute(:password, params[:password])
|
||||
render_ok
|
||||
else
|
||||
render_error(interactor.error)
|
||||
end
|
||||
end
|
||||
|
||||
# 忘记密码
|
||||
def reset_password
|
||||
begin
|
||||
|
|
@ -365,7 +348,4 @@ class AccountsController < ApplicationController
|
|||
params.require(:user).permit(:login, :email, :phone)
|
||||
end
|
||||
|
||||
def account_params
|
||||
params.require(:account).permit(:login, :password)
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -0,0 +1,31 @@
|
|||
class Admins::ApplyDestroyController < Admins::BaseController
|
||||
def index
|
||||
memos = Memo.where(destroy_status: 1).includes(:author).order("created_at desc")
|
||||
@memos = paginate memos
|
||||
respond_to do |format|
|
||||
format.html
|
||||
format.js
|
||||
end
|
||||
end
|
||||
|
||||
def confirm_apply_destroy
|
||||
memo = Memo.find(params[:id])
|
||||
apply_status = params[:confirm]
|
||||
if apply_status == "delete"
|
||||
memo.destroy
|
||||
extra = "d_2"
|
||||
Tiding.create!(:user_id => memo.author_id, :trigger_user_id => 0,
|
||||
container_id: memo.id, container_type: 'Memo',
|
||||
:viewed => 0, :tiding_type => "System", :extra => "d_2")
|
||||
else
|
||||
memo.common!
|
||||
memo.save
|
||||
extra = "d_3"
|
||||
Tiding.create!(:user_id => memo.author_id, :trigger_user_id => 0,
|
||||
container_id: memo.id, container_type: 'Memo',
|
||||
:viewed => 0, :tiding_type => "System", :extra => "d_3")
|
||||
end
|
||||
@status = 1
|
||||
@message = "操作成功"
|
||||
end
|
||||
end
|
||||
|
|
@ -32,7 +32,7 @@ class Admins::AuthSchoolsController < Admins::BaseController
|
|||
def search_manager
|
||||
school = School.find_by(id: params[:school_id])
|
||||
user_ids = school&.ec_school_users&.pluck(:user_id)
|
||||
@users = User.where.not(id: user_ids).where("CONCAT(lastname, firstname) like ? OR nickname like ?", "%#{params[:name].strip.to_s}%", "%#{params[:name].strip.to_s}%").limit(10)
|
||||
@users = User.where.not(id: user_ids).where("concat(lastname, firstname) like ?", "%#{params[:name].strip.to_s}%").limit(10)
|
||||
end
|
||||
|
||||
# 添加认证学校管理员
|
||||
|
|
|
|||
|
|
@ -0,0 +1,66 @@
|
|||
class Admins::BannedUsersController < Admins::BaseController
|
||||
# include Admins::BaseHelper
|
||||
|
||||
def index
|
||||
@menu_type = 8
|
||||
@sub_type = 6
|
||||
#被禁言的用户
|
||||
all_banned_users = BannedForum.includes(:memo, :author, user: :user_extensions)
|
||||
banned_true = all_banned_users.where(is_banned: true)
|
||||
@banned_users_size = banned_true.size
|
||||
@banned_type = params[:banned_type] || "banned"
|
||||
@search_params = params[:search] || nil
|
||||
if @banned_type == "banned"
|
||||
banned_users = banned_true
|
||||
|
||||
else
|
||||
banned_users = all_banned_users.where(is_banned: false)
|
||||
end
|
||||
|
||||
if @search_params.present?
|
||||
banned_users = banned_users.joins(:user).where("LOWER(users.login) LIKE ? or LOWER(concat(users.lastname, users.firstname)) LIKE ?", "%#{@search_params}%", "%#{@search_params}%")
|
||||
end
|
||||
|
||||
banned_users = banned_users.order("updated_at desc")
|
||||
@banned_users_count = banned_users.size
|
||||
@banned_users = paginate banned_users
|
||||
# page = (params[:page] || 1).to_i
|
||||
# per_page = 15
|
||||
|
||||
|
||||
# @banned_users_pages = Paginator.new @banned_users_count, per_page, page
|
||||
# @banned_users = banned_users.limit(@banned_users_pages.per_page).offset(@banned_users_pages.offset).to_a
|
||||
|
||||
end
|
||||
|
||||
def confirm_banned
|
||||
if params[:user_id].blank? || params[:id].blank?
|
||||
@status = -1
|
||||
@message = "参数缺失"
|
||||
else
|
||||
before_users_banned = BannedForum.where(user_id:params[:user_id])
|
||||
|
||||
banned_params = {
|
||||
user_id: params[:user_id],
|
||||
author_id: current_user.id,
|
||||
memo_id: params[:id],
|
||||
is_banned: false,
|
||||
banned_count: before_users_banned.present? ? (before_users_banned.last.banned_count + 1) : 1
|
||||
}
|
||||
new_banned = BannedForum.new(banned_params)
|
||||
if new_banned.save
|
||||
before_users_banned&.update_all(is_banned: false) if before_users_banned.present?
|
||||
@status = 1
|
||||
@message = "取消禁言成功"
|
||||
else
|
||||
@status = -1
|
||||
@message = "取消禁言失败，请稍后重试"
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
end
|
||||
|
||||
|
||||
|
||||
end
|
||||
|
|
@ -43,4 +43,30 @@ class Admins::BaseController < ApplicationController
|
|||
def setup_laboratory
|
||||
Laboratory.current = Laboratory.find_by_subdomain(request.subdomain) || Laboratory.find(1)
|
||||
end
|
||||
|
||||
def up_and_down(opr,current_target,position,model_name)
|
||||
modal_target = model_name.capitalize.classify.constantize
|
||||
if model_name == "forum_section" #只有root才能移动
|
||||
modal_target = modal_target.roots
|
||||
end
|
||||
if opr.to_s == "up"
|
||||
last_target = modal_target.where("position > ?",position)&.first
|
||||
if last_target.present?
|
||||
current_target.update_attribute(:position, last_target.position)
|
||||
last_target.update_attribute(:position, position) # 重新获取当前问题的位置
|
||||
return 0
|
||||
else
|
||||
return -1
|
||||
end
|
||||
elsif opr.to_s == "down"
|
||||
next_target = modal_target.where("position < ?",position)&.last
|
||||
if next_target.present?
|
||||
current_target.update_attribute(:position, next_target.position)
|
||||
next_target.update_attribute(:position, position)
|
||||
return 0
|
||||
else
|
||||
return -1
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,58 +0,0 @@
|
|||
class Admins::FaqsController < Admins::BaseController
|
||||
before_action :find_faq, only: [:edit,:update, :destroy]
|
||||
|
||||
def index
|
||||
sort_by = Faq.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'updated_at'
|
||||
sort_direction = %w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : 'desc'
|
||||
|
||||
keyword = params[:keyword].to_s.strip
|
||||
collection = Faq.search_question(keyword).order("#{sort_by} #{sort_direction}")
|
||||
@faqs = paginate collection
|
||||
end
|
||||
|
||||
def new
|
||||
@faq = Faq.new
|
||||
end
|
||||
|
||||
def edit
|
||||
end
|
||||
|
||||
def update
|
||||
begin
|
||||
@faq.update!(faq_params)
|
||||
flash[:success] = '修改成功'
|
||||
rescue Exception
|
||||
flash[:danger] = @faq.errors.full_messages.to_sentence
|
||||
end
|
||||
|
||||
redirect_to admins_faqs_path
|
||||
end
|
||||
|
||||
def destroy
|
||||
@faq.destroy
|
||||
|
||||
redirect_to admins_faqs_path
|
||||
flash[:success] = "删除成功"
|
||||
end
|
||||
|
||||
def create
|
||||
@faq = Faq.new(faq_params)
|
||||
begin
|
||||
@faq.save!
|
||||
flash[:success] = '创建成功'
|
||||
rescue Exception
|
||||
flash[:danger] = @faq.errors.full_messages.to_sentence
|
||||
end
|
||||
redirect_to admins_faqs_path
|
||||
end
|
||||
|
||||
private
|
||||
def find_faq
|
||||
@faq = Faq.find params[:id]
|
||||
end
|
||||
|
||||
def faq_params
|
||||
params.require(:faq).permit(:question, :url)
|
||||
end
|
||||
|
||||
end
|
||||
|
|
@ -0,0 +1,89 @@
|
|||
class Admins::ForumAppliesController < Admins::BaseController
|
||||
# include Admins::BaseHelper
|
||||
|
||||
def index
|
||||
@menu_type = 8
|
||||
@sub_type = 7
|
||||
all_forum_applies = ApplyForum.includes(:forum_section,:reviews, user: :user_extensions)
|
||||
@select_type = params[:select_type] || "unconfirm"
|
||||
@section_name = params[:section_name] || nil
|
||||
@search_name = params[:user_name] || nil
|
||||
if @select_type == "unconfirm"
|
||||
forum_applies = all_forum_applies.where(is_confirm: 0)
|
||||
else
|
||||
forum_applies = all_forum_applies.where(is_confirm: [1,2])
|
||||
end
|
||||
|
||||
if @section_name.present?
|
||||
forum_applies = forum_applies.joins(:forum_section).where("forum_sections.title like ?", "%#{@section_name}%")
|
||||
end
|
||||
|
||||
if @search_name.present?
|
||||
forum_applies = forum_applies.joins(:user).where("LOWER(users.login) LIKE ? or LOWER(concat(users.lastname, users.firstname)) LIKE ?", "%#{@search_name}%", "%#{@search_name}%")
|
||||
end
|
||||
forum_applies = forum_applies.order("apply_forums.updated_at desc")
|
||||
@forum_applies_count = forum_applies.size
|
||||
@forum_applies = paginate forum_applies
|
||||
# page = (params[:page] || 1).to_i
|
||||
# per_page = 15
|
||||
|
||||
|
||||
# @forum_applies_pages = Paginator.new @forum_applies_count, per_page, page
|
||||
# @forum_applies = forum_applies.limit(@forum_applies_pages.per_page).offset(@forum_applies_pages.offset).to_a
|
||||
|
||||
end
|
||||
|
||||
def confirm_apply
|
||||
@forum_apply = ApplyForum.find(params[:id])
|
||||
@is_confirm = params[:is_confirm].to_i
|
||||
|
||||
review_result = params[:review_result].to_i
|
||||
review_params = {
|
||||
review_status: review_result,
|
||||
reason: params[:reason].present? ? params[:reason] : nil,
|
||||
user_id: current_user.id,
|
||||
reviewable_type: "ApplyForum",
|
||||
reviewable_id: params[:id],
|
||||
source: "apply_forum"
|
||||
}
|
||||
if Review.exists?(reviewable_type: "ApplyForum", reviewable_id: params[:id], source: "apply_forum")
|
||||
this_review = Review.where(reviewable_type: "ApplyForum", reviewable_id: params[:id], source: "apply_forum").first
|
||||
if this_review.update_attributes(review_params)
|
||||
@status = 1
|
||||
@message = "操作成功"
|
||||
else
|
||||
@status = -1
|
||||
@message = "操作失败"
|
||||
end
|
||||
else
|
||||
review = Review.new(review_params)
|
||||
if review.save
|
||||
@status = 1
|
||||
@message = "操作成功"
|
||||
else
|
||||
@status = -1
|
||||
@message = "操作失败"
|
||||
end
|
||||
end
|
||||
|
||||
if @status > 0
|
||||
@forum_apply.update_attributes(is_confirm: (review_result+1),deal_time: Time.now)
|
||||
exists_moder = ForumModerator.where(user_id: @forum_apply.user_id,forum_section_id: @forum_apply.forum_section_id)
|
||||
if review_result == 1
|
||||
exists_moder.delete_all if exists_moder.exists?
|
||||
elsif review_result == 0
|
||||
unless exists_moder.exists?
|
||||
ForumModerator.create(user_id: @forum_apply.user_id, forum_section_id: @forum_apply.forum_section_id,is_children: @forum_apply.forum_section.try(:parent_id).present?)
|
||||
end
|
||||
end
|
||||
|
||||
Tiding.where(container_type: "ForumSection", container_id: @forum_apply.forum_section_id, status: 0).update_all(status: 1)
|
||||
Tiding.create(:user_id => @forum_apply.user_id, :trigger_user_id => 1,
|
||||
container_id: @forum_apply.forum_section_id, container_type: 'ForumSection',
|
||||
:parent_container_id => @forum_apply.id, :parent_container_type => "ApplyForum",
|
||||
:viewed => 0,status: 1, :tiding_type => "System",extra: "4")
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
end
|
||||
|
|
@ -0,0 +1,59 @@
|
|||
class Admins::ForumModeratorsController < Admins::BaseController
|
||||
before_action :set_forum
|
||||
|
||||
def new
|
||||
|
||||
end
|
||||
|
||||
def create
|
||||
user_ids = params[:member_ids]
|
||||
is_children = @forum_section.parent_id.present?
|
||||
if user_ids.present? && user_ids.size > 0
|
||||
user_ids = user_ids.reject(&:blank?)
|
||||
user_ids.each do |user_id|
|
||||
unless ForumModerator.exists?(user_id: user_id, forum_section_id: @forum_section.id)
|
||||
@forum_section.forum_moderators.create!(user_id: user_id, is_children: is_children)
|
||||
end
|
||||
unless is_children
|
||||
children_forum_sections = @forum_section.children_forum
|
||||
children_forum_sections.each do |children|
|
||||
unless ForumModerator.exists?(user_id: user_id, forum_section_id: children.id)
|
||||
children.forum_moderators.create!(user_id: user_id, is_children: true)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@forum_moderators = @forum_section.forum_moderators
|
||||
@forum_status = 1
|
||||
else
|
||||
@forum_status = -1
|
||||
end
|
||||
end
|
||||
|
||||
def destroy
|
||||
@forum_moderator = ForumModerator.find_by_id(params[:id])
|
||||
@forum_moderator.destroy
|
||||
end
|
||||
|
||||
def search_user
|
||||
return_html = ""
|
||||
user_name = params[:user_name].strip
|
||||
if user_name.present?
|
||||
users = User.where("( LOWER(login) LIKE ? or LOWER(concat(lastname, firstname)) LIKE ? or LOWER(mail) LIKE ? )",
|
||||
"%#{user_name}%","%#{user_name}%","%#{user_name}%")
|
||||
users.each do |u|
|
||||
check_html = "<div class='search-user-check'><input id='check_user_#{u.login}' class='magic-checkbox mr4' type='checkbox' name='member_ids[]' value=""#{u.id}"" checked='false'><label for='check_user_#{u.login}'>#{u.try(:show_real_name)}</label></div>"
|
||||
return_html << check_html
|
||||
end
|
||||
end
|
||||
render json: {html: return_html }
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def set_forum
|
||||
@forum_section = ForumSection.find_by_id(params[:forum_section_id])
|
||||
end
|
||||
|
||||
end
|
||||
|
|
@ -0,0 +1,153 @@
|
|||
#论坛的板块设置
|
||||
class Admins::ForumSectionsController < Admins::BaseController
|
||||
before_action :set_forum, except: [:index, :new,:create]
|
||||
|
||||
def index
|
||||
@menu_type = 8
|
||||
@sub_type = 5
|
||||
|
||||
forum_sections = ForumSection.roots.includes(:forum_moderators).order("position desc")
|
||||
@max_position = forum_sections&.maximum(:position).to_i
|
||||
@min_position = forum_sections&.minimum(:position).to_i
|
||||
@forum_sections_count = forum_sections.size
|
||||
# page = (params[:page] || 1).to_i
|
||||
# per_page = 15
|
||||
# @forum_sections_pages = Paginator.new @forum_sections_count, per_page, page
|
||||
# @forum_sections = forum_sections.limit(@forum_sections_pages.per_page).offset(@forum_sections_pages.offset).to_a
|
||||
@forum_sections = paginate forum_sections
|
||||
respond_to do |format|
|
||||
format.html
|
||||
format.js
|
||||
end
|
||||
end
|
||||
|
||||
def new
|
||||
@parent_id = params[:parent_id]
|
||||
@forum_section = ForumSection.new
|
||||
respond_to do |format|
|
||||
format.js
|
||||
end
|
||||
end
|
||||
|
||||
def create
|
||||
attachment_id = params[:attachments]&.first
|
||||
positions = ForumSection.pluck(:position).select { |a| a.is_a? Integer }
|
||||
positions = positions.max.to_i
|
||||
if params[:forum_section][:parent_id].present?
|
||||
@parent_forum = ForumSection.find_by_id(params[:forum_section][:parent_id])
|
||||
end
|
||||
if params[:forum_section][:title].blank?
|
||||
forum_status = 0
|
||||
forum_msg = "标题不能为空"
|
||||
elsif params[:forum_section][:title].strip.length > 20
|
||||
forum_status = 0
|
||||
forum_msg = "不能超过最大限制：20个字符"
|
||||
elsif ForumSection.exists?(title: params[:forum_section][:title].strip)
|
||||
forum_status = 0
|
||||
forum_msg = "不能重名"
|
||||
else
|
||||
forum_section_params = {
|
||||
user_id: current_user.id,
|
||||
title: params[:forum_section][:title].strip,
|
||||
position: positions + 1,
|
||||
parent_id: params[:forum_section][:parent_id],
|
||||
is_recommend: false,
|
||||
description: params[:forum_section][:description].to_s.truncate(200)
|
||||
}
|
||||
@forum_section = ForumSection.new(forum_section_params)
|
||||
if @forum_section.save
|
||||
if attachment_id.present?
|
||||
attachment = Attachment.find(attachment_id)
|
||||
attachment.container = @forum_section
|
||||
attachment.save
|
||||
@forum_section.attachment_id = attachment_id
|
||||
@forum_section.save
|
||||
end
|
||||
forum_status = 1
|
||||
forum_msg = "创建成功"
|
||||
else
|
||||
forum_status = -1
|
||||
forum_msg = "创建失败,请重试"
|
||||
end
|
||||
end
|
||||
@forum_status = {status: forum_status, msg: forum_msg}
|
||||
end
|
||||
|
||||
def edit
|
||||
@children_forum = params[:children_forum]
|
||||
@attachment = @forum_section.image_attachment
|
||||
end
|
||||
|
||||
def update
|
||||
attachment_id = params[:attachments]&.first
|
||||
if params[:forum_section][:title].blank?
|
||||
forum_status = 0
|
||||
forum_msg = "名称不能为空"
|
||||
elsif params[:forum_section][:title].strip.length > 20
|
||||
forum_status = 0
|
||||
forum_msg = "不能超过最大限制：20个字符"
|
||||
elsif params[:forum_section][:title].strip != @forum_section.title && ForumSection.exists?(title: params[:forum_section][:title].strip)
|
||||
forum_status = 0
|
||||
forum_msg = "不能重名"
|
||||
else
|
||||
|
||||
if @forum_section.update_attributes(title: params[:forum_section][:title].strip, description: params[:forum_section][:description].to_s.truncate(200))
|
||||
|
||||
unless attachment_id.blank? || @forum_section.attachment_id.to_i == attachment_id.to_i
|
||||
Attachment.where(id: @forum_section.attachment_id.to_i).destroy_all if @forum_section.attachment_id.present?
|
||||
attachment = Attachment.find(attachment_id)
|
||||
attachment.container = @forum_section
|
||||
attachment.save
|
||||
@forum_section.attachment_id = attachment_id
|
||||
@forum_section.save
|
||||
end
|
||||
forum_status = 1
|
||||
forum_msg = "更新成功"
|
||||
else
|
||||
forum_status = -1
|
||||
forum_msg = "更新失败,请重试"
|
||||
end
|
||||
end
|
||||
@edit_forum_status = {status: forum_status, msg: forum_msg}
|
||||
end
|
||||
|
||||
def destroy
|
||||
if @forum_section.destroy
|
||||
delete_status = 1
|
||||
delete_msg = "删除成功"
|
||||
else
|
||||
delete_status = -1
|
||||
delete_msg = "删除失败,请稍后重试"
|
||||
end
|
||||
@delete_status = {status: delete_status, msg: delete_msg}
|
||||
end
|
||||
|
||||
def order_forums
|
||||
@children_forums = @forum_section.get_children_section("asc")
|
||||
end
|
||||
|
||||
def recommend_forums
|
||||
@forum_section.update_attribute(:is_recommend, params[:is_recommend])
|
||||
end
|
||||
|
||||
def move
|
||||
cate_opt = params[:opr]
|
||||
cate_position = @forum_section.position.to_i
|
||||
move_status = up_and_down(cate_opt,@forum_section,cate_position,"forum_section")
|
||||
if move_status == 0
|
||||
@c_msg = "移动成功"
|
||||
else
|
||||
@c_msg = "移动失败"
|
||||
end
|
||||
redirect_to admins_forum_sections_path
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def set_forum
|
||||
@forum_section = ForumSection.find_by_id(params[:id])
|
||||
end
|
||||
|
||||
|
||||
|
||||
end
|
||||
|
|
@ -33,7 +33,7 @@ class Admins::LaboratoriesController < Admins::BaseController
|
|||
keyword = params[:keyword].to_s.strip
|
||||
if keyword.present?
|
||||
like_sql = 'shixuns.name LIKE :keyword OR CONCAT(users.lastname, users.firstname) LIKE :keyword '\
|
||||
'users.nickname LIKE :keyword OR mirror_repositories.name LIKE :keyword'
|
||||
'OR mirror_repositories.name LIKE :keyword'
|
||||
shixuns = shixuns.joins(:user, :mirror_repositories).where(like_sql, keyword: "%#{keyword}%")
|
||||
end
|
||||
|
||||
|
|
@ -48,7 +48,7 @@ class Admins::LaboratoriesController < Admins::BaseController
|
|||
|
||||
keyword = params[:keyword].to_s.strip
|
||||
if keyword.present?
|
||||
like_sql = 'subjects.name LIKE :keyword OR CONCAT(users.lastname, users.firstname) LIKE :keyword OR users.nickname LIKE :keyword'
|
||||
like_sql = 'subjects.name LIKE :keyword OR CONCAT(users.lastname, users.firstname) LIKE :keyword'
|
||||
subjects = subjects.joins(:user).where(like_sql, keyword: "%#{keyword}%")
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,16 @@
|
|||
class Admins::MemoReplyListsController < Admins::BaseController
|
||||
|
||||
def index
|
||||
@memo_hidden_type = params[:hidden] || ""
|
||||
memos = Memo.where("parent_id is not null").includes(:author, :parent)
|
||||
if @memo_hidden_type.present?
|
||||
memos = memos.where(hidden: @memo_hidden_type.to_s == "hidden")
|
||||
end
|
||||
memos = memos.order("created_at desc")
|
||||
@memos = paginate memos
|
||||
respond_to do |format|
|
||||
format.html
|
||||
format.js
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -0,0 +1,79 @@
|
|||
class Admins::MemosController < Admins::BaseController
|
||||
# include Admins::BaseHelper
|
||||
# 帖子
|
||||
def index
|
||||
@memo_hidden_type = params[:hidden] || ""
|
||||
|
||||
memos = Memo.where(parent_id: nil).includes(:author)
|
||||
if @memo_hidden_type.present?
|
||||
memos = memos.where(hidden: @memo_hidden_type.to_s == "hidden")
|
||||
end
|
||||
memos = memos.order("created_at desc")
|
||||
@memos = paginate memos
|
||||
respond_to do |format|
|
||||
format.html
|
||||
format.js
|
||||
end
|
||||
end
|
||||
|
||||
def memo_homepage_show
|
||||
memo = Memo.find params[:id]
|
||||
memo.update_column(:homepage_show, params[:checked]) unless memo.hidden?
|
||||
render :json => {status: 1, message: "设置成功!"}
|
||||
end
|
||||
|
||||
def memo_hidden
|
||||
memo = Memo.find params[:id]
|
||||
if params[:checked].to_s == 'true'
|
||||
publish_time = Time.now
|
||||
action_type = "passed"
|
||||
extra = "1"
|
||||
else
|
||||
publish_time = nil
|
||||
action_type = "refuse"
|
||||
extra = "2"
|
||||
end
|
||||
memo.update_attributes(hidden: !(params[:checked].to_s == 'true'), published_at: publish_time) # 勾选代表不隐藏，所以要取反
|
||||
CheckedAction.create!(user_id: current_user.id,checkable_type: "Memo",checkable_id: params[:id], action_type: action_type, action_at: Time.now)
|
||||
|
||||
|
||||
if !memo.hidden? && memo.parent_id.present? && !memo.tidings.exists?(user_id: memo.parent.author_id,trigger_user_id: memo.author_id, extra: "3")
|
||||
Tiding.create(:user_id => memo.parent.author_id, :trigger_user_id => memo.author_id,
|
||||
container_id: memo.id, container_type: 'Memo',
|
||||
:parent_container_id => memo.root_id, :parent_container_type => "Memo",
|
||||
:viewed => 0, :tiding_type => "Comment", :extra => "3")
|
||||
|
||||
elsif !memo.hidden? && memo.parent_id.blank?
|
||||
Tiding.create(:user_id => memo.author_id, :trigger_user_id => current_user.id,
|
||||
container_id: memo.id, container_type: 'Memo',
|
||||
:viewed => 0, :tiding_type => "Comment",:extra => extra)
|
||||
|
||||
end
|
||||
render :json => {status: 1, message: "设置成功!"}
|
||||
end
|
||||
|
||||
def delete_memo
|
||||
memo = Memo.find params[:id]
|
||||
memo.destroy if memo.hidden?
|
||||
redirect_to memo.parent_id.present? ? admins_memo_reply_lists_path : admins_memos_path
|
||||
end
|
||||
|
||||
# def memo_reply_list
|
||||
# @menu_type = 8
|
||||
# @sub_type = 4
|
||||
# @memo_hidden_type = params[:hidden] || ""
|
||||
# Rails.logger.info("======================sub_type==================#@sub_type")
|
||||
|
||||
# memos = Memo.where("parent_id is not null").includes(:author, :parent)
|
||||
# if @memo_hidden_type.present?
|
||||
# memos = memos.where(hidden: @memo_hidden_type.to_s == "hidden")
|
||||
# end
|
||||
# memos = memos.order("created_at desc")
|
||||
# @memos = paginate memos
|
||||
# respond_to do |format|
|
||||
# format.html
|
||||
# format.js
|
||||
# end
|
||||
# end
|
||||
|
||||
end
|
||||
|
|
@ -3,8 +3,8 @@ class Admins::ProjectCategoriesController < Admins::BaseController
|
|||
before_action :validate_names, only: [:create, :update]
|
||||
|
||||
def index
|
||||
sort_by = ProjectCategory.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'created_at'
|
||||
sort_direction = %w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : 'desc'
|
||||
sort_by = params[:sort_by] ||= 'created_at'
|
||||
sort_direction = params[:sort_direction] ||= 'desc'
|
||||
q = ProjectCategory.ransack(name_cont: params[:name])
|
||||
project_categories = q.result(distinct: true).order("#{sort_by} #{sort_direction}")
|
||||
@project_categories = paginate(project_categories)
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@ class Admins::ProjectIgnoresController < Admins::BaseController
|
|||
before_action :validate_params, only: [:create, :update]
|
||||
|
||||
def index
|
||||
sort_by = Ignore.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'created_at'
|
||||
sort_direction = %w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : 'desc'
|
||||
sort_by = params[:sort_by] ||= 'created_at'
|
||||
sort_direction = params[:sort_direction] ||= 'desc'
|
||||
q = Ignore.ransack(name_cont: params[:search])
|
||||
project_ignores = q.result(distinct: true).order("#{sort_by} #{sort_direction}")
|
||||
@project_ignores = paginate(project_ignores)
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@ class Admins::ProjectLanguagesController < Admins::BaseController
|
|||
before_action :validate_names, only: [:create, :update]
|
||||
|
||||
def index
|
||||
sort_by = ProjectLanguage.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'created_at'
|
||||
sort_direction = %w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : 'desc'
|
||||
sort_by = params[:sort_by] ||= 'created_at'
|
||||
sort_direction = params[:sort_direction] ||= 'desc'
|
||||
q = ProjectLanguage.ransack(name_cont: params[:search])
|
||||
project_languages = q.result(distinct: true).order("#{sort_by} #{sort_direction}")
|
||||
@project_languages = paginate(project_languages)
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@ class Admins::ProjectLicensesController < Admins::BaseController
|
|||
before_action :validate_params, only: [:create, :update]
|
||||
|
||||
def index
|
||||
sort_by = License.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'created_at'
|
||||
sort_direction = %w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : 'desc'
|
||||
sort_by = params[:sort_by] ||= 'created_at'
|
||||
sort_direction = params[:sort_direction] ||= 'desc'
|
||||
q = License.ransack(name_cont: params[:search])
|
||||
project_licenses = q.result(distinct: true).order("#{sort_by} #{sort_direction}")
|
||||
@project_licenses = paginate(project_licenses)
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
class Admins::ProjectsController < Admins::BaseController
|
||||
|
||||
def index
|
||||
sort_by = Project.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'created_on'
|
||||
sort_direction = %w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : 'desc'
|
||||
sort_by = params[:sort_by] ||= 'created_on'
|
||||
sort_direction = params[:sort_direction] ||= 'desc'
|
||||
|
||||
search = params[:search].to_s.strip
|
||||
projects = Project.where("name like ?", "%#{search}%").order("#{sort_by} #{sort_direction}")
|
||||
@projects = paginate projects.includes(:owner, :members, :issues, :versions, :attachments, :project_score)
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ class ApplicationController < ActionController::Base
|
|||
DCODES = %W(2 3 4 5 6 7 8 9 a b c f e f g h i j k l m n o p q r s t u v w x y z)
|
||||
OPENKEY = "79e33abd4b6588941ab7622aed1e67e8"
|
||||
|
||||
helper_method :current_user, :base_url
|
||||
helper_method :current_user
|
||||
|
||||
# 所有请求必须合法签名
|
||||
def check_sign
|
||||
|
|
@ -343,8 +343,7 @@ class ApplicationController < ActionController::Base
|
|||
elsif params[:debug] == 'student'
|
||||
User.current = User.find 8686
|
||||
elsif params[:debug] == 'admin'
|
||||
logger.info "@@@@@@@@@@@@@@@@@@@@@@ debug mode....."
|
||||
user = User.find 36480
|
||||
user = User.find 1
|
||||
User.current = user
|
||||
cookies.signed[:user_id] = user.id
|
||||
end
|
||||
|
|
@ -385,7 +384,11 @@ class ApplicationController < ActionController::Base
|
|||
end
|
||||
|
||||
def current_user
|
||||
User.current
|
||||
if Rails.env.development?
|
||||
User.current = User.find 1
|
||||
else
|
||||
User.current
|
||||
end
|
||||
end
|
||||
|
||||
## 默认输出json
|
||||
|
|
@ -615,8 +618,8 @@ class ApplicationController < ActionController::Base
|
|||
end
|
||||
|
||||
# 排序
|
||||
rorder = UserExtension.column_names.include?(option[:order]) ? option[:order] : "updated_at"
|
||||
b_order = %w(desc asc).include?(option[:b_order]) ? option[:b_order] : "desc"
|
||||
rorder = option[:order] || "updated_at"
|
||||
b_order = option[:b_order] || "desc"
|
||||
if rorder == "created_at" || rorder == "work_score"
|
||||
work_list = work_list.order("graduation_works.#{rorder} #{b_order}")
|
||||
elsif rorder == "student_id"
|
||||
|
|
@ -680,14 +683,6 @@ class ApplicationController < ActionController::Base
|
|||
relation.page(page).per(limit)
|
||||
end
|
||||
|
||||
def kaminari_array_paginate(relation)
|
||||
limit = params[:limit] || params[:per_page]
|
||||
limit = (limit.to_i.zero? || limit.to_i > 15) ? 15 : limit.to_i
|
||||
page = params[:page].to_i.zero? ? 1 : params[:page].to_i
|
||||
|
||||
Kaminari.paginate_array(relation).page(page).per(limit)
|
||||
end
|
||||
|
||||
def strf_time(time)
|
||||
time.blank? ? '' : time.strftime("%Y-%m-%d %H:%M:%S")
|
||||
end
|
||||
|
|
@ -749,7 +744,7 @@ class ApplicationController < ActionController::Base
|
|||
namespace = params[:owner]
|
||||
id = params[:repo] || params[:id]
|
||||
|
||||
@project, @owner = Project.find_with_namespace(namespace, id)
|
||||
@project = Project.find_with_namespace(namespace, id)
|
||||
|
||||
if @project and current_user.can_read_project?(@project)
|
||||
logger.info "###########： has project and can read project"
|
||||
|
|
@ -767,33 +762,9 @@ class ApplicationController < ActionController::Base
|
|||
end
|
||||
|
||||
def load_repository
|
||||
@repository ||= load_project&.repository
|
||||
@repository ||= load_project.repository
|
||||
end
|
||||
|
||||
def base_url
|
||||
request.base_url
|
||||
end
|
||||
|
||||
def convert_image!
|
||||
@image = params[:image] || user_params[:image]
|
||||
return unless @image.present?
|
||||
max_size = EduSetting.get('upload_avatar_max_size') || 2 * 1024 * 1024 # 2M
|
||||
if @image.class == ActionDispatch::Http::UploadedFile
|
||||
render_error('请上传文件') if @image.size.zero?
|
||||
render_error('文件大小超过限制') if @image.size > max_size.to_i
|
||||
else
|
||||
image = @image.to_s.strip
|
||||
return render_error('请上传正确的图片') if image.blank?
|
||||
@image = Util.convert_base64_image(image, max_size: max_size.to_i)
|
||||
end
|
||||
rescue Base64ImageConverter::Error => ex
|
||||
render_error(ex.message)
|
||||
end
|
||||
|
||||
def avatar_path(object)
|
||||
ApplicationController.helpers.disk_filename(object.class, object.id)
|
||||
end
|
||||
|
||||
private
|
||||
def object_not_found
|
||||
uid_logger("Missing template or cant't find record, responding with 404")
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
class AppliedProjectsController < ApplicationController
|
||||
before_action :require_login
|
||||
def create
|
||||
@applied_project = Projects::ApplyJoinService.call(current_user, applied_params)
|
||||
rescue Projects::ApplyJoinService::Error => ex
|
||||
render_error(ex.message)
|
||||
end
|
||||
|
||||
private
|
||||
def applied_params
|
||||
params.require(:applied_project).permit(:code, :role)
|
||||
end
|
||||
end
|
||||
|
|
@ -92,6 +92,44 @@ class AttachmentsController < ApplicationController
|
|||
end
|
||||
end
|
||||
|
||||
#后台上传图片
|
||||
def upload_images
|
||||
upload_file = params["file"] || params["#{params[:file_param_name]}"]# 这里的file_param_name是为了方便其他插件名称
|
||||
raise "未上传文件" unless upload_file
|
||||
|
||||
folder = edu_setting('attachment_folder')
|
||||
raise "存储目录未定义" unless folder.present?
|
||||
month_folder = current_month_folder
|
||||
save_path = File.join(folder, month_folder)
|
||||
|
||||
ext = SecureRandom.urlsafe_base64
|
||||
|
||||
local_path, digest = file_save_to_local(save_path, upload_file.tempfile, ext)
|
||||
|
||||
content_type = upload_file.content_type.presence || 'application/octet-stream'
|
||||
|
||||
disk_filename = local_path[save_path.size + 1, local_path.size]
|
||||
|
||||
@attachment = Attachment.where(disk_filename: disk_filename,author_id: current_user.id).first
|
||||
if @attachment.blank?
|
||||
@attachment = Attachment.new
|
||||
@attachment.filename = upload_file.original_filename
|
||||
@attachment.disk_filename = disk_filename
|
||||
@attachment.filesize = upload_file.tempfile.size
|
||||
@attachment.content_type = content_type
|
||||
@attachment.digest = digest
|
||||
@attachment.author_id = current_user.id
|
||||
@attachment.disk_directory = month_folder
|
||||
@attachment.save!
|
||||
@status = 1
|
||||
else
|
||||
@status = -1
|
||||
end
|
||||
respond_to do |format|
|
||||
format.js
|
||||
end
|
||||
end
|
||||
|
||||
def destroy
|
||||
begin
|
||||
@file_path = absolute_path(local_path(@file))
|
||||
|
|
|
|||
|
|
@ -0,0 +1,36 @@
|
|||
# encoding=utf-8
|
||||
class CategoriesController < ApplicationController
|
||||
before_action :require_login, :except => [:all]
|
||||
include ApplicationHelper
|
||||
|
||||
# 所有类型，通过参数过滤
|
||||
def all
|
||||
render_react
|
||||
end
|
||||
|
||||
def guide
|
||||
render_react
|
||||
end
|
||||
|
||||
def techShare
|
||||
render_react
|
||||
end
|
||||
|
||||
def show
|
||||
render_react
|
||||
end
|
||||
|
||||
def shixun_discuss
|
||||
render_react
|
||||
end
|
||||
|
||||
# 我的发布
|
||||
def my_published
|
||||
|
||||
end
|
||||
|
||||
private
|
||||
def render_react
|
||||
render "/common/index", :layout => false
|
||||
end
|
||||
end
|
||||
|
|
@ -1,76 +0,0 @@
|
|||
class Ci::BaseController < ApplicationController
|
||||
include Ci::DbConnectable
|
||||
|
||||
before_action :require_login
|
||||
before_action :connect_to_ci_db
|
||||
|
||||
def load_repo
|
||||
namespace = params[:owner]
|
||||
id = params[:repo] || params[:id]
|
||||
|
||||
@ci_user, @repo = Ci::Repo.find_with_namespace(namespace, id)
|
||||
end
|
||||
|
||||
def load_all_repo
|
||||
namespace = current_user.login
|
||||
@repos = Ci::Repo.find_all_with_namespace(namespace)
|
||||
end
|
||||
|
||||
def load_repo_by_repo_slug(slug)
|
||||
@repo_slug = Ci::Repo.load_repo_by_repo_slug(slug)
|
||||
end
|
||||
|
||||
private
|
||||
def authorize_access_project!
|
||||
unless @project.manager?(current_user)
|
||||
return render_forbidden
|
||||
end
|
||||
end
|
||||
|
||||
def authenticate_manager!
|
||||
unless @project.manager?(current_user)
|
||||
return render_forbidden
|
||||
end
|
||||
end
|
||||
|
||||
def authenticate_admin!
|
||||
return render_forbidden unless current_user.admin?
|
||||
end
|
||||
|
||||
def authorize_owner!
|
||||
unless @project.owner?(current_user)
|
||||
return render_forbidden
|
||||
end
|
||||
end
|
||||
|
||||
def find_cloud_account
|
||||
@cloud_account ||= current_user.ci_cloud_account
|
||||
@cloud_account.blank? ? nil : @cloud_account
|
||||
end
|
||||
|
||||
def load_ci_user
|
||||
@ci_user ||= Ci::User.find_by(user_login: params[:owner])
|
||||
@ci_user.blank? ? raise("未找到相关的记录") : @ci_user
|
||||
end
|
||||
|
||||
def connect_to_ci_db(options={})
|
||||
current = current_user
|
||||
owner = params[:owner]
|
||||
if owner
|
||||
current = User.find_by(login: owner)
|
||||
end
|
||||
|
||||
if !(current && !current.is_a?(AnonymousUser) && !current.devops_uninit?)
|
||||
return
|
||||
end
|
||||
|
||||
if current.ci_cloud_account.server_type == Ci::CloudAccount::SERVER_TYPE_TRUSTIE
|
||||
connect_to_trustie_ci_database(options)
|
||||
else
|
||||
options = options.merge(db_name: current.login)
|
||||
connect_to_ci_database(options)
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
end
|
||||
|
|
@ -1,53 +0,0 @@
|
|||
class Ci::BuildsController < Ci::BaseController
|
||||
include RepositoriesHelper
|
||||
|
||||
before_action :load_project
|
||||
before_action :authorize_owner!, only: [:restart, :stop]
|
||||
before_action :load_repo
|
||||
before_action :find_cloud_account, except: [:index, :show]
|
||||
|
||||
def index
|
||||
@user = current_user
|
||||
|
||||
scope = Ci::Builds::ListQuery.call(@repo, params)
|
||||
|
||||
@total_count = scope.map(&:build_id).size
|
||||
@builds = paginate scope
|
||||
end
|
||||
|
||||
def show
|
||||
@build = @repo.builds.includes(stages: [:steps]).find_by(build_number: params[:build])
|
||||
end
|
||||
|
||||
def restart
|
||||
result = Ci::Drone::API.new(@ci_user.user_hash, @cloud_account.drone_url, @repo.repo_namespace, @repo.repo_name, number: params[:build]).restart
|
||||
|
||||
render json: result
|
||||
end
|
||||
|
||||
def stop
|
||||
result = Ci::Drone::API.new(@ci_user.user_hash, @cloud_account.drone_url, @repo.repo_namespace, @repo.repo_name, number: params[:build]).stop
|
||||
render json: result
|
||||
end
|
||||
|
||||
def logs
|
||||
# TODO **待优化**
|
||||
# 因直接操作ci库，如下查询待优化，可直接根据log id查询即可
|
||||
build = @repo.builds.find_by(build_number: params[:build])
|
||||
return render_not_found("Couldn't found build with 'number'= #{params[:build]}") if build.blank?
|
||||
|
||||
stage = build.stages.includes(steps: [:log]).find_by(stage_number: params[:stage])
|
||||
return render_not_found("Couldn't found build with 'number'= #{params[:stage]}") if stage.blank?
|
||||
|
||||
step = stage.steps.find_by(step_number: params[:step])
|
||||
return render_not_found("Couldn't found build with 'number'= #{params[:step]}") if step.blank?
|
||||
|
||||
log = step.log
|
||||
|
||||
result = log.blank? ? nil : (log.log_data[0..5].include?('null') ? nil : JSON.parse(log.log_data))
|
||||
|
||||
# result = Ci::Drone::API.new(@user.user_hash, @cloud_account.drone_url, @repo.repo_namespace, @repo.repo_name, build: params[:build], stage: params[:stage], step: params[:step]).logs
|
||||
|
||||
render json: result
|
||||
end
|
||||
end
|
||||
|
|
@ -1,129 +0,0 @@
|
|||
class Ci::CloudAccountsController < Ci::BaseController
|
||||
include Ci::CloudAccountManageable
|
||||
|
||||
skip_before_action :connect_to_ci_db, only: %i[create bind trustie_bind]
|
||||
before_action :load_project, only: %i[create activate]
|
||||
before_action :authorize_owner!, only: %i[create activate]
|
||||
before_action :load_repo, only: %i[activate]
|
||||
before_action :load_all_repo, only: %i[unbind]
|
||||
before_action :find_cloud_account, only: %i[show oauth_grant]
|
||||
before_action :validate_params!, only: %i[create bind]
|
||||
before_action only: %i[create bind] do
|
||||
connect_to_ci_database(master_db: true)
|
||||
end
|
||||
|
||||
def create
|
||||
flag, msg = check_bind_cloud_account!
|
||||
return render_error(msg) if flag === true
|
||||
|
||||
ActiveRecord::Base.transaction do
|
||||
@cloud_account = bind_account!
|
||||
if @cloud_account.blank?
|
||||
render_error('激活失败, 请检查你的云服务器信息是否正确.')
|
||||
raise ActiveRecord::Rollback
|
||||
else
|
||||
current_user.set_drone_step!(User::DEVOPS_UNVERIFIED)
|
||||
render_ok(redirect_url: @cloud_account.authenticate_url)
|
||||
end
|
||||
end
|
||||
rescue Exception => ex
|
||||
render_error(ex.message)
|
||||
end
|
||||
|
||||
def activate
|
||||
return render_error('请先认证') unless current_user.ci_certification?
|
||||
|
||||
begin
|
||||
@cloud_account = Ci::CloudAccount.find params[:id]
|
||||
ActiveRecord::Base.transaction do
|
||||
if @repo
|
||||
return render_error('该项目已经激活') if @repo.repo_active?
|
||||
@repo.activate!(@project)
|
||||
else
|
||||
@repo = Ci::Repo.auto_create!(@ci_user, @project)
|
||||
@user.update_column(:user_syncing, false)
|
||||
end
|
||||
|
||||
result = bind_hook!(current_user, @cloud_account, @repo)
|
||||
@project.update_columns(open_devops: true, gitea_webhook_id: result['id'])
|
||||
@cloud_account.update_column(:ci_user_id, @ci_user.user_id)
|
||||
end
|
||||
render_ok
|
||||
rescue Exception => ex
|
||||
render_error(ex.message)
|
||||
end
|
||||
end
|
||||
|
||||
def show
|
||||
end
|
||||
|
||||
def bind
|
||||
flag, msg = check_bind_cloud_account!
|
||||
return render_error(msg) if flag === true
|
||||
|
||||
ActiveRecord::Base.transaction do
|
||||
@cloud_account = bind_account!
|
||||
if @cloud_account.blank?
|
||||
render_error('激活失败, 请检查你的云服务器信息是否正确.')
|
||||
raise ActiveRecord::Rollback
|
||||
else
|
||||
current_user.set_drone_step!(User::DEVOPS_UNVERIFIED)
|
||||
end
|
||||
end
|
||||
rescue Exception => ex
|
||||
render_error(ex.message)
|
||||
end
|
||||
|
||||
def trustie_bind
|
||||
account = params[:account].to_s
|
||||
return render_error("account不能为空.") if account.blank?
|
||||
|
||||
flag, msg = check_trustie_bind_cloud_account!
|
||||
return render_error(msg) if flag === true
|
||||
|
||||
ActiveRecord::Base.transaction do
|
||||
@cloud_account = trustie_bind_account!
|
||||
if @cloud_account.blank?
|
||||
render_error('激活失败, 请检查你的云服务器信息是否正确.')
|
||||
raise ActiveRecord::Rollback
|
||||
else
|
||||
current_user.set_drone_step!(User::DEVOPS_UNVERIFIED)
|
||||
end
|
||||
end
|
||||
rescue Exception => ex
|
||||
render_error(ex.message)
|
||||
end
|
||||
|
||||
def unbind
|
||||
ActiveRecord::Base.transaction do
|
||||
if current_user.ci_cloud_account.server_type == Ci::CloudAccount::SERVER_TYPE_TRUSTIE
|
||||
if @repos
|
||||
@repos.each do |repo|
|
||||
repo.deactivate!
|
||||
end
|
||||
end
|
||||
end
|
||||
unbind_account!
|
||||
render_ok
|
||||
end
|
||||
rescue Exception => ex
|
||||
render_error(ex.message)
|
||||
end
|
||||
|
||||
def oauth_grant
|
||||
password = params[:password].to_s
|
||||
return render_error('你输入的密码不正确.') unless current_user.check_password?(password)
|
||||
|
||||
oauth = current_user.oauths.last
|
||||
return render_error("服务器出小差了.") if oauth.blank?
|
||||
|
||||
result = gitea_oauth_grant!(password, oauth)
|
||||
return render_error('授权失败.') unless result === true
|
||||
current_user.set_drone_step!(User::DEVOPS_CERTIFICATION)
|
||||
end
|
||||
|
||||
private
|
||||
def validate_params!
|
||||
Ci::CreateCloudAccountForm.new(devops_params).validate!
|
||||
end
|
||||
end
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
class Ci::LanguagesController < Ci::BaseController
|
||||
# TODO 需要开启权限认证，只有该项目devops初始化成功后才能获取语言列表
|
||||
before_action :find_langugae, only: :show
|
||||
|
||||
def index
|
||||
@languages = Ci::Language.by_usage_amount_desc
|
||||
end
|
||||
|
||||
def show
|
||||
end
|
||||
|
||||
def common
|
||||
@languages = Ci::Language.six_common
|
||||
end
|
||||
|
||||
private
|
||||
def find_langugae
|
||||
@language = Ci::Language.find params[:id]
|
||||
end
|
||||
end
|
||||
|
|
@ -1,294 +0,0 @@
|
|||
class Ci::PipelinesController < Ci::BaseController
|
||||
|
||||
before_action :require_login, only: %i[list create content]
|
||||
skip_before_action :connect_to_ci_db, except: %i[list create destroy content]
|
||||
before_action :load_project, only: %i[create content]
|
||||
before_action :load_repo, only: %i[create content]
|
||||
|
||||
# ======流水线相关接口========== #
|
||||
def list
|
||||
@result = Array.new
|
||||
list = Ci::Pipeline.where('identifier=? and owner=?', params[:identifier], params[:owner])
|
||||
# 查询build状态
|
||||
list.collect do |pipeline|
|
||||
pipeline.last_build_time = nil
|
||||
repo = load_repo_by_repo_slug("#{pipeline.owner}/#{pipeline.identifier}")
|
||||
if repo
|
||||
build = repo.builds.order("build_created desc").find_by(build_target: pipeline.branch)
|
||||
if build
|
||||
pipeline.pipeline_status = build.build_status
|
||||
pipeline.last_build_time = Time.at(build.build_created)
|
||||
end
|
||||
end
|
||||
@result.push(pipeline)
|
||||
end
|
||||
@total_count = @result.size
|
||||
@pipelines = paginate @result
|
||||
end
|
||||
|
||||
def create
|
||||
ActiveRecord::Base.transaction do
|
||||
size = Ci::Pipeline.where('branch=? and identifier=? and owner=?', params[:branch], params[:repo], params[:owner]).size
|
||||
if size > 0
|
||||
render_error("#{params[:branch]}分支已经存在流水线！")
|
||||
return
|
||||
end
|
||||
pipeline = Ci::Pipeline.new(pipeline_name: params[:pipeline_name], file_name: params[:file_name],owner: params[:owner],
|
||||
login: current_user.login, identifier: params[:repo], branch: params[:branch], event: params[:event])
|
||||
pipeline.save!
|
||||
|
||||
# 默认创建四个初始阶段
|
||||
init_stages = Ci::PipelineStage::INIT_STAGES
|
||||
index = 1
|
||||
init_stages.each do |type, name|
|
||||
pipeline.pipeline_stages.build(
|
||||
stage_name: name,
|
||||
stage_type: type,
|
||||
show_index: index
|
||||
).save!
|
||||
index += 1
|
||||
end
|
||||
create_pipeline_file(pipeline)
|
||||
create_ci_repo(pipeline)
|
||||
render_ok({id: pipeline.id})
|
||||
end
|
||||
rescue Exception => ex
|
||||
render_error(ex.message)
|
||||
end
|
||||
|
||||
# 在代码库创建文件
|
||||
def create_pipeline_file(pipeline)
|
||||
sha = get_pipeline_file_sha(pipeline.file_name, pipeline.branch)
|
||||
if sha
|
||||
logger.info "#{pipeline.file_name}已存在"
|
||||
else
|
||||
interactor = Gitea::CreateFileInteractor.call(current_user.gitea_token, @owner.login, content_params)
|
||||
if interactor.success?
|
||||
logger.info "#{pipeline.file_name}创建成功"
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
# 在drone数据库repo表新增一条repo记录
|
||||
def create_ci_repo(pipeline)
|
||||
if pipeline.branch != 'master'
|
||||
create_params = {
|
||||
repo_user_id: @ci_user.user_id,
|
||||
repo_namespace: @project.owner.login,
|
||||
repo_name: @project.identifier,
|
||||
repo_slug: "#{@project.owner.login}/#{@project.identifier}-" + pipeline.id.to_s,
|
||||
repo_clone_url: @project.repository.url,
|
||||
repo_branch: pipeline.branch,
|
||||
repo_config: pipeline.file_name
|
||||
}
|
||||
repo = Ci::Repo.create_repo(create_params)
|
||||
repo
|
||||
end
|
||||
nil
|
||||
end
|
||||
|
||||
def get_pipeline_file_sha(file_name, branch)
|
||||
file_path_uri = URI.parse(file_name)
|
||||
interactor = Repositories::EntriesInteractor.call(@project.owner, @project.identifier, file_path_uri, ref: branch || 'master')
|
||||
if interactor.success?
|
||||
file = interactor.result
|
||||
file['sha']
|
||||
end
|
||||
end
|
||||
|
||||
def content_params
|
||||
{
|
||||
filepath: params[:file_name],
|
||||
branch: params[:branch],
|
||||
new_branch: params[:new_branch],
|
||||
content: "#pipeline \n",
|
||||
message: 'create pipeline',
|
||||
committer: {
|
||||
email: current_user.mail,
|
||||
name: current_user.login
|
||||
},
|
||||
identifier: params[:repo]
|
||||
}
|
||||
end
|
||||
|
||||
def update
|
||||
pipeline = Ci::Pipeline.find(params[:id])
|
||||
if pipeline
|
||||
pipeline.update!(pipeline_name: params[:pipeline_name],branch: params[:branch], event: params[:event])
|
||||
end
|
||||
render_ok
|
||||
rescue Exception => ex
|
||||
render_error(ex.message)
|
||||
end
|
||||
|
||||
def destroy
|
||||
pipeline = Ci::Pipeline.find(params[:id])
|
||||
if pipeline
|
||||
repo = load_repo_by_repo_slug("#{pipeline.login}/#{pipeline.identifier}-" + pipeline.id.to_s)
|
||||
if repo
|
||||
repo.destroy!
|
||||
end
|
||||
pipeline.destroy!
|
||||
end
|
||||
render_ok
|
||||
rescue Exception => ex
|
||||
render_error(ex.message)
|
||||
end
|
||||
|
||||
def content
|
||||
@yaml = "\n"
|
||||
pipeline = Ci::Pipeline.find(params[:id])
|
||||
stages = pipeline.pipeline_stages
|
||||
if stages && !stages.empty?
|
||||
init_step = stages.first.pipeline_stage_steps.first
|
||||
@yaml += init_step.content + "\n" + "steps:\n"
|
||||
stages = stages.slice(1, stages.size - 1)
|
||||
unless stages.empty?
|
||||
stages.each do |stage|
|
||||
steps = stage.pipeline_stage_steps
|
||||
next unless steps && !steps.empty?
|
||||
steps.each do |step|
|
||||
@yaml += step.content + "\n"
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
@sha = get_pipeline_file_sha(pipeline.file_name, pipeline.branch)
|
||||
trigger = ''
|
||||
trigger += " branch:\r\n - #{pipeline.branch}\r\n" unless pipeline.branch.blank?
|
||||
unless pipeline.event.blank?
|
||||
trigger += " event:\r\n"
|
||||
pipeline.event.split(',').each { |event| trigger += " - #{event}\r\n"}
|
||||
end
|
||||
@yaml += "trigger:\r\n" + trigger unless trigger.blank?
|
||||
@branch = pipeline.branch
|
||||
end
|
||||
|
||||
# =========阶段相关接口========= #
|
||||
def stages
|
||||
pipeline_id = params[:id]
|
||||
@pipeline_name = Ci::Pipeline.find(pipeline_id).pipeline_name
|
||||
@pipeline_stages = Ci::PipelineStage.where('pipeline_id=?', pipeline_id).order('show_index asc')
|
||||
end
|
||||
|
||||
def create_stage
|
||||
ActiveRecord::Base.transaction do
|
||||
# 修改stage排序
|
||||
update_stage_index(params[:id], params[:show_index], 1)
|
||||
pipeline_stage = Ci::PipelineStage.new(stage_name: params[:stage_name],
|
||||
stage_type: params[:stage_type].blank? ? 'customize' : params[:stage_type],
|
||||
pipeline_id: params[:id], show_index: params[:show_index])
|
||||
pipeline_stage.save!
|
||||
render_ok
|
||||
end
|
||||
rescue Exception => ex
|
||||
render_error(ex.message)
|
||||
end
|
||||
|
||||
def update_stage
|
||||
pipeline_stage = Ci::PipelineStage.find(params[:stage_id])
|
||||
if pipeline_stage
|
||||
pipeline_stage.update!(stage_name: params[:stage_name])
|
||||
end
|
||||
render_ok
|
||||
rescue Exception => ex
|
||||
render_error(ex.message)
|
||||
end
|
||||
|
||||
def delete_stage
|
||||
ActiveRecord::Base.transaction do
|
||||
update_stage_index(params[:id], params[:show_index].to_i, -1)
|
||||
pipeline_stage = Ci::PipelineStage.find(params[:stage_id])
|
||||
if pipeline_stage
|
||||
pipeline_stage.destroy!
|
||||
end
|
||||
render_ok
|
||||
end
|
||||
rescue Exception => ex
|
||||
render_error(ex.message)
|
||||
end
|
||||
|
||||
def update_stage_index(pipeline_id, show_index, diff)
|
||||
stages = Ci::Pipeline.find(pipeline_id).pipeline_stages
|
||||
stages.each do |stage|
|
||||
if stage.show_index >= show_index
|
||||
stage.update!(show_index: stage.show_index + diff)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
# ========步骤相关接口========= #
|
||||
def steps
|
||||
@stage_type = Ci::PipelineStage.find(params[:stage_id]).stage_type
|
||||
@pipeline_stage_steps = Ci::PipelineStageStep.where('stage_id=?', params[:stage_id]).order('show_index asc')
|
||||
end
|
||||
|
||||
def stage_step
|
||||
ActiveRecord::Base.transaction do
|
||||
steps = params[:steps]
|
||||
unless steps.empty?
|
||||
steps.each do |step|
|
||||
unless step[:template_id]
|
||||
render_error('请选择模板！')
|
||||
return
|
||||
end
|
||||
if !step[:id]
|
||||
step = Ci::PipelineStageStep.new(step_name: step[:step_name], stage_id: params[:stage_id],
|
||||
template_id: step[:template_id], content: step[:content], show_index: step[:show_index])
|
||||
step.save!
|
||||
else
|
||||
pipeline_stage_step = Ci::PipelineStageStep.find(step[:id])
|
||||
pipeline_stage_step.update(step_name: step[:step_name], content: step[:content],
|
||||
show_index: step[:show_index], template_id: step[:template_id])
|
||||
end
|
||||
end
|
||||
end
|
||||
render_ok
|
||||
end
|
||||
rescue Exception => ex
|
||||
render_error(ex.message)
|
||||
end
|
||||
|
||||
def create_stage_step
|
||||
ActiveRecord::Base.transaction do
|
||||
steps = params[:steps]
|
||||
unless steps.empty?
|
||||
steps.each do |step|
|
||||
step = Ci::PipelineStageStep.new(step_name: step[:step_name], stage_id: params[:stage_id],
|
||||
template_id: step[:template_id], content: step[:content], show_index: step[:show_index])
|
||||
step.save!
|
||||
end
|
||||
end
|
||||
render_ok
|
||||
end
|
||||
rescue Exception => ex
|
||||
render_error(ex.message)
|
||||
end
|
||||
|
||||
def update_stage_step
|
||||
ActiveRecord::Base.transaction do
|
||||
steps = params[:steps]
|
||||
unless steps.empty?
|
||||
steps.each do |step|
|
||||
pipeline_stage_step = Ci::PipelineStageStep.find(step[:id])
|
||||
if pipeline_stage_step
|
||||
pipeline_stage_step.update(step_name: step[:step_name], content: step[:content], template_id: step[:template_id])
|
||||
end
|
||||
end
|
||||
end
|
||||
render_ok
|
||||
end
|
||||
rescue Exception => ex
|
||||
render_error(ex.message)
|
||||
end
|
||||
|
||||
def delete_stage_step
|
||||
pipeline_stage_step = Ci::PipelineStageStep.find(params[:step_id])
|
||||
if pipeline_stage_step
|
||||
pipeline_stage_step.destroy!
|
||||
end
|
||||
render_ok
|
||||
rescue Exception => ex
|
||||
render_error(ex.message)
|
||||
end
|
||||
end
|
||||
|
|
@ -1,70 +0,0 @@
|
|||
class Ci::ProjectsController < Ci::BaseController
|
||||
include RepositoriesHelper
|
||||
include Ci::CloudAccountManageable
|
||||
|
||||
before_action :load_project
|
||||
before_action :load_repo, only: [:update_trustie_pipeline, :activate, :deactivate]
|
||||
before_action :authorize_owner!, only: [:authorize]
|
||||
before_action :find_cloud_account, only: [:authorize, :activate, :deactivate]
|
||||
|
||||
def authorize
|
||||
@user = current_user
|
||||
end
|
||||
|
||||
# get .trustie-pipeline.yml file
|
||||
def get_trustie_pipeline
|
||||
file_path_uri = URI.parse('.trustie-pipeline.yml')
|
||||
interactor = Repositories::EntriesInteractor.call(@project.owner, @project.identifier, file_path_uri, ref: params[:ref] || "master")
|
||||
if interactor.success?
|
||||
file = interactor.result
|
||||
return render json: {} if file[:status]
|
||||
|
||||
json = {name: file['name'], path: file['path'], sha: file['sha'], content: render_decode64_content(file['content'])}
|
||||
render json: json
|
||||
end
|
||||
end
|
||||
|
||||
def update_trustie_pipeline
|
||||
interactor = Gitea::UpdateFileInteractor.call(current_user.gitea_token, params[:owner], params.merge(identifier: @project.identifier))
|
||||
if interactor.success?
|
||||
@file = interactor.result
|
||||
render_result(1, "更新成功")
|
||||
else
|
||||
render_error(interactor.error)
|
||||
end
|
||||
end
|
||||
|
||||
def activate
|
||||
return render_error('你还未认证') unless current_user.ci_certification?
|
||||
|
||||
begin
|
||||
ActiveRecord::Base.transaction do
|
||||
if @repo
|
||||
return render_error('该项目已经激活') if @repo.repo_active?
|
||||
@repo.activate!(@project)
|
||||
return render_ok
|
||||
else
|
||||
@repo = Ci::Repo.auto_create!(@ci_user, @project)
|
||||
@ci_user.update_column(:user_syncing, false)
|
||||
end
|
||||
|
||||
result = bind_hook!(current_user, @cloud_account, @repo)
|
||||
@project.update_columns(open_devops: true, gitea_webhook_id: result['id'])
|
||||
@project.increment!(:open_devops_count)
|
||||
@cloud_account.update_column(:ci_user_id, @ci_user.user_id)
|
||||
end
|
||||
render_ok
|
||||
rescue Exception => ex
|
||||
render_error(ex.message)
|
||||
end
|
||||
end
|
||||
|
||||
def deactivate
|
||||
return render_error('该项目已经取消激活') if !@repo.repo_active?
|
||||
|
||||
@project.update_column(:open_devops, false)
|
||||
@repo.deactivate_repos!
|
||||
render_ok
|
||||
end
|
||||
|
||||
end
|
||||
|
|
@ -1,53 +0,0 @@
|
|||
class Ci::SecretsController < Ci::BaseController
|
||||
|
||||
before_action :load_repo
|
||||
|
||||
# 参数列表
|
||||
def index
|
||||
result = Ci::Drone::API.new(@ci_user.user_hash, ci_drone_url, params[:owner], params[:repo], nil).secrets
|
||||
@secrets = result
|
||||
end
|
||||
|
||||
#新增、更新参数
|
||||
def create
|
||||
options = {
|
||||
name: params[:name],
|
||||
data: params[:data]
|
||||
}
|
||||
id = params[:id]
|
||||
if id
|
||||
result = Ci::Drone::API.new(@ci_user.user_hash, ci_drone_url, params[:owner], params[:repo], options).update_secret
|
||||
if result["id"]
|
||||
render_ok
|
||||
else
|
||||
render_error(result["message"])
|
||||
end
|
||||
else
|
||||
result = Ci::Drone::API.new(@ci_user.user_hash, ci_drone_url, params[:owner], params[:repo], options).create_secret
|
||||
if result["id"]
|
||||
render_ok
|
||||
else
|
||||
render_error(result["message"])
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
#删除参数
|
||||
def destroy
|
||||
name = params[:name]
|
||||
if !name.blank?
|
||||
Ci::Drone::API.new(@ci_user.user_hash, ci_drone_url, params[:owner], params[:repo], {name: name}).delete_secret
|
||||
render_ok
|
||||
else
|
||||
render_error("参数名不能为空")
|
||||
end
|
||||
rescue Exception => ex
|
||||
render_ok
|
||||
end
|
||||
|
||||
def ci_drone_url
|
||||
user = User.find_by(login: params[:owner])
|
||||
user&.ci_cloud_account.drone_url
|
||||
end
|
||||
|
||||
end
|
||||
|
|
@ -1,104 +0,0 @@
|
|||
class Ci::TemplatesController < Ci::BaseController
|
||||
|
||||
before_action :require_login, only: %i[list create]
|
||||
skip_before_action :connect_to_ci_db
|
||||
|
||||
#======模板管理======#
|
||||
def list
|
||||
stage_type = params[:stage_type]
|
||||
template_name = params[:name]
|
||||
templates = template_name.blank? ? Ci::Template.all : Ci::Template.where("template_name like ?", "%#{template_name}%")
|
||||
templates = templates.select{ |template| template.login == current_user.login} unless current_user.admin?
|
||||
if !stage_type.blank? && stage_type != 'all'
|
||||
templates = templates.select{ |template| template.stage_type == stage_type}
|
||||
end
|
||||
@total_count = templates.map(&:id).count
|
||||
@templates = paginate templates
|
||||
end
|
||||
|
||||
def show
|
||||
@template = Ci::Template.find(params[:id])
|
||||
end
|
||||
|
||||
def create
|
||||
stage_type = params[:stage_type]
|
||||
category = params[:category]
|
||||
if category.blank?
|
||||
category = Ci::Template::STAGE_TYPES[:"#{stage_type}"]
|
||||
end
|
||||
|
||||
if params[:id]
|
||||
template = Ci::Template.find(params[:id])
|
||||
if template
|
||||
template.update!(template_name: params[:template_name],
|
||||
stage_type: stage_type,
|
||||
category: category,
|
||||
parent_category: Ci::Template::STAGE_TYPES[:"#{stage_type}"],
|
||||
content: params[:content],
|
||||
login: current_user.admin? ? 'admin' : current_user.login
|
||||
)
|
||||
end
|
||||
else
|
||||
template = Ci::Template.new(template_name: params[:template_name],
|
||||
stage_type: stage_type,
|
||||
category: category,
|
||||
parent_category: Ci::Template::STAGE_TYPES[:"#{stage_type}"],
|
||||
content: params[:content],
|
||||
login: current_user.admin? ? 'admin' : current_user.login
|
||||
)
|
||||
template.save!
|
||||
end
|
||||
render_ok
|
||||
rescue Exception => ex
|
||||
render_error(ex.message)
|
||||
end
|
||||
|
||||
def update
|
||||
template = Ci::Template.find(params[:id])
|
||||
template.update!(template_name: params[:template_name],
|
||||
stage_type: params[:stage_type],
|
||||
category: params[:category],
|
||||
parent_category: params[:parent_category],
|
||||
content: params[:content]
|
||||
)
|
||||
render_ok
|
||||
rescue Exception => ex
|
||||
render_error(ex.message)
|
||||
end
|
||||
|
||||
def destroy
|
||||
template = Ci::Template.find(params[:id])
|
||||
if template
|
||||
template.destroy!
|
||||
end
|
||||
render_ok
|
||||
rescue Exception => ex
|
||||
render_error(ex.message)
|
||||
end
|
||||
|
||||
#======流水线模板查询=====#
|
||||
def templates_by_stage
|
||||
stage_type = params[:stage_type]
|
||||
if stage_type != Ci::PipelineStage::CUSTOMIZE_STAGE_TYPE
|
||||
@templates = Ci::Template.where("stage_type = ?", stage_type)
|
||||
@templates = @templates.select{ |template| template.login == current_user.login || template.login == 'admin'} unless current_user.admin?
|
||||
if stage_type == Ci::PipelineStage::INIT_STAGE_TYPE && !@templates.nil?
|
||||
@templates.each do |template|
|
||||
content = template.content
|
||||
unless content.blank?
|
||||
pipeline = Ci::Pipeline.find(params[:id])
|
||||
template.content = content.gsub(/{name}/, pipeline.pipeline_name) unless pipeline.nil?
|
||||
end
|
||||
end
|
||||
end
|
||||
# 根据模板类别分组
|
||||
@category_templates = @templates.group_by{ |template| template.category }
|
||||
else
|
||||
# 自定义阶段，按阶段分类分类返回模板列表
|
||||
@templates = Ci::Template.where("stage_type != ?", Ci::PipelineStage::INIT_STAGE_TYPE)
|
||||
@templates = @templates.select{ |template| template.login == current_user.login || template.login == 'admin'} unless current_user.admin?
|
||||
@category_templates = @templates.group_by{ |template| template.parent_category }
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
class CompareController < ApplicationController
|
||||
# skip_before_action :require_login
|
||||
before_action :load_repository
|
||||
|
||||
def index
|
||||
end
|
||||
|
||||
def show
|
||||
compare
|
||||
end
|
||||
|
||||
private
|
||||
def compare
|
||||
base, head = compare_params
|
||||
|
||||
# TODO: 处理fork的项目向源项目发送PR的base、head参数问题
|
||||
@compare_result ||=
|
||||
head.include?(":") ? gitea_compare(base, head) : gitea_compare(head, base)
|
||||
end
|
||||
|
||||
def compare_params
|
||||
base = Addressable::URI.unescape(params[:base])
|
||||
head = params[:head].include?('json') ? params[:head]&.split('.json')[0] : params[:head]
|
||||
|
||||
[base, head]
|
||||
end
|
||||
|
||||
def gitea_compare(base, head)
|
||||
Gitea::Repository::Commits::CompareService.call(@owner.login, @project.identifier, base, head)
|
||||
end
|
||||
end
|
||||
|
|
@ -3,12 +3,13 @@ class ComposesController < ApplicationController
|
|||
before_action :find_compose, except: [:index, :new,:create]
|
||||
|
||||
def index
|
||||
@order_type = params[:order] || "created_at"
|
||||
@search_name = params[:search]
|
||||
composes = Compose.compose_includes
|
||||
if @search_name.present?
|
||||
composes = composes.where("title like ?", "%#{@search_name}%")
|
||||
end
|
||||
composes = composes.order("#{order_type} desc")
|
||||
composes = composes.order("#{@order_type} desc")
|
||||
@page = params[:page] || 1
|
||||
@limit = params[:limit] || 15
|
||||
@composes_size = composes.size
|
||||
|
|
@ -95,8 +96,4 @@ class ComposesController < ApplicationController
|
|||
end
|
||||
end
|
||||
|
||||
def order_type
|
||||
Compose.column_names.include?(params[:order_type]) ? params[:order_type] : 'created_at'
|
||||
end
|
||||
|
||||
end
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
module Acceleratorable
|
||||
extend ActiveSupport::Concern
|
||||
|
||||
def enable_accelerator?(clone_addr)
|
||||
is_foreign_url?(clone_addr) && config_accelerator?
|
||||
end
|
||||
|
||||
def accelerator_url(repo_name)
|
||||
[accelerator_domain, accelerator_username, "#{repo_name}.git"].join('/')
|
||||
end
|
||||
|
||||
def github_domain
|
||||
'github.com'
|
||||
end
|
||||
|
||||
def gitlab_domain
|
||||
'gitlab.com'
|
||||
end
|
||||
|
||||
def accelerator_domain
|
||||
Gitea.gitea_config[:accelerator]["domain"]
|
||||
end
|
||||
|
||||
def accelerator_username
|
||||
Gitea.gitea_config[:accelerator]["access_key_id"]
|
||||
end
|
||||
|
||||
def config_accelerator?
|
||||
Gitea.gitea_config[:accelerator].present?
|
||||
end
|
||||
|
||||
def is_foreign_url?(clone_addr)
|
||||
clone_addr.include?(github_domain) || clone_addr.include?(gitlab_domain)
|
||||
end
|
||||
|
||||
end
|
||||
|
|
@ -1,209 +0,0 @@
|
|||
module Ci::CloudAccountManageable
|
||||
extend ActiveSupport::Concern
|
||||
|
||||
included do
|
||||
end
|
||||
|
||||
# 自有服务器绑定流程
|
||||
def bind_account!
|
||||
# 1. 保存华为云服务器帐号
|
||||
create_params = devops_params.merge(ip_num: IPAddr.new(devops_params[:ip_num].strip).to_i, secret: Ci::CloudAccount.encrypted_secret(devops_params[:secret]), server_type: Ci::CloudAccount::SERVER_TYPE_SELF)
|
||||
|
||||
cloud_account = Ci::CloudAccount.new(create_params)
|
||||
cloud_account.user = current_user
|
||||
cloud_account.save!
|
||||
|
||||
# 2. 生成oauth2应用程序的client_id和client_secrete
|
||||
gitea_oauth = Gitea::Oauth2::CreateService.call(current_user.gitea_token, {name: "pipeline-#{SecureRandom.hex(8)}", redirect_uris: ["#{cloud_account.drone_url}/login"]})
|
||||
logger.info "######### gitea_oauth: #{gitea_oauth}"
|
||||
|
||||
raise 'Gitea接口异常' if gitea_oauth['client_id'].blank?
|
||||
|
||||
oauth = Oauth.new(client_id: gitea_oauth['client_id'],
|
||||
client_secret: gitea_oauth['client_secret'],
|
||||
redirect_uri: gitea_oauth['redirect_uris'],
|
||||
gitea_oauth_id: gitea_oauth['id'],
|
||||
user_id: current_user.id)
|
||||
oauth.save!
|
||||
|
||||
# 创建数据ci端数据库
|
||||
database_result = auto_create_database!(@connection, "#{current_user.login}_drone")
|
||||
logger.info "[CI::DbConnectable] auto_create_database's result: #{database_result}"
|
||||
|
||||
# 初始化表结构
|
||||
sub_connection = connect_to_ci_database
|
||||
auto_create_table_structure!(sub_connection)
|
||||
|
||||
rpc_secret = SecureRandom.hex 16
|
||||
logger.info "######### rpc_secret: #{rpc_secret}"
|
||||
|
||||
# 3. 创建drone server
|
||||
drone_server_cmd = Ci::Drone::Server.new(current_user.login, oauth.client_id, oauth.client_secret, cloud_account.drone_host, rpc_secret).generate_cmd
|
||||
logger.info "######### drone_server_cmd: #{drone_server_cmd}"
|
||||
|
||||
# 4. 创建drone client
|
||||
drone_client_cmd = Ci::Drone::Client.new(oauth.client_id, cloud_account.drone_ip, rpc_secret).generate_cmd
|
||||
logger.info "######### drone_client_cmd: #{drone_client_cmd}"
|
||||
|
||||
# 5. 登录远程服务器，启动drone服务
|
||||
result = Ci::Drone::Start.new(cloud_account.account, cloud_account.visible_secret, cloud_account.drone_ip, drone_server_cmd, drone_client_cmd).run
|
||||
logger.info "######### result: #{result}"
|
||||
|
||||
|
||||
redirect_url = "#{cloud_account.drone_url}/login"
|
||||
logger.info "######### redirect_url: #{redirect_url}"
|
||||
|
||||
return nil unless result.present?
|
||||
result && !result.blank? ? cloud_account : nil
|
||||
end
|
||||
|
||||
def trustie_drone_server_config
|
||||
# 读取drone配置信息
|
||||
config = Rails.application.config_for(:configuration).symbolize_keys!
|
||||
trustie_drone_config = config[:trustie_drone].symbolize_keys!
|
||||
return trustie_drone_config
|
||||
end
|
||||
|
||||
# trustie提供服务器,绑定流程
|
||||
def trustie_bind_account!
|
||||
trustie_drone_config = trustie_drone_server_config
|
||||
raise 'trustie_drone config missing' if trustie_drone_config.blank?
|
||||
|
||||
# 创建云账号
|
||||
create_params = devops_params.merge(ip_num: IPAddr.new(trustie_drone_config[:ip_num].strip).to_i, secret: Ci::CloudAccount.encrypted_secret(trustie_drone_config[:secret]), server_type: Ci::CloudAccount::SERVER_TYPE_TRUSTIE)
|
||||
cloud_account = Ci::CloudAccount.new(create_params)
|
||||
cloud_account.user = current_user
|
||||
cloud_account.save!
|
||||
|
||||
#生成oauth2应用程序的client_id和client_secrete
|
||||
gitea_oauth = Gitea::Oauth2::CreateService.call(current_user.gitea_token, {name: "pipeline-#{SecureRandom.hex(8)}", redirect_uris: ["#{cloud_account.drone_url}/login"]})
|
||||
logger.info "######### gitea_oauth: #{gitea_oauth}"
|
||||
|
||||
raise 'Gitea接口异常' if gitea_oauth['client_id'].blank?
|
||||
|
||||
oauth = Oauth.new(client_id: gitea_oauth['client_id'],
|
||||
client_secret: gitea_oauth['client_secret'],
|
||||
redirect_uri: gitea_oauth['redirect_uris'],
|
||||
gitea_oauth_id: gitea_oauth['id'],
|
||||
user_id: current_user.id)
|
||||
result = oauth.save!
|
||||
|
||||
redirect_url = "#{cloud_account.drone_url}/login"
|
||||
logger.info "######### redirect_url: #{redirect_url}"
|
||||
|
||||
return nil unless result.present?
|
||||
result ? cloud_account : nil
|
||||
end
|
||||
|
||||
def unbind_account!
|
||||
cloud_account = current_user.ci_cloud_account
|
||||
return render_error('你未绑定CI服务器') if current_user.devops_step == User::DEVOPS_UNINIT || cloud_account.blank?
|
||||
|
||||
if cloud_account.server_type == Ci::CloudAccount::SERVER_TYPE_SELF
|
||||
@connection.execute("DROP DATABASE IF EXISTS #{current_user.login}_drone") # TOTO drop drone database
|
||||
end
|
||||
|
||||
cloud_account.destroy! unless cloud_account.blank?
|
||||
current_user.unbind_account!
|
||||
end
|
||||
|
||||
def bind_hook!(user, cloud_account, repo)
|
||||
hook_params = {
|
||||
active: true,
|
||||
config: {
|
||||
content_type: "json",
|
||||
url: cloud_account.drone_url + "/hook?secret=#{repo.repo_signer}"
|
||||
},
|
||||
type: "gitea"
|
||||
}
|
||||
result = Gitea::Hooks::CreateService.call(user.gitea_token, user.login, repo.repo_name, hook_params)
|
||||
|
||||
result[:status].present? ? nil : result
|
||||
end
|
||||
|
||||
def check_bind_cloud_account!
|
||||
return [true, "你已经绑定了云帐号."] unless current_user.ci_cloud_account.blank?
|
||||
|
||||
ip_num = IPAddr.new(devops_params[:ip_num]).to_i
|
||||
|
||||
#自有服务器进行判断
|
||||
cloud_account = current_user.ci_cloud_account
|
||||
if cloud_account && cloud_account.server_type == Ci::CloudAccount::SERVER_TYPE_SELF
|
||||
Ci::CloudAccount.exists?(ip_num: ip_num) ? [true, "#{devops_params[:ip_num]}服务器已被使用."] : [false, nil]
|
||||
end
|
||||
end
|
||||
|
||||
def check_trustie_bind_cloud_account!
|
||||
return [true, "你已经绑定了云帐号."] unless current_user.ci_cloud_account.blank?
|
||||
end
|
||||
|
||||
def gitea_auto_create_auth_grant!(gitea_oauth_id)
|
||||
connection = Gitea::Database.set_connection.connection
|
||||
unix_time = Time.now.to_i
|
||||
|
||||
# 目前直接操作db，可以建立对应的model进行操作
|
||||
sql = "REPLACE INTO oauth2_grant ( user_id, application_id, counter, created_unix, updated_unix ) VALUES ( #{current_user.gitea_uid}, #{gitea_oauth_id}, 0, #{unix_time}, #{unix_time} );"
|
||||
connection.execute(sql)
|
||||
|
||||
#如果使用trustie提供的服务器，需要多增加一条授权信息
|
||||
if current_user.ci_cloud_account.server_type == Ci::CloudAccount::SERVER_TYPE_TRUSTIE
|
||||
trustie_drone_config = trustie_drone_server_config
|
||||
admin_application_id = trustie_drone_config[:admin_application_id]
|
||||
sql = "REPLACE INTO oauth2_grant ( user_id, application_id, counter, created_unix, updated_unix ) VALUES ( #{current_user.gitea_uid}, #{admin_application_id}, 0, #{unix_time}, #{unix_time} );"
|
||||
connection.execute(sql)
|
||||
end
|
||||
end
|
||||
|
||||
def gitea_oauth_grant!(password, oauth)
|
||||
gitea_auto_create_auth_grant!(oauth&.gitea_oauth_id)
|
||||
|
||||
state = SecureRandom.hex(8)
|
||||
# redirect_uri eg:
|
||||
# https://localhost:3000/login/oauth/authorize?client_id=94976481-ad0e-4ed4-9247-7eef106007a2&redirect_uri=http%3A%2F%2F121.69.81.11%3A80%2Flogin&response_type=code&state=9cab990b9cfb1805
|
||||
redirect_uri = CGI.escape("#{@cloud_account.drone_url}/login")
|
||||
clientId = client_id(oauth)
|
||||
grant_url = "#{Gitea.gitea_config[:domain]}/login/oauth/authorize?client_id=#{clientId}&redirect_uri=#{redirect_uri}&response_type=code&state=#{state}"
|
||||
logger.info "[gitea] grant_url: #{grant_url}"
|
||||
|
||||
conn = Faraday.new(url: grant_url) do |req|
|
||||
req.request :url_encoded
|
||||
req.adapter Faraday.default_adapter
|
||||
req.basic_auth(current_user.login, password)
|
||||
end
|
||||
|
||||
response = conn.get
|
||||
logger.info "[gitea] response headers: #{response.headers}"
|
||||
|
||||
drone_oauth_user!(response.headers.to_h['location'], state)
|
||||
end
|
||||
|
||||
def drone_oauth_user!(url, state)
|
||||
logger.info "[drone] drone_oauth_user url: #{url}"
|
||||
conn = Faraday.new(url: url) do |req|
|
||||
req.request :url_encoded
|
||||
req.adapter Faraday.default_adapter
|
||||
req.headers["cookie"] = "_session_=#{SecureRandom.hex(28)}; _oauth_state_=#{state}"
|
||||
end
|
||||
|
||||
response = conn.get
|
||||
logger.info "[drone] response headers: #{response.headers}"
|
||||
|
||||
response.headers['location'].include?('error') ? false : true
|
||||
end
|
||||
|
||||
private
|
||||
def devops_params
|
||||
params.permit(:account, :secret, :ip_num)
|
||||
end
|
||||
|
||||
def client_id(oauth)
|
||||
#如果是使用trustie服务器使用管理员用户的clientId
|
||||
if current_user.ci_cloud_account.server_type == Ci::CloudAccount::SERVER_TYPE_TRUSTIE
|
||||
trustie_drone_config = trustie_drone_server_config
|
||||
return trustie_drone_config[:client_id]
|
||||
else
|
||||
return oauth&.client_id
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
module Ci::DbConnectable
|
||||
extend ActiveSupport::Concern
|
||||
|
||||
included do
|
||||
end
|
||||
|
||||
# Dynamically sets the database connection.
|
||||
def connect_to_ci_database(options={})
|
||||
master_db = options[:master_db] || false
|
||||
config = Rails.application.config_for(:configuration).symbolize_keys!
|
||||
db_config = config[:ci_db_server].symbolize_keys!
|
||||
raise 'ci database config missing' if db_config.blank?
|
||||
|
||||
req_params = {
|
||||
host: db_config[:host],
|
||||
username: db_config[:username],
|
||||
password: db_config[:password],
|
||||
port: db_config[:port]
|
||||
}
|
||||
db_name = options[:db_name].blank? ? current_user.login : options[:db_name]
|
||||
req_params = req_params.merge(database: "#{db_name}_#{db_config[:database]}") unless master_db === true
|
||||
|
||||
db_params = Ci::Database.get_connection_params(req_params)
|
||||
@connection = Ci::Database.set_connection(db_params).connection
|
||||
end
|
||||
|
||||
def connect_to_trustie_ci_database(options={})
|
||||
master_db = options[:master_db] || false
|
||||
config = Rails.application.config_for(:configuration).symbolize_keys!
|
||||
db_config = config[:ci_db_server_trustie].symbolize_keys!
|
||||
raise 'ci database config missing' if db_config.blank?
|
||||
|
||||
req_params = {
|
||||
host: db_config[:host],
|
||||
username: db_config[:username],
|
||||
password: db_config[:password],
|
||||
port: db_config[:port]
|
||||
}
|
||||
|
||||
req_params = req_params.merge(database: "#{db_config[:database]}") unless master_db === true
|
||||
db_params = Ci::Database.get_connection_params(req_params)
|
||||
@trustie_db_connection = Ci::Database.set_connection(db_params).connection
|
||||
end
|
||||
|
||||
def auto_create_database!(connection, database)
|
||||
Rails.logger.info "[CI::DbConnectable] auto_create_database's connection: #{connection}"
|
||||
connection.execute("CREATE DATABASE IF NOT EXISTS #{database}")
|
||||
end
|
||||
|
||||
def auto_create_table_structure!(connection)
|
||||
Rails.logger.info "[CI::DbConnectable] auto_create_table_structure's connection: #{connection}"
|
||||
|
||||
sqls = Ci::Schema.statement.split(';').map(&:strip).reject { |e| e.to_s.empty? }
|
||||
sqls.each do |sql|
|
||||
con_result = connection.execute(sql)
|
||||
Rails.logger.info "=============> ci create tabels result: #{con_result}"
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -39,7 +39,7 @@ module LaboratoryHelper
|
|||
new_course: "https://www.trustie.net/courses/new",
|
||||
edit_account: "https://www.trustie.net/my/account",
|
||||
my_courses: "https://www.trustie.net/users/#{current_user.try(:login)}/user_courselist",
|
||||
my_projects: "/users/#{current_user.try(:login)}/projects",
|
||||
my_projects: "https://forgeplus.trustie.net/users/#{current_user.try(:login)}/projects",
|
||||
my_organ: "https://www.trustie.net/users/#{current_user.try(:login)}/user_organizations",
|
||||
default_url: "https://www.trustie.net/",
|
||||
tiding_url: "https://www.trustie.net/users/#{current_user.try(:login)}/user_messages",
|
||||
|
|
|
|||
|
|
@ -127,8 +127,6 @@ module LoginHelper
|
|||
token = config[:sync_token]
|
||||
api_host = config[:sync_url]
|
||||
|
||||
return if api_host.blank?
|
||||
|
||||
url = "#{api_host}/api/v1/users/sync_user_token"
|
||||
sync_json = {
|
||||
"token": token,
|
||||
|
|
|
|||
|
|
@ -1,14 +1,12 @@
|
|||
module PaginateHelper
|
||||
def paginate(objs, **opts)
|
||||
page = params[:page].to_i <= 0 ? 1 : params[:page].to_i
|
||||
per_page = params[:per_page].to_i > 0 && params[:per_page].to_i < 50 ? params[:per_page].to_i : opts[:per_page] || 20
|
||||
|
||||
def paginate(relation)
|
||||
limit = params[:limit] || params[:per_page]
|
||||
limit = (limit.to_i.zero? || limit.to_i > 15) ? 15 : limit.to_i
|
||||
page = params[:page].to_i.zero? ? 1 : params[:page].to_i
|
||||
|
||||
if relation.is_a?(Array)
|
||||
Kaminari.paginate_array(relation).page(page).per(limit)
|
||||
if objs.is_a?(Array)
|
||||
Kaminari.paginate_array(objs).page(page).per(per_page)
|
||||
else
|
||||
relation.page(page).per(limit)
|
||||
objs.page(page).per(per_page)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -1,22 +1,20 @@
|
|||
module RegisterHelper
|
||||
extend ActiveSupport::Concern
|
||||
|
||||
def autologin_register(username, email, password, platform= 'forge')
|
||||
def autologin_register(username, email, password, platform= '')
|
||||
result = {message: nil, user: nil}
|
||||
|
||||
user = User.new(admin: false, login: username, mail: email, type: "User")
|
||||
user.password = password
|
||||
user.platform = platform
|
||||
user.activate
|
||||
|
||||
return unless user.valid?
|
||||
|
||||
interactor = Gitea::RegisterInteractor.call({username: username, email: email, password: password})
|
||||
if interactor.success?
|
||||
gitea_user = interactor.result
|
||||
result = Gitea::User::GenerateTokenService.call(username, password)
|
||||
result = Gitea::User::GenerateTokenService.new(username, password).call
|
||||
user.gitea_token = result['sha1']
|
||||
user.gitea_uid = gitea_user[:body]['id']
|
||||
user.gitea_uid = gitea_user['id']
|
||||
if user.save!
|
||||
UserExtension.create!(user_id: user.id)
|
||||
result[:user] = {id: user.id, token: user.gitea_token}
|
||||
|
|
|
|||
|
|
@ -1,19 +0,0 @@
|
|||
module Repository::LanguagesPercentagable
|
||||
extend ActiveSupport::Concern
|
||||
|
||||
def languages_precentagable
|
||||
result = Gitea::Repository::Languages::ListService.call(@owner.login,
|
||||
@repository.identifier, current_user&.gitea_token)
|
||||
|
||||
result[:status] === :success ? hash_transform_precentagable(result[:body]) : nil
|
||||
end
|
||||
|
||||
# hash eq:{"JavaScript": 301681522,"Ruby": 1444004,"Roff": 578781}
|
||||
def hash_transform_precentagable(hash)
|
||||
total_byte_size = hash.values.sum
|
||||
hash.transform_values { |v|
|
||||
ActionController::Base.helpers
|
||||
.number_to_percentage((v * 100.0 / total_byte_size), precision: 1)
|
||||
}.select{|k,v| v != "0.0%"}
|
||||
end
|
||||
end
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
class CustomersController < ApplicationController
|
||||
def show
|
||||
targets = UsersService.new.user_info params, current_user
|
||||
render json: targets
|
||||
end
|
||||
|
||||
def edit_brief
|
||||
targets = UsersService.new.edit_brief params, current_user
|
||||
render json: targets
|
||||
end
|
||||
end
|
||||
|
|
@ -0,0 +1,101 @@
|
|||
class ForumSectionsController < ApplicationController
|
||||
|
||||
def index
|
||||
targets = ForumSectionsService.new.index params
|
||||
render json: targets
|
||||
end
|
||||
|
||||
def select_sections
|
||||
targets = ForumSectionsService.new.select_sections
|
||||
render json: targets
|
||||
end
|
||||
|
||||
def user_apply
|
||||
targets = ForumSectionsService.new.user_apply params, current_user, current_user_ip
|
||||
render json: targets
|
||||
end
|
||||
|
||||
def edit_notice
|
||||
targets = ForumSectionsService.new.edit_notice params
|
||||
render json: targets
|
||||
end
|
||||
|
||||
def forum_section_header
|
||||
targets = ForumSectionsService.new.forum_section_header params, current_user
|
||||
render json: targets
|
||||
end
|
||||
|
||||
def create
|
||||
targets = ForumSectionsService.new.create params, current_user
|
||||
render json: targets
|
||||
end
|
||||
|
||||
def rename
|
||||
targets = ForumSectionsService.new.rename params, current_user
|
||||
render json: targets
|
||||
end
|
||||
|
||||
def destroy_forum
|
||||
targets = ForumSectionsService.new.destroy params, current_user
|
||||
render json: targets
|
||||
end
|
||||
|
||||
def order_forums
|
||||
targets = ForumSectionsService.new.order_forums params, current_user
|
||||
render json: targets
|
||||
end
|
||||
|
||||
def search_users
|
||||
targets = ForumSectionsService.new.search_users params, current_user
|
||||
render json: targets
|
||||
end
|
||||
|
||||
def add_users
|
||||
targets = ForumSectionsService.new.add_users params, current_user
|
||||
render json: targets
|
||||
end
|
||||
|
||||
def managements
|
||||
targets = ForumSectionsService.new.managements params, current_user
|
||||
render json: targets
|
||||
end
|
||||
|
||||
def applied_forums
|
||||
targets = ForumSectionsService.new.applied_forums params, current_user
|
||||
render json: targets
|
||||
end
|
||||
|
||||
def deal_applies
|
||||
targets = ForumSectionsService.new.deal_applies params, current_user
|
||||
render json: targets
|
||||
end
|
||||
|
||||
def destroy_moderator
|
||||
targets = ForumSectionsService.new.destroy_moderator params, current_user
|
||||
render json: targets
|
||||
end
|
||||
|
||||
def unchecked_memos
|
||||
targets = ForumSectionsService.new.unchecked_memos params, current_user
|
||||
render json: targets
|
||||
end
|
||||
|
||||
def unchecked_replies
|
||||
targets = ForumSectionsService.new.unchecked_replies params, current_user
|
||||
render json: targets
|
||||
end
|
||||
|
||||
def checked_memos
|
||||
targets = ForumSectionsService.new.checked_memos params, current_user
|
||||
render json: targets
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def current_user_ip
|
||||
env['REMOTE_ADDR']
|
||||
end
|
||||
|
||||
|
||||
|
||||
end
|
||||
|
|
@ -0,0 +1,434 @@
|
|||
# encoding=utf-8
|
||||
# For react
|
||||
class ForumsController < ApplicationController
|
||||
before_action :require_login, :only => [:new, :edit]
|
||||
include ApplicationHelper
|
||||
|
||||
def show
|
||||
render_react
|
||||
end
|
||||
|
||||
def new
|
||||
render_react
|
||||
end
|
||||
|
||||
def index
|
||||
render_react
|
||||
end
|
||||
|
||||
|
||||
def edit
|
||||
render_react
|
||||
end
|
||||
|
||||
def shixun_discuss
|
||||
render_react
|
||||
end
|
||||
|
||||
def manage
|
||||
render_react
|
||||
end
|
||||
|
||||
def detail
|
||||
render_react
|
||||
end
|
||||
|
||||
def theme
|
||||
render_react
|
||||
end
|
||||
|
||||
private
|
||||
def render_react
|
||||
render file: 'public/react/build/index.html', :layout => false
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
|
||||
# # encoding: utf-8
|
||||
# # added by fq
|
||||
# class ForumsController < ApplicationController
|
||||
# layout "users_base"
|
||||
# include ApplicationHelper
|
||||
# # GET /forums
|
||||
# # GET /forums.json
|
||||
# before_action :find_forum_if_available
|
||||
# before_action :authenticate_user_edit, :only => [:edit, :update]
|
||||
# before_action :authenticate_user_destroy, :only => [:destroy]
|
||||
# before_action :require_login, :only => [:new, :create,:destroy,:update,:edit]
|
||||
# before_action :check_authentication
|
||||
#
|
||||
# helper :sort
|
||||
# include SortHelper
|
||||
#
|
||||
# PageLimit = 20
|
||||
# def create_feedback
|
||||
# if User.current.logged?
|
||||
# #@memo = Memo.new(params[:memo])
|
||||
# #@memo.forum_id = "1"
|
||||
# #@memo.author_id = User.current.id
|
||||
# #@forum = @memo.forum
|
||||
# cs = CommentService.new
|
||||
# @memo,message = cs.create_feedback params,User.current
|
||||
# respond_to do |format|
|
||||
# if !@memo.new_record?
|
||||
# if params[:direct]
|
||||
# format.html { redirect_to forums_path() }
|
||||
# else
|
||||
# format.html { redirect_to forum_path(@memo.forum) }
|
||||
# end
|
||||
# # format.html { redirect_to forum_path(@memo.forum) }
|
||||
# else
|
||||
# sort_init 'updated_at', 'desc'
|
||||
# sort_update 'created_at' => "#{Memo.table_name}.created_at",
|
||||
# 'replies' => "#{Memo.table_name}.replies_count",
|
||||
# 'updated_at' => "COALESCE (last_replies_memos.created_at, #{Memo.table_name}.created_at)"
|
||||
#
|
||||
# @topic_count = @forum.topics.count
|
||||
# @topic_pages = Paginator.new @topic_count, per_page_option, params['page']
|
||||
# @memos = @forum.topics.
|
||||
# reorder("#{Memo.table_name}.sticky DESC").
|
||||
# includes(:last_reply).
|
||||
# limit(@topic_pages.per_page).
|
||||
# offset(@topic_pages.offset).
|
||||
# order(sort_clause).
|
||||
# preload(:author, {:last_reply => :author}).
|
||||
# all
|
||||
#
|
||||
# flash.now[:error] = "#{l :label_memo_create_fail}: #{@memo.errors.full_messages[0]}"
|
||||
# # back_error_page = @memo.parent_id.nil? ? forum_path(@forum) : forum_memo_path(@forum, @memo.parent_id)
|
||||
# format.html { render action: :show, layout: 'base_forums' }#, error: "#{l :label_memo_create_fail}: #{@memo.errors.full_messages[0]}" }
|
||||
# format.json { render json: @memo.errors, status: :unprocessable_entity }
|
||||
# end
|
||||
# end
|
||||
# else
|
||||
# respond_to do |format|
|
||||
# format.html { redirect_to signin_path }
|
||||
# end
|
||||
# end
|
||||
# end
|
||||
#
|
||||
# def mail_feedback
|
||||
# @user = User.where(:id => params[:user_id]).first
|
||||
# unless @user.nil?
|
||||
# cs = CommentService.new
|
||||
# @memo, message = cs.create_feedback params, @user
|
||||
# end
|
||||
# respond_to do |format|
|
||||
# format.js
|
||||
# end
|
||||
# end
|
||||
#
|
||||
# def forum_create_memo
|
||||
# @memo = Memo.new
|
||||
# @my_forums_count = Forum.where(:creator_id => User.current.id).count
|
||||
# @my_memos_count = Memo.where(:author_id => User.current.id).count
|
||||
# @forums = Forum.reorder("topic_count desc,updated_at desc")
|
||||
# respond_to do |format|
|
||||
# format.js
|
||||
# format.html {render layout: 'base_new_forum'}
|
||||
# end
|
||||
# end
|
||||
#
|
||||
# def create_memo
|
||||
# @memo = Memo.new(params[:memo])
|
||||
# @memo.forum_id = @forum.id
|
||||
# @memo.author_id = User.current.id
|
||||
#
|
||||
# @memo.save_attachments(params[:attachments] || (params[:memo] && params[:memo][:uploads]))
|
||||
#
|
||||
# respond_to do |format|
|
||||
# if @memo.save
|
||||
# if params[:asset_id]
|
||||
# ids = params[:asset_id].split(',')
|
||||
# update_kindeditor_assets_owner ids ,@memo.id,OwnerTypeHelper::MEMO
|
||||
# end
|
||||
# #end
|
||||
# format.html { redirect_to (forum_memo_url(@forum, (@memo.parent_id.nil? ? @memo : @memo.parent_id))), notice: "#{l :label_memo_create_succ}" }
|
||||
# format.json { render json: @memo, status: :created, location: @memo }
|
||||
# else
|
||||
# sort_init 'updated_at', 'desc'
|
||||
# sort_update 'created_at' => "#{Memo.table_name}.created_at",
|
||||
# 'replies' => "#{Memo.table_name}.replies_count",
|
||||
# 'updated_at' => "COALESCE (last_replies_memos.created_at, #{Memo.table_name}.created_at)"
|
||||
#
|
||||
# @topic_count = @forum.topics.count
|
||||
# @topic_pages = Paginator.new @topic_count, per_page_option, params['page']
|
||||
# @memos = @forum.topics.
|
||||
# reorder("#{Memo.table_name}.sticky DESC").
|
||||
# includes(:last_reply).
|
||||
# limit(@topic_pages.per_page).
|
||||
# offset(@topic_pages.offset).
|
||||
# order(sort_clause).
|
||||
# preload(:author, {:last_reply => :author}).
|
||||
# all
|
||||
# @memos
|
||||
# flash.now[:error] = "#{l :label_memo_create_fail}: #{@memo.errors.full_messages[0]}"
|
||||
# # back_error_page = @memo.parent_id.nil? ? forum_path(@forum) : forum_memo_path(@forum, @memo.parent_id)
|
||||
# format.html { render action: :show, layout: 'base_forums' }#, error: "#{l :label_memo_create_fail}: #{@memo.errors.full_messages[0]}" }
|
||||
# format.json { render json: @memo.errors, status: :unprocessable_entity }
|
||||
# end
|
||||
# end
|
||||
# end
|
||||
#
|
||||
# # id: 1 问题反馈 3 操作指南 5 技术分享
|
||||
# def index
|
||||
#
|
||||
# render "/common/index", :layout => false
|
||||
# end
|
||||
#
|
||||
# # GET /forums/1
|
||||
# # GET /forums/1.json
|
||||
# def show
|
||||
# # sort_init 'updated_at', 'desc'
|
||||
# # sort_update 'created_at' => "#{Memo.table_name}.created_at",
|
||||
# # 'replies' => "#{Memo.table_name}.replies_count",
|
||||
# # 'updated_at' => "COALESCE (last_replies_memos.created_at, #{Memo.table_name}.created_at)"
|
||||
# order = ""
|
||||
# @order_str = ""
|
||||
# if(params[:reorder_complex])
|
||||
# order = "#{Memo.table_name}.sticky desc, last_replies_memos.created_at #{params[:reorder_complex]}, #{Memo.table_name}.created_at #{params[:reorder_complex]}"
|
||||
# @order_str = "reorder_complex="+params[:reorder_complex]
|
||||
# elsif(params[:reorder_popu])
|
||||
# order = "#{Memo.table_name}.sticky desc, replies_count #{params[:reorder_popu]}"
|
||||
# @order_str = "reorder_popu="+params[:reorder_popu]
|
||||
# elsif(params[:reorder_time])
|
||||
# order = "#{Memo.table_name}.sticky desc, #{Memo.table_name}.updated_at #{params[:reorder_time]}"
|
||||
# @order_str = "reorder_time="+params[:reorder_time]
|
||||
# else
|
||||
# order = "#{Memo.table_name}.sticky desc, #{Memo.table_name}.updated_at desc"
|
||||
# @order_str = "reorder_time=desc"
|
||||
# end
|
||||
# @memo = Memo.new(:forum => @forum)
|
||||
# @topic_count = @forum.topics.count
|
||||
# @limit = 20
|
||||
# @is_remote = true
|
||||
# @topic_pages = Paginator.new @topic_count, @limit, params['page'] || 1
|
||||
# @memos = paginateHelper @forum.topics.includes(:last_reply).reorder(order).preload(:author, {:last_reply => :author}), @limit
|
||||
# @my_topic_count = Memo.where("forum_id = #{@memo.forum_id} and parent_id is null").count
|
||||
# @my_replies_count = Memo.where("forum_id = #{@memo.forum_id} and parent_id is not null").count
|
||||
# @errors = params[:errors]
|
||||
# # 推荐贴吧
|
||||
# @forums = Forum.where("id !=?", @forum.id).reorder("topic_count desc,updated_at desc").first(3)
|
||||
# respond_to do |format|
|
||||
# format.js
|
||||
# format.html {
|
||||
# render :layout => 'base_new_forum'
|
||||
# }# show.html.erb
|
||||
# format.json { render json: @forum }
|
||||
# end
|
||||
# end
|
||||
#
|
||||
# # GET /forums/new
|
||||
# # GET /forums/new.json
|
||||
# def new
|
||||
# @forum = Forum.new
|
||||
# respond_to do |format|
|
||||
# format.html # new.html.erb
|
||||
# format.js
|
||||
# format.json { render json: @forum }
|
||||
# end
|
||||
# end
|
||||
#
|
||||
# # GET /forums/1/edit
|
||||
# def edit
|
||||
# @forum = Forum.find(params[:id])
|
||||
# respond_to do |format|
|
||||
# format.html
|
||||
# format.js
|
||||
# end
|
||||
# end
|
||||
#
|
||||
# # POST /forums
|
||||
# # POST /forums.json
|
||||
# def create
|
||||
# @forum = Forum.new(params[:forum])
|
||||
# @forum.creator_id = User.current.id
|
||||
# if @forum.save
|
||||
# # Time 2015-03-24 17:07:05
|
||||
# # Author lizanle
|
||||
# # Description after save后需要进行资源记录的更新
|
||||
# # owner_type = 2 对应的是 forum
|
||||
# @save_flag = true
|
||||
# if params[:asset_id]
|
||||
# ids = params[:asset_id].split(',')
|
||||
# update_kindeditor_assets_owner ids, @forum.id, OwnerTypeHelper::FORUM
|
||||
# end
|
||||
# #end
|
||||
# respond_to do |format|
|
||||
# format.js{ redirect_to forums_path, notice: l(:label_forum_create_succ)}
|
||||
# format.html { redirect_to @forum, notice: l(:label_forum_create_succ) }
|
||||
# format.json { render json: @forum, status: :created, location: @forum }
|
||||
# end
|
||||
# else
|
||||
# @save_flag=false
|
||||
# respond_to do |format|
|
||||
# flash.now[:error] = "#{l :label_forum_create_fail}: #{@forum.errors.full_messages[0]}"
|
||||
# format.js
|
||||
# format.html { render action: "new" }
|
||||
# format.json { render json: @forum.errors, status: :unprocessable_entity }
|
||||
# end
|
||||
# end
|
||||
# end
|
||||
#
|
||||
# # PUT /forums/1
|
||||
# # PUT /forums/1.json
|
||||
# def update
|
||||
# @forum = Forum.find(params[:id])
|
||||
# respond_to do |format|
|
||||
# if @forum.update_attributes(params[:forum])
|
||||
# format.js
|
||||
# format.html { redirect_to @forum, notice: l(:label_forum_update_succ) }
|
||||
# format.json { head :no_content }
|
||||
# else
|
||||
# flash.now[:error] = "#{l :label_forum_update_fail}: #{@forum.errors.full_messages[0]}"
|
||||
# format.js
|
||||
# format.html { render action: "edit" }
|
||||
# format.json { render json: @forum.errors, status: :unprocessable_entity }
|
||||
# end
|
||||
# end
|
||||
# end
|
||||
#
|
||||
# # DELETE /forums/1
|
||||
# # DELETE /forums/1.json
|
||||
# def destroy
|
||||
# @forum = Forum.find(params[:id])
|
||||
# @forum.destroy
|
||||
#
|
||||
# respond_to do |format|
|
||||
# format.html { redirect_to forums_url }
|
||||
# format.json { head :no_content }
|
||||
# end
|
||||
# end
|
||||
#
|
||||
# # 更新贴吧描述
|
||||
# def update_memo_description
|
||||
# @forum = Forum.find(params[:id])
|
||||
# if @forum.blank?
|
||||
# result = { :result => false }
|
||||
# else
|
||||
# forum_decription = params[:forum][:description]
|
||||
# @forum.update_attributes(:description => forum_decription )
|
||||
# result = { :result => true }
|
||||
# end
|
||||
# render :json => result
|
||||
# end
|
||||
#
|
||||
# def search_forum
|
||||
# # @forums = paginateHelper Forum.where("name LIKE '%#{params[:name]}%'")
|
||||
# q = "%#{params[:name].strip}%"
|
||||
# (redirect_to forums_url, :notice => l(:label_sumbit_empty);return) if params[:name].blank?
|
||||
# @offset, @limit = api_offset_and_limit({:limit => 10})
|
||||
# @forums_all = Forum.where("name LIKE ?", q)
|
||||
# @forums_count = @forums_all.count
|
||||
# @forums_pages = Paginator.new @forums_count, @limit, params['page']
|
||||
#
|
||||
# @offset ||= @forums_pages.offset
|
||||
# @forums = @forums_all.offset(@offset).limit(@limit).all
|
||||
# respond_to do |format|
|
||||
# format.html {
|
||||
# render 'index'
|
||||
# }
|
||||
# format.json { render json: @forums }
|
||||
# end
|
||||
# end
|
||||
#
|
||||
# def search_memo
|
||||
# q = "%#{params[:name].strip}%"
|
||||
#
|
||||
# limit = PageLimit
|
||||
# @memo = Memo.new
|
||||
# @offset, @limit = api_offset_and_limit({:limit => limit})
|
||||
# @forum = Forum.find(params[:id])
|
||||
# @memos_all = @forum.topics.where("subject LIKE ?", q)
|
||||
# @topic_count = @memos_all.count
|
||||
# @topic_pages = Paginator.new @topic_count, @limit, params['page']
|
||||
#
|
||||
# @offset ||= @topic_pages.offset
|
||||
# @memos = @memos_all.offset(@offset).limit(@limit).all
|
||||
# respond_to do |format|
|
||||
# format.html {
|
||||
# render 'show', :layout => 'base_forums'
|
||||
# }
|
||||
# format.json { render json: @forum }
|
||||
# end
|
||||
# end
|
||||
#
|
||||
# #检查forum的名字
|
||||
# def check_forum_name
|
||||
# begin
|
||||
# forum_name = params[:forum_name]
|
||||
# if params[:forum_id]
|
||||
# result = Forum.where("name = '#{forum_name}' and id != #{params[:forum_id]}").first.blank? ? {:result => true} : {:result => false}
|
||||
# else
|
||||
# result = Forum.where(:name => forum_name).first.blank? ? {:result => true} : {:result => false}
|
||||
# end
|
||||
# rescue Exception => e
|
||||
# puts e
|
||||
# end
|
||||
# render :json => result
|
||||
# # if params[:forum_id]
|
||||
# # forum_name_exist = Forum.where("name = '#{params[:forum_name]}' and id != #{params[:forum_id]}").count >= 1 ? true : false
|
||||
# # else
|
||||
# # forum_name_exist = Forum.where("name = '#{params[:forum_name]}' ").count >= 1 ? true : false
|
||||
# # end
|
||||
# # render :text => forum_name_exist
|
||||
# end
|
||||
#
|
||||
#
|
||||
#
|
||||
#
|
||||
# #添加论坛tag
|
||||
# def add_forum_tag
|
||||
# @forum = Forum.find(params[:id])
|
||||
# unless @forum.nil?
|
||||
# @forum.tag_list.add(params[:tag_str].split(','))
|
||||
# @forum.save
|
||||
# end
|
||||
# respond_to do |format|
|
||||
# format.js {render :delete_forum_tag}
|
||||
# end
|
||||
# end
|
||||
#
|
||||
# #删除forum的tag
|
||||
# def delete_forum_tag
|
||||
# @tag_id = (ActsAsTaggableOn::Tag.find_by_name(params[:tag_name])).id
|
||||
# #forum的taggable_type = 5
|
||||
# @taggings = ActsAsTaggableOn::Tagging.find_by_tag_id_and_taggable_id_and_taggable_type(@tag_id,params[:id],'Forum')
|
||||
#
|
||||
# unless @taggings.nil?
|
||||
# @taggings.delete
|
||||
# end
|
||||
#
|
||||
# # 是否还有其他记录 引用了 tag_id
|
||||
# @tagging = ActsAsTaggableOn::Tagging.find_by_tag_id(@tag_id)
|
||||
# # 如果taggings表中记录已经不存在 ，那么检查tags表 作删除动作
|
||||
# if @tagging.nil?
|
||||
# @tag = ActsAsTaggableOn::Tag.find_by_id(@tag_id)
|
||||
# @tag.delete unless @tag.nil?
|
||||
# end
|
||||
# @forum = Forum.find(params[:id])
|
||||
# respond_to do |format|
|
||||
# format.js
|
||||
# end
|
||||
# end
|
||||
#
|
||||
# private
|
||||
#
|
||||
# def find_forum_if_available
|
||||
# @forum = Forum.find(params[:id]) if params[:id]
|
||||
# rescue ActiveRecord::RecordNotFound
|
||||
# render_404
|
||||
# nil
|
||||
# end
|
||||
#
|
||||
# def authenticate_user_edit
|
||||
# find_forum_if_available
|
||||
# render_403 unless @forum.editable_by? User.current
|
||||
# end
|
||||
#
|
||||
# def authenticate_user_destroy
|
||||
# find_forum_if_available
|
||||
# render_403 unless @forum.destroyable_by? User.current
|
||||
# end
|
||||
# end
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
class Helps::FaqsController < ApplicationController
|
||||
skip_before_action :check_sign, :user_setup
|
||||
|
||||
def index
|
||||
faqs = Faq.select_without_id.order(updated_at: :desc)
|
||||
render json: faqs.as_json(:except => [:id])
|
||||
end
|
||||
end
|
||||
|
|
@ -4,18 +4,18 @@ class HooksController < ApplicationController
|
|||
before_action :check_user
|
||||
before_action :set_repository
|
||||
|
||||
def index
|
||||
hooks_response = Gitea::Hooks::ListService.new(@user.gitea_token, @user.login, @repository.try(:identifier)).call
|
||||
if hooks_response.status == 200
|
||||
def index
|
||||
hooks_response = Gitea::Hooks::ListService.new(@user, @repository.try(:identifier)).call
|
||||
if hooks_response.status == 200
|
||||
lists = JSON.parse(hooks_response.body)
|
||||
@hooks_size = lists.size
|
||||
@hooks = paginate(lists)
|
||||
else
|
||||
else
|
||||
normal_status(-1, "出现错误")
|
||||
end
|
||||
end
|
||||
|
||||
def create
|
||||
def create
|
||||
#根据gitea的api
|
||||
# hook_params = {
|
||||
# active: true,
|
||||
|
|
@ -36,17 +36,17 @@ class HooksController < ApplicationController
|
|||
# content_type: params[:content_type].to_i,
|
||||
# secret: params[:secret],
|
||||
# events: {
|
||||
# push_only: params[:push_only] || false, # 是否为推送事件
|
||||
# send_everything: params[:send_everything] || false, #是否为所有事件
|
||||
# push_only: params[:push_only] || false, # 是否为推送事件
|
||||
# send_everything: params[:send_everything] || false, #是否为所有事件
|
||||
# choose_events: params[:choose_events] || false, #是否为自定义事件
|
||||
# branch_filter: params[:branch_filter] || "*",
|
||||
# events: {
|
||||
# create: params[:create] || false, #创建分支/标签
|
||||
# delete: params[:delete] || false, #删除分支/标签
|
||||
# fork: params[:fork] || false, #仓库被派生
|
||||
# delete: params[:delete] || false, #删除分支/标签
|
||||
# fork: params[:fork] || false, #仓库被派生
|
||||
# issues: params[:issues] || false, #工单
|
||||
# issue_comment: params[:issue_comment] || false, #评论
|
||||
# push: params[:push] || false # 推送
|
||||
# issue_comment: params[:issue_comment] || false, #评论
|
||||
# push: params[:push] || false # 推送
|
||||
# pull_request: params[:pull_request] || false #合并请求
|
||||
# repository: params[:repository] || false #仓库
|
||||
# release: params[:release] || false #版本发布
|
||||
|
|
@ -58,28 +58,28 @@ class HooksController < ApplicationController
|
|||
Gitea::Hooks::CreateService.new(@user, @repository.try(:identifier), hook_params).call #创建gitea的hook功能
|
||||
Gitea::Hooks::CreateService.new(user, p.try(:identifier), hook_params).call #创建gitea的hook功能
|
||||
|
||||
end
|
||||
end
|
||||
|
||||
def update
|
||||
def update
|
||||
hook_params = params[:hook_params]
|
||||
response = Gitea::Hooks::UpdateService.new(@user, @repository.try(:identifier), hook_params, params[:id]).call
|
||||
if response.status == 200
|
||||
if response.status == 200
|
||||
normal_status(1, "更新成功")
|
||||
else
|
||||
else
|
||||
normal_status(-1, "更新失败")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def destroy
|
||||
def destroy
|
||||
response = Gitea::Hooks::DestroyService.new(@user, @repository.try(:identifier), params[:id]).call
|
||||
if response.status == 204
|
||||
normal_status(1, "删除成功")
|
||||
else
|
||||
else
|
||||
normal_status(-1, "删除失败")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
private
|
||||
|
||||
def set_repository
|
||||
@repository = @project.repository
|
||||
|
|
@ -88,9 +88,9 @@ class HooksController < ApplicationController
|
|||
normal_status(-1, "用户不存在") unless @user.present?
|
||||
end
|
||||
|
||||
def check_user
|
||||
unless @project.user_id == current_user.id
|
||||
tip_exception(403, "您没有权限进入")
|
||||
def check_user
|
||||
unless @project.user_id == current_user.id
|
||||
tip_exception(403, "您没有权限进入")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -7,6 +7,9 @@ class IssueTagsController < ApplicationController
|
|||
|
||||
|
||||
def index
|
||||
order_name = params[:order_name] || "created_at"
|
||||
order_type = params[:order_type] || "desc"
|
||||
|
||||
issue_tags = @project.issue_tags.order("#{order_name} #{order_type}")
|
||||
@user_admin_or_member = current_user.present? && (current_user.admin || @project.member?(current_user))
|
||||
@page = params[:page] || 1
|
||||
|
|
@ -135,14 +138,4 @@ class IssueTagsController < ApplicationController
|
|||
end
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def order_name
|
||||
IssueTag.column_names.include?(params[:order_name]) ? params[:order_name] : 'created_at'
|
||||
end
|
||||
|
||||
def order_type
|
||||
%w(desc asc).include?(params[:order_type]) ? params[:order_type] : 'desc'
|
||||
end
|
||||
|
||||
end
|
||||
|
|
|
|||
|
|
@ -6,26 +6,21 @@ class IssuesController < ApplicationController
|
|||
before_action :check_project_public, only: [:index ,:show, :copy, :index_chosen, :close_issue]
|
||||
|
||||
before_action :set_issue, only: [:edit, :update, :destroy, :show, :copy, :close_issue, :lock_issue]
|
||||
before_action :check_token_enough, only: [:create, :update]
|
||||
before_action :get_branches, only: [:new, :edit]
|
||||
|
||||
include ApplicationHelper
|
||||
include TagChosenHelper
|
||||
|
||||
def index
|
||||
return render_not_found unless @project.has_menu_permission("issues")
|
||||
@user_admin_or_member = current_user.present? && current_user.logged? && (current_user.admin || @project.member?(current_user))
|
||||
issues = @project.issues.issue_issue.issue_index_includes
|
||||
issues = issues.where(is_private: false) unless @user_admin_or_member
|
||||
|
||||
@all_issues = issues
|
||||
@filter_issues = @all_issues
|
||||
@filter_issues = @filter_issues.where.not(status_id: IssueStatus::CLOSED) if params[:status_type].to_i == IssueStatus::ADD
|
||||
@filter_issues = @filter_issues.where(status_id: IssueStatus::CLOSED) if params[:status_type].to_i == IssueStatus::SOLVING
|
||||
@filter_issues = @filter_issues.where("subject LIKE ? OR description LIKE ? ", "%#{params[:search]}%", "%#{params[:search]}%") if params[:search].present?
|
||||
@open_issues = @all_issues.where.not(status_id: IssueStatus::CLOSED)
|
||||
@close_issues = @all_issues.where(status_id: IssueStatus::CLOSED)
|
||||
@assign_to_me = @filter_issues.where(assigned_to_id: current_user&.id)
|
||||
@my_published = @filter_issues.where(author_id: current_user&.id)
|
||||
@all_issues_size = issues.size
|
||||
@open_issues_size = issues.where.not(status_id: 5).size
|
||||
@close_issues_size = issues.where(status_id: 5).size
|
||||
@assign_to_me_size = issues.where(assigned_to_id: current_user&.id).size
|
||||
@my_published_size = issues.where(author_id: current_user&.id).size
|
||||
scopes = Issues::ListQueryService.call(issues,params.delete_if{|k,v| v.blank?}, "Issue")
|
||||
@issues_size = scopes.size
|
||||
@issues = paginate(scopes)
|
||||
|
|
@ -101,16 +96,80 @@ class IssuesController < ApplicationController
|
|||
end
|
||||
|
||||
def new
|
||||
@issue_chosen = get_associated_data(@project)
|
||||
@all_branches = get_branches
|
||||
@issue_chosen = issue_left_chosen(@project, nil)
|
||||
end
|
||||
|
||||
def create
|
||||
issue_params = issue_send_params(params)
|
||||
Issues::CreateForm.new({subject:issue_params[:subject]}).validate!
|
||||
@issue = Issue.new(issue_params)
|
||||
if @issue.save!
|
||||
if params[:attachment_ids].present?
|
||||
params[:attachment_ids].each do |id|
|
||||
if params[:subject].blank?
|
||||
normal_status(-1, "标题不能为空")
|
||||
elsif params[:subject].to_s.size > 255
|
||||
normal_status(-1, "标题不能超过255个字符")
|
||||
elsif (params[:issue_type].to_s == "2")
|
||||
return normal_status(-1, "悬赏的奖金必须大于0") if params[:token].to_i == 0
|
||||
|
||||
else
|
||||
issue_params = issue_send_params(params)
|
||||
|
||||
@issue = Issue.new(issue_params)
|
||||
if @issue.save!
|
||||
if params[:attachment_ids].present?
|
||||
params[:attachment_ids].each do |id|
|
||||
attachment = Attachment.select(:id, :container_id, :container_type)&.find_by_id(id)
|
||||
unless attachment.blank?
|
||||
attachment.container = @issue
|
||||
attachment.author_id = current_user.id
|
||||
attachment.description = ""
|
||||
attachment.save
|
||||
end
|
||||
end
|
||||
end
|
||||
if params[:issue_tag_ids].present?
|
||||
params[:issue_tag_ids].each do |tag|
|
||||
IssueTagsRelate.create!(issue_id: @issue.id, issue_tag_id: tag)
|
||||
end
|
||||
end
|
||||
if params[:assigned_to_id].present?
|
||||
Tiding.create!(user_id: params[:assigned_to_id], trigger_user_id: current_user.id,
|
||||
container_id: @issue.id, container_type: 'Issue',
|
||||
parent_container_id: @project.id, parent_container_type: "Project",
|
||||
tiding_type: 'issue', status: 0)
|
||||
end
|
||||
|
||||
@issue.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "create")
|
||||
# normal_status(0, "创建成功",)
|
||||
render :json => { status: 0, message: "创建成功", id: @issue.id}
|
||||
else
|
||||
normal_status(-1, "创建失败")
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
def edit
|
||||
# @all_branches = get_branches
|
||||
# @issue_chosen = issue_left_chosen(@project, @issue.id)
|
||||
@issue_attachments = @issue.attachments
|
||||
end
|
||||
|
||||
def update
|
||||
issue_params = issue_send_params(params).except(:issue_classify, :author_id, :project_id)
|
||||
return normal_status(-1, "您没有权限修改token") if @issue.will_save_change_to_token? && @issue.user_id != current_user&.id
|
||||
if params[:issue_tag_ids].present? && !@issue&.issue_tags_relates.where(issue_tag_id: params[:issue_tag_ids]).exists?
|
||||
@issue&.issue_tags_relates&.destroy_all
|
||||
params[:issue_tag_ids].each do |tag|
|
||||
IssueTagsRelate.create(issue_id: @issue.id, issue_tag_id: tag)
|
||||
end
|
||||
end
|
||||
|
||||
if @issue.update_attributes(issue_params)
|
||||
issue_files = params[:attachment_ids]
|
||||
change_files = false
|
||||
issue_file_ids = []
|
||||
|
||||
if issue_files.present?
|
||||
change_files = true
|
||||
issue_files.each do |id|
|
||||
attachment = Attachment.select(:id, :container_id, :container_type)&.find_by_id(id)
|
||||
unless attachment.blank?
|
||||
attachment.container = @issue
|
||||
|
|
@ -120,65 +179,6 @@ class IssuesController < ApplicationController
|
|||
end
|
||||
end
|
||||
end
|
||||
if params[:issue_tag_ids].present?
|
||||
params[:issue_tag_ids].each do |tag|
|
||||
IssueTagsRelate.create!(issue_id: @issue.id, issue_tag_id: tag)
|
||||
end
|
||||
end
|
||||
if params[:assigned_to_id].present?
|
||||
Tiding.create!(user_id: params[:assigned_to_id], trigger_user_id: current_user.id,
|
||||
container_id: @issue.id, container_type: 'Issue',
|
||||
parent_container_id: @project.id, parent_container_type: "Project",
|
||||
tiding_type: 'issue', status: 0)
|
||||
end
|
||||
|
||||
#为悬赏任务时, 扣除当前用户的积分
|
||||
if params[:issue_type].to_s == "2"
|
||||
post_to_chain("minus", params[:token].to_i, current_user.try(:login))
|
||||
end
|
||||
|
||||
@issue.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "create")
|
||||
render json: {status: 0, message: "创建成", id: @issue.id}
|
||||
else
|
||||
normal_status(-1, "创建失败")
|
||||
end
|
||||
rescue Exception => exception
|
||||
puts exception.message
|
||||
normal_status(-1, exception.message)
|
||||
end
|
||||
|
||||
def edit
|
||||
# @issue_chosen = issue_left_chosen(@project, @issue.id)
|
||||
@cannot_edit_tags = @issue.issue_type=="2" && @issue.status_id == 5 #悬赏任务已解决且关闭的状态下，不能修改
|
||||
@issue_attachments = @issue.attachments
|
||||
end
|
||||
|
||||
def update
|
||||
last_token = @issue.token
|
||||
last_status_id = @issue.status_id
|
||||
if params[:issue_tag_ids].present? && !@issue&.issue_tags_relates.where(issue_tag_id: params[:issue_tag_ids]).exists?
|
||||
@issue&.issue_tags_relates&.destroy_all
|
||||
params[:issue_tag_ids].each do |tag|
|
||||
IssueTagsRelate.create(issue_id: @issue.id, issue_tag_id: tag)
|
||||
end
|
||||
end
|
||||
|
||||
issue_files = params[:attachment_ids]
|
||||
change_files = false
|
||||
issue_file_ids = []
|
||||
|
||||
if issue_files.present?
|
||||
change_files = true
|
||||
issue_files.each do |id|
|
||||
attachment = Attachment.select(:id, :container_id, :container_type)&.find_by_id(id)
|
||||
unless attachment.blank?
|
||||
attachment.container = @issue
|
||||
attachment.author_id = current_user.id
|
||||
attachment.description = ""
|
||||
attachment.save
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
# if params[:issue_tag_ids].present?
|
||||
# issue_current_tags = @issue&.issue_tags&.select(:id)&.pluck(:id)
|
||||
|
|
@ -194,39 +194,17 @@ class IssuesController < ApplicationController
|
|||
# end
|
||||
# end
|
||||
|
||||
if @issue.issue_type.to_s == "2" && params[:status_id].to_i == 5 && @issue.author_id != current_user.try(:id)
|
||||
normal_status(-1, "不允许修改为关闭状态")
|
||||
else
|
||||
issue_params = issue_send_params(params).except(:issue_classify, :author_id, :project_id)
|
||||
Issues::UpdateForm.new({subject:issue_params[:subject]}).validate!
|
||||
if @issue.update_attributes(issue_params)
|
||||
if params[:status_id].to_i == 5 #任务由非关闭状态到关闭状态时
|
||||
@issue.issue_times.update_all(end_time: Time.now)
|
||||
@issue.update_closed_issues_count_in_project!
|
||||
if @issue.issue_type.to_s == "2" && last_status_id != 5
|
||||
if @issue.assigned_to_id.present? && last_status_id == 3 #只有当用户完成100%时，才给token
|
||||
post_to_chain("add", @issue.token, @issue.get_assign_user.try(:login))
|
||||
else
|
||||
post_to_chain("add", @issue.token, @issue.user.try(:login))
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
if @issue.issue_type.to_s == "2" && @issue.status_id != 5 && @issue.saved_change_to_attribute("token")
|
||||
#表示修改token值
|
||||
change_token = last_token - @issue.token
|
||||
change_type = change_token > 0 ? "add" : "minus"
|
||||
post_to_chain(change_type, change_token.abs, current_user.try(:login))
|
||||
end
|
||||
@issue.create_journal_detail(change_files, issue_files, issue_file_ids, current_user&.id)
|
||||
normal_status(0, "更新成功")
|
||||
else
|
||||
normal_status(-1, "更新失败")
|
||||
if params[:status_id].to_i == 5
|
||||
@issue.issue_times.update_all(end_time: Time.now)
|
||||
# @issue.update_closed_issues_count_in_project! #已经有after_update方法了，这里就不需要了
|
||||
end
|
||||
|
||||
@issue.create_journal_detail(change_files, issue_files, issue_file_ids, current_user&.id)
|
||||
normal_status(0, "更新成功")
|
||||
else
|
||||
normal_status(-1, "更新失败")
|
||||
end
|
||||
rescue Exception => exception
|
||||
puts exception.message
|
||||
normal_status(-1, exception.message)
|
||||
|
||||
end
|
||||
|
||||
def show
|
||||
|
|
@ -246,32 +224,17 @@ class IssuesController < ApplicationController
|
|||
end
|
||||
|
||||
def destroy
|
||||
begin
|
||||
issue_type = @issue.issue_type
|
||||
status_id = @issue.status_id
|
||||
token = @issue.token
|
||||
login = @issue.user.try(:login)
|
||||
if @issue.destroy
|
||||
if issue_type == "2" && status_id != 5
|
||||
post_to_chain("add", token, login)
|
||||
end
|
||||
normal_status(0, "删除成功")
|
||||
else
|
||||
normal_status(-1, "删除失败")
|
||||
end
|
||||
rescue => exception
|
||||
Rails.logger.info("#########_______exception.message_________##########{exception.message}")
|
||||
normal_status(-1, "删除失败")
|
||||
if @issue.destroy
|
||||
normal_status(0, "删除成功")
|
||||
else
|
||||
normal_status(-1, "删除失败")
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
def clean
|
||||
#批量删除，暂时只能删除未悬赏的
|
||||
issue_ids = params[:ids]
|
||||
if issue_ids.present?
|
||||
if Issue.where(id: issue_ids, issue_type: "1").destroy_all
|
||||
if Issue.where(id: issue_ids).destroy_all
|
||||
normal_status(0, "删除成功")
|
||||
else
|
||||
normal_status(-1, "删除失败")
|
||||
|
|
@ -343,9 +306,6 @@ class IssuesController < ApplicationController
|
|||
if type == 5
|
||||
@issue&.project_trends&.update_all(action_type: "close")
|
||||
@issue.issue_times.update_all(end_time: Time.now)
|
||||
if @issue.issue_type.to_s == "2"
|
||||
post_to_chain("add", @issue.token, @issue.get_assign_user.try(:login))
|
||||
end
|
||||
if @issue.issue_classify.to_s == "pull_request"
|
||||
@issue&.pull_request&.update_attribute(:status, 2)
|
||||
end
|
||||
|
|
@ -439,6 +399,17 @@ class IssuesController < ApplicationController
|
|||
tracker_array
|
||||
end
|
||||
|
||||
def get_branches
|
||||
all_branches = []
|
||||
get_all_branches = Gitea::Repository::Branches::ListService.new(@user, @project&.repository.try(:identifier)).call
|
||||
if get_all_branches && get_all_branches.size > 0
|
||||
get_all_branches.each do |b|
|
||||
all_branches.push(b["name"])
|
||||
end
|
||||
end
|
||||
all_branches
|
||||
end
|
||||
|
||||
def issue_send_params(params)
|
||||
{
|
||||
subject: params[:subject],
|
||||
|
|
@ -463,32 +434,4 @@ class IssuesController < ApplicationController
|
|||
project_id: @project.id
|
||||
}
|
||||
end
|
||||
|
||||
def post_to_chain(type, amount,login)
|
||||
change_params = {
|
||||
type: type,
|
||||
chain_params: {
|
||||
amount: amount,
|
||||
reponame: @project.try(:identifier),
|
||||
username: login
|
||||
}
|
||||
}
|
||||
PostChainJob.perform_later(change_params)
|
||||
end
|
||||
|
||||
def check_token_enough
|
||||
if params[:issue_type].to_s == "2" && (@issue.blank? || (@issue.present? && @issue.author_id == current_user.try(:id)))
|
||||
return normal_status(-1, "悬赏的奖金必须大于0") if params[:token].to_i == 0
|
||||
query_params = {
|
||||
type: "query",
|
||||
chain_params: {
|
||||
reponame: @project.try(:identifier),
|
||||
username: current_user.try(:login)
|
||||
}
|
||||
}
|
||||
response = Gitea::Chain::ChainGetService.new(query_params).call
|
||||
return normal_status(-1, "获取token失败，请稍后重试") if response.status != 200
|
||||
return normal_status(-1, "您的token值不足") if JSON.parse(response.body)["balance"].to_i < params[:token].to_i
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ class MainController < ApplicationController
|
|||
protect_from_forgery except: :index
|
||||
skip_before_action :check_sign
|
||||
skip_before_action :user_setup
|
||||
skip_before_action :setup_laboratory
|
||||
# skip_before_action :setup_laboratory
|
||||
|
||||
def first_stamp
|
||||
render :json => { status: 0, message: Time.now.to_i }
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ class MembersController < ApplicationController
|
|||
scope = @project.members.includes(:roles, user: :user_extension)
|
||||
search = params[:search].to_s.downcase
|
||||
role = params[:role].to_s
|
||||
scope = scope.joins(:user).merge(User.like(search))
|
||||
scope = scope.joins(:user).where("LOWER(concat(users.lastname, users.firstname, users.login, users.mail)) LIKE ?", "%#{search.split(" ").join('|')}%") if search.present?
|
||||
scope = scope.joins(:roles).where("roles.name LIKE ?", "%#{role}%") if role.present?
|
||||
|
||||
@total_count = scope.size
|
||||
|
|
@ -47,7 +47,7 @@ class MembersController < ApplicationController
|
|||
end
|
||||
|
||||
def member_exists?
|
||||
@project.members.exists?(params[:user_id])
|
||||
@project.member?(params[:user_id])
|
||||
end
|
||||
|
||||
def operate!
|
||||
|
|
@ -59,6 +59,6 @@ class MembersController < ApplicationController
|
|||
end
|
||||
|
||||
def check_member_not_exists!
|
||||
return render_result(1, "user_id为#{params[:user_id]}的用户还不是项目成员") unless @project.member?(params[:user_id])
|
||||
return render_result(1, "user_id为#{params[:user_id]}的用户还不是项目成员") unless member_exists?
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -0,0 +1,109 @@
|
|||
class MemosController < ApplicationController
|
||||
before_action :require_login, only: [:create, :edit, :update, :watch_memo]
|
||||
|
||||
def index
|
||||
memos = MemosService.new.index params, current_user
|
||||
render json: memos
|
||||
end
|
||||
|
||||
def related_memos
|
||||
targets = MemosService.new.related_memos params, current_user
|
||||
render json: targets
|
||||
end
|
||||
|
||||
def edit
|
||||
targets = MemosService.new.edit params, current_user
|
||||
render json: targets
|
||||
end
|
||||
|
||||
def update
|
||||
targets = MemosService.new.update params, current_user
|
||||
render json: targets
|
||||
end
|
||||
|
||||
def create
|
||||
params.permit!
|
||||
targets = MemosService.new.create params, current_user
|
||||
render json: targets
|
||||
end
|
||||
|
||||
def show
|
||||
targets = MemosService.new.show params, current_user
|
||||
render json: targets
|
||||
end
|
||||
|
||||
def watch_memo
|
||||
targets = MemosService.new.watch_memo params, current_user
|
||||
render json: targets
|
||||
end
|
||||
|
||||
def hidden
|
||||
Memo.find(params[:id]).update_attribute(:hidden, true)
|
||||
{status: 0, message: "隐藏成功"}
|
||||
end
|
||||
|
||||
def memo_hidden
|
||||
targets = MemosService.new.memo_hidden params, current_user
|
||||
render json: targets
|
||||
end
|
||||
|
||||
def reply
|
||||
targets = MemosService.new.reply params, current_user
|
||||
render json: targets
|
||||
end
|
||||
|
||||
def destroy
|
||||
targets = MemosService.new.destroy params, current_user
|
||||
render json: targets
|
||||
end
|
||||
|
||||
def set_top_or_down
|
||||
targets = MemosService.new.set_top_or_down params, current_user
|
||||
render json: targets
|
||||
end
|
||||
|
||||
def is_fine
|
||||
targets = MemosService.new.is_fine params, current_user
|
||||
render json: targets
|
||||
end
|
||||
|
||||
def banned_user
|
||||
targets = MemosService.new.banned_user params, current_user
|
||||
render json: targets
|
||||
end
|
||||
|
||||
def more_reply
|
||||
targets = MemosService.new.more_reply params, current_user
|
||||
render json: targets
|
||||
end
|
||||
|
||||
def forum_memos
|
||||
targets = MemosService.new.forum_memos params, current_user
|
||||
render json: targets
|
||||
end
|
||||
|
||||
def forum_memos_head
|
||||
targets = MemosService.new.forum_memos_head params, current_user
|
||||
render json: targets
|
||||
end
|
||||
|
||||
def forum_memos_right
|
||||
targets = MemosService.new.forum_memos_right params, current_user
|
||||
render json: targets
|
||||
end
|
||||
|
||||
def is_watch
|
||||
targets = MemosService.new.is_watch params, current_user
|
||||
render json: targets
|
||||
end
|
||||
|
||||
def confirm_delete
|
||||
targets = MemosService.new.confirm_delete params, current_user
|
||||
render json: targets
|
||||
end
|
||||
|
||||
def plus
|
||||
targets = MemosService.new.plus params, current_user
|
||||
render json: targets
|
||||
end
|
||||
end
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
class MyMemosController < ApplicationController
|
||||
|
||||
def index
|
||||
targets = MyMemosService.new.index params, current_user
|
||||
render json: targets
|
||||
end
|
||||
|
||||
def my_interested
|
||||
targets = MyMemosService.new.my_interested params, current_user
|
||||
render json: targets
|
||||
end
|
||||
|
||||
def replies_memos
|
||||
targets = MyMemosService.new.replies_memos params,current_user
|
||||
render json: targets
|
||||
end
|
||||
|
||||
def recommend_memos
|
||||
targets = MyMemosService.new.recommend_memos current_user
|
||||
render json: targets
|
||||
end
|
||||
end
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
class Organizations::BaseController < ApplicationController
|
||||
include ApplicationHelper
|
||||
include PaginateHelper
|
||||
|
||||
protected
|
||||
|
||||
def can_edit_org?
|
||||
current_user.admin? || @organization.is_owner?(current_user.id)
|
||||
end
|
||||
|
||||
def check_user_can_edit_org
|
||||
tip_exception("您没有权限进行该操作") unless can_edit_org?
|
||||
end
|
||||
|
||||
def org_limited_condition
|
||||
@organization.organization_extension.limited? && !current_user.logged?
|
||||
end
|
||||
|
||||
def org_privacy_condition
|
||||
return false if current_user.admin?
|
||||
@organization.organization_extension.privacy? && @organization.organization_users.where(user_id: current_user.id).blank?
|
||||
end
|
||||
|
||||
def team_not_found_condition
|
||||
!current_user&.admin? && @team.team_users.where(user_id: current_user.id).blank? && !@organization.is_owner?(current_user.id)
|
||||
end
|
||||
|
||||
def user_mark
|
||||
params[:username] || params[:id]
|
||||
end
|
||||
|
||||
def project_mark
|
||||
params[:repo_name] || params[:id]
|
||||
end
|
||||
end
|
||||
|
|
@ -1,57 +0,0 @@
|
|||
class Organizations::OrganizationUsersController < Organizations::BaseController
|
||||
before_action :load_organization
|
||||
before_action :load_operate_user, :load_organization_user, :check_user_can_edit_org, only: [:destroy]
|
||||
|
||||
def index
|
||||
@organization_users = @organization.organization_users.includes(:user)
|
||||
search = params[:search].to_s.downcase
|
||||
@organization_users = @organization_users.joins(:user).merge(User.like(search))
|
||||
|
||||
@organization_users = kaminari_paginate(@organization_users)
|
||||
end
|
||||
|
||||
def destroy
|
||||
tip_exception("您不能从所有者团队中删除最后一个用户") if @organization.is_owner_team_last_one?(@operate_user.id)
|
||||
ActiveRecord::Base.transaction do
|
||||
@organization_user.destroy!
|
||||
TeamUser.where(organization_id: @organization.id, user_id: @operate_user.id).map{|u| u.destroy!}
|
||||
Gitea::Organization::OrganizationUser::DeleteService.call(@organization.gitea_token, @organization.login, @operate_user.login)
|
||||
render_ok
|
||||
end
|
||||
rescue Exception => e
|
||||
uid_logger_error(e.message)
|
||||
tip_exception(e.message)
|
||||
end
|
||||
|
||||
def quit
|
||||
@organization_user = @organization.organization_users.find_by(user_id: current_user.id)
|
||||
tip_exception("您不在该组织中") if @organization_user.nil?
|
||||
tip_exception("您不能从所有者团队中删除最后一个用户") if @organization.is_owner_team_last_one?(current_user.id)
|
||||
ActiveRecord::Base.transaction do
|
||||
@organization_user.destroy!
|
||||
TeamUser.where(organization_id: @organization.id, user_id: current_user.id).map{|u| u.destroy!}
|
||||
Gitea::Organization::OrganizationUser::DeleteService.call(@organization.gitea_token, @organization.login, current_user.login)
|
||||
render_ok
|
||||
end
|
||||
rescue Exception => e
|
||||
uid_logger_error(e.message)
|
||||
tip_exception(e.message)
|
||||
end
|
||||
|
||||
private
|
||||
def load_organization
|
||||
@organization = Organization.find_by(login: params[:organization_id]) || Organization.find_by(id: params[:organization_id])
|
||||
return render_not_found("组织不存在") if @organization.nil?
|
||||
return render_forbidden("没有查看组织的权限") if org_limited_condition || org_privacy_condition
|
||||
end
|
||||
|
||||
def load_operate_user
|
||||
@operate_user = User.find_by(login: user_mark) if user_mark.present?
|
||||
tip_exception("平台用户不存在") if @operate_user.nil?
|
||||
end
|
||||
|
||||
def load_organization_user
|
||||
@organization_user = OrganizationUser.find_by(organization_id: @organization.id, user_id: @operate_user.id)
|
||||
tip_exception("组织成员不存在") if @organization_user.nil?
|
||||
end
|
||||
end
|
||||
|
|
@ -1,98 +0,0 @@
|
|||
class Organizations::OrganizationsController < Organizations::BaseController
|
||||
before_action :require_login, except: [:index, :show, :recommend]
|
||||
before_action :convert_image!, only: [:create, :update]
|
||||
before_action :load_organization, only: [:show, :update, :destroy]
|
||||
before_action :check_user_can_edit_org, only: [:update, :destroy]
|
||||
|
||||
def index
|
||||
if current_user.logged?
|
||||
logged_organizations_sql = Organization.with_visibility(%w(common limited)).to_sql
|
||||
privacy_organizations_sql = Organization.with_visibility("privacy").joins(:organization_users).where(organization_users: {user_id: current_user.id}).to_sql
|
||||
@organizations = Organization.from("( #{ logged_organizations_sql } UNION #{ privacy_organizations_sql } ) AS users")
|
||||
else
|
||||
@organizations = Organization.with_visibility("common")
|
||||
end
|
||||
@organizations = @organizations.ransack(login_cont: params[:search]).result if params[:search].present?
|
||||
@organizations = @organizations.includes(:organization_extension).order("organization_extensions.#{sort_by} #{sort_direction}")
|
||||
@organizations = kaminari_paginate(@organizations)
|
||||
end
|
||||
|
||||
def show
|
||||
@can_create_project = @organization.can_create_project?(current_user.id)
|
||||
@is_admin = can_edit_org?
|
||||
@is_member = @organization.is_member?(current_user.id)
|
||||
end
|
||||
|
||||
def create
|
||||
ActiveRecord::Base.transaction do
|
||||
Organizations::CreateForm.new(organization_params).validate!
|
||||
@organization = Organizations::CreateService.call(current_user, organization_params)
|
||||
Util.write_file(@image, avatar_path(@organization)) if params[:image].present?
|
||||
end
|
||||
rescue Exception => e
|
||||
uid_logger_error(e.message)
|
||||
tip_exception(e.message)
|
||||
end
|
||||
|
||||
def update
|
||||
ActiveRecord::Base.transaction do
|
||||
Organizations::CreateForm.new(organization_params).validate!
|
||||
login = @organization.login
|
||||
@organization.login = organization_params[:name] if organization_params[:name].present?
|
||||
@organization.nickname = organization_params[:nickname] if organization_params[:nickname].present?
|
||||
@organization.save!
|
||||
@organization.organization_extension.update_attributes!(organization_params.except(:name, :nickname))
|
||||
Gitea::Organization::UpdateService.call(@organization.gitea_token, login, @organization.reload)
|
||||
Util.write_file(@image, avatar_path(@organization)) if params[:image].present?
|
||||
end
|
||||
rescue Exception => e
|
||||
uid_logger_error(e.message)
|
||||
tip_exception(e.message)
|
||||
end
|
||||
|
||||
def destroy
|
||||
tip_exception("密码不正确") unless current_user.check_password?(password)
|
||||
ActiveRecord::Base.transaction do
|
||||
Gitea::Organization::DeleteService.call(@organization.gitea_token, @organization.login)
|
||||
@organization.destroy!
|
||||
end
|
||||
render_ok
|
||||
rescue Exception => e
|
||||
uid_logger_error(e.message)
|
||||
tip_exception(e.message)
|
||||
end
|
||||
|
||||
def recommend
|
||||
recommend = %W(xuos Huawei_Technology openatom_foundation pkecosystem TensorLayer)
|
||||
|
||||
@organizations = Organization.with_visibility(%w(common))
|
||||
.where(login: recommend).select(:id, :login, :firstname, :lastname, :nickname)
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def organization_params
|
||||
params.permit(:name, :description, :website, :location,
|
||||
:repo_admin_change_team_access, :visibility,
|
||||
:max_repo_creation, :nickname)
|
||||
end
|
||||
|
||||
def password
|
||||
params.fetch(:password, "")
|
||||
end
|
||||
|
||||
def load_organization
|
||||
@organization = Organization.find_by(login: params[:id]) || Organization.find_by(id: params[:id])
|
||||
return render_not_found("组织不存在") if @organization.nil?
|
||||
return render_forbidden("没有查看组织的权限") if org_limited_condition || org_privacy_condition
|
||||
end
|
||||
|
||||
def sort_by
|
||||
OrganizationExtension.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'created_at'
|
||||
end
|
||||
|
||||
def sort_direction
|
||||
%w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : 'desc'
|
||||
end
|
||||
|
||||
end
|
||||
|
|
@ -1,45 +0,0 @@
|
|||
class Organizations::ProjectsController < Organizations::BaseController
|
||||
before_action :load_organization
|
||||
|
||||
def index
|
||||
public_projects_sql = @organization.projects.where(is_public: true).to_sql
|
||||
private_projects_sql = @organization.projects
|
||||
.where(is_public: false)
|
||||
.joins(team_projects: {team: :team_users})
|
||||
.where(team_users: {user_id: current_user.id}).to_sql
|
||||
@projects = Project.from("( #{ public_projects_sql} UNION #{ private_projects_sql } ) AS projects")
|
||||
|
||||
@projects = @projects.ransack(name_or_identifier_cont: params[:search]).result if params[:search].present?
|
||||
@projects = @projects.includes(:owner).order("projects.#{sort} #{sort_direction}")
|
||||
@projects = paginate(@projects)
|
||||
end
|
||||
|
||||
def search
|
||||
tip_exception("请输入搜索关键词") if params[:search].nil?
|
||||
public_projects_sql = @organization.projects.where(is_public: true).to_sql
|
||||
private_projects_sql = @organization.projects
|
||||
.where(is_public: false)
|
||||
.joins(team_projects: {team: :team_users})
|
||||
.where(team_users: {user_id: current_user.id}).to_sql
|
||||
@projects = Project.from("( #{ public_projects_sql} UNION #{ private_projects_sql } ) AS projects")
|
||||
|
||||
@projects = @projects.ransack(name_or_identifier_cont: params[:search]).result
|
||||
@projects = @projects.includes(:owner).order("projects.#{sort} #{sort_direction}")
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def load_organization
|
||||
@organization = Organization.find_by(login: params[:organization_id]) || Organization.find_by(id: params[:organization_id])
|
||||
return render_not_found("组织不存在") if @organization.nil?
|
||||
return render_forbidden("没有查看组织的权限") if org_limited_condition || org_privacy_condition
|
||||
end
|
||||
|
||||
def sort
|
||||
Project.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'updated_on'
|
||||
end
|
||||
|
||||
def sort_direction
|
||||
%w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : 'desc'
|
||||
end
|
||||
end
|
||||
|
|
@ -1,58 +0,0 @@
|
|||
class Organizations::TeamProjectsController < Organizations::BaseController
|
||||
before_action :load_organization
|
||||
before_action :load_team
|
||||
before_action :load_operate_project, :check_user_can_edit_org, only: [:create, :destroy]
|
||||
before_action :load_team_project, only: [:destroy]
|
||||
|
||||
def index
|
||||
@team_projects = @team.team_projects
|
||||
|
||||
@team_projects = paginate(@team_projects)
|
||||
end
|
||||
|
||||
def create
|
||||
tip_exception("该组织团队项目包括组织所有项目,不允许更改") if @team.includes_all_project
|
||||
ActiveRecord::Base.transaction do
|
||||
@team_project = TeamProject.build(@organization.id, @team.id, @operate_project.id)
|
||||
Gitea::Organization::TeamProject::CreateService.call(@organization.gitea_token, @team.gtid, @organization.login, @operate_project.identifier)
|
||||
end
|
||||
rescue Exception => e
|
||||
uid_logger_error(e.message)
|
||||
tip_exception(e.message)
|
||||
end
|
||||
|
||||
def destroy
|
||||
tip_exception("该组织团队项目包括组织所有项目,不允许更改") if @team.includes_all_project
|
||||
ActiveRecord::Base.transaction do
|
||||
@team_project.destroy!
|
||||
Gitea::Organization::TeamProject::DeleteService.call(@organization.gitea_token, @team.gtid, @organization.login, @operate_project.identifier)
|
||||
render_ok
|
||||
end
|
||||
rescue Exception => e
|
||||
uid_logger_error(e.message)
|
||||
tip_exception(e.message)
|
||||
end
|
||||
|
||||
private
|
||||
def load_organization
|
||||
@organization = Organization.find_by(login: params[:organization_id]) || Organization.find_by(id: params[:organization_id])
|
||||
return render_not_found("组织不存在") if @organization.nil?
|
||||
return render_forbidden("没有查看组织的权限") if org_limited_condition || org_privacy_condition
|
||||
end
|
||||
|
||||
def load_team
|
||||
@team = Team.find_by_id(params[:team_id])
|
||||
return render_not_found("组织团队不存在") if @team.nil?
|
||||
return render_forbidden("没有查看组织团队的权限") if team_not_found_condition
|
||||
end
|
||||
|
||||
def load_operate_project
|
||||
@operate_project = Project.find_by(id: project_mark) || Project.find_by(identifier: project_mark)
|
||||
tip_exception("项目不存在") if @operate_project.nil?
|
||||
end
|
||||
|
||||
def load_team_project
|
||||
@team_project = TeamProject.find_by(organization_id: @organization.id, team_id: @team.id, project_id: @operate_project.id)
|
||||
tip_exception("组织团队项目不存在") if @team_project.nil?
|
||||
end
|
||||
end
|
||||
|
|
@ -1,76 +0,0 @@
|
|||
class Organizations::TeamUsersController < Organizations::BaseController
|
||||
before_action :load_organization, :load_team
|
||||
before_action :load_operate_user, only: [:create, :destroy]
|
||||
before_action :load_team_user, only: [:destroy]
|
||||
before_action :check_user_can_edit_org, only: [:create, :destroy]
|
||||
|
||||
def index
|
||||
@team_users = @team.team_users.includes(:user)
|
||||
|
||||
search = params[:search].to_s.downcase
|
||||
@team_users = @team_users.joins(:user).merge(User.like(search))
|
||||
|
||||
@team_users = kaminari_paginate(@team_users)
|
||||
end
|
||||
|
||||
def create
|
||||
ActiveRecord::Base.transaction do
|
||||
@team_user = TeamUser.build(@organization.id, @operate_user.id, @team.id)
|
||||
@organization_user = OrganizationUser.build(@organization.id, @operate_user.id)
|
||||
Gitea::Organization::TeamUser::CreateService.call(@organization.gitea_token, @team.gtid, @operate_user.login)
|
||||
end
|
||||
rescue Exception => e
|
||||
uid_logger_error(e.message)
|
||||
tip_exception(e.message)
|
||||
end
|
||||
|
||||
def destroy
|
||||
tip_exception("您不能从所有者团队中删除最后一个用户") if @team.owner? && @organization.is_owner_team_last_one?(@operate_user.id)
|
||||
ActiveRecord::Base.transaction do
|
||||
@team_user.destroy!
|
||||
Gitea::Organization::TeamUser::DeleteService.call(@organization.gitea_token, @team.gtid, @operate_user.login)
|
||||
render_ok
|
||||
end
|
||||
rescue Exception => e
|
||||
uid_logger_error(e.message)
|
||||
tip_exception(e.message)
|
||||
end
|
||||
|
||||
def quit
|
||||
@team_user = @team.team_users.find_by(user_id: current_user.id)
|
||||
tip_exception("您不在该组织团队中") if @team_user.nil?
|
||||
tip_exception("您不能从所有者团队中删除最后一个用户") if @team.owner? && @organization.is_owner_team_last_one?(current_user.id)
|
||||
ActiveRecord::Base.transaction do
|
||||
@team_user.destroy!
|
||||
Gitea::Organization::TeamUser::DeleteService.call(@organization.gitea_token, @team.gtid, current_user.login)
|
||||
render_ok
|
||||
end
|
||||
rescue Exception => e
|
||||
uid_logger_error(e.message)
|
||||
tip_exception(e.message)
|
||||
end
|
||||
|
||||
private
|
||||
def load_organization
|
||||
@organization = Organization.find_by(login: params[:organization_id]) || Organization.find_by(id: params[:organization_id])
|
||||
return render_not_found("组织不存在") if @organization.nil?
|
||||
return render_forbidden("没有查看组织的权限") if org_limited_condition || org_privacy_condition
|
||||
end
|
||||
|
||||
def load_team
|
||||
@team = Team.find_by_id(params[:team_id])
|
||||
return render_not_found("组织团队不存在") if @team.nil?
|
||||
return render_forbidden("没有查看组织团队的权限") if team_not_found_condition
|
||||
end
|
||||
|
||||
def load_operate_user
|
||||
@operate_user = User.find_by(login: user_mark) if user_mark.present?
|
||||
tip_exception("平台用户不存在") if @operate_user.nil?
|
||||
end
|
||||
|
||||
def load_team_user
|
||||
@team_user = TeamUser.find_by(team_id: @team.id, user_id: @operate_user.id)
|
||||
tip_exception("组织团队成员不存在") if @team_user.nil?
|
||||
end
|
||||
|
||||
end
|
||||
|
|
@ -1,81 +0,0 @@
|
|||
class Organizations::TeamsController < Organizations::BaseController
|
||||
before_action :load_organization
|
||||
before_action :load_team, only: [:show, :update, :destroy]
|
||||
before_action :check_user_can_edit_org, only: [:create, :update, :destroy]
|
||||
|
||||
def index
|
||||
#if @organization.is_owner?(current_user) || current_user.admin?
|
||||
@teams = @organization.teams
|
||||
#else
|
||||
# @teams = @organization.teams.joins(:team_users).where(team_users: {user_id: current_user.id})
|
||||
#end
|
||||
@is_admin = can_edit_org?
|
||||
@teams = @teams.includes(:team_units, :team_users)
|
||||
|
||||
@teams = kaminari_paginate(@teams)
|
||||
end
|
||||
|
||||
def search
|
||||
tip_exception("请输入搜索关键词") if params[:search].nil?
|
||||
if @organization.is_owner?(current_user) || current_user.admin?
|
||||
@teams = @organization.teams
|
||||
else
|
||||
@teams = @organization.teams.joins(:team_users).where(team_users: {user_id: current_user.id})
|
||||
end
|
||||
@is_admin = can_edit_org?
|
||||
@teams = @teams.ransack(name_cont: params[:search]).result if params[:search].present?
|
||||
@teams = @teams.includes(:team_units, :team_users)
|
||||
end
|
||||
|
||||
def show
|
||||
@is_admin = can_edit_org?
|
||||
@is_member = @team.is_member?(current_user.id)
|
||||
end
|
||||
|
||||
def create
|
||||
ActiveRecord::Base.transaction do
|
||||
Organizations::CreateTeamForm.new(team_params).validate!
|
||||
@team = Organizations::Teams::CreateService.call(current_user, @organization, team_params)
|
||||
end
|
||||
rescue Exception => e
|
||||
uid_logger_error(e.message)
|
||||
tip_exception(e.message)
|
||||
end
|
||||
|
||||
def update
|
||||
Organizations::CreateTeamForm.new(team_params).validate!
|
||||
@team = Organizations::Teams::UpdateService.call(current_user, @team, team_params)
|
||||
rescue Exception => e
|
||||
uid_logger_error(e.message)
|
||||
tip_exception(e.message)
|
||||
end
|
||||
|
||||
def destroy
|
||||
tip_exception("组织团队不允许被删除") if @team.owner?
|
||||
ActiveRecord::Base.transaction do
|
||||
Gitea::Organization::Team::DeleteService.call(@organization.gitea_token, @team.gtid)
|
||||
@team.destroy!
|
||||
end
|
||||
render_ok
|
||||
rescue Exception => e
|
||||
uid_logger_error(e.message)
|
||||
tip_exception(e.message)
|
||||
end
|
||||
|
||||
private
|
||||
def team_params
|
||||
params.permit(:name, :nickname, :description, :authorize, :includes_all_project, :can_create_org_project, :unit_types => [])
|
||||
end
|
||||
|
||||
def load_organization
|
||||
@organization = Organization.find_by(login: params[:organization_id]) || Organization.find_by(id: params[:organization_id])
|
||||
return render_not_found("组织不存在") if @organization.nil?
|
||||
return render_forbidden("没有查看组织的权限") if org_limited_condition || org_privacy_condition
|
||||
end
|
||||
|
||||
def load_team
|
||||
@team = Team.find_by_id(params[:id])
|
||||
return render_not_found("组织团队不存在") if @team.nil?
|
||||
return render_forbidden("没有查看组织团队的权限") if team_not_found_condition
|
||||
end
|
||||
end
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
class OwnersController < ApplicationController
|
||||
before_action :require_login
|
||||
|
||||
def index
|
||||
@owners = []
|
||||
@owners += [current_user]
|
||||
@owners += Organization.joins(team_users: :team)
|
||||
.where(team_users: {user_id: current_user.id},
|
||||
teams: {can_create_org_project: true})
|
||||
.distinct
|
||||
end
|
||||
end
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
class PlatesController < ApplicationController
|
||||
def index
|
||||
render_react
|
||||
end
|
||||
|
||||
def show
|
||||
render_react
|
||||
end
|
||||
|
||||
def all
|
||||
render_react
|
||||
end
|
||||
|
||||
def is_fine
|
||||
render_react
|
||||
end
|
||||
|
||||
def my_memos
|
||||
render_react
|
||||
end
|
||||
|
||||
def my_topics
|
||||
render_react
|
||||
end
|
||||
|
||||
private
|
||||
def render_react
|
||||
render "/common/index", :layout => false
|
||||
end
|
||||
end
|
||||
|
|
@ -40,5 +40,8 @@ class PraiseTreadController < ApplicationController
|
|||
end
|
||||
|
||||
private
|
||||
def render_result
|
||||
|
||||
end
|
||||
|
||||
end
|
||||
|
|
|
|||
|
|
@ -6,8 +6,12 @@ class ProjectCategoriesController < ApplicationController
|
|||
end
|
||||
|
||||
def group_list
|
||||
@project_categories = ProjectCategory.where('projects_count > 0').order(projects_count: :desc)
|
||||
# projects = Project.no_anomory_projects.visible
|
||||
# @category_group_list = projects.joins(:project_category).group("project_categories.id", "project_categories.name").size
|
||||
# if current_user&.logged?
|
||||
# projects = Project.list_user_projects(current_user.id)
|
||||
# else
|
||||
# projects = Project.visible
|
||||
# end
|
||||
projects = Project.no_anomory_projects.visible
|
||||
@category_group_list = projects.joins(:project_category).group("project_categories.id", "project_categories.name").size
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,26 +0,0 @@
|
|||
class Projects::AppliedTransferProjectsController < Projects::BaseController
|
||||
before_action :check_auth
|
||||
|
||||
def organizations
|
||||
@organizations = Organization.includes(:organization_extension).joins(team_users: :team).where(team_users: {user_id: current_user.id}, teams: {authorize: %w(admin owner)})
|
||||
end
|
||||
|
||||
def create
|
||||
@applied_transfer_project = Projects::ApplyTransferService.call(current_user, @project, params)
|
||||
rescue Exception => e
|
||||
uid_logger_error(e.message)
|
||||
tip_exception(e.message)
|
||||
end
|
||||
|
||||
def cancel
|
||||
@applied_transfer_project = Projects::CancelTransferService.call(current_user, @project)
|
||||
rescue Exception => e
|
||||
uid_logger_error(e.message)
|
||||
tip_exception(e.message)
|
||||
end
|
||||
|
||||
private
|
||||
def check_auth
|
||||
return render_forbidden unless current_user.admin? ||@project.owner?(current_user)
|
||||
end
|
||||
end
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
class Projects::ProjectUnitsController < Projects::BaseController
|
||||
def index
|
||||
@project_units = @project.project_units
|
||||
end
|
||||
|
||||
def create
|
||||
if current_user.admin? || @project.manager?(current_user)
|
||||
ActiveRecord::Base.transaction do
|
||||
ProjectUnit.update_by_unit_types!(@project, unit_types)
|
||||
render_ok
|
||||
end
|
||||
else
|
||||
render_forbidden('你没有权限操作')
|
||||
end
|
||||
rescue Exception => e
|
||||
uid_logger_error(e.message)
|
||||
tip_exception(e.message)
|
||||
end
|
||||
|
||||
private
|
||||
def unit_types
|
||||
params.fetch(:unit_types, [])
|
||||
end
|
||||
end
|
||||
|
|
@ -1,47 +0,0 @@
|
|||
class Projects::TeamsController < Projects::BaseController
|
||||
before_action :load_operate_team, only: [:create, :destroy]
|
||||
before_action :load_team_project, only: :destroy
|
||||
|
||||
def index
|
||||
if @project.owner.is_a?(Organization)
|
||||
@teams = Team.joins(:team_projects).where(team_projects: {project_id: @project.id})
|
||||
else
|
||||
@teams = Team.none
|
||||
end
|
||||
@teams = paginate(@teams)
|
||||
end
|
||||
|
||||
def create
|
||||
ActiveRecord::Base.transaction do
|
||||
@team_project = TeamProject.build(@owner.id, @operate_team.id, @project.id)
|
||||
Gitea::Organization::TeamProject::CreateService.call(@owner.gitea_token, @operate_team.gtid, @owner.login, @project.identifier)
|
||||
render_ok
|
||||
end
|
||||
rescue Exception => e
|
||||
uid_logger_error(e.message)
|
||||
tip_exception(e.message)
|
||||
end
|
||||
|
||||
def destroy
|
||||
ActiveRecord::Base.transaction do
|
||||
@team_project.destroy!
|
||||
Gitea::Organization::TeamProject::DeleteService.call(@owner.gitea_token, @operate_team.gtid, @owner.login, @project.identifier)
|
||||
render_ok
|
||||
end
|
||||
rescue Exception => e
|
||||
uid_logger_error(e.message)
|
||||
tip_exception(e.message)
|
||||
end
|
||||
|
||||
private
|
||||
def load_operate_team
|
||||
@operate_team = Team.find_by(id: params[:team_id]) || Team.find_by(id: params[:id])
|
||||
tip_exception("项目不存在") if @operate_team.nil?
|
||||
tip_exception("该组织团队拥有组织所有项目，无法进行操作") if @operate_team.includes_all_project
|
||||
end
|
||||
|
||||
def load_team_project
|
||||
@team_project = TeamProject.find_by(organization_id: @owner.id, team_id: @operate_team.id, project_id: @project.id)
|
||||
tip_exception("组织团队项目不存在") if @team_project.nil?
|
||||
end
|
||||
end
|
||||
|
|
@ -2,44 +2,16 @@ class ProjectsController < ApplicationController
|
|||
include ApplicationHelper
|
||||
include OperateProjectAbilityAble
|
||||
include ProjectsHelper
|
||||
include Acceleratorable
|
||||
|
||||
before_action :require_login, except: %i[index branches group_type_list simple show fork_users praise_users watch_users recommend about menu_list]
|
||||
before_action :require_login, except: %i[index branches group_type_list simple show fork_users praise_users watch_users recommend about]
|
||||
before_action :load_project, except: %i[index group_type_list migrate create recommend]
|
||||
before_action :authorizate_user_can_edit_project!, only: %i[update]
|
||||
before_action :project_public?, only: %i[fork_users praise_users watch_users]
|
||||
|
||||
def menu_list
|
||||
menu = []
|
||||
|
||||
menu.append(menu_hash_by_name("home"))
|
||||
menu.append(menu_hash_by_name("code")) if @project.has_menu_permission("code")
|
||||
menu.append(menu_hash_by_name("issues")) if @project.has_menu_permission("issues")
|
||||
menu.append(menu_hash_by_name("pulls")) if @project.has_menu_permission("pulls")
|
||||
menu.append(menu_hash_by_name("devops")) if @project.has_menu_permission("devops")
|
||||
menu.append(menu_hash_by_name("versions")) if @project.has_menu_permission("versions")
|
||||
menu.append(menu_hash_by_name("resources")) if @project.has_menu_permission("resources")
|
||||
menu.append(menu_hash_by_name("activity"))
|
||||
menu.append(menu_hash_by_name("setting")) if current_user.admin? || @project.manager?(current_user)
|
||||
|
||||
render json: menu
|
||||
end
|
||||
|
||||
def index
|
||||
scope = Projects::ListQuery.call(params)
|
||||
|
||||
# @projects = kaminari_paginate(scope)
|
||||
@projects = paginate scope.includes(:project_category, :project_language, :repository, :project_educoder, :owner, :project_units)
|
||||
|
||||
category_id = params[:category_id]
|
||||
@total_count =
|
||||
if category_id.blank?
|
||||
ps = ProjectStatistic.first
|
||||
ps.common_projects_count + ps.mirror_projects_count unless ps.blank?
|
||||
else
|
||||
cate = ProjectCategory.find_by(id: category_id)
|
||||
cate&.projects_count || 0
|
||||
end
|
||||
@projects = kaminari_paginate(scope)
|
||||
@total_count = @projects.total_count
|
||||
end
|
||||
|
||||
def create
|
||||
|
|
@ -55,81 +27,36 @@ class ProjectsController < ApplicationController
|
|||
|
||||
def migrate
|
||||
Projects::MigrateForm.new(mirror_params).validate!
|
||||
|
||||
@project =
|
||||
if enable_accelerator?(mirror_params[:clone_addr])
|
||||
source_clone_url = mirror_params[:clone_addr]
|
||||
uid_logger("########## 已动加速器 ##########")
|
||||
result = Gitea::Accelerator::MigrateService.call(mirror_params)
|
||||
if result[:status] == :success
|
||||
Rails.logger.info "########## 加速镜像成功 ########## "
|
||||
Projects::MigrateService.call(current_user,
|
||||
mirror_params.merge(source_clone_url: source_clone_url,
|
||||
clone_addr: accelerator_url(mirror_params[:repository_name])))
|
||||
else
|
||||
Projects::MigrateService.call(current_user, mirror_params)
|
||||
end
|
||||
else
|
||||
Projects::MigrateService.call(current_user, mirror_params)
|
||||
end
|
||||
@project = Projects::MigrateService.new(current_user, mirror_params).call
|
||||
rescue Exception => e
|
||||
uid_logger_error(e.message)
|
||||
tip_exception(e.message)
|
||||
end
|
||||
|
||||
def branches
|
||||
return @branches = [] unless @project.forge?
|
||||
|
||||
result = Gitea::Repository::Branches::ListService.call(@owner, @project.identifier)
|
||||
@branches = result.is_a?(Hash) && result.key?(:status) ? [] : result
|
||||
@branches = Gitea::Repository::Branches::ListService.new(@project.owner, @project.identifier).call
|
||||
end
|
||||
|
||||
def group_type_list
|
||||
project_statics = ProjectStatistic.first
|
||||
|
||||
@project_statics_list = [
|
||||
{
|
||||
project_type: 'common',
|
||||
name: '开源托管项目',
|
||||
projects_count: project_statics&.common_projects_count || 0
|
||||
},
|
||||
{
|
||||
project_type: 'mirror',
|
||||
name: '开源镜像项目',
|
||||
projects_count: project_statics&.mirror_projects_count || 0
|
||||
}
|
||||
]
|
||||
|
||||
# projects = Project.no_anomory_projects.visible
|
||||
# @project_group_list = projects.group(:project_type).size
|
||||
# if current_user&.logged?
|
||||
# projects = Project.list_user_projects(current_user.id)
|
||||
# else
|
||||
# projects = Project.visible
|
||||
# end
|
||||
projects = Project.no_anomory_projects.visible
|
||||
@project_group_list = projects.group(:project_type).size
|
||||
end
|
||||
|
||||
def update
|
||||
ActiveRecord::Base.transaction do
|
||||
# TODO:
|
||||
# 临时特殊处理修改website、lesson_url操作方法
|
||||
if project_params.has_key?("website")
|
||||
@project.update(project_params)
|
||||
else
|
||||
validate_params = project_params.slice(:name, :description,
|
||||
:project_category_id, :project_language_id, :private)
|
||||
|
||||
Projects::UpdateForm.new(validate_params).validate!
|
||||
|
||||
private = params[:private] || false
|
||||
|
||||
new_project_params = project_params.except(:private).merge(is_public: !private)
|
||||
@project.update_attributes!(new_project_params)
|
||||
gitea_params = {
|
||||
private: private,
|
||||
default_branch: @project.default_branch,
|
||||
website: @project.website
|
||||
}
|
||||
if [true, false].include? private
|
||||
Gitea::Repository::UpdateService.call(@owner, @project.identifier, gitea_params)
|
||||
@project.repository.update_column(:hidden, private)
|
||||
end
|
||||
# Projects::CreateForm.new(project_params).validate!
|
||||
private = params[:private]
|
||||
if [true, false].include? private
|
||||
new_project_params = project_params.merge(is_public: !private)
|
||||
Gitea::Repository::UpdateService.new(@project.owner, @project.repository.identifier, {private: private}).call
|
||||
@project.repository.update_column(:hidden, private)
|
||||
end
|
||||
@project.update_attributes!(new_project_params)
|
||||
end
|
||||
rescue Exception => e
|
||||
uid_logger_error(e.message)
|
||||
|
|
@ -140,7 +67,7 @@ class ProjectsController < ApplicationController
|
|||
end
|
||||
|
||||
def destroy
|
||||
if current_user.admin? || @project.manager?(current_user)
|
||||
if current_user.admin? || @project.owner?(current_user)
|
||||
ActiveRecord::Base.transaction do
|
||||
Gitea::Repository::DeleteService.new(@project.owner, @project.identifier).call
|
||||
@project.destroy!
|
||||
|
|
@ -173,11 +100,11 @@ class ProjectsController < ApplicationController
|
|||
end
|
||||
|
||||
def simple
|
||||
json_response(@project, current_user)
|
||||
json_response(@project)
|
||||
end
|
||||
|
||||
def recommend
|
||||
@projects = Project.recommend.includes(:repository, :project_category, :owner).order(visits: :desc)
|
||||
@projects = Project.recommend.includes(:repository, :project_category, owner: :user_extension).limit(5)
|
||||
end
|
||||
|
||||
def about
|
||||
|
|
@ -211,8 +138,8 @@ class ProjectsController < ApplicationController
|
|||
|
||||
private
|
||||
def project_params
|
||||
params.permit(:user_id, :name, :description, :repository_name, :website, :lesson_url,
|
||||
:project_category_id, :project_language_id, :license_id, :ignore_id, :private)
|
||||
params.permit(:user_id, :name, :description, :repository_name,
|
||||
:project_category_id, :project_language_id, :license_id, :ignore_id)
|
||||
end
|
||||
|
||||
def mirror_params
|
||||
|
|
|
|||
|
|
@ -1,43 +0,0 @@
|
|||
class ProtectedBranchesController < ApplicationController
|
||||
include OperateProjectAbilityAble
|
||||
|
||||
before_action :require_login
|
||||
before_action :load_repository
|
||||
before_action :authorizate_user_can_edit_project!
|
||||
|
||||
def index
|
||||
scope = @repository.protected_branches
|
||||
@total_count = scope.size
|
||||
@protected_branches = paginate(scope)
|
||||
end
|
||||
|
||||
def create
|
||||
@protected_branch = ProtectedBranches::CreateService.call(@repository, @owner, params)
|
||||
|
||||
render_protected_branch_json
|
||||
end
|
||||
|
||||
def update
|
||||
@protected_branch = ProtectedBranches::UpdateService.call(@repository, @owner, params)
|
||||
end
|
||||
|
||||
def destroy
|
||||
ProtectedBranches::DestroyService.call(@repository, @owner, params[:branch_name])
|
||||
|
||||
render_ok
|
||||
end
|
||||
|
||||
def show
|
||||
@protected_branch = ProtectedBranches::GetService.call(@repository, @owner, params)
|
||||
end
|
||||
|
||||
def edit
|
||||
@branch, @protected_branch = ProtectedBranches::EditService.call(@repository, @owner, params[:branch_name])
|
||||
end
|
||||
|
||||
private
|
||||
def render_protected_branch_json
|
||||
@protected_branch.persisted? ? @protected_branch : render_error('创建失败!')
|
||||
end
|
||||
|
||||
end
|
||||
|
|
@ -1,23 +1,21 @@
|
|||
class PullRequestsController < ApplicationController
|
||||
before_action :require_login, except: [:index, :show, :files, :commits]
|
||||
before_action :require_login, except: [:index, :show]
|
||||
before_action :load_repository
|
||||
before_action :find_pull_request, except: [:index, :new, :create, :check_can_merge,:get_branches,:create_merge_infos, :files, :commits]
|
||||
before_action :load_pull_request, only: [:files, :commits]
|
||||
before_action :set_user, only: [:new, :get_branches]
|
||||
before_action :find_pull_request, except: [:index, :new, :create, :check_can_merge,:get_branches,:create_merge_infos]
|
||||
# before_action :get_relatived, only: [:edit]
|
||||
include TagChosenHelper
|
||||
include ApplicationHelper
|
||||
|
||||
|
||||
def index
|
||||
return render_not_found unless @project.has_menu_permission("pulls")
|
||||
# @issues = Gitea::PullRequest::ListService.new(@user,@repository.try(:identifier)).call #通过gitea获取
|
||||
issues = @project.issues.issue_pull_request.issue_index_includes.includes(pull_request: :user)
|
||||
issues = issues.where(is_private: false) unless current_user.present? && (current_user.admin? || @project.member?(current_user))
|
||||
@all_issues = issues.distinct
|
||||
@filter_issues = @all_issues
|
||||
@filter_issues = @filter_issues.where("subject LIKE ? OR description LIKE ? ", "%#{params[:search]}%", "%#{params[:search]}%") if params[:search].present?
|
||||
@open_issues = @filter_issues.joins(:pull_request).where(pull_requests: {status: PullRequest::OPEN})
|
||||
@close_issues = @filter_issues.joins(:pull_request).where(pull_requests: {status: PullRequest::CLOSED})
|
||||
@merged_issues = @filter_issues.joins(:pull_request).where(pull_requests: {status: PullRequest::MERGED})
|
||||
@all_issues_size = issues.size
|
||||
@open_issues_size = issues.joins(:pull_request).where(pull_requests: {status: 0}).size
|
||||
@close_issues_size = issues.joins(:pull_request).where(pull_requests: {status: 2}).size
|
||||
@merged_issues_size = issues.joins(:pull_request).where(pull_requests: {status: 1}).size
|
||||
@user_admin_or_member = current_user.present? && (current_user.admin || @project.member?(current_user))
|
||||
|
||||
scopes = Issues::ListQueryService.call(issues,params.delete_if{|k,v| v.blank?}, "PullRequest")
|
||||
|
|
@ -26,11 +24,11 @@ class PullRequestsController < ApplicationController
|
|||
end
|
||||
|
||||
def new
|
||||
@all_branches = Branches::ListService.call(@owner, @project)
|
||||
@all_branches = PullRequests::BranchesService.new(@user, @project).call
|
||||
@is_fork = @project.forked_from_project_id.present?
|
||||
@projects_names = [{
|
||||
project_user_login: @owner.try(:login),
|
||||
project_name: "#{@owner.try(:show_real_name)}/#{@repository.try(:identifier)}",
|
||||
project_user_login: @user.try(:login),
|
||||
project_name: "#{@user.try(:show_real_name)}/#{@repository.try(:identifier)}",
|
||||
project_id: @project.identifier,
|
||||
id: @project.id
|
||||
}]
|
||||
|
|
@ -47,20 +45,64 @@ class PullRequestsController < ApplicationController
|
|||
end
|
||||
|
||||
def get_branches
|
||||
branch_result = Branches::ListService.call(@owner, @project)
|
||||
branch_result = PullRequests::BranchesService.new(@user, @project).call
|
||||
render json: branch_result
|
||||
# return json: branch_result
|
||||
end
|
||||
|
||||
def create
|
||||
ActiveRecord::Base.transaction do
|
||||
@pull_request, @gitea_pull_request = PullRequests::CreateService.call(current_user, @owner, @project, params)
|
||||
if @gitea_pull_request[:status] == :success
|
||||
@pull_request.bind_gitea_pull_request!(@gitea_pull_request[:body]["number"])
|
||||
render_ok
|
||||
else
|
||||
render_error("create pull request error: #{@gitea_pull_request[:status]}")
|
||||
raise ActiveRecord::Rollback
|
||||
if params[:title].nil?
|
||||
normal_status(-1, "名称不能为空")
|
||||
elsif params[:issue_tag_ids].nil?
|
||||
normal_status(-1, "标签不能为空")
|
||||
else
|
||||
ActiveRecord::Base.transaction do
|
||||
begin
|
||||
merge_params
|
||||
pull_issue = Issue.new(@issue_params)
|
||||
if pull_issue.save!
|
||||
pr_params = {
|
||||
user_id: current_user.try(:id),
|
||||
project_id: @project.id,
|
||||
issue_id: pull_issue.id,
|
||||
fork_project_id: params[:fork_project_id],
|
||||
is_original: params[:is_original]
|
||||
}
|
||||
local_requests = PullRequest.new(@local_params.merge(pr_params))
|
||||
if local_requests.save
|
||||
remote_pr_params = @local_params
|
||||
remote_pr_params = remote_pr_params.merge(head: "#{params[:merge_user_login]}:#{params[:head]}").compact if local_requests.is_original && params[:merge_user_login]
|
||||
gitea_request = Gitea::PullRequest::CreateService.call(current_user.try(:gitea_token), @project.owner, @repository.try(:identifier), remote_pr_params.except(:milestone))
|
||||
if gitea_request && local_requests.update_attributes(gpid: gitea_request["number"])
|
||||
if params[:issue_tag_ids].present?
|
||||
params[:issue_tag_ids].each do |tag|
|
||||
IssueTagsRelate.create!(issue_id: pull_issue.id, issue_tag_id: tag)
|
||||
end
|
||||
end
|
||||
|
||||
if params[:assigned_to_id].present?
|
||||
Tiding.create!(user_id: params[:assigned_to_id], trigger_user_id: current_user.id,
|
||||
container_id: local_requests.id, container_type: 'PullRequest',
|
||||
parent_container_id: @project.id, parent_container_type: "Project",
|
||||
tiding_type: 'pull_request', status: 0)
|
||||
end
|
||||
local_requests.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "create")
|
||||
if params[:title].to_s.include?("WIP:")
|
||||
pull_issue.custom_journal_detail("WIP", "", "这个合并请求被标记为尚未完成的工作。完成后请从标题中移除WIP:前缀。", current_user&.id)
|
||||
end
|
||||
# render :json => { status: 0, message: "PullRequest创建成功", id: pull_issue.id}
|
||||
normal_status(0, "PullRequest创建成功")
|
||||
else
|
||||
normal_status(-1, "PullRequest创建失败")
|
||||
end
|
||||
else
|
||||
normal_status(-1, "PullRequest创建失败")
|
||||
end
|
||||
end
|
||||
rescue => e
|
||||
normal_status(-1, e.message)
|
||||
raise ActiveRecord::Rollback
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -90,10 +132,8 @@ class PullRequestsController < ApplicationController
|
|||
|
||||
if @issue.update_attributes(@issue_params)
|
||||
if @pull_request.update_attributes(@local_params.compact)
|
||||
gitea_pull = Gitea::PullRequest::UpdateService.call(@owner.login, @repository.identifier,
|
||||
@pull_request.gpid, @requests_params, current_user.gitea_token)
|
||||
|
||||
if gitea_pull[:status] === :success
|
||||
gitea_request = Gitea::PullRequest::UpdateService.new(@project.owner, @repository.try(:identifier), @requests_params, @pull_request.try(:gpid)).call
|
||||
if gitea_request
|
||||
if params[:issue_tag_ids].present?
|
||||
params[:issue_tag_ids].each do |tag|
|
||||
IssueTagsRelate.create(issue_id: @issue.id, issue_tag_id: tag)
|
||||
|
|
@ -122,8 +162,9 @@ class PullRequestsController < ApplicationController
|
|||
def refuse_merge
|
||||
ActiveRecord::Base.transaction do
|
||||
begin
|
||||
colsed = PullRequests::CloseService.call(@owner, @repository, @pull_request, current_user)
|
||||
colsed === true ? normal_status(1, "已拒绝") : normal_status(-1, '合并失败')
|
||||
@pull_request.update(status: 2)
|
||||
@pull_request.issue.update(status_id: 5)
|
||||
normal_status(1, "已拒绝")
|
||||
rescue => e
|
||||
normal_status(-1, e.message)
|
||||
raise ActiveRecord::Rollback
|
||||
|
|
@ -138,26 +179,30 @@ class PullRequestsController < ApplicationController
|
|||
def show
|
||||
@issue_user = @issue.user
|
||||
@issue_assign_to = @issue.get_assign_user
|
||||
@gitea_pull = Gitea::PullRequest::GetService.call(@owner.login,
|
||||
@repository.identifier, @pull_request.gpid, current_user&.gitea_token)
|
||||
|
||||
end
|
||||
|
||||
def pr_merge
|
||||
return render_forbidden("你没有权限操作.") unless @project.operator?(current_user)
|
||||
return render_forbidden("你没有权限操作.") if @project.reporter?(current_user)
|
||||
|
||||
if params[:do].blank?
|
||||
normal_status(-1, "请选择合并方式")
|
||||
else
|
||||
ActiveRecord::Base.transaction do
|
||||
begin
|
||||
result = PullRequests::MergeService.call(@owner, @repository, @pull_request, current_user, params)
|
||||
|
||||
if result.status == 200 && @pull_request.merge!
|
||||
@pull_request.project_trend_status!
|
||||
requests_params = {
|
||||
Do: params[:do],
|
||||
MergeMessageField: params[:body],
|
||||
MergeTitleField: params[:title]
|
||||
}
|
||||
merge_pr = Gitea::PullRequest::MergeService.call(current_user.gitea_token, @project.owner.login,
|
||||
@repository.try(:identifier), @pull_request.try(:gpid), requests_params)
|
||||
if @pull_request.update_attribute(:status, 1) && merge_pr[:status].to_i == 200
|
||||
@pull_request&.project_trends&.update_all(action_type: "close")
|
||||
@issue&.custom_journal_detail("merge", "", "该合并请求已被合并", current_user&.id)
|
||||
normal_status(1, "合并成功")
|
||||
else
|
||||
normal_status(-1, result.message)
|
||||
normal_status(-1, "合并失败")
|
||||
end
|
||||
rescue => e
|
||||
normal_status(-1, e.message)
|
||||
|
|
@ -177,11 +222,11 @@ class PullRequestsController < ApplicationController
|
|||
elsif target_head === target_base && !is_original
|
||||
normal_status(-2, "分支内容相同，无需创建合并请求")
|
||||
else
|
||||
can_merge = @project&.pull_requests.where(head: target_head, base: target_base, status: 0, is_original: is_original, fork_project_id: params[:fork_project_id])
|
||||
can_merge = @project&.pull_requests.where(user_id: current_user&.id, head: target_head, base: target_base, status: 0, is_original: is_original, fork_project_id: params[:fork_project_id])
|
||||
if can_merge.present?
|
||||
render json: {
|
||||
status: -2,
|
||||
message: "在这些分支之间的合并请求已存在：<a href='/projects/#{@owner.login}/#{@project.identifier}/pulls/#{can_merge.first.id}/Messagecount''>#{can_merge.first.try(:title)}</a>",
|
||||
message: "在这些分支之间的合并请求已存在：<a href='/projects/#{@project.id}/merge/#{can_merge.first.id}/Messagecount''>#{can_merge.first.try(:title)}</a>",
|
||||
}
|
||||
else
|
||||
normal_status(0, "可以合并")
|
||||
|
|
@ -190,19 +235,9 @@ class PullRequestsController < ApplicationController
|
|||
end
|
||||
|
||||
|
||||
def files
|
||||
@files_result = Gitea::PullRequest::FilesService.call(@owner.login, @project.identifier, @pull_request.gpid, current_user&.gitea_token)
|
||||
# render json: @files_result
|
||||
end
|
||||
|
||||
def commits
|
||||
@commits_result = Gitea::PullRequest::CommitsService.call(@owner.login, @project.identifier, @pull_request.gpid, current_user&.gitea_token)
|
||||
# render json: @commits_result
|
||||
end
|
||||
|
||||
private
|
||||
def load_pull_request
|
||||
@pull_request = PullRequest.find params[:id]
|
||||
def set_user
|
||||
@user = @project.owner
|
||||
end
|
||||
|
||||
def find_pull_request
|
||||
|
|
@ -218,7 +253,7 @@ class PullRequestsController < ApplicationController
|
|||
def get_relatived
|
||||
@project_tags = @project.issue_tags&.select(:id,:name, :color).as_json
|
||||
@project_versions = @project.versions&.select(:id,:name, :status).as_json
|
||||
@project_members = @project.all_developers
|
||||
@project_members = @project.members_user_infos
|
||||
@project_priories = IssuePriority&.select(:id,:name, :position).as_json
|
||||
end
|
||||
|
||||
|
|
@ -232,8 +267,7 @@ class PullRequestsController < ApplicationController
|
|||
}
|
||||
@requests_params = @local_params.merge({
|
||||
assignee: current_user.try(:login),
|
||||
# assignees: ["#{params[:assigned_login].to_s}"],
|
||||
assignees: ["#{current_user.try(:login).to_s}"],
|
||||
assignees: ["#{params[:assigned_login].to_s}"],
|
||||
labels: params[:issue_tag_ids],
|
||||
due_date: Time.now
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,39 +1,19 @@
|
|||
class RepositoriesController < ApplicationController
|
||||
include ApplicationHelper
|
||||
include OperateProjectAbilityAble
|
||||
include Repository::LanguagesPercentagable
|
||||
|
||||
before_action :require_login, only: %i[edit update create_file update_file delete_file sync_mirror]
|
||||
before_action :load_repository
|
||||
before_action :authorizate!, except: [:sync_mirror, :tags, :commit]
|
||||
before_action :authorizate_user_can_edit_repo!, only: %i[sync_mirror]
|
||||
before_action :get_ref, only: %i[entries sub_entries top_counts file]
|
||||
before_action :get_ref, only: %i[entries sub_entries top_counts]
|
||||
before_action :get_latest_commit, only: %i[entries sub_entries top_counts]
|
||||
before_action :get_statistics, only: %i[top_counts]
|
||||
|
||||
def files
|
||||
result = @project.educoder? ? nil : Gitea::Repository::Files::GetService.call(@owner, @project.identifier, @ref, params[:search], @owner.gitea_token)
|
||||
render json: result
|
||||
end
|
||||
|
||||
# 新版项目详情
|
||||
def detail
|
||||
@user = current_user
|
||||
@result = Repositories::DetailService.call(@owner, @repository, @user)
|
||||
@project_fork_id = @project.try(:forked_from_project_id)
|
||||
if @project_fork_id.present?
|
||||
@fork_project = Project.find_by(id: @project_fork_id)
|
||||
@fork_project_user = @fork_project.owner
|
||||
end
|
||||
rescue Exception => e
|
||||
uid_logger_error(e.message)
|
||||
tip_exception(e.message)
|
||||
end
|
||||
|
||||
def show
|
||||
@user = current_user
|
||||
@repo = @project.repository
|
||||
@result = @project.forge? ? Gitea::Repository::GetService.new(@owner, @project.identifier).call : nil
|
||||
@result = Gitea::Repository::GetService.new(@project.owner, @project.identifier).call
|
||||
@project_fork_id = @project.try(:forked_from_project_id)
|
||||
if @project_fork_id.present?
|
||||
@fork_project = Project.find_by(id: @project_fork_id)
|
||||
|
|
@ -46,113 +26,62 @@ class RepositoriesController < ApplicationController
|
|||
|
||||
def entries
|
||||
@project.increment!(:visits)
|
||||
|
||||
if @project.educoder?
|
||||
@entries = Educoder::Repository::Entries::ListService.call(@project&.project_educoder.repo_name)
|
||||
else
|
||||
@entries = Gitea::Repository::Entries::ListService.new(@owner, @project.identifier, ref: @ref).call
|
||||
@entries = @entries.present? ? @entries.sort_by{ |hash| hash['type'] } : []
|
||||
@path = Gitea.gitea_config[:domain]+"/#{@project.owner.login}/#{@project.identifier}/raw/branch/#{@ref}/"
|
||||
|
||||
# TODO
|
||||
# 临时处理readme文件问题
|
||||
result = Gitea::Repository::Readme::GetService.call(@owner.login, @project.identifier, @ref, @owner&.gitea_token)
|
||||
@readme =
|
||||
if result[:status] == :success
|
||||
result[:body]
|
||||
else
|
||||
{}
|
||||
end
|
||||
end
|
||||
@project_owner = @project.owner
|
||||
@entries = Gitea::Repository::Entries::ListService.new(@project_owner, @project.identifier, ref: @ref).call
|
||||
@entries = @entries.present? ? @entries.sort_by{ |hash| hash['type'] } : []
|
||||
@path = Gitea.gitea_config[:domain]+"/#{@project.owner.login}/#{@project.identifier}/raw/branch/#{@ref}/"
|
||||
end
|
||||
|
||||
def top_counts
|
||||
@result = @project.educoder? ? nil : Gitea::Repository::GetService.new(@project.owner, @project.identifier).call
|
||||
@result = Gitea::Repository::GetService.new(@project.owner, @project.identifier).call
|
||||
end
|
||||
|
||||
def sub_entries
|
||||
file_path_uri = URI.parse(URI.encode(params[:filepath].to_s.strip))
|
||||
|
||||
if @project.educoder?
|
||||
if params[:type] === 'file'
|
||||
@sub_entries = Educoder::Repository::Entries::GetService.call(@project&.project_educoder&.repo_name, file_path_uri)
|
||||
logger.info "######### sub_entries: #{@sub_entries}"
|
||||
return render_error('该文件暂未开放，敬请期待.') if @sub_entries['status'].to_i === -1
|
||||
|
||||
tmp_entries = [{
|
||||
"content" => @sub_entries['data']['content'],
|
||||
"type" => "blob"
|
||||
}]
|
||||
@sub_entries = {
|
||||
"trees"=>tmp_entries,
|
||||
"commits" => [{}]
|
||||
}
|
||||
else
|
||||
@sub_entries = Educoder::Repository::Entries::ListService.call(@project&.project_educoder&.repo_name, {path: file_path_uri})
|
||||
end
|
||||
else
|
||||
interactor = Repositories::EntriesInteractor.call(@owner, @project.identifier, file_path_uri, ref: @ref)
|
||||
if interactor.success?
|
||||
result = interactor.result
|
||||
@sub_entries = result.is_a?(Array) ? result.sort_by{ |hash| hash['type'] } : result
|
||||
else
|
||||
render_error(interactor.error)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def commits
|
||||
@hash_commit = Gitea::Repository::Commits::ListService.new(@owner.login, @project.identifier,
|
||||
sha: params[:sha], page: params[:page], limit: params[:limit], token: current_user&.gitea_token).call
|
||||
end
|
||||
|
||||
def commit
|
||||
@sha = params[:sha]
|
||||
@commit = Gitea::Repository::Commits::GetService.call(@owner.login, @repository.identifier, @sha, current_user&.gitea_token)
|
||||
@commit_diff = Gitea::Repository::Commits::GetService.call(@owner.login, @repository.identifier, @sha, current_user&.gitea_token, {diff: true})
|
||||
end
|
||||
|
||||
def tags
|
||||
result = Gitea::Repository::Tags::ListService.call(current_user&.gitea_token, @owner.login, @project.identifier, {page: params[:page], limit: params[:limit]})
|
||||
|
||||
@tags = result.is_a?(Hash) && result.key?(:status) ? [] : result
|
||||
end
|
||||
|
||||
def contributors
|
||||
@contributors = Gitea::Repository::Contributors::GetService.call(@owner, @repository.identifier)
|
||||
end
|
||||
|
||||
def edit
|
||||
return render_forbidden if !@project.manager?(current_user) && !current_user.admin?
|
||||
end
|
||||
|
||||
def create_file
|
||||
interactor = Gitea::CreateFileInteractor.call(current_user.gitea_token, @owner.login, content_params)
|
||||
interactor = Repositories::EntriesInteractor.call(@project.owner, @project.identifier, file_path_uri, ref: @ref)
|
||||
if interactor.success?
|
||||
@file = interactor.result
|
||||
# create_new_pr(params)
|
||||
#如果是更新流水线文件
|
||||
if params[:pipeline_id]
|
||||
update_pipeline(params[:pipeline_id])
|
||||
end
|
||||
result = interactor.result
|
||||
return @sub_entries = [] if result.is_a?(Hash) && result[:status] == -1
|
||||
|
||||
@sub_entries = result.is_a?(Array) ? result : [result]
|
||||
@sub_entries = @sub_entries.sort_by{ |hash| hash['type'] }
|
||||
else
|
||||
render_error(interactor.error)
|
||||
end
|
||||
end
|
||||
|
||||
def update_pipeline(pipeline_id)
|
||||
pipeline = Ci::Pipeline.find(pipeline_id)
|
||||
if pipeline
|
||||
pipeline.update!(sync: 1)
|
||||
def commits
|
||||
@project_owner = @project.owner
|
||||
@hash_commit = 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
|
||||
end
|
||||
|
||||
def commit
|
||||
@commit = Gitea::Repository::Commits::GetService.new(@repository.user.login, @repository.identifier, params[:sha], current_user.gitea_token).call
|
||||
end
|
||||
|
||||
def tags
|
||||
@tags = Gitea::Repository::Tags::ListService.new(current_user&.gitea_token, @project.owner.login, @project.identifier, {page: params[:page], limit: params[:limit]}).call
|
||||
end
|
||||
|
||||
def edit
|
||||
end
|
||||
|
||||
def create_file
|
||||
interactor = Gitea::CreateFileInteractor.call(current_user.gitea_token, @project.owner.login, content_params)
|
||||
if interactor.success?
|
||||
@file = interactor.result
|
||||
create_new_pr(params)
|
||||
else
|
||||
render_error(interactor.error)
|
||||
end
|
||||
end
|
||||
|
||||
def update_file
|
||||
interactor = Gitea::UpdateFileInteractor.call(current_user.gitea_token, @owner.login, params.merge(identifier: @project.identifier))
|
||||
interactor = Gitea::UpdateFileInteractor.call(current_user.gitea_token, @project.owner.login, params.merge(identifier: @project.identifier))
|
||||
if interactor.success?
|
||||
@file = interactor.result
|
||||
# TODO: 是否创建pr
|
||||
# create_new_pr(params)
|
||||
create_new_pr(params)
|
||||
render_result(1, "更新成功")
|
||||
else
|
||||
render_error(interactor.error)
|
||||
|
|
@ -160,7 +89,7 @@ class RepositoriesController < ApplicationController
|
|||
end
|
||||
|
||||
def delete_file
|
||||
interactor = Gitea::DeleteFileInteractor.call(current_user.gitea_token, @owner.login, params.merge(identifier: @project.identifier))
|
||||
interactor = Gitea::DeleteFileInteractor.call(current_user.gitea_token, @project.owner.login, params.merge(identifier: @project.identifier))
|
||||
if interactor.success?
|
||||
@file = interactor.result
|
||||
render_result(1, "文件删除成功")
|
||||
|
|
@ -181,17 +110,6 @@ class RepositoriesController < ApplicationController
|
|||
render_ok
|
||||
end
|
||||
|
||||
def readme
|
||||
result = Gitea::Repository::Readme::GetService.call(@owner.login, @repository.identifier, params[:ref], current_user&.gitea_token)
|
||||
|
||||
@readme = result[:status] === :success ? result[:body] : nil
|
||||
render json: @readme
|
||||
end
|
||||
|
||||
def languages
|
||||
render json: languages_precentagable
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def find_project
|
||||
|
|
@ -217,18 +135,18 @@ class RepositoriesController < ApplicationController
|
|||
end
|
||||
|
||||
def get_statistics
|
||||
@branches_count = @project.educoder? ? 0 : Gitea::Repository::Branches::ListService.new(@project.owner, @project.identifier).call&.size
|
||||
@tags_count = @project.educoder? ? 0 : Gitea::Repository::Tags::ListService.new(current_user&.gitea_token, @project.owner.login, @project.identifier).call&.size
|
||||
@branches_count = Gitea::Repository::Branches::ListService.new(@project.owner, @project.identifier).call&.size
|
||||
@tags_count = Gitea::Repository::Tags::ListService.new(current_user&.gitea_token, @project.owner.login, @project.identifier).call&.size
|
||||
end
|
||||
|
||||
def get_ref
|
||||
@ref = params[:ref] || @project&.default_branch
|
||||
@ref = params[:ref] || "master"
|
||||
end
|
||||
|
||||
def get_latest_commit
|
||||
latest_commit = @project.educoder? ? nil : project_commits
|
||||
@latest_commit = latest_commit.present? ? latest_commit[:body][0] : nil
|
||||
@commits_count = latest_commit.present? ? latest_commit[:total_count] : 0
|
||||
latest_commit = project_commits
|
||||
@latest_commit = latest_commit[:body][0] if latest_commit.present?
|
||||
@commits_count = latest_commit[:total_count] if latest_commit.present?
|
||||
end
|
||||
|
||||
def content_params
|
||||
|
|
@ -296,14 +214,14 @@ class RepositoriesController < ApplicationController
|
|||
issue_type: "1",
|
||||
tracker_id: 2,
|
||||
status_id: 1,
|
||||
priority_id: params[:priority_id] || "2"
|
||||
priority_id: 1
|
||||
}
|
||||
@pull_issue = Issue.new(issue_params)
|
||||
if @pull_issue.save!
|
||||
local_requests = PullRequest.new(local_params.merge(user_id: current_user.try(:id), project_id: @project.id, issue_id: @pull_issue.id))
|
||||
if local_requests.save
|
||||
gitea_request = Gitea::PullRequest::CreateService.new(current_user.try(:gitea_token), @owner.login, @project.try(:identifier), requests_params).call
|
||||
if gitea_request[:status] == :success && local_requests.update_attributes(gpid: gitea_request["body"]["number"])
|
||||
gitea_request = Gitea::PullRequest::CreateService.new(current_user.try(:gitea_token), @project.owner, @project.try(:identifier), requests_params).call
|
||||
if gitea_request && local_requests.update_attributes(gpid: gitea_request["number"])
|
||||
local_requests.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "create")
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,57 +1,6 @@
|
|||
class SettingsController < ApplicationController
|
||||
def show
|
||||
@old_projects_url = nil
|
||||
get_add_menu
|
||||
get_common_menu
|
||||
get_personal_menu
|
||||
|
||||
@old_projects_url = nil
|
||||
@old_projects_url = "https://www.trustie.net/users/#{current_user.try(:login)}/projects" if User.current.logged?
|
||||
end
|
||||
|
||||
private
|
||||
def get_add_menu
|
||||
@add = []
|
||||
Site.add.select(:id, :name, :url, :key).to_a.map(&:serializable_hash).each do |site|
|
||||
hash = {}
|
||||
site.each {|k, v|
|
||||
hash.merge!("#{k}": get_site_url(k, v))
|
||||
}
|
||||
@add << hash
|
||||
end
|
||||
end
|
||||
|
||||
def get_common_menu
|
||||
@common = {}
|
||||
Site.common.select(:url, :key).each do |site|
|
||||
next if site["url"].to_s.include?("current_user") && !User.current.logged?
|
||||
@common.merge!("#{site["key"]}": append_http(reset_site_url(site["url"])))
|
||||
end
|
||||
end
|
||||
|
||||
def get_personal_menu
|
||||
@personal = []
|
||||
if User.current.logged?
|
||||
Site.personal.select(:id, :name, :url, :key).to_a.map(&:serializable_hash).each do |site|
|
||||
hash = {}
|
||||
site.each {|k, v|
|
||||
hash.merge!("#{k}": get_site_url(k, v))
|
||||
}
|
||||
@personal << hash
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def get_site_url(key, value)
|
||||
key.to_s === "url" ? append_http(reset_site_url(value)) : reset_site_url(value)
|
||||
end
|
||||
|
||||
def reset_site_url(url)
|
||||
return url unless url.to_s.include?("current_user")
|
||||
|
||||
split_arr = url.split('current_user')
|
||||
split_arr.length > 1 ? split_arr.join(current_user&.login) : (split_arr << current_user&.login).join('')
|
||||
end
|
||||
|
||||
def append_http(url)
|
||||
url.to_s.start_with?("http") ? url : [request.protocol, request.host_with_port, url].join('')
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
class StatisticController < ApplicationController
|
||||
|
||||
# 平台概况
|
||||
def platform_profile
|
||||
@platform_user_query = Statistic::PlatformUserQuery.new(params).call
|
||||
@platform_project_query = Statistic::PlatformProjectQuery.new(params).call
|
||||
@platform_course_query = Statistic::PlatformCourseQuery.new(params).call
|
||||
end
|
||||
|
||||
# 平台代码提交数据
|
||||
def platform_code
|
||||
@platform_pull_request_query = Statistic::PlatformPullRequestQuery.new(params).call
|
||||
@platform_commit_query = Statistic::PlatformCommitQuery.new(params,current_user).call
|
||||
end
|
||||
|
||||
# 项目案例活跃度排行榜
|
||||
def active_project_rank
|
||||
@active_project_rank_query = Statistic::ActiveProjectRankQuery.new(params, current_user).call
|
||||
end
|
||||
|
||||
# 开发者活跃度排行榜
|
||||
def active_developer_rank
|
||||
@active_developer_rank_query = Statistic::ActiveDeveloperRankQuery.new(params, current_user).call
|
||||
end
|
||||
end
|
||||
|
|
@ -12,11 +12,11 @@ class SyncForgeController < ApplicationController
|
|||
end
|
||||
end
|
||||
|
||||
# def create
|
||||
# def create
|
||||
# ActiveRecord::Base.transaction do
|
||||
# params.permit!
|
||||
# sync_params = params[:sync_params]
|
||||
# project_user = User.where(login: sync_params[:owner_login])&.first
|
||||
# project_user = User.where(login: sync_params[:owner_login])&.first
|
||||
# #以前已同步的项目,那么肯定存在仓库
|
||||
# SyncLog.sync_log("=================begin_to_sync_forge: project_identifier: #{sync_params[:identifier]}========")
|
||||
# user_projects = Project.where(user_id: project_user.id)
|
||||
|
|
@ -38,7 +38,7 @@ class SyncForgeController < ApplicationController
|
|||
# check_sync_project(project, sync_params)
|
||||
# else #新建项目
|
||||
# SyncLog.sync_log("=================begin_to_create_new_project========")
|
||||
|
||||
|
||||
# project_params = {
|
||||
# repository_name: sync_params[:identifier],
|
||||
# user_id: project_user.id,
|
||||
|
|
@ -53,7 +53,7 @@ class SyncForgeController < ApplicationController
|
|||
# new_project_score = ProjectScore.create(score_params)
|
||||
# SyncLog.sync_log("=================new_project_score:#{new_project_score.try(:id)}========")
|
||||
# end
|
||||
|
||||
|
||||
# SyncRepositoryJob.perform_later(sync_params[:owner_login], sync_params[:identifier], sync_params[:repository], get_sudomain) if sync_params[:repository].present?
|
||||
# check_new_project(project, sync_params)
|
||||
# else
|
||||
|
|
@ -115,7 +115,7 @@ class SyncForgeController < ApplicationController
|
|||
# SyncLog.sync_log("=================sync_user_failed====#{e}")
|
||||
# end
|
||||
|
||||
# private
|
||||
# private
|
||||
|
||||
# def check_sync_project(project,sync_params)
|
||||
# begin
|
||||
|
|
@ -125,8 +125,8 @@ class SyncForgeController < ApplicationController
|
|||
# # end
|
||||
|
||||
# SyncLog.sync_log("----begin_to_check_sync_project----project_id:#{project.id}---------------")
|
||||
# change_project_score(project, sync_params[:project_score], sync_params[:repository]) if sync_params[:repository].present? #更新project_score
|
||||
# change_project_issues(project, sync_params[:issues],project.id, gitea_main)
|
||||
# change_project_score(project, sync_params[:project_score], sync_params[:repository]) if sync_params[:repository].present? #更新project_score
|
||||
# change_project_issues(project, sync_params[:issues],project.id, gitea_main)
|
||||
# change_project_members(project, sync_params[:members],gitea_main)
|
||||
# change_project_versions(project, sync_params[:project_versions],gitea_main)
|
||||
# change_project_watchers(project, sync_params[:project_watchers],gitea_main)
|
||||
|
|
@ -134,7 +134,7 @@ class SyncForgeController < ApplicationController
|
|||
# rescue => e
|
||||
# SyncLog.sync_log("=========check_sync_project_errors:#{e}===================")
|
||||
# end
|
||||
|
||||
|
||||
# end
|
||||
|
||||
# def check_new_project(project,sync_params)
|
||||
|
|
@ -167,7 +167,7 @@ class SyncForgeController < ApplicationController
|
|||
# parent_id: project.id
|
||||
# }
|
||||
# SyncProjectsJob.perform_later(sync_projects_params,gitea_main)
|
||||
|
||||
|
||||
# SyncLog.sync_log("***6. end_to_sync_parises---------------")
|
||||
# end
|
||||
# end
|
||||
|
|
@ -189,7 +189,7 @@ class SyncForgeController < ApplicationController
|
|||
# end
|
||||
# end
|
||||
# pre_project_score.save! if change_num > 0 #如果 project_score有变化则更新
|
||||
# else
|
||||
# else
|
||||
# ProjectScore.create!(project_scores.merge(project_id: project.id))
|
||||
# end
|
||||
# SyncLog.sync_log("***1. end_to_sync_project_score---------------")
|
||||
|
|
@ -206,7 +206,7 @@ class SyncForgeController < ApplicationController
|
|||
# SyncLog.sync_log("***2--01. forge_issue_ids-#{forge_issue_ids.size.to_i}--------------")
|
||||
# if forge_issue_ids.size.to_i <= old_issues_params[:count].to_i
|
||||
# diff_issue_ids = old_issues_params[:ids] - forge_issue_ids
|
||||
|
||||
|
||||
# if diff_issue_ids.size == 0 #issue数量一样，判断评论是否有增减
|
||||
# forge_journal_ids = Journal.select([:id, :journalized_id, :journalized_type]).where(journalized_id: forge_issue_ids).pluck(:id)
|
||||
# diff_journal_ids = old_issues_params[:journals][:ids] - forge_journal_ids
|
||||
|
|
@ -241,10 +241,10 @@ class SyncForgeController < ApplicationController
|
|||
# # }
|
||||
# # SyncLog.sync_log("***2--03. sync_projects_params_groups-#{sync_projects_params}--------------")
|
||||
# # SyncProjectsJob.perform_later(sync_projects_params, gitea_main)
|
||||
|
||||
|
||||
# end
|
||||
# end
|
||||
|
||||
|
||||
# # SyncProjectsJob.perform_later(sync_projects_params, gitea_main) if sync_projects_params.present?
|
||||
# SyncLog.sync_log("***2. end_to_syncissues---------------")
|
||||
# rescue Exception => e
|
||||
|
|
@ -265,7 +265,7 @@ class SyncForgeController < ApplicationController
|
|||
# parent_id: project.id
|
||||
# }
|
||||
# SyncProjectsJob.perform_later(sync_projects_params,gitea_main)
|
||||
|
||||
|
||||
# end
|
||||
# end
|
||||
# SyncLog.sync_log("***5. begin_to_sync_watchers---------------")
|
||||
|
|
@ -285,7 +285,7 @@ class SyncForgeController < ApplicationController
|
|||
# }
|
||||
# SyncProjectsJob.perform_later(sync_projects_params,gitea_main)
|
||||
# end
|
||||
|
||||
|
||||
# SyncLog.sync_log("***4. end_to_sync_versions---------------")
|
||||
# end
|
||||
# end
|
||||
|
|
@ -304,12 +304,12 @@ class SyncForgeController < ApplicationController
|
|||
# }
|
||||
# SyncProjectsJob.perform_later(sync_projects_params,gitea_main)
|
||||
# end
|
||||
|
||||
|
||||
# SyncLog.sync_log("***3. end_to_sync_members---------------")
|
||||
# end
|
||||
# end
|
||||
|
||||
# def check_token
|
||||
# def check_token
|
||||
# sync_params = params[:sync_params]
|
||||
# unless sync_params[:token] && sync_params[:token] == get_token
|
||||
# render json: {message: "token_errors"}
|
||||
|
|
@ -331,4 +331,4 @@ class SyncForgeController < ApplicationController
|
|||
# return gitea_main
|
||||
# end
|
||||
|
||||
end
|
||||
end
|
||||
|
|
@ -1,18 +0,0 @@
|
|||
class Users::AppliedMessagesController < Users::BaseController
|
||||
before_action :check_auth
|
||||
after_action :view_messages, only: [:index]
|
||||
|
||||
def index
|
||||
@applied_messages = @_observed_user.applied_messages.order(viewed: :asc, created_at: :desc)
|
||||
@applied_messages = paginate @applied_messages
|
||||
end
|
||||
|
||||
private
|
||||
def check_auth
|
||||
return render_forbidden unless current_user.admin? || observed_logged_user?
|
||||
end
|
||||
|
||||
def view_messages
|
||||
@applied_messages.update_all(viewed: 'viewed')
|
||||
end
|
||||
end
|
||||
|
|
@ -1,39 +0,0 @@
|
|||
class Users::AppliedProjectsController < Users::BaseController
|
||||
before_action :check_auth
|
||||
before_action :find_applied_project, except: [:index]
|
||||
before_action :find_project, except: [:index]
|
||||
|
||||
def index
|
||||
@applied_projects = AppliedProject.where(project_id: observed_user.full_admin_projects)
|
||||
@applied_projects = paginate @applied_projects.order("created_at desc")
|
||||
end
|
||||
|
||||
# 接受申请
|
||||
def accept
|
||||
@applied_project = Projects::AcceptJoinService.call(current_user, @applied_project)
|
||||
rescue Exception => e
|
||||
uid_logger_error(e.message)
|
||||
tip_exception(e.message)
|
||||
end
|
||||
|
||||
# 拒绝申请
|
||||
def refuse
|
||||
@applied_project = Projects::RefuseJoinService.call(current_user, @applied_project)
|
||||
rescue Exception => e
|
||||
uid_logger_error(e.message)
|
||||
tip_exception(e.message)
|
||||
end
|
||||
|
||||
private
|
||||
def check_auth
|
||||
return render_forbidden unless current_user.admin? || observed_logged_user?
|
||||
end
|
||||
|
||||
def find_applied_project
|
||||
@applied_project = AppliedProject.find_by_id params[:id]
|
||||
end
|
||||
|
||||
def find_project
|
||||
@project = @applied_project.project
|
||||
end
|
||||
end
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
class Users::AppliedTransferProjectsController < Users::BaseController
|
||||
before_action :check_auth
|
||||
before_action :find_applied_transfer_project, except: [:index]
|
||||
before_action :find_project, except: [:index]
|
||||
|
||||
def index
|
||||
user_collection_sql = AppliedTransferProject.where(owner_id: @_observed_user.id).to_sql
|
||||
org_collection_sql = AppliedTransferProject.where(owner_id: Organization.joins(team_users: :team).where(team_users: {user_id: @_observed_user.id}, teams: {authorize: %w(admin owner)} )).to_sql
|
||||
@applied_transfer_projects = AppliedTransferProject.from("( #{ user_collection_sql } UNION #{ org_collection_sql } ) AS applied_transfer_projects")
|
||||
@applied_transfer_projects = paginate @applied_transfer_projects.order("created_at desc")
|
||||
end
|
||||
|
||||
# 接受迁移
|
||||
def accept
|
||||
@applied_transfer_project = Projects::AcceptTransferService.call(current_user, @project)
|
||||
rescue Exception => e
|
||||
uid_logger_error(e.message)
|
||||
tip_exception(e.message)
|
||||
end
|
||||
|
||||
# 拒绝迁移
|
||||
def refuse
|
||||
@applied_transfer_project = Projects::RefuseTransferService.call(current_user, @project)
|
||||
rescue Exception => e
|
||||
uid_logger_error(e.message)
|
||||
tip_exception(e.message)
|
||||
end
|
||||
|
||||
private
|
||||
def check_auth
|
||||
return render_forbidden unless current_user.admin? || observed_logged_user?
|
||||
end
|
||||
|
||||
def find_applied_transfer_project
|
||||
@applied_transfer_project = AppliedTransferProject.find_by_id params[:id]
|
||||
end
|
||||
|
||||
def find_project
|
||||
@project = @applied_transfer_project.project
|
||||
end
|
||||
end
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
class Users::BanksController < Users::BaseController
|
||||
before_action :params_filter
|
||||
def index
|
||||
order = CourseList.column_names.include?(params[:order]) ? params[:order] : "updated_at"
|
||||
sort = %w(desc asc).includes?(params[:sort]) ? params[:sort] : "desc"
|
||||
order = params[:order] || "updated_at"
|
||||
sort = params[:sort] || "desc"
|
||||
@banks = @object_type.classify.constantize.where(@object_filter)
|
||||
@course_lists = CourseList.where(id: @banks.pluck(:course_list_id))
|
||||
@banks = @banks.where(course_list_id: params[:tag_id]) unless params[:tag_id].blank?
|
||||
|
|
|
|||
|
|
@ -1,26 +0,0 @@
|
|||
class Users::HeadmapsController < Users::BaseController
|
||||
def index
|
||||
result = Gitea::User::HeadmapService.call(observed_user.login, start_stamp, end_stamp)
|
||||
@headmaps = result[2]
|
||||
rescue Exception => e
|
||||
uid_logger_error(e.message)
|
||||
tip_exception(e.message)
|
||||
end
|
||||
|
||||
private
|
||||
def start_stamp
|
||||
if params[:year].present?
|
||||
Date.new(params[:year], 1).to_time.to_i
|
||||
else
|
||||
Date.today.to_time.to_i - 365*24*60*60
|
||||
end
|
||||
end
|
||||
|
||||
def end_stamp
|
||||
if params[:year].present?
|
||||
Date.new(params[:year], 1).to_time.to_i + 365*24*60*60
|
||||
else
|
||||
Date.today.to_time.to_i
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -1,45 +0,0 @@
|
|||
class Users::IsPinnedProjectsController < Users::BaseController
|
||||
before_action :private_user_resources!, only: [:pin]
|
||||
def index
|
||||
@is_pinned_projects = observed_user.pinned_projects.order(position: :desc, created_at: :asc).includes(project: [:project_category, :project_language, :repository]).order(position: :desc)
|
||||
@is_pinned_projects = kaminari_paginate(@is_pinned_projects)
|
||||
end
|
||||
|
||||
def pin
|
||||
observed_user.is_pinned_project_ids = is_pinned_project_ids
|
||||
render_ok
|
||||
rescue ActiveRecord::RecordNotFound => e
|
||||
render_not_found
|
||||
rescue Exception => e
|
||||
uid_logger_error(e.message)
|
||||
tip_exception(e.message)
|
||||
end
|
||||
|
||||
def update
|
||||
@pinned_project = PinnedProject.find_by_id(params[:id])
|
||||
@pinned_project.attributes = pinned_project_params
|
||||
if @pinned_project.save
|
||||
render_ok
|
||||
else
|
||||
render_error
|
||||
end
|
||||
rescue Exception => e
|
||||
uid_logger_error(e.message)
|
||||
tip_exception(e.message)
|
||||
end
|
||||
|
||||
private
|
||||
def is_pinned_project_ids
|
||||
if params[:is_pinned_project_ids].present?
|
||||
return params[:is_pinned_project_ids].select{|id| observed_user.full_member_projects.visible.pluck(:id).include?(id.to_i) }
|
||||
end
|
||||
if params[:is_pinned_project_id].present?
|
||||
return observed_user.is_pinned_project_ids unless observed_user.full_member_projects.visible.pluck(:id).include?(params[:is_pinned_project_id].to_i)
|
||||
return observed_user.is_pinned_project_ids.include?(params[:is_pinned_project_id].to_i) ? observed_user.is_pinned_project_ids : observed_user.is_pinned_project_ids.push(params[:is_pinned_project_id].to_i)
|
||||
end
|
||||
end
|
||||
|
||||
def pinned_project_params
|
||||
params.require(:pinned_project).permit(:position)
|
||||
end
|
||||
end
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
class Users::OrganizationsController < Users::BaseController
|
||||
|
||||
def index
|
||||
if current_user.logged?
|
||||
logged_organizations_sql = observed_user.organizations.with_visibility(%w(common limited)).to_sql
|
||||
privacy_organizations_sql = observed_user.organizations.with_visibility("privacy").joins(:organization_users).where(organization_users: {user_id: current_user.id}).to_sql
|
||||
@organizations = Organization.from("( #{ logged_organizations_sql } UNION #{ privacy_organizations_sql } ) AS users")
|
||||
else
|
||||
@organizations = observed_user.organizations.with_visibility("common")
|
||||
end
|
||||
|
||||
@organizations = @organizations.ransack(login_cont: params[:search]).result if params[:search].present?
|
||||
@organizations = @organizations.includes(:organization_extension).order("organization_extensions.#{sort_by} #{sort_direction}")
|
||||
@organizations = kaminari_paginate(@organizations)
|
||||
end
|
||||
|
||||
private
|
||||
def sort_by
|
||||
OrganizationExtension.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'created_at'
|
||||
end
|
||||
|
||||
def sort_direction
|
||||
%w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : 'desc'
|
||||
end
|
||||
end
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
class Users::ProjectTrendsController < Users::BaseController
|
||||
|
||||
def index
|
||||
if params[:date].present?
|
||||
@project_trends = observed_user.project_trends.where("DATE(created_at) = ?", params[:date])
|
||||
else
|
||||
@project_trends = observed_user.project_trends
|
||||
end
|
||||
@project_trends = kaminari_paginate(@project_trends.includes(:trend, :project).order(created_at: :desc))
|
||||
end
|
||||
end
|
||||
|
|
@ -1,217 +0,0 @@
|
|||
class Users::StatisticsController < Users::BaseController
|
||||
before_action :preload_develop_data, only: [:develop]
|
||||
|
||||
# 近期活动统计
|
||||
def activity
|
||||
date_range = (1.week.ago.to_date..Date.today).to_a
|
||||
commit_request = Gitea::User::HeadmapService.call(observed_user.login, 1.week.ago.to_date.to_time.to_i, Date.today.to_time.to_i)
|
||||
commit_data = commit_request[2]
|
||||
@date_data = []
|
||||
@issue_data = []
|
||||
@pull_request_data = []
|
||||
@commit_data = []
|
||||
date_range.each do |date|
|
||||
@date_data << date.strftime("%Y.%m.%d")
|
||||
@issue_data << observed_user.issues.where("DATE(created_on) = ?", date).size
|
||||
@pull_request_data << observed_user.pull_requests.where("DATE(created_at) = ?", date).size
|
||||
date_commit_data = commit_data.select{|item| item["timestamp"] == date.to_time.to_i}
|
||||
@commit_data << (date_commit_data.blank? ? 0 : date_commit_data[0]["contributions"].to_i)
|
||||
end
|
||||
render :json => {dates: @date_data, issues_count: @issue_data, pull_requests_count: @pull_request_data, commits_count: @commit_data}
|
||||
end
|
||||
|
||||
# 开发能力
|
||||
def develop
|
||||
if params[:start_time].present? && params[:end_time].present?
|
||||
# 影响力
|
||||
@influence = (60.0 + @follow_count / (@follow_count + 10.0) * 40.0).to_i
|
||||
@platform_influence = (60.0 + @platform_follow_count / (@platform_follow_count + 10.0) * 40.0).to_i
|
||||
# 贡献度
|
||||
@contribution = (60.0 + @pullrequest_count / (@pullrequest_count + 10.0) * 40.0).to_i
|
||||
@platform_contribution = (60.0 + @platform_pullrequest_count / (@platform_pullrequest_count + 10.0) * 40.0).to_i
|
||||
# 活跃度
|
||||
@activity = (60.0 + @issues_count / (@issues_count + 10.0) * 40.0).to_i
|
||||
@platform_activity = (60.0 + @platform_issues_count / (@platform_issues_count + 10.0) * 40.0).to_i
|
||||
# 项目经验
|
||||
@experience = 10 * @project_count + 5 * @fork_count + @project_watchers_count + @project_praises_count
|
||||
@experience = (60.0 + @experience / (@experience + 100.0) * 40.0).to_i
|
||||
@platform_experience = 10 * @platform_project_count + 5 * @platform_fork_count + @platform_project_watchers_count + @platform_project_praises_count
|
||||
@platform_experience = (60.0 + @platform_experience / (@platform_experience + 100.0) * 40.0).to_i
|
||||
# 语言能力
|
||||
@language = (60.0 + @project_languages_count.length / (@project_languages_count.length + 5.0) * 40.0).to_i
|
||||
@platform_language = (60.0 + @platform_project_languages_count.length / (@platform_project_languages_count.length + 5.0) * 40.0).to_i
|
||||
# 语言百分比
|
||||
@languages_percent = Hash.new
|
||||
for key in @project_languages_count.keys do
|
||||
@languages_percent[key] = (@project_languages_count[key].to_f / @project_languages_count.values.sum).round(2)
|
||||
end
|
||||
@platform_languages_percent = Hash.new
|
||||
for key in @platform_project_languages_count.keys do
|
||||
@platform_languages_percent[key] = (@platform_project_languages_count[key].to_f / @platform_project_languages_count.values.sum).round(2)
|
||||
end
|
||||
# 各门语言分数
|
||||
@each_language_score = Hash.new
|
||||
for key in @project_languages_count.keys do
|
||||
@each_language_score[key] = (60.0 + @project_languages_count[key] / (@project_languages_count[key] + 5.0) * 40.0).to_i
|
||||
end
|
||||
@platform_each_language_score = Hash.new
|
||||
for key in @platform_project_languages_count.keys do
|
||||
@platform_each_language_score[key] = (60.0 + @platform_project_languages_count[key] / (@platform_project_languages_count[key] + 5.0) * 40.0).to_i
|
||||
end
|
||||
else
|
||||
# 影响力
|
||||
@influence = (60.0 + @follow_count / (@follow_count + 20.0) * 40.0).to_i
|
||||
@platform_influence = (60.0 + @platform_follow_count / (@platform_follow_count + 20.0) * 40.0).to_i
|
||||
|
||||
# 贡献度
|
||||
@contribution = (60.0 + @pullrequest_count / (@pullrequest_count + 20.0) * 40.0).to_i
|
||||
@platform_contribution = (60.0 + @platform_pullrequest_count / (@platform_pullrequest_count + 20.0) * 40.0).to_i
|
||||
|
||||
# 活跃度
|
||||
@activity = (60.0 + @issues_count / (@issues_count + 80.0) * 40.0).to_i
|
||||
@platform_activity = (60.0 + @platform_issues_count / (@platform_issues_count + 80.0) * 40.0).to_i
|
||||
|
||||
# 项目经验
|
||||
@experience = 10 * @project_count + 5 * @fork_count + @project_watchers_count + @project_praises_count
|
||||
@experience = (60.0 + @experience / (@experience + 100.0) * 40.0).to_i
|
||||
@platform_experience = 10 * @platform_project_count + 5 * @platform_fork_count + @platform_project_watchers_count + @platform_project_praises_count
|
||||
@platform_experience = (60.0 + @platform_experience / (@platform_experience + 100.0) * 40.0).to_i
|
||||
# 语言能力
|
||||
@language = (60.0 + @project_languages_count.length / (@project_languages_count.length + 5.0) * 40.0).to_i
|
||||
@platform_language = (60.0 + @platform_project_languages_count.length / (@platform_project_languages_count.length + 5.0) * 40.0).to_i
|
||||
|
||||
# 语言百分比
|
||||
@languages_percent = Hash.new
|
||||
for key in @project_languages_count.keys do
|
||||
@languages_percent[key] = (@project_languages_count[key].to_f / @project_languages_count.values.sum).round(2)
|
||||
end
|
||||
# @platform_languages_percent = Hash.new
|
||||
# for key in @platform_project_languages_count.keys do
|
||||
# @platform_languages_percent[key] = (@platform_project_languages_count[key].to_f / @platform_project_languages_count.values.sum).round(2)
|
||||
# end
|
||||
# 各门语言分数
|
||||
@each_language_score = Hash.new
|
||||
for key in @project_languages_count.keys do
|
||||
@each_language_score[key] = (60.0 + @project_languages_count[key] / (@project_languages_count[key] + 5.0) * 40.0).to_i
|
||||
end
|
||||
# @platform_each_language_score = Hash.new
|
||||
# for key in @platform_project_languages_count.keys do
|
||||
# @platform_each_language_score[key] = (60.0 + @platform_project_languages_count[key] / (@platform_project_languages_count[key] + 5.0) * 40.0).to_i
|
||||
# end
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
# 角色定位
|
||||
def role
|
||||
full_member_projects = observed_user.full_member_projects
|
||||
owner_projects = filter_member_projects_by_role("Owner")
|
||||
manager_projects = filter_member_projects_by_role("Manager").where.not(id: owner_projects.ids)
|
||||
developer_projects = filter_member_projects_by_role("Developer").where.not(id: owner_projects.ids + manager_projects.ids)
|
||||
reporter_projects = filter_member_projects_by_role("Reporter").where.not(id: owner_projects.ids + manager_projects.ids + developer_projects.ids)
|
||||
|
||||
@full_member_projects_count = full_member_projects.size
|
||||
@owner_projects_count = owner_projects.size
|
||||
@manager_projects_count = manager_projects.size
|
||||
@developer_projects_count = developer_projects.size
|
||||
@reporter_projects_count = reporter_projects.size
|
||||
|
||||
end
|
||||
|
||||
# 专业定位
|
||||
def major
|
||||
# 参与项目
|
||||
join_normal_projects_sql = Project.members_projects(observed_user.id).to_sql
|
||||
join_org_projects_sql = Project.joins(team_projects: [team: :team_users]).where(team_users: {user_id: observed_user.id}).to_sql
|
||||
# 关注项目
|
||||
star_projects_sql = Project.joins(:watchers).where(watchers: {watchable_type: "Project", user_id: observed_user.id}).to_sql
|
||||
# fork项目
|
||||
fork_projects_sql = Project.where(id: observed_user.fork_users.select(:id, :fork_project_id).pluck(:fork_project_id)).to_sql
|
||||
major_projects = Project.from("( #{ join_normal_projects_sql} UNION #{ join_org_projects_sql } UNION #{ star_projects_sql } UNION #{fork_projects_sql}) AS projects").distinct
|
||||
categories = ProjectCategory.joins(:projects).merge(Project.where(id: time_filter(major_projects, 'created_on'))).distinct.pluck(:name)
|
||||
render :json => {categories: categories}
|
||||
end
|
||||
|
||||
private
|
||||
def time_filter(collection, time_field)
|
||||
if params[:start_time].present? && params[:end_time].present?
|
||||
return collection.where("#{time_field} > ? AND #{time_field} < ?", Time.at(params[:start_time].to_i).beginning_of_day, Time.at(params[:end_time].to_i).end_of_day)
|
||||
else
|
||||
return collection
|
||||
end
|
||||
rescue
|
||||
return collection
|
||||
end
|
||||
|
||||
def filter_member_projects_by_role(role)
|
||||
case role
|
||||
when 'Owner'
|
||||
normal_projects_sql = Project.joins(members: :roles).where(user_id: observed_user.id).where(members: {user_id: observed_user.id}, roles: {name: 'Manager'}).to_sql
|
||||
org_projects_sql = Project.joins(:owner, teams: :team_users).where(users: {type: 'Organization'}, teams: {authorize: "owner"}, team_users: {user_id: observed_user.id}).to_sql
|
||||
when "Manager"
|
||||
normal_projects_sql = Project.joins(members: :roles).where.not(user_id: observed_user.id).where(members: {user_id: observed_user.id}, roles: {name: 'Manager'}).to_sql
|
||||
org_projects_sql = Project.joins(:owner, teams: :team_users).where(users: {type: 'Organization'}, teams: {authorize: "admin"}, team_users: {user_id: observed_user.id}).to_sql
|
||||
when "Developer"
|
||||
normal_projects_sql = Project.joins(members: :roles).where.not(user_id: observed_user.id).where(members: {user_id: observed_user.id}, roles: {name: 'Developer'}).to_sql
|
||||
org_projects_sql = Project.joins(:owner, teams: :team_users).where(users: {type: 'Organization'}, teams: {authorize: "write"}, team_users: {user_id: observed_user.id}).to_sql
|
||||
when "Reporter"
|
||||
normal_projects_sql = Project.joins(members: :roles).where.not(user_id: observed_user.id).where(members: {user_id: observed_user.id}, roles: {name: 'Reporter'}).to_sql
|
||||
org_projects_sql = Project.joins(:owner, teams: :team_users).where(users: {type: 'Organization'}, teams: {authorize: "read"}, team_users: {user_id: observed_user.id}).to_sql
|
||||
end
|
||||
return time_filter(Project.from("( #{normal_projects_sql} UNION #{org_projects_sql} ) AS projects").distinct, 'created_on')
|
||||
end
|
||||
|
||||
def preload_develop_data
|
||||
if params[:start_time].present? && params[:end_time].present?
|
||||
# 用户被follow数量
|
||||
@follow_count = time_filter(Watcher.where(watchable: observed_user), 'created_at').count
|
||||
@platform_follow_count = time_filter(Watcher.where(watchable_type: 'User'), 'created_at').count
|
||||
# 用户pr数量
|
||||
@pullrequest_count = time_filter(PullRequest.where(user_id: observed_user.id), 'created_at').count
|
||||
@platform_pullrequest_count = time_filter(PullRequest, 'created_at').count
|
||||
# 用户issue数量
|
||||
@issues_count = time_filter(Issue.where(author_id: observed_user.id), 'created_on').count
|
||||
@platform_issues_count = time_filter(Issue, 'created_on').count
|
||||
# 用户总项目数
|
||||
@project_count = time_filter(Project.where(user_id:observed_user.id), 'created_on').count
|
||||
@platform_project_count = time_filter(Project, 'created_on').count
|
||||
# 用户项目被fork数量
|
||||
@fork_count = time_filter(Project.where(user_id:observed_user.id), 'created_on').sum("forked_count")
|
||||
@platform_fork_count = time_filter(Project, 'created_on').sum("forked_count")
|
||||
# 用户项目关注数
|
||||
@project_watchers_count = time_filter(Project.where(user_id: observed_user.id), 'created_on').sum("watchers_count")
|
||||
@platform_project_watchers_count = time_filter(Project, 'created_on').sum("watchers_count")
|
||||
# 用户项目点赞数
|
||||
@project_praises_count = time_filter(Project.where(user_id: observed_user.id), 'created_on').sum("praises_count")
|
||||
@platform_project_praises_count = time_filter(Project, 'created_on').sum("praises_count")
|
||||
# 用户不同语言项目数量
|
||||
@project_languages_count = time_filter(Project.where(user_id: observed_user.id), 'created_on').joins(:project_language).group("project_languages.name").count
|
||||
@platform_project_languages_count = time_filter(Project, 'created_on').joins(:project_language).group("project_languages.name").count
|
||||
else
|
||||
# 用户被follow数量
|
||||
@follow_count = Cache::UserFollowCountService.call(observed_user)
|
||||
@platform_follow_count = Cache::PlatformFollowCountService.call
|
||||
# 用户pr数量
|
||||
@pullrequest_count = Cache::UserPullrequestCountService.call(observed_user)
|
||||
@platform_pullrequest_count = Cache::PlatformPullrequestCountService.call
|
||||
# 用户issue数量
|
||||
@issues_count = Cache::UserIssueCountService.call(observed_user)
|
||||
@platform_issues_count = Cache::PlatformIssueCountService.call
|
||||
# 用户总项目数
|
||||
@project_count = Cache::UserProjectCountService.call(observed_user)
|
||||
@platform_project_count = Cache::PlatformProjectCountService.call
|
||||
# 用户项目被fork数量
|
||||
@fork_count = Cache::UserProjectForkCountService.call(observed_user)
|
||||
@platform_fork_count = Cache::PlatformProjectForkCountService.call
|
||||
# 用户项目关注数
|
||||
@project_watchers_count = Cache::UserProjectWatchersCountService.call(observed_user)
|
||||
@platform_project_watchers_count = Cache::PlatformProjectWatchersCountService.call
|
||||
# 用户项目点赞数
|
||||
@project_praises_count = Cache::UserProjectPraisesCountService.call(observed_user)
|
||||
@platform_project_praises_count = Cache::PlatformProjectPraisesCountService.call
|
||||
# 用户不同语言项目数量
|
||||
@project_languages_count = Cache::UserProjectLanguagesCountService.call(observed_user)
|
||||
@platform_project_languages_count = Cache::PlatformProjectLanguagesCountService.call
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -1,25 +1,11 @@
|
|||
class UsersController < ApplicationController
|
||||
include ApplicationHelper
|
||||
include Ci::DbConnectable
|
||||
|
||||
before_action :load_user, only: [:show, :homepage_info, :sync_token, :sync_gitea_pwd, :projects, :watch_users, :fan_users, :hovercard]
|
||||
before_action :check_user_exist, only: [:show, :homepage_info,:projects, :watch_users, :fan_users, :hovercard]
|
||||
before_action :require_login, only: %i[me list sync_user_info]
|
||||
before_action :connect_to_ci_db, only: [:get_user_info]
|
||||
before_action :convert_image!, only: [:update]
|
||||
before_action :load_user, only: [:show, :homepage_info, :sync_token, :sync_gitea_pwd, :projects, :watch_users, :fan_users]
|
||||
before_action :check_user_exist, only: [:show, :homepage_info,:projects, :watch_users, :fan_users]
|
||||
before_action :require_login, only: %i[me list]
|
||||
skip_before_action :check_sign, only: [:attachment_show]
|
||||
|
||||
def connect_to_ci_db(options={})
|
||||
if !(current_user && !current_user.is_a?(AnonymousUser) && current_user.devops_certification?)
|
||||
return
|
||||
end
|
||||
if current_user.ci_cloud_account.server_type == Ci::CloudAccount::SERVER_TYPE_TRUSTIE
|
||||
connect_to_trustie_ci_database(options)
|
||||
else
|
||||
connect_to_ci_database(options)
|
||||
end
|
||||
end
|
||||
|
||||
def list
|
||||
scope = User.active.recent.like(params[:search]).includes(:user_extension)
|
||||
@total_count = scope.size
|
||||
|
|
@ -28,26 +14,11 @@ class UsersController < ApplicationController
|
|||
|
||||
def show
|
||||
#待办事项，现在未做
|
||||
if User.current.admin? || User.current.login == @user.login
|
||||
@waiting_applied_messages = @user.applied_messages.waiting
|
||||
@common_applied_transfer_projects = AppliedTransferProject.where(owner_id: @user.id).common + AppliedTransferProject.where(owner_id: Organization.joins(team_users: :team).where(team_users: {user_id: @user.id}, teams: {authorize: %w(admin owner)} )).common
|
||||
@common_applied_projects = AppliedProject.where(project_id: @user.full_admin_projects).common
|
||||
@undo_events = @waiting_applied_messages.size + @common_applied_transfer_projects.size + @common_applied_projects.size
|
||||
else
|
||||
@waiting_applied_messages = AppliedMessage.none
|
||||
@common_applied_transfer_projects = AppliedTransferProject.none
|
||||
@common_applied_projects = AppliedProject.none
|
||||
@undo_events = 0
|
||||
end
|
||||
@undo_events = 0
|
||||
#用户的组织数量
|
||||
# @user_composes_count = @user.composes.size
|
||||
@user_composes_count = 0
|
||||
user_organizations = User.current.logged? ? @user.organizations.with_visibility(%w(common limited)) + @user.organizations.with_visibility("privacy").joins(:team_users).where(team_users: {user_id: current_user.id}) : @user.organizations.with_visibility("common")
|
||||
@user_org_count = user_organizations.size
|
||||
normal_projects = Project.members_projects(@user.id).to_sql
|
||||
org_projects = Project.joins(team_projects: [team: :team_users]).where(team_users: {user_id: @user.id}).to_sql
|
||||
projects = Project.from("( #{ normal_projects} UNION #{ org_projects } ) AS projects").distinct
|
||||
user_projects = User.current.logged? && (User.current.admin? || User.current.login == @user.login) ? projects : projects.visible
|
||||
user_projects = User.current.logged? && (User.current.admin? || User.current.login == @user.login) ? @user.projects : @user.projects.visible
|
||||
@projects_common_count = user_projects.common.size
|
||||
@projects_mirrior_count = user_projects.mirror.size
|
||||
@projects_sync_mirrior_count = user_projects.sync_mirror.size
|
||||
|
|
@ -65,22 +36,16 @@ class UsersController < ApplicationController
|
|||
|
||||
def fan_users
|
||||
watchers = @user.watchers.includes(:user).order("watchers.created_at desc")
|
||||
watchers = watchers.joins(:user).merge(User.like(params[:search]))
|
||||
watchers = watchers.joins(:user).where("LOWER(concat(users.lastname, users.firstname, users.login)) LIKE ?", "%#{params[:search].split(" ").join('|')}%") if params[:search].present?
|
||||
|
||||
@watchers_count = watchers.size
|
||||
@watchers = paginate(watchers)
|
||||
end
|
||||
|
||||
def hovercard
|
||||
end
|
||||
|
||||
def update
|
||||
return render_not_found unless @user = User.find_by_id(params[:id]) || User.find_by(login: params[:id])
|
||||
return render_forbidden unless User.current.logged? && (current_user&.admin? || current_user.id == @user.id)
|
||||
Util.write_file(@image, avatar_path(@user)) if user_params[:image].present?
|
||||
@user.attributes = user_params.except(:image)
|
||||
unless @user.save
|
||||
render_error(@user.errors.full_messages.join(", "))
|
||||
end
|
||||
@user = User.find params[:id]
|
||||
@user.update!(user_params)
|
||||
render_ok
|
||||
end
|
||||
|
||||
def me
|
||||
|
|
@ -254,39 +219,17 @@ class UsersController < ApplicationController
|
|||
render_ok
|
||||
end
|
||||
|
||||
def sync_user_info
|
||||
user = User.find_by_login params[:login]
|
||||
return render_forbidden unless user === current_user
|
||||
|
||||
sync_params = {
|
||||
email: params[:email],
|
||||
password: params[:password]
|
||||
}
|
||||
|
||||
Users::UpdateInfoForm.new(sync_params.merge(login: params[:login])).validate!
|
||||
|
||||
interactor = Gitea::User::UpdateInteractor.call(user.login, sync_params)
|
||||
if interactor.success?
|
||||
user.update!(password: params[:password], mail: params[:email], status: User::STATUS_EDIT_INFO)
|
||||
render_ok
|
||||
else
|
||||
render_error(interactor.error)
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
def load_user
|
||||
@user = User.find_by_login(params[:id]) || User.find_by(id: params[:id])
|
||||
end
|
||||
|
||||
def user_params
|
||||
params.require(:user).permit(:nickname, :image,
|
||||
params.require(:user).permit(:nickname, :lastname, :show_realname,:login,:mail,
|
||||
user_extension_attributes: [
|
||||
:gender, :location, :location_city,
|
||||
:occupation, :technical_title,
|
||||
:school_id, :department_id, :province, :city,
|
||||
:custom_department, :identity, :student_id, :description,
|
||||
:show_email, :show_location, :show_department]
|
||||
:school_id, :department_id,:identity, :student_id, :description]
|
||||
)
|
||||
end
|
||||
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue