Merge branch 'trustie_server' into standalone

This reverts commit 0e9699885d.

.gitignore

@@ -37,13 +37,11 @@ public/react/yarn.lock
 
 # Ignore react node_modules
 public/system/*
-public/react/*
 /public/react/.cache
 /public/react/node_modules/
 /public/react/config/stats.json
 /public/react/stats.json
 /public/react/.idea/*
-/public/react/build/*
 /public/h5build
 /public/npm-debug.log
 
@@ -74,6 +72,7 @@ vendor/bundle/
 /log
 /public/admin
 /mysql_data
+/public/repo/
 
 
 .generators
@@ -85,3 +84,4 @@ redis_data/
 Dockerfile
 dump.rdb
 .tags*
+ceshi_user.xlsx

.merge_file_a17580

@@ -1,529 +0,0 @@
-import React, {Component} from 'react';
-import logo from './logo.svg';
-import './App.css';
-import {LocaleProvider} from 'antd'
-import zhCN from 'antd/lib/locale-provider/zh_CN';
-import {
-	BrowserRouter as Router,
-	Route,
-	Switch
-} from 'react-router-dom';
-import axios from 'axios';
-import '@icedesign/base/dist/ICEDesignBase.css';
-
-import '@icedesign/base/index.scss';
-
-import LoginDialog from './modules/login/LoginDialog';
-import Notcompletedysl from './modules/user/Notcompletedysl';
-import Trialapplicationysl from './modules/login/Trialapplicationysl';
-import Trialapplicationreview from './modules/user/Trialapplicationreview';
-import Addcourses from "./modules/courses/coursesPublic/Addcourses";
-import AccountProfile from"./modules/user/AccountProfile";
-
-
-import Trialapplication from './modules/login/Trialapplication'
-
-import NotFoundPage from './NotFoundPage'
-
-import Loading from './Loading'
-
-import Loadable from 'react-loadable';
-
-
-import moment from 'moment'
-
-import {MuiThemeProvider, createMuiTheme} from 'material-ui/styles';
-
-// import './AppConfig'
-
-import history from './history';
-
-import {SnackbarHOC} from 'educoder'
-import {initAxiosInterceptors} from './AppConfig'
-
-
-// ！！！tpi需要这个来加载css
-import {TPMIndexHOC} from './modules/tpm/TPMIndexHOC';
-
-
-const theme = createMuiTheme({
-	palette: {
-		primary: {
-			main: '#4CACFF',
-			contrastText: 'rgba(255, 255, 255, 0.87)'
-		},
-		secondary: {main: '#4CACFF'}, // #11cb5f This is just green.A700 as hex.
-	},
-});
-//
-// const Trialapplication= Loadable({
-//     loader: () =>import('./modules/login/Trialapplication'),
-//     loading:Loading,
-// })
-//登入
-const EducoderLogin = Loadable({
-	loader: () => import('./modules/login/EducoderLogin'),
-	loading: Loading,
-})
-const TestIndex = Loadable({
-	loader: () => import('./modules/test'),
-	loading: Loading,
-})
-
-const IndexWrapperComponent = Loadable({
-	loader: () => import('./modules/page/IndexWrapper'),
-	loading: Loading,
-})
-
-const CommentComponent = Loadable({
-	loader: () => import('./modules/comment/CommentContainer'),
-	loading: Loading,
-})
-
-const TestMaterialDesignComponent = Loadable({
-	loader: () => import('./modules/test/md/TestMaterialDesign'),
-	loading: Loading,
-})
-const TestCodeMirrorComponent = Loadable({
-	loader: () => import('./modules/test/codemirror/TestCodeMirror'),
-	loading: Loading,
-})
-
-const TestComponent = Loadable({
-	loader: () => import('./modules/test/TestRC'),
-	loading: Loading,
-})
-const TestUrlQueryComponent = Loadable({
-	loader: () => import('./modules/test/urlquery/TestUrlQuery'),
-	loading: Loading,
-})
-
-const TPMIndexComponent = Loadable({
-	loader: () => import('./modules/tpm/TPMIndex'),
-	loading: Loading,
-})
-const TPMShixunsIndexComponent = Loadable({
-	loader: () => import('./modules/tpm/shixuns/ShixunsIndex'),
-	loading: Loading,
-})
-
-//实训课程（原实训路径）
-const ShixunPaths = Loadable({
-	loader: () => import('./modules/paths/Index'),
-	loading: Loading,
-})
-
-//在线课堂
-const CoursesIndex = Loadable({
-	loader: () => import('./modules/courses/Index'),
-	loading: Loading,
-})
-const SearchPage = Loadable({
-	loader: () => import('./search/SearchPage'),
-	loading: Loading,
-})
-
-//教学案例
-const MoopCases = Loadable({
-	loader: () => import('./modules/moop_cases/index'),
-	loading: Loading,
-})
-
-// 课堂讨论
-// const BoardIndex = Loadable({
-//   loader: () => import('./modules/courses/boards/BoardIndex'),
-//   loading:Loading,
-// })
-
-// //课堂普通作业&分组作业
-// const CoursesWorkIndex = Loadable({
-//   loader: () => import('./modules/courses/busyWork/Index'),
-//   loading:Loading,
-// })
-//
-
-// const TPMShixunchildIndexComponent = Loadable({
-//     loader: () => import('./modules/tpm/shixunchild/ShixunChildIndex'),
-//     loading: Loading,
-//   })
-
-
-// const TPMshixunfork_listIndexComponent = Loadable({
-//     loader: () => import('./modules/tpm/shixunchild/Shixunfork_list'),
-//     loading: Loading,
-//   })
-
-
-const ForumsIndexComponent = Loadable({
-	loader: () => import('./modules/forums/ForumsIndex'),
-	loading: Loading,
-})
-
-// trustie plus forum
-// const TPForumsIndexComponent = Loadable({
-//   loader: () => import('./modules/tp-forums/TPForumsIndex'),
-//   loading: Loading,
-// })
-
-
-// const TestPageComponent = Loadable({
-//   loader: () => import('./modules/page/Index'),
-//   loading: Loading,
-// })
-
-
-//新建实训
-const Newshixuns = Loadable({
-	loader: () => import('./modules/tpm/newshixuns/Newshixuns'),
-	loading: Loading,
-})
-
-
-//实训首页
-const ShixunsHome = Loadable({
-	loader: () => import('./modules/home/shixunsHome'),
-	loading: Loading,
-})
-
-
-const CompatibilityPageLoadable = Loadable({
-	loader: () => import('./modules/common/CompatibilityPage'),
-	loading: Loading,
-})
-
-//403页面
-const Shixunauthority = Loadable({
-	loader: () => import('./modules/403/Shixunauthority'),
-	loading: Loading,
-})
-
-
-//404页面
-const Shixunnopage = Loadable({
-	loader: () => import('./modules/404/Shixunnopage'),
-	loading: Loading,
-})
-
-//500页面
-const http500 = Loadable({
-	loader: () => import('./modules/500/http500'),
-	loading: Loading,
-})
-
-// 登录注册
-const LoginRegisterPage = Loadable({
-	loader: () => import('./modules/user/LoginRegisterPage'),
-	loading: Loading,
-})
-const AccountPage = Loadable({
-	loader: () => import('./modules/user/AccountPage'),
-	loading: Loading,
-})
-
-// 个人主页
-const UsersInfo = Loadable({
-	loader: () => import('./modules/user/usersInfo/Infos'),
-	loading: Loading,
-})
-
-// 兴趣页面
-const Interestpage = Loadable({
-	loader: () => import('./modules/login/EducoderInteresse'),
-	loading: Loading,
-})
-
-//众包创新
-const ProjectPackages=Loadable({
-	loader: () => import('./modules/projectPackages/ProjectPackageIndex'),
-	loading: Loading,
-})
-
-class App extends Component {
-	constructor(props) {
-		super(props)
-		// this.state = {
-		// 	isRenders:false,
-		// }
-
-	}
-
-	componentDidMount() {
-		// force an update if the URL changes
-		history.listen(() => {
-			this.forceUpdate()
-			const $ = window.$
-			// https://www.trustie.net/issues/21919 可能会有问题
-			$("html").animate({ scrollTop: $('html').scrollTop() - 0 })
-		});
-
-		initAxiosInterceptors(this.props)
-
-		//
-		// axios.interceptors.response.use((response) => {
-		// 	// console.log("response"+response);
-		// 	if(response!=undefined)
-		// 		// console.log("response"+response.data.statu);
-		// 	if (response&&response.data.status === 407) {
-		// 		this.setState({
-		// 			isRenders: true,
-		// 		})
-		// 	}
-		// 	return response;
-		// }, (error) => {
-		// 	//TODO 这里如果样式变了会出现css不加载的情况
-		// });
-	}
-	//修改登录方法
-	Modifyloginvalue=()=>{
-		this.setState({
-			isRender:false,
-		})
-	}
-
-	render() {
-
-
-		return (
-			<LocaleProvider locale={zhCN}>
-
-
-				<MuiThemeProvider theme={theme}>
-					<LoginDialog {...this.props} {...this.state}  Modifyloginvalue={()=>this.Modifyloginvalue()}></LoginDialog>
-					<Notcompletedysl {...this.props} {...this.state}></Notcompletedysl>
-					<Trialapplicationysl  {...this.props} {...this.state}></Trialapplicationysl>
-					<Trialapplicationreview  {...this.props} {...this.state}></Trialapplicationreview>
-				  <Addcourses {...this.props} {...this.state}/>
-				  <AccountProfile {...this.props} {...this.state}/>
-					{/*{*/}
-					{/*	isRender === true?*/}
-					{/*		<LoginDialog></LoginDialog> : ""*/}
-					{/*}*/}
-
-					{/*{*/}
-					{/*	isRenders === true?*/}
-					{/*<Trialapplication></Trialapplication>*/}
-					{/*:""*/}
-					{/*}*/}
-
-					<Router>
-						<Switch>
-							{/*<Route path="/login" component={LoginRegisterPage}/>*/}
-
-							{/*众包创新*/}
-							<Route path={"/crowdsourcings"} component={ProjectPackages}/>
-							{/*认证*/}
-							<Route path="/account" component={AccountPage}/>
-
-							{/*403*/}
-							<Route path="/403" component={Shixunauthority}/>
-
-							<Route path="/500" component={http500}/>
-
-							{/*404*/}
-							<Route path="/nopage" component={Shixunnopage}/>
-
-							<Route path="/compatibility" component={CompatibilityPageLoadable}/>
-							<Route
-								path="/login" component={EducoderLogin}
-							/>
-							<Route
-								path="/register" component={EducoderLogin}
-							/>
-							<Route path="/users/:username"
-								render={
-									(props) => (<UsersInfo {...this.props} {...props} {...this.state} />)
-							}></Route>
-							{/*<Route*/}
-							{/*  path="/trialapplication" component={Trialapplication}*/}
-							{/*/>*/}
-							<Route
-								path="/changepassword" component={EducoderLogin}
-							/>
-              <Route
-							  path="/interesse" component={Interestpage}
-
-							/>
-
-							<Route path="/shixuns/new" component={Newshixuns}>
-							</Route>
-
-							<Route path="/tasks/:stageId" component={IndexWrapperComponent}/>
-
-							<Route path="/shixuns/:shixunId" component={TPMIndexComponent}>
-							</Route>
-
-							{/*列表页*/}
-							<Route path="/shixuns" component={TPMShixunsIndexComponent}/>
-
-							{/* <Route path="/shixunchild" component={TPMShixunchildIndexComponent}>
-          </Route>
-          <Route path="/fork_list" component={TPMshixunfork_listIndexComponent}>
-          </Route> */}
-
-							{/*<Route path="/forums" component={ForumsIndexComponent}>*/}
-							{/*</Route>*/}
-
-
-							{/*实训课程（原实训路径）*/}
-							<Route path="/paths" component={ShixunPaths}></Route>
-
-							<Route path="/search"
-										 render={
-											 (props)=>(<SearchPage {...this.props} {...props} {...this.state}></SearchPage>)
-										 }
-							></Route>
-
-							{/*课堂*/}
-							<Route path="/courses" component={CoursesIndex} {...this.props}></Route>
-
-							{/* 课堂讨论 */}
-							{/* <Route path="/board" component = {BoardIndex} {...this.props}></Route> */}
-
-							{/* <Route path="/tpforums" component={TPForumsIndexComponent}>
-          </Route> */}
-
-							{/* <Route path="/myshixuns/:shixunId/stages/:stageId" component={Index}/> */}
-              {/* 兴趣页面*/}
-              {/*<Route path="/interest" component={Interestpage}/>*/}
-
-							<Route path="/comment" component={CommentComponent}/>
-							<Route path="/testMaterial" component={TestMaterialDesignComponent}/>
-							<Route path="/test" component={TestIndex}/>
-							<Route path="/testCodeMirror" component={TestCodeMirrorComponent}/>
-							<Route path="/testRCComponent" component={TestComponent}/>
-							<Route path="/testUrlQuery" component={TestUrlQueryComponent}/>
-
-							{/* 教学案例 */}
-							<Route path="/moop_cases"render={
-									(props) => (<MoopCases {...this.props} {...props} {...this.state} />)
-							}/>
-
-							{/* <Route component={NotFoundPage}/> */}
-							{/*列表页*/}
-							{/*<Route component={TPMShixunsIndexComponent}/>*/}
-							{/*首页*/}
-							<Route exact path="/" component={ShixunsHome}/>
-							<Route component={Shixunnopage}/>
-							
-							{/*<Route component={ShixunsHome}/>*/}
-
-						</Switch>
-					</Router>
-				</MuiThemeProvider>
-			</LocaleProvider>
-		);
-	}
-}
-
-// moment国际化，设置为中文
-moment.defineLocale('zh-cn', {
-	months: '一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月'.split('_'),
-	monthsShort: '1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月'.split('_'),
-	weekdays: '星期日_星期一_星期二_星期三_星期四_星期五_星期六'.split('_'),
-	weekdaysShort: '周日_周一_周二_周三_周四_周五_周六'.split('_'),
-	weekdaysMin: '日_一_二_三_四_五_六'.split('_'),
-	longDateFormat: {
-		LT: 'Ah点mm分',
-		LTS: 'Ah点m分s秒',
-		L: 'YYYY-MM-DD',
-		LL: 'YYYY年MMMD日',
-		LLL: 'YYYY年MMMD日Ah点mm分',
-		LLLL: 'YYYY年MMMD日ddddAh点mm分',
-		l: 'YYYY-MM-DD',
-		ll: 'YYYY年MMMD日',
-		lll: 'YYYY年MMMD日Ah点mm分',
-		llll: 'YYYY年MMMD日ddddAh点mm分'
-	},
-	meridiemParse: /凌晨|早上|上午|中午|下午|晚上/,
-	meridiemHour: function (hour, meridiem) {
-		if (hour === 12) {
-			hour = 0;
-		}
-		if (meridiem === '凌晨' || meridiem === '早上' ||
-			meridiem === '上午') {
-			return hour;
-		} else if (meridiem === '下午' || meridiem === '晚上') {
-			return hour + 12;
-		} else {
-			// '中午'
-			return hour >= 11 ? hour : hour + 12;
-		}
-	},
-	meridiem: function (hour, minute, isLower) {
-		var hm = hour * 100 + minute;
-		if (hm < 600) {
-			return '凌晨';
-		} else if (hm < 900) {
-			return '早上';
-		} else if (hm < 1130) {
-			return '上午';
-		} else if (hm < 1230) {
-			return '中午';
-		} else if (hm < 1800) {
-			return '下午';
-		} else {
-			return '晚上';
-		}
-	},
-	calendar: {
-		sameDay: function () {
-			return this.minutes() === 0 ? '[今天]Ah[点整]' : '[今天]LT';
-		},
-		nextDay: function () {
-			return this.minutes() === 0 ? '[明天]Ah[点整]' : '[明天]LT';
-		},
-		lastDay: function () {
-			return this.minutes() === 0 ? '[昨天]Ah[点整]' : '[昨天]LT';
-		},
-		nextWeek: function () {
-			var startOfWeek, prefix;
-			startOfWeek = moment().startOf('week');
-			prefix = this.unix() - startOfWeek.unix() >= 7 * 24 * 3600 ? '[下]' : '[本]';
-			return this.minutes() === 0 ? prefix + 'dddAh点整' : prefix + 'dddAh点mm';
-		},
-		lastWeek: function () {
-			var startOfWeek, prefix;
-			startOfWeek = moment().startOf('week');
-			prefix = this.unix() < startOfWeek.unix() ? '[上]' : '[本]';
-			return this.minutes() === 0 ? prefix + 'dddAh点整' : prefix + 'dddAh点mm';
-		},
-		sameElse: 'LL'
-	},
-	ordinalParse: /\d{1,2}(日|月|周)/,
-	ordinal: function (number, period) {
-		switch (period) {
-			case 'd':
-			case 'D':
-			case 'DDD':
-				return number + '日';
-			case 'M':
-				return number + '月';
-			case 'w':
-			case 'W':
-				return number + '周';
-			default:
-				return number;
-		}
-	},
-	relativeTime: {
-		future: '%s内',
-		past: '%s前',
-		s: '几秒',
-		m: '1分钟',
-		mm: '%d分钟',
-		h: '1小时',
-		hh: '%d小时',
-		d: '1天',
-		dd: '%d天',
-		M: '1个月',
-		MM: '%d个月',
-		y: '1年',
-		yy: '%d年'
-	},
-	week: {
-		// GB/T 7408-1994《数据元和交换格式·信息交换·日期和时间表示法》与ISO 8601:1988等效
-		dow: 1, // Monday is the first day of the week.
-		doy: 4  // The week that contains Jan 4th is the first week of the year.
-	}
-});
-export default SnackbarHOC()(App);

CHANGELOG.md

@@ -1,4 +1,35 @@
 # Changelog
+## [v3.2.0](https://forgeplus.trustie.net/projects/jasder/forgeplus/releases) - 2021-06-09
+
+### ENHANCEMENTS
+  * ADD 集成邮件和平台站内信等通知系统
+  * Fix 代码库二级页面-优化文件子目录浏览功能(#50388)
+  * Fix 代码库二级页面-优化commit提交详情页页面排版及数据显示(#50372)
+  * Fix 代码库二级页面-优化commit提交信息列表页加载方式和数据排序功能(#50348)
+  * Fix 代码库二级页面-优化创建发行版功能(#50346)
+  * Fix 代码库二级页面-优化标签列表页功能(#50344)
+  * Fix 代码库二级页面-优化发行版本列表页功能(#50345)
+  * Fix 代码库二级页面-优化分支列表页功能(#50343)
+  * Fix 其他问题优化(#51581) (#51343) (#51108)
+
+---
+
+### BUGFIXES
+  * Fix 发行版—标签跳转链接错误(#51666)
+  * Fix 文件预览报错(#51660)
+  * Fix 标签创建时间显示错误(#51658)
+  * Fix 分支列表中头像显示问题(#51656)
+  * Fix 文本信息过长(#51630) (#51626)
+  * Fix 版本库中附件下载400(#51625)
+  * Fix loading页面优化(#51588)
+  * Fix 提交详情页面优化(#51577)
+  * Fix 修复疑修复制功能(#51569)
+  * Fix 修复新建发行版用户信息显示错误的问题(#51665)
+  * Fix 修复查看文件详细信息报错的问题(#51561)
+  * Fix 修复提交记录中时间显示格式问题(#51526)
+  * Fix 组织下项目更加更新时间倒序排序(#50833)
+
+
 ## [v3.1.0](https://forgeplus.trustie.net/projects/jasder/forgeplus/releases) - 2021-06-09
 
 * ENHANCEMENTS
@@ -31,7 +62,7 @@
 ## [v3.0.3](https://forgeplus.trustie.net/projects/jasder/forgeplus/releases) - 2021-05-08
 
 * BUGFIXES
-  * Fix 解决易修标题过长导致的排版问题(45469)
+  * Fix 解决疑修标题过长导致的排版问题(45469)
   * Fix 解决合并请求详情页面排版错误的问题(45457)
   * FIX 解决转移仓库界面专有名词描述错误的问题(45455)
   * Fix 解决markdown格式文件自动生成数字排序的问题(45454)

Gemfile

@@ -1,132 +1,130 @@
-source 'https://gems.ruby-china.com'
-git_source(:github) { |repo| "https://github.com/#{repo}.git" }
-
-gem 'rails', '~> 5.2.0'
-gem 'mysql2', '>= 0.4.4', '< 0.6.0'
-gem 'puma', '~> 3.11'
-gem 'sass-rails', '~> 5.0'
-gem 'uglifier', '>= 1.3.0'
-
-# gem 'coffee-rails', '~> 4.2'
-gem 'turbolinks', '~> 5'
-gem 'jbuilder', '~> 2.5'
-gem 'groupdate', '~> 4.1.0'
-gem 'chartkick'
-gem 'grape-entity', '~> 0.7.1'
-gem 'kaminari', '~> 1.1', '>= 1.1.1'
-
-gem 'bootsnap', '>= 1.1.0', require: false
-
-gem 'chinese_pinyin'
-
-gem 'rack-cors'
-gem 'redis-rails'
-gem 'roo-xls'
-gem 'simple_xlsx_reader'
-
-gem 'rubyzip'
-
-gem 'spreadsheet'
-gem 'ruby-ole'
-# 导出为xlsx
-gem 'axlsx', '~> 3.0.0.pre'
-gem 'axlsx_rails', '~> 0.5.2'
-
-gem 'oauth2'
-#导出为pdf
-gem 'pdfkit'
-gem 'wkhtmltopdf-binary'
-# gem 'request_store'
-#gem 'iconv'
-# markdown 转html
-gem 'redcarpet', '~> 3.4'
-
-gem 'rqrcode', '~> 0.10.1'
-gem 'rqrcode_png'
-
-gem 'acts-as-taggable-on', '~> 6.0'
-
-# a tree structure
-gem 'ancestry'
-gem 'acts_as_list'
-gem 'omniauth-cas'
-
-# profiler Middleware
-gem 'rack-mini-profiler'
-
-# object-based searching
-gem 'ransack'
-
-group :development, :test do
-  gem 'rspec-rails', '~> 3.8'
-end
-
-group :development do
-  gem 'prettier'
-  gem 'rubocop', '~> 0.52.0'
-  gem 'solargraph', '~> 0.38.0'
-  gem 'awesome_print'
-  gem 'web-console', '>= 3.3.0'
-  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
-  gem 'capybara', '>= 2.15', '< 4.0'
-  gem 'selenium-webdriver'
-  gem 'chromedriver-helper'
-end
-
-gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
-
-#编码检测
-gem 'rchardet', '~> 1.8'
-
-# http client
-gem 'faraday', '~> 0.15.4'
-
-# view
-gem 'active_decorator'
-gem 'bootstrap', '~> 4.3.1'
-gem 'jquery-rails'
-gem 'simple_form'
-gem 'font-awesome-sass', '4.7.0'
-
-# i18n
-gem 'rails-i18n', '~> 5.1'
-
-# job
-gem 'sidekiq'
-gem 'sinatra'
-gem "sidekiq-cron", "~> 1.1"
-
-# batch insert
-gem 'bulk_insert'
-
-# elasticsearch
-gem 'searchkick'
-
-gem 'aasm'
-gem 'enumerize'
-
-gem 'diffy'
-
-gem 'deep_cloneable', '~> 3.0.0'
-
-# oauth2
-gem 'omniauth', '~> 1.9.0'
-gem 'omniauth-oauth2', '~> 1.6.0'
-
-# global var
-gem 'request_store'
-
-# 敏感词汇
-gem 'harmonious_dictionary', '~> 0.0.1'
-
-gem 'parallel', '~> 1.19', '>= 1.19.1'
-
-gem 'letter_avatar'
-
-gem 'cd'
+source 'https://gems.ruby-china.com'
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
+gem 'rails', '~> 5.2.0'
+gem 'mysql2', '>= 0.4.4', '< 0.6.0'
+gem 'puma', '~> 3.11'
+gem 'sass-rails', '~> 5.0'
+gem 'uglifier', '>= 1.3.0'
+
+# gem 'coffee-rails', '~> 4.2'
+gem 'turbolinks', '~> 5'
+gem 'jbuilder', '~> 2.5'
+gem 'groupdate', '~> 4.1.0'
+gem 'chartkick'
+gem 'grape-entity', '~> 0.7.1'
+gem 'kaminari', '~> 1.1', '>= 1.1.1'
+
+gem 'bootsnap', '>= 1.1.0', require: false
+
+gem 'chinese_pinyin'
+
+gem 'rack-cors'
+gem 'redis-rails'
+gem 'roo-xls'
+gem 'simple_xlsx_reader'
+
+gem 'rubyzip'
+
+gem 'spreadsheet'
+gem 'ruby-ole'
+# 导出为xlsx
+gem 'axlsx', '~> 3.0.0.pre'
+gem 'axlsx_rails', '~> 0.5.2'
+
+gem 'oauth2'
+#导出为pdf
+gem 'pdfkit'
+gem 'wkhtmltopdf-binary'
+# gem 'request_store'
+#gem 'iconv'
+# markdown 转html
+gem 'redcarpet', '~> 3.4'
+
+gem 'rqrcode', '~> 0.10.1'
+gem 'rqrcode_png'
+
+gem 'acts-as-taggable-on', '~> 6.0'
+
+# a tree structure
+gem 'ancestry'
+gem 'acts_as_list'
+gem 'omniauth-cas'
+
+# profiler Middleware
+gem 'rack-mini-profiler'
+
+# object-based searching
+gem 'ransack'
+
+group :development, :test do
+  gem 'rspec-rails', '~> 3.8'
+end
+
+group :development do
+  gem 'prettier'
+  gem 'rubocop', '~> 0.52.0'
+  gem 'solargraph', '~> 0.38.0'
+  gem 'awesome_print'
+  gem 'web-console', '>= 3.3.0'
+  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
+  gem 'capybara', '>= 2.15', '< 4.0'
+  gem 'selenium-webdriver'
+  gem 'chromedriver-helper'
+end
+
+gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+
+#编码检测
+gem 'rchardet', '~> 1.8'
+
+# http client
+gem 'faraday', '~> 0.15.4'
+
+# view
+gem 'active_decorator'
+gem 'bootstrap', '~> 4.3.1'
+gem 'jquery-rails'
+gem 'simple_form'
+gem 'font-awesome-sass', '4.7.0'
+
+# i18n
+gem 'rails-i18n', '~> 5.1'
+
+# job
+gem 'sidekiq'
+gem 'sinatra'
+gem "sidekiq-cron", "~> 1.1"
+
+# batch insert
+gem 'bulk_insert'
+
+# elasticsearch
+gem 'searchkick'
+
+gem 'aasm'
+gem 'enumerize'
+
+gem 'diffy'
+
+gem 'deep_cloneable', '~> 3.0.0'
+
+# oauth2
+gem 'omniauth', '~> 1.9.0'
+gem 'omniauth-oauth2', '~> 1.6.0'
+
+# global var
+gem 'request_store'
+
+# 敏感词汇
+gem 'harmonious_dictionary', '~> 0.0.1'
+
+gem 'parallel', '~> 1.19', '>= 1.19.1'
+
+gem 'letter_avatar'

README.md

@@ -1,17 +1,30 @@
-Trustie （确实）是一个以大众化协同开发、开放式资源共享、持续性可信评估为核心机理，面向高校创新实践的在线协作平台。
+# GitLink - CCF开源创新服务平台
 
-## 特性
+GitLink（确实开源）是中国计算机学会（CCF）官方指定的开源创新服务平台，旨在以“为开源创新服务”为使命，以“成为开源创新的汇聚地”为愿景，秉承“创新、开放、协作、共享”的价值观，致力于为大规模开源开放协同创新助力赋能，打造创新成果孵化和新工科人才培养的开源创新生态！
 
-- 软件创作与生产深度融合的软件开发环境体系结构 软件自由创作和工程生产的高效衔接，适于软件开发中群体智慧的有效汇聚。
+<center>
+<img src="https://code.gitlink.org.cn/young/forgeplus/raw/branch/standalone/docs/figs/gitlink.png?raw=true" width=80% />
+</center>
+    
+## 特色功能
 
-- 构件化协同开发环境的可扩展运行框架多样化工具的集成和联动，形成了强动态扩展能力的平台框架。
+- **分布式协作开发**：基于Git打造分布式代码托管环境，提供免费公、私有代码仓库，支持在线文件编辑、代码分支管理、协作贡献统计、代码仓库复刻（Fork）、贡献合并请求（PR）、群智贡献审阅等功能，让您的项目在这里健康、快速的成长！
 
-- “互联网即资源库”的全新软件复用模式 成长式软件资源管理系统，实现了分散资源的知识融合、资源的可持续增长和有效复用。
+- **一站式过程管理**：提供易修（Issue）、里程碑、通知提醒、标签归档等多样化任务管理工具，支持各类开发任务的发布、指派与跟踪，同时提供在线Wiki文档、组织多粒度管理等功能，为您搭建一站式的项目过程管理环境，让您的团队协作更高效、过程更透明！
 
-## 部署
+- **高效流水线运维**：融合DevOps思想，提供轻量级的工作流引擎（Engine），打通编码、测试、构建、部署等开发运维环节；支持自定义配置、代码静态扫描、构建自动触发、容器镜像托管等功能，同时支持接入第三方运维工具，让您的代码更加快速、可靠地形成高质量的产品！
+
+- **多层次代码分析**：提供软件软代码和芯片RTL代码的溯源分析、文件级和组件级许可证识别及风险分析、输入性开源漏洞检测和加固建议，支持分析结果的多层次可视化展示，帮助您实施有效开源治理，厘清代码引用链，发现并消除漏洞感染链，为安全合规的开源引用保驾护航！
+
+- **多维度用户画像**：实时采集和分析平台中的各类开源资源数据，搭建多维度用户画像评估系统，提供开发活动统计、贡献度日历、用户能力建模、角色与专业定位分析等功能，让您在个人主页展示开发动态与创新能力！
+
+## 第三方组件
 
 
-### Depends Versions
+## 部署流程
+
+
+### 依赖库
 
 * Ruby 2.4.5
 
@@ -23,22 +36,19 @@ Trustie （确实）是一个以大众化协同开发、开放式资源共享、
 
 * imagemagick
 
-### Steps
+### 步骤
 
-#### 1. 克隆稳定版本
+（1）克隆稳定版本
 ```
 git clone -b standalone https://git.trustie.net/jasder/forgeplus.git
 ```
 
-#### 2. 安装依赖包
-
+（2）安装依赖包
 ```bash
 cd forgeplus && bundle install
 ```
 
-#### 3. 配置初始化文件
-进入项目根目录执行一下命令：
-
+（3）配置初始化文件：进入项目根目录执行以下命令
 ```bash
 cp config/configuration.yml.example config/configuration.yml
 cp config/database.yml.example config/database.yml
@@ -46,11 +56,7 @@ touch config/redis.yml
 touch config/elasticsearch.yml
 ```
 
-#### 4. 配置数据库
-数据库配置信息请查看/config/database.yml文件，
-项目默认采用mysql数据库, 如需更改，请自行修改配置信息，
-默认配置如下：
-
+（4）配置数据库：数据库配置信息请查看/config/database.yml文件，项目默认采用mysql数据库, 如需更改，请自行修改配置信息，默认配置如下
 ```bash
 default: &default
   adapter: mysql2
@@ -60,14 +66,13 @@ default: &default
   password: 123456
 ```
 
-#### 5. 配置gitea服务(可选)
-**如需要部署自己的gitea平台，请参考gitea官方平台：https://docs.gitea.io/zh-cn/install-from-binary/**
+（5）配置gitea服务(可选)：如需要部署自己的gitea平台，请参考[gitea官方平台文档](https://docs.gitea.io/zh-cn/install-from-binary/)。因目前gitea平台api受限，暂时推荐从forge平台获取[gitea部署文件](https://forgeplus.trustie.net/projects/Trustie/gitea-binary)进行部署
 
-**因目前gitea平台api受限，暂时推荐从forge平台获取gitea部署文件进行部署：https://forgeplus.trustie.net/projects/Trustie/gitea-binary**
-
-**配置gitea服务步骤**
-1. 部署gitea服务，并注册root账户
-2. 修改forge平台的 config/configuration.yml中的gitea服务指向地址，如：
+- 配置gitea服务步骤：
+                                                  
+	-- 部署gitea服务，并注册root账户
+                                                  
+	-- 修改forge平台的 config/configuration.yml中的gitea服务指向地址，如：
 
 ```ruby
 gitea:
@@ -77,10 +82,9 @@ gitea:
   base_url: '/api/v1'
 ```
 
-#### 6. 安装redis环境
-**请自行搜索各平台如何安装部署redis环境**
+（6）安装redis环境：请自行搜索各平台如何安装部署redis环境
 
-#### 7. 安装imagemagick插件
+（7）安装imagemagick插件：
 - Mac OS X
 ```bash
  brew install imagemagick ghostscript
@@ -91,88 +95,95 @@ gitea:
 sudo apt-get install -y imagemagick
 ```
 
-#### 8. 创建数据库
-**开发环境为development， 生成环境为production**
+（8）创建数据库：开发环境为development， 生成环境为production
 ```bash
 rails db:create  RAILS_ENV=development
 ```
 
-#### 9. 导入数据表结构
+（9）导入数据表结构
 
 ```bash
 bundle exec rake sync_table_structure:import_csv
 ```
 
-#### 10. 执行migrate迁移文件
-**开发环境为development， 生成环境为production**
+（10）执行migrate迁移文件：开发环境为development， 生成环境为production
 ```bash
 rails db:migrate RAILS_ENV=development
 ```
 
-#### 11. clone前端代码
-**将前端代码克隆到public/react目录下，目录结构应该是: public/react/build**
+（11）clone前端代码：将前端代码克隆到public/react目录下，目录结构应该是: public/react/build
 ```bash
 git clone -b standalone https://git.trustie.net/jasder/build.git
 ```
 
-#### 12. 启动redis(此处已mac系统为例)
+（12）启动redis(此处以macOS系统为例)
 ```bash
 redis-server&
 ```
 
-#### 13. 启动sidekiq
-**开发环境为development， 生成环境为production**
+（13）启动sidekiq：开发环境为development， 生成环境为production
 ```bash
 bundle exec sidekiq -C config/sidekiq.yml -e production -d
 ```
 
-#### 14. 启动rails服务
+（14）启动rails服务
 ```bash
 rails s
 ```
 
-#### 15. 浏览器访问
-在浏览器中输入如下地址访问：
+（15）浏览器访问：在浏览器中输入如下地址访问
 ```bash
 http://localhost:3000/
 ```
 
-#### 16. 其他说明
-通过页面注册都第一个用户为平台管理员用户
+（16）其他说明：通过页面注册以第一个用户为平台管理员用户
+
 
 ## 页面展示
 
-- 代码库
-
-![](docs/figs/code.png?raw=true)
-
+- 项目列表
 
+<center>
+<img src="https://code.gitlink.org.cn/young/forgeplus/raw/branch/standalone/docs/figs/project_list.png?raw=true" width=50% />
+</center>
+        
+- 代码仓库
+            
+<center>
+<img src="https://code.gitlink.org.cn/young/forgeplus/raw/branch/standalone/docs/figs/repo.png?raw=true" width=50% />
+</center>
+                    
 - 任务管理
-![](docs/figs/issue_manage.png?raw=true)
+            
+<center>
+<img src="https://code.gitlink.org.cn/young/forgeplus/raw/branch/standalone/docs/figs/issues.png?raw=true" width=50% />
+</center>
+                    
+- 合并请求
+            
+<center>
+<img src="https://code.gitlink.org.cn/young/forgeplus/raw/branch/standalone/docs/figs/PR.png?raw=true" width=50% />
+</center>
+                  
+- 引擎配置
+            
+<center>
+<img src="https://code.gitlink.org.cn/young/forgeplus/raw/branch/standalone/docs/figs/engine.png?raw=true" width=50% />
+</center>
 
-- 任务查看
-
-![](docs/figs/issue_view.png?raw=true)
-
-- 任务指派
-
-![](docs/figs/issue_assign2.png?raw=true)
-
-- 里程碑
-
-![](docs/figs/milestone.png?raw=true)
-
-### API
-- [API文档](https://forgeplus.trustie.net/docs/api)
-- [API](showdoc.com.cn)
-  账号：forgeplus@admin.com 密码：forge123
 
 ## 贡献代码
 
+我们期待您向GitLink提交贡献！在您贡献时，请遵循以下流程：
+
 1. Fork 项目
 2. 创建本地分支(git checkout -b my-new-feature)
 3. 提交更改 (git commit -am 'Add some feature')
 4. 推送到分支 (git push origin my-new-feature)
 5. 向源项目的 **develop** 分支发起 Pull Request
 
-## License
+#### 指导文档
+- [API文档](https://www.gitlink.org.cn/docs/api)
+- [Git常用命令](https://git-scm.com/)
+
+## 许可证协议

api_document.md

@@ -51,6 +51,51 @@ http://localhost:3000/api/accounts/remote_register  | jq
 |-- token         |string|用户token|
 
 
+返回值
+```json
+{
+  "status": 0,
+  "message": "success",
+  "user": {
+    "id": 36400,
+    "token": "8c87a80d9cfacc92fcb2451845104f35119eda96"
+  }
+}
+```
+---
+
+#### 独立注册接口
+```
+POST accounts/register
+```
+*示例*
+```bash
+curl -X POST \
+-d "login=2456233122@qq.com" \
+-d "password=djs_D_00001" \
+-d "namespace=16895620" \
+-d "code=forge" \
+http://localhost:3000/api/accounts/remote_register  | jq
+```
+*请求参数说明:*
+
+|参数名|必选|类型|说明|
+|-|-|-|-|
+|login    |是|string   |邮箱或者手机号  |
+|namespace |是|string   |登录名 |
+|password |是|string   |密码  |
+|code |是|string   |验证码  |
+
+
+*返回参数说明:*
+
+|参数名|类型|说明|
+|-|-|-|
+|user|json object |返回数据|
+|-- id            |int   |用户id |
+|-- token         |string|用户token|
+
+
 返回值
 ```json
 {
@@ -338,10 +383,10 @@ http://localhost:3000/api/projects/  | jq
 |-|-|-|-|
 |user_id            |是|int    |用户id或者组织id  |
 |name               |是|string |项目名称  |
-|description        |是|string |项目描述  |
+|description        |否|string |项目描述  |
 |repository_name    |是|string |仓库名称, 只含有数字、字母、下划线不能以下划线开头和结尾，且唯一  |
-|project_category_id|是|int    |项目类别id  |
-|project_language_id|是|int    |项目语言id  |
+|project_category_id|否|int    |项目类别id  |
+|project_language_id|否|int    |项目语言id  |
 |ignore_id          |否|int    |gitignore相关id  |
 |license_id         |否|int    |开源许可证id  |
 |private            |否|boolean|项目是否私有, true：为私有，false: 公开，默认为公开  |
@@ -374,9 +419,7 @@ curl -X POST \
 -d "user_id=36408" \
 -d "clone_addr=https://gitea.com/mx8090alex/golden.git" \
 -d "name=golden_mirror1" \
--d "description=golden_mirror" \
--d "project_category_id=1" \
--d "project_language_id=2" \
+-d "repository_name=golden_mirror1" \
 http://localhost:3000/api/projects/migrate.json  | jq
 ```
 *请求参数说明:*
@@ -388,8 +431,8 @@ http://localhost:3000/api/projects/migrate.json  | jq
 |clone_addr         |是|string |镜像项目clone地址  |
 |description        |否|string |项目描述  |
 |repository_name    |是|string |仓库名称, 只含有数字、字母、下划线不能以下划线开头和结尾，且唯一  |
-|project_category_id|是|int    |项目类别id  |
-|project_language_id|是|int    |项目语言id  |
+|project_category_id|否|int    |项目类别id  |
+|project_language_id|否|int    |项目语言id  |
 |is_mirror          |否|boolean|是否设置为镜像， true：是， false：否，默认为否  |
 |auth_username      |否|string|镜像源仓库的登录用户名  |
 |auth_password      |否|string|镜像源仓库的登录秘密  |

app/assets/javascripts/admin.js

@@ -99,3 +99,38 @@ $(document).on("turbolinks:before-cache", function () {
 
 $(function () {
 });
+
+$(document).on('turbolinks:load', function() {
+  
+  $('.logo-item-left').on("change", 'input[type="file"]', function () {
+    var $fileInput = $(this);
+    var file = this.files[0];
+    var imageType = /image.*/;
+    if (file && file.type.match(imageType)) {
+      var reader = new FileReader();
+      reader.onload = function () {
+        var $box = $fileInput.parent();
+        $box.find('img').attr('src', reader.result).css('display', 'block');
+        $box.addClass('has-img');
+      };
+      reader.readAsDataURL(file);
+    } else {
+    }
+  });
+
+  $('.attachment-item-left').on("change", 'input[type="file"]', function () {
+    var $fileInput = $(this);
+    var file = this.files[0];
+    var imageType = /image.*/;
+    if (file && file.type.match(imageType)) {
+      var reader = new FileReader();
+      reader.onload = function () {
+        var $box = $fileInput.parent();
+        $box.find('img').attr('src', reader.result).css('display', 'block');
+        $box.addClass('has-img');
+      };
+      reader.readAsDataURL(file);
+    } else {
+    }
+  });
+})

app/assets/javascripts/admins/courses/index.js

@@ -1,7 +1,7 @@
 $(document).on('turbolinks:load', function() {
   if ($('body.admins-courses-index-page').length > 0) {
-    let searchContainer = $(".course-list-form");
-    let searchForm = $("form.search-form",searchContainer);
+    var searchContainer = $(".course-list-form");
+    var searchForm = $("form.search-form",searchContainer);
 
     searchContainer.on('change', '.course-homepage-show', function(){
       searchForm.find('input[type="submit"]').trigger('click');

app/assets/javascripts/admins/projects/index.js

@@ -0,0 +1,141 @@
+/*
+ * @Description: Do not edit
+ * @Date: 2021-08-31 11:16:45
+ * @LastEditors: viletyy
+ * @Author: viletyy
+ * @LastEditTime: 2021-08-31 14:19:46
+ * @FilePath: /forgeplus/app/assets/javascripts/admins/system_notifications/index.js
+ */
+$(document).on('turbolinks:load', function(){
+
+    var showSuccessNotify = function() {
+      $.notify({
+        message: '操作成功'
+      },{
+        type: 'success'
+      });
+    }
+
+    // close user
+    $('.project-list-container').on('click', '.recommend-action', function(){
+      var $closeAction = $(this);
+      var $uncloseAction = $closeAction.siblings('.unrecommend-action');
+      var $editAction = $closeAction.siblings('.edit-recommend-action');
+
+      var keywordID = $closeAction.data('id');
+      customConfirm({
+        content: '确认将该项目设置为推荐项目吗?',
+        ok: function(){
+          $.ajax({
+            url: '/admins/projects/' + keywordID,
+            method: 'PUT',
+            dataType: 'json',
+            data: {
+              project: {
+                recommend: true,
+                recommend_index: 1
+              }
+            },
+            success: function() {
+              showSuccessNotify();
+              $closeAction.hide();
+              $uncloseAction.show();
+              $editAction.show();
+              $(".project-item-"+keywordID).children('td').eq(5).text("√")
+            }
+          });
+        }
+      });
+    });
+
+    // unclose user
+    $('.project-list-container').on('click', '.unrecommend-action', function(){
+      var $uncloseAction = $(this);
+      var $closeAction = $uncloseAction.siblings('.recommend-action');
+      var $editAction = $closeAction.siblings('.edit-recommend-action');
+
+      var keywordID = $uncloseAction.data('id');
+      customConfirm({
+        content: '确认取消该推荐项目吗？',
+        ok: function () {
+          $.ajax({
+            url: '/admins/projects/' + keywordID,
+            method: 'PUT',
+            dataType: 'json',
+            data: {
+              project: {
+                recommend: false,
+                recommend_index: 0
+              }
+            },
+            success: function() {
+              showSuccessNotify();
+              $closeAction.show();
+              $uncloseAction.hide();
+              $editAction.hide();
+              $(".project-item-"+keywordID).children('td').eq(5).text("")
+            }
+          });
+        }
+      })
+    });
+
+
+    // close user
+    $('.project-list-container').on('click', '.pinned-action', function(){
+      var $closeAction = $(this);
+      var $uncloseAction = $closeAction.siblings('.unpinned-action');
+
+      var keywordID = $closeAction.data('id');
+      customConfirm({
+        content: '确认将该项目设置为精选项目吗?',
+        ok: function(){
+          $.ajax({
+            url: '/admins/projects/' + keywordID,
+            method: 'PUT',
+            dataType: 'json',
+            data: {
+              project: {
+                is_pinned: true,
+              }
+            },
+            success: function() {
+              showSuccessNotify();
+              $closeAction.hide();
+              $uncloseAction.show();
+              $(".project-item-"+keywordID).children('td').eq(4).text("√")
+            }
+          });
+        }
+      });
+    });
+
+    // unclose user
+    $('.project-list-container').on('click', '.unpinned-action', function(){
+      var $uncloseAction = $(this);
+      var $closeAction = $uncloseAction.siblings('.pinned-action');
+
+      var keywordID = $uncloseAction.data('id');
+      customConfirm({
+        content: '确认取消该精选项目吗？',
+        ok: function () {
+          $.ajax({
+            url: '/admins/projects/' + keywordID,
+            method: 'PUT',
+            dataType: 'json',
+            data: {
+              project: {
+                is_pinned: false,
+              }
+            },
+            success: function() {
+              showSuccessNotify();
+              $closeAction.show();
+              $uncloseAction.hide();
+              $(".project-item-"+keywordID).children('td').eq(4).text("")
+            }
+          });
+        }
+      })
+    });
+})

app/assets/javascripts/admins/reversed_keywords/index.js

@@ -0,0 +1,76 @@
+/*
+ * @Description: Do not edit
+ * @Date: 2021-08-31 11:16:45
+ * @LastEditors: viletyy
+ * @Author: viletyy
+ * @LastEditTime: 2021-08-31 14:19:46
+ * @FilePath: /forgeplus/app/assets/javascripts/admins/reversed_keywords/index.js
+ */
+$(document).on('turbolinks:load', function(){
+
+    var showSuccessNotify = function() {
+      $.notify({
+        message: '操作成功'
+      },{
+        type: 'success'
+      });
+    }
+
+    // close user
+    $('.reversed-keyword-list-container').on('click', '.close-action', function(){
+      var $closeAction = $(this);
+      var $uncloseAction = $closeAction.siblings('.unclose-action');
+
+      var keywordID = $closeAction.data('id');
+      customConfirm({
+        content: '确认关闭限制吗？',
+        ok: function(){
+          $.ajax({
+            url: '/admins/reversed_keywords/' + keywordID,
+            method: 'PUT',
+            dataType: 'json',
+            data: {
+              reversed_keyword: {
+                closed: true
+              }
+            },
+            success: function() {
+              showSuccessNotify();
+              $closeAction.hide();
+              $uncloseAction.show();
+              $(".reversed-keyword-item-"+keywordID).children('td').eq(3).text("")
+            }
+          });
+        }
+      });
+    });
+
+    // unclose user
+    $('.reversed-keyword-list-container').on('click', '.unclose-action', function(){
+      var $uncloseAction = $(this);
+      var $closeAction = $uncloseAction.siblings('.close-action');
+
+      var keywordID = $uncloseAction.data('id');
+      customConfirm({
+        content: '确认开启限制吗？',
+        ok: function () {
+          $.ajax({
+            url: '/admins/reversed_keywords/' + keywordID,
+            method: 'PUT',
+            dataType: 'json',
+            data: {
+              reversed_keyword: {
+                closed: false
+              }
+            },
+            success: function() {
+              showSuccessNotify();
+              $closeAction.show();
+              $uncloseAction.hide();
+              $(".reversed-keyword-item-"+keywordID).children('td').eq(3).text("√")
+            }
+          });
+        }
+      })
+    });
+})

app/assets/javascripts/admins/shixun_settings/index.js

@@ -1,7 +1,15 @@
+/*
+ * @Description: Do not edit
+ * @Date: 2021-07-16 11:58:16
+ * @LastEditors: viletyy
+ * @Author: viletyy
+ * @LastEditTime: 2021-08-31 14:48:59
+ * @FilePath: /forgeplus/app/assets/javascripts/admins/shixun_settings/index.js
+ */
 $(document).on('turbolinks:load', function() {
   if ($('body.admins-shixun-settings-index-page').length > 0) {
-    let searchContainer = $(".shixun-settings-list-form");
-    let searchForm = $("form.search-form",searchContainer);
+    var searchContainer = $(".shixun-settings-list-form");
+    var searchForm = $("form.search-form",searchContainer);
 
     searchContainer.on('change', '.shixun-settings-select', function(){
       searchForm.find('input[type="submit"]').trigger('click');

app/assets/javascripts/admins/system_notifications/index.js

@@ -0,0 +1,76 @@
+/*
+ * @Description: Do not edit
+ * @Date: 2021-08-31 11:16:45
+ * @LastEditors: viletyy
+ * @Author: viletyy
+ * @LastEditTime: 2021-08-31 14:19:46
+ * @FilePath: /forgeplus/app/assets/javascripts/admins/system_notifications/index.js
+ */
+$(document).on('turbolinks:load', function(){
+
+    var showSuccessNotify = function() {
+      $.notify({
+        message: '操作成功'
+      },{
+        type: 'success'
+      });
+    }
+
+    // close user
+    $('.system-notification-list-container').on('click', '.close-action', function(){
+      var $closeAction = $(this);
+      var $uncloseAction = $closeAction.siblings('.unclose-action');
+
+      var keywordID = $closeAction.data('id');
+      customConfirm({
+        content: '确认取消置顶吗？',
+        ok: function(){
+          $.ajax({
+            url: '/admins/system_notifications/' + keywordID,
+            method: 'PUT',
+            dataType: 'json',
+            data: {
+              system_notification: {
+                is_top: false
+              }
+            },
+            success: function() {
+              showSuccessNotify();
+              $closeAction.hide();
+              $uncloseAction.show();
+              $(".system-notification-item-"+keywordID).children('td').eq(3).text("")
+            }
+          });
+        }
+      });
+    });
+
+    // unclose user
+    $('.system-notification-list-container').on('click', '.unclose-action', function(){
+      var $uncloseAction = $(this);
+      var $closeAction = $uncloseAction.siblings('.close-action');
+
+      var keywordID = $uncloseAction.data('id');
+      customConfirm({
+        content: '确认置顶吗？',
+        ok: function () {
+          $.ajax({
+            url: '/admins/system_notifications/' + keywordID,
+            method: 'PUT',
+            dataType: 'json',
+            data: {
+              system_notification: {
+                is_top: true
+              }
+            },
+            success: function() {
+              showSuccessNotify();
+              $closeAction.show();
+              $uncloseAction.hide();
+              $(".system-notification-item-"+keywordID).children('td').eq(3).text("√")
+            }
+          });
+        }
+      })
+    });
+})

app/assets/stylesheets/admin.scss

@@ -58,3 +58,149 @@ input.form-control {
   position: absolute;
 }
 
+.logo-item {
+  display: flex;
+
+  &-img {
+    display: block;
+    width: 80px;
+    height: 80px;
+    background: #e9ecef;
+  }
+
+  &-upload {
+    cursor: pointer;
+    position: absolute;
+    top: 0;
+    width: 80px;
+    height: 80px;
+    background: #e9ecef;
+    border: 1px solid #ced4da;
+
+    &::before {
+      content: '';
+      position: absolute;
+      top: 27px;
+      left: 39px;
+      width: 2px;
+      height: 26px;
+      background: #495057;
+    }
+
+    &::after {
+      content: '';
+      position: absolute;
+      top: 39px;
+      left: 27px;
+      width: 26px;
+      height: 2px;
+      background: #495057;
+    }
+  }
+
+  &-left {
+    position: relative;
+    width: 80px;
+    height: 80px;
+
+    &.has-img {
+      .logo-item-upload {
+        display: none;
+      }
+
+      &:hover {
+        .logo-item-upload {
+          display: block;
+          background: rgba(145, 145, 145, 0.8);
+        }
+      }
+    }
+  }
+
+  &-right {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    color: #777777;
+    font-size: 0.8rem;
+  }
+
+  &-title {
+    color: #23272B;
+    font-size: 1rem;
+  }
+}
+
+.attachment-item {
+  display: flex;
+
+  &-img {
+    display: block;
+    width: 160px;
+    height: 160px;
+    background: #e9ecef;
+  }
+
+  &-upload {
+    cursor: pointer;
+    position: absolute;
+    top: 0;
+    width: 160px;
+    height: 160px;
+    background: #e9ecef;
+    border: 1px solid #ced4da;
+
+    &::before {
+      content: '';
+      position: absolute;
+      top: 54px;
+      left: 78px;
+      width: 2px;
+      height: 52px;
+      background: #495057;
+    }
+
+    &::after {
+      content: '';
+      position: absolute;
+      top: 78px;
+      left: 54px;
+      width: 52px;
+      height: 2px;
+      background: #495057;
+    }
+  }
+
+  &-left {
+    position: relative;
+    width: 160px;
+    height: 160px;
+
+    &.has-img {
+      .attachment-item-upload {
+        display: none;
+      }
+
+      &:hover {
+        .attachment-item-upload {
+          display: block;
+          background: rgba(145, 145, 145, 0.8);
+        }
+      }
+    }
+  }
+
+  &-right {
+    padding-top: 100px;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    color: #777777;
+    font-size: 0.8rem;
+  }
+
+  &-title {
+    color: #23272B;
+    font-size: 1rem;
+  }
+}

app/controllers/accounts_controller.rb

@@ -1,389 +1,384 @@
-class AccountsController < ApplicationController
-
-  #skip_before_action :check_account, :only => [:logout]
-
-  def index
-    render json: session
-  end
-
-  # 为了同步平台上未注册gitea的用户
-  def gitea_register
-    user = User.find_by(login: sync_gitea_params[:login])
-    Users::SyncGiteaForm.new(sync_gitea_params.merge(user: user)).validate!
-    return render_error("该用户已同步协作平台") if user.gitea_token.present? && user.gitea_uid.present?
-    
-    result = create_gitea_user!(user, sync_gitea_params[:login], sync_gitea_params[:email], sync_gitea_params[:password])
-    
-    result[:user] ? render_ok : render_error(result[:message])
-  rescue Exception => e
-    uid_logger_error(e.message)
-    tip_exception(-1, e.message)
-  end
-
-  # 其他平台同步注册的用户
-  def remote_register
-    username = params[:username]&.gsub(/\s+/, "")
-    email = params[:email]&.gsub(/\s+/, "")
-    password = params[:password]
-    platform = (params[:platform] || 'forge')&.gsub(/\s+/, "")
-
-    ActiveRecord::Base.transaction do
-      result = autologin_register(username, email, password, platform)
-      if result[:message].blank?
-        render_ok({user: result[:user]})
-      else
-        render_error(result[:message])
-      end
-    end
-  rescue Exception => e
-    uid_logger_error(e.message)
-    tip_exception(-1, e.message)
-  end
-
-  # 其他平台修改用户的信息，这边同步修改
-  def remote_update
-    ActiveRecord::Base.transaction do
-      user_params = params[:user_params]
-      user_extension_params = params[:user_extension_params]
-
-      u = User.find_by(login: params[:old_user_login])
-      user_mail = u.try(:mail)
-
-      if u.present?
-        ue = u.user_extension
-        u.login = user_params["login"] if user_params["login"]
-        u.mail = user_params["mail"] if user_params["mail"]
-        u.lastname = user_params["lastname"] if user_params["lastname"]
-
-        ue.gender = user_extension_params["gender"]
-        ue.school_id = user_extension_params["school_id"]
-        ue.location = user_extension_params["location"]
-        ue.location_city = user_extension_params["location_city"]
-        ue.identity = user_extension_params["identity"]
-        ue.technical_title = user_extension_params["technical_title"]
-        ue.student_id = user_extension_params["student_id"]
-        ue.description = user_extension_params["description"]
-        ue.save!
-        u.save!
-
-        sync_params = {}
-
-        if (user_params["mail"] && user_params["mail"] != user_mail)
-          sync_params = sync_params.merge(email: user_params["mail"])
-        end
-
-        if sync_params.present?
-          interactor = Gitea::User::UpdateInteractor.call(u.login, sync_params)
-          if interactor.success?
-            render_ok
-          else
-            render_error(interactor.error)
-          end
-        end
-      end
-    end
-  rescue Exception => e
-    uid_logger_error(e.message)
-    tip_exception(-1, e.message)
-  end
-
-  # 其他平台同步登录
-  def remote_login
-    @user = User.try_to_login(params[:login], params[:password])
-    if @user
-      successful_authentication(@user)
-      render_ok({user: {id: @user.id, token: @user.gitea_token}})
-    else
-      render_error("用户不存在")
-    end
-  end
-
-  #修改密码
-  def remote_password
-    @user = User.find_by(login: params[:login])
-    return render_error("未找到相关用户!") if @user.blank?
-
-    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
-
-
-
-  # 用户注册
-  # 注意：用户注册需要兼顾本地版，本地版是不需要验证码及激活码以及使用授权的，注册完成即可使用
-  # 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
-
-      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, '只支持邮箱注册')
-      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
-      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}")
-      # check_code = (verifi_code.try(:code) == code.strip && (Time.now.to_i - verifi_code.created_at.to_i) <= 10*60)
-      # todo 上线前请删除万能验证码"513231"
-      return normal_status(-1, "8~16位密码，支持字母数字和符号") unless params[:password] =~ CustomRegexp::PASSWORD
-
-      code = generate_identifier User, 8, pre
-      login = pre + code
-      @user = User.new(admin: false, login: login, mail: email, phone: phone, type: "User")
-      @user.password = params[:password]
-      # 现在因为是验证码，所以在注册的时候就可以激活
-      @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)
-      end
-    rescue Exception => e
-      uid_logger_error(e.message)
-      tip_exception(-1, e.message)
-    end
-  end
-
-  # 用户登录
-  def login
-    Users::LoginForm.new(account_params).validate!
-    @user = User.try_to_login(params[:login], params[:password])
-
-    return normal_status(-2, "错误的账号或密码") if @user.blank?
-    # user is already in local database
-    return normal_status(-2, "违反平台使用规范，账号已被锁定") if @user.locked?
-
-    login_control = LimitForbidControl::UserLogin.new(@user)
-    return normal_status(-2, "登录密码出错已达上限，账号已被锁定, 请#{login_control.forbid_expires/60}分钟后重新登录或找回密码") if login_control.forbid?
-
-    password_ok = @user.check_password?(params[:password].to_s)
-    unless password_ok
-      if login_control.remain_times-1 == 0
-        normal_status(-2, "登录密码出错已达上限，账号已被锁定, 请#{login_control.forbid_expires/60}分钟后重新登录或找回密码")
-      else
-        normal_status(-2, "你已经输错密码#{login_control.error_times+1}次，还剩余#{login_control.remain_times-1}次机会")
-      end
-      login_control.increment!
-      return
-    end
-
-    successful_authentication(@user)
-    sync_pwd_to_gitea!(@user, {password: params[:password].to_s}) # TODO用户密码未同步
-
-    # 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
-      code = params[:code]
-      login_type = phone_mail_type(params[:login].strip)
-      # 获取验证码
-      if login_type == 1
-        phone = params[:login]
-        verifi_code = VerificationCode.where(phone: phone, code: code, code_type: 2).last
-        user = User.find_by_phone(phone)
-      else
-        email = params[:login]
-        verifi_code = VerificationCode.where(email: email, code: code, code_type: 3).last
-        user = User.find_by_mail(email)     #这里有问题，应该是为email,而不是mail  6.13-hs
-      end
-      return normal_status(-2, "验证码不正确") if verifi_code.try(:code) != code.strip
-      return normal_status(-2, "验证码已失效") if !verifi_code&.effective?
-      return normal_status(-1, "8~16位密码，支持字母数字和符号") unless params[:new_password] =~ CustomRegexp::PASSWORD
-
-      user.password, user.password_confirmation = params[:new_password], params[:new_password_confirmation]
-      ActiveRecord::Base.transaction do
-        user.save!
-        LimitForbidControl::UserLogin.new(user).clear
-      end
-      sucess_status
-    rescue Exception => e
-      uid_logger_error(e.message)
-      tip_exception(e.message)
-    end
-  end
-
-  def  successful_authentication(user)
-    uid_logger("Successful authentication start: '#{user.login}' from #{request.remote_ip} at #{Time.now.utc}")
-    # Valid user
-    self.logged_user = user
-    # generate a key and set cookie if autologin
-
-    set_autologin_cookie(user)
-    UserAction.create(:action_id => user.try(:id), :action_type => "Login", :user_id => user.try(:id), :ip => request.remote_ip)
-    user.update_column(:last_login_on, Time.now)
-    session[:"#{default_yun_session}"] = user.id
-    Rails.logger.info("#########_____session_default_yun_session__________###############{default_yun_session}")
-    # 注册完成后有一天的试用申请(先去掉)
-    # UserDayCertification.create(user_id: user.id, status: 1)
-  end
-
-  def set_autologin_cookie(user)
-    token = Token.get_or_create_permanent_login_token(user, "autologin")
-    sync_user_token_to_trustie(user.login, token.value)
-
-    cookie_options = {
-                      :value => token.value,
-                      :expires => 1.month.from_now,
-                      :path => '/',
-                      :secure => false,
-                      :httponly => true
-                     }
-    if edu_setting('cookie_domain').present?
-      cookie_options = cookie_options.merge(domain: edu_setting('cookie_domain'))
-    end
-    cookies[autologin_cookie_name] = cookie_options
-    cookies.signed[:user_id] ||= user.id
-
-    logger.info("cookies is #{cookies} ======> #{cookies.signed[:user_id]} =====> #{cookies[autologin_cookie_name]}")
-  end
-
-  def logout
-    Rails.logger.info("########___logout_current_user____________########{current_user.try(:id)}")
-    UserAction.create(action_id: User.current.id, action_type: "Logout", user_id: User.current.id, :ip => request.remote_ip)
-    logout_user
-    render :json => {status: 1, message: "退出成功!"}
-  end
-
-  # 检验邮箱是否已被注册及邮箱或者手机号是否合法
-  # 参数type为事件类型 1：注册；2：忘记密码；3：绑定
-  def valid_email_and_phone
-    check_mail_and_phone_valid(params[:login], params[:type])
-  end
-
-  # 发送验证码
-  # params[:login]  手机号或者邮箱号
-  # params[:type]为事件通知类型 1：用户注册注册 2：忘记密码 3: 绑定手机 4: 绑定邮箱, 5: 验收手机号有效 # 如果有新的继续后面加
-  # 发送验证码：send_type 1：注册手机验证码 2：找回密码手机验证码 3：找回密码邮箱验证码 4：绑定手机 5：绑定邮箱
-  # 6：手机验证码登录 7：邮箱验证码登录 8：邮箱注册验证码 9: 验收手机号有效
-  def get_verification_code
-    code = %W(0 1 2 3 4 5 6 7 8 9)
-    value = params[:login]
-    type = params[:type].strip.to_i
-    login_type = phone_mail_type(value)
-    send_type = verify_type(login_type, type)
-    verification_code = code.sample(6).join
-
-    sign = Digest::MD5.hexdigest("#{OPENKEY}#{value}")
-    tip_exception(501, "请求不合理") if sign != params[:smscode]
-
-    logger.info("########get_verification_code: login_type： #{login_type}， send_type：#{send_type}, ")
-
-    # 记录验证码
-    check_verification_code(verification_code, send_type, value)
-    sucess_status
-  end
-
-  # 1 手机类型；0 邮箱类型
-  # 注意新版的login是自动名生成的
-  def phone_mail_type value
-    value =~ /^1\d{10}$/ ? 1 : 0
-  end
-
-  private
-
-  # type 事件类型 1：用户注册 2：忘记密码 3: 绑定手机 4: 绑定邮箱, 5: 验证手机号是否有效 # 如果有新的继续后面加
-  # login_type 1：手机类型 2：邮箱类型
-  def verify_type login_type, type
-    case type
-    when 1
-      login_type == 1 ? 1 : 8
-    when 2
-      login_type == 1 ? 2 : 3
-    when 3
-      login_type == 1 ? 4 : tip_exception('请填写正确的手机号')
-    when 4
-      login_type == 1 ? tip_exception('请填写正确的邮箱') : 5
-    when 5
-      login_type == 1 ? 9 : tip_exception('请填写正确的手机号')
-    end
-  end
-
-  def generate_login(login)
-    type = phone_mail_type(login.strip)
-
-    if type == 1
-      uid_logger("start register by phone:  type is #{type}")
-      pre = 'p'
-      email = nil
-      phone = login
-    else
-      uid_logger("start register by email:  type is #{type}")
-      pre = 'm'
-      email = login
-      phone = nil
-    end
-    code = generate_identifier User, 8, pre
-
-    { login: pre + code, email: email, phone: phone }
-  end
-
-  def sync_gitea_params
-    params.permit(:login, :email, :password)
-  end
-
-  def user_params
-    params.require(:user).permit(:login, :email, :phone)
-  end
-
-  def account_params 
-    params.require(:account).permit(:login, :password)
-  end
-end
+class AccountsController < ApplicationController
+  include ApplicationHelper
+
+  def index
+    render json: session
+  end
+
+  # 其他平台同步注册的用户
+  def remote_register
+    Register::RemoteForm.new(remote_register_params).validate!
+    username = params[:username]&.gsub(/\s+/, "")
+    tip_exception("无法使用以下关键词：#{username}，请重新命名") if ReversedKeyword.check_exists?(username)
+    email = params[:email]&.gsub(/\s+/, "")
+    password = params[:password]
+    platform = (params[:platform] || 'forge')&.gsub(/\s+/, "")
+
+    ActiveRecord::Base.transaction do
+      result = autologin_register(username, email, password, platform)
+      if result[:message].blank?
+        render_ok({user: result[:user]})
+      else
+        render_error(result[:message])
+      end
+    end
+  rescue Exception => e
+    uid_logger_error(e.message)
+    tip_exception(-1, e.message)
+  end
+
+  # 其他平台修改用户的信息，这边同步修改
+  def remote_update
+    ActiveRecord::Base.transaction do
+      user_params = params[:user_params]
+      user_extension_params = params[:user_extension_params]
+
+      u = User.find_by(login: params[:old_user_login])
+      user_mail = u.try(:mail)
+
+      if u.present?
+        ue = u.user_extension
+        u.login = user_params["login"] if user_params["login"]
+        u.mail = user_params["mail"] if user_params["mail"]
+        u.lastname = user_params["lastname"] if user_params["lastname"]
+
+        ue.gender = user_extension_params["gender"]
+        ue.school_id = user_extension_params["school_id"]
+        ue.location = user_extension_params["location"]
+        ue.location_city = user_extension_params["location_city"]
+        ue.identity = user_extension_params["identity"]
+        ue.technical_title = user_extension_params["technical_title"]
+        ue.student_id = user_extension_params["student_id"]
+        ue.description = user_extension_params["description"]
+        ue.save!
+        u.save!
+
+        sync_params = {}
+
+        if (user_params["mail"] && user_params["mail"] != user_mail)
+          sync_params = sync_params.merge(email: user_params["mail"])
+        end
+
+        if sync_params.present?
+          interactor = Gitea::User::UpdateInteractor.call(u.login, sync_params)
+          if interactor.success?
+            render_ok
+          else
+            render_error(interactor.error)
+          end
+        end
+      end
+    end
+  rescue Exception => e
+    uid_logger_error(e.message)
+    tip_exception(-1, e.message)
+  end
+
+  # 其他平台同步登录
+  def remote_login
+    @user = User.try_to_login(params[:login], params[:password])
+    if @user
+      successful_authentication(@user)
+      render_ok({user: {id: @user.id, token: @user.gitea_token}})
+    else
+      render_error("用户不存在")
+    end
+  end
+
+  #修改密码
+  def remote_password
+    @user = User.find_by(login: params[:login])
+    return render_error("未找到相关用户!") if @user.blank?
+
+    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
+
+
+
+  # 用户注册
+  # 注意：用户注册需要兼顾本地版，本地版是不需要验证码及激活码以及使用授权的，注册完成即可使用
+  # params[:login] 邮箱或者手机号
+  # params[:namespace] 登录名
+  # params[:code]  验证码
+  # code_type 1：注册手机验证码  8：邮箱注册验证码
+  # 本地forge注册入口需要重新更改逻辑
+  def register
+    # type只可能是1或者8
+    user = nil
+    begin
+      Register::Form.new(register_params).validate!
+
+      user = Users::RegisterService.call(register_params)
+      password = register_params[:password].strip
+
+      # gitea用户注册, email, username, password
+      interactor = Gitea::RegisterInteractor.call({username: user.login, email: user.mail, password: password})
+      if interactor.success?
+        gitea_user = interactor.result
+        result = Gitea::User::GenerateTokenService.call(user.login, password)
+        user.gitea_token = result['sha1']
+        user.gitea_uid = gitea_user[:body]['id']
+        if user.save!
+          UserExtension.create!(user_id: user.id)
+          successful_authentication(user)
+          render_ok
+        end
+      else
+        tip_exception(-1, interactor.error)
+      end
+    rescue Register::BaseForm::EmailError => e
+      render_result(-2, e.message)
+    rescue Register::BaseForm::LoginError => e
+      render_result(-3, e.message)
+    rescue Register::BaseForm::PhoneError => e
+      render_result(-4, e.message)
+    rescue Register::BaseForm::PasswordFormatError => e
+      render_result(-5, e.message)
+    rescue Register::BaseForm::PasswordConfirmationError => e
+      render_result(-7, e.message)
+    rescue Register::BaseForm::VerifiCodeError => e
+      render_result(-6, e.message)
+    rescue Exception => e
+      Gitea::User::DeleteService.call(user.login) unless user.nil?
+      uid_logger_error(e.message)
+      tip_exception(-1, e.message)
+    end
+  end
+
+  # 用户登录
+  def login
+    Users::LoginForm.new(login_params).validate!
+    @user = User.try_to_login(params[:login], params[:password])
+
+    return normal_status(-2, "错误的账号或密码") if @user.blank?
+    # user is already in local database
+    return normal_status(-2, "违反平台使用规范，账号已被锁定") if @user.locked?
+
+    login_control = LimitForbidControl::UserLogin.new(@user)
+    return normal_status(-2, "登录密码出错已达上限，账号已被锁定, 请#{login_control.forbid_expires/60}分钟后重新登录或找回密码") if login_control.forbid?
+
+    password_ok = @user.check_password?(params[:password].to_s)
+    unless password_ok
+      if login_control.remain_times-1 == 0
+        normal_status(-2, "登录密码出错已达上限，账号已被锁定, 请#{login_control.forbid_expires/60}分钟后重新登录或找回密码")
+      else
+        normal_status(-2, "你已经输错密码#{login_control.error_times+1}次，还剩余#{login_control.remain_times-1}次机会")
+      end
+      login_control.increment!
+      return
+    end
+
+    successful_authentication(@user)
+    sync_pwd_to_gitea!(@user, {password: params[:password].to_s}) # TODO用户密码未同步
+
+    # 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
+      Accounts::ResetPasswordForm.new(reset_password_params).validate!
+
+      user = find_user
+      return render_error('未找到相关账号') if user.blank?
+
+      user = Accounts::ResetPasswordService.call(user, reset_password_params)
+      LimitForbidControl::UserLogin.new(user).clear if user.save!
+
+      render_ok
+    rescue Register::BaseForm::EmailError => e
+      render_result(-2, e.message)
+    rescue Register::BaseForm::PhoneError => e
+      render_result(-4, e.message)
+    rescue Register::BaseForm::PasswordFormatError => e
+      render_result(-5, e.message)
+    rescue Register::BaseForm::PasswordConfirmationError => e
+      render_result(-7, e.message)
+    rescue Register::BaseForm::VerifiCodeError => e
+      render_result(-6, e.message)
+    rescue ActiveRecord::Rollback => e
+      render_result(-1, "服务器异常")
+    rescue Exception => e
+      uid_logger_error(e.message)
+      tip_exception(e.message)
+    end
+  end
+
+  def  successful_authentication(user)
+    uid_logger("Successful authentication start: '#{user.login}' from #{request.remote_ip} at #{Time.now.utc}")
+    # Valid user
+    self.logged_user = user
+    # generate a key and set cookie if autologin
+
+    set_autologin_cookie(user)
+    UserAction.create(:action_id => user.try(:id), :action_type => "Login", :user_id => user.try(:id), :ip => request.remote_ip)
+    user.update_column(:last_login_on, Time.now)
+    session[:"#{default_yun_session}"] = user.id
+    Rails.logger.info("#########_____session_default_yun_session__________###############{default_yun_session}")
+    # 注册完成后有一天的试用申请(先去掉)
+    # UserDayCertification.create(user_id: user.id, status: 1)
+  end
+
+  def set_autologin_cookie(user)
+    token = Token.get_or_create_permanent_login_token(user, "autologin")
+    # sync_user_token_to_trustie(user.login, token.value)
+
+    cookie_options = {
+                      :value => token.value,
+                      :expires => 1.month.from_now,
+                      :path => '/',
+                      :secure => false,
+                      :httponly => true
+                     }
+    if edu_setting('cookie_domain').present?
+      cookie_options = cookie_options.merge(domain: edu_setting('cookie_domain'))
+    end
+    cookies[autologin_cookie_name] = cookie_options
+    cookies.signed[:user_id] ||= user.id
+
+    logger.info("cookies is #{cookies} ======> #{cookies.signed[:user_id]} =====> #{cookies[autologin_cookie_name]}")
+  end
+
+  def logout
+    Rails.logger.info("########___logout_current_user____________########{current_user.try(:id)}")
+    UserAction.create(action_id: User.current.id, action_type: "Logout", user_id: User.current.id, :ip => request.remote_ip)
+    logout_user
+    render :json => {status: 1, message: "退出成功!"}
+  end
+
+  # 检验邮箱是否已被注册及邮箱或者手机号是否合法
+  # 参数type为事件类型 1：注册；2：忘记密码；3：绑定
+  def valid_email_and_phone
+    check_mail_and_phone_valid(params[:login], params[:type])
+  end
+
+  # 发送验证码
+  # params[:login]  手机号或者邮箱号
+  # params[:type]为事件通知类型 1：用户注册 2：忘记密码 3: 绑定手机 4: 绑定邮箱, 5: 验收手机号有效 # 如果有新的继续后面加
+  # 发送验证码：send_type 1：注册手机验证码 2：找回密码手机验证码 3：找回密码邮箱验证码 4：绑定手机 5：绑定邮箱
+  # 6：手机验证码登录 7：邮箱验证码登录 8：邮箱注册验证码 9: 验收手机号有效
+  def get_verification_code
+    code = %W(0 1 2 3 4 5 6 7 8 9)
+    value = params[:login]
+    type = params[:type].strip.to_i
+    login_type = phone_mail_type(value)
+    send_type = verify_type(login_type, type)
+    verification_code = code.sample(6).join
+
+    sign = Digest::MD5.hexdigest("#{OPENKEY}#{value}")
+    tip_exception(501, "请求不合理") if sign != params[:smscode]
+
+    logger.info "########### 验证码：#{verification_code}"
+    logger.info("########get_verification_code: login_type： #{login_type}， send_type：#{send_type}, ")
+
+    # 记录验证码
+    check_verification_code(verification_code, send_type, value)
+    render_ok
+  end
+
+  # check user's login or email or phone is used
+  # params[:value]  手机号或者邮箱号或者登录名
+  # params[:type] 为事件类型 1：登录名(login) 2：email(邮箱) 3：phone(手机号)
+  def check
+    Register::CheckColumnsForm.new(check_params).validate!
+    render_ok
+  end
+  
+  private
+
+  # type 事件类型 1：用户注册 2：忘记密码 3: 绑定手机 4: 绑定邮箱, 5: 验证手机号是否有效 # 如果有新的继续后面加
+  # login_type 1：手机类型 2：邮箱类型
+  def verify_type login_type, type
+    case type
+    when 1
+      login_type == 1 ? 1 : 8
+    when 2
+      login_type == 1 ? 2 : 3
+    when 3
+      login_type == 1 ? 4 : tip_exception('请填写正确的手机号')
+    when 4
+      login_type == 1 ? tip_exception('请填写正确的邮箱') : 5
+    when 5
+      login_type == 1 ? 9 : tip_exception('请填写正确的手机号')
+    end
+  end
+
+  def generate_login(login)
+    type = phone_mail_type(login.strip)
+
+    if type == 1
+      uid_logger("start register by phone:  type is #{type}")
+      pre = 'p'
+      email = nil
+      phone = login
+    else
+      uid_logger("start register by email:  type is #{type}")
+      pre = 'm'
+      email = login
+      phone = nil
+    end
+    code = generate_identifier User, 8, pre
+
+    { login: pre + code, email: email, phone: phone }
+  end
+
+  def user_params
+    params.require(:user).permit(:login, :email, :phone)
+  end
+
+  def login_params 
+    params.require(:account).permit(:login, :password)
+  end
+
+  def check_params
+    params.permit(:type, :value)
+  end
+
+  def register_params
+    params.permit(:login, :namespace, :password, :password_confirmation, :code)
+  end
+
+  def reset_password_params
+    params.permit(:login, :password, :password_confirmation, :code)
+  end
+  
+  def find_user
+    phone_or_mail = strip(reset_password_params[:login])
+    User.where("phone = :search OR mail = :search", search: phone_or_mail).last
+  end
+
+  def remote_register_params
+    params.permit(:username, :email, :password, :platform)
+  end
+  
+end

app/controllers/admins/edu_settings_controller.rb

@@ -0,0 +1,55 @@
+class Admins::EduSettingsController < Admins::BaseController
+  before_action :find_setting, only: [:edit,:update, :destroy]
+
+  def index
+    default_sort('id', 'desc')
+
+    edu_settings = Admins::EduSettingQuery.call(params)
+    @edu_settings = paginate edu_settings
+  end
+  
+  def new
+    @edu_setting = EduSetting.new
+  end
+
+  def edit 
+  end
+
+  def create
+    @edu_setting = EduSetting.new(edu_setting_params)
+    if @edu_setting.save
+      redirect_to admins_edu_settings_path
+      flash[:success] = '创建成功'
+    else
+      redirect_to admins_edu_settings_path
+      flash[:danger] = @edu_setting.errors.full_messages.join(",")
+    end
+  end
+  
+  def update
+    if @edu_setting.update!(edu_setting_params)
+      flash[:success] = '更新成功'
+    else
+      flash[:danger] = @edu_setting.errors.full_messages.join(",")
+    end
+    redirect_to admins_edu_settings_path
+  end
+  
+  def destroy
+    if @edu_setting.destroy!
+      flash[:success] = '删除成功'
+    else
+      lash[:danger] = '删除失败'
+    end
+    redirect_to admins_edu_settings_path
+  end
+  
+  private
+  def find_setting
+    @edu_setting ||= EduSetting.find(params[:id])
+  end
+  
+  def edu_setting_params
+    params.require(:edu_setting).permit(:name, :value, :description)
+  end
+end

app/controllers/admins/message_templates_controller.rb

@@ -0,0 +1,44 @@
+class Admins::MessageTemplatesController < Admins::BaseController 
+  before_action :get_template, only: [:edit, :update, :destroy]
+
+  def index 
+    message_templates = MessageTemplate.group(:type).count.keys
+    @message_templates = kaminari_array_paginate(message_templates)
+  end
+
+  def edit 
+  end
+
+  def update 
+    if @message_template.update_attributes(message_template_params)
+      redirect_to admins_message_templates_path
+      flash[:success] = '消息模版更新成功'
+    else 
+      redirect_to admins_message_templates_path
+      flash[:danger] = @message_template.errors.full_messages.join(",")
+    end
+  end
+
+  def init_data
+    if MessageTemplate.build_init_data
+      redirect_to admins_message_templates_path
+      flash[:success] = '消息模版初始化成功'
+    else 
+      redirect_to admins_message_templates_path
+      flash[:danger] = '消息模版初始化失败'
+    end
+  end
+
+  private 
+  def message_template_params
+    params.require(@message_template.type.split("::").join("_").underscore.to_sym).permit!
+  end
+
+  def get_template
+    @message_template = MessageTemplate.find_by(id: params[:id])
+    unless @message_template.present?
+      redirect_to admins_message_templates_path 
+      flash[:danger] = "消息模版不存在"
+    end
+  end
+end

app/controllers/admins/project_categories_controller.rb

@@ -22,7 +22,7 @@ class Admins::ProjectCategoriesController < Admins::BaseController
     max_position_items = ProjectCategory.select(:id, :position).pluck(:position).reject!(&:blank?) 
     max_position =  max_position_items.present? ? max_position_items.max.to_i : 0
 
-    @project_category = ProjectCategory.new(name: @name,position: max_position)
+    @project_category = ProjectCategory.new(name: @name,position: max_position, pinned_index: params[:project_category][:pinned_index].to_i)
     if @project_category.save
       redirect_to admins_project_categories_path
       flash[:success] = '创建成功'
@@ -33,17 +33,18 @@ class Admins::ProjectCategoriesController < Admins::BaseController
   end
 
   def update 
-    if @project_category.update_attribute(:name, @name)
+    if @project_category.update_attributes({name: @name, pinned_index: params[:project_category][:pinned_index].to_i})
+      save_image_file(params[:logo], 'logo')
       redirect_to admins_project_categories_path
       flash[:success] = '更新成功'
     else 
       redirect_to admins_project_categories_path
-      flash[:success] = '更新失败'
+      flash[:danger] = '更新失败'
     end
   end
 
   def destroy 
-    if @project_category.destroy
+    if @project_category.destroy 
       redirect_to admins_project_categories_path
       flash[:success] = "删除成功"
     else 
@@ -80,4 +81,12 @@ class Admins::ProjectCategoriesController < Admins::BaseController
       flash[:danger] = '分类已存在'
     end
   end
+
+  def save_image_file(file, type)
+    return unless file.present? && file.is_a?(ActionDispatch::Http::UploadedFile)
+
+    file_path = Util::FileManage.source_disk_filename(@project_category, type)
+    File.delete(file_path) if File.exist?(file_path) # 删除之前的文件
+    Util.write_file(file, file_path)
+  end
 end

app/controllers/admins/projects_controller.rb

@@ -1,4 +1,5 @@
 class Admins::ProjectsController < Admins::BaseController
+  before_action :find_project, only: [:edit, :update]
 
   def index
     sort_by = Project.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'created_on'
@@ -8,6 +9,26 @@ class Admins::ProjectsController < Admins::BaseController
     @projects = paginate projects.includes(:owner, :members, :issues, :versions, :attachments, :project_score)
   end
 
+  def edit ;end
+
+  def update
+    respond_to do |format|
+      if @project.update_attributes(project_update_params)
+        format.html do 
+          redirect_to admins_projects_path
+          flash[:sucess] = "更新成功"
+        end
+        format.js {render_ok}
+      else 
+        format.html do 
+          redirect_to admins_projects_path
+          flash[:danger] = "更新失败"
+        end
+        format.js {render_js_error}
+      end
+    end
+  end
+
   def destroy
     project = Project.find_by!(id: params[:id])
     ActiveRecord::Base.transaction do
@@ -21,4 +42,13 @@ class Admins::ProjectsController < Admins::BaseController
       redirect_to admins_projects_path
       flash[:danger] = "删除失败"
   end
+
+  private 
+  def find_project
+    @project = Project.find_by_id(params[:id])
+  end
+
+  def project_update_params 
+    params.require(:project).permit(:is_pinned, :recommend, :recommend_index)
+  end
 end

app/controllers/admins/reversed_keywords_controller.rb

@@ -0,0 +1,84 @@
+class Admins::ReversedKeywordsController < Admins::BaseController 
+  before_action :get_keyword, only: [:edit,:update, :destroy]
+  # before_action :validate_identifer, only: [:create, :update]
+
+  def index 
+    sort_by = ReversedKeyword.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'created_at'
+    sort_direction = %w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : 'desc'
+    q = ReversedKeyword.ransack(identifier_cont: params[:search])
+    keywords = q.result(distinct: true).order("#{sort_by} #{sort_direction}")
+    @keywords = paginate(keywords)
+    
+  end
+
+  def new 
+    @keyword = ReversedKeyword.new
+  end
+
+  def edit 
+  end
+
+  def create 
+    @keyword = ReversedKeyword.new(keyword_params)
+    if @keyword.save
+      redirect_to admins_reversed_keywords_path
+      flash[:success] = '系统保留关键词创建成功'
+    else
+      redirect_to admins_reversed_keywords_path
+      flash[:danger] = @keyword.errors.full_messages.join(",")
+    end
+  end
+
+  def update 
+    
+    respond_to do |format|
+      if @keyword.update_attributes(keyword_params)
+        format.html do 
+          redirect_to admins_reversed_keywords_path
+          flash[:success] = '系统保留关键词更新成功'
+        end
+        format.js {render_ok}
+      else 
+        format.html do 
+          redirect_to admins_reversed_keywords_path
+          flash[:danger] = @keyword.errors.full_messages.join(",")
+        end
+        format.js {render_js_error}
+      end
+    end
+  end
+
+  def destroy 
+    if @keyword.destroy 
+      redirect_to admins_reversed_keywords_path 
+      flash[:success] = "系统保留关键词删除成功"
+    else 
+      redirect_to admins_reversed_keywords_path 
+      flash[:danger] = "系统保留关键词删除失败"
+    end
+  end
+
+  private 
+  def keyword_params 
+    params.require(:reversed_keyword).permit!
+  end
+
+  def get_keyword
+    @keyword = ReversedKeyword.find_by(id: params[:id])
+    unless @keyword.present?
+      redirect_to admins_reversed_keywords_path 
+      flash[:danger] = "系统保留关键词不存在"
+    end
+  end
+
+  def validate_identifer 
+    identifer = keyword_params[:identifier].to_s.downcase
+    if identifer.blank?
+      redirect_to admins_reversed_keywords_path
+      flash[:danger] = '系统保留关键词标识不能为空'
+    elsif ProjectLanguage.exists?(name: identifer)
+      redirect_to admins_reversed_keywords_path
+      flash[:danger] = '系统保留关键词已存在'
+    end
+  end
+end

app/controllers/admins/sites_controller.rb

@@ -0,0 +1,56 @@
+class Admins::SitesController < Admins::BaseController 
+  before_action :find_site, only: [:edit,:update, :destroy]
+
+  def index
+    default_sort('id', 'desc')
+
+    sites = Admins::SiteQuery.call(params)
+    @sites = paginate sites
+  end
+  
+  def new
+    @site = Site.new
+  end
+
+  def edit 
+  end
+
+  def create
+    @site = Site.new(site_params)
+    if @site.save
+      redirect_to admins_sites_path
+      flash[:success] = '创建成功'
+    else
+      redirect_to admins_sites_path
+      flash[:danger] = @site.errors.full_messages.join(",")
+    end
+  end
+  
+  def update
+    if @site.update!(site_params)
+      flash[:success] = '更新成功'
+    else
+      flash[:danger] = @site.errors.full_messages.join(",")
+    end
+    redirect_to admins_sites_path
+  end
+  
+  def destroy
+    if @site.destroy!
+      flash[:success] = '删除成功'
+    else
+      lash[:danger] = '删除失败'
+    end
+    redirect_to admins_sites_path
+  end
+  
+  private
+  def find_site
+    @site ||= Site.find(params[:id])
+  end
+  
+  def site_params
+    params.require(:site).permit(:name, :url, :key, :site_type)
+  end
+
+end

app/controllers/admins/system_notifications_controller.rb

@@ -0,0 +1,75 @@
+class Admins::SystemNotificationsController < Admins::BaseController 
+  before_action :get_notification, only: [:history, :edit,:update, :destroy]
+  # before_action :validate_identifer, only: [:create, :update]
+
+  def index 
+    sort_by = SystemNotification.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'created_at'
+    sort_direction = %w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : 'desc'
+    q = SystemNotification.ransack(subject_cont: params[:search])
+    notifications = q.result(distinct: true).reorder("#{sort_by} #{sort_direction},created_at desc")
+    @notifications = paginate(notifications)
+  end
+
+  def history
+    @users = @notification.users
+  end
+
+  def new 
+    @notification = SystemNotification.new
+  end
+
+  def edit 
+  end
+
+  def create 
+    @notification = SystemNotification.new(notification_params)
+    if @notification.save
+      redirect_to admins_system_notifications_path
+      flash[:success] = '系统消息创建成功'
+    else
+      redirect_to admins_system_notifications_path
+      flash[:danger] = @notification.errors.full_messages.join(",")
+    end
+  end
+
+  def update 
+    respond_to do |format|
+      if @notification.update_attributes(notification_params)
+        format.html do 
+          redirect_to admins_system_notifications_path
+          flash[:success] = '系统消息更新成功'
+        end
+        format.js {render_ok}
+      else 
+        format.html do 
+          redirect_to admins_system_notifications_path
+          flash[:danger] = @notification.errors.full_messages.join(",")
+        end
+        format.js {render_js_error}
+      end
+    end
+  end
+
+  def destroy 
+    if @notification.destroy 
+      redirect_to admins_system_notifications_path 
+      flash[:success] = "系统消息删除成功"
+    else 
+      redirect_to admins_system_notifications_path 
+      flash[:danger] = "系统消息删除失败"
+    end
+  end
+
+  private 
+  def notification_params 
+    params.require(:system_notification).permit!
+  end
+
+  def get_notification
+    @notification = SystemNotification.find_by(id: params[:id])
+    unless @notification.present?
+      redirect_to admins_system_notifications_path 
+      flash[:danger] = "系统消息不存在"
+    end
+  end
+end

app/controllers/admins/topic/activity_forums_controller.rb

@@ -0,0 +1,57 @@
+class Admins::Topic::ActivityForumsController < Admins::Topic::BaseController
+  before_action :find_activity_forum, only: [:edit, :update, :destroy]
+
+  def index 
+    q = ::Topic::ActivityForum.ransack(title_cont: params[:search])
+    activity_forums = q.result(distinct: true)
+    @activity_forums = paginate(activity_forums)
+  end
+
+  def new 
+    @activity_forum = ::Topic::ActivityForum.new
+  end
+
+  def create 
+    @activity_forum = ::Topic::ActivityForum.new(activity_forum_params)
+    if @activity_forum.save 
+      redirect_to admins_topic_activity_forums_path
+      flash[:success] = "新增平台动态成功"
+    else
+      redirect_to admins_topic_activity_forums_path
+      flash[:danger] = "新增平台动态失败"
+    end
+  end
+
+  def edit 
+  end
+
+  def update 
+    @activity_forum.attributes = activity_forum_params
+    if @activity_forum.save 
+      redirect_to admins_topic_activity_forums_path
+      flash[:success] = "更新平台动态成功"
+    else  
+      redirect_to admins_topic_activity_forums_path
+      flash[:danger] = "更新平台动态失败"
+    end
+  end
+
+  def destroy 
+    if @activity_forum.destroy 
+      redirect_to admins_topic_activity_forums_path
+      flash[:success] = "删除平台动态成功"
+    else  
+      redirect_to admins_topic_activity_forums_path
+      flash[:danger] = "删除平台动态失败"
+    end
+  end
+
+  private 
+  def find_activity_forum
+    @activity_forum = ::Topic::ActivityForum.find_by_id(params[:id])
+  end
+
+  def activity_forum_params 
+    params.require(:topic_activity_forum).permit(:title, :uuid, :url, :order_index)
+  end
+end

app/controllers/admins/topic/banners_controller.rb

@@ -0,0 +1,57 @@
+class Admins::Topic::BannersController < Admins::Topic::BaseController
+  before_action :find_banner, only: [:edit, :update, :destroy]
+
+  def index 
+    @banners = paginate(::Topic::Banner)
+  end
+
+  def new 
+    @banner = ::Topic::Banner.new
+  end
+
+  def create 
+    @banner = ::Topic::Banner.new(banner_params)
+    if @banner.save 
+      save_image_file(params[:image], @banner)
+      redirect_to admins_topic_banners_path
+      flash[:success] = "新增banner成功"
+    else
+      redirect_to admins_topic_banners_path
+      flash[:danger] = "新增banner失败"
+    end
+  end
+
+  def edit 
+  end
+
+  def update 
+    @banner.attributes = banner_params
+    if @banner.save 
+      save_image_file(params[:image], @banner)
+      redirect_to admins_topic_banners_path
+      flash[:success] = "更新banner成功"
+    else  
+      redirect_to admins_topic_banners_path
+      flash[:danger] = "更新banner失败"
+    end
+  end
+
+  def destroy 
+    if @banner.destroy 
+      redirect_to admins_topic_banners_path
+      flash[:success] = "删除banner成功"
+    else  
+      redirect_to admins_topic_banners_path
+      flash[:danger] = "删除banner失败"
+    end
+  end
+
+  private 
+  def find_banner
+    @banner = ::Topic::Banner.find_by_id(params[:id])
+  end
+
+  def banner_params 
+    params.require(:topic_banner).permit(:title, :order_index)
+  end
+end

app/controllers/admins/topic/base_controller.rb

@@ -0,0 +1,11 @@
+class Admins::Topic::BaseController < Admins::BaseController
+  
+  protected
+  def save_image_file(file, topic)
+    return unless file.present? && file.is_a?(ActionDispatch::Http::UploadedFile)
+
+    file_path = Util::FileManage.source_disk_filename(topic, 'image')
+    File.delete(file_path) if File.exist?(file_path) # 删除之前的文件
+    Util.write_file(file, file_path)
+  end
+end

app/controllers/admins/topic/cards_controller.rb

@@ -0,0 +1,57 @@
+class Admins::Topic::CardsController < Admins::Topic::BaseController
+  before_action :find_card, only: [:edit, :update, :destroy]
+
+  def index 
+    q = ::Topic::Card.ransack(title_cont: params[:search])
+    cards = q.result(distinct: true)
+    @cards = paginate(cards)
+  end
+
+  def new 
+    @card = ::Topic::Card.new
+  end
+
+  def create 
+    @card = ::Topic::Card.new(card_params)
+    if @card.save 
+      redirect_to admins_topic_cards_path
+      flash[:success] = "新增合作单位成功"
+    else
+      redirect_to admins_topic_cards_path
+      flash[:danger] = "新增合作单位失败"
+    end
+  end
+
+  def edit 
+  end
+
+  def update 
+    @card.attributes = card_params
+    if @card.save 
+      redirect_to admins_topic_cards_path
+      flash[:success] = "更新合作单位成功"
+    else  
+      redirect_to admins_topic_cards_path
+      flash[:danger] = "更新合作单位失败"
+    end
+  end
+
+  def destroy 
+    if @card.destroy 
+      redirect_to admins_topic_cards_path
+      flash[:success] = "删除合作单位成功"
+    else  
+      redirect_to admins_topic_cards_path
+      flash[:danger] = "删除合作单位失败"
+    end
+  end
+
+  private 
+  def find_card
+    @card = ::Topic::Card.find_by_id(params[:id])
+  end
+
+  def card_params 
+    params.require(:topic_card).permit(:title, :url, :order_index)
+  end
+end

app/controllers/admins/topic/cooperators_controller.rb

@@ -0,0 +1,57 @@
+class Admins::Topic::CooperatorsController < Admins::Topic::BaseController
+  before_action :find_cooperator, only: [:edit, :update, :destroy]
+
+  def index 
+    @cooperators = paginate(::Topic::Cooperator)
+  end
+
+  def new 
+    @cooperator = ::Topic::Cooperator.new
+  end
+
+  def create 
+    @cooperator = ::Topic::Cooperator.new(cooperator_params)
+    if @cooperator.save 
+      save_image_file(params[:image], @cooperator)
+      redirect_to admins_topic_cooperators_path
+      flash[:success] = "新增合作单位成功"
+    else
+      redirect_to admins_topic_cooperators_path
+      flash[:danger] = "新增合作单位失败"
+    end
+  end
+
+  def edit 
+  end
+
+  def update 
+    @cooperator.attributes = cooperator_params
+    if @cooperator.save 
+      save_image_file(params[:image], @cooperator)
+      redirect_to admins_topic_cooperators_path
+      flash[:success] = "更新合作单位成功"
+    else  
+      redirect_to admins_topic_cooperators_path
+      flash[:danger] = "更新合作单位失败"
+    end
+  end
+
+  def destroy 
+    if @cooperator.destroy 
+      redirect_to admins_topic_cooperators_path
+      flash[:success] = "删除合作单位成功"
+    else  
+      redirect_to admins_topic_cooperators_path
+      flash[:danger] = "删除合作单位失败"
+    end
+  end
+
+  private 
+  def find_cooperator
+    @cooperator = ::Topic::Cooperator.find_by_id(params[:id])
+  end
+
+  def cooperator_params 
+    params.require(:topic_cooperator).permit(:title, :url, :order_index)
+  end
+end

app/controllers/admins/topic/excellent_projects_controller.rb

@@ -0,0 +1,57 @@
+class Admins::Topic::ExcellentProjectsController < Admins::Topic::BaseController
+  before_action :find_excellent_project, only: [:edit, :update, :destroy]
+
+  def index 
+    q = ::Topic::ExcellentProject.ransack(title_cont: params[:search])
+    excellent_projects = q.result(distinct: true)
+    @excellent_projects = paginate(excellent_projects)
+  end
+
+  def new 
+    @excellent_project = ::Topic::ExcellentProject.new
+  end
+
+  def create 
+    @excellent_project = ::Topic::ExcellentProject.new(excellent_project_params)
+    if @excellent_project.save 
+      redirect_to admins_topic_excellent_projects_path
+      flash[:success] = "新增优秀仓库成功"
+    else
+      redirect_to admins_topic_excellent_projects_path
+      flash[:danger] = "新增优秀仓库失败"
+    end
+  end
+
+  def edit 
+  end
+
+  def update 
+    @excellent_project.attributes = excellent_project_params
+    if @excellent_project.save 
+      redirect_to admins_topic_excellent_projects_path
+      flash[:success] = "更新优秀仓库成功"
+    else  
+      redirect_to admins_topic_excellent_projects_path
+      flash[:danger] = "更新优秀仓库失败"
+    end
+  end
+
+  def destroy 
+    if @excellent_project.destroy 
+      redirect_to admins_topic_excellent_projects_path
+      flash[:success] = "删除优秀仓库成功"
+    else  
+      redirect_to admins_topic_excellent_projects_path
+      flash[:danger] = "删除优秀仓库失败"
+    end
+  end
+
+  private 
+  def find_excellent_project
+    @excellent_project = ::Topic::ExcellentProject.find_by_id(params[:id])
+  end
+
+  def excellent_project_params 
+    params.require(:topic_excellent_project).permit(:title, :uuid, :url, :order_index)
+  end
+end

app/controllers/admins/topic/experience_forums_controller.rb

@@ -0,0 +1,57 @@
+class Admins::Topic::ExperienceForumsController < Admins::Topic::BaseController
+  before_action :find_experience_forum, only: [:edit, :update, :destroy]
+
+  def index 
+    q = ::Topic::ExperienceForum.ransack(title_cont: params[:search])
+    experience_forums = q.result(distinct: true)
+    @experience_forums = paginate(experience_forums)
+  end
+
+  def new 
+    @experience_forum = ::Topic::ExperienceForum.new
+  end
+
+  def create 
+    @experience_forum = ::Topic::ExperienceForum.new(experience_forum_params)
+    if @experience_forum.save 
+      redirect_to admins_topic_experience_forums_path
+      flash[:success] = "新增经验分享成功"
+    else
+      redirect_to admins_topic_experience_forums_path
+      flash[:danger] = "新增经验分享失败"
+    end
+  end
+
+  def edit 
+  end
+
+  def update 
+    @experience_forum.attributes = experience_forum_params
+    if @experience_forum.save 
+      redirect_to admins_topic_experience_forums_path
+      flash[:success] = "更新经验分享成功"
+    else  
+      redirect_to admins_topic_experience_forums_path
+      flash[:danger] = "更新经验分享失败"
+    end
+  end
+
+  def destroy 
+    if @experience_forum.destroy 
+      redirect_to admins_topic_experience_forums_path
+      flash[:success] = "删除经验分享成功"
+    else  
+      redirect_to admins_topic_experience_forums_path
+      flash[:danger] = "删除经验分享失败"
+    end
+  end
+
+  private 
+  def find_experience_forum
+    @experience_forum = ::Topic::ExperienceForum.find_by_id(params[:id])
+  end
+
+  def experience_forum_params 
+    params.require(:topic_experience_forum).permit(:title, :uuid, :url, :order_index)
+  end
+end

app/controllers/admins/topic/pinned_forums_controller.rb

@@ -0,0 +1,57 @@
+class Admins::Topic::PinnedForumsController < Admins::Topic::BaseController
+  before_action :find_pinned_forum, only: [:edit, :update, :destroy]
+
+  def index 
+    q = ::Topic::PinnedForum.ransack(title_cont: params[:search])
+    pinned_forums = q.result(distinct: true)
+    @pinned_forums = paginate(pinned_forums)
+  end
+
+  def new 
+    @pinned_forum = ::Topic::PinnedForum.new
+  end
+
+  def create 
+    @pinned_forum = ::Topic::PinnedForum.new(pinned_forum_params)
+    if @pinned_forum.save 
+      redirect_to admins_topic_pinned_forums_path
+      flash[:success] = "新增精选文章成功"
+    else
+      redirect_to admins_topic_pinned_forums_path
+      flash[:danger] = "新增精选文章失败"
+    end
+  end
+
+  def edit 
+  end
+
+  def update 
+    @pinned_forum.attributes = pinned_forum_params
+    if @pinned_forum.save 
+      redirect_to admins_topic_pinned_forums_path
+      flash[:success] = "更新精选文章成功"
+    else  
+      redirect_to admins_topic_pinned_forums_path
+      flash[:danger] = "更新精选文章失败"
+    end
+  end
+
+  def destroy 
+    if @pinned_forum.destroy 
+      redirect_to admins_topic_pinned_forums_path
+      flash[:success] = "删除精选文章成功"
+    else  
+      redirect_to admins_topic_pinned_forums_path
+      flash[:danger] = "删除精选文章失败"
+    end
+  end
+
+  private 
+  def find_pinned_forum
+    @pinned_forum = ::Topic::PinnedForum.find_by_id(params[:id])
+  end
+
+  def pinned_forum_params 
+    params.require(:topic_pinned_forum).permit(:title, :uuid, :url, :order_index)
+  end
+end

app/controllers/admins/users_controller.rb

@@ -1,4 +1,6 @@
 class Admins::UsersController < Admins::BaseController
+  before_action :finder_user, except: [:index]
+
   def index
     params[:sort_by] = params[:sort_by].presence || 'created_on'
     params[:sort_direction] = params[:sort_direction].presence || 'desc'
@@ -8,12 +10,9 @@ class Admins::UsersController < Admins::BaseController
   end
 
   def edit
-    @user = User.find(params[:id])
   end
 
   def update
-    @user = User.find(params[:id])
-
     Admins::UpdateUserService.call(@user, update_params)
     flash[:success] = '保存成功'
     redirect_to edit_admins_user_path(@user)
@@ -26,43 +25,47 @@ class Admins::UsersController < Admins::BaseController
   end
 
   def destroy
-    User.find(params[:id]).destroy!
+    @user.destroy!
+    Gitea::User::DeleteService.call(@user.login)
 
     render_delete_success
   end
 
   def lock
-    User.find(params[:id]).lock!
+    @user.lock!
 
     render_ok
   end
 
   def unlock
-    User.find(params[:id]).activate!
+    @user.activate!
 
     render_ok
   end
 
   def reward_grade
-    user = User.find(params[:user_id])
     return render_unprocessable_entity('金币数量必须大于0') if params[:grade].to_i <= 0
 
-    RewardGradeService.call(user, container_id: user.id, container_type: 'Feedback', score: params[:grade].to_i, not_unique: true)
+    RewardGradeService.call(@user, container_id: @user.id, container_type: 'Feedback', score: params[:grade].to_i, not_unique: true)
 
-    render_ok(grade: user.grade)
+    render_ok(grade: @user.grade)
   end
 
   def reset_login_times
-    User.find(params[:id]).reset_login_times!
+    @user.reset_login_times!
 
     render_ok
   end
 
   private
 
+  def finder_user
+    @user = User.find(params[:id])
+  end
+
   def update_params
     params.require(:user).permit(%i[lastname nickname gender identity technical_title student_id is_shixun_marker
                                     mail phone location location_city school_id department_id admin business is_test
-                                    password professional_certification authentication])
+                                    password professional_certification authentication login])
   end
 end

app/controllers/application_controller.rb

@@ -26,7 +26,8 @@ class ApplicationController < ActionController::Base
   end
 
 	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"
+	OPENKEY = Rails.application.config_for(:configuration)['sign_key'] || "79e33abd4b6588941ab7622aed1e67e8"
+
 
 	helper_method :current_user, :base_url
 
@@ -70,49 +71,11 @@ class ApplicationController < ActionController::Base
 																									(current_user.professional_certification && (ue.teacher? || ue.professional?))
 	end
 
-	def shixun_marker
-		unless current_user.is_shixun_marker? || current_user.admin_or_business?
-			tip_exception(403, "..")
-		end
-	end
-
-	# 实训的访问权限
-	def shixun_access_allowed
-		if !current_user.shixun_permission(@shixun)
-			tip_exception(403, "..")
-		end
-	end
 
 	def admin_or_business?
 		User.current.admin? || User.current.business?
 	end
 
-	# 访问课堂时没权限直接弹加入课堂的弹框 ：409
-	def user_course_identity
-		@user_course_identity = current_user.course_identity(@course)
-		if @user_course_identity > Course::STUDENT && @course.is_public == 0
-			tip_exception(401, "..") unless User.current.logged?
-			check_account
-			tip_exception(@course.excellent ? 410 : 409, "您没有权限进入")
-		end
-		if @user_course_identity > Course::CREATOR && @user_course_identity <= Course::STUDENT && @course.tea_id != current_user.id
-			# 实名认证和职业认证的身份判断
-			tip_exception(411, "你的实名认证和职业认证审核未通过") if @course.authentication &&
-				@course.professional_certification && (!current_user.authentication && !current_user.professional_certification)
-			tip_exception(411, "你的实名认证审核未通过") if @course.authentication && !current_user.authentication
-			tip_exception(411, "你的职业认证审核未通过") if @course.professional_certification && !current_user.professional_certification
-		end
-		uid_logger("###############user_course_identity:#{@user_course_identity}")
-	end
-
-	# 题库的访问权限
-	def bank_visit_auth
-		tip_exception(-2,"未通过职业认证") if current_user.is_teacher? && !current_user.certification_teacher? && !current_user.admin_or_business? && @bank.user_id != current_user.id && @bank.is_public
-		tip_exception(403, "无权限") unless @bank.user_id == current_user.id || current_user.admin_or_business? ||
-			(current_user.certification_teacher? && @bank.is_public)
-	end
-
-
 	# 判断用户的邮箱或者手机是否可用
 	# params[:type] 1: 注册；2：忘记密码；3：绑定
 	def  check_mail_and_phone_valid login, type
@@ -120,16 +83,16 @@ class ApplicationController < ActionController::Base
 					 login =~ /^[a-zA-Z0-9]+([._\\]*[a-zA-Z0-9])$/
 			tip_exception(-2, "请输入正确的手机号或邮箱")
 		end
-		# 考虑到安全参数问题，多一次查询，去掉Union
-		user = User.where(phone: login).first ||  User.where(mail: login).first
-		if type.to_i == 1 && !user.nil?
+	
+		user_exist = Owner.exists?(phone: login) || Owner.exists?(mail: login)
+		if user_exist && type.to_i == 1
 			tip_exception(-2, "该手机号码或邮箱已被注册")
-		elsif type.to_i == 2 && user.nil?
+		elsif type.to_i == 2 && !user_exist
 			tip_exception(-2, "该手机号码或邮箱未注册")
-		elsif type.to_i == 3 && user.present?
+		elsif type.to_i == 3 && user_exist
 			tip_exception(-2, "该手机号码或邮箱已绑定")
 		end
-		sucess_status
+		render_ok
 	end
 
 	# 发送及记录激活码
@@ -140,7 +103,7 @@ class ApplicationController < ActionController::Base
 		when 1, 2, 4, 9
 			# 手机类型的发送
 			sigle_para = {phone: value}
-			status = Educoder::Sms.send(mobile: value, code: code)
+			status = Gitlink::Sms.send(mobile: value, code: code)
 			tip_exception(-2, code_msg(status)) if status != 0
 		when 8, 3, 5
 			# 邮箱类型的发送
@@ -186,26 +149,6 @@ class ApplicationController < ActionController::Base
 		end
 	end
 
-	def find_course
-		return normal_status(2, '缺少course_id参数！') if params[:course_id].blank?
-		@course = Course.find(params[:course_id])
-		tip_exception(404, "") if @course.is_delete == 1 && !current_user.admin_or_business?
-	rescue Exception => e
-		tip_exception(e.message)
-	end
-
-	def course_manager
-		return normal_status(403, '只有课堂管理员才有权限') if @user_course_identity > Course::CREATOR
-	end
-
-	def find_board
-		return normal_status(2, "缺少board_id参数") if params[:board_id].blank?
-		@board = Board.find(params[:board_id])
-	rescue Exception => e
-		uid_logger_error(e.message)
-		tip_exception(e.message)
-	end
-
 	def validate_type(object_type)
 		normal_status(2, "参数") if params.has_key?(:sort_type) && !SORT_TYPE.include?(params[:sort_type].strip)
 	end
@@ -215,21 +158,6 @@ class ApplicationController < ActionController::Base
 		@page_size = params[:page_size] || 15
 	end
 
-	# 课堂教师权限
-	def teacher_allowed
-		logger.info("#####identity: #{current_user.course_identity(@course)}")
-		unless current_user.course_identity(@course) < Course::STUDENT
-			normal_status(403, "")
-		end
-	end
-
-	# 课堂教师、课堂管理员、超级管理员的权限(不包含助教)
-	def teacher_or_admin_allowed
-		unless current_user.course_identity(@course) < Course::ASSISTANT_PROFESSOR
-			normal_status(403, "")
-		end
-	end
-
 	def require_admin
 		normal_status(403, "") unless User.current.admin?
 	end
@@ -246,9 +174,17 @@ class ApplicationController < ActionController::Base
 		tip_exception(401, "请登录后再操作") unless User.current.logged?
 	end
 
+	def require_profile_completed
+		tip_exception(411, "请完善资料后再操作") unless User.current.profile_is_completed?
+	end
+
+	def require_user_profile_completed(user)
+		tip_exception(412, "请用户完善资料后再操作") unless user.profile_is_completed?
+	end
+
 	# 异常提醒
 	def tip_exception(status = -1, message)
-		raise Educoder::TipException.new(status, message)
+		raise Gitlink::TipException.new(status, message)
 	end
 
 	def missing_template
@@ -257,7 +193,7 @@ class ApplicationController < ActionController::Base
 
 	# 弹框提醒
 	def tip_show_exception(status = -2, message)
-		raise Educoder::TipException.new(status, message)
+		raise Gitlink::TipException.new(status, message)
 	end
 
 	def normal_status(status = 0, message)
@@ -272,7 +208,7 @@ class ApplicationController < ActionController::Base
 
 	# 资料是否完善
 	def check_account
-		if !current_user.profile_completed?
+		if !current_user. profile_is_completed?
 			#info_url = '/account/profile'
 			tip_exception(402, nil)
 		end
@@ -329,7 +265,6 @@ class ApplicationController < ActionController::Base
 				User.current = user
 			end
 		end
-
 		# if !User.current.logged? && Rails.env.development?
 		# 	User.current = User.find 1
 		# end
@@ -401,11 +336,6 @@ class ApplicationController < ActionController::Base
 		@message = message
 	end
 
-	# 实训等对应的仓库地址
-	def repo_ip_url(repo_path)
-		"#{edu_setting('git_address_ip')}/#{repo_path}"
-	end
-
 	def repo_url(repo_path)
 		"#{edu_setting('git_address_domain')}/#{repo_path}"
 	end
@@ -438,7 +368,7 @@ class ApplicationController < ActionController::Base
 			JSON.parse(res)
 		rescue Exception => e
 			uid_logger_error("--uri_exec: exception #{e.message}")
-			raise Educoder::TipException.new("实训平台繁忙（繁忙等级：84）")
+			raise Gitlink::TipException.new("实训平台繁忙（繁忙等级：84）")
 		end
 	end
 
@@ -457,7 +387,7 @@ class ApplicationController < ActionController::Base
 			end
 		rescue Exception => e
 			uid_logger("--uri_exec: exception #{e.message}")
-			raise Educoder::TipException.new(message)
+			raise Gitlink::TipException.new(message)
 		end
 	end
 
@@ -481,7 +411,7 @@ class ApplicationController < ActionController::Base
 			end
 		rescue Exception => e
 			uid_logger("--uri_exec: exception #{e.message}")
-			raise Educoder::TipException.new("服务器繁忙")
+			raise Gitlink::TipException.new("服务器繁忙")
 		end
 	end
 
@@ -653,8 +583,8 @@ class ApplicationController < ActionController::Base
 
 	# 获取Oauth Client
 	def get_client(site)
-		client_id = Rails.configuration.educoder['client_id']
-		client_secret = Rails.configuration.educoder['client_secret']
+		client_id = Rails.configuration.Gitlink['client_id']
+		client_secret = Rails.configuration.Gitlink['client_secret']
 
 		OAuth2::Client.new(client_id, client_secret, site: site)
 	end
@@ -674,7 +604,7 @@ class ApplicationController < ActionController::Base
 
 	def kaminari_paginate(relation)
 		limit = params[:limit] || params[:per_page]
-		limit = (limit.to_i.zero? || limit.to_i > 15) ? 15 : limit.to_i
+		limit = (limit.to_i.zero? || limit.to_i > 20) ? 20 : limit.to_i
 		page  = params[:page].to_i.zero? ? 1 : params[:page].to_i
 
 		relation.page(page).per(limit)
@@ -682,7 +612,7 @@ class ApplicationController < ActionController::Base
 
 	def kaminari_array_paginate(relation)
 		limit = params[:limit] || params[:per_page]
-		limit = (limit.to_i.zero? || limit.to_i > 15) ? 15 : limit.to_i
+		limit = (limit.to_i.zero? || limit.to_i > 20) ? 20 : limit.to_i
 		page  = params[:page].to_i.zero? ? 1 : params[:page].to_i
 
 		Kaminari.paginate_array(relation).page(page).per(limit)
@@ -754,10 +684,10 @@ class ApplicationController < ActionController::Base
     if @project and current_user.can_read_project?(@project)
 			logger.info "###########： has project and can read project"
 			@project
-    elsif @project && current_user.is_a?(AnonymousUser)
-			logger.info "###########：This is AnonymousUser"
-			@project = nil if !@project.is_public?
-			render_forbidden and return
+    # elsif @project && current_user.is_a?(AnonymousUser)
+		# 	logger.info "###########：This is AnonymousUser"
+		# 	@project = nil if !@project.is_public?
+		# 	render_forbidden and return
     else
 			logger.info "###########：project not found"
       @project = nil
@@ -774,13 +704,20 @@ class ApplicationController < ActionController::Base
 		Rails.application.config_for(:configuration)['platform_url'] || request.base_url
 	end
 
+	def image_type?(str)
+    default_type = %w(png jpg gif tif psd svg bmp webp jpeg ico psd)
+    default_type.include?(str&.downcase)
+  end
+
 	def convert_image!
-		@image = params[:image] || user_params[:image]
+		@image = params[:image] 
+		@image = @image.nil? && params[:user].present? ? params[:user][:image] : @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
+      return render_error('请上传文件') if @image.size.zero?
+      return render_error('文件大小超过限制') if @image.size > max_size.to_i
+			return render_error('头像格式不正确！') unless image_type?(File.extname(@image.original_filename.to_s)[1..-1])
     else
       image = @image.to_s.strip
       return render_error('请上传正确的图片') if image.blank?
@@ -806,37 +743,10 @@ class ApplicationController < ActionController::Base
 		render json: exception.tip_json
 	end
 
-	def render_parameter_missing
-		render json: { status: -1, message: '参数缺失' }
-	end
-
 	def set_export_cookies
 		cookies[:fileDownload] = true
 	end
 
-	# 149课程的评审用户数据创建（包含创建课堂学生）
-	def open_class_user
-		user = User.find_by(login: "OpenClassUser")
-		unless user
-			ActiveRecord::Base.transaction do
-				user_params = {status: 1, login: "OpenClassUser", lastname: "开放课程",
-											 nickname: "开放课程", professional_certification: 1, certification: 1, grade: 0,
-											 password: "12345678", phone: "11122223333", profile_completed: 1}
-				user = User.create!(user_params)
-
-				UserExtension.create!(user_id: user.id, gender: 0, school_id: 3396, :identity => 1, :student_id => "openclassuser") # 3396
-
-				subject = Subject.find_by(id: 149)
-				if subject
-					subject.courses.each do |course|
-						CourseMember.create!(course_id: course.id, role: 3, user_id: user.id) if !course.course_members.exists?(user_id: user.id)
-					end
-				end
-			end
-		end
-		user
-	end
-
 	# 记录热门搜索关键字
 	def record_search_keyword
 		keyword = params[:keyword].to_s.strip
@@ -846,4 +756,8 @@ class ApplicationController < ActionController::Base
 		HotSearchKeyword.add(keyword)
 	end
 
+  def find_atme_receivers
+    @atme_receivers = User.where(login: params[:receivers_login])
+  end
+
 end

app/controllers/attachments_controller.rb

@@ -32,8 +32,17 @@ class AttachmentsController < ApplicationController
   def get_file
     normal_status(-1, "参数缺失") if params[:download_url].blank?
     url = URI.encode(params[:download_url].to_s.gsub("http:", "https:"))
-    response = Faraday.get(url)
-    filename = params[:download_url].to_s.split("/").pop()
+    if url.starts_with?(base_url)
+      domain  = Gitea.gitea_config[:domain]
+      api_url = Gitea.gitea_config[:base_url]
+      url = url.split(base_url)[1].gsub("api", "repos").gsub('?filepath=', '/').gsub('&', '?')
+      request_url = [domain, api_url, url, "?ref=#{params[:ref]}&access_token=#{current_user&.gitea_token}"].join
+      response = Faraday.get(request_url)
+      filename = url.to_s.split("/").pop()
+    else
+      response = Faraday.get(url)
+      filename = params[:download_url].to_s.split("/").pop()
+    end
     send_data(response.body.force_encoding("UTF-8"),  filename: filename, type: "application/octet-stream", disposition: 'attachment')
   end
 
@@ -187,7 +196,7 @@ class AttachmentsController < ApplicationController
   end
 
   def file_save_to_ucloud(path, file, content_type)
-    ufile = Educoder::Ufile.new(
+    ufile = Gitlink::Ufile.new(
         ucloud_public_key: edu_setting('public_key'),
         ucloud_private_key: edu_setting('private_key'),
         ucloud_public_read: true,

app/controllers/claims_controller.rb

@@ -0,0 +1,138 @@
+#coding=utf-8
+class ClaimsController < ApplicationController
+    # skip_before_action :verify_authenticity_token
+    protect_from_forgery with: :null_session
+    before_action :require_login, except: [:index]
+    before_action :set_issue
+
+    def index
+        @user_claimed = 0
+        @claims = @issue.claims.claim_includes.order("created_at desc")
+    
+        @claims.each do |claim|
+            if claim.user_id == current_user.id
+                @user_claimed = 1
+                break
+            end
+        end 
+        render file: 'app/views/claims/list.json.jbuilder'
+    end
+
+    def create
+        @claim = Claim.find_by_sql(["select id from claims where issue_id=? and user_id=?",params[:issue_id], current_user.id])
+        if @claim.present?
+            return normal_status(-1,"您已经声明过该易修")
+        end
+
+        ActiveRecord::Base.transaction do
+            @claim = Claim.new(parse_issue_params(params))
+            if @claim.save
+                @claims = @issue.claims.claim_includes.order("created_at desc")
+                @user_claimed = 1
+                
+                journal_params = {
+                    journalized_id: params[:issue_id],
+                    journalized_type: "Issue",
+                    user_id: current_user.id ,
+                    notes: "新建声明: #{params[:claim_note]}",
+                }
+
+                journal = Journal.new(journal_params)
+                if journal.save
+                    render file: 'app/views/claims/list.json.jbuilder'
+                else
+                    normal_status(-1,"新建声明关联评论操作失败")
+                end
+
+            else
+                normal_status(-1,"新建声明操作失败")
+            end
+        end 
+    end
+
+    def update
+        @claim =  Claim.find_by_id(params[:claim_id])
+        if @claim.blank? 
+            return normal_status(-1,"易修不存在")
+        end
+
+        if @claim.user_id != current_user.id
+            return normal_status(-1,"你不能更新别人的声明")
+        end
+
+        ActiveRecord::Base.transaction do
+            if @claim.update_attribute(:note,params[:claim_note])
+                @claims = @issue.claims.claim_includes.order("created_at desc")
+                @user_claimed = 1
+               
+                journal_params = {
+                    journalized_id: params[:issue_id],
+                    journalized_type: "Issue",
+                    user_id: current_user.id ,
+                    notes: "更新声明: #{params[:claim_note]}",
+                }
+
+                journal = Journal.new(journal_params)
+                if journal.save
+                    render file: 'app/views/claims/list.json.jbuilder'
+                else
+                    normal_status(-1,"新建声明关联评论操作失败")
+                end
+
+            else
+                normal_status(-1,"声明更新操作失败")
+            end
+        end 
+    end
+
+    def destroy
+        @claim = Claim.find_by_sql(["select id from claims where issue_id=? and user_id=?",params[:issue_id], current_user.id])
+        if @claim.blank?
+            normal_status(-1,"您未曾声明过该易修")
+        else 
+            @claim = @claim[0]
+            # 判断current user是否是claimer
+            ActiveRecord::Base.transaction do
+                if @claim.destroy
+
+                    @claims = @issue.claims.claim_includes.order("created_at desc")
+                    @user_claimed = 0
+
+                    journal_params = {
+                        journalized_id: params[:issue_id],
+                        journalized_type: "Issue",
+                        user_id: current_user.id ,
+                        notes: "取消声明",
+                    }
+    
+                    journal = Journal.new(journal_params)
+                    if journal.save
+                        render file: 'app/views/claims/list.json.jbuilder'
+                    else
+                        normal_status(-1,"新建声明关联评论操作失败")
+                    end
+
+                else
+                    normal_status(-1,"取消声明操作失败")
+                end
+            end 
+        end 
+    end
+
+    private
+    def parse_issue_params(params)
+        {
+            issue_id: params[:issue_id],
+            user_id: current_user.id,
+            note: params[:claim_note],
+        }
+    end
+
+    def set_issue
+        @issue = Issue.find_by_id(params[:issue_id])
+        unless @issue.present?
+          normal_status(-1, "易修不存在")
+        end
+      end
+
+end

app/controllers/compare_controller.rb

@@ -24,7 +24,7 @@ class CompareController < ApplicationController
         @exist_pullrequest = @project.pull_requests.where(is_original: false, head: @base, base: @head, status: 0).take
       end
       if @exist_pullrequest.present?
-        return -2, "在这些分支之间的合并请求已存在：<a href='/projects/#{@owner.login}/#{@project.identifier}/pulls/#{@exist_pullrequest.id}/Messagecount'>#{@exist_pullrequest.try(:title)}</a>"
+        return -2, "在这些分支之间的合并请求已存在：<a href='/#{@owner.login}/#{@project.identifier}/pulls/#{@exist_pullrequest.id}'>#{@exist_pullrequest.try(:title)}</a>"
       else 
         if @compare_result["Commits"].blank? && @compare_result["Diff"].blank?
           return -2, "分支内容相同，无需创建合并请求"
@@ -42,12 +42,14 @@ class CompareController < ApplicationController
   end
 
   def load_compare_params
-    @base = Addressable::URI.unescape(params[:base])
-    @head = params[:head].include?('json') ? params[:head]&.split('.json')[0] : params[:head]
-
+    # @base = Addressable::URI.unescape(params[:base])
+    @base = params[:base].include?(":") ? Addressable::URI.unescape(params[:base].split(":")[0]) + ':' + Base64.decode64(params[:base].split(":")[1]) : Base64.decode64(params[:base])
+    @head = params[:head].include?('.json') ? params[:head][0..-6] : params[:head]
+    # @head = Addressable::URI.unescape(@head)
+    @head = @head.include?(":") ? Addressable::URI.unescape(@head.split(":")[0]) + ':' + Base64.decode64(@head.split(":")[1]) : Base64.decode64(@head)
   end
 
   def gitea_compare(base, head)
-    Gitea::Repository::Commits::CompareService.call(@owner.login, @project.identifier, base, head)
+    Gitea::Repository::Commits::CompareService.call(@owner.login, @project.identifier, CGI.escape(base), CGI.escape(head), current_user.gitea_token)
   end
 end

app/controllers/concerns/controller_rescue_handler.rb

@@ -20,7 +20,7 @@ module ControllerRescueHandler
     end
     # rescue_from ActionView::MissingTemplate, with: :object_not_found
     # rescue_from ActiveRecord::RecordNotFound, with: :object_not_found
-    rescue_from Educoder::TipException, with: :tip_show
+    rescue_from Gitlink::TipException, with: :tip_show
     rescue_from ::ActionView::MissingTemplate, with: :missing_template
     rescue_from ActiveRecord::RecordNotFound, with: :object_not_found
     rescue_from ActionController::ParameterMissing, with: :render_parameter_missing

app/controllers/concerns/git_common.rb

@@ -36,10 +36,10 @@ module GitCommon
     begin
       @commits = GitService.commits(repo_path: @repo_path)
       logger.info("git first commit is #{@commits.try(:first)}")
-      raise Educoder::TipException.new("请先创建版本库") if @commits.nil?
+      raise Gitlink::TipException.new("请先创建版本库") if @commits.nil?
     rescue Exception => e
       uid_logger_error(e.message)
-      raise Educoder::TipException.new("提交记录异常")
+      raise Gitlink::TipException.new("提交记录异常")
     end
   end
 

app/controllers/concerns/git_helper.rb

@@ -34,7 +34,7 @@ module GitHelper
 
     rescue Exception => e
       Rails.logger.error(e.message)
-      raise Educoder::TipException.new("文档内容获取异常")
+      raise Gitlink::TipException.new("文档内容获取异常")
     end
   end
 
@@ -64,7 +64,7 @@ module GitHelper
 
   # 版本库Fork功能
   def project_fork(container, original_rep_path, username)
-    raise Educoder::TipException.new("fork源路径为空,fork失败!") if original_rep_path.blank?
+    raise Gitlink::TipException.new("fork源路径为空,fork失败!") if original_rep_path.blank?
     # 将要生成的仓库名字
     new_repo_name = "#{username.try(:strip)}/#{container.try(:identifier)}#{ Time.now.strftime("%Y%m%d%H%M%S")}"
     # uid_logger("start fork container: repo_name is #{new_repo_name}")

app/controllers/concerns/laboratory_helper.rb

@@ -35,16 +35,15 @@ module LaboratoryHelper
     # my_projects: "/users/#{current_user.try(:login)}/projects",
     #       my_projects: "https://www.trustie.net/users/#{current_user.try(:login)}/user_projectlist",
     {
-      new_syllabuses: "https://forge.educoder.net/syllabuses/new",
-      new_course: "https://forge.educoder.net/courses/new",
-      edit_account: "https://forge.educoder.net/my/account",
-      my_courses: "https://forge.educoder.net/users/#{current_user.try(:login)}/user_courselist",
+      new_syllabuses: "https://www.trustie.net/syllabuses/new",
+      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_organ: "https://forge.educoder.net/users/#{current_user.try(:login)}/user_organizations",
-      default_url: "http://106.75.178.228",
-      forge_url: "http://106.75.178.228:81",
-      tiding_url: "https://www.educoder.net/users/#{current_user.try(:login)}/user_tidings",
-      register_url: "https://www.educoder.net/user/register"
+      my_organ: "https://www.trustie.net/users/#{current_user.try(:login)}/user_organizations",
+      default_url: Rails.application.config_for(:configuration)['platform_url'],
+      tiding_url: "https://www.trustie.net/users/#{current_user.try(:login)}/user_messages",
+      register_url: "https://www.trustie.net/login?login=false"
     }
   end
 end

app/controllers/concerns/register_helper.rb

@@ -1,44 +1,61 @@
 module RegisterHelper
   extend ActiveSupport::Concern
 
-  def autologin_register(username, email, password, platform= 'forge')
+  def autologin_register(username, email, password, platform= 'forge', need_edit_info = false)
+    result = {message: nil, user: nil}
+
     user = User.new(admin: false, login: username, mail: email, type: "User")
     user.password = password
     user.platform = platform
-    user.activate
+    if need_edit_info
+      user.need_edit_info
+    else 
+      user.activate
+    end
     
     return unless user.valid?
 
-    create_gitea_user!(user, username, email, password)
-  end
-
-  def create_gitea_user!(forge_user, username, email, password=random_password)
-    result = {message: nil, user: nil}
-
     interactor = Gitea::RegisterInteractor.call({username: username, email: email, password: password})
-    if interactor.success? || interactor.error.to_s.include?("已被注册")
-      gitea_user = interactor.error.to_s.include?("已被注册") ? Gitea::User::GetService.call(username, password) : interactor.result
-      Rails.logger.info "##### [gitea] create_gitea_user result: #{gitea_user}"
-      if gitea_user[:body].present?
-        result = Gitea::User::GenerateTokenService.call(username, password)
-        forge_user.gitea_token = result['sha1']
-        forge_user.gitea_uid = gitea_user[:body]['id'] if gitea_user[:body].present? && gitea_user[:body]['id'] !=0
-        forge_user.mail = email
-        if forge_user.save
-          UserExtension.create!(user_id: forge_user.id) if forge_user.user_extension.blank?
-          result[:user] = {id: forge_user.id, token: forge_user.gitea_token}
-        end
-      else
-        result[:message] = interactor.error
+    if interactor.success?
+      gitea_user = interactor.result
+      result = Gitea::User::GenerateTokenService.call(username, password)
+      user.gitea_token = result['sha1']
+      user.gitea_uid = gitea_user[:body]['id']
+      if user.save!
+        UserExtension.create!(user_id: user.id)
+        result[:user] = {id: user.id, token: user.gitea_token}
       end
     else
-      Rails.logger.info "##### [gitea] create_gitea_user result: #{interactor.error}"
       result[:message] = interactor.error
     end
     result
   end
-  
-  def random_password
-    "#{Random.rand(11111111)}"
+
+  def autosync_register_trustie(username, password, email, lastname="")
+    config = Rails.application.config_for(:configuration).symbolize_keys!
+
+    api_host = config[:sync_url]
+
+    return if api_host.blank?
+
+    url = "#{api_host}/api/v1/users/common"
+    sync_json = {
+      "mail": email,
+      "password": password,
+      "login": username,
+      "lastname": lastname
+    }.compact
+    uri = URI.parse(url)
+
+    if api_host
+      http = Net::HTTP.new(uri.hostname, uri.port)
+
+      if api_host.include?("https://")
+        http.use_ssl = true
+      end
+
+      http.send_request('POST', uri.path, sync_json.to_json, {'Content-Type' => 'application/json'})
+    end
   end
+
 end

app/controllers/concerns/render_helper.rb

@@ -28,4 +28,8 @@ module RenderHelper
   def render_result(status=1, message='success')
     render json: { status: status, message: message }
   end
+
+  def render_parameter_missing
+		render json: { status: -1, message: '参数缺失' }
+	end
 end

app/controllers/edu_settings_controller.rb

@@ -29,10 +29,8 @@ class EduSettingsController < ApplicationController
 
     respond_to do |format|
       if @edu_setting.save
-        format.html { redirect_to @edu_setting, notice: 'Edu setting was successfully created.' }
         format.json { render :show, status: :created, location: @edu_setting }
       else
-        format.html { render :new }
         format.json { render json: @edu_setting.errors, status: :unprocessable_entity }
       end
     end
@@ -43,10 +41,8 @@ class EduSettingsController < ApplicationController
   def update
     respond_to do |format|
       if @edu_setting.update(edu_setting_params)
-        format.html { redirect_to @edu_setting, notice: 'Edu setting was successfully updated.' }
         format.json { render :show, status: :ok, location: @edu_setting }
       else
-        format.html { render :edit }
         format.json { render json: @edu_setting.errors, status: :unprocessable_entity }
       end
     end
@@ -57,7 +53,6 @@ class EduSettingsController < ApplicationController
   def destroy
     @edu_setting.destroy
     respond_to do |format|
-      format.html { redirect_to edu_settings_url, notice: 'Edu setting was successfully destroyed.' }
       format.json { head :no_content }
     end
   end

app/controllers/forks_controller.rb

@@ -1,18 +1,11 @@
 class ForksController < ApplicationController
   before_action :require_login
+  before_action :require_profile_completed, only: [:create]
   before_action :load_project
   before_action :authenticate_project!, :authenticate_user!
 
   def create
     @new_project = Projects::ForkService.new(current_user, @project, params[:organization]).call
-
-    # TODO: fix Educoder shixun
-    if @new_project.persisted?
-      ProjectScore.create(:project_id => @new_project.id, :score => 0) if @new_project.project_score.nil?
-
-      project_info = ProjectInfo.new(:user_id => current_user.id, :project_id => @new_project.id)
-      @project.project_infos << project_info
-    end
   end
 
   private
@@ -20,7 +13,7 @@ class ForksController < ApplicationController
     if current_user&.id == @project.user_id
       render_result(-1, "自己不能fork自己的项目")
     elsif Project.exists?(user_id: current_user.id, identifier: @project.identifier)
-      render_result(-1, "fork失败，你已拥有了这个项目")
+      render_result(0, "fork失败，你已拥有了这个项目")
     end
     # return if current_user != @project.owner
     # render_result(-1, "自己不能fork自己的项目")

app/controllers/issue_tags_controller.rb

@@ -2,12 +2,12 @@ class IssueTagsController < ApplicationController
   before_action :require_login, except: [:index]
   before_action :load_repository
   before_action :set_user
-  before_action :check_issue_permission, except: :index
+  before_action :check_issue_tags_permission
   before_action :set_issue_tag, only: [:edit, :update, :destroy]
 
 
   def index
-    issue_tags = @project.issue_tags.order("#{order_name} #{order_type}")
+    issue_tags = @project.issue_tags.reorder("#{order_name} #{order_type}")
     @user_admin_or_member = current_user.present? && (current_user.admin || @project.member?(current_user))
     @page  = params[:page]  || 1
     @limit = params[:limit] || 15
@@ -17,7 +17,7 @@ class IssueTagsController < ApplicationController
 
 
   def create
-    title = params[:name].to_s.strip.first(10)
+    title = params[:name].to_s.strip.first(15)
     desc = params[:description].to_s.first(30)
     color = params[:color] || "#ccc"
 
@@ -29,7 +29,7 @@ class IssueTagsController < ApplicationController
 
     if title.present?
       if IssueTag.exists?(name: title, project_id: @project.id)
-        normal_status(-1, "标签已存在")
+        normal_status(-1, "项目标记已存在")
       else
         ActiveRecord::Base.transaction do
           begin
@@ -37,12 +37,12 @@ class IssueTagsController < ApplicationController
             if issue_tag.save
               # gitea_tag = Gitea::Labels::CreateService.new(current_user, @repository.try(:identifier), tag_params).call
               # if gitea_tag && issue_tag.update_attributes(gid: gitea_tag["id"], gitea_url: gitea_tag["url"])
-              #   normal_status(0, "标签创建成功")
+              normal_status(0, "项目标记创建成功！")
               # else
-              #   normal_status(-1, "标签创建失败")
+              #   normal_status(-1, "项目标记创建失败")
               # end
             else
-              normal_status(-1, "标签创建失败")
+              normal_status(-1, "项目标记创建失败")
             end
           rescue => e
             puts "create version release error: #{e.message}"
@@ -51,7 +51,7 @@ class IssueTagsController < ApplicationController
         end
       end
     else
-      normal_status(-1, "标签名称不能为空")
+      normal_status(-1, "项目标记名称不能为空")
     end
   end
 
@@ -60,8 +60,8 @@ class IssueTagsController < ApplicationController
   end
 
   def update
-    title = params[:name]
-    desc = params[:description]
+    title = params[:name].to_s.strip.first(15)
+    desc = params[:description].to_s.first(30)
     color = params[:color] || "#ccc"
 
     tag_params = {
@@ -71,19 +71,19 @@ class IssueTagsController < ApplicationController
     }
     if title.present?
       if IssueTag.exists?(name: title, project_id: @project.id) && (@issue_tag.name != title)
-        normal_status(-1, "标签已存在")
+        normal_status(-1, "项目标记已存在")
       else
         ActiveRecord::Base.transaction do
           begin
             if @issue_tag.update_attributes(tag_params)
               # gitea_tag = Gitea::Labels::UpdateService.new(current_user, @repository.try(:identifier),@issue_tag.try(:gid), tag_params).call
               # if gitea_tag
-              #   normal_status(0, "标签更新成功")
+              #   normal_status(0, "项目标记更新成功")
               # else
-              #   normal_status(-1, "标签更新失败")
+              #   normal_status(-1, "项目标记更新失败")
               # end
             else
-              normal_status(-1, "标签更新失败")
+              normal_status(-1, "项目标记更新失败")
             end
           rescue => e
             puts "create version release error: #{e.message}"
@@ -92,7 +92,7 @@ class IssueTagsController < ApplicationController
         end
       end
     else
-      normal_status(-1, "标签名称不能为空")
+      normal_status(-1, "项目标记名称不能为空")
     end
   end
 
@@ -102,12 +102,12 @@ class IssueTagsController < ApplicationController
         if @issue_tag.destroy
           # issue_tag = Gitea::Labels::DeleteService.new(@user, @repository.try(:identifier), @issue_tag.try(:gid)).call
           # if issue_tag
-          #   normal_status(0, "标签删除成功")
+          #   normal_status(0, "项目标记删除成功")
           # else
-          #   normal_status(-1, "标签删除失败")
+          #   normal_status(-1, "项目标记删除失败")
           # end
         else
-          normal_status(-1, "标签删除失败")
+          normal_status(-1, "项目标记删除失败")
         end
       rescue => e
         puts "create version release error: #{e.message}"
@@ -122,16 +122,16 @@ class IssueTagsController < ApplicationController
     @user = @project.owner
   end
 
-  def check_issue_permission
-    unless @project.member?(current_user) || current_user.admin?
-      normal_status(-1, "您没有权限")
+  def check_issue_tags_permission
+    unless @project.manager?(current_user) || current_user.admin?
+      return render_forbidden('你不是管理员，没有权限操作')
     end
   end
 
   def set_issue_tag
     @issue_tag = IssueTag.find_by_id(params[:id])
     unless @issue_tag.present?
-      normal_status(-1, "标签不存在")
+      normal_status(-1, "项目标记不存在")
     end
   end
 

app/controllers/issues_controller.rb

@@ -1,20 +1,22 @@
 class IssuesController < ApplicationController
   before_action :require_login, except: [:index, :show, :index_chosen]
+  before_action :require_profile_completed, only: [:create]
   before_action :load_project
   before_action :set_user
+  before_action :check_menu_authorize, except: [:index_chosen]
   before_action :check_issue_permission
   before_action :operate_issue_permission, only:[:create, :update, :destroy, :clean, :series_update, :copy]
   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 :check_token_enough, :find_atme_receivers, only: [:create, :update]
 
   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))
+    @user_operate_issue = current_user.present? && current_user.logged? && (current_user.admin || @project.member?(current_user))
+    @user_admin_or_member = current_user.present? && current_user.logged? && (current_user.admin || @project.member?(current_user) || @project.is_public?)
     issues = @project.issues.issue_issue.issue_index_includes
     issues = issues.where(is_private: false) unless @user_admin_or_member
 
@@ -110,6 +112,8 @@ class IssuesController < ApplicationController
     Issues::CreateForm.new({subject:issue_params[:subject]}).validate!
     @issue = Issue.new(issue_params)
     if @issue.save!
+      SendTemplateMessageJob.perform_later('IssueAssigned', current_user.id, @issue&.id) if Site.has_notice_menu?
+      SendTemplateMessageJob.perform_later('ProjectIssue', current_user.id, @issue&.id) if Site.has_notice_menu?
       if params[:attachment_ids].present?
         params[:attachment_ids].each do |id|
           attachment = Attachment.select(:id, :container_id, :container_type)&.find_by_id(id)
@@ -122,9 +126,15 @@ class IssuesController < ApplicationController
         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
+        if params[:issue_tag_ids].is_a?(Array) && params[:issue_tag_ids].size > 1
+          return normal_status(-1, "最多只能创建一个标记。")
+        elsif params[:issue_tag_ids].is_a?(Array) && params[:issue_tag_ids].size == 1
+          params[:issue_tag_ids].each do |tag|
+            IssueTagsRelate.create!(issue_id: @issue.id, issue_tag_id: tag)
+          end
+        else
+          return normal_status(-1, "请输入正确的标记。")
+        end 
       end
       if params[:assigned_to_id].present?
         Tiding.create!(user_id: params[:assigned_to_id], trigger_user_id: current_user.id,
@@ -139,7 +149,11 @@ class IssuesController < ApplicationController
       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}
+
+      Rails.logger.info "[ATME] maybe to at such users: #{@atme_receivers.pluck(:login)}"
+      AtmeService.call(current_user, @atme_receivers, @issue) if @atme_receivers.size > 0
+
+      render json: {status: 0, message: "创建成功", id: @issue.id}
     else
       normal_status(-1, "创建失败")
     end
@@ -157,11 +171,18 @@ class IssuesController < ApplicationController
   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
+    @issue&.issue_tags_relates&.destroy_all if params[:issue_tag_ids].blank?
+    if params[:issue_tag_ids].present? 
+      if params[:issue_tag_ids].is_a?(Array) && params[:issue_tag_ids].size > 1
+        return normal_status(-1, "最多只能创建一个标记。")
+      elsif params[:issue_tag_ids].is_a?(Array) && params[:issue_tag_ids].size == 1
+        @issue&.issue_tags_relates&.destroy_all
+        params[:issue_tag_ids].each do |tag|
+          IssueTagsRelate.create!(issue_id: @issue.id, issue_tag_id: tag)
+        end
+      else
+        return normal_status(-1, "请输入正确的标记。")
+      end 
     end
 
     issue_files = params[:attachment_ids]
@@ -201,6 +222,26 @@ class IssuesController < ApplicationController
       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 @issue&.pull_request.present?
+          SendTemplateMessageJob.perform_later('PullRequestChanged', current_user.id, @issue&.pull_request&.id, @issue.previous_changes.slice(:assigned_to_id, :priority_id, :fixed_version_id, :issue_tags_value)) if Site.has_notice_menu?
+          SendTemplateMessageJob.perform_later('PullRequestAssigned', current_user.id, @issue&.pull_request&.id ) if @issue.previous_changes[:assigned_to_id].present? && Site.has_notice_menu?
+        else
+          previous_changes = @issue.previous_changes.slice(:status_id, :assigned_to_id, :tracker_id, :priority_id, :fixed_version_id, :done_ratio, :issue_tags_value, :branch_name)
+          if @issue.previous_changes[:start_date].present? 
+            previous_changes.merge!(start_date: [@issue.previous_changes[:start_date][0].to_s,  @issue.previous_changes[:start_date][1].to_s])
+          end
+          if @issue.previous_changes[:due_date].present? 
+            previous_changes.merge!(due_date: [@issue.previous_changes[:due_date][0].to_s,  @issue.previous_changes[:due_date][1].to_s])
+          end
+          if @issue.previous_changes[:status_id].present? && @issue.previous_changes[:status_id][1] == 5
+            @issue.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: ProjectTrend::CLOSE)
+          end
+          if @issue.previous_changes[:status_id].present? && @issue.previous_changes[:status_id][0] == 5
+            @issue.project_trends.where(action_type: ProjectTrend::CLOSE).destroy_all
+          end
+          SendTemplateMessageJob.perform_later('IssueChanged', current_user.id, @issue&.id, previous_changes) if Site.has_notice_menu?
+          SendTemplateMessageJob.perform_later('IssueAssigned', current_user.id, @issue&.id) if @issue.previous_changes[:assigned_to_id].present? && Site.has_notice_menu?
+        end
         if params[:status_id].to_i == 5  #任务由非关闭状态到关闭状态时
           @issue.issue_times.update_all(end_time: Time.now)
           @issue.update_closed_issues_count_in_project!
@@ -219,7 +260,11 @@ class IssuesController < ApplicationController
           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)
+        @issue.create_journal_detail(change_files, issue_files, issue_file_ids, current_user&.id) if @issue.previous_changes.present? 
+
+        Rails.logger.info "[ATME] maybe to at such users: #{@atme_receivers.pluck(:login)}"
+        AtmeService.call(current_user, @atme_receivers, @issue) if @atme_receivers.size > 0
+
         normal_status(0, "更新成功")
       else
         normal_status(-1, "更新失败")
@@ -252,6 +297,7 @@ class IssuesController < ApplicationController
       status_id = @issue.status_id
       token = @issue.token
       login =  @issue.user.try(:login)
+      SendTemplateMessageJob.perform_later('IssueDeleted', current_user.id, @issue&.subject, @issue.assigned_to_id, @issue.author_id) if Site.has_notice_menu?
       if @issue.destroy
         if issue_type == "2" && status_id != 5
           post_to_chain("add", token, login)
@@ -271,8 +317,12 @@ class IssuesController < ApplicationController
   def clean
     #批量删除，暂时只能删除未悬赏的
     issue_ids = params[:ids]
-    if issue_ids.present?
-      if Issue.where(id: issue_ids, issue_type: "1").destroy_all
+    issues = Issue.where(id: issue_ids, issue_type: "1")
+    if issues.present?
+      issues.find_each do |i|
+        SendTemplateMessageJob.perform_later('IssueDeleted', current_user.id, i&.subject, i.assigned_to_id, i.author_id) if Site.has_notice_menu?
+      end
+      if issues.destroy_all
         normal_status(0, "删除成功")
       else
         normal_status(-1, "删除失败")
@@ -302,9 +352,28 @@ class IssuesController < ApplicationController
     # update_hash = params[:issue]
     issue_ids = params[:ids]
     if issue_ids.present?
+      issues = Issue.where(id: issue_ids)
       if update_hash.blank?
         normal_status(-1, "请选择批量更新内容")
-      elsif Issue.where(id: issue_ids)&.update(update_hash)
+      elsif issues&.update(update_hash)
+        issues.each do |i|
+          i.create_journal_detail(false, [], [], current_user&.id) if i.previous_changes.present?
+          previous_changes = i.previous_changes.slice(:status_id, :assigned_to_id, :tracker_id, :priority_id, :fixed_version_id, :done_ratio, :issue_tags_value, :branch_name)
+          if i.previous_changes[:start_date].present? 
+            previous_changes.merge!(start_date: [i.previous_changes[:start_date][0].to_s,  i.previous_changes[:start_date][1].to_s])
+          end
+          if i.previous_changes[:due_date].present? 
+            previous_changes.merge!(due_date: [i.previous_changes[:due_date][0].to_s,  i.previous_changes[:due_date][1].to_s])
+          end
+          if i.previous_changes[:status_id].present? && i.previous_changes[:status_id][1] == 5
+            i.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: ProjectTrend::CLOSE)
+          end
+          if i.previous_changes[:status_id].present? && i.previous_changes[:status_id][0] == 5
+            i.project_trends.where(action_type: ProjectTrend::CLOSE).destroy_all
+          end
+          SendTemplateMessageJob.perform_later('IssueChanged', current_user.id, i&.id, previous_changes) if Site.has_notice_menu?
+          SendTemplateMessageJob.perform_later('IssueAssigned', current_user.id, i&.id) if i.previous_changes[:assigned_to_id].present? && Site.has_notice_menu?
+        end
         normal_status(0, "批量更新成功")
       else
         normal_status(-1, "批量更新失败")
@@ -318,6 +387,8 @@ class IssuesController < ApplicationController
     @new_issue = @issue.dup
     @new_issue.author_id = current_user.id
     if @new_issue.save
+      SendTemplateMessageJob.perform_later('IssueAssigned', current_user.id, @new_issue&.id) if Site.has_notice_menu?
+      SendTemplateMessageJob.perform_later('ProjectIssue', current_user.id, @new_issue&.id) if Site.has_notice_menu?
       issue_tags = @issue.issue_tags.pluck(:id)
       if issue_tags.present?
         issue_tags.each do |tag|
@@ -395,27 +466,28 @@ class IssuesController < ApplicationController
 
   def check_project_public
     unless @project.is_public || @project.member?(current_user) || current_user.admin? || (@project.user_id == current_user.id)
-      normal_status(-1, "您没有权限")
+      return render_forbidden
     end
   end
 
   def set_issue
     @issue = Issue.find_by_id(params[:id])
     if @issue.blank?
-      normal_status(-1, "标签不存在")
-    elsif @issue.is_lock &&!(@project.member?(current_user) || current_user.admin?)
-      normal_status(-1, "您没有权限")
+      return render_not_found
+    elsif !(@project.is_public || (current_user.present? && (@project.member?(current_user) || current_user&.admin? || (@project.user_id == current_user&.id))))
+      return render_forbidden
     end
   end
 
   def check_issue_permission
     unless @project.is_public || (current_user.present? && (@project.member?(current_user) || current_user&.admin? || (@project.user_id == current_user&.id)))
-      normal_status(-1, "您没有权限")
+      return render_forbidden
     end
   end
 
   def operate_issue_permission
-    return render_forbidden("您没有权限进行此操作.") unless current_user.admin? || @project.member?(current_user)
+    @issue = Issue.find_by_id(params[:id]) unless @issue.present?
+    return render_forbidden("您没有权限进行此操作.") unless current_user.present? && current_user.logged? && (current_user.admin? || @project.member?(current_user) || (@project.is_public && @issue.nil?) || (@project.is_public && @issue.present? && @issue.author_id == current_user.id))
   end
 
   def export_issues(issues)
@@ -497,4 +569,8 @@ class IssuesController < ApplicationController
       return normal_status(-1, "您的token值不足") if JSON.parse(response.body)["balance"].to_i < params[:token].to_i
     end
   end
+
+  def check_menu_authorize
+    return render_not_found unless @project.has_menu_permission("issues")
+  end
 end

app/controllers/journals_controller.rb

@@ -1,5 +1,6 @@
 class JournalsController < ApplicationController
   before_action :require_login, except: [:index, :get_children_journals]
+  before_action :require_profile_completed, :find_atme_receivers, only: [:create]
   before_action :set_issue
   before_action :check_issue_permission
   before_action :set_journal, only: [:destroy, :edit, :update]
@@ -21,32 +22,35 @@ class JournalsController < ApplicationController
     if notes.blank?
       normal_status(-1, "评论内容不能为空")
     else
-      journal_params = {
-        journalized_id: @issue.id ,
-        journalized_type: "Issue",
-        user_id: current_user.id ,
-        notes: notes.to_s.strip,
-        parent_id: params[:parent_id]
-      }
-      journal = Journal.new journal_params
-      if journal.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 = journal
-              attachment.author_id = current_user.id
-              attachment.description = ""
-              attachment.save
+      ActiveRecord::Base.transaction do
+        journal_params = {
+          journalized_id: @issue.id ,
+          journalized_type: "Issue",
+          user_id: current_user.id ,
+          notes: notes.to_s.strip,
+          parent_id: params[:parent_id]
+        }
+        journal = Journal.new journal_params
+        if journal.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 = journal
+                attachment.author_id = current_user.id
+                attachment.description = ""
+                attachment.save
+              end
             end
           end
+          Rails.logger.info "[ATME] maybe to at such users: #{@atme_receivers.pluck(:login)}"
+          AtmeService.call(current_user, @atme_receivers, journal) if @atme_receivers.size > 0
+          # @issue.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "journal")
+          render :json => { status: 0, message: "评论成功", id:  journal.id}
+          # normal_status(0, "评论成功")
+        else
+          normal_status(-1, "评论失败")
         end
-
-        # @issue.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "journal")
-        render :json => { status: 0, message: "评论成功", id:  journal.id}
-        # normal_status(0, "评论成功")
-      else
-        normal_status(-1, "评论失败")
       end
     end
   end

app/controllers/main_controller.rb

@@ -21,19 +21,11 @@ class MainController < ApplicationController
       uid_logger("main start is #{cookies[:_educoder_session]}")
     end
 
-    if params[:path] && params[:path].start_with?('projects/')
-      project_id = params[:path].split("/")[1]
-      project = Project.find_by_id(project_id)
-      if project.present?
-        return redirect_to("/projects/#{project.owner.login}/#{project.identifier}", status: 301)
-      end
-    end
-
     # TODO: 这块之后需要整合，者架构重新变化，统一跳转到index后再路由分发
     if params[:path] && params[:path]&.include?("h5educoderbuild") && params[:path].split("/").first == "h5educoderbuild"
-      render file: 'public/h5educoderbuild/index.html', :layout => false
+      render file: 'public/h5educoderbuild/index.html', :layout => false, :content_type=> 'text/html'
     else
-      render file: 'public/react/build/index.html', :layout => false
+      render file: 'public/react/build/index.html', :layout => false, :content_type=> 'text/html'
     end
 
   end

app/controllers/members_controller.rb

@@ -2,21 +2,15 @@ class MembersController < ApplicationController
   before_action :require_login
   before_action :load_project
   before_action :find_user_with_id, only: %i[create remove change_role]
-  before_action :operate!, except: %i[index]
+  before_action :check_user_profile_completed, only: [:create]
+  before_action :operate!
   before_action :check_member_exists!, only: %i[create]
   before_action :check_member_not_exists!, only: %i[remove change_role]
 
   def create
-    if @user.gitea_token.blank?
-      result = Gitea::User::GetService.call(@user.login)
-      if result[:status] == :error
-        # gitea不存在用户@user,直接注册
-        user_result = create_gitea_user!(@user, @user.login, @user.mail)
-        return render_error(user_result[:message]) if user_result[:message]
-      end
-    end
     interactor = Projects::AddMemberInteractor.call(@project.owner, @project, @user)
-    
+    SendTemplateMessageJob.perform_later('ProjectJoined', current_user.id, @user.id, @project.id) if Site.has_notice_menu?
+    SendTemplateMessageJob.perform_later('ProjectMemberJoined', current_user.id, @user.id, @project.id) if Site.has_notice_menu?
     render_response(interactor)
   rescue Exception => e
     uid_logger_error(e.message)
@@ -36,6 +30,8 @@ class MembersController < ApplicationController
 
   def remove
     interactor = Projects::DeleteMemberInteractor.call(@project.owner, @project, @user)
+    SendTemplateMessageJob.perform_later('ProjectLeft', current_user.id, @user.id, @project.id) if Site.has_notice_menu?
+    SendTemplateMessageJob.perform_later('ProjectMemberLeft', current_user.id, @user.id, @project.id) if Site.has_notice_menu?
     render_response(interactor)
   rescue Exception => e
     uid_logger_error(e.message)
@@ -44,6 +40,7 @@ class MembersController < ApplicationController
 
   def change_role
     interactor = Projects::ChangeMemberRoleInteractor.call(@project.owner, @project, @user, params[:role])
+    SendTemplateMessageJob.perform_later('ProjectRole', current_user.id, @user.id, @project.id, message_role_name) if Site.has_notice_menu?
     render_response(interactor)
   rescue Exception => e
     uid_logger_error(e.message)
@@ -56,7 +53,7 @@ class MembersController < ApplicationController
   end
 
   def member_exists?
-    @project.members.exists?(params[:user_id])
+    @project.members.exists?(user_id: params[:user_id])
   end
 
   def operate!
@@ -64,10 +61,24 @@ class MembersController < ApplicationController
   end
 
   def check_member_exists!
-    return render_result(1, "user_id为#{params[:user_id]}的用户已经是项目成员") if member_exists?
+    return render_error("user_id为#{params[:user_id]}的用户已经是项目成员") if member_exists?
   end
 
   def check_member_not_exists!
-    return render_result(1, "user_id为#{params[:user_id]}的用户还不是项目成员") unless @project.member?(params[:user_id])
+    return render_error("user_id为#{params[:user_id]}的用户还不是项目成员") unless member_exists?
+  end
+
+  def check_user_profile_completed
+    require_user_profile_completed(@user)
+  end
+
+  def message_role_name 
+    case params[:role]
+    when 'Manager' then '管理员'
+    when 'Developer' then '开发者'
+    when 'Reporter' then '报告者'
+    else 
+      ''
+    end
   end
 end

app/controllers/oauth/base_controller.rb

@@ -2,6 +2,7 @@ class Oauth::BaseController < ActionController::Base
   include RenderHelper
   include LoginHelper
   include ControllerRescueHandler
+  include LoggerHelper
   # include LaboratoryHelper
 
   skip_before_action :verify_authenticity_token
@@ -11,6 +12,18 @@ class Oauth::BaseController < ActionController::Base
   end
 
   private
+  def tip_exception(status = -1, message)
+		raise Educoder::TipException.new(status, message)
+  end
+  
+  def tip_show_exception(status = -2, message)
+		raise Educoder::TipException.new(status, message)
+  end
+  
+  def tip_show(exception)
+		uid_logger("Tip show status is #{exception.status}, message is #{exception.message}")
+		render json: exception.tip_json
+	end
 
   def session_user_id
     # session[:user_id]
@@ -48,4 +61,13 @@ class Oauth::BaseController < ActionController::Base
     Rails.logger.info("[wechat] set session unionid: #{unionid}")
     session[:unionid] = unionid
   end
+
+  def session_edulogin
+    session[:edulogin]
+  end
+
+  def set_session_edulogin(login)
+    Rails.logger.info("[educoder] set sesstion edulogin: #{login}")
+    session[:edulogin] = login
+  end
 end

app/controllers/oauth/educoder_controller.rb

@@ -1,4 +1,6 @@
 class Oauth::EducoderController < Oauth::BaseController
+  include RegisterHelper
+
   def bind
     begin
       login = params[:login]
@@ -32,4 +34,41 @@ class Oauth::EducoderController < Oauth::BaseController
       render_error(ex.message)
     end
   end
+
+  # 需要educoder那边设置回调地址
+  def create
+    begin
+      code = params['code'].to_s.strip
+      tip_exception("code不能为空") if code.blank?
+
+      new_user = false
+      result = EducoderOauth::Service.access_token(code)
+      result = EducoderOauth::Service.user_info(result[:access_token])
+
+      # 存在该用户
+      open_user = OpenUsers::Educoder.find_by(uid: result['login'])
+      if open_user.present? && open_user.user.present?
+        successful_authentication(open_user.user)
+      else
+        if current_user.blank? || !current_user.logged?
+          new_user = true
+          login = User.generate_login('E')
+          reg_result = autologin_register(login,"#{login}@forge.com", "Ec#{login}2021#", 'educoder', true)
+          if reg_result[:message].blank?
+            open_user = OpenUsers::Educoder.create!(user_id: reg_result[:user][:id], uid: result['login'], extra: result)
+            autosync_register_trustie(login, "Ec#{login}2021#", "#{login}@forge.com")
+            successful_authentication(open_user.user)
+          else
+            render_error(reg_result[:message])
+          end
+        else
+          OpenUsers::Educoder.create!(user: current_user, uid: result['login'], extra: result)
+        end
+      end
+
+      redirect_to root_path(new_user: new_user)
+    rescue Exception => ex
+      render_error(ex.message)
+    end
+  end
 end

app/controllers/oauth_controller.rb

@@ -61,6 +61,7 @@ class OauthController < ApplicationController
     login = params[:login]
     email = params[:mail]
     password = params[:password]
+    lastname = params[:lastname]
     callback_url =  params[:callback_url]
     platform = params[:plathform] || 'educoder'
 
@@ -72,8 +73,11 @@ class OauthController < ApplicationController
       if result[:message].blank?
         logger.info "[Oauth educoer] ====auto_register success"
         user = User.find result[:user][:id]
-        successful_authentication(user)
+        user.update_column(:lastname, params[:lastname])
+        autosync_register_trustie(login, password, email, lastname)
+        
         OpenUsers::Educoder.create!(user: user, uid: user.login)
+        successful_authentication(user)
 
         render json: { callback_url: callback_url }
         # redirect_to callback_url

app/controllers/organizations/organizations_controller.rb

@@ -1,5 +1,6 @@
 class Organizations::OrganizationsController < Organizations::BaseController
   before_action :require_login, except: [:index, :show, :recommend]
+  before_action :require_profile_completed, only: [:create]
   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]
@@ -21,11 +22,13 @@ class Organizations::OrganizationsController < Organizations::BaseController
     @can_create_project = @organization.can_create_project?(current_user.id)
     @is_admin = can_edit_org?
     @is_member = @organization.is_member?(current_user.id)
+    Cache::V2::OwnerCommonService.new(@organization.id).read
   end
 
   def create
     ActiveRecord::Base.transaction do
-      Organizations::CreateForm.new(organization_params).validate!
+      tip_exception("无法使用以下关键词：#{organization_params[:name]}，请重新命名") if ReversedKeyword.check_exists?(organization_params[:name])
+      Organizations::CreateForm.new(organization_params.merge(original_name: "")).validate!
       @organization = Organizations::CreateService.call(current_user, organization_params)
       Util.write_file(@image, avatar_path(@organization)) if params[:image].present?
     end
@@ -36,13 +39,14 @@ class Organizations::OrganizationsController < Organizations::BaseController
 
   def update
     ActiveRecord::Base.transaction do
-      Organizations::CreateForm.new(organization_params).validate!
+      Organizations::CreateForm.new(organization_params.merge(original_name: @organization.login)).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)
+      sync_organization_extension!
+      
+      Gitea::Organization::UpdateService.call(current_user.gitea_token, login, @organization.reload)
       Util.write_file(@image, avatar_path(@organization)) if params[:image].present?
     end
   rescue Exception => e
@@ -53,10 +57,16 @@ class Organizations::OrganizationsController < Organizations::BaseController
   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!
+      gitea_destroy = Gitea::Organization::DeleteService.call(current_user.gitea_token, @organization.login)
+      if gitea_destroy[:status] == 204 
+        @organization.destroy!
+        render_ok
+      elsif gitea_destroy[:status] == 500
+        tip_exception("当组织内含有仓库时，无法删除此组织")
+      else
+        tip_exception("")
+      end
     end
-    render_ok
   rescue Exception => e
     uid_logger_error(e.message)
     tip_exception(e.message)
@@ -65,8 +75,7 @@ class Organizations::OrganizationsController < Organizations::BaseController
   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)
+    @organizations = Organization.includes(:organization_extension).where(organization_extensions: {recommend: true}).to_a.each_slice(group_size).to_a
   end
 
   private
@@ -77,6 +86,10 @@ class Organizations::OrganizationsController < Organizations::BaseController
                   :max_repo_creation, :nickname)
   end
 
+  def group_size 
+    params.fetch(:group_size, 4).to_i
+  end
+
   def password
     params.fetch(:password, "")
   end
@@ -95,4 +108,18 @@ class Organizations::OrganizationsController < Organizations::BaseController
     %w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : 'desc'
   end
 
+  def set_max_repo_creation
+    organization_params[:max_repo_creation].blank? ? -1 : organization_params[:max_repo_creation]
+  end
+
+  def organization_extension_params
+    organization_params
+    .except(:name, :nickname)
+    .merge(max_repo_creation: set_max_repo_creation)
+  end
+  
+  def sync_organization_extension!
+    @organization.organization_extension.update_attributes!(organization_extension_params)
+  end
+  
 end

app/controllers/organizations/team_users_controller.rb

@@ -1,6 +1,7 @@
 class Organizations::TeamUsersController < Organizations::BaseController
   before_action :load_organization, :load_team
   before_action :load_operate_user, only: [:create, :destroy]
+  before_action :check_user_profile_completed, only: [:create]
   before_action :load_team_user, only: [:destroy]
   before_action :check_user_can_edit_org, only: [:create, :destroy]
 
@@ -17,6 +18,7 @@ class Organizations::TeamUsersController < Organizations::BaseController
     ActiveRecord::Base.transaction do
       @team_user = TeamUser.build(@organization.id, @operate_user.id, @team.id)
       @organization_user = OrganizationUser.build(@organization.id, @operate_user.id)
+      SendTemplateMessageJob.perform_later('TeamJoined', @operate_user.id, @organization.id, @team.id) if Site.has_notice_menu?
       Gitea::Organization::TeamUser::CreateService.call(@organization.gitea_token, @team.gtid, @operate_user.login)
     end
   rescue Exception => e
@@ -29,6 +31,12 @@ class Organizations::TeamUsersController < Organizations::BaseController
     ActiveRecord::Base.transaction do
       @team_user.destroy!
       Gitea::Organization::TeamUser::DeleteService.call(@organization.gitea_token, @team.gtid, @operate_user.login)
+      SendTemplateMessageJob.perform_later('TeamLeft', @operate_user.id, @organization.id, @team.id) if Site.has_notice_menu?
+      org_team_users = @organization.team_users.where(user_id: @operate_user.id)
+      unless org_team_users.present?
+        @organization.organization_users.find_by(user_id: @operate_user.id).destroy!
+        Gitea::Organization::OrganizationUser::DeleteService.call(@organization.gitea_token, @organization.login, @operate_user.login)
+      end
       render_ok
     end
   rescue Exception => e
@@ -43,6 +51,11 @@ class Organizations::TeamUsersController < Organizations::BaseController
     ActiveRecord::Base.transaction do
       @team_user.destroy!
       Gitea::Organization::TeamUser::DeleteService.call(@organization.gitea_token, @team.gtid, current_user.login)
+      org_team_users = @organization.team_users.where(user_id: current_user.id)
+      unless org_team_users.present?
+        @organization.organization_users.find_by(user_id: current_user.id).destroy!
+        Gitea::Organization::OrganizationUser::DeleteService.call(@organization.gitea_token, @organization.login, current_user.login)
+      end
       render_ok
     end
   rescue Exception => e
@@ -73,4 +86,8 @@ class Organizations::TeamUsersController < Organizations::BaseController
     tip_exception("组织团队成员不存在") if @team_user.nil?
   end
 
+  def check_user_profile_completed
+    require_user_profile_completed(@operate_user)
+  end
+
 end

app/controllers/organizations/teams_controller.rb

@@ -4,15 +4,24 @@ class Organizations::TeamsController < Organizations::BaseController
   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)
+    if params[:is_full].present? 
+      if can_edit_org?
+        @teams = @organization.teams
+      else 
+        @teams = []
+      end
+    else 
+      #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
   end
 
   def search
@@ -34,8 +43,12 @@ class Organizations::TeamsController < Organizations::BaseController
 
   def create
     ActiveRecord::Base.transaction do
-      Organizations::CreateTeamForm.new(team_params).validate!
-      @team = Organizations::Teams::CreateService.call(current_user, @organization, team_params)
+      if @organization.teams.count >= 50
+        return render_forbidden("组织的团队数量已超过限制！") 
+      else 
+        Organizations::CreateTeamForm.new(team_params).validate!
+        @team = Organizations::Teams::CreateService.call(current_user, @organization, team_params)
+      end
     end
   rescue Exception => e
     uid_logger_error(e.message)

app/controllers/owners_controller.rb

@@ -1,5 +1,5 @@
 class OwnersController < ApplicationController
-  before_action :require_login
+  before_action :require_login, only: [:index]
 
   def index
     @owners = []
@@ -9,4 +9,52 @@ class OwnersController < ApplicationController
                           teams: {can_create_org_project: true})
                    .distinct
   end
-end
+
+  def show 
+    @owner = Owner.find_by(login: params[:id]) || Owner.find_by(id: params[:id])
+    return render_ok(type: 'User') unless @owner.present?
+    # 组织
+    if @owner.is_a?(Organization)
+      return render_forbidden("没有查看组织的权限") if org_limited_condition || org_privacy_condition
+      @can_create_project = @owner.can_create_project?(current_user.id)
+      @is_admin = current_user.admin? || @owner.is_owner?(current_user.id)
+      @is_member = @owner.is_member?(current_user.id)
+    # 用户
+    elsif @owner.is_a?(User)
+      #待办事项，现在未做
+      if User.current.admin? || User.current.login == @owner.login 
+        @waiting_applied_messages = @owner.applied_messages.waiting
+        @common_applied_transfer_projects = AppliedTransferProject.where(owner_id: @owner.id).common + AppliedTransferProject.where(owner_id: Organization.joins(team_users: :team).where(team_users: {user_id: @owner.id}, teams: {authorize: %w(admin owner)} )).common
+        @common_applied_projects = AppliedProject.where(project_id: @owner.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
+      #用户的组织数量
+      # @user_composes_count =  @user.composes.size
+      @user_composes_count = 0
+      user_organizations =  User.current.logged? ? @owner.organizations.with_visibility(%w(common limited)) + @owner.organizations.with_visibility("privacy").joins(:team_users).where(team_users: {user_id: current_user.id}) : @owner.organizations.with_visibility("common")
+      @user_org_count = user_organizations.size
+      normal_projects = Project.members_projects(@owner.id).to_sql
+      org_projects = Project.joins(team_projects: [team: :team_users]).where(team_users: {user_id: @owner.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 == @owner.login) ? projects : 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
+    end
+  end
+
+  private 
+  def org_limited_condition
+    @owner.organization_extension.limited? && !current_user.logged?
+  end
+
+  def org_privacy_condition
+    return false if current_user.admin?
+    @owner.organization_extension.privacy? && @owner.organization_users.where(user_id: current_user.id).blank?
+  end
+end

app/controllers/praise_tread_controller.rb

@@ -1,5 +1,6 @@
 class PraiseTreadController < ApplicationController
   before_action :require_login, except: %i[index]
+  before_action :require_profile_completed, only: [:like]
   before_action :find_project_with_id
 
   def index

app/controllers/project_categories_controller.rb

@@ -5,6 +5,10 @@ class ProjectCategoriesController < ApplicationController
     @project_categories = q.result(distinct: true)
   end
 
+  def pinned_index
+    @project_categories = ProjectCategory.where.not(pinned_index: 0).order(pinned_index: :desc)
+  end
+
   def group_list
     @project_categories = ProjectCategory.where('projects_count > 0').order(projects_count: :desc)
     # projects = Project.no_anomory_projects.visible

app/controllers/project_rank_controller.rb

@@ -0,0 +1,26 @@
+class ProjectRankController < ApplicationController
+  # 根据时间获取热门项目
+  def index 
+    $redis_cache.zunionstore("recent-days-project-rank", get_timeable_key_names)
+    deleted_data = $redis_cache.smembers("v2-project-rank-deleted")
+    $redis_cache.zrem("recent-days-project-rank", deleted_data) unless deleted_data.blank?
+    @project_rank = $redis_cache.zrevrange("recent-days-project-rank", 0, 4, withscores: true)
+  rescue Exception => e
+    @project_rank = []
+  end
+
+  private 
+  # 默认显示7天的
+  def time
+    params.fetch(:time, 7).to_i
+  end
+
+  def get_timeable_key_names
+    names_array = []
+    (0...time).to_a.each do |i|
+      date_time_string = (Date.today - i.days).to_s
+      names_array << "v2-project-rank-#{date_time_string}"
+    end
+    names_array
+  end
+end

app/controllers/project_trends_controller.rb

@@ -3,7 +3,7 @@ class ProjectTrendsController < ApplicationController
   before_action :check_project_public
 
   def index
-    project_trends = @project.project_trends.includes(:user, trend: :user)
+    project_trends = @project.project_trends.preload(:user, trend: :user, project: :owner)
 
     check_time = params[:time]  #时间的筛选
     check_type = params[:type]   #动态类型的筛选，目前已知的有 Issue, PullRequest, Version
@@ -14,20 +14,25 @@ class ProjectTrendsController < ApplicationController
       project_trends = project_trends.where("created_at between ? and ?",(Time.now.beginning_of_day - check_time.days), Time.now.end_of_day)
     end
 
-    @project_open_issues_count = project_trends.where(trend_type: "Issue", action_type: "create").size
     @project_close_issues_count = project_trends.where(trend_type: "Issue", action_type: "close").size
-    @project_issues_count = @project_open_issues_count + @project_close_issues_count
-
-    @project_pr_count = project_trends.where(trend_type: "PullRequest", action_type: "close").size
-    @project_new_pr_count = project_trends.where(trend_type: "PullRequest", action_type: "create").size
-    @project_pr_all_count = @project_pr_count + @project_new_pr_count
+    @project_issues_count = project_trends.where(trend_type: "Issue", action_type: "create").size
+    @project_open_issues_count = @project_issues_count - @project_close_issues_count
 
+    @project_pr_count = project_trends.where(trend_type: "PullRequest", action_type: ["close", "merge"]).size
+    @project_pr_all_count = project_trends.where(trend_type: "PullRequest", action_type: "create").size
+    @project_new_pr_count = @project_pr_all_count - @project_pr_count
     if check_type.present?
       project_trends = project_trends.where(trend_type: check_type.to_s.strip)
     end
 
     if check_status.present?
-      project_trends = project_trends.where(action_type: check_status.to_s.strip)
+      if check_status == "delay" || check_status == "close"
+        project_trends = project_trends.where(action_type: ["close", "merge"])
+      else 
+        project_trends = project_trends.where(action_type: ["create"]).where.not(trend_id: project_trends.where(action_type: ["close", "merge"]).pluck(:trend_id)) 
+      end
+    else
+      project_trends = project_trends.where(action_type: "create")
     end
     project_trends = project_trends.order("created_at desc")
 

app/controllers/projects/applied_transfer_projects_controller.rb

@@ -1,5 +1,6 @@
 class Projects::AppliedTransferProjectsController < Projects::BaseController
   before_action :check_auth
+  before_action :check_user_profile_completed, only: [:create]
 
   def organizations 
     @organizations = Organization.includes(:organization_extension).joins(team_users: :team).where(team_users: {user_id: current_user.id}, teams: {authorize: %w(admin owner)})
@@ -23,4 +24,10 @@ class Projects::AppliedTransferProjectsController < Projects::BaseController
   def check_auth 
     return render_forbidden unless current_user.admin? ||@project.owner?(current_user)
   end
+
+  def check_user_profile_completed
+    @owner = Owner.find_by(login: params[:owner_name])
+    return if @owner.is_a?(Organization)
+    require_user_profile_completed(@owner)
+  end
 end

app/controllers/projects/base_controller.rb

@@ -4,4 +4,7 @@ class Projects::BaseController < ApplicationController
   before_action :load_project
   before_action :load_repository
 
+  def require_manager!
+    return render_forbidden('你没有权限操作') unless current_user.admin? || @project.manager?(current_user)
+  end
 end

app/controllers/projects/members_controller.rb

@@ -0,0 +1,6 @@
+class Projects::MembersController < Projects::BaseController
+  def index 
+    users = @project.all_collaborators.like(params[:search]).includes(:user_extension)
+    @users = kaminari_paginate(users)
+  end
+end

app/controllers/projects/project_applies_controller.rb

@@ -1,4 +1,5 @@
 class Projects::ProjectAppliesController < Projects::BaseController
+  before_action :require_profile_completed, only: [:create]
   def create
     project = Projects::ApplyJoinService.call(current_user, create_params)
     render_ok(project_id: project.id)

app/controllers/projects/project_units_controller.rb

@@ -6,7 +6,8 @@ class Projects::ProjectUnitsController < Projects::BaseController
   def create 
     if current_user.admin? || @project.manager?(current_user)
       ActiveRecord::Base.transaction do 
-        ProjectUnit.update_by_unit_types!(@project, unit_types)
+        before_units, after_units = ProjectUnit.update_by_unit_types!(@project, unit_types)
+        SendTemplateMessageJob.perform_later('ProjectSettingChanged', current_user.id, @project&.id, {navbar: true}) unless before_units.eql?(after_units) if Site.has_notice_menu?
         render_ok
       end
     else 

app/controllers/projects/teams_controller.rb

@@ -14,7 +14,7 @@ class Projects::TeamsController < Projects::BaseController
   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)
+      Gitea::Organization::TeamProject::CreateService.call(current_user.gitea_token, @operate_team.gtid, @owner.login, @project.identifier)
       render_ok
     end
   rescue Exception => e
@@ -25,7 +25,7 @@ class Projects::TeamsController < Projects::BaseController
   def destroy
     ActiveRecord::Base.transaction do
       @team_project.destroy!
-      Gitea::Organization::TeamProject::DeleteService.call(@owner.gitea_token, @operate_team.gtid, @owner.login, @project.identifier)
+      Gitea::Organization::TeamProject::DeleteService.call(current_user.gitea_token, @operate_team.gtid, @owner.login, @project.identifier)
       render_ok
     end
   rescue Exception => e

app/controllers/projects/webhooks_controller.rb

@@ -0,0 +1,116 @@
+class Projects::WebhooksController < Projects::BaseController
+  before_action :require_manager!
+  before_action :find_webhook, only:[:edit, :update, :destroy, :tasks, :test]
+
+  def index 
+    @webhooks = @project.webhooks
+    @webhooks = kaminari_paginate(@webhooks)
+  end
+
+  def create 
+    ActiveRecord::Base.transaction do
+      return render_error("webhooks数量已到上限！请删除暂不使用的webhooks以进行添加操作") if @project.webhooks.size > 19
+      return render_error("参数错误.") unless webhook_params.present?
+      form =  Projects::Webhooks::CreateForm.new(webhook_params)
+      return  render json: {status: -1, message: form.errors} unless form.validate!
+      response = Gitea::Repository::Webhooks::CreateService.new(operating_token, @project&.owner&.login, @project&.identifier, gitea_webhooks_params).call
+      if response[0] == 201 
+        @webhook = response[2]
+      else 
+        render_error("创建失败.")
+      end
+    end
+  rescue Exception => e
+    uid_logger_error(e.message)
+    tip_exception(e.message)
+  end
+
+  def edit 
+
+  end
+
+  def update 
+    return render_error("参数错误.") unless webhook_params.present?
+    form =  Projects::Webhooks::CreateForm.new(webhook_params)
+    return  render json: {status: -1, message: form.errors} unless form.validate!
+    response = Gitea::Repository::Webhooks::UpdateService.call(operating_token, @project&.owner&.login, @project&.identifier, @webhook.id, gitea_webhooks_params)
+    if response[0] == 200
+      @webhook = response[2]
+      render_ok
+    else 
+      render_error("更新失败.")
+    end
+  rescue Exception => e
+    uid_logger_error(e.message)
+    tip_exception(e.message)
+  end
+
+  def destroy 
+    response = Gitea::Repository::Webhooks::DeleteService.call(operating_token, @project&.owner&.login, @project&.identifier, @webhook.id)
+    if response[0] == 204
+      @webhook = response[2]
+      render_ok
+    else 
+      render_error("删除失败.")
+    end
+  rescue Exception => e
+    uid_logger_error(e.message)
+    tip_exception(e.message)
+  end
+
+  def tasks
+    @tasks = @webhook.tasks.where(is_delivered: true).order("delivered desc")
+    @tasks = kaminari_paginate(@tasks)
+  end
+
+  def test 
+    ActiveRecord::Base.transaction do
+      response = Gitea::Repository::Webhooks::TestService.call(operating_token, @project&.owner&.login, @project&.identifier, @webhook.id)
+      if response[0] == 204
+        render_ok
+      else 
+        render_error("测试推送失败.")
+      end
+    end
+  rescue Exception => e
+    uid_logger_error(e.message)
+    tip_exception(e.message)
+  end
+
+  private 
+  def find_webhook
+    @webhook = @project.webhooks.find_by_id(params[:id])
+    return render_not_found if @webhook.nil?
+  end
+
+  def webhook_params 
+    params.require(:webhook).permit(:url, :type, :http_method, :content_type, :secret, :active, :branch_filter, events: [])
+  end
+
+  def webhook_type
+    webhook_params.fetch(:type, "gitea")
+  end
+
+  def webhook_branch_filter 
+    webhook_params.fetch(:branch_filter, "*")
+  end
+
+  def gitea_webhooks_params
+    {
+      active: webhook_params[:active],
+      branch_filter: webhook_branch_filter,
+      config: {
+        content_type: webhook_params[:content_type],
+        url: webhook_params[:url],
+        http_method: webhook_params[:http_method],
+        secret: webhook_params[:secret]
+      },
+      events: webhook_params[:events],
+      type: webhook_type,
+    }
+  end
+
+  def operating_token 
+    @project.member?(current_user) ? current_user.gitea_token : @project&.owner&.gitea_token
+  end
+end

app/controllers/projects_controller.rb

@@ -4,8 +4,9 @@ class ProjectsController < ApplicationController
   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 :load_repository, except: %i[index group_type_list migrate create recommend]
+  before_action :require_login, except: %i[index branches branches_slice group_type_list simple show fork_users praise_users watch_users recommend banner_recommend about menu_list]
+  before_action :require_profile_completed, only: [:create, :migrate]
+  before_action :load_repository, except: %i[index group_type_list migrate create recommend banner_recommend]
   before_action :authorizate_user_can_edit_project!, only: %i[update]
   before_action :project_public?, only: %i[fork_users praise_users watch_users]
 
@@ -15,23 +16,22 @@ class ProjectsController < ApplicationController
     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("pulls")) if @project.has_menu_permission("pulls") && @project.forge?
+    menu.append(menu_hash_by_name("devops")) if @project.has_menu_permission("devops") && @project.forge?
     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("wiki")) if @project.has_menu_permission("wiki") && @project.forge?
+    menu.append(menu_hash_by_name("resources")) if @project.has_menu_permission("resources") && @project.forge?
     menu.append(menu_hash_by_name("activity"))
-    # menu.append(menu_hash_by_name("gantt"))
-    # menu.append(menu_hash_by_name("sonar"))
-    menu.append(menu_hash_by_name("setting")) if current_user.admin? || @project.manager?(current_user)
+    menu.append(menu_hash_by_name("settings")) if (current_user.admin? || @project.manager?(current_user)) && @project.forge?
 
     render json: menu
   end
 
   def index
-    scope = Projects::ListQuery.call(params)
+    scope = current_user.logged? ? Projects::ListQuery.call(params, current_user.id) : Projects::ListQuery.call(params)
 
-    # @projects = kaminari_paginate(scope)
-    @projects = paginate scope.includes(:project_category, :project_language, :repository, :project_educoder, :owner, :project_units)
+    @projects = kaminari_paginate(scope.includes(:project_category, :project_language, :repository, :project_educoder, :owner, :project_units))
+    # @projects = paginate scope.includes(:project_category, :project_language, :repository, :project_educoder, :owner, :project_units)
 
     category_id = params[:category_id]
     @total_count =
@@ -49,13 +49,6 @@ class ProjectsController < ApplicationController
       Projects::CreateForm.new(project_params).validate!
       @project = Projects::CreateService.new(current_user, project_params).call
 
-      # TODO: fix Educoder shixun
-      if @project.persisted?
-        ProjectScore.create(:project_id => @project.id, :score => 0) if @project.project_score.nil?
-
-        project_info = ProjectInfo.new(:user_id => current_user.id, :project_id => @project.id)
-        @project.project_infos << project_info
-      end
     end
   rescue Exception => e
     uid_logger_error(e.message)
@@ -89,13 +82,21 @@ class ProjectsController < ApplicationController
   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
+    # result = Gitea::Repository::Branches::ListService.call(@owner, @project.identifier)
+    result = Gitea::Repository::Branches::ListNameService.call(@owner, @project.identifier)
+    @branches =  result.is_a?(Hash) ? (result.key?(:status) ? [] : result["branch_name"]) : result
+  end
+
+  def branches_slice
+    return @branches = [] unless @project.forge?
+
+    slice_result = Gitea::Repository::Branches::ListSliceService.call(@owner, @project.identifier)
+    @branches_slice = slice_result.is_a?(Hash) && slice_result.key?(:status) ? [] : slice_result
   end
 
   def group_type_list
     project_statics = ProjectStatistic.first
-    project_statics = ProjectStatistic.create!(common_projects_count: 0) if project_statics.blank?
+
     @project_statics_list = [
       {
         project_type: 'common',
@@ -117,13 +118,19 @@ class ProjectsController < ApplicationController
     ActiveRecord::Base.transaction do
       # TODO:
       # 临时特殊处理修改website、lesson_url操作方法
-      if project_params.has_key?("website")
+      if project_params.has_key?("website") 
         @project.update(project_params)
+      elsif project_params.has_key?("default_branch")
+        @project.update(project_params)
+        gitea_params = {
+          default_branch: @project.default_branch
+        }
+        Gitea::Repository::UpdateService.call(@owner, @project.identifier, gitea_params)
       else
         validate_params = project_params.slice(:name, :description, 
-          :project_category_id, :project_language_id, :private)
+          :project_category_id, :project_language_id, :private, :identifier)
   
-        Projects::UpdateForm.new(validate_params).validate!
+        Projects::UpdateForm.new(validate_params.merge(user_id: @project.user_id, project_identifier: @project.identifier)).validate!
   
         private = @project.forked_from_project.present? ? !@project.forked_from_project.is_public : params[:private] || false
 
@@ -133,13 +140,13 @@ class ProjectsController < ApplicationController
         gitea_params = {
           private: private,
           default_branch: @project.default_branch,
-          website: @project.website
+          website: @project.website,
+          name: @project.identifier
         }
-        if [true, false].include? private
-          Gitea::Repository::UpdateService.call(@owner, @project.identifier, gitea_params)
-          @project.repository.update_column(:hidden, private)
-        end
+        gitea_repo = Gitea::Repository::UpdateService.call(@owner, @project&.repository&.identifier, gitea_params)
+        @project.repository.update_attributes({hidden: gitea_repo["private"], identifier: gitea_repo["name"]})
       end
+      SendTemplateMessageJob.perform_later('ProjectSettingChanged', current_user.id, @project&.id, @project.previous_changes.slice(:name, :description, :project_category_id, :project_language_id, :is_public, :identifier)) if Site.has_notice_menu?
     end
   rescue Exception => e
     uid_logger_error(e.message)
@@ -184,6 +191,8 @@ class ProjectsController < ApplicationController
   end
 
   def simple
+    # 为了缓存活跃项目的基本信息，后续删除
+    Cache::V2::ProjectCommonService.new(@project.id).read
     json_response(@project, current_user)
   end
 
@@ -191,6 +200,10 @@ class ProjectsController < ApplicationController
     @projects = Project.recommend.includes(:repository, :project_category, :owner).order(visits: :desc)
   end
 
+  def banner_recommend
+    @projects = Project.recommend.where.not(recommend_index: 0).includes(:project_category, :owner, :project_language).order(recommend_index: :desc)
+  end
+
   def about
     @project_detail = @project.project_detail
     @attachments = Array(@project_detail&.attachments) if request.get?
@@ -222,7 +235,7 @@ class ProjectsController < ApplicationController
 
   private
   def project_params
-    params.permit(:user_id, :name, :description, :repository_name, :website, :lesson_url,
+    params.permit(:user_id, :name, :description, :repository_name, :website, :lesson_url, :default_branch, :identifier,
                   :project_category_id, :project_language_id, :license_id, :ignore_id, :private)
   end
 

app/controllers/public_keys_controller.rb

@@ -0,0 +1,64 @@
+class PublicKeysController < ApplicationController
+  before_action :require_login
+  before_action :find_public_key, only: [:destroy]
+
+  def index 
+    @public_keys = current_user.public_keys 
+    @public_keys = kaminari_paginate(@public_keys)
+  rescue Exception => e
+    uid_logger_error(e.message)
+    tip_exception(e.message)
+  end
+
+  def create 
+    return render_error("参数错误") if public_key_params.blank?
+    return render_ok({status: 10002, message: "请输入密钥"}) if public_key_params[:key].blank?
+    return render_ok({status: 10001, message: "请输入标题"}) if public_key_params[:title].blank?
+    @gitea_response = Gitea::User::Keys::CreateService.call(current_user.gitea_token, public_key_params)
+    if @gitea_response[0] == 201 
+      @public_key = @gitea_response[2]
+    else 
+      return render_error("创建ssh key失败") if @gitea_response[2].blank?
+      return render_ok({status: 10002, message: "密钥格式不正确"}) if @gitea_response[2]["message"].starts_with?("Invalid key content")
+      exist_public_key = Gitea::PublicKey.find_by(content: public_key_params[:key])
+      return render_ok({status: 10002, message: "密钥已被占用"}) if @gitea_response[2]["message"].starts_with?("Key content has been used as non-deploy key") && exist_public_key.present? && exist_public_key&.owner_id != current_user.gitea_uid
+      return render_ok({status: 10002, message: "密钥已存在，请勿重复添加"}) if @gitea_response[2]["message"].starts_with?("Key content has been used as non-deploy key") 
+      @public_key = nil
+    end
+  rescue Exception => e
+    uid_logger_error(e.message)
+    tip_exception(e.message)
+  end
+
+  def destroy
+    return render_not_found unless @public_key.present?
+    result = Gitea::User::Keys::DeleteService.call(current_user.gitea_token, @public_key.id)
+    if result[0] == 204
+      render_ok 
+    else 
+      render_error
+    end
+  rescue Exception => e
+    uid_logger_error(e.message)
+    tip_exception(e.message)
+  end
+
+  private 
+
+  def page
+    params[:page].to_i.zero? ? 1 : params[:page].to_i
+  end
+
+  def limit 
+    limit = params[:limit] || params[:per_page]
+		limit = (limit.to_i.zero? || limit.to_i > 15) ? 15 : limit.to_i
+  end
+
+  def public_key_params 
+    params.require(:public_key).permit(:key, :title)
+  end
+
+  def find_public_key
+    @public_key = current_user.public_keys.find_by_id(params[:id])
+  end
+end

app/controllers/pull_requests_controller.rb

@@ -1,14 +1,16 @@
 class PullRequestsController < ApplicationController
   before_action :require_login, except: [:index, :show, :files, :commits]
+  before_action :require_profile_completed, only: [:create]
   before_action :load_repository
+  before_action :check_menu_authorize
   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 :find_atme_receivers, only: [:create, :update]
   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))
@@ -19,6 +21,7 @@ class PullRequestsController < ApplicationController
     @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})
     @user_admin_or_member = current_user.present? && (current_user.admin || @project.member?(current_user))
+    @user_admin_or_developer = current_user.present? && (current_user.admin || @project.all_developers.include?(current_user))
 
     scopes = Issues::ListQueryService.call(issues,params.delete_if{|k,v| v.blank?}, "PullRequest")
     @issues_size = scopes.size
@@ -53,39 +56,54 @@ class PullRequestsController < ApplicationController
   end
 
   def create
+    # return normal_status(-1, "您不是目标分支开发者，没有权限，请联系目标分支作者.") unless @project.operator?(current_user)
     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"], @gitea_pull_request[:body]["id"])
-        render_ok
+        SendTemplateMessageJob.perform_later('PullRequestAssigned', current_user.id, @pull_request&.id) if Site.has_notice_menu?
+        SendTemplateMessageJob.perform_later('ProjectPullRequest', current_user.id, @pull_request&.id) if Site.has_notice_menu?
+        Rails.logger.info "[ATME] maybe to at such users: #{@atme_receivers.pluck(:login)}"
+        AtmeService.call(current_user, @atme_receivers, @pull_request) if @atme_receivers.size > 0
       else
         render_error("create pull request error: #{@gitea_pull_request[:status]}")
         raise ActiveRecord::Rollback
       end
     end
+  rescue => e
+    normal_status(-1, e.message)
   end
 
   def edit
-    @fork_project_user_name = @project&.fork_project&.owner.try(:show_real_name)
-    @fork_project_user = @project&.fork_project&.owner.try(:login)
-    @fork_project_identifier = @project&.fork_project&.repository.try(:identifier)
+    @fork_project_user_name = @pull_request&.fork_project&.owner.try(:show_real_name)
+    @fork_project_user = @pull_request&.fork_project&.owner.try(:login)
+    @fork_project_identifier = @pull_request&.fork_project&.repository.try(:identifier)
   end
 
   def update
+    return render_forbidden("你没有权限操作.") unless @project.operator?(current_user)
     if params[:title].nil?
       normal_status(-1, "名称不能为空")
     elsif params[:issue_tag_ids].nil?
-      normal_status(-1, "标签不能为空")
+      normal_status(-1, "标记不能为空")
     else
       ActiveRecord::Base.transaction do
         begin
+          return normal_status(-1, "title不能超过255个字符") if params[:title].length > 255
           merge_params
 
+          @issue&.issue_tags_relates&.destroy_all if params[:issue_tag_ids].blank?
           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
+            if params[:issue_tag_ids].is_a?(Array) && params[:issue_tag_ids].size > 1
+              return normal_status(-1, "最多只能创建一个标记。")
+            elsif params[:issue_tag_ids].is_a?(Array) && params[:issue_tag_ids].size == 1
+              @issue&.issue_tags_relates&.destroy_all
+              params[:issue_tag_ids].each do |tag|
+                IssueTagsRelate.create!(issue_id: @issue.id, issue_tag_id: tag)
+              end
+            else
+              return normal_status(-1, "请输入正确的标记。")
+            end 
           end
 
           if @issue.update_attributes(@issue_params)
@@ -95,13 +113,22 @@ class PullRequestsController < ApplicationController
 
               if gitea_pull[:status] === :success
                 if params[:issue_tag_ids].present?
-                  params[:issue_tag_ids].each do |tag|
-                    IssueTagsRelate.create(issue_id: @issue.id, issue_tag_id: tag)
-                  end
+                  if params[:issue_tag_ids].is_a?(Array) && params[:issue_tag_ids].size > 1
+                    return normal_status(-1, "最多只能创建一个标记。")
+                  elsif params[:issue_tag_ids].is_a?(Array) && params[:issue_tag_ids].size == 1
+                    @issue&.issue_tags_relates&.destroy_all
+                    params[:issue_tag_ids].each do |tag|
+                      IssueTagsRelate.create!(issue_id: @issue.id, issue_tag_id: tag)
+                    end
+                  else
+                    return normal_status(-1, "请输入正确的标记。")
+                  end 
                 end
                 if params[:status_id].to_i == 5
                   @issue.issue_times.update_all(end_time: Time.now)
                 end
+                Rails.logger.info "[ATME] maybe to at such users: #{@atme_receivers.pluck(:login)}"
+                AtmeService.call(current_user, @atme_receivers, @pull_request) if @atme_receivers.size > 0
                 normal_status(0, "PullRequest更新成功")
               else
                 normal_status(-1, "PullRequest更新失败")
@@ -114,6 +141,8 @@ class PullRequestsController < ApplicationController
           normal_status(-1, e.message)
           raise ActiveRecord::Rollback
         end
+        SendTemplateMessageJob.perform_later('PullRequestChanged', current_user.id, @pull_request&.id, @issue.previous_changes.slice(:assigned_to_id, :priority_id, :fixed_version_id, :issue_tags_value)) if Site.has_notice_menu?
+        SendTemplateMessageJob.perform_later('PullRequestAssigned', current_user.id, @pull_request&.id ) if @issue.previous_changes[:assigned_to_id].present? && Site.has_notice_menu?
       end
     end
 
@@ -123,7 +152,13 @@ class PullRequestsController < ApplicationController
     ActiveRecord::Base.transaction do
       begin
         colsed = PullRequests::CloseService.call(@owner, @repository, @pull_request, current_user)
-        colsed === true ? normal_status(1, "已拒绝") : normal_status(-1, '合并失败')
+        if colsed === true 
+          @pull_request.project_trends.create!(user: current_user, project: @project,action_type: ProjectTrend::CLOSE)
+          SendTemplateMessageJob.perform_later('PullRequestClosed', current_user.id, @pull_request.id) if Site.has_notice_menu?
+          normal_status(1, "已拒绝") 
+        else
+          normal_status(-1, '合并失败')
+        end
       rescue => e
         normal_status(-1, e.message)
         raise ActiveRecord::Rollback
@@ -160,8 +195,10 @@ class PullRequestsController < ApplicationController
           end
 
           if success_condition && @pull_request.merge!
-            @pull_request.project_trend_status!
+            # @pull_request.project_trend_status!
+            @pull_request.project_trends.create!(user: current_user, project: @project,action_type: ProjectTrend::MERGE)
             @issue&.custom_journal_detail("merge", "", "该合并请求已被合并", current_user&.id)
+            SendTemplateMessageJob.perform_later('PullRequestMerged', current_user.id, @pull_request.id) if Site.has_notice_menu?
             normal_status(1, "合并成功")
           else
             normal_status(-1, result.message)
@@ -178,7 +215,7 @@ class PullRequestsController < ApplicationController
   def check_can_merge
     target_head = params[:head]  #源分支
     target_base = params[:base]  #目标分支
-    is_original = params[:is_original]
+    is_original = params[:is_original] || false
     if target_head.blank? || target_base.blank?
       normal_status(-2, "请选择分支")
     elsif target_head === target_base && !is_original
@@ -188,7 +225,7 @@ class PullRequestsController < ApplicationController
       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='/#{@owner.login}/#{@project.identifier}/pulls/#{can_merge.first.id}''>#{can_merge.first.try(:title)}</a>",
         }
       else
         normal_status(0, "可以合并")
@@ -209,11 +246,11 @@ class PullRequestsController < ApplicationController
 
   private
   def load_pull_request
-    @pull_request = PullRequest.find params[:id]
+    @pull_request = @project.pull_requests.where(gitea_number: params[:id]).where.not(id: params[:id]).take || PullRequest.find_by_id(params[:id])
   end
 
   def find_pull_request
-    @pull_request = PullRequest.find_by_id(params[:id])
+    @pull_request = @project.pull_requests.where(gitea_number: params[:id]).where.not(id: params[:id]).take || PullRequest.find_by_id(params[:id])
     @issue = @pull_request&.issue
     if @pull_request.blank?
       normal_status(-1, "合并请求不存在")
@@ -252,11 +289,15 @@ class PullRequestsController < ApplicationController
       assigned_to_id: params[:assigned_to_id],
       fixed_version_id: params[:fixed_version_id],
       issue_tags_value: params[:issue_tag_ids].present? ? params[:issue_tag_ids].join(",") : "",
-      priority_id: params[:priority_id] || "2",
+      priority_id: params[:priority_id],
       issue_classify: "pull_request",
       issue_type: params[:issue_type] || "1",
       tracker_id: 2,
       status_id: 1,
     }
   end
+
+  def check_menu_authorize
+    return render_not_found unless @project.has_menu_permission("pulls")
+  end
 end

app/controllers/repositories_controller.rb

@@ -1,374 +1,387 @@
-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, :archive]
-  before_action :authorizate_user_can_edit_repo!, only: %i[sync_mirror]
-  before_action :get_ref, only: %i[entries sub_entries top_counts file archive]
-  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
-    @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 entries
-    Rails.logger.info("request.base_url=========#{request.base_url}")
-    puts "request.base_url=========#{request.base_url}"
-    @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
-  end
-
-  def top_counts
-    @result = @project.educoder? ? nil : 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)
-    if interactor.success?
-      @file = interactor.result
-      # create_new_pr(params)
-      #如果是更新流水线文件
-      if params[:pipeline_id]
-        update_pipeline(params[:pipeline_id])
-      end
-    else
-      render_error(interactor.error)
-    end
-  end
-
-  def update_pipeline(pipeline_id)
-    pipeline = Ci::Pipeline.find(pipeline_id)
-    if pipeline
-      pipeline.update!(sync: 1)
-    end
-  end
-
-  def update_file
-    interactor = Gitea::UpdateFileInteractor.call(current_user.gitea_token, @owner.login, params.merge(identifier: @project.identifier))
-    if interactor.success?
-      @file = interactor.result
-      # TODO: 是否创建pr
-      # create_new_pr(params)
-      render_result(1, "更新成功")
-    else
-      render_error(interactor.error)
-    end
-  end
-
-  def delete_file
-    interactor = Gitea::DeleteFileInteractor.call(current_user.gitea_token, @owner.login, params.merge(identifier: @project.identifier))
-    if interactor.success?
-      @file = interactor.result
-      render_result(1, "文件删除成功")
-    else
-      render_error(interactor.error)
-    end
-  end
-
-  def repo_hook
-
-  end
-
-  def sync_mirror
-    return render_error("正在镜像中..") if  @repository.mirror.waiting?
-
-    @repository.sync_mirror!
-    SyncMirroredRepositoryJob.perform_later(@repository.id, current_user.id)
-    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
-
-  def archive
-    domain  = Gitea.gitea_config[:domain]
-    api_url = Gitea.gitea_config[:base_url]
-    archive_url = "/repos/#{@owner.login}/#{@repository.identifier}/archive/#{params[:archive]}"
-
-    file_path = [domain, api_url, archive_url].join
-    file_path = [file_path, "access_token=#{current_user&.gitea_token}"].join("?") if @repository.hidden?
-    Rails.logger.info("file_path======================#{file_path}")
-    return render_not_found if !request.format.zip? && !request.format.gzip?
-
-    redirect_to file_path
-  end
-
-  def sonarqube
-    @sonarqubes = @project.sonarqubes
-
-    branches = Gitea::Repository::Branches::ListService.call(@owner, @project.identifier)
-    branches.each do |branch|
-      sonarqube = @sonarqubes.find_by(branch_name: branch['name'])
-      file_num = 0 
-
-      entries = Gitea::Repository::Entries::ListService.call(@owner, @project.identifier, ref: branch['name'])
-      file_num += entries.size
-      entries.each do |entry|
-        file_path_uri = URI.parse(URI.encode(entry['path'].to_s.strip))
-        
-        interactor = Repositories::EntriesInteractor.call(@owner, @project.identifier, file_path_uri, ref: branch['name'])
-        if interactor.success?
-          result = interactor.result
-          
-          while result.is_a?(Array)
-            file_num += result.size
-            result.each do |res|
-              file_path_uri = URI.parse(URI.encode(res['path'].to_s.strip))
-              interactor = Repositories::EntriesInteractor.call(@owner, @project.identifier, file_path_uri, ref: branch['name'])
-              result = interactor.result
-            end
-          end
-        end
-      end
-
-      if sonarqube
-        sonarqube.update(bug_num: 0, loophole: 0, repetition_rate: 0, file_num: file_num, created_at: Time.now)
-        sleep 3.seconds
-        sonarqube.update_column(:updated_at, Time.now)
-      else
-        @project.sonarqubes.create!(
-          branch_name: branch['name'],
-          bug_num: 0,
-          loophole: 0,
-          repetition_rate: 0,
-          file_num: file_num
-          )
-      end
-    end
-  end
-  
-
-  private
-
-  def find_project
-    @project = Project.find params[:id]
-    render_not_found("未找到相关的仓库") unless @project
-  end
-
-  def find_project_with_includes
-    @project = Project.includes(:repository, :owner, :watchers, :praise_treads).find params[:id]
-  end
-
-  def authorizate!
-    return if current_user && current_user.admin?
-    if @project.repository.hidden? && !@project.member?(current_user)
-      render_forbidden
-    end
-  end
-
-  # TODO 获取最新commit信息
-  def project_commits
-    Gitea::Repository::Commits::ListService.new(@project.owner.login, @project.identifier,
-      sha: get_ref, page: 1, limit: 1, token: current_user&.gitea_token).call
-  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
-  end
-
-  def get_ref
-    @ref = params[:ref] || @project&.default_branch
-  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
-  end
-
-  def content_params
-    {
-      filepath: params[:filepath],
-      branch: params[:branch],
-      new_branch: params[:new_branch],
-      content: params[:content],
-      message: params[:message],
-      committer: {
-        email: current_user.mail,
-        name: current_user.login
-      },
-      identifier: @project.identifier
-    }
-  end
-
-  def hook_params(hook_type, params)
-    # if hook_type == "push"
-    #   # TODO hook返回的记录中，暂时没有文件代码数量的增减，暂时根据 commits数量来计算
-    #   uploadPushInfo = {
-    #     "sha": params["commits"].present? ? params["commits"].last : "",
-    #     "branch": params["ref"].to_s.split("/").last,
-    #     "modification_lines": params["commits"].length
-    #     }
-    # elsif hook_type == "pull_request" && params["action"].to_s == "closed"  #合并请求合并后才会有上链操作
-    #   uploadPushInfo = {
-    #     "branch": params["base"]["ref"].to_s.split("/").last,
-    #     "sha": params["pull_request"]["merge_base"],
-    #     "modification_lines": 1  #pull_request中没有commits数量
-    #     }
-    # else
-    #     uploadPushInfo = {}
-    # end
-
-    # uploadPushInfo
-  end
-  
-  def create_new_pr(params)
-    if params[:new_branch].present? && params[:new_branch] != params[:branch]
-      local_params = {
-        title: params[:message],  #标题
-        body:	params[:content],  #内容
-        head: params[:new_branch],  #源分支
-        base: params[:branch],  #目标分支
-        milestone: 0  #里程碑,未与本地的里程碑关联
-
-      }
-      requests_params = local_params.merge({
-                                             assignee: current_user.try(:login),
-                                             assignees: [],
-                                             labels: [],
-                                             due_date: Time.now
-                                           })
-
-      issue_params = {
-        author_id: current_user.id,
-        project_id: @project.id,
-        subject: params[:message],
-        description: params[:content],
-        assigned_to_id: nil,
-        fixed_version_id: nil,
-        issue_tags_value: nil,
-        issue_classify: "pull_request",
-        issue_type: "1",
-        tracker_id: 2,
-        status_id: 1,
-        priority_id: params[:priority_id] || "2"
-      }
-      @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(gitea_number: gitea_request["body"]["number"])
-            local_requests.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "create")
-          end
-        end
-      end
-    end
-  end
-
-end
+class RepositoriesController < ApplicationController
+  include RepositoriesHelper
+  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 :require_profile_completed, only: [:create_file]
+  before_action :load_repository
+  before_action :authorizate!, except: [:sync_mirror, :tags, :commit, :archive]
+  before_action :authorizate_user_can_edit_repo!, only: %i[sync_mirror]
+  before_action :get_ref, only: %i[entries sub_entries top_counts file archive]
+  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
+    @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 entries
+    @project.increment!(:visits)
+    CacheAsyncSetJob.perform_later("project_common_service", {visits: 1}, @project.id)
+    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}/"
+    end
+  end
+
+  def top_counts
+    @result = @project.educoder? ? nil : 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
+        begin
+          @sub_entries = Educoder::Repository::Entries::ListService.call(@project&.project_educoder&.repo_name, {path: file_path_uri})
+          if @sub_entries.blank? || @sub_entries['status'].to_i === -1
+            @sub_entries = Educoder::Repository::Entries::GetService.call(@project&.project_educoder&.repo_name, file_path_uri)
+            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" => [{}]
+            }
+          end
+        rescue 
+          return render_error('该文件暂未开放，敬请期待.')
+        end
+      end
+    else
+      @path = Gitea.gitea_config[:domain]+"/#{@project.owner.login}/#{@project.identifier}/raw/branch/#{@ref}/"
+      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
+    if @project.educoder?
+      @commits = Educoder::Repository::Commits::ListService.call(@project&.project_educoder&.repo_name)
+    else
+      if params[:filepath].present?
+        file_path_uri = URI.parse(URI.encode(params[:filepath].to_s.strip))
+        @hash_commit = Gitea::Repository::Commits::FileListService.new(@owner.login, @project.identifier, file_path_uri,
+                                                                       sha: params[:sha], page: params[:page], limit: params[:limit], token: current_user&.gitea_token).call
+      else
+        @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
+    end
+  end
+
+  def commits_slice 
+    @hash_commit = Gitea::Repository::Commits::ListSliceService.call(@owner.login, @project.identifier,
+      sha: params[:sha], page: params[:page], limit: params[:limit], token: current_user&.gitea_token)
+  end 
+
+  def commit
+    @sha         = params[:sha]
+    if @project.educoder?
+      return render_error('暂未开放，敬请期待.')
+    else
+      @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
+  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
+    if params[:filepath].present? || @project.educoder?
+      @contributors = []
+    else
+      @contributors = Gitea::Repository::Contributors::GetService.call(@owner, @repository.identifier)
+    end
+  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)
+    if interactor.success?
+      @file = interactor.result
+      # create_new_pr(params)
+      #如果是更新流水线文件
+      if params[:pipeline_id]
+        update_pipeline(params[:pipeline_id])
+      end
+    else
+      render_error(interactor.error)
+    end
+  end
+
+  def update_pipeline(pipeline_id)
+    pipeline = Ci::Pipeline.find(pipeline_id)
+    if pipeline
+      pipeline.update!(sync: 1)
+    end
+  end
+
+  def update_file
+    interactor = Gitea::UpdateFileInteractor.call(current_user.gitea_token, @owner.login, params.merge(identifier: @project.identifier))
+    if interactor.success?
+      @file = interactor.result
+      # TODO: 是否创建pr
+      # create_new_pr(params)
+      render_result(1, "更新成功")
+    else
+      render_error(interactor.error)
+    end
+  end
+
+  def delete_file
+    interactor = Gitea::DeleteFileInteractor.call(current_user.gitea_token, @owner.login, params.merge(identifier: @project.identifier))
+    if interactor.success?
+      @file = interactor.result
+      render_result(1, "文件删除成功")
+    else
+      render_error(interactor.error)
+    end
+  end
+
+  def repo_hook
+
+  end
+
+  def sync_mirror
+    return render_error("正在镜像中..") if  @repository.mirror.waiting?
+
+    @repository.sync_mirror!
+    SyncMirroredRepositoryJob.perform_later(@repository.id, current_user.id)
+    render_ok
+  end
+
+  def readme
+    if params[:filepath].present?
+      result = Gitea::Repository::Readme::DirService.call(@owner.login, @repository.identifier, params[:filepath], params[:ref], current_user&.gitea_token)
+    else
+      result = Gitea::Repository::Readme::GetService.call(@owner.login, @repository.identifier, params[:ref], current_user&.gitea_token)
+    end
+    @path = Gitea.gitea_config[:domain]+"/#{@owner.login}/#{@repository.identifier}/raw/branch/#{params[:ref]}/"
+    @readme = result[:status] === :success ? result[:body] : nil
+    @readme['content'] = decode64_content(@readme, @owner, @repository, params[:ref], @path)
+    render json: @readme.slice("type", "encoding", "size", "name", "path", "content", "sha")
+  rescue 
+    render json: nil
+  end
+
+  def languages
+    if @project.educoder? 
+      render json: {}
+    else
+      render json: languages_precentagable
+    end
+  end
+
+  def archive
+    domain  = Gitea.gitea_config[:domain]
+    api_url = Gitea.gitea_config[:base_url]
+    archive_url = "/repos/#{@owner.login}/#{@repository.identifier}/archive/#{CGI.escape(params[:archive])}"
+
+    file_path = [domain, api_url, archive_url].join
+    file_path = [file_path, "access_token=#{current_user&.gitea_token}"].join("?") if @repository.hidden?
+
+    return render_not_found if !request.format.zip? && !request.format.gzip?
+
+    redirect_to file_path
+  end
+  
+  def raw 
+    domain  = Gitea.gitea_config[:domain]
+    api_url = Gitea.gitea_config[:base_url]
+
+    url = "/repos/#{@owner.login}/#{@repository.identifier}/raw/#{CGI.escape(params[:filepath])}?ref=#{CGI.escape(params[:ref])}"
+    file_path = [domain, api_url, url].join
+    file_path = [file_path, "access_token=#{current_user&.gitea_token}"].join("&") 
+
+    redirect_to file_path
+  end
+
+  private
+
+  def find_project
+    @project = Project.find params[:id]
+    render_not_found("未找到相关的仓库") unless @project
+  end
+
+  def find_project_with_includes
+    @project = Project.includes(:repository, :owner, :watchers, :praise_treads).find params[:id]
+  end
+
+  def authorizate!
+    return if current_user && current_user.admin?
+    if @project.repository.hidden? && !@project.member?(current_user)
+      render_forbidden
+    end
+  end
+
+  # TODO 获取最新commit信息
+  def project_commits
+    if params[:filepath].present?
+      file_path_uri = URI.parse(URI.encode(params[:filepath].to_s.strip))
+      Gitea::Repository::Commits::FileListService.new(@project.owner.login, @project.identifier, file_path_uri,
+        sha: get_ref, page: 1, limit: 1, token: current_user&.gitea_token).call
+    else
+      Gitea::Repository::Commits::ListService.new(@project.owner.login, @project.identifier,
+        sha: get_ref, page: 1, limit: 1, token: current_user&.gitea_token).call
+    end
+  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
+  end
+
+  def get_ref
+    @ref = params[:ref] || @project&.default_branch
+  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
+  end
+
+  def content_params
+    {
+      filepath: params[:filepath],
+      branch: params[:branch],
+      new_branch: params[:new_branch],
+      content: params[:content],
+      message: params[:message],
+      committer: {
+        email: current_user.mail,
+        name: current_user.login
+      },
+      identifier: @project.identifier
+    }
+  end
+
+  def hook_params(hook_type, params)
+    # if hook_type == "push"
+    #   # TODO hook返回的记录中，暂时没有文件代码数量的增减，暂时根据 commits数量来计算
+    #   uploadPushInfo = {
+    #     "sha": params["commits"].present? ? params["commits"].last : "",
+    #     "branch": params["ref"].to_s.split("/").last,
+    #     "modification_lines": params["commits"].length
+    #     }
+    # elsif hook_type == "pull_request" && params["action"].to_s == "closed"  #合并请求合并后才会有上链操作
+    #   uploadPushInfo = {
+    #     "branch": params["base"]["ref"].to_s.split("/").last,
+    #     "sha": params["pull_request"]["merge_base"],
+    #     "modification_lines": 1  #pull_request中没有commits数量
+    #     }
+    # else
+    #     uploadPushInfo = {}
+    # end
+
+    # uploadPushInfo
+  end
+  
+  def create_new_pr(params)
+    if params[:new_branch].present? && params[:new_branch] != params[:branch]
+      local_params = {
+        title: params[:message],  #标题
+        body:	params[:content],  #内容
+        head: params[:new_branch],  #源分支
+        base: params[:branch],  #目标分支
+        milestone: 0  #里程碑,未与本地的里程碑关联
+
+      }
+      requests_params = local_params.merge({
+                                             assignee: current_user.try(:login),
+                                             assignees: [],
+                                             labels: [],
+                                             due_date: Time.now
+                                           })
+
+      issue_params = {
+        author_id: current_user.id,
+        project_id: @project.id,
+        subject: params[:message],
+        description: params[:content],
+        assigned_to_id: nil,
+        fixed_version_id: nil,
+        issue_tags_value: nil,
+        issue_classify: "pull_request",
+        issue_type: "1",
+        tracker_id: 2,
+        status_id: 1,
+        priority_id: params[:priority_id] || "2"
+      }
+      @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"])
+            local_requests.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "create")
+          end
+        end
+      end
+    end
+  end
+
+end

app/controllers/settings_controller.rb

@@ -4,7 +4,8 @@ class SettingsController < ApplicationController
     get_add_menu
     get_common_menu
     get_personal_menu
-
+    get_third_party
+    get_top_system_notification
   end
 
   private
@@ -40,6 +41,18 @@ class SettingsController < ApplicationController
       end
     end
 
+    def get_third_party
+      @third_party = []
+      @third_party << {
+        name: 'educoder',
+        url: EducoderOauth.oauth_url
+      }
+    end
+    
+    def get_top_system_notification
+      @top_system_notification = SystemNotification.is_top.first
+    end
+
     def get_site_url(key, value)
       key.to_s === "url" ? append_http(reset_site_url(value)) : reset_site_url(value)
     end

app/controllers/template_message_settings_controller.rb

@@ -0,0 +1,8 @@
+class TemplateMessageSettingsController < ApplicationController
+  before_action :require_login
+
+  def index 
+    @group_settings = TemplateMessageSetting.group(:type).count
+  end
+
+end

app/controllers/topics_controller.rb

@@ -0,0 +1,9 @@
+class TopicsController < ApplicationController
+
+  def index 
+    return render_not_found("请输入正确的数据类型") unless params[:topic_type].present?
+    scope = Topic.with_single_type(params[:topic_type])
+    @topics = kaminari_paginate(scope)
+  end
+
+end

app/controllers/user_rank_controller.rb

@@ -0,0 +1,24 @@
+class UserRankController < ApplicationController
+  # 根据时间获取热门开发者
+  def index 
+    $redis_cache.zunionstore("recent-days-user-rank", get_timeable_key_names)
+    @user_rank = $redis_cache.zrevrange("recent-days-user-rank", 0, 3, withscores: true)
+  rescue Exception => e
+    @user_rank = []
+  end
+
+  private 
+  # 默认显示7天的
+  def time
+    params.fetch(:time, 7).to_i
+  end
+
+  def get_timeable_key_names
+    names_array = []
+    (0...time).to_a.each do |i|
+      date_time_string = (Date.today - i.days).to_s
+      names_array << "v2-user-rank-#{date_time_string}"
+    end
+    names_array
+  end
+end

app/controllers/users/base_controller.rb

@@ -5,7 +5,7 @@ class Users::BaseController < ApplicationController
   helper_method :observed_logged_user?, :observed_user
 
   def observed_user
-    @_observed_user ||= (User.find_by_id(params[:user_id]) || User.find_by_login(params[:user_id]))
+    @_observed_user ||= (User.find_by_login(params[:user_id]) || User.find_by_id(params[:user_id]))
   end
 
   def observed_logged_user?

app/controllers/users/headmaps_controller.rb

@@ -1,7 +1,7 @@
 class Users::HeadmapsController < Users::BaseController
   def index 
     result = Gitea::User::HeadmapService.call(observed_user.login, start_stamp, end_stamp)
-    @headmaps = result[2]
+    @headmaps = result[2].blank? ? [] : result[2]
   rescue Exception => e
     uid_logger_error(e.message)
     tip_exception(e.message)

app/controllers/users/messages_controller.rb

@@ -0,0 +1,96 @@
+class Users::MessagesController < Users::BaseController 
+  before_action :private_user_resources!
+  before_action :find_receivers, only: [:create]
+
+  def index 
+		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
+    result = Notice::Read::ListService.call(observed_user.id, message_type, message_status, page, limit)
+    return render_error if result.nil?
+    @data = result[2]
+  end
+
+  def create
+    return render_forbidden unless %w(atme).include?(params[:type])
+    case params[:type] 
+    when 'atme' 
+      Notice::Write::CreateAtmeForm.new(atme_params).validate!
+      case atme_params[:atmeable_type]
+      when 'Issue'
+        SendTemplateMessageJob.perform_now('IssueAtme', @receivers, current_user.id, atme_params[:atmeable_id]) if Site.has_notice_menu?
+      when 'PullRequest'
+        SendTemplateMessageJob.perform_now('PullRequestAtme', @receivers, current_user.id, atme_params[:atmeable_id]) if Site.has_notice_menu?
+      when 'Journal'
+        journal = Journal.find_by_id(atme_params[:atmeable_id])
+        if journal.present?
+          if journal&.issue&.pull_request.present?
+            SendTemplateMessageJob.perform_now('PullRequestAtme', @receivers, current_user.id, atme_params[:atmeable_id]) if Site.has_notice_menu?
+          else
+            SendTemplateMessageJob.perform_now('IssueAtme', @receivers, current_user.id, atme_params[:atmeable_id]) if Site.has_notice_menu?
+          end
+        end
+      end
+    end
+    render_ok
+  rescue Exception => e
+    uid_logger_error(e.message)
+    tip_exception(e.message)
+  end
+
+  def delete 
+    return render_forbidden unless %w(atme).include?(params[:type])
+    result = Notice::Write::DeleteService.call(params[:ids], observed_user.id, message_type)
+    return render_error if result.nil? 
+      
+    render_ok
+  rescue Exception => e
+    uid_logger_error(e.message)
+    tip_exception(e.message)
+  end
+
+  def read 
+    return render_forbidden unless %w(notification atme).include?(params[:type])
+    result = Notice::Write::ChangeStatusService.call(params[:ids], observed_user.id, message_type)
+    if result.nil? 
+      render_error 
+    else
+      render_ok
+    end
+  rescue Exception => e
+    uid_logger_error(e.message)
+    tip_exception(e.message)
+  end
+
+  private 
+  def message_type 
+    @message_type = begin
+      case params[:type]
+      when "notification" then 1
+      when "atme" then 2
+      else 
+        -1
+      end
+    end
+  end
+
+  def message_status 
+    @message_status = begin 
+      case params[:status]
+      when "1" then 1
+      when "2" then 2
+      else 
+        -1
+      end
+    end
+  end
+
+  def atme_params 
+    params.permit(:atmeable_type, :atmeable_id, receivers_login: [])
+  end
+
+  def find_receivers
+    @receivers = User.where(login: params[:receivers_login])
+    return render_not_found if @receivers.size == 0
+  end
+end

app/controllers/users/statistics_controller.rb

@@ -14,7 +14,7 @@ class Users::StatisticsController < Users::BaseController
       @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}
+      date_commit_data = commit_data.blank? ? nil : 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}
@@ -188,30 +188,32 @@ class Users::StatisticsController < Users::BaseController
       @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
+      @platform_result = Cache::V2::PlatformStatisticService.new.read
+      @user_result = Cache::V2::UserStatisticService.new(observed_user.id).read
       # 用户被follow数量
-      @follow_count = Cache::UserFollowCountService.call(observed_user)
-      @platform_follow_count = Cache::PlatformFollowCountService.call
+      @follow_count = @user_result["follow-count"].to_i
+      @platform_follow_count = @platform_result["follow-count"].to_i
       # 用户pr数量
-      @pullrequest_count = Cache::UserPullrequestCountService.call(observed_user)
-      @platform_pullrequest_count = Cache::PlatformPullrequestCountService.call
+      @pullrequest_count = @user_result["pullrequest-count"].to_i
+      @platform_pullrequest_count = @platform_result["pullrequest-count"].to_i
       # 用户issue数量
-      @issues_count = Cache::UserIssueCountService.call(observed_user)
-      @platform_issues_count = Cache::PlatformIssueCountService.call
+      @issues_count = @user_result["issue-count"].to_i
+      @platform_issues_count = @platform_result["issue-count"].to_i
       # 用户总项目数 
-      @project_count = Cache::UserProjectCountService.call(observed_user)
-      @platform_project_count = Cache::PlatformProjectCountService.call
+      @project_count = @user_result["project-count"].to_i
+      @platform_project_count = @platform_result["project-count"].to_i
       # 用户项目被fork数量
-      @fork_count = Cache::UserProjectForkCountService.call(observed_user)
-      @platform_fork_count = Cache::PlatformProjectForkCountService.call
+      @fork_count = @user_result["fork-count"].to_i
+      @platform_fork_count = @platform_result["fork-count"].to_i
       # 用户项目关注数
-      @project_watchers_count = Cache::UserProjectWatchersCountService.call(observed_user)
-      @platform_project_watchers_count = Cache::PlatformProjectWatchersCountService.call 
+      @project_watchers_count = @user_result["project-watcher-count"].to_i
+      @platform_project_watchers_count = @platform_result["project-watcher-count"].to_i
       # 用户项目点赞数
-      @project_praises_count = Cache::UserProjectPraisesCountService.call(observed_user)
-      @platform_project_praises_count = Cache::PlatformProjectPraisesCountService.call
+      @project_praises_count = @user_result["project-praise-count"].to_i
+      @platform_project_praises_count = @platform_result["project-praise-count"].to_i
       # 用户不同语言项目数量
-      @project_languages_count = Cache::UserProjectLanguagesCountService.call(observed_user)
-      @platform_project_languages_count = Cache::PlatformProjectLanguagesCountService.call
+      @project_languages_count = JSON.parse(@user_result["project-language"])
+      @platform_project_languages_count = JSON.parse(@platform_result["project-language"])
     end
   end
 end

app/controllers/users/system_notification_histories_controller.rb

@@ -0,0 +1,15 @@
+class Users::SystemNotificationHistoriesController < Users::BaseController 
+  before_action :private_user_resources!, only: [:create]
+  def create 
+    @history = observed_user.system_notification_histories.new(system_notification_id: params[:system_notification_id])
+    if @history.save
+      render_ok
+    else 
+      Rails.logger.info @history.errors.as_json
+      render_error(@history.errors.full_messages.join(","))
+    end
+  rescue Exception => e
+    uid_logger_error(e.message)
+    tip_exception(e.message)
+  end
+end

app/controllers/users/template_message_settings_controller.rb

@@ -0,0 +1,36 @@
+class Users::TemplateMessageSettingsController < Users::BaseController 
+  before_action :check_auth 
+  before_action :get_current_setting 
+
+  def current_setting 
+   
+  end
+
+  def update_setting 
+    Rails.logger.info setting_params[:notification_body]
+    Rails.logger.info setting_params[:email_body]
+
+    @current_setting.notification_body = setting_params[:notification_body].to_hash
+    @current_setting.email_body = setting_params[:email_body].to_hash
+    return render_error("保存失败") unless @current_setting.save!
+  end
+
+  private 
+  def check_auth 
+    return render_forbidden unless current_user.admin? || observed_logged_user?
+  end
+
+  def get_current_setting
+    @current_setting = @_observed_user.user_template_message_setting
+    @current_setting = UserTemplateMessageSetting.build(@_observed_user.id) if @current_setting.nil?
+  end
+
+  def setting_params 
+    params.require(:setting).permit(notification_body: {}, email_body: {})
+  end
+
+  def valid_setting_params
+    setting_params[:notification_body].keys.equal?(UserTemplateMessageSetting.init_notification_body.keys) && setting_params[:email_body].keys.equal?(UserTemplateMessageSetting.init_email_body)
+  end
+  
+end

app/controllers/users_controller.rb

@@ -4,9 +4,9 @@ class UsersController < ApplicationController
 
   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]
+  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 :convert_image!, only: [:update, :update_image]
   skip_before_action :check_sign, only: [:attachment_show]
 
   def connect_to_ci_db(options={})
@@ -32,7 +32,8 @@ class UsersController < ApplicationController
         @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
+        #@undo_events = @waiting_applied_messages.size + @common_applied_transfer_projects.size + @common_applied_projects.size
+        @undo_events = @common_applied_transfer_projects.size + @common_applied_projects.size
       else 
         @waiting_applied_messages = AppliedMessage.none
         @common_applied_transfer_projects = AppliedTransferProject.none
@@ -51,6 +52,8 @@ class UsersController < ApplicationController
       @projects_common_count = user_projects.common.size
       @projects_mirrior_count = user_projects.mirror.size
       @projects_sync_mirrior_count = user_projects.sync_mirror.size
+      # 为了缓存活跃用户的基本信息，后续删除
+      Cache::V2::OwnerCommonService.new(@user.id).read
   end
 
   def watch_users
@@ -74,15 +77,26 @@ class UsersController < ApplicationController
   end
 
   def update
-    return render_not_found unless @user = User.find_by_id(params[:id]) || User.find_by(login: params[:id])
+    return render_not_found unless @user = User.find_by(login: params[:id]) || User.find_by_id(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(", "))
+      render_error(-1, @user.errors.full_messages.join(", "))
     end
   end
 
+  def update_image 
+    return render_not_found unless @user = User.find_by(login: params[:id]) || User.find_by_id(params[:id]) 
+    return render_forbidden unless User.current.logged? && (current_user&.admin? || current_user.id == @user.id)
+
+    Util.write_file(@image, avatar_path(@user)) 
+    return render_ok({message: '头像修改成功'})
+  rescue Exception => e
+    uid_logger_error(e.message)
+    render_error(-1, '头像修改失败！')
+  end
+
   def me
     @user = current_user
   end
@@ -91,6 +105,12 @@ class UsersController < ApplicationController
   def get_user_info
     begin
       @user = current_user
+      begin
+        result = Notice::Read::CountService.call(current_user.id)
+        @message_unread_total = result.nil? ? 0 : result[2]["unread_notification"]
+      rescue 
+        @message_unread_total = 0
+      end
       # TODO 等消息上线再打开注释
       #@tidding_count = unviewed_tiddings(current_user) if current_user.present?
     rescue Exception => e
@@ -185,7 +205,7 @@ class UsersController < ApplicationController
   def trustie_related_projects
     projects = Project.includes(:owner, :members, :project_score).where(id: params[:ids]).order("updated_on desc")
     projects_json = []
-    domain_url = EduSetting.get('host_name') + '/projects'
+    domain_url = EduSetting.get('host_name')
     if projects.present?
       projects.each do |p|
         project_url = "/#{p.owner.login}/#{p.identifier}"
@@ -254,58 +274,23 @@ class UsersController < ApplicationController
     render_ok
   end
 
-  # TODO: For Educoder
-  def change_password
+  def sync_user_info
     user = User.find_by_login params[:login]
-
-    form_params= {
-      login: params[:login],
-      email: user&.mail,
-      password: params[:password],
-      user: user
-    }
-    Gitea::User::ChangePasswordForm.new(form_params).validate!
+    return render_forbidden unless user === current_user
 
     sync_params = {
-      email: user&.mail,
+      email: params[:email],
       password: params[:password]
     }
 
-    if sync_params.present?
-      interactor = Gitea::User::UpdateInteractor.call(user.login, sync_params)
-      if interactor.success?
-        user.update!(password: params[:password], is_sync_pwd: true)
-        render_ok
-      else
-        render_error(interactor.error)
-      end
-    end
-  end
+    Users::UpdateInfoForm.new(sync_params.merge(login: params[:login])).validate!
 
-  # TODO: For Educoder
-  def change_email
-    user = User.find_by_login params[:login]
-
-    form_params= {
-      login: params[:login],
-      email: user&.mail,
-      user: user
-    }
-
-    Gitea::User::ChangeEmailForm.new(form_params).validate!
-
-    sync_params = {
-      email: params[:email]
-    }
-
-    if sync_params.present?
-      interactor = Gitea::User::UpdateInteractor.call(user.login, sync_params)
-      if interactor.success?
-        user.update!(mail: params[:email])
-        render_ok
-      else
-        render_error(interactor.error)
-      end
+    interactor = Gitea::User::UpdateInteractor.call(user.login, sync_params)
+    if interactor.success?
+      user.update!(password: params[:password], mail: params[:email], status: User::STATUS_ACTIVE)
+      render_ok
+    else
+      render_error(interactor.error)
     end
   end
 

app/controllers/version_releases_controller.rb

@@ -1,14 +1,14 @@
 class VersionReleasesController < ApplicationController
   before_action :load_repository
   before_action :set_user
-  before_action :require_login, except: [:index]
-  before_action :find_version , only: [:edit, :update, :destroy]
+  before_action :require_login, except: [:index, :show]
+  before_action :check_release_authorize, except: [:index, :show]
+  before_action :find_version , only: [:show, :edit, :update, :destroy]
 
   def index
-    version_releases = Gitea::Versions::ListService.new(@user.gitea_token, @user.try(:login), @repository.try(:identifier)).call
-    @version_releases = version_releases
-    @user_permission = current_user.present? && (current_user == @user || current_user.admin?)
-    @forge_releases = @repository.version_releases.select(:id,:version_gid, :created_at).includes(:attachments)
+    @version_releases = kaminari_paginate(@repository.version_releases.order(created_at: :desc))
+    @user_permission = current_user.present? && (@repository.project.all_developers.include?(current_user) || current_user.admin?)
+    @user_admin_permission = current_user.present? && (@repository.project.all_managers.include?(current_user) || current_user.admin?)
   end
 
   def new
@@ -22,6 +22,10 @@ class VersionReleasesController < ApplicationController
     end
   end
 
+  def show 
+    # @release = Gitea::Versions::GetService.call(current_user.gitea_token, @user&.login, @repository&.identifier, @version&.version_gid)
+  end
+
   def create
     if params[:name].nil?
       normal_status(-1, "名称不能为空")
@@ -37,13 +41,14 @@ class VersionReleasesController < ApplicationController
           version_params = releases_params
           version_release = VersionRelease.new(version_params.merge(user_id: current_user.id, repository_id: @repository.id))
           if version_release.save!
-            git_version_release = Gitea::Versions::CreateService.new(@user.gitea_token, @user.try(:login), @repository.try(:identifier), version_params).call
+            git_version_release = Gitea::Versions::CreateService.new(current_user.gitea_token, @user.try(:login), @repository.try(:identifier), version_params).call
             if git_version_release
               update_params = {
                 tarball_url: git_version_release["tarball_url"],
                 zipball_url: git_version_release["zipball_url"],
                 url: git_version_release["url"],
                 version_gid: git_version_release["id"],
+                sha: git_version_release["sha"]
               }
               version_release.update_attributes!(update_params)
               version_release.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "create")
@@ -81,7 +86,7 @@ class VersionReleasesController < ApplicationController
 
           if @version.update_attributes!(version_params)
             create_attachments(params[:attachment_ids], @version) if params[:attachment_ids].present?
-            git_version_release = Gitea::Versions::UpdateService.new(@user.gitea_token, @user.try(:login), @repository.try(:identifier), version_params, @version.try(:version_gid)).call
+            git_version_release = Gitea::Versions::UpdateService.new(current_user.gitea_token, @user.try(:login), @repository.try(:identifier), version_params, @version.try(:version_gid)).call
             unless git_version_release
               raise Error, "更新失败"
             end
@@ -102,7 +107,7 @@ class VersionReleasesController < ApplicationController
     ActiveRecord::Base.transaction do
       begin
         if @version.destroy
-          git_version_release = Gitea::Versions::DeleteService.new(@user.gitea_token, @user.try(:login), @repository.try(:identifier), @version.try(:version_gid)).call
+          git_version_release = Gitea::Versions::DeleteService.new(current_user.gitea_token, @user.try(:login), @repository.try(:identifier), @version.try(:version_gid)).call
 
           if git_version_release.status == 204
             normal_status(0, "删除成功")
@@ -157,4 +162,8 @@ class VersionReleasesController < ApplicationController
     end
   end
 
+  def check_release_authorize
+    return render_forbidden("您没有权限进行此操作.") unless current_user.admin? || @project.manager?(current_user)
+  end
+
 end

app/controllers/versions_controller.rb

@@ -1,11 +1,12 @@
 class VersionsController < ApplicationController
   before_action :require_login, except: [:index, :show]
+  before_action :require_profile_completed, only: [:create]
   before_action :load_repository
+  before_action :check_menu_authorize
   before_action :check_issue_permission, except: [:show, :index]
   before_action :set_version, only: [:edit, :update, :destroy, :show,:update_status]
 
   def index
-    return render_not_found unless @project.has_menu_permission("versions")
     @user_admin_or_member = current_user.present? && (current_user.admin || @project.member?(current_user))
     status = params[:status]
     versions = @project.versions.version_includes
@@ -182,4 +183,8 @@ class VersionsController < ApplicationController
     %w(desc asc).include?(params[:order_type]) ? params[:order_type] : 'desc'
    end
 
+   def check_menu_authorize
+    return render_not_found unless @project.has_menu_permission("versions")
+   end
+
 end

app/controllers/watchers_controller.rb

@@ -1,5 +1,6 @@
 class WatchersController < ApplicationController
   before_action :require_login, except: %i[index]
+  before_action :require_profile_completed, only: [:follow]
   # before_action :find_project_with_id
   before_action :get_target
 

app/decorators/course_decorator.rb

@@ -1,5 +0,0 @@
-module CourseDecorator
-  def can_visited?
-    is_public == 1 || User.current.admin_or_business? || User.current.member_of_course?(self)
-  end
-end

app/decorators/ec_course_target_decorator.rb

@@ -1,2 +0,0 @@
-module EcCourseTargetDecorator
-end

app/decorators/experience_decorator.rb

@@ -1,16 +0,0 @@
-module ExperienceDecorator
-  def container_type_text
-    I18n.t("experience.container_type.#{container_type.to_s.underscore}")
-  end
-
-  def content
-    case container_type.to_s.underscore
-    when 'game' then
-      game = Game.find_by(id: container_id)
-      game.present? ? "通过实训“#{game.challenge.shixun.name}”的第#{game.challenge.position}关获得的奖励" : ''
-    when 'shixun_publish' then
-      shixun = Shixun.find_by(id: container_id)
-      shixun.present? ? "发布实训“#{shixun.name}”获得的奖励" : ''
-    end
-  end
-end

app/decorators/grade_decorator.rb

@@ -1,39 +0,0 @@
-module GradeDecorator
-  def container_type_text
-    I18n.t("grade.container_type.#{container_type.to_s.underscore}")
-  end
-
-  def content
-    case container_type.to_s.underscore
-    when 'avatar'         then '用户首次上传头像获得的奖励'
-    when 'phone'          then '用户首次绑定手机号码获得的奖励'
-    when 'mail'           then '用户首次绑定邮箱获得的奖励'
-    when 'attendance'     then '用户每天签到获得的奖励'
-    when 'account'        then '新用户首次填写基本资料获得的奖励'
-    when 'memo'           then '发布的评论或者帖子获得平台奖励'
-    when 'discusses'      then '发布的评论获得平台奖励'
-    when 'star'           then '用户给实训评分获得的随机奖励'
-    when 'feedback'       then '反馈的问题获得平台奖励'
-    when 'authentication' then '用户首次完成实名认证获得的奖励'
-    when 'professional'   then '用户首次完成职业认证获得的奖励'
-    when 'answer' then
-      game = Game.find_by(id: container_id)
-      game.present? ? "查看实训“#{game.challenge.shixun.name}”第#{game.challenge.position}关的参考答案消耗的金币" : ''
-    when 'game' then
-      game = Game.find_by(id: container_id)
-      game.present? ? "通过实训“#{game.challenge.shixun.name}”的第#{game.challenge.position}关获得的奖励" : ''
-    when 'test_set' then
-      game = Game.find_by(id: container_id)
-      game.present? ? "查看实训“#{game.challenge.shixun.name}”的第#{game.challenge.position}关的隐藏测试集消耗的金币" : ''
-    when 'shixun_publish' then
-      shixun = Shixun.find_by(id: container_id)
-      shixun.present? ? "发布实训“#{shixun.name}”获得的奖励" : ''
-    when 'check_ta_answer' then
-      game = Game.find_by(id: container_id)
-      game.present? ? "查看实训“#{game.challenge.shixun.name}”第#{game.challenge.position}关的TA人解答消耗的金币" : ''
-    when 'hack' then
-      hack = Hack.find_by(id: container_id)
-      hack.present? ? "完成了题目解答“#{hack.name}”，获得金币奖励：#{hack.score}" : ''
-    end
-  end
-end

app/decorators/library_decorator.rb

@@ -1,5 +0,0 @@
-module LibraryDecorator
-  extend ApplicationDecorator
-
-  display_time_method :published_at, :created_at, :updated_at
-end

app/decorators/shixun_decorator.rb

@@ -1,5 +0,0 @@
-module ShixunDecorator
-  def human_status
-    I18n.t("shixun.status.#{status}")
-  end
-end

app/decorators/subject_decorator.rb

@@ -1,5 +0,0 @@
-module SubjectDecorator
-  def can_visited?
-    published? || User.current.admin? || member?(User.current)
-  end
-end

app/decorators/video_decorator.rb

@@ -1,5 +0,0 @@
-module VideoDecorator
-  extend ApplicationDecorator
-
-  display_time_method :published_at, :created_at, :updated_at
-end

app/docs/slate/source/api.html.md

@@ -0,0 +1,37 @@
+---
+title: Trustie API Reference
+
+language_tabs: # must be one of https://git.io/vQNgJ
+  - shell: Shell
+  - javascript: JavaScript
+
+toc_footers:
+  - <a href='https://www.trustie.net/login?login=false'>Sign Up for a User</a>
+  - <a href='https://www.trustie.net'>Powered by Trustie</a>
+
+includes:
+  - licenses
+  - gitignores
+  - public_keys
+  - users
+  - projects
+  - repositories
+  - pulls
+  - issues
+  - organizations
+  - teams
+  - errors
+
+
+search: true
+
+code_clipboard: true
+---
+
+# Introduction
+
+Welcome to the Trustie API! You can use our API to access Trustie API endpoints, which can get information on projects, repository, and users in our platform.
+
+We have language bindings in Shell,avaScript! You can view code examples in the dark area to the right, and you can switch the programming language of the examples with the tabs in the top right.
+
+This example API documentation page was created with [Trustie](https://www.trustie.net). Feel free to edit it and use it as a base for your own API's documentation.

app/docs/slate/source/includes/_projects.md

@@ -0,0 +1,852 @@
+# Projects
+
+## 申请加入项目
+申请加入项目
+
+> 示例:
+
+```shell
+curl -X POST http://localhost:3000/api/applied_projects.json
+```
+
+```javascript
+await octokit.request('POST /api/appliedr_projects.json')
+```
+
+### HTTP 请求
+`POST /api/applied_projects.json`
+
+### 请求参数
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+|applied_project.code     |是| |string |邀请码  |
+|applied_project.role     |否| |string |项目权限，reporter: 报告者, developer: 开发者，manager：管理员  |
+
+> 请求的JSON示例
+
+```json
+{
+  "applied_project": {
+    "code": "1una34",
+    "role": "developer"
+  }
+}
+```
+
+### 返回字段说明
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|id             |int      |申请id |
+|status         |string   |申请状态，canceled:取消,common:正在申请, accept:已接受,refuse:已拒绝|
+|time_ago       |string   |项目申请创建的时间 |
+|project.id     |int      |申请项目的id |
+|project.identifier     |string      |申请项目的标识 |
+|project.name     |string      |申请项目的名称 |
+|project.description     |string      |申请项目的描述 |
+|project.is_public     |bool      |申请项目是否公开 |
+|project.owner.id     |bool      |申请项目拥有者id |
+|project.owner.type     |string      |申请项目拥有者类型 |
+|project.owner.name     |string      |申请项目拥有者昵称 |
+|project.owner.login     |string      |申请项目拥有者标识 |
+|project.owner.image_url     |string      |申请项目拥有者头像 |
+|user.id     |int      |申请创建者的id |
+|user.type     |string      |申请创建者的类型 |
+|user.name     |string      |申请创建者的名称 |
+|user.login     |string      |申请创建者的标识 |
+|user.image_url     |string      |申请创建者头像 |
+> 返回的JSON示例:
+
+```json
+{
+    "project": {
+        "id": 74,
+        "identifier": "hehuisssjssjjsjs",
+        "name": "hehuisssjssjjsjs",
+        "description": "wwww",
+        "is_public": false,
+        "owner": {
+            "id": 10,
+            "type": "User",
+            "name": "testforge1",
+            "login": "testforge1",
+            "image_url": "system/lets/letter_avatars/2/T/19_237_174/120.png"
+        }
+    },
+    "user": {
+        "id": 6,
+        "type": "User",
+        "name": "何慧",
+        "login": "yystopf",
+        "image_url": "images/avatars/User/6?t=1622513134"
+    },
+    "id": 7,
+    "status": "common",
+    "created_at": "2021-06-09 16:41",
+    "time_ago": "1分钟前"
+}
+```
+
+## 获取项目列表
+获取项目列表，也可以更加相关条件过滤搜素
+
+> 示例:
+
+```shell
+curl -X GET \
+-d "page=1" \
+-d "limit=5" \
+http://localhost:3000/api/projects  | jq
+```
+
+```javascript
+await octokit.request('GET /api/projects')
+```
+
+### HTTP 请求
+`GET api/projects`
+
+### 请求参数
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+page          | false | 1 | string | 页数，第几页
+limit         | false | 15 | string | 每页多少条数据，默认15条
+sort_by       | false |  | string | 排序类型, 取值：updated_on、created_on、forked_count、praises_count; updated_on: 更新时间排序，created_on: 创建时间排序，forked_count: fork数据排序，praises_count: 点赞数量排序，默认为updated_on更新时间排序
+sort_direction| false |  | string | 排序方式,取值为: desc、asc; desc: 降序排序， asc: 升序排序， 默认为：desc
+search        | false |  | string | 按照项目名称搜索
+category_id   | false |  | int    | 项目类别id
+language_id   | false |  | int    | 项目语言id
+project_type  | false |  | string | 项目类型， 取值为：common、mirror; common:开源托管项目, mirror:开源镜像项目
+
+
+### 返回字段说明
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+total_count     | int   | 项目总条数
+id              | string | 项目id
+name            | string | 项目名称
+description     | string | 项目简介
+visits          | int | 流量数
+forked_count    | int | 被fork的数量
+praises_count   | int | star数量
+is_public       | boolean | 是否公开， true:公开，false:未公开
+mirror_url      | string | 镜像url
+last_update_time| int | 最后更新时间，为UNIX格式的时间戳
+author          | object | 项目创建者
+-- name         | string | 用户名，也是用户标识
+category        | object | 项目类别
+-- id           | int | 项目类型id
+-- name         | string | 项目类型名称
+language        | object | 项目语言
+-- id           | int | 项目语言id
+-- name         | string | 项目语言名称
+
+
+> 返回的JSON示例:
+
+```json
+{
+  "total_count": 3096,
+  "projects": [
+    {
+      "id": 1400794,
+      "repo_id": 1402452,
+      "identifier": "cscw_2021_sponsor",
+      "name": "Sponsor机制下的开源贡献",
+      "description": "CSCW 2021 sponsor机制研究",
+      "visits": 5,
+      "praises_count": 0,
+      "forked_count": 0,
+      "is_public": true,
+      "mirror_url": null,
+      "type": 0,
+      "last_update_time": 1611971671,
+      "time_ago": "2天前",
+      "forked_from_project_id": null,
+      "open_devops": false,
+      "platform": "forge",
+      "author": {
+        "name": "张迅晖",
+        "login": "Nigel",
+        "image_url": "images/avatars/User/3675?t=1611832880"
+      },
+      "category": {
+        "id": 13,
+        "name": "云计算和大数据"
+      },
+      "language": {
+        "id": 34,
+        "name": "Python3.6"
+      }
+    }
+  ]
+}
+```
+<aside class="success">
+Remember — a happy kitten is an authenticated kitten!
+</aside>
+
+
+## 推荐项目
+获取推荐项目列表
+
+> 示例:
+
+```shell
+curl -X GET \
+http://localhost:3000/api/projects/recommend  | jq
+```
+
+```javascript
+await octokit.request('GET /api/projects/recommend.json')
+```
+
+### HTTP 请求
+`GET api/projects/recommend`
+
+
+### 返回字段说明
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+total_count     |int   |项目总条数
+id              |string   |项目id
+name            |string|项目名称
+description     |string|项目简介
+visits          |int|流量数
+forked_count    |int|被fork的数量
+praises_count   |int|star数量
+is_public       |boolean|是否公开， true:公开，false:未公开
+mirror_url      |string|镜像url
+last_update_time|int|最后更新时间，为UNIX格式的时间戳
+author          |object|项目创建者
+-- name         |string|用户名，也是用户标识
+category        |object|项目类别
+-- id           |int|项目类型id
+-- name         |string|项目类型名称
+language        |object|项目语言
+-- id           |int|项目语言id
+-- name         |string|项目语言名称
+
+
+> 返回的JSON示例:
+
+```json
+[
+  {
+    "id": 20,
+    "repo_id": 2,
+    "identifier": "PNAekinmH",
+    "name": "FNILL",
+    "visits": 13567,
+    "author": {
+      "name": "王一达",
+      "login": "wangyida",
+      "image_url": "avatars/User/b"
+    },
+    "category": {
+      "id": 8,
+      "name": "其他"
+    }
+  }
+]
+```
+<aside class="success">
+Remember — a happy kitten is an authenticated kitten!
+</aside>
+
+
+## 项目导航
+获取项目导航信息
+
+> 示例:
+
+```shell
+curl -X GET \
+http://localhost:3000/api/yystopf/ceshi/menu_list  | jq
+```
+
+```javascript
+await octokit.request('GET /api/yystopf/ceshi/menu_list')
+```
+
+### HTTP 请求
+`GET api/:owner/:repo/menu_list`
+
+### 请求参数
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+owner             |是| |string |用户登录名
+repo             |是| |string |项目标识identifier
+
+### 返回字段说明
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+menu_name     |string|导航名称， home:主页,code:代码库,issues:疑修,pulls:合并请求,devops:工作流,versions:里程碑,activity:动态,setting:仓库设置
+
+
+> 返回的JSON示例:
+
+```json
+[
+    {
+        "menu_name": "home"
+    },
+    {
+        "menu_name": "code"
+    },
+    {
+        "menu_name": "pulls"
+    },
+    {
+        "menu_name": "activity"
+    }
+]
+```
+
+
+## 项目主页
+获取项目主页信息
+
+> 示例:
+
+```shell
+curl -X GET \
+http://localhost:3000/api/jasder/forgeplus/about  | jq
+```
+
+```javascript
+await octokit.request('GET /api/jasder/forgeplus/about')
+```
+
+### HTTP 请求
+`GET api/:owner/:repo/about`
+
+### 请求参数
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+owner             |是| |string |用户登录名
+repo             |是| |string |项目标识identifier
+
+### 返回字段说明
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+identifier     |string|project's identifier
+content     |string|主页内容
+attachments     |array|附件
+
+
+> 返回的JSON示例:
+
+```json
+{
+  "content": "",
+  "identifier": "forgeplus",
+  attachments: []
+}
+```
+<aside class="success">
+Remember — a happy kitten is an authenticated kitten!
+</aside>
+
+## 项目模块信息
+项目模块信息
+
+> 示例:
+
+```shell
+curl -X GET \
+http://localhost:3000/api/yystopf/ceshi/project_units.json
+```
+
+```javascript
+await octokit.request('GET /api/yystopf/ceshi/project_units')
+```
+
+### HTTP 请求
+`GET /api/yystopf/ceshi/project_units`
+
+### 返回字段说明:
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|type          |string|模块名称 |
+
+> 返回的JSON示例:
+
+```json
+[
+    {
+        "type": "code"
+    },
+    {
+        "type": "pulls"
+    },
+    {
+        "type": "issues"
+    }
+]
+```
+
+## 更改项目模块展示
+更改项目模块展示
+
+> 示例:
+
+```shell
+curl -X POST \
+-H  "accept: application/json" \
+-H  "Content-Type: application/json" \
+-d "{ \"unit_typs\": [\"code\", \"pulls\"]}" \
+http://localhost:3000/api/yystopf/ceshi/project_units.json
+```
+
+```javascript
+await octokit.request('POST /api/yystopf/ceshi/project_units')
+```
+
+### HTTP 请求
+`POST /api/yystopf/ceshi/project_units`
+
+### 请求参数
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+|unit_types |是| |array    | 项目模块内容， 支持以下参数:code:代码库,issues:疑修,pulls:合并请求,devops:工作流,versions:里程碑 |
+
+
+### 返回字段说明:
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|status          |int|返回状态， 0: 表示操作成功 |
+|message         |string|返回信息说明|
+
+> 返回的JSON示例:
+
+```json
+{
+    "status": 0,
+    "message": "success"
+}
+```
+
+## 创建项目
+创建项目
+
+> 示例:
+
+```shell
+curl -X POST \
+-d "user_id=36401" \
+-d "name=hnfl_demo" \
+-d "description=my first project" \
+-d "repository_name=hnfl_demo" \
+-d "project_category_id=1" \
+-d "project_language_id=2" \
+-d "ignore_id=2" \
+-d "license_id=1" \
+http://localhost:3000/api/projects.json
+```
+
+```javascript
+await octokit.request('GET /api/projects.json')
+```
+
+### HTTP 请求
+`POST api/projects`
+
+### 请求参数
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+|user_id            |是| |int    |用户id或者组织id  |
+|name               |是| |string |项目名称  |
+|description        |是| |string |项目描述  |
+|repository_name    |是| |string |仓库名称, 只含有数字、字母、下划线不能以下划线开头和结尾，且唯一  |
+|project_category_id|是| |int    |项目类别id  |
+|project_language_id|是| |int    |项目语言id  |
+|ignore_id          |否| |int    |gitignore相关id  |
+|license_id         |否| |int    |开源许可证id  |
+|private            |否| |boolean|项目是否私有, true：为私有，false: 公开，默认为公开  |
+
+### 返回字段说明
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|id             |int   |id |
+|name           |string|项目名称|
+
+
+> 返回的JSON示例:
+
+```json
+{
+  "id": 3240,
+  "name": "好项目"
+}
+```
+
+
+## 创建镜像项目
+创建镜像项目
+
+> 示例:
+
+```shell
+curl -X POST \
+-d "user_id=36408" \
+-d "clone_addr=https://gitea.com/mx8090alex/golden.git" \
+-d "name=golden_mirror1" \
+-d "description=golden_mirror" \
+-d "project_category_id=1" \
+-d "project_language_id=2" \
+http://localhost:3000/api/projects/migrate.json
+```
+
+```javascript
+await octokit.request('GET /api/projects/migrate.json')
+```
+
+### HTTP 请求
+`POST api/projects/migrate.json`
+
+### 请求参数
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+|user_id            |是| |int    |用户id或者组织id  |
+|name               |是| |string |项目名称  |
+|clone_addr         |是| |string |镜像项目clone地址  |
+|description        |否| |string |项目描述  |
+|repository_name    |是| |string |仓库名称, 只含有数字、字母、下划线不能以下划线开头和结尾，且唯一  |
+|project_category_id|是| |int    |项目类别id  |
+|project_language_id|是| |int    |项目语言id  |
+|is_mirror          |否| |boolean|是否设置为镜像， true：是， false：否，默认为否  |
+|auth_username      |否| |string|镜像源仓库的登录用户名  |
+|auth_password      |否| |string|镜像源仓库的登录秘密  |
+|private            |否| |boolean|项目是否私有, true：为私有，false: 非私有，默认为公开  |
+
+### 返回字段说明
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|id             |int   |id |
+|name           |string|项目名称|
+
+
+> 返回的JSON示例:
+
+```json
+{
+  "id": 3241,
+  "name": "这是一个镜像项目"
+}
+```
+
+
+## 同步镜像
+手动同步镜像
+
+> 示例:
+
+```shell
+curl -X POST http://localhost:3000/api/repositories/1244/sync_mirror.json
+```
+
+```javascript
+await octokit.request('POST /api/repositories/1244/sync_mirror.json')
+```
+
+### HTTP 请求
+`POST api/repositories/:id/sync_mirror.json`
+
+### 请求参数
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+|id            |是| |int    |仓库id  |
+
+
+### 返回字段说明
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|status            |int   |状态码， 0:标识请求成功 |
+|message           |string|服务端返回的信息说明|
+
+
+> 返回的JSON示例:
+
+```json
+{
+  "status": 0,
+  "message": "success"
+}
+```
+
+
+## Fork项目
+fork项目
+
+> 示例:
+
+```shell
+curl -X POST http://localhost:3000/api/jasder/forgeplus/forks.json
+```
+
+```javascript
+await octokit.request('POST /api/jaser/jasder_test/forks.json')
+```
+
+### HTTP 请求
+`POST api/:owner/:repo/forks.json`
+
+### 请求参数
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+|owner             |是| |string |用户登录名  |
+|repo             |是| |string |项目标识identifier  |
+
+### 返回字段说明
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|id             |int   |项目id |
+|identifier     |string|项目标识|
+
+
+> 返回的JSON示例:
+
+```json
+{
+  "id": 3290,
+  "identifier": "newadm"
+}
+```
+
+## 用户管理的组织列表
+用户管理的组织列表
+
+> 示例:
+
+```shell
+curl -X GET \
+http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/organizations.json  | jq
+```
+
+```javascript
+await octokit.request('GET /api/:owner/:repo/applied_transfer_projects/organizations')
+```
+
+### HTTP 请求
+`GET api/:owner/:repo/applied_transfer_projects/organizations`
+
+### 请求参数
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+owner             |是| |string |用户登录名
+repo             |是| |string |项目标识identifier
+
+### 返回字段说明
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+name     |string|组织标识
+nickname |string|组织名称
+description|string|组织描述
+avatar_url|string｜组织头像
+
+
+> 返回的JSON示例:
+
+```json
+{
+    "total_count": 3,
+    "organizations": [
+        {
+            "id": 9,
+            "name": "ceshi_org",
+            "nickname": "测试组织",
+            "description": "测试组织",
+            "avatar_url": "images/avatars/Organization/9?t=1612706073"
+        },
+        {
+            "id": 51,
+            "name": "ceshi",
+            "nickname": "测试组织哈哈哈",
+            "description": "23212312",
+            "avatar_url": "images/avatars/Organization/51?t=1618800723"
+        },
+        {
+            "id": 52,
+            "name": "ceshi1",
+            "nickname": "身份卡手动阀",
+            "description": "1231手动阀是的",
+            "avatar_url": "images/avatars/Organization/52?t=1618805056"
+        }
+    ]
+}
+```
+
+## 迁移项目
+迁移项目，edit接口is_transfering为true表示正在迁移
+
+> 示例:
+
+```shell
+curl -X POST http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects.json
+```
+
+```javascript
+await octokit.request('POST /api/:owner/:repo/applied_transfer_projects.json')
+```
+
+### HTTP 请求
+`POST /api/:owner/:repo/applied_transfer_projects.json`
+
+### 请求参数
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+|owner     |是| |string |用户登录名  |
+|repo      |是| |string |项目标识identifier  |
+|owner_name|是| |string |迁移对象标识  |
+
+### 返回字段说明
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|id             |int      |项目id |
+|status         |string   |项目迁移状态，canceled:取消,common:正在迁移, accept:已接受,refuse:已拒绝|
+|time_ago       |string   |项目迁移创建的时间 |
+|project.id     |int      |迁移项目的id |
+|project.identifier     |string      |迁移项目的标识 |
+|project.name     |string      |迁移项目的名称 |
+|project.description     |string      |迁移项目的描述 |
+|project.is_public     |bool      |迁移项目是否公开 |
+|project.owner.id     |bool      |迁移项目拥有者id |
+|project.owner.type     |string      |迁移项目拥有者类型 |
+|project.owner.name     |string      |迁移项目拥有者昵称 |
+|project.owner.login     |string      |迁移项目拥有者标识 |
+|project.owner.image_url     |string      |迁移项目拥有者头像 |
+|user.id     |int      |迁移创建者的id |
+|user.type     |string      |迁移创建者的类型 |
+|user.name     |string      |迁移创建者的名称 |
+|user.login     |string      |迁移创建者的标识 |
+|user.image_url     |string      |迁移创建者头像 |
+|owner.id     |int      |迁移接受者的id |
+|owner.type     |string      |迁移接受者的类型 |
+|owner.name     |string      |迁移接受者的名称 |
+|owner.login     |string      |迁移接受者的标识 |
+|owner.image_url     |string      |迁移接受者头像 |
+> 返回的JSON示例:
+
+```json
+{
+    "project": {
+        "id": 86,
+        "identifier": "ceshi_repo1",
+        "name": "测试项目啊1",
+        "description": "二十多",
+        "is_public": true,
+        "owner": {
+            "id": 52,
+            "type": "Organization",
+            "name": "身份卡手动阀",
+            "login": "ceshi1",
+            "image_url": "images/avatars/Organization/52?t=1618805056"
+        }
+    },
+    "user": {
+        "id": 6,
+        "type": "User",
+        "name": "yystopf",
+        "login": "yystopf",
+        "image_url": "system/lets/letter_avatars/2/Y/241_125_89/120.png"
+    },
+    "owner": {
+        "id": 9,
+        "type": "Organization",
+        "name": "测试组织",
+        "login": "ceshi_org",
+        "image_url": "images/avatars/Organization/9?t=1612706073"
+    },
+    "id": 4,
+    "status": "common",
+    "created_at": "2021-04-26 09:54",
+    "time_ago": "1分钟前"
+}
+```
+
+## 取消迁移项目
+迁移项目，edit接口is_transfering为true表示正在迁移
+
+> 示例:
+
+```shell
+curl -X POST http://localhost:3000/api/ceshi1/ceshi_repo1/applied_transfer_projects/cancel.json
+```
+
+```javascript
+await octokit.request('POST /api/:owner/:repo/applied_transfer_projects/cancel.json')
+```
+
+### HTTP 请求
+`POST /api/:owner/:repo/applied_transfer_projects/cancel.json`
+
+### 请求参数
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+|owner     |是| |string |用户登录名  |
+|repo      |是| |string |项目标识identifier  |
+
+### 返回字段说明
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|id             |int      |迁移id |
+|status         |string   |迁移状态，canceled:取消,common:正在迁移, accept:已接受,refuse:已拒绝|
+|time_ago       |string   |迁移创建的时间 |
+|project.id     |int      |迁移项目的id |
+|project.identifier     |string      |迁移项目的标识 |
+|project.name     |string      |迁移项目的名称 |
+|project.description     |string      |迁移项目的描述 |
+|project.is_public     |bool      |迁移项目是否公开 |
+|project.owner.id     |bool      |迁移项目拥有者id |
+|project.owner.type     |string      |迁移项目拥有者类型 |
+|project.owner.name     |string      |迁移项目拥有者昵称 |
+|project.owner.login     |string      |迁移项目拥有者标识 |
+|project.owner.image_url     |string      |迁移项目拥有者头像 |
+|user.id     |int      |迁移创建者的id |
+|user.type     |string      |迁移创建者的类型 |
+|user.name     |string      |迁移创建者的名称 |
+|user.login     |string      |迁移创建者的标识 |
+|user.image_url     |string      |迁移创建者头像 |
+|owner.id     |int      |迁移接受者的id |
+|owner.type     |string      |迁移接受者的类型 |
+|owner.name     |string      |迁移接受者的名称 |
+|owner.login     |string      |迁移接受者的标识 |
+|owner.image_url     |string      |迁移接受者头像 |
+> 返回的JSON示例:
+
+```json
+{
+    "project": {
+        "id": 86,
+        "identifier": "ceshi_repo1",
+        "name": "测试项目啊1",
+        "description": "二十多",
+        "is_public": true,
+        "owner": {
+            "id": 52,
+            "type": "Organization",
+            "name": "身份卡手动阀",
+            "login": "ceshi1",
+            "image_url": "images/avatars/Organization/52?t=1618805056"
+        }
+    },
+    "user": {
+        "id": 6,
+        "type": "User",
+        "name": "yystopf",
+        "login": "yystopf",
+        "image_url": "system/lets/letter_avatars/2/Y/241_125_89/120.png"
+    },
+    "owner": {
+        "id": 9,
+        "type": "Organization",
+        "name": "测试组织",
+        "login": "ceshi_org",
+        "image_url": "images/avatars/Organization/9?t=1612706073"
+    },
+    "id": 4,
+    "status": "common",
+    "created_at": "2021-04-26 09:54",
+    "time_ago": "1分钟前"
+}
+```

app/docs/slate/source/includes/_public_keys.md

@@ -0,0 +1,158 @@
+<!--
+ * @Date: 2021-07-14 15:10:29
+ * @LastEditors: viletyy
+ * @LastEditTime: 2021-07-14 15:37:23
+ * @FilePath: /forgeplus/app/docs/slate/source/includes/_public_keys.md
+-->
+# PublicKeys
+
+## public_keys列表
+获取public_keys列表，支持分页
+
+> 示例:
+
+```shell
+curl -X GET \
+http://localhost:3000/api/public_keys.json
+```
+
+```javascript
+await octokit.request('GET /api/public_keys.json')
+```
+
+### HTTP 请求
+`GET api/public_keys.json`
+
+### 请求参数
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+page  |否| 1 | int |  页码   |
+limit |否| 15 | int | 每页数量 |
+
+### 返回字段说明
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+total_count              |int   |总数 |
+public_keys.id           |int   |ID|
+public_keys.name         |string|密钥标题|
+public_keys.content      |string|密钥内容|
+public_keys.fingerprint  |string|密钥标识|
+public_keys.created_time |string|密钥创建时间|
+
+
+> 返回的JSON示例:
+
+```json
+{
+    "total_count": 1,
+    "public_keys": [
+        {
+            "id": 16,
+            "name": "xxx",
+            "content": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDe5ETOTB5PcmcYJkIhfF7+mxmJQDCLg7/LnMoKHpKoo/jYUnFU9OjfsxVo3FTNUvh2475WXMAur5KsFoNKjK9+JHxvoXyJKmyVPWgXU/NRxQyaWPnPLPK8qPRF5ksJE6feBOqtsdxsvBiHs2r1NX/U26Ecnpr6avudD0cmyrEfbYMWbupLrhsd39dswPT73f3W5jc7B9Y47Ioiv8UOju3ABt1+kpuAjaaVC6VtUQoEFiZb1y33yBnyePya7dvFyApyD4ILyyIG2rtZWK7l53YFnwZDuFsTWjEEEQD0U4FBSFdH5wtwx0WQLMSNyTtaFBSG0kJ+uiQQIrxlvikcm63df7zbC3/rWLPsKgW122Zt966dcpFqiCiJNDKZPPw3qpg8TBL6X+qIZ+FxVEk/16/zScpyEfoxQp0GvgxI7hPLErmfkC5tMsib8MAXYBNyvJXna0vg/wOaNNIaI4SAH9Ksh3f/TtalYVjp6WxIwVBfnbq51WnmlnEXePtX6XjAGL+GbF2VQ1nv/IzrY09tNbTV6wQsrSIP3VDzYQxdJ1rdsVNMoJB0H2Pu0NdcSz53Wx45N+myD0QnE05ss+zDp5StY90OYsx2aCo6qAA8Qn2jUjdta7MQWwkPfKrta4tTQ0XbWMjx4/E1+l3J5liwZkl2XOGOwhfXdRsBjaEziZ18kQ== yystopf@163.com",
+            "fingerprint": "SHA256:cU8AK/+roqUUyiaYXIdS2Nj4+Rb2p6rqWSeRDc+aqKM",
+            "created_unix": 1626246596,
+            "created_time": "2021/07/14 15:09"
+        }
+    ]
+}
+```
+<aside class="success">
+Success — a happy kitten is an authenticated kitten!
+</aside>
+
+## 创建public_key
+创建public_key
+
+> 示例:
+
+```shell
+curl -X POST \
+http://localhost:3000/api/public_keys.json
+```
+
+```javascript
+await octokit.request('POST /api/public_keys.json')
+```
+
+### HTTP 请求
+`POST api/public_keys.json`
+
+### 请求参数
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+key   |是 | 否 | string |  密钥   |
+title |是 | 否 | string | 密钥标题 |
+
+> 请求的JSON示例：
+```json
+{
+  "public_key": {
+    "key": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDe5ETOTB5PcmcYJkIhfF7+mxmJQDCLg7/LnMoKHpKoo/jYUnFU9OjfsxVo3FTNUvh2475WXMAur5KsFoNKjK9+JHxvoXyJKmyVPWgXU/NRxQyaWPnPLPK8qPRF5ksJE6feBOqtsdxsvBiHs2r1NX/U26Ecnpr6avudD0cmyrEfbYMWbupLrhsd39dswPT73f3W5jc7B9Y47Ioiv8UOju3ABt1+kpuAjaaVC6VtUQoEFiZb1y33yBnyePya7dvFyApyD4ILyyIG2rtZWK7l53YFnwZDuFsTWjEEEQD0U4FBSFdH5wtwx0WQLMSNyTtaFBSG0kJ+uiQQIrxlvikcm63df7zbC3/rWLPsKgW122Zt966dcpFqiCiJNDKZPPw3qpg8TBL6X+qIZ+FxVEk/16/zScpyEfoxQp0GvgxI7hPLErmfkC5tMsib8MAXYBNyvJXna0vg/wOaNNIaI4SAH9Ksh3f/TtalYVjp6WxIwVBfnbq51WnmlnEXePtX6XjAGL+GbF2VQ1nv/IzrY09tNbTV6wQsrSIP3VDzYQxdJ1rdsVNMoJB0H2Pu0NdcSz53Wx45N+myD0QnE05ss+zDp5StY90OYsx2aCo6qAA8Qn2jUjdta7MQWwkPfKrta4tTQ0XbWMjx4/E1+l3J5liwZkl2XOGOwhfXdRsBjaEziZ18kQ== yystopf@163.com", 
+    "title": "xxx"
+  }
+}
+```
+
+### 返回字段说明
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+total_count              |int   |总数 |
+id           |int   |ID|
+name         |string|密钥标题|
+content      |string|密钥内容|
+fingerprint  |string|密钥标识|
+created_time |string|密钥创建时间|
+
+
+> 返回的JSON示例:
+
+```json
+{
+    "id": 17,
+    "name": "xxx",
+    "content": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDe5ETOTB5PcmcYJkIhfF7+mxmJQDCLg7/LnMoKHpKoo/jYUnFU9OjfsxVo3FTNUvh2475WXMAur5KsFoNKjK9+JHxvoXyJKmyVPWgXU/NRxQyaWPnPLPK8qPRF5ksJE6feBOqtsdxsvBiHs2r1NX/U26Ecnpr6avudD0cmyrEfbYMWbupLrhsd39dswPT73f3W5jc7B9Y47Ioiv8UOju3ABt1+kpuAjaaVC6VtUQoEFiZb1y33yBnyePya7dvFyApyD4ILyyIG2rtZWK7l53YFnwZDuFsTWjEEEQD0U4FBSFdH5wtwx0WQLMSNyTtaFBSG0kJ+uiQQIrxlvikcm63df7zbC3/rWLPsKgW122Zt966dcpFqiCiJNDKZPPw3qpg8TBL6X+qIZ+FxVEk/16/zScpyEfoxQp0GvgxI7hPLErmfkC5tMsib8MAXYBNyvJXna0vg/wOaNNIaI4SAH9Ksh3f/TtalYVjp6WxIwVBfnbq51WnmlnEXePtX6XjAGL+GbF2VQ1nv/IzrY09tNbTV6wQsrSIP3VDzYQxdJ1rdsVNMoJB0H2Pu0NdcSz53Wx45N+myD0QnE05ss+zDp5StY90OYsx2aCo6qAA8Qn2jUjdta7MQWwkPfKrta4tTQ0XbWMjx4/E1+l3J5liwZkl2XOGOwhfXdRsBjaEziZ18kQ== yystopf@163.com",
+    "fingerprint": "SHA256:cU8AK/+roqUUyiaYXIdS2Nj4+Rb2p6rqWSeRDc+aqKM",
+    "created_time": "2021/07/14 15:26"
+}
+```
+<aside class="success">
+Success — a happy kitten is an authenticated kitten!
+</aside>
+
+
+## 删除public_key
+删除public_key
+
+> 示例:
+
+```shell
+curl -X DELETE \
+http://localhost:3000/api/public_keys/:id.json
+```
+
+```javascript
+await octokit.request('DELETE /api/public_keys/:id.json')
+```
+
+### HTTP 请求
+`DELETE api/public_keys/:id.json`
+
+### 请求参数
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+id   |是 | 否 | int |  密钥ID   |
+
+
+> 返回的JSON示例:
+
+```json
+{
+    "status": 0,
+    "message": "success"
+}
+```
+<aside class="success">
+Success — a happy kitten is an authenticated kitten!
+</aside>
+

app/docs/slate/source/includes/_pulls.md

@@ -0,0 +1,502 @@
+# Pulls
+
+
+## Get a pull request
+获取合并请求详情接口
+
+> 示例:
+
+```shell
+curl -X GET http://localhost:3000/api/Jasder/gitlink/pulls/88.json
+```
+
+```javascript
+await octokit.request('GET /api/Jasder/gitlink/pulls/88.json')
+```
+
+### HTTP 请求
+`GET /api/:owner/:repo/pulls/:id.json`
+
+### 请求参数:
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+|owner             |是| |string |用户登录名  |
+|repo             |是| |string |项目标识identifier  |
+|id             |是|  | integer | pull id值 |
+
+
+
+
+> 返回的JSON示例:
+
+```json
+{
+    "status": 0,
+    "message": "响应成功",
+    "project_name": "Gitlink",
+    "identifier": "forgeplus",
+    "project_identifier": "forgeplus",
+    "pr_time": "52分钟前",
+    "commits_count": 229,
+    "files_count": 328,
+    "comments_count": 0,
+    "comments_total_count": 0,
+    "pull_request": {
+        "id": 1189,
+        "base": "master",
+        "head": "develop",
+        "status": 0,
+        "fork_project_id": null,
+        "is_original": false,
+        "pull_request_staus": "open",
+        "fork_project_user": null,
+        "create_user": "jasder",
+        "mergeable": true,
+        "state": "open"
+    },
+    "issue": {
+        "id": 51888,
+        "subject": "FIx release v3.2.0",
+        "description": null,
+        "is_private": false,
+        "branch_name": null,
+        "project_author_name": "Gitlink",
+        "closed_on": "",
+        "created_at": "2021-10-12 15:51",
+        "assign_user_name": "victor",
+        "assign_user_login": "moshenglv",
+        "author_name": "段甲生",
+        "author_login": "jasder",
+        "author_picture": "images/avatars/User/36480?t=1615520120",
+        "issue_status": "新增",
+        "priority": "正常",
+        "version": null,
+        "issue_tags": null
+    },
+    "conflict_files": []
+}
+```
+
+## 获取pull request文件列表
+获取pull request文件列表
+
+> 示例:
+
+```shell
+curl -X GET \
+http://localhost:3000/api/Jason/gitlink/pulls/1/files.json 
+```
+
+```javascript
+await octokit.request('GET /api/jasder/gitlink/pulls/1/files.json')
+```
+
+### HTTP 请求
+`GET /api/:owner/:repo/pulls/:id/files.json`
+
+### 请求参数:
+|参数名|必选|类型|说明|
+|-|-|-|-|
+|owner          |是|string |用户登录名  |
+|repo           |是|string |project's identifier |
+|id             |是|int |pull request's id  |
+
+
+### 返回字段说明:
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|-|-|-|
+|files_count        |int|文件更改的总数量|
+|total_addition         |int|添加代码总行数|
+|total_deletion        |int|删除代码总行数|
+|files      |array||
+|-- sha  |string|commit's sha value|
+|-- name  |string|当前文件名|
+|-- old_name |string| 修改之前的文件名称,与name相同的话，说明文件名未更改|
+|-- addition  |int|文件添加的行数|
+|-- deletion  |int|文件删除的行数|
+|-- type  |int|文件类型， 1: 表示该文件只添加了内容，2: 表示该文件内容有修改， 3: 表示文件被删除或者改文件只删除了内容|
+|-- isCreated  |boolean|当前文件是否为新增文件, true: 是， false: 否|
+|-- isDeleted  |boolean|当前文件是否被删除， true: 是，false: 否|
+|-- isBin  |boolean|当前文件是否为二进制文件，true: 是，false: 否|
+|-- isLFSFile  |boolean|当前文件是否为LFS文件，true: 是，false: 否|
+|-- isRenamed  |boolean|当前文件是否被重命名，true: 是，false: 否|
+|-- sections  |array||
+|---- fileName   |string|文件名称|
+|---- lines  |array||
+|------ leftIdx   |string|文件变动之前所在行数|
+|------ rightIdx   |string|文件更改后所在行数|
+|------ type   |string|文件变更类型，1: 新增，2: 修改， 3: 删除， 4: diff统计信息|
+|------ content   |string|文件变更的内容|
+|------ sectionInfo   |object||
+|-------- path   |string|文件相对仓库的路径|
+|-------- lastLeftIdx   |int||
+|-------- lastRightIdx   |int||
+|-------- leftHunkSize   |int|文件变更之前的行数|
+|-------- rightHunkSize   |int|文件变更之后的行数(及当前页面编辑器显示的总行数)|
+|-------- leftIdx   |int|文件变更之前所在行数|
+|-------- rightIdx   |int|文件变更之后所在行数(即：页面编辑器开始显示的行数)|
+
+
+
+> 返回的JSON示例:
+
+```json
+{
+  "files_count": 6,
+  "total_addition": 447,
+  "total_deletion": 0,
+  "files": [
+    {
+      "sha": "xefenisnii",
+      "name": "文件.txt",
+      "old_name": "文件.txt",
+      "index": 6,
+      "addition": 2,
+      "deletion": 0,
+      "type": 1,
+      "isCreated": true,
+      "isDeleted": false,
+      "isBin": false,
+      "isLFSFile": false,
+      "isRenamed": false,
+      "isSubmodule": false,
+      "sections": [
+        {
+          "fileName": "文件.txt",
+          "name": "",
+          "lines": [
+            {
+              "leftIdx": 0,
+              "rightIdx": 0,
+              "type": 4,
+              "content": "@@ -0,0 +1,2 @@",
+              "sectionInfo": {
+                "path": null,
+                "lastLeftIdx": null,
+                "lastRightIdx": null,
+                "leftIdx": 0,
+                "rightIdx": 0,
+                "leftHunkSize": null,
+                "rightHunkSize": null
+              }
+            },
+            {
+              "leftIdx": 0,
+              "rightIdx": 1,
+              "type": 2,
+              "content": "+用例图一致性更新",
+              "sectionInfo": null
+            },
+            {
+              "leftIdx": 0,
+              "rightIdx": 2,
+              "type": 2,
+              "content": "+工程文件直接上传会有文件缺失，现在压缩后上传",
+              "sectionInfo": null
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
+```
+
+
+## 获取pull request的commits列表
+获取pull request的commits列表
+
+> 示例:
+
+```shell
+curl -X GET http://localhost:3000/api/jasder/jasder_test/pulls/1/commits.json
+```
+
+```javascript
+await octokit.request('GET /api/jasder/jasder_test/pulls/1/commits.json')
+```
+
+### HTTP 请求
+`GET /api/:owner/:repo/pulls/:id/commits.json`
+
+### 请求参数:
+|参数名|必选|类型|说明|
+|-|-|-|-|
+|owner          |是|string |用户登录名  |
+|repo           |是|string |project's identifier |
+|id             |是|int |pull request's id  |
+
+
+### 返回字段说明:
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|commits_count        |int|commits总数量|
+|commits      |array||
+|-- author          |object|项目作者|
+|---- login        |string|用户login|
+|---- name         |string|用户姓名|
+|---- image_url    |string|用户头像|
+|-- committer          |object|commit提交用户|
+|---- login        |string|用户login|
+|---- name         |string|用户姓名|
+|---- image_url    |string|用户头像|
+|-- timestamp      |int|commit的unix时间戳|
+|-- time_from_now|string|commit’s 提交时间距当前时间的时间值|
+|-- message      |string|commit说明信息|
+|-- sha          |string|commit’s sha值|
+
+
+> 返回的JSON示例:
+
+```json
+{
+  "commits_count": 1,
+  "commits": [
+    {
+      "author": {
+        "id": 36480,
+        "login": "jasder",
+        "name": "段甲生",
+        "image_url": "avatars/User/b"
+      },
+      "committer": {
+        "id": 36480,
+        "login": "jasder",
+        "name": "段甲生",
+        "image_url": "avatars/User/b"
+      },
+      "timestamp": 1604382982,
+      "time_from_now": "3小时前",
+      "message": "add some file\n* Add the tag list page to the release page\n* Apply suggestions from code review\n* Add the tags list view\n* Add the delete tag way on ui\n* Not delete tag and clear message when delete a release\n",
+      "sha": "8f5faee0d3b3be1b8063e84da0c79dd75327b968"
+    }
+  ]
+}
+```
+
+## Compare two commits
+Compare two commits
+
+> 示例:
+
+```shell
+curl -X GET \
+http://localhost:3000/api/Jason/test-txt/compare/master...develop
+
+curl -X GET \
+http://localhost:3000/api/Jason/test-txt/compare/master...Jason/test-txt:develop
+```
+
+```javascript
+await octokit.request('GET /api/Jason/test-txt/compare/master...Jason/test-txt:develop')
+```
+
+### HTTP 请求
+`GET /api/:owner/:repo/compare/{base}...{head}.json`
+
+### 请求参数:
+|参数名|必选|类型|说明|
+|-|-|-|-|
+|owner          |是|string |用户登录名  |
+|repo           |是|string |project's identifier |
+|base             |是|string |pull request's id  |
+|head             |是|string |pull request's id  |
+
+
+### 返回字段说明:
+参数  | 类型 | 字段说明
+--------- | ----------- | -----------
+|-|-|-|
+|commits_count        |int|commits总数量|
+|commits      |array||
+|-- author          |object|项目作者|
+|---- login        |string|用户login|
+|---- name         |string|用户姓名|
+|---- image_url    |string|用户头像|
+|-- committer          |object|commit提交用户|
+|---- login        |string|用户login|
+|---- name         |string|用户姓名|
+|---- image_url    |string|用户头像|
+|-- timestamp      |int|commit的unix时间戳|
+|-- time_from_now|string|commit’s 提交时间距当前时间的时间值|
+|-- message      |string|commit说明信息|
+|-- sha          |string|commit’s sha值|
+|diff      |object||
+|-- files_count        |int|文件更改的总数量|
+|-- total_addition         |int|添加代码总行数|
+|-- total_deletion        |int|删除代码总行数|
+|-- files      |Array||
+|-- sha  |string|commit's sha |
+|-- name  |string|当前文件名|
+|-- old_name |string| 修改之前的文件名称,与name相同的话，说明文件名未更改|
+|-- addition  |int|文件添加的行数|
+|-- deletion  |int|文件删除的行数|
+|-- type  |int|文件类型， 1: 表示该文件只添加了内容，2: 表示该文件内容有修改， 3: 表示文件被删除或者改文件只删除了内容|
+|-- isCreated  |boolean|当前文件是否为新增文件, true: 是， false: 否|
+|-- isDeleted  |boolean|当前文件是否被删除， true: 是，false: 否|
+|-- isBin  |boolean|当前文件是否为二进制文件，true: 是，false: 否|
+|-- isLFSFile  |boolean|当前文件是否为LFS文件，true: 是，false: 否|
+|-- isRenamed  |boolean|当前文件是否被重命名，true: 是，false: 否|
+|-- sections  |array||
+|---- fileName   |string|文件名称|
+|---- lines  |array||
+|------ leftIdx   |string|文件变动之前所在行数|
+|------ rightIdx   |string|文件更改后所在行数|
+|------ type   |string|文件变更类型，1: 内容未改动，2: 添加， 3: 删除， 4: diff统计信息|
+|------ content   |string|文件变更的内容|
+|------ sectionInfo   |object||
+|-------- path   |string|文件相对仓库的路径|
+|-------- lastLeftIdx   |int||
+|-------- lastRightIdx   |int||
+|-------- leftHunkSize   |int|文件变更之前的行数|
+|-------- rightHunkSize   |int|文件变更之后的行数(及当前页面编辑器显示的总行数)|
+|-------- leftIdx   |int|文件变更之前所在行数|
+|-------- rightIdx   |int|文件变更之后所在行数|
+
+> 返回的JSON示例:
+
+```json
+{
+  "commits_count": 1,
+  "commits": [
+    {
+      "author": {
+        "id": 36480,
+        "login": "jasder",
+        "name": "段甲生",
+        "image_url": "avatars/User/b"
+      },
+      "committer": {
+        "id": 36480,
+        "login": "jasder",
+        "name": "段甲生",
+        "image_url": "avatars/User/b"
+      },
+      "timestamp": 1604382982,
+      "time_from_now": "4小时前",
+      "message": "add some file\n* Add the tag list page to the release page\n* Apply suggestions from code review\n* Add the tags list view\n* Add the delete tag way on ui\n* Not delete tag and clear message when delete a release\n",
+      "sha": "8f5faee0d3b3be1b8063e84da0c79dd75327b968"
+    }
+  ],
+  "diff": {
+    "files_count": 6,
+    "total_addition": 447,
+    "total_deletion": 0,
+    "files": [
+      {
+        "name": "build.go",
+        "old_name": "build.go",
+        "index": 1,
+        "addition": 33,
+        "deletion": 0,
+        "type": 1,
+        "isCreated": true,
+        "isDeleted": false,
+        "isBin": false,
+        "isLFSFile": false,
+        "isRenamed": false,
+        "isSubmodule": false,
+        "sections": [
+          {
+            "fileName": "build.go",
+            "name": "",
+            "lines": [
+              {
+                "leftIdx": 0,
+                "rightIdx": 0,
+                "type": 4,
+                "content": "@@ -0,0 +1,33 @@",
+                "sectionInfo": {
+                  "path": "build.go",
+                  "lastLeftIdx": 0,
+                  "lastRightIdx": 0,
+                  "leftIdx": 0,
+                  "rightIdx": 1,
+                  "leftHunkSize": 0,
+                  "rightHunkSize": 33
+                }
+              },
+              {
+                "leftIdx": 0,
+                "rightIdx": 1,
+                "type": 2,
+                "content": "+// Copyright 2020 The Gitea Authors. All rights reserved.",
+                "sectionInfo": null
+              }
+            ]
+          }
+        ]
+      }
+    ]
+  }
+```
+
+
+##  List pull requests
+获取合并请求列表
+
+> 示例:
+
+```shell
+curl -X GET http://localhost:3000/api/Jasder/gitlink/pulls.json
+```
+
+```javascript
+await octokit.request('GET /api/Jasder/gitlink/pulls.json')
+```
+
+### HTTP 请求
+`GET /api/:owner/:repo/pulls.json`
+
+### 请求参数:
+参数    | 必选 | 默认 | 类型 | 字段说明
+--------- | ------- | ------- | -------- | ----------
+|owner             |是| |string |用户登录名  |
+|repo             |是| |string |项目标识identifier  |
+
+
+
+
+> 返回的JSON示例:
+
+```json
+{
+  "status": 0,
+  "message": "响应成功",
+  "open_count": 4,
+  "close_count": 51,
+  "merged_issues_size": 123,
+  "search_count": 4,
+  "limit": null,
+  "user_admin_or_member": true,
+  "user_admin_or_developer": true,
+  "project_name": "Gitlink",
+  "project_author_name": "Gitlink",
+  "issues": [
+    {
+      "pull_request_id": 1189,
+      "pull_request_status": 0,
+      "pull_request_head": "develop",
+      "pull_request_base": "master",
+      "pull_request_staus": "open",
+      "is_original": false,
+      "fork_project_id": null,
+      "fork_project_identifier": null,
+      "fork_project_user": null,
+      "id": 51888,
+      "name": "FIx release v3.2.0",
+      "pr_time": "59分钟前",
+      "assign_user_name": "victor",
+      "assign_user_login": "moshenglv",
+      "author_name": "段甲生",
+      "author_login": "jasder",
+      "avatar_url": "images/avatars/User/36480?t=1615520120",
+      "priority": "正常",
+      "version": null,
+      "journals_count": 0,
+      "issue_tags": null
+    }
+  ]
+}
+```