Merge branch 'dev_military' of https://git.trustie.net/jasder/forgeplus into dev_military

.gitignore

@@ -36,12 +36,16 @@ public/react/yarn.lock
 /.idea/*
 
 # Ignore react node_modules
-public/system/*
+public/react/*
+public/react
+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
 
@@ -72,7 +76,6 @@ vendor/bundle/
 /log
 /public/admin
 /mysql_data
-/public/repo/
 
 
 .generators
@@ -82,6 +85,4 @@ docker/
 educoder.sql
 redis_data/
 Dockerfile
-dump.rdb
-.tags*
-ceshi_user.xlsx
+dump.rdb

.merge_file_a17580

@@ -0,0 +1,529 @@
+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,129 +0,0 @@
-# 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
-  * ADD 用户活动统计图表功能
-  * ADD 用户精选项目功能
-  * ADD 用户贡献度统计图表功能
-  * ADD 用户开发能力数据统计工
-  * ADD 用户角色定位展示功能
-  * ADD 用户专业定位标签展示功能
-  * ADD 修改用户基本资料功能
-  * ADD 更改密码功能
-  * ADD 用户个人主页基本现在展示可配置功能
-
-* BUGFIXES
-  * Fix 解决一些bug
-  * Fix 优化美化页面
-
-
-* BUGFIXES
-  * Fix 在线修改文件，页面文件显不及时的问题(46049)
-  * Fix Fork项目，接口多次调用问题(45052)
-  * FIX 页面置顶功能区域排版问题(45825)
-  * Fix 其他样式显示问题
-
-* ENHANCEMENTS
-  * ADD 合并请求页面显示有冲突文件状态(46016)
-  * ADD 创建组织各属性添加规则匹配功能(45707)
-  * ADD 微信分享功能(45707)
-
-## [v3.0.3](https://forgeplus.trustie.net/projects/jasder/forgeplus/releases) - 2021-05-08
-
-* BUGFIXES
-  * Fix 解决易修标题过长导致的排版问题(45469)
-  * Fix 解决合并请求详情页面排版错误的问题(45457)
-  * FIX 解决转移仓库界面专有名词描述错误的问题(45455)
-  * Fix 解决markdown格式文件自动生成数字排序的问题(45454)
-  * Fix 解决镜像项目源地址不显示的问题(45403)
-  * Fix 解决镜像项目导航显示错误问题(45398)
-  * Fix 解决其他相关bug
-
-* ENHANCEMENTS
-  * UPDATE 用户注册时，账号和密码正则匹配调整(45336) (45318) (45290)
-  * ADD 创建组织各属性添加规则匹配功能(45313) (45289)
-  * ADD 创建团建各属性添加规则匹配功能(45334) (45325) (45287)
-  * ADD 仓库转移功能(45017) (45015)
- 
-## [v3.0.2](https://forgeplus.trustie.net/projects/jasder/forgeplus/releases) - 2021-04-23
-
-* BUGFIXES
-  * Fix 解决部分用户头像不显示问题
-  * Fix 解决代码库模块中最左侧目录中的文件定位加载不准确的问题
-  * FIX 解决团队管理页面中项目链接错误问题
-  * Fix 解决markdown格式文件显示问题
-  * Fix 解决组织名下创建项目报错的问题
-  * Fix 解决组织名下的项目，创建issue报错的问题
-  * Fix 解决组织名下创建团队提示信息信息显示错误问题
-  * Fix 解决点击组织图片时，链接加载错误问题
-  * Fix 修复查询版本库信息安全漏洞
-  * Fix 解决修复团队成员操作访问组织仓库报403错误的问题
-  * Fix 解决owners团队成员对仓库添加成功失败的问题
-
-* ENHANCEMENTS
-  * ADD 自动生产用户头像功能
-  * ADD 创建组织支持中文名称
-  * ADD 创建团建支持中文名称
-  * ADD 组织名称统一显示中文名
-  * ADD 团队名称统一显示中文名
-  * ADD 用户头像悬浮时展示相关信息
-  * ADD 项目详情页添加实践课程链接入口
-  * ADD README文件页面添加添加目录导航功能
-  * UPDATE 升级改版底部footer信息
-  * UPDATE 升级用户操作版本库权限
-
-## [v3.0.1](https://forgeplus.trustie.net/projects/jasder/forgeplus/releases) - 2021-03-19
-
-* BUGFIXES
-  * Fix pull reqeust模块中用户头像显示问题
-  * Fix 解决issue模块中，指派用户的问题
-  * Fix 解决合并请求失败的后显示message信息不正确
-  * Fix 代码目录页面，readme文件提供单独的api
-
-* ENHANCEMENTS
-  * 重构项目详情页面
-
-## [v3.0.0](https://forgeplus.trustie.net/projects/jasder/forgeplus/releases) - 2020-12-29
-
-* BUGFIXES
-  * Fix pull reqeust的访问权限问题 (#14156) (#14171)
-  * Fix 部分页面访问403的问题
-  * Fix 合并请求失败的问题
-  * Fix 代码目录页面，文件夹和文件图片不显示的问题
-  * Fix Issue列表中按‘负责人’过滤筛选时，部分项目成员不在搜索范围没的问题
-  * Fix 项目更新时间不同步的问题, 添加了定时任务
-* ENHANCEMENTS
-  * 提升获取版本库目录代码查询速度 (#43296)
-  * tag 列表慢查询速度问题 (#43332)
-  * API builder 模版中 render partial builder的性能问题

Gemfile

@@ -126,5 +126,3 @@ gem 'request_store'
 gem 'harmonious_dictionary', '~> 0.0.1'
 
 gem 'parallel', '~> 1.19', '>= 1.19.1'
-
-gem 'letter_avatar'

Gemfile.lock

@@ -162,7 +162,6 @@ GEM
       activerecord
       kaminari-core (= 1.2.0)
     kaminari-core (1.2.0)
-    letter_avatar (0.3.8)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -176,9 +175,7 @@ GEM
       mimemagic (~> 0.3.2)
     maruku (0.7.3)
     method_source (0.9.2)
-    mimemagic (0.3.10)
-      nokogiri (~> 1)
-      rake
+    mimemagic (0.3.4)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minitest (5.14.0)
@@ -459,7 +456,6 @@ DEPENDENCIES
   jbuilder (~> 2.5)
   jquery-rails
   kaminari (~> 1.1, >= 1.1.1)
-  letter_avatar
   listen (>= 3.0.5, < 3.2)
   mysql2 (>= 0.4.4, < 0.6.0)
   oauth2

LICENSE

@@ -1,124 +1,21 @@
-木兰宽松许可证， 第2版
+MIT License
 
-2020年1月 http://license.coscl.org.cn/MulanPSL2
+Copyright (c) [year] [fullname]
 
-您对“软件”的复制、使用、修改及分发受木兰宽松许可证，第2版（“本许可证”）的如下条款的约束：
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-0.   定义
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-“软件” 是指由“贡献”构成的许可在“本许可证”下的程序和相关文档的集合。
-
-“贡献” 是指由任一“贡献者”许可在“本许可证”下的受版权法保护的作品。
-
-“贡献者” 是指将受版权法保护的作品许可在“本许可证”下的自然人或“法人实体”。
-
-“法人实体” 是指提交贡献的机构及其“关联实体”。
-
-“关联实体” 是指，对“本许可证”下的行为方而言，控制、受控制或与其共同受控制的机构，此处的控制是指有受控方或共同受控方至少50%直接或间接的投票权、资金或其他有价证券。
-
-1.   授予版权许可
-
-每个“贡献者”根据“本许可证”授予您永久性的、全球性的、免费的、非独占的、不可撤销的版权许可，您可以复制、使用、修改、分发其“贡献”，不论修改与否。
-
-2.   授予专利许可
-
-每个“贡献者”根据“本许可证”授予您永久性的、全球性的、免费的、非独占的、不可撤销的（根据本条规定撤销除外）专利许可，供您制造、委托制造、使用、许诺销售、销售、进口其“贡献”或以其他方式转移其“贡献”。前述专利许可仅限于“贡献者”现在或将来拥有或控制的其“贡献”本身或其“贡献”与许可“贡献”时的“软件”结合而将必然会侵犯的专利权利要求，不包括对“贡献”的修改或包含“贡献”的其他结合。如果您或您的“关联实体”直接或间接地，就“软件”或其中的“贡献”对任何人发起专利侵权诉讼（包括反诉或交叉诉讼）或其他专利维权行动，指控其侵犯专利权，则“本许可证”授予您对“软件”的专利许可自您提起诉讼或发起维权行动之日终止。
-
-3.   无商标许可
-
-“本许可证”不提供对“贡献者”的商品名称、商标、服务标志或产品名称的商标许可，但您为满足第4条规定的声明义务而必须使用除外。
-
-4.   分发限制
-
-您可以在任何媒介中将“软件”以源程序形式或可执行形式重新分发，不论修改与否，但您必须向接收者提供“本许可证”的副本，并保留“软件”中的版权、商标、专利及免责声明。
-
-5.   免责声明与责任限制
-
-“软件”及其中的“贡献”在提供时不带任何明示或默示的担保。在任何情况下，“贡献者”或版权所有者不对任何人因使用“软件”或其中的“贡献”而引发的任何直接或间接损失承担责任，不论因何种原因导致或者基于何种法律理论,即使其曾被建议有此种损失的可能性。
-
-6.   语言
-
-“本许可证”以中英文双语表述，中英文版本具有同等法律效力。如果中英文版本存在任何冲突不一致，以中文版为准。
-
-条款结束
-
-如何将木兰宽松许可证，第2版，应用到您的软件
-
-如果您希望将木兰宽松许可证，第2版，应用到您的新软件，为了方便接收者查阅，建议您完成如下三步：
-
-1， 请您补充如下声明中的空白，包括软件名、软件的首次发表年份以及您作为版权人的名字；
-
-2， 请您在软件包的一级目录下创建以“LICENSE”为名的文件，将整个许可证文本放入该文件中；
-
-3， 请将如下声明文本放入每个源文件的头部注释中。
-
-Copyright (c) [Year] [name of copyright holder]
-[Software Name] is licensed under Mulan PSL v2.
-You can use this software according to the terms and conditions of the Mulan PSL v2.
-You may obtain a copy of Mulan PSL v2 at:
-         http://license.coscl.org.cn/MulanPSL2
-THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
-EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
-MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
-See the Mulan PSL v2 for more details.
-Mulan Permissive Software License，Version 2
-Mulan Permissive Software License，Version 2 (Mulan PSL v2)
-
-January 2020 http://license.coscl.org.cn/MulanPSL2
-
-Your reproduction, use, modification and distribution of the Software shall be subject to Mulan PSL v2 (this License) with the following terms and conditions:
-
-0. Definition
-
-Software means the program and related documents which are licensed under this License and comprise all Contribution(s).
-
-Contribution means the copyrightable work licensed by a particular Contributor under this License.
-
-Contributor means the Individual or Legal Entity who licenses its copyrightable work under this License.
-
-Legal Entity means the entity making a Contribution and all its Affiliates.
-
-Affiliates means entities that control, are controlled by, or are under common control with the acting entity under this License, ‘control’ means direct or indirect ownership of at least fifty percent (50%) of the voting power, capital or other securities of controlled or commonly controlled entity.
-
-1. Grant of Copyright License
-
-Subject to the terms and conditions of this License, each Contributor hereby grants to you a perpetual, worldwide, royalty-free, non-exclusive, irrevocable copyright license to reproduce, use, modify, or distribute its Contribution, with modification or not.
-
-2. Grant of Patent License
-
-Subject to the terms and conditions of this License, each Contributor hereby grants to you a perpetual, worldwide, royalty-free, non-exclusive, irrevocable (except for revocation under this Section) patent license to make, have made, use, offer for sale, sell, import or otherwise transfer its Contribution, where such patent license is only limited to the patent claims owned or controlled by such Contributor now or in future which will be necessarily infringed by its Contribution alone, or by combination of the Contribution with the Software to which the Contribution was contributed. The patent license shall not apply to any modification of the Contribution, and any other combination which includes the Contribution. If you or your Affiliates directly or indirectly institute patent litigation (including a cross claim or counterclaim in a litigation) or other patent enforcement activities against any individual or entity by alleging that the Software or any Contribution in it infringes patents, then any patent license granted to you under this License for the Software shall terminate as of the date such litigation or activity is filed or taken.
-
-3. No Trademark License
-
-No trademark license is granted to use the trade names, trademarks, service marks, or product names of Contributor, except as required to fulfill notice requirements in section 4.
-
-4. Distribution Restriction
-
-You may distribute the Software in any medium with or without modification, whether in source or executable forms, provided that you provide recipients with a copy of this License and retain copyright, patent, trademark and disclaimer statements in the Software.
-
-5. Disclaimer of Warranty and Limitation of Liability
-
-THE SOFTWARE AND CONTRIBUTION IN IT ARE PROVIDED WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED. IN NO EVENT SHALL ANY CONTRIBUTOR OR COPYRIGHT HOLDER BE LIABLE TO YOU FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO ANY DIRECT, OR INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING FROM YOUR USE OR INABILITY TO USE THE SOFTWARE OR THE CONTRIBUTION IN IT, NO MATTER HOW IT’S CAUSED OR BASED ON WHICH LEGAL THEORY, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-6. Language
-
-THIS LICENSE IS WRITTEN IN BOTH CHINESE AND ENGLISH, AND THE CHINESE VERSION AND ENGLISH VERSION SHALL HAVE THE SAME LEGAL EFFECT. IN THE CASE OF DIVERGENCE BETWEEN THE CHINESE AND ENGLISH VERSIONS, THE CHINESE VERSION SHALL PREVAIL.
-
-END OF THE TERMS AND CONDITIONS
-
-How to Apply the Mulan Permissive Software License，Version 2 (Mulan PSL v2) to Your Software
-
-To apply the Mulan PSL v2 to your work, for easy identification by recipients, you are suggested to complete following three steps:
-
-Fill in the blanks in following statement, including insert your software name, the year of the first publication of your software, and your name identified as the copyright owner;
-Create a file named "LICENSE" which contains the whole context of this License in the first directory of your software package;
-Attach the statement to the appropriate annotated syntax at the beginning of each source file.
-Copyright (c) [Year] [name of copyright holder]
-[Software Name] is licensed under Mulan PSL v2.
-You can use this software according to the terms and conditions of the Mulan PSL v2.
-You may obtain a copy of Mulan PSL v2 at:
-         http://license.coscl.org.cn/MulanPSL2
-THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
-EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
-MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
-See the Mulan PSL v2 for more details.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -11,32 +11,13 @@ Trustie （确实）是一个以大众化协同开发、开放式资源共享、
 ## 部署
 
 
-### Depends Versions
-
-* Ruby 2.4.5
-
-* Rails ~> 5.2
-
-* MySql ~> 5.6
-
-* Redis 5+
-
-* imagemagick
-
-### Steps
-
-#### 1. 克隆稳定版本
-```
-git clone -b standalone https://git.trustie.net/jasder/forgeplus.git
-```
-
-#### 2. 安装依赖包
+### 1. 安装依赖包
 
 ```bash
-cd forgeplus && bundle install
+bundle install
 ```
 
-#### 3. 配置初始化文件
+### 2. 配置初始化文件
 进入项目根目录执行一下命令：
 
 ```bash
@@ -46,26 +27,12 @@ touch config/redis.yml
 touch config/elasticsearch.yml
 ```
 
-#### 4. 配置数据库
-数据库配置信息请查看/config/database.yml文件，
-项目默认采用mysql数据库, 如需更改，请自行修改配置信息，
-默认配置如下：
-
-```bash
-default: &default
-  adapter: mysql2
-  host: 127.0.0.1
-  encoding: utf8
-  username: root
-  password: 123456
-```
-
-#### 5. 配置gitea服务(可选)
+### 3. 配置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/jasder/gitea-binary
 
-**配置gitea服务步骤**
+#### 配置gitea服务步骤
 1. 部署gitea服务，并注册root账户
 2. 修改forge平台的 config/configuration.yml中的gitea服务指向地址，如：
 
@@ -77,93 +44,75 @@ gitea:
   base_url: '/api/v1'
 ```
 
-#### 6. 安装redis环境
+### 4. 安装redis环境
 **请自行搜索各平台如何安装部署redis环境**
 
-#### 7. 安装imagemagick插件
-- Mac OS X
+
+### 5. 创建数据库
+
 ```bash
- brew install imagemagick ghostscript
+rails db:create
 ```
 
-- Linux
-```bash
-sudo apt-get install -y imagemagick
-```
-
-#### 8. 创建数据库
-**开发环境为development， 生成环境为production**
-```bash
-rails db:create  RAILS_ENV=development
-```
-
-#### 9. 导入数据表结构
+### 6. 导入数据表结构
 
 ```bash
 bundle exec rake sync_table_structure:import_csv
 ```
 
-#### 10. 执行migrate迁移文件
+### 7. 执行migrate迁移文件
 **开发环境为development， 生成环境为production**
 ```bash
 rails db:migrate RAILS_ENV=development
 ```
 
-#### 11. clone前端代码
-**将前端代码克隆到public/react目录下，目录结构应该是: public/react/build**
-```bash
-git clone -b standalone https://git.trustie.net/jasder/build.git
-```
-
-#### 12. 启动redis(此处以macOS系统为例)
+### 8. 启动redis(此处已mac系统为例)
 ```bash
 redis-server&
 ```
 
-#### 13. 启动sidekiq
+### 9. 启动sidekiq
 **开发环境为development， 生成环境为production**
 ```bash
 bundle exec sidekiq -C config/sidekiq.yml -e production -d
 ```
 
-#### 14. 启动rails服务
+### 10. 启动rails服务
 ```bash
 rails s
 ```
 
-#### 15. 浏览器访问
+### 11. 浏览器访问
 在浏览器中输入如下地址访问：
 ```bash
 http://localhost:3000/
 ```
 
-#### 16. 其他说明
-通过页面注册都第一个用户为平台管理员用户
 
 ## 页面展示
 
 - 代码库
 
-![](docs/figs/code.png?raw=true)
+![](docs/figs/code.png)
 
 
 - 任务管理
-![](docs/figs/issue_manage.png?raw=true)
+![](docs/figs/issue_manage.png)
 
 - 任务查看
 
-![](docs/figs/issue_view.png?raw=true)
+![](docs/figs/issue_view.png)
 
 - 任务指派
 
-![](docs/figs/issue_assign2.png?raw=true)
+![](docs/figs/issue_assign2.png)
 
 - 里程碑
 
-![](docs/figs/milestone.png?raw=true)
+![](docs/figs/milestone.png)
 
 ### API
-- [API文档](https://forgeplus.trustie.net/docs/api)
+- [API](api_document.md)
 - [API](showdoc.com.cn)
   账号：forgeplus@admin.com 密码：forge123
 

api_document.md

@@ -284,6 +284,7 @@ http://localhost:3000/api/licenses/  | jq
 |licenses|array |返回数据|
 |-- id             |int   |id |
 |-- name           |string|开源许可证名称|
+|-- is_secret           |string|是否为特殊许可证|
 
 
 返回值
@@ -292,23 +293,33 @@ http://localhost:3000/api/licenses/  | jq
   "licenses": [
     {
       "id": 57,
-      "name": "AFL-1.2"
+      "name": "AFL-1.2",
+      "is_secret": false
     },
     {
       "id": 76,
-      "name": "AFL-3.0"
+      "name": "AFL-3.0",
+      "is_secret": false
     },
     {
       "id": 214,
-      "name": "AFL-1.1"
+      "name": "AFL-1.1",
+      "is_secret": false
     },
     {
       "id": 326,
-      "name": "AFL-2.1"
+      "name": "AFL-2.1",
+      "is_secret": false
     },
     {
       "id": 350,
-      "name": "AFL-2.0"
+      "name": "AFL-2.0",
+      "is_secret": false
+    },
+    {
+      "id": 359,
+      "name": "PHengLEI",
+      "is_secret": true
     }
   ]
 }
@@ -338,10 +349,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,7 +385,9 @@ curl -X POST \
 -d "user_id=36408" \
 -d "clone_addr=https://gitea.com/mx8090alex/golden.git" \
 -d "name=golden_mirror1" \
--d "repository_name=golden_mirror1" \
+-d "description=golden_mirror" \
+-d "project_category_id=1" \
+-d "project_language_id=2" \
 http://localhost:3000/api/projects/migrate.json  | jq
 ```
 *请求参数说明:*
@@ -386,8 +399,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|镜像源仓库的登录秘密  |
@@ -552,6 +565,8 @@ curl -X GET http://localhost:3000/api/repositories/:id/edit.json | jq
 |project_category_id  |int|项目类别id|
 |project_language_id  |int|项目语言id|
 |private              |boolean|项目是否私有, true：为私有，false: 公开  |
+|is_secret            |boolean|项目是否为特殊协议项目, true：是，false: 否  |
+
 
 
 返回值
@@ -564,7 +579,8 @@ curl -X GET http://localhost:3000/api/repositories/:id/edit.json | jq
   "project_description": "my first project mirror_demo",
   "project_category_id": 1,
   "project_language_id": 2,
-  "private": false
+  "private": false,
+  "is_secret": true
 }
 ```
 ---
@@ -1144,6 +1160,7 @@ http://localhost:3000/api/projects  | jq
 |forked_count    |int|被fork的数量|
 |praises_count   |int|star数量|
 |is_public       |boolean|是否公开， true:公开，false:未公开|
+|is_secret       |boolean|是否为特殊许可证项目， true:是，false:否|
 |mirror_url      |string|镜像url|
 |last_update_time|int|最后更新时间，为UNIX格式的时间戳|
 |author          |object|项目创建者|
@@ -1154,6 +1171,10 @@ http://localhost:3000/api/projects  | jq
 |language        |object|项目语言|
 |-- id           |int|项目语言id|
 |-- name         |string|项目语言名称|
+|user_apply_signatures        |object|用户创建的特殊许可申请|
+|-- id           |int|用户创建的特殊许可申请id|
+|-- status       |int|用户创建的特殊许可申请审核状态， 'unpassed': 审核未通过，'waiting': 等待审核 'passed':审核通过|
+
 
 
 返回值
@@ -1169,6 +1190,7 @@ http://localhost:3000/api/projects  | jq
       "praises_count": 0,
       "forked_count": 0,
       "is_public": true,
+      "is_secret": true,
       "mirror_url": null,
       "last_update_time": 1577697461,
       "author": {
@@ -1182,7 +1204,13 @@ http://localhost:3000/api/projects  | jq
       "language": {
         "id": 2,
         "name": "C"
-      }
+      },
+      "user_apply_signatures":[
+        {
+          "id": 1,
+          "status": "waiting"
+        }
+      ]
     },
     {
       "id": 2,
@@ -1192,6 +1220,7 @@ http://localhost:3000/api/projects  | jq
       "praises_count": 0,
       "forked_count": 0,
       "is_public": true,
+      "is_secret": false,
       "mirror_url": null,
       "last_update_time": 1577697403,
       "author": {
@@ -1205,7 +1234,8 @@ http://localhost:3000/api/projects  | jq
       "language": {
         "id": 2,
         "name": "C"
-      }
+      },
+      "user_apply_signatures":[]
     },
     {
       "id": 3,
@@ -1215,6 +1245,7 @@ http://localhost:3000/api/projects  | jq
       "praises_count": 0,
       "forked_count": 0,
       "is_public": true,
+      "is_secret": true,  
       "mirror_url": null,
       "last_update_time": 1577415173,
       "author": {
@@ -1228,7 +1259,8 @@ http://localhost:3000/api/projects  | jq
       "language": {
         "id": 2,
         "name": "C"
-      }
+      },
+      "user_apply_signatures":[]
     },
     {
       "id": 5,
@@ -1238,6 +1270,7 @@ http://localhost:3000/api/projects  | jq
       "praises_count": 0,
       "forked_count": 0,
       "is_public": false,
+      "is_secret": true,
       "mirror_url": "https://gitea.com/CasperVector/slew.git",
       "last_update_time": 1577346228,
       "author": {
@@ -1251,7 +1284,8 @@ http://localhost:3000/api/projects  | jq
       "language": {
         "id": 2,
         "name": "C"
-      }
+      },
+      "user_apply_signatures":[]
     },
     {
       "id": 7,
@@ -1261,6 +1295,7 @@ http://localhost:3000/api/projects  | jq
       "praises_count": 0,
       "forked_count": 0,
       "is_public": true,
+      "is_secret": true,
       "mirror_url": null,
       "last_update_time": 1577341572,
       "author": {
@@ -1274,7 +1309,8 @@ http://localhost:3000/api/projects  | jq
       "language": {
         "id": 2,
         "name": "C"
-      }
+      },
+      "user_apply_signatures":[]
     }
   ]
 }
@@ -5014,6 +5050,7 @@ http://localhost:3000/api/users/Jason/projects.json | jq
 |forked_count    |int|被fork的数量|
 |praises_count   |int|star数量|
 |is_public       |boolean|是否公开， true:公开，false:未公开|
+|is_secret       |boolean|是否为特殊许可证项目， true:是，false:否|
 |mirror_url      |string|镜像url|
 |last_update_time|int|最后更新时间，为UNIX格式的时间戳|
 |author          |object|项目创建者|
@@ -5024,7 +5061,9 @@ http://localhost:3000/api/users/Jason/projects.json | jq
 |language        |object|项目语言|
 |-- id           |int|项目语言id|
 |-- name         |string|项目语言名称|
-
+|user_apply_signatures        |object|用户创建的特殊许可申请|
+|-- id           |int|用户创建的特殊许可申请id|
+|-- status       |int|用户创建的特殊许可申请审核状态， 'unpassed': 审核未通过，'waiting': 等待审核 'passed':审核通过|
 
 返回值
 ```json
@@ -5039,6 +5078,7 @@ http://localhost:3000/api/users/Jason/projects.json | jq
       "praises_count": 0,
       "forked_count": 0,
       "is_public": true,
+      "is_secret": false,
       "mirror_url": null,
       "last_update_time": 1577697461,
       "author": {
@@ -5052,9 +5092,163 @@ http://localhost:3000/api/users/Jason/projects.json | jq
       "language": {
         "id": 2,
         "name": "C"
-      }
+      },
+      "user_apply_signatures":[
+        {
+          "id": 1,
+          "status": "waiting"
+        }
+      ]
     }
   ]
 }
 ```
 ---
+
+#### 特殊许可证项目申请列表
+```
+GET /api/apply_signatures
+```
+*示例*
+```bash
+curl -X GET \
+-d "project_id=36" \
+-d "page=1" \
+-d "limit=5" \
+-d "search=16895620" \
+-d "status=waiting" \
+http://localhost:3000/api/apply_signatures  | jq
+```
+*请求参数说明:*
+
+|参数名|必选|类型|说明|
+|-|-|-|-|
+|project_id    |是|int    |项目id  |
+|page          |否|string |页数，第几页  |
+|limit         |否|string |每页多少条数据，默认15条  |
+|search        |否|string |用户名、登录名匹配搜索  |
+|status        |否|string |状态匹配搜索，'unpassed': 审核未通过，'waiting': 等待审核 'passed':审核通过  |
+
+
+*返回参数说明:*
+
+|参数名|类型|说明|
+|-|-|-|
+|total_count       |int   |返回记录总条数 |
+|apply_signatures  |array|特殊许可证项目申请信息|
+|-- id             |int|特殊许可证项目申请id|
+|-- status         |int|特殊许可证项目申请状态，'unpassed': 审核未通过，'waiting': 等待审核 'passed':审核通过|
+|user              |object|用户|
+|-- id             |int|用户id|
+|-- name           |string|用户名称|
+|-- login          |string|用户登录名/标识|
+|-- image_url      |string|用户头像|
+|-- email          |string|用户邮箱|
+|-- is_owner       |boolean|是否是项目的拥有者，true:是， false:不是|
+|attachment        |object|上传附件|
+|--filename        |string|附件名称|
+|--path            |string|附件地址|
+
+
+返回值
+```json
+{
+    "total_count": 1,
+    "apply_signatures": [
+        {
+            "id": 18,
+            "status": "passed",
+            "user": {
+                "id": 3,
+                "name": "16895620",
+                "login": "16895620",
+                "image_url": "avatars/User/boy.jpg",
+                "email": "2456233122@qq.com",
+                "is_owner": false
+            },
+            "attachment": {
+                "filename": "PHengLEI软件开源协议.docx",
+                "path": "/api/attachments/23"
+            }
+        }
+    ]
+}
+```
+---
+#### 特殊许可证项目用户创建申请
+```
+POST  /api/apply_signatures
+```
+
+*示例*
+```bash
+curl -X POST \
+-d "project_id=8" \
+-d "attachment_id=4" \
+http://localhost:3000/api/apply_signatures.json | jq
+```
+
+*请求参数说明:*
+
+|参数名|必选|类型|说明|
+|-|-|-|-|
+|project_id          |是|int |项目id  |
+|attachment_id       |是|int |上传的文件id |
+
+*返回参数说明:*
+
+|参数名|类型|说明|
+|-|-|-|
+|id           |int|特殊许可证项目用户创建申请的id|
+|attachment   |object|上传的文件|
+|--filename   |string|上传的文件的文件名|
+
+返回值
+```json
+{
+    "id": 5,
+    "attachment": {
+        "filename": "timg.jpeg"
+    }
+}
+```
+---
+#### 特殊许可证项目申请修改
+```
+PATCH  /api/apply_signatures/:id
+```
+
+*示例*
+```bash
+curl -X POST \
+-d "id=18" \
+-d "status=passed" \
+-d "project_id=36" \
+http://localhost:3000/api/apply_signatures/18 | jq
+```
+
+*请求参数说明:*
+
+|参数名|必选|类型|说明|
+|-|-|-|-|
+|id                  |是|int |特殊许可证项目申请id  |
+|status              |是|string |特殊许可证项目申请状态 ，'unpassed': 审核未通过，'waiting': 等待审核 'passed':审核通过|
+|project_id          |是|int |项目id|
+
+
+*返回参数说明:*
+
+|参数名|类型|说明|
+|-|-|-|
+|status            |int   |0:添加成功， -1: 更改失败， 1: 表示已经是该状态了 |
+|message           |string|返回信息说明|
+
+
+返回值
+```json
+{
+  "status": 0,
+  "message": "success"
+}
+```
+---

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

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

app/assets/javascripts/admins/faqs.js

@@ -1,2 +0,0 @@
-// Place all the behaviors and hooks related to the matching controller here.
-// All this logic will automatically be available in application.js.

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

@@ -1,76 +0,0 @@
-/*
- * @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,15 +1,7 @@
-/*
- * @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) {
-    var searchContainer = $(".shixun-settings-list-form");
-    var searchForm = $("form.search-form",searchContainer);
+    let searchContainer = $(".shixun-settings-list-form");
+    let 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

@@ -1,76 +0,0 @@
-/*
- * @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/javascripts/helps/faqs.js

@@ -1,2 +0,0 @@
-// Place all the behaviors and hooks related to the matching controller here.
-// All this logic will automatically be available in application.js.

app/assets/stylesheets/admins/faqs.scss

@@ -1,3 +0,0 @@
-// Place all the styles related to the admins/faqs controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/

app/assets/stylesheets/helps/faqs.scss

@@ -1,3 +0,0 @@
-// Place all the styles related to the helps/faqs controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/

app/controllers/accounts_controller.rb

@@ -9,7 +9,6 @@ class AccountsController < ApplicationController
   # 其他平台同步注册的用户
   def remote_register
     username = params[:username]&.gsub(/\s+/, "")
-    tip_exception("无法使用以下关键词：#{username}，请重新命名") if ReversedKeyword.is_reversed(username).present?
     email = params[:email]&.gsub(/\s+/, "")
     password = params[:password]
     platform = (params[:platform] || 'forge')&.gsub(/\s+/, "")
@@ -142,9 +141,7 @@ class AccountsController < ApplicationController
 
       code = generate_identifier User, 8, pre
       login = pre + code
-
-      is_admin = !User.exists?(type: 'User')
-      @user = User.new(admin: is_admin, login: login, mail: email, phone: phone, type: "User")
+      @user = User.new(admin: false, login: login, mail: email, phone: phone, type: "User")
       @user.password = params[:password]
       # 现在因为是验证码，所以在注册的时候就可以激活
       @user.activate
@@ -157,11 +154,6 @@ class AccountsController < ApplicationController
         @user.gitea_token = result['sha1']
         @user.gitea_uid = gitea_user[:body]['id']
         if @user.save!
-          # set user for admin role
-          if @user.admin?
-            sync_params = { email: @user.mail, admin: true }
-            Gitea::User::UpdateInteractor.call(@user.login, sync_params)
-          end
           UserExtension.create!(user_id: @user.id)
           successful_authentication(@user)
           normal_status("注册成功")
@@ -177,7 +169,6 @@ class AccountsController < ApplicationController
 
   # 用户登录
   def login
-    Users::LoginForm.new(account_params).validate!
     @user = User.try_to_login(params[:login], params[:password])
 
     return normal_status(-2, "错误的账号或密码") if @user.blank?
@@ -204,25 +195,6 @@ class AccountsController < ApplicationController
     # session[:user_id] = @user.id
   end
 
-  def change_password 
-    @user = User.find_by(login: params[:login])
-    return render_error("未找到相关用户!") if @user.blank?
-    return render_error("旧密码不正确") unless @user.check_password?(params[:old_password])
-
-    sync_params = {
-      password: params[:password].to_s,
-      email: @user.mail
-    }
-
-    interactor = Gitea::User::UpdateInteractor.call(@user.login, sync_params)
-    if interactor.success?
-      @user.update_attribute(:password, params[:password])
-      render_ok
-    else
-      render_error(interactor.error)
-    end
-  end
-
   # 忘记密码
   def reset_password
     begin
@@ -270,9 +242,7 @@ class AccountsController < ApplicationController
   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)
-
+    token = Token.get_or_create_permanent_login_token(user, autologin_cookie_name)
     cookie_options = {
                       :value => token.value,
                       :expires => 1.month.from_now,
@@ -373,7 +343,4 @@ class AccountsController < ApplicationController
     params.require(:user).permit(:login, :email, :phone)
   end
 
-  def account_params 
-    params.require(:account).permit(:login, :password)
-  end
 end

app/controllers/admins/apply_signatures_controller.rb

@@ -0,0 +1,32 @@
+class Admins::ApplySignaturesController < Admins::BaseController
+
+    def index
+      sort_by = params[:sort_by] ||= 'created_on'
+      sort_direction = params[:sort_direction] ||= 'desc'
+
+      @apply_signatures = paginate ApplySignature.waiting.includes(:attachments)
+    end
+
+    def update
+      ActiveRecord::Base.transaction do
+        begin
+          apply_signature = ApplySignature.find_by!(id: params[:id])
+          apply_signature.update_attributes!(apply_signatures_params)
+          if apply_signature.status == "passed"
+            Projects::AddMemberInteractor.call(apply_signature.project.owner, apply_signature.project, apply_signature.user, "read", true)
+          end
+          redirect_to admins_apply_signatures_path
+          flash[:success] = "更新成功"
+        rescue => e
+          raise ActiveRecord::Rollback
+          redirect_to admins_apply_signatures_path
+          flash[:danger] = "更新失败"
+        end
+      end
+    end
+
+    private
+    def apply_signatures_params
+      params.permit(:status)
+    end
+  end

app/controllers/admins/auth_schools_controller.rb

@@ -32,7 +32,7 @@ class Admins::AuthSchoolsController < Admins::BaseController
   def search_manager
     school = School.find_by(id: params[:school_id])
     user_ids = school&.ec_school_users&.pluck(:user_id)
-    @users = User.where.not(id: user_ids).where("CONCAT(lastname, firstname) like ? OR nickname like ?", "%#{params[:name].strip.to_s}%",  "%#{params[:name].strip.to_s}%").limit(10)
+    @users = User.where.not(id: user_ids).where("concat(lastname, firstname) like ?", "%#{params[:name].strip.to_s}%").limit(10)
   end
 
   # 添加认证学校管理员

app/controllers/admins/edu_settings_controller.rb

@@ -1,55 +0,0 @@
-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/faqs_controller.rb

@@ -1,58 +0,0 @@
-class Admins::FaqsController < Admins::BaseController
-  before_action :find_faq, only: [:edit,:update, :destroy]
-
-  def index
-    sort_by = Faq.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'updated_at'
-    sort_direction = %w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : 'desc'
-
-    keyword = params[:keyword].to_s.strip
-    collection = Faq.search_question(keyword).order("#{sort_by} #{sort_direction}")
-    @faqs = paginate collection
-  end
-
-  def new 
-    @faq = Faq.new
-  end
-
-  def edit 
-  end
-
-  def update
-    begin
-      @faq.update!(faq_params)
-      flash[:success] = '修改成功'
-    rescue Exception
-      flash[:danger] = @faq.errors.full_messages.to_sentence
-    end
-
-    redirect_to admins_faqs_path
-  end
-
-  def destroy
-    @faq.destroy
-
-    redirect_to admins_faqs_path 
-    flash[:success] = "删除成功"
-  end
-
-  def create
-    @faq = Faq.new(faq_params)
-    begin
-      @faq.save!
-      flash[:success] = '创建成功'
-    rescue Exception
-      flash[:danger] = @faq.errors.full_messages.to_sentence
-    end
-    redirect_to admins_faqs_path
-  end
-  
-  private
-  def find_faq
-    @faq = Faq.find params[:id]
-  end
-  
-  def faq_params
-    params.require(:faq).permit(:question, :url)
-  end
-  
-end

app/controllers/admins/laboratories_controller.rb

@@ -33,7 +33,7 @@ class Admins::LaboratoriesController < Admins::BaseController
     keyword = params[:keyword].to_s.strip
     if keyword.present?
       like_sql = 'shixuns.name LIKE :keyword OR CONCAT(users.lastname, users.firstname) LIKE :keyword '\
-                 'users.nickname LIKE :keyword OR mirror_repositories.name LIKE :keyword'
+                 'OR mirror_repositories.name LIKE :keyword'
       shixuns = shixuns.joins(:user, :mirror_repositories).where(like_sql, keyword: "%#{keyword}%")
     end
 
@@ -48,7 +48,7 @@ class Admins::LaboratoriesController < Admins::BaseController
 
     keyword = params[:keyword].to_s.strip
     if keyword.present?
-      like_sql = 'subjects.name LIKE :keyword OR CONCAT(users.lastname, users.firstname) LIKE :keyword OR users.nickname LIKE :keyword'
+      like_sql = 'subjects.name LIKE :keyword OR CONCAT(users.lastname, users.firstname) LIKE :keyword'
       subjects = subjects.joins(:user).where(like_sql, keyword: "%#{keyword}%")
     end
 

app/controllers/admins/message_templates_controller.rb

@@ -1,44 +0,0 @@
-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/phenglei_users_controller.rb

@@ -0,0 +1,36 @@
+class Admins::PhengleiUsersController < Admins::BaseController
+  before_action :phenglei_project, only: [:index]
+
+  def index 
+    if params[:keyword].present?
+      @phenglei_users = PhengleiUser.ransack(phone_cont: params[:keyword]).result
+    else
+      @phenglei_users = PhengleiUser 
+    end
+    @phenglei_users = @phenglei_users.page(page).per(per_page)
+  end
+
+  def new 
+    @phenglei_user = PhengleiUser.new
+  end
+
+  def create 
+    @phenglei_user = PhengleiUser.new(phenglei_user_params)
+    if @phenglei_user.save 
+      redirect_to admins_phenglei_users_path
+      flash[:success] = "创建成功"
+    else  
+      redirect_to admins_phenglei_users_path 
+      flash[:error] = "创建失败"
+    end
+  end
+
+  private 
+  def phenglei_project 
+    @phenglei_project = Project.find_by_id(EduSetting.get("sync_phenglei_user_project"))
+  end
+
+  def phenglei_user_params
+    params.require(:phenglei_user).permit(:phone)
+  end
+end

app/controllers/admins/project_categories_controller.rb

@@ -3,8 +3,8 @@ class Admins::ProjectCategoriesController < Admins::BaseController
   before_action :validate_names, only: [:create, :update]
 
   def index 
-    sort_by = ProjectCategory.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'created_at'
-    sort_direction = %w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : 'desc'
+    sort_by = params[:sort_by] ||= 'created_at'
+    sort_direction = params[:sort_direction] ||= 'desc'
     q = ProjectCategory.ransack(name_cont: params[:name])
     project_categories = q.result(distinct: true).order("#{sort_by} #{sort_direction}")
     @project_categories = paginate(project_categories)

app/controllers/admins/project_ignores_controller.rb

@@ -3,8 +3,8 @@ class Admins::ProjectIgnoresController < Admins::BaseController
   before_action :validate_params, only: [:create, :update]
 
   def index
-    sort_by = Ignore.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'created_at'
-    sort_direction = %w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : 'desc'
+    sort_by = params[:sort_by] ||= 'created_at'
+    sort_direction = params[:sort_direction] ||= 'desc'
     q = Ignore.ransack(name_cont: params[:search])
     project_ignores = q.result(distinct: true).order("#{sort_by} #{sort_direction}")
     @project_ignores = paginate(project_ignores)

app/controllers/admins/project_languages_controller.rb

@@ -3,8 +3,8 @@ class Admins::ProjectLanguagesController < Admins::BaseController
   before_action :validate_names, only: [:create, :update]
 
   def index 
-    sort_by = ProjectLanguage.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'created_at'
-    sort_direction = %w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : 'desc'
+    sort_by = params[:sort_by] ||= 'created_at'
+    sort_direction = params[:sort_direction] ||= 'desc'
     q = ProjectLanguage.ransack(name_cont: params[:search])
     project_languages = q.result(distinct: true).order("#{sort_by} #{sort_direction}")
     @project_languages = paginate(project_languages)

app/controllers/admins/project_licenses_controller.rb

@@ -3,8 +3,8 @@ class Admins::ProjectLicensesController < Admins::BaseController
   before_action :validate_params, only: [:create, :update]
 
   def index
-    sort_by = License.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'created_at'
-    sort_direction = %w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : 'desc'
+    sort_by = params[:sort_by] ||= 'created_at'
+    sort_direction = params[:sort_direction] ||= 'desc'
     q = License.ransack(name_cont: params[:search])
     project_licenses = q.result(distinct: true).order("#{sort_by} #{sort_direction}")
     @project_licenses = paginate(project_licenses)

app/controllers/admins/projects_controller.rb

@@ -1,11 +1,13 @@
 class Admins::ProjectsController < Admins::BaseController
+  before_action :load_project, only: [:sync_phenglei_user]
 
   def index
-    sort_by = Project.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'created_on'
-    sort_direction = %w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : 'desc'
+    sort_by = params[:sort_by] ||= 'created_on'
+    sort_direction = params[:sort_direction] ||= 'desc'
+
     search = params[:search].to_s.strip
     projects = Project.where("name like ?", "%#{search}%").order("#{sort_by} #{sort_direction}")
-    @projects = paginate projects.includes(:owner, :members, :issues, :versions, :attachments, :project_score)
+    @projects = paginate projects.includes(:owner, :members, :issues, :versions, :attachments, :project_score, :license)
   end
 
   def destroy
@@ -21,4 +23,20 @@ class Admins::ProjectsController < Admins::BaseController
       redirect_to admins_projects_path
       flash[:danger] = "删除失败"
   end
+
+  def sync_phenglei_user
+    if @project.is_secret
+      SyncPhengleiUserJob.perform_later(@project.id)
+      redirect_to admins_phenglei_users_path
+      flash[:success] = "已开启后台同步任务"
+    else
+      redirect_to admins_phenglei_users_path
+      flash[:danger] = "非风雷协议项目"
+    end
+  end
+
+  private
+  def load_project
+    @project = Project.find_by!(id: params[:id])
+  end
 end

app/controllers/admins/reversed_keywords_controller.rb

@@ -1,84 +0,0 @@
-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

@@ -1,56 +0,0 @@
-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

@@ -1,71 +0,0 @@
-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 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/users_controller.rb

@@ -58,11 +58,58 @@ class Admins::UsersController < Admins::BaseController
     render_ok
   end
 
-  private
+  def new
+    @user = User.new
+  end
+  
+  def create
+    Users::AdminCreateUserForm.new(validate_create_params).validate!
 
+    user  = User.new(create_params)
+    login = User.generate_login("p")
+
+    user.type  = 'User'
+    user.login = login
+    user.mail  = "#{login}@example.org"
+    ActiveRecord::Base.transaction do
+      if user.save!
+        UserExtension.create!(user_id: user.id)
+        interactor = Gitea::RegisterInteractor.call({username: user.login, email: user.mail, password: create_params[:password]})
+        if interactor.success?
+          gitea_user = interactor.result
+          result = Gitea::User::GenerateTokenService.call(user.login, create_params[:password])
+          user.gitea_token = result['sha1']
+          user.gitea_uid = gitea_user[:body]['id']
+          user.save!
+        end
+      end
+    end
+
+    flash[:success] = '保存成功'
+    redirect_to admins_users_path
+  rescue ActiveRecord::RecordInvalid => e
+    logger.info "------------ #{e.message}"
+    puts e.message
+    flash.now[:danger] = e.message
+    render 'new'
+  rescue Exception => ex
+    flash.now[:danger] = ex.message
+    render 'new'
+  end
+
+
+  private
   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])
   end
+
+  def create_params
+    params.require(:user).permit(%i[nickname gender mail phone location location_city password professional_certification])
+  end
+
+  def validate_create_params
+    create_params.slice(:phone, :password)
+  end
 end

app/controllers/application_controller.rb

@@ -28,7 +28,7 @@ class ApplicationController < ActionController::Base
 	DCODES = %W(2 3 4 5 6 7 8 9 a b c f e f g h i j k l m n o p q r s t u v w x y z)
 	OPENKEY = "79e33abd4b6588941ab7622aed1e67e8"
 
-	helper_method :current_user, :base_url
+	helper_method :current_user
 
 	# 所有请求必须合法签名
 	def check_sign
@@ -246,14 +246,6 @@ 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)
@@ -280,7 +272,7 @@ class ApplicationController < ActionController::Base
 
 	# 资料是否完善
 	def check_account
-		if !current_user. profile_is_completed?
+		if !current_user.profile_completed?
 			#info_url = '/account/profile'
 			tip_exception(402, nil)
 		end
@@ -337,6 +329,7 @@ class ApplicationController < ActionController::Base
 				User.current = user
 			end
 		end
+
 		# if !User.current.logged? && Rails.env.development?
 		# 	User.current = User.find 1
 		# end
@@ -381,7 +374,7 @@ class ApplicationController < ActionController::Base
 			# auto-login feature starts a new session
 			user = nil
 			Rails.logger.info("111111111111111111#{default_yun_session}, session is #{session[:"#{default_yun_session}"]} ")
-			user = User.try_to_autologin(cookies[autologin_cookie_name])
+			user = User.try_to_autologin(cookies[autologin_cookie_name], autologin_cookie_name)
 			# start_user_session(user) if user # TODO 解决sso退出不同步的问题
 			user
 		end
@@ -622,8 +615,8 @@ class ApplicationController < ActionController::Base
 		end
 
 		# 排序
-		rorder = UserExtension.column_names.include?(option[:order]) ? option[:order] : "updated_at"
-		b_order = %w(desc asc).include?(option[:b_order]) ? option[:b_order] : "desc"
+		rorder = option[:order] || "updated_at"
+		b_order = option[:b_order] || "desc"
 		if rorder == "created_at" || rorder == "work_score"
 			work_list = work_list.order("graduation_works.#{rorder} #{b_order}")
 		elsif rorder == "student_id"
@@ -761,10 +754,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
@@ -782,8 +775,7 @@ class ApplicationController < ActionController::Base
 	end
 
 	def convert_image!
-		@image = params[:image] 
-		@image = @image.nil? && params[:user].present? ? params[:user][:image] : @image
+		@image = params[:image] || user_params[:image]
     return unless @image.present?
     max_size = EduSetting.get('upload_avatar_max_size') || 2 * 1024 * 1024 # 2M
     if @image.class == ActionDispatch::Http::UploadedFile

app/controllers/applied_projects_controller.rb

@@ -1,13 +0,0 @@
-class AppliedProjectsController < ApplicationController
-  before_action :require_login
-  def create 
-    @applied_project = Projects::ApplyJoinService.call(current_user, applied_params)
-  rescue Projects::ApplyJoinService::Error => ex
-    render_error(ex.message)
-  end
-
-  private 
-  def applied_params 
-    params.require(:applied_project).permit(:code, :role)
-  end
-end

app/controllers/apply_signatures_controller.rb

@@ -0,0 +1,75 @@
+class ApplySignaturesController < ApplicationController
+  include ApplicationHelper
+  before_action :find_project, only: [:index, :create, :update]
+  before_action :require_owner, only: [:update]
+  before_action :find_apply_signature, only: [:update]
+
+  def index 
+    search = params[:search].to_s.downcase
+    @apply_signatures = @project.apply_signatures.with_status(status).includes(user: :user_extension)
+    @apply_signatures = @apply_signatures.joins(:user).where("LOWER(CONCAT_WS(users.lastname, users.firstname, users.login, users.mail, users.nickname)) LIKE ?", "%#{search.split(" ").join('|')}%") if search.present?
+    @apply_signatures = kaminari_paginate(@apply_signatures)
+  end
+
+  def template_file
+    license = License.find_by_name("PHengLEI")
+    file = license.attachments.take
+    normal_status(-1, "文件不存在") if file.blank?
+    send_file(absolute_path(local_path(file)), filename: file.title,stream:false, type: file.content_type.presence || 'application/octet-stream')
+  end
+
+  def create 
+    ActiveRecord::Base.transaction do
+      begin
+        @signature = current_user.apply_signatures.find_or_create_by!(project_id: params[:project_id])
+        @signature.status = 0
+        @signature.attachments = Attachment.none
+        @attachment = Attachment.find_by_id(params[:attachment_id])
+        @attachment.container = @signature
+        @signature.save!
+        @attachment.save!
+      rescue Exception => e
+        tip_exception("#{e}")
+        raise ActiveRecord::Rollback
+      end
+      render_json
+    end
+  end
+
+  def update
+    @apply_signature.update_attributes!(apply_signature_params)
+    if @apply_signature.status == "passed"
+      Projects::AddMemberInteractor.call(@apply_signature.project.owner, @apply_signature.project, @apply_signature.user, "read", true)
+    else
+      Projects::DeleteMemberInteractor.call(@apply_signature.project.owner, @apply_signature.project, @apply_signature.user)
+    end
+    render_ok
+  rescue Exception => e
+    uid_logger_error(e.message)
+    tip_exception(e.message)
+  end
+
+  private
+  def find_project
+    @project = Project.find_by_id(params[:project_id])
+    normal_status(-1, "项目不存在") unless @project.present?
+  end
+
+  def find_apply_signature
+    @apply_signature = ApplySignature.find_by_id(params[:id])
+    normal_status(-1, "特殊许可申请不存在") unless @apply_signature.present?
+    normal_status(1, "已经是该状态了") if @apply_signature.status == params[:status]
+  end
+
+  def apply_signature_params
+    params.permit(:status)
+  end
+
+  def status 
+    params.fetch(:status, "all")
+  end
+
+  def require_owner
+    normal_status(403, "") unless @project.owner?(current_user)
+  end
+end 

app/controllers/attachments_controller.rb

@@ -32,17 +32,8 @@ 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:"))
-    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
+    response = Faraday.get(url)
+    filename = params[:download_url].to_s.split("/").pop()
     send_data(response.body.force_encoding("UTF-8"),  filename: filename, type: "application/octet-stream", disposition: 'attachment')
   end
 
@@ -51,6 +42,7 @@ class AttachmentsController < ApplicationController
     # 2. 上传到云
     begin
       upload_file = params["file"] || params["#{params[:file_param_name]}"]# 这里的file_param_name是为了方便其他插件名称
+      dun_check_file = upload_file.dup
       uid_logger("#########################file_params####{params["#{params[:file_param_name]}"]}")
       raise "未上传文件" unless upload_file
 
@@ -88,8 +80,16 @@ class AttachmentsController < ApplicationController
         @attachment.digest = digest
         @attachment.author_id = current_user.id
         @attachment.disk_directory = month_folder
-        @attachment.cloud_url = remote_path
-        @attachment.save!
+        # @attachment.cloud_url = remote_path
+        # @attachment.save!
+        if @attachment.save!
+          check_result = Attachment.check_image_able(dun_check_file)
+          if check_result[:status].to_i == -1
+            @attachment.destroy
+            raise "上传失败，#{check_result[:message]}"
+            # return render json: {status: -1, message: "上传失败，#{check_result[:message]}" } 
+          end
+        end
       else
         logger.info "文件已存在，id = #{@attachment.id}, filename = #{@attachment.filename}"
       end

app/controllers/compare_controller.rb

@@ -6,48 +6,26 @@ class CompareController < ApplicationController
   end
 
   def show
-    load_compare_params
     compare
-    @merge_status, @merge_message = get_merge_message
   end
 
   private
-  def get_merge_message 
-    if @base.blank? || @head.blank?
-      return -2, "请选择分支"
-    else
-      if @head.include?(":")
-        fork_project = @project.forked_projects.joins(:owner).where(users: {login: @head.to_s.split("/")[0]}).take
-        return -2, "请选择正确的仓库" unless fork_project.present?
-        @exist_pullrequest = @project.pull_requests.where(is_original: true, head: @head.to_s.split(":")[1], base: @base, status: 0, fork_project_id: fork_project.id).take
-      else 
-        @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='/#{@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, "分支内容相同，无需创建合并请求"
-        end
-      end
-    end
-    return 0, "可以合并"
-  end
-
   def compare
+    base, head = compare_params
 
     # TODO: 处理fork的项目向源项目发送PR的base、head参数问题
     @compare_result ||=
-      @head.include?(":") ? gitea_compare(@base, @head) : gitea_compare(@head, @base)
+      head.include?(":") ? gitea_compare(base, head) : gitea_compare(head, base)
   end
 
-  def load_compare_params
-    @base = Addressable::URI.unescape(params[:base])
-    @head = params[:head].include?('json') ? params[:head]&.split('.json')[0] : params[:head]
+  def compare_params
+    base = Addressable::URI.unescape(params[:base])
+    head = params[:head].include?('json') ? params[:head]&.split('.json')[0] : params[:head]
 
+    [base, head]
   end
 
   def gitea_compare(base, head)
-    Gitea::Repository::Commits::CompareService.call(@owner.login, @project.identifier, base, head, current_user.gitea_token)
+    Gitea::Repository::Commits::CompareService.call(@owner.login, @project.identifier, base, head)
   end
 end

app/controllers/composes_controller.rb

@@ -3,12 +3,13 @@ class ComposesController < ApplicationController
   before_action :find_compose, except: [:index, :new,:create]
 
   def index
+    @order_type = params[:order] || "created_at"
     @search_name = params[:search]
     composes = Compose.compose_includes
     if @search_name.present?
       composes = composes.where("title like ?", "%#{@search_name}%")
     end
-    composes = composes.order("#{order_type} desc")
+    composes = composes.order("#{@order_type} desc")
     @page  = params[:page]  || 1
     @limit = params[:limit] || 15
     @composes_size = composes.size
@@ -95,8 +96,4 @@ class ComposesController < ApplicationController
     end
   end
 
-  def order_type 
-    Compose.column_names.include?(params[:order_type]) ? params[:order_type] : 'created_at'
-  end
-
 end

app/controllers/concerns/acceleratorable.rb

@@ -1,36 +0,0 @@
-module Acceleratorable
-  extend ActiveSupport::Concern
-
-  def enable_accelerator?(clone_addr)
-    is_foreign_url?(clone_addr) && config_accelerator?
-  end
-  
-  def accelerator_url(repo_name)
-    [accelerator_domain, accelerator_username, "#{repo_name}.git"].join('/')
-  end
-
-  def github_domain
-    'github.com'
-  end
-
-  def gitlab_domain
-    'gitlab.com'
-  end
-
-  def accelerator_domain
-    Gitea.gitea_config[:accelerator]["domain"]
-  end
-
-  def accelerator_username
-    Gitea.gitea_config[:accelerator]["access_key_id"]
-  end
-  
-  def config_accelerator?
-    Gitea.gitea_config[:accelerator].present?
-  end
-  
-  def is_foreign_url?(clone_addr)
-    clone_addr.include?(github_domain) || clone_addr.include?(gitlab_domain)
-  end
-  
-end

app/controllers/concerns/laboratory_helper.rb

@@ -8,6 +8,9 @@ module LaboratoryHelper
     helper_method :default_setting
     helper_method :default_yun_session
     helper_method :default_course_links
+    helper_method :manager_main_site_url
+    helper_method :main_web_site_url
+    helper_method :current_main_site_url
   end
 
   def current_laboratory
@@ -32,18 +35,29 @@ module LaboratoryHelper
   end
 
   def default_course_links
-    # my_projects: "/users/#{current_user.try(:login)}/projects",
-    #       my_projects: "https://www.trustie.net/users/#{current_user.try(:login)}/user_projectlist",
+
     {
-      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://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"
+      # 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://www.trustie.net/users/#{current_user.try(:login)}/user_organizations",
+      # default_url: "https://www.trustie.net/",
+      tiding_url: "#{main_web_site_url}/users/#{current_user.try(:login)}/user_tidings",
+      register_url: "#{main_web_site_url}/user_join"
     }
   end
+
+  def manager_main_site_url
+    {name: '管理', link: "#{main_web_site_url}/managements"}
+  end
+
+  def main_web_site_url
+    EduSetting.get('host_main_site')
+  end
+
+  def current_main_site_url
+    EduSetting.get('host_name')
+  end
 end

app/controllers/concerns/login_helper.rb

@@ -6,14 +6,12 @@ module LoginHelper
   end
 
   def autologin_cookie_name
-    edu_setting('autologin_cookie_name').presence || 'autologin'
+    edu_setting('autologin_cookie_name').presence || 'autologin_forge_military'
   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)
-
-    Rails.logger.info "###### def set_autologin_cookie and get_or_create_permanent_login_token result: #{token&.value}"
+    Rails.logger.info("set_cookie_user_id is=======> #{user.id}")
+    token = Token.get_or_create_permanent_login_token(user, autologin_cookie_name)
     cookie_options = {
       :value => token.value,
       :expires => 1.month.from_now,

app/controllers/concerns/register_helper.rb

@@ -1,17 +1,16 @@
 module RegisterHelper
   extend ActiveSupport::Concern
 
-  def autologin_register(username, email, password, platform= 'forge', need_edit_info = false)
+  def autologin_register(username, email, password, platform= 'forge')
     result = {message: nil, user: nil}
+    email =  email.blank? ? "#{username}@example.org" : email
+
+    user = User.find_by(login: username)
+    user ||= User.new(admin: false, login: username, mail: email, type: "User")
 
-    user = User.new(admin: false, login: username, mail: email, type: "User")
     user.password = password
     user.platform = platform
-    if need_edit_info
-      user.need_edit_info
-    else 
-      user.activate
-    end
+    user.activate
     
     return unless user.valid?
 
@@ -22,7 +21,7 @@ module RegisterHelper
       user.gitea_token = result['sha1']
       user.gitea_uid = gitea_user[:body]['id']
       if user.save!
-        UserExtension.create!(user_id: user.id)
+        UserExtension.create!(user_id: user.id) if user.user_extension.blank?
         result[:user] = {id: user.id, token: user.gitea_token}
       end
     else
@@ -31,31 +30,4 @@ module RegisterHelper
     result
   end
 
-  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/repository/languages_percentagable.rb

@@ -14,6 +14,6 @@ module Repository::LanguagesPercentagable
     hash.transform_values { |v|
       ActionController::Base.helpers
         .number_to_percentage((v * 100.0 / total_byte_size), precision: 1)
-    }.select{|k,v| v != "0.0%"}
+    }
   end
 end

app/controllers/edu_settings_controller.rb

@@ -29,8 +29,10 @@ 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
@@ -41,8 +43,10 @@ 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
@@ -53,6 +57,7 @@ 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,6 +1,5 @@
 class ForksController < ApplicationController
   before_action :require_login
-  before_action :require_profile_completed, only: [:create]
   before_action :load_project
   before_action :authenticate_project!, :authenticate_user!
 

app/controllers/helps/faqs_controller.rb

@@ -1,8 +0,0 @@
-class Helps::FaqsController < ApplicationController
-  skip_before_action :check_sign, :user_setup
-
-  def index
-    faqs = Faq.select_without_id.order(updated_at: :desc)
-    render json: faqs.as_json(:except => [:id])
-  end
-end

app/controllers/issue_tags_controller.rb

@@ -7,7 +7,10 @@ class IssueTagsController < ApplicationController
 
 
   def index
-    issue_tags = @project.issue_tags.reorder("#{order_name} #{order_type}")
+    order_name = params[:order_name] || "created_at"
+    order_type = params[:order_type] || "desc"
+
+    issue_tags = @project.issue_tags.order("#{order_name} #{order_type}")
     @user_admin_or_member = current_user.present? && (current_user.admin || @project.member?(current_user))
     @page  = params[:page]  || 1
     @limit = params[:limit] || 15
@@ -135,14 +138,4 @@ class IssueTagsController < ApplicationController
     end
   end
 
-  private 
-
-  def order_name
-    IssueTag.column_names.include?(params[:order_name]) ? params[:order_name] : 'created_at'
-  end
-
-  def order_type 
-    %w(desc asc).include?(params[:order_type]) ? params[:order_type] : 'desc'
-  end
-
 end

app/controllers/issues_controller.rb

@@ -1,33 +1,25 @@
 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]
 
   include ApplicationHelper
   include TagChosenHelper
 
   def index
-    @user_admin_or_member = current_user.present? && current_user.logged? && (current_user.admin || @project.member?(current_user) || @project.is_public?)
+    @user_admin_or_member = current_user.present? && current_user.logged? && (current_user.admin || @project.member?(current_user))
     issues = @project.issues.issue_issue.issue_index_includes
     issues = issues.where(is_private: false) unless @user_admin_or_member
 
-    @all_issues = issues
-    @filter_issues = @all_issues
-    @filter_issues = @filter_issues.where.not(status_id: IssueStatus::CLOSED) if params[:status_type].to_i == IssueStatus::ADD
-    @filter_issues = @filter_issues.where(status_id: IssueStatus::CLOSED) if params[:status_type].to_i == IssueStatus::SOLVING
-    @filter_issues = @filter_issues.where("subject LIKE ? OR description LIKE ? ", "%#{params[:search]}%", "%#{params[:search]}%") if params[:search].present?
-    @open_issues = @all_issues.where.not(status_id: IssueStatus::CLOSED)
-    @close_issues = @all_issues.where(status_id: IssueStatus::CLOSED)
-    @assign_to_me = @filter_issues.where(assigned_to_id: current_user&.id)
-    @my_published = @filter_issues.where(author_id: current_user&.id)
+    @all_issues_size = issues.size
+    @open_issues_size = issues.where.not(status_id: 5).size
+    @close_issues_size = issues.where(status_id: 5).size
+    @assign_to_me_size = issues.where(assigned_to_id: current_user&.id).size
+    @my_published_size = issues.where(author_id: current_user&.id).size
     scopes = Issues::ListQueryService.call(issues,params.delete_if{|k,v| v.blank?}, "Issue")
     @issues_size = scopes.size
     @issues = paginate(scopes)
@@ -103,18 +95,76 @@ class IssuesController < ApplicationController
   end
 
   def new
-    @issue_chosen = get_associated_data(@project)
+    # @all_branches = get_branches
+    @issue_chosen = issue_left_chosen(@project, nil)
   end
 
   def create
-    issue_params = issue_send_params(params)
-    Issues::CreateForm.new({subject:issue_params[:subject]}).validate!
-    @issue = Issue.new(issue_params)
-    if @issue.save!
-      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|
+    if params[:subject].blank?
+      normal_status(-1, "标题不能为空")
+    elsif params[:subject].to_s.size > 255
+      normal_status(-1, "标题不能超过255个字符")
+    else
+      issue_params = issue_send_params(params)
+
+      @issue = Issue.new(issue_params)
+      if @issue.save!
+        if params[:attachment_ids].present?
+          params[:attachment_ids].each do |id|
+            attachment = Attachment.select(:id, :container_id, :container_type)&.find_by_id(id)
+            unless attachment.blank?
+              attachment.container = @issue
+              attachment.author_id = current_user.id
+              attachment.description = ""
+              attachment.save
+            end
+          end
+        end
+        if params[:issue_tag_ids].present?
+          params[:issue_tag_ids].each do |tag|
+            IssueTagsRelate.create!(issue_id: @issue.id, issue_tag_id: tag)
+          end
+        end
+        if params[:assigned_to_id].present?
+          Tiding.create!(user_id: params[:assigned_to_id], trigger_user_id: current_user.id,
+                         container_id: @issue.id, container_type: 'Issue',
+                         parent_container_id: @project.id, parent_container_type: "Project",
+                         tiding_type: 'issue', status: 0)
+        end
+
+        @issue.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "create")
+        render json: {status: 0, message: "创建成", id: @issue.id}
+      else
+        normal_status(-1, @issue.errors.messages.values[0][0])
+      end
+
+    end
+
+  end
+
+  def edit
+    # @issue_chosen = issue_left_chosen(@project, @issue.id)
+    @issue_attachments = @issue.attachments
+  end
+
+  def update
+    issue_params = issue_send_params(params).except(:issue_classify, :author_id, :project_id)
+    return normal_status(-1, "您没有权限修改token") if @issue.will_save_change_to_token? && @issue.user_id != current_user&.id
+    if params[:issue_tag_ids].present? && !@issue&.issue_tags_relates.where(issue_tag_id: params[:issue_tag_ids]).exists?
+      @issue&.issue_tags_relates&.destroy_all
+      params[:issue_tag_ids].each do |tag|
+        IssueTagsRelate.create(issue_id: @issue.id, issue_tag_id: tag)
+      end
+    end
+
+    if @issue.update_attributes(issue_params)
+      issue_files = params[:attachment_ids]
+      change_files = false
+      issue_file_ids = []
+
+      if issue_files.present?
+        change_files = true
+        issue_files.each do |id|
           attachment = Attachment.select(:id, :container_id, :container_type)&.find_by_id(id)
           unless attachment.blank?
             attachment.container = @issue
@@ -124,66 +174,6 @@ class IssuesController < ApplicationController
           end
         end
       end
-      if params[:issue_tag_ids].present?
-        params[:issue_tag_ids].each do |tag|
-          IssueTagsRelate.create!(issue_id: @issue.id, issue_tag_id: tag)
-        end
-      end
-      if params[:assigned_to_id].present?
-        Tiding.create!(user_id: params[:assigned_to_id], trigger_user_id: current_user.id,
-                       container_id: @issue.id, container_type: 'Issue',
-                       parent_container_id: @project.id, parent_container_type: "Project",
-                       tiding_type: 'issue', status: 0)
-      end
-
-      #为悬赏任务时, 扣除当前用户的积分
-      if params[:issue_type].to_s == "2"
-        post_to_chain("minus", params[:token].to_i, current_user.try(:login))
-      end
-
-      @issue.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "create")
-      render json: {status: 0, message: "创建成", id: @issue.id}
-    else
-      normal_status(-1, "创建失败")
-    end
-  rescue Exception => exception
-    puts exception.message
-    normal_status(-1, exception.message)
-  end
-
-  def edit
-    # @issue_chosen = issue_left_chosen(@project, @issue.id)
-    @cannot_edit_tags = @issue.issue_type=="2" && @issue.status_id == 5  #悬赏任务已解决且关闭的状态下，不能修改
-    @issue_attachments = @issue.attachments
-  end
-
-  def update
-    last_token = @issue.token
-    last_status_id = @issue.status_id
-    @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
-    end
-
-    issue_files = params[:attachment_ids]
-    change_files = false
-    issue_file_ids = []
-
-    if issue_files.present?
-      change_files = true
-      issue_files.each do |id|
-        attachment = Attachment.select(:id, :container_id, :container_type)&.find_by_id(id)
-        unless attachment.blank?
-          attachment.container = @issue
-          attachment.author_id = current_user.id
-          attachment.description = ""
-          attachment.save
-        end
-      end
-    end
 
       # if params[:issue_tag_ids].present?
       #   issue_current_tags = @issue&.issue_tags&.select(:id)&.pluck(:id)
@@ -199,63 +189,20 @@ class IssuesController < ApplicationController
       #   end
       # end
 
-    if @issue.issue_type.to_s == "2" &&  params[:status_id].to_i == 5 && @issue.author_id != current_user.try(:id)
-      normal_status(-1, "不允许修改为关闭状态")
-    else
-      issue_params = issue_send_params(params).except(:issue_classify, :author_id, :project_id)
-      Issues::UpdateForm.new({subject:issue_params[:subject]}).validate!
-      if @issue.update_attributes(issue_params)
-        if @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!
-          if @issue.issue_type.to_s == "2" && last_status_id != 5
-            if @issue.assigned_to_id.present? && last_status_id == 3 #只有当用户完成100%时，才给token
-              post_to_chain("add", @issue.token, @issue.get_assign_user.try(:login))
-            else
-              post_to_chain("add", @issue.token, @issue.user.try(:login))
-            end
-          end
-        end
-
-        if @issue.issue_type.to_s == "2" && @issue.status_id != 5 && @issue.saved_change_to_attribute("token")
-          #表示修改token值
-          change_token = last_token - @issue.token
-          change_type = change_token > 0 ? "add" : "minus"
-          post_to_chain(change_type, change_token.abs, current_user.try(:login))
-        end
-        @issue.create_journal_detail(change_files, issue_files, issue_file_ids, current_user&.id) if @issue.previous_changes.present? 
-        normal_status(0, "更新成功")
-      else
-        normal_status(-1, "更新失败")
+      if params[:status_id].to_i == 5
+        @issue.issue_times.update_all(end_time: Time.now)
+        #@issue.update_closed_issues_count_in_project!
       end
+
+      @issue.create_journal_detail(change_files, issue_files, issue_file_ids, current_user&.id)
+      normal_status(0, "更新成功")
+    else
+      normal_status(-1, @issue.errors.messages.values[0][0])
     end
-  rescue Exception => exception
-    puts exception.message
-    normal_status(-1, exception.message)
   end
 
   def show
-    @user_permission = current_user.present? && current_user.logged? && (@project.member?(current_user) || current_user.admin? || @issue.user == current_user)
+    @user_permission = current_user.present? && current_user.logged? && (!@issue.is_lock || @project.member?(current_user) || current_user.admin? || @issue.user == current_user)
     @issue_attachments = @issue.attachments
     @issue_user = @issue.user
     @issue_assign_to = @issue.get_assign_user
@@ -271,37 +218,17 @@ class IssuesController < ApplicationController
   end
 
   def destroy
-    begin
-      issue_type = @issue.issue_type
-      status_id = @issue.status_id
-      token = @issue.token
-      login =  @issue.user.try(:login)
-      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)
-        end
-        normal_status(0, "删除成功")
-      else
-        normal_status(-1, "删除失败")
-      end
-    rescue => exception
-      Rails.logger.info("#########_______exception.message_________##########{exception.message}")
-      normal_status(-1, "删除失败")
+    if @issue.destroy
+      normal_status(0, "删除成功")
     else
+      normal_status(-1, "删除失败")
     end
-
   end
 
   def clean
-    #批量删除，暂时只能删除未悬赏的
     issue_ids = params[:ids]
-    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
+    if issue_ids.present?
+      if Issue.where(id: issue_ids).destroy_all
         normal_status(0, "删除成功")
       else
         normal_status(-1, "删除失败")
@@ -331,28 +258,9 @@ 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 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
+      elsif Issue.where(id: issue_ids).update_all(update_hash)
         normal_status(0, "批量更新成功")
       else
         normal_status(-1, "批量更新失败")
@@ -364,10 +272,7 @@ class IssuesController < ApplicationController
 
   def copy
     @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|
@@ -445,29 +350,25 @@ class IssuesController < ApplicationController
 
   def check_project_public
     unless @project.is_public || @project.member?(current_user) || current_user.admin? || (@project.user_id == current_user.id)
-      return render_forbidden
+      normal_status(-1, "您没有权限")
     end
   end
 
   def set_issue
     @issue = Issue.find_by_id(params[:id])
     if @issue.blank?
-      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
+      normal_status(-1, "标签不存在")
+    elsif @issue.is_lock &&!(@project.member?(current_user) || current_user.admin?)
+      normal_status(-1, "您没有权限")
     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)))
-      return render_forbidden
+      normal_status(-1, "您没有权限")
     end
   end
 
-  def operate_issue_permission
-    return render_forbidden("您没有权限进行此操作.") unless current_user.present? && current_user.logged? && (current_user.admin? || @project.member?(current_user) || @project.is_public?)
-  end
-
   def export_issues(issues)
     @table_columns = %w(ID 类型 标题	描述	状态	指派给	优先级 标签 发布人 创建时间 里程碑 开始时间 截止时间 完成度 分类 金额 属于)
     @export_issues = []
@@ -519,36 +420,4 @@ class IssuesController < ApplicationController
         project_id: @project.id
       }
   end
-
-  def post_to_chain(type, amount,login)
-    change_params = {
-      type: type,
-      chain_params: {
-        amount: amount,
-        reponame: @project.try(:identifier),
-        username: login
-      }
-    }
-    PostChainJob.perform_later(change_params)
-  end
-
-  def check_token_enough
-    if params[:issue_type].to_s == "2" && (@issue.blank? || (@issue.present? && @issue.author_id == current_user.try(:id)))
-      return normal_status(-1, "悬赏的奖金必须大于0") if params[:token].to_i == 0
-      query_params = {
-        type: "query",
-        chain_params: {
-          reponame: @project.try(:identifier),
-          username: current_user.try(:login)
-        }
-      }
-      response = Gitea::Chain::ChainGetService.new(query_params).call
-      return normal_status(-1, "获取token失败，请稍后重试") if response.status != 200
-      return normal_status(-1, "您的token值不足") if JSON.parse(response.body)["balance"].to_i < params[:token].to_i
-    end
-  end
-
-  def check_menu_authorize
-    return render_not_found unless @project.has_menu_permission("issues")
-  end
 end

app/controllers/journals_controller.rb

@@ -1,6 +1,5 @@
 class JournalsController < ApplicationController
   before_action :require_login, except: [:index, :get_children_journals]
-  before_action :require_profile_completed, only: [:create]
   before_action :set_issue
   before_action :check_issue_permission
   before_action :set_journal, only: [:destroy, :edit, :update]
@@ -47,7 +46,7 @@ class JournalsController < ApplicationController
         render :json => { status: 0, message: "评论成功", id:  journal.id}
         # normal_status(0, "评论成功")
       else
-        normal_status(-1, "评论失败")
+        normal_status(-1, journal.errors.messages.values[0][0])
       end
     end
   end
@@ -71,7 +70,7 @@ class JournalsController < ApplicationController
       if @journal.update_attribute(:notes, content)
         normal_status(0, "更新成功")
       else
-        normal_status(-1, "更新失败")
+        normal_status(-1, @journal.errors.messages.values[0][0])
       end
     else
       normal_status(-1, "评论的内容不能为空")

app/controllers/main_controller.rb

@@ -23,9 +23,9 @@ class MainController < ApplicationController
 
     # TODO: 这块之后需要整合，者架构重新变化，统一跳转到index后再路由分发
     if params[:path] && params[:path]&.include?("h5educoderbuild") && params[:path].split("/").first == "h5educoderbuild"
-      render file: 'public/h5educoderbuild/index.html', :layout => false, :content_type=> 'text/html'
+      render file: 'public/h5educoderbuild/index.html', :layout => false
     else
-      render file: 'public/react/build/index.html', :layout => false, :content_type=> 'text/html'
+      render file: 'public/react/build/index.html', :layout => false
     end
 
   end

app/controllers/members_controller.rb

@@ -2,15 +2,12 @@ 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 :check_user_profile_completed, only: [:create]
   before_action :operate!, except: %i[index]
   before_action :check_member_exists!, only: %i[create]
   before_action :check_member_not_exists!, only: %i[remove change_role]
 
   def create
     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)
@@ -21,7 +18,7 @@ class MembersController < ApplicationController
     scope = @project.members.includes(:roles, user: :user_extension)
     search = params[:search].to_s.downcase
     role = params[:role].to_s
-    scope = scope.joins(:user).merge(User.like(search))
+    scope = scope.joins(:user).where("LOWER(CONCAT_WS(users.lastname, users.firstname, users.login, users.mail, users.nickname)) LIKE ?", "%#{search.split(" ").join('|')}%") if search.present?
     scope = scope.joins(:roles).where("roles.name LIKE ?", "%#{role}%") if role.present?
 
     @total_count = scope.size
@@ -30,8 +27,6 @@ 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)
@@ -40,7 +35,6 @@ 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)
@@ -53,7 +47,7 @@ class MembersController < ApplicationController
   end
 
   def member_exists?
-    @project.members.exists?(user_id: params[:user_id])
+    @project.member?(params[:user_id])
   end
 
   def operate!
@@ -61,24 +55,10 @@ class MembersController < ApplicationController
   end
 
   def check_member_exists!
-    return render_error("user_id为#{params[:user_id]}的用户已经是项目成员") if member_exists?
+    return render_result(1, "user_id为#{params[:user_id]}的用户已经是项目成员") if member_exists?
   end
 
   def check_member_not_exists!
-    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
+    return render_result(1, "user_id为#{params[:user_id]}的用户还不是项目成员") unless member_exists?
   end
 end

app/controllers/oauth/base_controller.rb

@@ -2,7 +2,6 @@ class Oauth::BaseController < ActionController::Base
   include RenderHelper
   include LoginHelper
   include ControllerRescueHandler
-  include LoggerHelper
   # include LaboratoryHelper
 
   skip_before_action :verify_authenticity_token
@@ -12,18 +11,6 @@ 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]
@@ -61,13 +48,4 @@ 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,6 +1,4 @@
 class Oauth::EducoderController < Oauth::BaseController
-  include RegisterHelper
-
   def bind
     begin
       login = params[:login]
@@ -10,7 +8,7 @@ class Oauth::EducoderController < Oauth::BaseController
 
       ::OauthEducoderForm.new({login: login, token: token, callback_url: callback_url}).validate!
 
-      open_user= OpenUsers::Educoder.find_by(uid: login) || OpenUsers::Educoder.find_by(uid: mail)
+      open_user= OpenUsers::Educoder.find_by(uid: login)
 
       if open_user.present? && open_user.user.present? && open_user.user.email_binded?
         Rails.logger.info "######## open_user exist and open_user.user exsit and email is binded ok"
@@ -34,41 +32,4 @@ 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,7 +61,6 @@ class OauthController < ApplicationController
     login = params[:login]
     email = params[:mail]
     password = params[:password]
-    lastname = params[:lastname]
     callback_url =  params[:callback_url]
     platform = params[:plathform] || 'educoder'
 
@@ -73,11 +72,8 @@ class OauthController < ApplicationController
       if result[:message].blank?
         logger.info "[Oauth educoer] ====auto_register success"
         user = User.find result[:user][:id]
-        user.update_column(:lastname, params[:lastname])
-        autosync_register_trustie(login, password, email, lastname)
-        
-        OpenUsers::Educoder.create!(user: user, uid: user.login)
         successful_authentication(user)
+        OpenUsers::Educoder.create!(user: user, uid: user.login)
 
         render json: { callback_url: callback_url }
         # redirect_to callback_url

app/controllers/organizations/base_controller.rb

@@ -17,12 +17,11 @@ class Organizations::BaseController < ApplicationController
   end
 
   def org_privacy_condition
-    return false if current_user.admin?
     @organization.organization_extension.privacy? && @organization.organization_users.where(user_id: current_user.id).blank?
   end
 
   def team_not_found_condition
-    !current_user&.admin? && @team.team_users.where(user_id: current_user.id).blank? && !@organization.is_owner?(current_user.id)
+    @team.team_users.where(user_id: current_user.id).blank? && !@organization.is_owner?(current_user.id)
   end
 
   def user_mark
@@ -32,4 +31,4 @@ class Organizations::BaseController < ApplicationController
   def project_mark
     params[:repo_name] || params[:id]
   end
-end
+end

app/controllers/organizations/organization_users_controller.rb

@@ -5,7 +5,7 @@ class Organizations::OrganizationUsersController < Organizations::BaseController
   def index
     @organization_users = @organization.organization_users.includes(:user)
     search = params[:search].to_s.downcase
-    @organization_users = @organization_users.joins(:user).merge(User.like(search))
+    @organization_users = @organization_users.joins(:user).where("LOWER(CONCAT_WS(users.lastname, users.firstname, users.login, users.mail)) LIKE ?", "%#{search.split(" ").join('|')}%") if search.present?
 
     @organization_users = kaminari_paginate(@organization_users)
   end

app/controllers/organizations/organizations_controller.rb

@@ -1,6 +1,5 @@
 class Organizations::OrganizationsController < Organizations::BaseController
-  before_action :require_login, except: [:index, :show, :recommend]
-  before_action :require_profile_completed, only: [:create]
+  before_action :require_login, except: [:index, :show]
   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]
@@ -26,8 +25,6 @@ class Organizations::OrganizationsController < Organizations::BaseController
 
   def create
     ActiveRecord::Base.transaction do
-      tip_exception("无法使用以下关键词：#{organization_params[:name]}，请重新命名") if ReversedKeyword.is_reversed(organization_params[:name]).present?
-      Organizations::CreateForm.new(organization_params).validate!
       @organization = Organizations::CreateService.call(current_user, organization_params)
       Util.write_file(@image, avatar_path(@organization)) if params[:image].present?
     end
@@ -38,13 +35,9 @@ class Organizations::OrganizationsController < Organizations::BaseController
 
   def update
     ActiveRecord::Base.transaction do
-      Organizations::CreateForm.new(organization_params).validate!
       login = @organization.login
-      @organization.login = organization_params[:name] if organization_params[:name].present?
-      @organization.nickname = organization_params[:nickname] if organization_params[:nickname].present?
-      @organization.save!
-      sync_organization_extension!
-      
+      @organization.update!(login: organization_params[:name]) if organization_params[:name].present?
+      @organization.organization_extension.update_attributes!(organization_params.except(:name))
       Gitea::Organization::UpdateService.call(@organization.gitea_token, login, @organization.reload)
       Util.write_file(@image, avatar_path(@organization)) if params[:image].present?
     end
@@ -65,19 +58,31 @@ class Organizations::OrganizationsController < Organizations::BaseController
     tip_exception(e.message)
   end
 
-  def recommend
-    recommend = %W(xuos Huawei_Technology openatom_foundation pkecosystem TensorLayer)
-    
-    @organizations = Organization.with_visibility(%w(common))
-      .where(login: recommend).select(:id, :login, :firstname, :lastname, :nickname)
+  private
+  def convert_image!
+    return unless params[:image].present?
+    max_size = EduSetting.get('upload_avatar_max_size') || 2 * 1024 * 1024 # 2M
+    if params[:image].class == ActionDispatch::Http::UploadedFile
+      @image = params[:image]
+      render_error('请上传文件') if @image.size.zero?
+      render_error('文件大小超过限制') if @image.size > max_size.to_i
+    else
+      image = params[:image].to_s.strip
+      return render_error('请上传正确的图片') if image.blank?
+      @image = Util.convert_base64_image(image, max_size: max_size.to_i)
+    end
+  rescue Base64ImageConverter::Error => ex
+    render_error(ex.message)
   end
 
-  private
+  def avatar_path(organization)
+    ApplicationController.helpers.disk_filename(organization.class, organization.id)
+  end
 
   def organization_params
     params.permit(:name, :description, :website, :location,
                   :repo_admin_change_team_access, :visibility,
-                  :max_repo_creation, :nickname)
+                  :max_repo_creation)
   end
 
   def password
@@ -91,25 +96,11 @@ class Organizations::OrganizationsController < Organizations::BaseController
   end
 
   def sort_by
-    OrganizationExtension.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'created_at'
+    params.fetch(:sort_by, "created_at")
   end
 
   def sort_direction
-    %w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : 'desc'
+    params.fetch(: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/projects_controller.rb

@@ -36,10 +36,10 @@ class Organizations::ProjectsController < Organizations::BaseController
   end
 
   def sort
-    Project.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'updated_on'
+    params.fetch(:sort_by, "updated_on")
   end
 
   def sort_direction
-    %w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : 'desc'
+    params.fetch(:sort_direction, "desc")
   end
 end

app/controllers/organizations/team_users_controller.rb

@@ -1,7 +1,6 @@
 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]
 
@@ -9,7 +8,7 @@ class Organizations::TeamUsersController < Organizations::BaseController
     @team_users = @team.team_users.includes(:user)
 
     search = params[:search].to_s.downcase
-    @team_users = @team_users.joins(:user).merge(User.like(search))
+    @team_users = @team_users.joins(:user).where("LOWER(CONCAT_WS(users.lastname, users.firstname, users.login, users.mail, users.nickname)) LIKE ?", "%#{search.split(" ").join('|')}%") if search.present?
 
     @team_users = kaminari_paginate(@team_users)
   end
@@ -18,7 +17,6 @@ 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('OrganizationRole', @operate_user.id, @organization.id, @team.authorize_name) if Site.has_notice_menu?
       Gitea::Organization::TeamUser::CreateService.call(@organization.gitea_token, @team.gtid, @operate_user.login)
     end
   rescue Exception => e
@@ -31,11 +29,6 @@ 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)
-      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
@@ -50,11 +43,6 @@ 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
@@ -85,8 +73,4 @@ 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

@@ -33,17 +33,13 @@ class Organizations::TeamsController < Organizations::BaseController
   end
 
   def create
-    ActiveRecord::Base.transaction do
-      Organizations::CreateTeamForm.new(team_params).validate!
-      @team = Organizations::Teams::CreateService.call(current_user, @organization, team_params)
-    end
+    @team = Organizations::Teams::CreateService.call(current_user, @organization, team_params)
   rescue Exception => e
     uid_logger_error(e.message)
     tip_exception(e.message)
   end
 
   def update
-    Organizations::CreateTeamForm.new(team_params).validate!
     @team = Organizations::Teams::UpdateService.call(current_user, @team, team_params)
   rescue Exception => e
     uid_logger_error(e.message)
@@ -64,7 +60,7 @@ class Organizations::TeamsController < Organizations::BaseController
 
   private
   def team_params
-    params.permit(:name, :nickname, :description, :authorize, :includes_all_project, :can_create_org_project, :unit_types => [])
+    params.permit(:name, :description, :authorize, :includes_all_project, :can_create_org_project, :unit_types => [])
   end
 
   def load_organization

app/controllers/owners_controller.rb

@@ -1,5 +1,5 @@
 class OwnersController < ApplicationController
-  before_action :require_login, only: [:index]
+  before_action :require_login
 
   def index
     @owners = []
@@ -9,53 +9,4 @@ class OwnersController < ApplicationController
                           teams: {can_create_org_project: true})
                    .distinct
   end
-
-  def show 
-    @owner = Owner.find_by(login: params[:id]) || Owner.find_by(id: params[:id])
-    return render_not_found 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)
-    # 用户
-    else 
-      #待办事项，现在未做
-      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
-      puts @owner.as_json
-    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
+end

app/controllers/praise_tread_controller.rb

@@ -1,6 +1,5 @@
 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

@@ -7,7 +7,5 @@ class ProjectCategoriesController < ApplicationController
 
   def group_list
     @project_categories = ProjectCategory.where('projects_count > 0').order(projects_count: :desc)
-    # projects = Project.no_anomory_projects.visible
-    # @category_group_list = projects.joins(:project_category).group("project_categories.id", "project_categories.name").size
   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.preload(:user, trend: :user)
+    project_trends = @project.project_trends.includes(:user, trend: :user)
 
     check_time = params[:time]  #时间的筛选
     check_type = params[:type]   #动态类型的筛选，目前已知的有 Issue, PullRequest, Version
@@ -14,25 +14,20 @@ 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_trends.where(trend_type: "Issue", action_type: "create").size
-    @project_open_issues_count = @project_issues_count - @project_close_issues_count
+    @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_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?
-      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")
+      project_trends = project_trends.where(action_type: check_status.to_s.strip)
     end
     project_trends = project_trends.order("created_at desc")
 

app/controllers/projects/applied_transfer_projects_controller.rb

@@ -1,33 +0,0 @@
-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)})
-  end
-
-  def create 
-    @applied_transfer_project = Projects::ApplyTransferService.call(current_user, @project, params)
-  rescue Exception => e
-    uid_logger_error(e.message)
-    tip_exception(e.message)
-  end
-
-  def cancel 
-    @applied_transfer_project = Projects::CancelTransferService.call(current_user, @project)
-  rescue Exception => e
-    uid_logger_error(e.message)
-    tip_exception(e.message)
-  end
-
-  private 
-  def check_auth 
-    return render_forbidden unless current_user.admin? ||@project.owner?(current_user)
-  end
-
-  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,7 +4,4 @@ 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/project_applies_controller.rb

@@ -1,5 +1,4 @@
 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

@@ -1,25 +0,0 @@
-class Projects::ProjectUnitsController < Projects::BaseController
-  def index 
-    @project_units = @project.project_units
-  end
-
-  def create 
-    if current_user.admin? || @project.manager?(current_user)
-      ActiveRecord::Base.transaction do 
-        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 
-      render_forbidden('你没有权限操作')
-    end
-  rescue Exception => e
-    uid_logger_error(e.message)
-    tip_exception(e.message)
-  end
-
-  private 
-  def unit_types
-    params.fetch(:unit_types, [])
-  end
-end

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(current_user.gitea_token, @operate_team.gtid, @owner.login, @project.identifier)
+      Gitea::Organization::TeamProject::CreateService.call(@owner.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(current_user.gitea_token, @operate_team.gtid, @owner.login, @project.identifier)
+      Gitea::Organization::TeamProject::DeleteService.call(@owner.gitea_token, @operate_team.gtid, @owner.login, @project.identifier)
       render_ok
     end
   rescue Exception => e

app/controllers/projects/webhooks_controller.rb

@@ -1,116 +0,0 @@
-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

@@ -2,39 +2,19 @@ class ProjectsController < ApplicationController
   include ApplicationHelper
   include OperateProjectAbilityAble
   include ProjectsHelper
-  include Acceleratorable
-
-  before_action :require_login, except: %i[index branches branches_slice group_type_list simple show fork_users praise_users watch_users 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]
+  before_action :require_login, except: %i[index branches group_type_list simple show fork_users praise_users watch_users recommend about]
+  before_action :load_project, except: %i[index group_type_list migrate create recommend]
   before_action :authorizate_user_can_edit_project!, only: %i[update]
   before_action :project_public?, only: %i[fork_users praise_users watch_users]
 
-  def menu_list
-    menu = []
-
-    menu.append(menu_hash_by_name("home"))
-    menu.append(menu_hash_by_name("code")) if @project.has_menu_permission("code")
-    menu.append(menu_hash_by_name("issues")) if @project.has_menu_permission("issues")
-    menu.append(menu_hash_by_name("pulls")) if @project.has_menu_permission("pulls")
-    menu.append(menu_hash_by_name("wiki")) if @project.has_menu_permission("wiki")
-    menu.append(menu_hash_by_name("devops")) if @project.has_menu_permission("devops")
-    menu.append(menu_hash_by_name("versions")) if @project.has_menu_permission("versions")
-    menu.append(menu_hash_by_name("resources")) if @project.has_menu_permission("resources")
-    menu.append(menu_hash_by_name("activity"))
-    menu.append(menu_hash_by_name("settings")) if current_user.admin? || @project.manager?(current_user)
-
-    render json: menu
-  end
-
   def index
-    scope = current_user.logged? ? Projects::ListQuery.call(params, current_user.id) : Projects::ListQuery.call(params)
+    scope = 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, :apply_signatures, :members, :owner)
 
     category_id = params[:category_id]
-    @total_count =
+    @total_count = @projects.total_count
       if category_id.blank?
         ps = ProjectStatistic.first
         ps.common_projects_count + ps.mirror_projects_count unless ps.blank?
@@ -57,95 +37,41 @@ class ProjectsController < ApplicationController
 
   def migrate
     Projects::MigrateForm.new(mirror_params).validate!
-
-    @project = 
-      if enable_accelerator?(mirror_params[:clone_addr])
-        source_clone_url = mirror_params[:clone_addr]
-        uid_logger("########## 已动加速器 ##########")
-        result = Gitea::Accelerator::MigrateService.call(mirror_params)
-        if result[:status] == :success
-          Rails.logger.info "########## 加速镜像成功 ########## "
-          Projects::MigrateService.call(current_user, 
-            mirror_params.merge(source_clone_url: source_clone_url, 
-              clone_addr: accelerator_url(mirror_params[:repository_name])))
-        else
-          Projects::MigrateService.call(current_user, mirror_params)
-        end
-      else
-        Projects::MigrateService.call(current_user, mirror_params)
-      end
+    @project = Projects::MigrateService.new(current_user, mirror_params).call
   rescue Exception => e
     uid_logger_error(e.message)
     tip_exception(e.message)
   end
 
   def branches
-    return @branches = [] unless @project.forge?
-
-    result = Gitea::Repository::Branches::ListService.call(@owner, @project.identifier)
-    @branches =  result.is_a?(Hash) && result.key?(:status) ? [] : result
-  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
+    @branches = @project.forge? ? Gitea::Repository::Branches::ListService.new(@owner, @project.identifier).call : []
   end
 
   def group_type_list
-    project_statics = ProjectStatistic.first
-
-    @project_statics_list = [
-      {
-        project_type: 'common',
-        name: '开源托管项目',
-        projects_count: project_statics&.common_projects_count || 0
-      },
-      {
-        project_type: 'mirror',
-        name: '开源镜像项目',
-        projects_count: project_statics&.mirror_projects_count || 0
-      }
-    ]
-
-    # projects = Project.no_anomory_projects.visible
-    # @project_group_list = projects.group(:project_type).size
+    # if current_user&.logged?
+    #   projects = Project.list_user_projects(current_user.id)
+    # else
+    #   projects = Project.visible
+    # end
+    projects = Project.no_anomory_projects.secret_and_visible
+    language_lists = projects.joins(:project_language).group("project_languages.name", "project_languages.id").size.keys.sort.to_h
+    @project_group_list = language_lists.delete_if { |k, v| k.blank? }
   end
 
   def update
     ActiveRecord::Base.transaction do
-      # TODO:
-      # 临时特殊处理修改website、lesson_url操作方法
-      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, :identifier)
-  
-        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
-
+      # Projects::CreateForm.new(project_params).validate!
+      private = params[:private]
+      gitea_params = {
+        private: private,
+        default_branch: params[:default_branch]
+      }
+      if [true, false].include? private
         new_project_params = project_params.except(:private).merge(is_public: !private)
-        @project.update_attributes!(new_project_params)
-        @project.forked_projects.update_all(is_public: @project.is_public)
-        gitea_params = {
-          private: private,
-          default_branch: @project.default_branch,
-          website: @project.website,
-          name: @project.identifier
-        }
-        gitea_repo = Gitea::Repository::UpdateService.call(@owner, @project&.repository&.identifier, gitea_params)
-        @project.repository.update_attributes({hidden: gitea_repo["private"], identifier: gitea_repo["name"]})
+        Gitea::Repository::UpdateService.call(@owner, @project.identifier, gitea_params)
+        @project.repository.update_column(:hidden, private)
       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?
+      @project.update_attributes!(new_project_params)
     end
   rescue Exception => e
     uid_logger_error(e.message)
@@ -156,11 +82,10 @@ class ProjectsController < ApplicationController
   end
 
   def destroy
-    if current_user.admin? || @project.manager?(current_user)
+    if  current_user.admin? ||  @project.owner?(current_user)
       ActiveRecord::Base.transaction do
         Gitea::Repository::DeleteService.new(@project.owner, @project.identifier).call
         @project.destroy!
-        @project.forked_projects.update_all(forked_from_project_id: nil)
         render_ok
       end
     else
@@ -194,7 +119,7 @@ class ProjectsController < ApplicationController
   end
 
   def recommend
-    @projects = Project.recommend.includes(:repository, :project_category, :owner).order(visits: :desc)
+    @projects = Project.recommend.includes(:repository, :project_category, :owner).limit(5)
   end
 
   def about
@@ -213,7 +138,6 @@ class ProjectsController < ApplicationController
         end
         if @project_detail.save!
           attachment_ids = Array(params[:attachment_ids])
-          logger.info "=============> #{Array(params[:attachment_ids])}"
           @attachments =  Attachment.where(id: attachment_ids)
           @attachments.update_all(
             container_id: @project_detail.id,
@@ -228,7 +152,7 @@ class ProjectsController < ApplicationController
 
   private
   def project_params
-    params.permit(:user_id, :name, :description, :repository_name, :website, :lesson_url, :default_branch, :identifier,
+    params.permit(:user_id, :name, :description, :repository_name,
                   :project_category_id, :project_language_id, :license_id, :ignore_id, :private)
   end
 

app/controllers/public_keys_controller.rb

@@ -1,64 +0,0 @@
-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,8 +1,6 @@
 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]
   include TagChosenHelper
@@ -13,14 +11,11 @@ class PullRequestsController < ApplicationController
     # @issues = Gitea::PullRequest::ListService.new(@user,@repository.try(:identifier)).call   #通过gitea获取
     issues = @project.issues.issue_pull_request.issue_index_includes.includes(pull_request: :user)
     issues = issues.where(is_private: false) unless current_user.present? && (current_user.admin? || @project.member?(current_user))
-    @all_issues = issues.distinct
-    @filter_issues = @all_issues
-    @filter_issues = @filter_issues.where("subject LIKE ? OR description LIKE ? ", "%#{params[:search]}%", "%#{params[:search]}%") if params[:search].present?
-    @open_issues = @filter_issues.joins(:pull_request).where(pull_requests: {status: PullRequest::OPEN})
-    @close_issues = @filter_issues.joins(:pull_request).where(pull_requests: {status: PullRequest::CLOSED})
-    @merged_issues = @filter_issues.joins(:pull_request).where(pull_requests: {status: PullRequest::MERGED})
+    @all_issues_size = issues.size
+    @open_issues_size = issues.joins(:pull_request).where(pull_requests: {status: 0}).size
+    @close_issues_size = issues.joins(:pull_request).where(pull_requests: {status: 2}).size
+    @merged_issues_size = issues.joins(:pull_request).where(pull_requests: {status: 1}).size
     @user_admin_or_member = current_user.present? && (current_user.admin || @project.member?(current_user))
-    @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
@@ -58,9 +53,8 @@ class PullRequestsController < ApplicationController
     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"])
-        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?
+        @pull_request.bind_gitea_pull_request!(@gitea_pull_request[:body]["number"])
+        render_ok
       else
         render_error("create pull request error: #{@gitea_pull_request[:status]}")
         raise ActiveRecord::Rollback
@@ -69,22 +63,21 @@ class PullRequestsController < ApplicationController
   end
 
   def edit
-    @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)
+    @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)
   end
 
   def update
     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
           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|
@@ -95,7 +88,7 @@ class PullRequestsController < ApplicationController
           if @issue.update_attributes(@issue_params)
             if @pull_request.update_attributes(@local_params.compact)
               gitea_pull = Gitea::PullRequest::UpdateService.call(@owner.login, @repository.identifier,
-                  @pull_request.gitea_number, @requests_params, current_user.gitea_token)
+                  @pull_request.gpid, @requests_params, current_user.gitea_token)
 
               if gitea_pull[:status] === :success
                 if params[:issue_tag_ids].present?
@@ -111,15 +104,15 @@ class PullRequestsController < ApplicationController
                 normal_status(-1, "PullRequest更新失败")
               end
             else
-              normal_status(-1, "PullRequest更新失败")
+              normal_status(-1, @pull_request.errors.messages.values[0][0])
             end
+          else
+            normal_status(-1, @issue.errors.messages.values[0][0])
           end
         rescue => e
           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
 
@@ -129,13 +122,7 @@ class PullRequestsController < ApplicationController
     ActiveRecord::Base.transaction do
       begin
         colsed = PullRequests::CloseService.call(@owner, @repository, @pull_request, current_user)
-        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
+        colsed === true ? normal_status(1, "已拒绝") : normal_status(-1, '合并失败')
       rescue => e
         normal_status(-1, e.message)
         raise ActiveRecord::Rollback
@@ -150,35 +137,25 @@ class PullRequestsController < ApplicationController
   def show
     @issue_user = @issue.user
     @issue_assign_to = @issue.get_assign_user
-    @gitea_pull = Gitea::PullRequest::GetService.call(@owner.login, 
-      @repository.identifier, @pull_request.gitea_number, current_user&.gitea_token)
+
   end
 
   def pr_merge
-    return render_forbidden("你没有权限操作.") unless @project.operator?(current_user)
+    return render_forbidden("你没有权限操作.") if @project.reporter?(current_user)
 
     if params[:do].blank?
       normal_status(-1, "请选择合并方式")
     else
       ActiveRecord::Base.transaction do
         begin
-          @gitea_pull = Gitea::PullRequest::GetService.call(@owner.login, @repository.identifier, @pull_request.gitea_number, current_user&.gitea_token)
+          result = PullRequests::MergeService.call(@owner, @repository, @pull_request, current_user, params)
 
-          if @gitea_pull["merged_by"].present?
-            success_condition = true
-          else
-            result = PullRequests::MergeService.call(@owner, @repository, @pull_request, current_user, params)
-            success_condition = result.status == 200
-          end
-
-          if success_condition && @pull_request.merge!
-            # @pull_request.project_trend_status!
-            @pull_request.project_trends.create!(user: current_user, project: @project,action_type: ProjectTrend::MERGE)
+          if result && @pull_request.merge!
+            @pull_request.project_trend_status!
             @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)
+            normal_status(-1, "合并失败")
           end
         rescue => e
           normal_status(-1, e.message)
@@ -202,7 +179,7 @@ class PullRequestsController < ApplicationController
       if can_merge.present?
         render json: {
           status: -2,
-          message: "在这些分支之间的合并请求已存在：<a href='/#{@owner.login}/#{@project.identifier}/pulls/#{can_merge.first.id}''>#{can_merge.first.try(:title)}</a>",
+          message: "在这些分支之间的合并请求已存在：<a href='/projects/#{@owner.login}/#{@project.identifier}/pulls/#{can_merge.first.id}/Messagecount''>#{can_merge.first.try(:title)}</a>",
         }
       else
         normal_status(0, "可以合并")
@@ -212,12 +189,12 @@ class PullRequestsController < ApplicationController
 
 
   def files
-    @files_result = Gitea::PullRequest::FilesService.call(@owner.login, @project.identifier, @pull_request.gitea_number, current_user&.gitea_token)
+    @files_result = Gitea::PullRequest::FilesService.call(@owner.login, @project.identifier, @pull_request.gpid, current_user&.gitea_token)
     # render json: @files_result
   end
 
   def commits
-    @commits_result = Gitea::PullRequest::CommitsService.call(@owner.login, @project.identifier, @pull_request.gitea_number, current_user&.gitea_token)
+    @commits_result = Gitea::PullRequest::CommitsService.call(@owner.login, @project.identifier, @pull_request.gpid, current_user&.gitea_token)
     # render json: @commits_result
   end
 
@@ -239,7 +216,7 @@ class PullRequestsController < ApplicationController
   def get_relatived
     @project_tags = @project.issue_tags&.select(:id,:name, :color).as_json
     @project_versions = @project.versions&.select(:id,:name, :status).as_json
-    @project_members = @project.all_developers
+    @project_members = @project.members_user_infos
     @project_priories = IssuePriority&.select(:id,:name, :position).as_json
   end
 
@@ -273,8 +250,4 @@ class PullRequestsController < ApplicationController
       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,37 +1,16 @@
 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!, except: [:sync_mirror, :tags, :commit]
   before_action :authorizate_user_can_edit_repo!, only: %i[sync_mirror]
-  before_action :get_ref, only: %i[entries sub_entries top_counts file archive]
+  before_action :get_ref, only: %i[entries sub_entries top_counts]
   before_action :get_latest_commit, only: %i[entries sub_entries top_counts]
   before_action :get_statistics, only: %i[top_counts]
 
-  def files
-    result = @project.educoder? ? nil : Gitea::Repository::Files::GetService.call(@owner, @project.identifier, @ref, params[:search], @owner.gitea_token)
-    render json: result
-  end
-
-  # 新版项目详情
-  def detail
-    @user = current_user
-    @result = Repositories::DetailService.call(@owner, @repository, @user)
-    @project_fork_id = @project.try(:forked_from_project_id)
-    if @project_fork_id.present?
-      @fork_project = Project.find_by(id: @project_fork_id)
-      @fork_project_user = @fork_project.owner
-    end
-  rescue Exception => e
-    uid_logger_error(e.message)
-    tip_exception(e.message)
-  end
-
   def show
     @user = current_user
     @repo = @project.repository
@@ -64,7 +43,6 @@ class RepositoriesController < ApplicationController
 
   def sub_entries
     file_path_uri = URI.parse(URI.encode(params[:filepath].to_s.strip))
-    @path = Gitea.gitea_config[:domain]+"/#{@project.owner.login}/#{@project.identifier}/raw/branch/#{@ref}/"
 
     if @project.educoder?
       if params[:type] === 'file'
@@ -95,21 +73,10 @@ class RepositoriesController < ApplicationController
   end
 
   def commits
-    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
+    @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 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]
     @commit      = Gitea::Repository::Commits::GetService.call(@owner.login, @repository.identifier, @sha, current_user&.gitea_token)
@@ -117,17 +84,7 @@ class RepositoriesController < ApplicationController
   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? 
-      @contributors = []
-    else
-      @contributors = Gitea::Repository::Contributors::GetService.call(@owner, @repository.identifier)
-    end
+    @tags = Gitea::Repository::Tags::ListService.call(current_user&.gitea_token, @owner.login, @project.identifier, {page: params[:page], limit: params[:limit]})
   end
 
   def edit
@@ -190,46 +147,16 @@ class RepositoriesController < ApplicationController
   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
+    result = Gitea::Repository::Readme::GetService.call(@owner.login, @repository.identifier, params[:ref], current_user&.gitea_token)
+
     @readme = result[:status] === :success ? result[:body] : nil
-    @readme['content'] = decode64_content(@readme, @owner, @repository, params[:ref])
-    render json: @readme.slice("type", "encoding", "size", "name", "path", "content", "sha")
-  rescue 
-    render json: 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?
-
-    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/#{params[:filepath]}?ref=#{params[:ref]}"
-    file_path = [domain, api_url, url].join
-    file_path = [file_path, "access_token=#{current_user&.gitea_token}"].join("&") if @repository.hidden?
-
-    redirect_to URI.escape(file_path)
-  end
-
   private
 
   def find_project
@@ -250,14 +177,8 @@ class RepositoriesController < ApplicationController
 
   # 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
+    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
@@ -266,7 +187,7 @@ class RepositoriesController < ApplicationController
   end
 
   def get_ref
-    @ref = params[:ref] || @project&.default_branch
+    @ref = params[:ref] || "master"
   end
 
   def get_latest_commit
@@ -310,7 +231,7 @@ class RepositoriesController < ApplicationController
 
     # uploadPushInfo
   end
-  
+
   def create_new_pr(params)
     if params[:new_branch].present? && params[:new_branch] != params[:branch]
       local_params = {
@@ -347,7 +268,7 @@ class RepositoriesController < ApplicationController
         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"])
+          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

app/controllers/settings_controller.rb

@@ -1,70 +1,4 @@
 class SettingsController < ApplicationController
   def show
-    @old_projects_url = nil
-    get_add_menu
-    get_common_menu
-    get_personal_menu
-    get_third_party
-    get_top_system_notification
   end
-
-  private
-    def get_add_menu
-      @add = []
-      Site.add.select(:id, :name, :url, :key).to_a.map(&:serializable_hash).each do |site|
-        hash = {}
-        site.each {|k, v|
-          hash.merge!("#{k}":  get_site_url(k, v))
-        }
-        @add << hash
-      end
-    end
-
-    def get_common_menu
-      @common = {}
-      Site.common.select(:url, :key).each do |site|
-        next if site["url"].to_s.include?("current_user") && !User.current.logged?
-        @common.merge!("#{site["key"]}": append_http(reset_site_url(site["url"])))
-      end
-    end
-
-    def get_personal_menu
-      @personal = []
-      if User.current.logged?
-        Site.personal.select(:id, :name, :url, :key).to_a.map(&:serializable_hash).each do |site|
-          hash = {}
-          site.each {|k, v|
-            hash.merge!("#{k}": get_site_url(k, v))
-          }
-          @personal << hash
-        end
-      end
-    end
-
-    def get_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
-
-    def reset_site_url(url)
-      return url unless url.to_s.include?("current_user")
-
-      split_arr = url.split('current_user')
-      split_arr.length > 1 ? split_arr.join(current_user&.login) : (split_arr << current_user&.login).join('')
-    end
-
-    def append_http(url)
-      url.to_s.start_with?("http") ? url : [request.protocol, request.host_with_port, url].join('')
-    end
 end

app/controllers/sync_forge_controller.rb

@@ -309,12 +309,12 @@ class SyncForgeController < ApplicationController
   #   end
   # end
 
-  # def check_token
-  #   sync_params = params[:sync_params]
-  #   unless sync_params[:token] && sync_params[:token] == get_token
-  #     render json: {message: "token_errors"}
-  #   end
-  # end
+  # # def check_token
+  # #   sync_params = params[:sync_params]
+  # #   unless sync_params[:token] && sync_params[:token] == get_token
+  # #     render json: {message: "token_errors"}
+  # #   end
+  # # end
 
   # def get_token
   #   "34c82f51e0b699d9d16d70fd6497c9b1e4821d6ea3e872558a6537a091076b8e"

app/controllers/template_message_settings_controller.rb

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

app/controllers/users/applied_messages_controller.rb

@@ -1,18 +0,0 @@
-class Users::AppliedMessagesController < Users::BaseController 
-  before_action :check_auth 
-  after_action :view_messages, only: [:index]
-
-  def index 
-    @applied_messages = @_observed_user.applied_messages.order(viewed: :asc, created_at: :desc)
-    @applied_messages = paginate @applied_messages
-  end
-
-  private 
-  def check_auth 
-    return render_forbidden unless current_user.admin? || observed_logged_user?
-  end
-
-  def view_messages
-    @applied_messages.update_all(viewed: 'viewed')
-  end
-end

app/controllers/users/applied_projects_controller.rb

@@ -1,39 +0,0 @@
-class Users::AppliedProjectsController < Users::BaseController 
-  before_action :check_auth
-  before_action :find_applied_project, except: [:index]
-  before_action :find_project, except: [:index]
-
-  def index 
-    @applied_projects = AppliedProject.where(project_id: observed_user.full_admin_projects)
-    @applied_projects = paginate @applied_projects.order("created_at desc")
-  end
-
-  # 接受申请
-  def accept 
-    @applied_project = Projects::AcceptJoinService.call(current_user, @applied_project)
-  rescue Exception => e
-    uid_logger_error(e.message)
-    tip_exception(e.message)
-  end
-
-  # 拒绝申请
-  def refuse 
-    @applied_project = Projects::RefuseJoinService.call(current_user, @applied_project)
-  rescue Exception => e
-    uid_logger_error(e.message)
-    tip_exception(e.message)
-  end
-
-  private 
-  def check_auth 
-    return render_forbidden unless current_user.admin? || observed_logged_user?
-  end
-
-  def find_applied_project 
-    @applied_project = AppliedProject.find_by_id params[:id]
-  end
-
-  def find_project 
-    @project = @applied_project.project
-  end
-end

app/controllers/users/applied_transfer_projects_controller.rb

@@ -1,41 +0,0 @@
-class Users::AppliedTransferProjectsController < Users::BaseController 
-  before_action :check_auth
-  before_action :find_applied_transfer_project, except: [:index]
-  before_action :find_project, except: [:index]
-
-  def index 
-    user_collection_sql = AppliedTransferProject.where(owner_id: @_observed_user.id).to_sql 
-    org_collection_sql = AppliedTransferProject.where(owner_id: Organization.joins(team_users: :team).where(team_users: {user_id: @_observed_user.id}, teams: {authorize: %w(admin owner)} )).to_sql 
-    @applied_transfer_projects = AppliedTransferProject.from("( #{ user_collection_sql } UNION #{ org_collection_sql } ) AS applied_transfer_projects")
-    @applied_transfer_projects = paginate @applied_transfer_projects.order("created_at desc")
-  end
-
-  # 接受迁移
-  def accept 
-    @applied_transfer_project = Projects::AcceptTransferService.call(current_user, @project)
-  rescue Exception => e
-    uid_logger_error(e.message)
-    tip_exception(e.message)
-  end
-
-  # 拒绝迁移
-  def refuse 
-    @applied_transfer_project = Projects::RefuseTransferService.call(current_user, @project)
-  rescue Exception => e
-    uid_logger_error(e.message)
-    tip_exception(e.message)
-  end
-
-  private 
-  def check_auth 
-    return render_forbidden unless current_user.admin? || observed_logged_user?
-  end
-
-  def find_applied_transfer_project 
-    @applied_transfer_project = AppliedTransferProject.find_by_id params[:id]
-  end
-
-  def find_project 
-    @project = @applied_transfer_project.project
-  end
-end

app/controllers/users/banks_controller.rb

@@ -1,8 +1,8 @@
 class Users::BanksController < Users::BaseController
   before_action :params_filter
   def index
-    order = CourseList.column_names.include?(params[:order]) ? params[:order] : "updated_at"
-    sort = %w(desc asc).includes?(params[:sort]) ? params[:sort] : "desc"
+    order = params[:order] || "updated_at"
+    sort = params[:sort] || "desc"
     @banks = @object_type.classify.constantize.where(@object_filter)
     @course_lists = CourseList.where(id: @banks.pluck(:course_list_id))
     @banks = @banks.where(course_list_id: params[:tag_id]) unless params[:tag_id].blank?

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_login(params[:user_id]) || User.find_by_id(params[:user_id]))
+    @_observed_user ||= (User.find_by_id(params[:user_id]) || User.find_by_login(params[:user_id]))
   end
 
   def observed_logged_user?

app/controllers/users/headmaps_controller.rb

@@ -1,26 +0,0 @@
-class Users::HeadmapsController < Users::BaseController
-  def index 
-    result = Gitea::User::HeadmapService.call(observed_user.login, start_stamp, end_stamp)
-    @headmaps = result[2].blank? ? [] : result[2]
-  rescue Exception => e
-    uid_logger_error(e.message)
-    tip_exception(e.message)
-  end
-
-  private 
-  def start_stamp
-    if params[:year].present?
-      Date.new(params[:year], 1).to_time.to_i
-    else 
-      Date.today.to_time.to_i - 365*24*60*60
-    end
-  end
-
-  def end_stamp 
-    if params[:year].present?
-      Date.new(params[:year], 1).to_time.to_i + 365*24*60*60
-    else 
-      Date.today.to_time.to_i 
-    end
-  end
-end

app/controllers/users/is_pinned_projects_controller.rb

@@ -1,45 +0,0 @@
-class Users::IsPinnedProjectsController < Users::BaseController 
-  before_action :private_user_resources!, only: [:pin]
-  def index 
-    @is_pinned_projects = observed_user.pinned_projects.order(position: :desc, created_at: :asc).includes(project: [:project_category, :project_language, :repository]).order(position: :desc)
-    @is_pinned_projects = kaminari_paginate(@is_pinned_projects)
-  end 
-  
-  def pin 
-    observed_user.is_pinned_project_ids = is_pinned_project_ids
-    render_ok
-  rescue ActiveRecord::RecordNotFound => e
-    render_not_found
-  rescue Exception => e
-    uid_logger_error(e.message)
-    tip_exception(e.message)
-  end
-
-  def update 
-    @pinned_project = PinnedProject.find_by_id(params[:id])
-    @pinned_project.attributes = pinned_project_params 
-    if @pinned_project.save 
-      render_ok
-    else 
-      render_error
-    end
-  rescue Exception => e
-    uid_logger_error(e.message)
-    tip_exception(e.message)
-  end
-
-  private 
-  def is_pinned_project_ids 
-    if params[:is_pinned_project_ids].present?
-      return params[:is_pinned_project_ids].select{|id| observed_user.full_member_projects.visible.pluck(:id).include?(id.to_i) }
-    end
-    if params[:is_pinned_project_id].present?
-      return observed_user.is_pinned_project_ids unless observed_user.full_member_projects.visible.pluck(:id).include?(params[:is_pinned_project_id].to_i)
-      return observed_user.is_pinned_project_ids.include?(params[:is_pinned_project_id].to_i) ? observed_user.is_pinned_project_ids : observed_user.is_pinned_project_ids.push(params[:is_pinned_project_id].to_i)
-    end
-  end
-  
-  def pinned_project_params
-    params.require(:pinned_project).permit(:position)
-  end
-end

app/controllers/users/messages_controller.rb

@@ -1,96 +0,0 @@
-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/organizations_controller.rb

@@ -16,10 +16,10 @@ class Users::OrganizationsController < Users::BaseController
 
   private
   def sort_by
-    OrganizationExtension.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'created_at' 
+    params.fetch(:sort_by, "created_at")
   end
 
   def sort_direction
-    %w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : 'desc'  
+    params.fetch(:sort_direction, "desc")
   end
 end

app/controllers/users/project_trends_controller.rb

@@ -1,11 +0,0 @@
-class Users::ProjectTrendsController < Users::BaseController 
-
-  def index 
-    if params[:date].present?
-      @project_trends = observed_user.project_trends.where("DATE(created_at) = ?", params[:date])
-    else 
-      @project_trends = observed_user.project_trends
-    end
-    @project_trends = kaminari_paginate(@project_trends.includes(:trend, :project).order(created_at: :desc))
-  end
-end

app/controllers/users/statistics_controller.rb

@@ -1,217 +0,0 @@
-class Users::StatisticsController < Users::BaseController 
-  before_action :preload_develop_data, only: [:develop]
-
-  # 近期活动统计
-  def activity 
-    date_range = (1.week.ago.to_date..Date.today).to_a
-    commit_request = Gitea::User::HeadmapService.call(observed_user.login, 1.week.ago.to_date.to_time.to_i, Date.today.to_time.to_i)
-    commit_data = commit_request[2]
-    @date_data = []
-    @issue_data = []
-    @pull_request_data = []
-    @commit_data = []
-    date_range.each do |date|
-      @date_data << date.strftime("%Y.%m.%d")
-      @issue_data << observed_user.issues.where("DATE(created_on) = ?", date).size
-      @pull_request_data << observed_user.pull_requests.where("DATE(created_at) = ?", date).size
-      date_commit_data = commit_data.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}
-  end
-
-  # 开发能力
-  def develop 
-    if params[:start_time].present? && params[:end_time].present?
-      # 影响力
-      @influence = (60.0 + @follow_count / (@follow_count + 10.0) * 40.0).to_i
-      @platform_influence = (60.0 + @platform_follow_count / (@platform_follow_count + 10.0) * 40.0).to_i
-      # 贡献度
-      @contribution = (60.0 + @pullrequest_count / (@pullrequest_count + 10.0) * 40.0).to_i
-      @platform_contribution = (60.0 + @platform_pullrequest_count / (@platform_pullrequest_count + 10.0) * 40.0).to_i
-      # 活跃度
-      @activity = (60.0 + @issues_count / (@issues_count + 10.0) * 40.0).to_i
-      @platform_activity = (60.0 + @platform_issues_count / (@platform_issues_count + 10.0) * 40.0).to_i
-      # 项目经验
-      @experience = 10 * @project_count + 5 * @fork_count + @project_watchers_count + @project_praises_count
-      @experience = (60.0 + @experience / (@experience + 100.0) * 40.0).to_i
-      @platform_experience = 10 * @platform_project_count + 5 * @platform_fork_count + @platform_project_watchers_count + @platform_project_praises_count
-      @platform_experience = (60.0 + @platform_experience / (@platform_experience + 100.0) * 40.0).to_i
-      # 语言能力  
-      @language = (60.0 + @project_languages_count.length / (@project_languages_count.length + 5.0) * 40.0).to_i
-      @platform_language = (60.0 + @platform_project_languages_count.length / (@platform_project_languages_count.length + 5.0) * 40.0).to_i
-      # 语言百分比
-      @languages_percent = Hash.new
-      for key in @project_languages_count.keys do
-        @languages_percent[key] = (@project_languages_count[key].to_f / @project_languages_count.values.sum).round(2)
-      end
-      @platform_languages_percent = Hash.new
-      for key in @platform_project_languages_count.keys do
-        @platform_languages_percent[key] = (@platform_project_languages_count[key].to_f / @platform_project_languages_count.values.sum).round(2)
-      end
-      # 各门语言分数
-      @each_language_score = Hash.new
-      for key in @project_languages_count.keys do
-        @each_language_score[key] = (60.0 + @project_languages_count[key] / (@project_languages_count[key] + 5.0) * 40.0).to_i
-      end
-      @platform_each_language_score = Hash.new
-      for key in @platform_project_languages_count.keys do
-        @platform_each_language_score[key] = (60.0 + @platform_project_languages_count[key] / (@platform_project_languages_count[key] + 5.0) * 40.0).to_i
-      end
-    else
-      # 影响力
-      @influence = (60.0 + @follow_count / (@follow_count + 20.0) * 40.0).to_i 
-      @platform_influence = (60.0 + @platform_follow_count / (@platform_follow_count + 20.0) * 40.0).to_i 
-
-      # 贡献度
-      @contribution = (60.0 + @pullrequest_count / (@pullrequest_count + 20.0) * 40.0).to_i
-      @platform_contribution = (60.0 + @platform_pullrequest_count / (@platform_pullrequest_count + 20.0) * 40.0).to_i
-
-       # 活跃度
-      @activity = (60.0 + @issues_count / (@issues_count + 80.0) * 40.0).to_i
-      @platform_activity = (60.0 + @platform_issues_count / (@platform_issues_count + 80.0) * 40.0).to_i
-
-      # 项目经验
-      @experience = 10 * @project_count + 5 * @fork_count + @project_watchers_count + @project_praises_count
-      @experience = (60.0 + @experience / (@experience + 100.0) * 40.0).to_i
-      @platform_experience = 10 * @platform_project_count + 5 * @platform_fork_count + @platform_project_watchers_count + @platform_project_praises_count
-      @platform_experience = (60.0 + @platform_experience / (@platform_experience + 100.0) * 40.0).to_i
-      # 语言能力
-      @language = (60.0 + @project_languages_count.length / (@project_languages_count.length + 5.0) * 40.0).to_i
-      @platform_language = (60.0 + @platform_project_languages_count.length / (@platform_project_languages_count.length + 5.0) * 40.0).to_i
-
-      # 语言百分比
-      @languages_percent = Hash.new
-      for key in @project_languages_count.keys do
-        @languages_percent[key] = (@project_languages_count[key].to_f / @project_languages_count.values.sum).round(2)
-      end
-      # @platform_languages_percent = Hash.new
-      # for key in @platform_project_languages_count.keys do
-      #   @platform_languages_percent[key] = (@platform_project_languages_count[key].to_f / @platform_project_languages_count.values.sum).round(2)
-      # end
-      # 各门语言分数
-      @each_language_score = Hash.new
-      for key in @project_languages_count.keys do
-        @each_language_score[key] = (60.0 + @project_languages_count[key] / (@project_languages_count[key] + 5.0) * 40.0).to_i
-      end
-      # @platform_each_language_score = Hash.new
-      # for key in @platform_project_languages_count.keys do
-      #   @platform_each_language_score[key] = (60.0 + @platform_project_languages_count[key] / (@platform_project_languages_count[key] + 5.0) * 40.0).to_i
-      # end
-    end
-    
-  end
-
-  # 角色定位
-  def role 
-    full_member_projects = observed_user.full_member_projects
-    owner_projects = filter_member_projects_by_role("Owner")
-    manager_projects = filter_member_projects_by_role("Manager").where.not(id: owner_projects.ids)
-    developer_projects = filter_member_projects_by_role("Developer").where.not(id: owner_projects.ids + manager_projects.ids)
-    reporter_projects = filter_member_projects_by_role("Reporter").where.not(id: owner_projects.ids + manager_projects.ids + developer_projects.ids)
-
-    @full_member_projects_count = full_member_projects.size
-    @owner_projects_count = owner_projects.size
-    @manager_projects_count = manager_projects.size
-    @developer_projects_count = developer_projects.size
-    @reporter_projects_count = reporter_projects.size
-
-  end
-
-  # 专业定位
-  def major 
-    # 参与项目
-    join_normal_projects_sql = Project.members_projects(observed_user.id).to_sql
-    join_org_projects_sql = Project.joins(team_projects: [team: :team_users]).where(team_users: {user_id: observed_user.id}).to_sql
-    # 关注项目
-    star_projects_sql = Project.joins(:watchers).where(watchers: {watchable_type: "Project", user_id: observed_user.id}).to_sql 
-    # fork项目
-    fork_projects_sql = Project.where(id: observed_user.fork_users.select(:id, :fork_project_id).pluck(:fork_project_id)).to_sql 
-    major_projects = Project.from("( #{ join_normal_projects_sql} UNION #{ join_org_projects_sql } UNION #{ star_projects_sql } UNION #{fork_projects_sql}) AS projects").distinct
-    categories = ProjectCategory.joins(:projects).merge(Project.where(id: time_filter(major_projects, 'created_on'))).distinct.pluck(:name)
-    render :json => {categories: categories}
-  end
-
-  private 
-  def time_filter(collection, time_field) 
-    if params[:start_time].present? && params[:end_time].present?
-      return collection.where("#{time_field} > ? AND #{time_field} < ?", Time.at(params[:start_time].to_i).beginning_of_day, Time.at(params[:end_time].to_i).end_of_day)
-    else 
-      return collection
-    end
-  rescue 
-    return collection
-  end
-
-  def filter_member_projects_by_role(role)
-    case role 
-    when 'Owner'
-      normal_projects_sql =  Project.joins(members: :roles).where(user_id: observed_user.id).where(members: {user_id: observed_user.id}, roles: {name: 'Manager'}).to_sql 
-      org_projects_sql = Project.joins(:owner, teams: :team_users).where(users: {type: 'Organization'}, teams: {authorize: "owner"}, team_users: {user_id: observed_user.id}).to_sql
-    when "Manager"
-      normal_projects_sql = Project.joins(members: :roles).where.not(user_id: observed_user.id).where(members: {user_id: observed_user.id}, roles: {name: 'Manager'}).to_sql 
-      org_projects_sql = Project.joins(:owner, teams: :team_users).where(users: {type: 'Organization'}, teams: {authorize: "admin"}, team_users: {user_id: observed_user.id}).to_sql
-    when "Developer"
-      normal_projects_sql = Project.joins(members: :roles).where.not(user_id: observed_user.id).where(members: {user_id: observed_user.id}, roles: {name: 'Developer'}).to_sql 
-      org_projects_sql = Project.joins(:owner, teams: :team_users).where(users: {type: 'Organization'}, teams: {authorize: "write"}, team_users: {user_id: observed_user.id}).to_sql
-    when "Reporter"
-      normal_projects_sql = Project.joins(members: :roles).where.not(user_id: observed_user.id).where(members: {user_id: observed_user.id}, roles: {name: 'Reporter'}).to_sql 
-      org_projects_sql = Project.joins(:owner, teams: :team_users).where(users: {type: 'Organization'}, teams: {authorize: "read"}, team_users: {user_id: observed_user.id}).to_sql
-    end
-    return time_filter(Project.from("( #{normal_projects_sql} UNION #{org_projects_sql} ) AS projects").distinct, 'created_on')
-  end
-
-  def preload_develop_data
-    if params[:start_time].present? && params[:end_time].present?
-      # 用户被follow数量
-      @follow_count = time_filter(Watcher.where(watchable: observed_user), 'created_at').count
-      @platform_follow_count = time_filter(Watcher.where(watchable_type: 'User'), 'created_at').count
-      # 用户pr数量
-      @pullrequest_count = time_filter(PullRequest.where(user_id: observed_user.id), 'created_at').count
-      @platform_pullrequest_count = time_filter(PullRequest, 'created_at').count  
-      # 用户issue数量
-      @issues_count = time_filter(Issue.where(author_id: observed_user.id), 'created_on').count 
-      @platform_issues_count = time_filter(Issue, 'created_on').count
-      # 用户总项目数 
-      @project_count = time_filter(Project.where(user_id:observed_user.id), 'created_on').count
-      @platform_project_count = time_filter(Project, 'created_on').count
-      # 用户项目被fork数量
-      @fork_count = time_filter(Project.where(user_id:observed_user.id), 'created_on').sum("forked_count") 
-      @platform_fork_count = time_filter(Project, 'created_on').sum("forked_count") 
-      # 用户项目关注数
-      @project_watchers_count = time_filter(Project.where(user_id: observed_user.id), 'created_on').sum("watchers_count")
-      @platform_project_watchers_count = time_filter(Project, 'created_on').sum("watchers_count")
-      # 用户项目点赞数
-      @project_praises_count = time_filter(Project.where(user_id: observed_user.id), 'created_on').sum("praises_count")
-      @platform_project_praises_count = time_filter(Project, 'created_on').sum("praises_count")
-      # 用户不同语言项目数量
-      @project_languages_count = time_filter(Project.where(user_id: observed_user.id), 'created_on').joins(:project_language).group("project_languages.name").count
-      @platform_project_languages_count = time_filter(Project, 'created_on').joins(:project_language).group("project_languages.name").count
-    else
-      # 用户被follow数量
-      @follow_count = Cache::UserFollowCountService.call(observed_user)
-      @platform_follow_count = Cache::PlatformFollowCountService.call
-      # 用户pr数量
-      @pullrequest_count = Cache::UserPullrequestCountService.call(observed_user)
-      @platform_pullrequest_count = Cache::PlatformPullrequestCountService.call
-      # 用户issue数量
-      @issues_count = Cache::UserIssueCountService.call(observed_user)
-      @platform_issues_count = Cache::PlatformIssueCountService.call
-      # 用户总项目数 
-      @project_count = Cache::UserProjectCountService.call(observed_user)
-      @platform_project_count = Cache::PlatformProjectCountService.call
-      # 用户项目被fork数量
-      @fork_count = Cache::UserProjectForkCountService.call(observed_user)
-      @platform_fork_count = Cache::PlatformProjectForkCountService.call
-      # 用户项目关注数
-      @project_watchers_count = Cache::UserProjectWatchersCountService.call(observed_user)
-      @platform_project_watchers_count = Cache::PlatformProjectWatchersCountService.call 
-      # 用户项目点赞数
-      @project_praises_count = Cache::UserProjectPraisesCountService.call(observed_user)
-      @platform_project_praises_count = Cache::PlatformProjectPraisesCountService.call
-      # 用户不同语言项目数量
-      @project_languages_count = Cache::UserProjectLanguagesCountService.call(observed_user)
-      @platform_project_languages_count = Cache::PlatformProjectLanguagesCountService.call
-    end
-  end
-end

app/controllers/users/template_message_settings_controller.rb

@@ -1,36 +0,0 @@
-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

@@ -2,11 +2,10 @@ class UsersController < ApplicationController
   include ApplicationHelper
   include Ci::DbConnectable
 
-  before_action :load_user, only: [:show, :homepage_info, :sync_token, :sync_gitea_pwd, :projects, :watch_users, :fan_users, :hovercard]
-  before_action :check_user_exist, only: [:show, :homepage_info,:projects, :watch_users, :fan_users, :hovercard]
-  before_action :require_login, only: %i[me list sync_user_info]
+  before_action :load_user, only: [:show, :homepage_info, :sync_token, :sync_gitea_pwd, :projects, :watch_users, :fan_users]
+  before_action :check_user_exist, only: [:show, :homepage_info,:projects, :watch_users, :fan_users]
+  before_action :require_login, only: %i[me list]
   before_action :connect_to_ci_db, only: [:get_user_info]
-  before_action :convert_image!, only: [:update]
   skip_before_action :check_sign, only: [:attachment_show]
 
   def connect_to_ci_db(options={})
@@ -28,26 +27,12 @@ class UsersController < ApplicationController
 
   def show
       #待办事项，现在未做
-      if User.current.admin? || User.current.login == @user.login 
-        @waiting_applied_messages = @user.applied_messages.waiting
-        @common_applied_transfer_projects = AppliedTransferProject.where(owner_id: @user.id).common + AppliedTransferProject.where(owner_id: Organization.joins(team_users: :team).where(team_users: {user_id: @user.id}, teams: {authorize: %w(admin owner)} )).common
-        @common_applied_projects = AppliedProject.where(project_id: @user.full_admin_projects).common
-        @undo_events = @waiting_applied_messages.size + @common_applied_transfer_projects.size + @common_applied_projects.size
-      else 
-        @waiting_applied_messages = AppliedMessage.none
-        @common_applied_transfer_projects = AppliedTransferProject.none
-        @common_applied_projects = AppliedProject.none
-        @undo_events = 0
-      end
+      @undo_events = 0
       #用户的组织数量
       # @user_composes_count =  @user.composes.size
       @user_composes_count = 0
-      user_organizations =  User.current.logged? ? @user.organizations.with_visibility(%w(common limited)) + @user.organizations.with_visibility("privacy").joins(:team_users).where(team_users: {user_id: current_user.id}) : @user.organizations.with_visibility("common")
-      @user_org_count = user_organizations.size
-      normal_projects = Project.members_projects(@user.id).to_sql
-      org_projects = Project.joins(team_projects: [team: :team_users]).where(team_users: {user_id: @user.id}).to_sql
-      projects = Project.from("( #{ normal_projects} UNION #{ org_projects } ) AS projects").distinct
-      user_projects = User.current.logged? && (User.current.admin? ||  User.current.login == @user.login) ? projects : projects.visible
+      @user_org_count = User.current.logged? ? @user.organizations.with_visibility(%w(common limited)).size + @user.organizations.with_visibility("privacy").joins(:organization_users).where(organization_users: {user_id: current_user.id}).size : @user.organizations.with_visibility("common").size
+      user_projects = User.current.logged? && (User.current.admin? ||  User.current.login == @user.login) ? @user.projects : @user.projects.visible
       @projects_common_count = user_projects.common.size
       @projects_mirrior_count = user_projects.mirror.size
       @projects_sync_mirrior_count = user_projects.sync_mirror.size
@@ -65,22 +50,16 @@ class UsersController < ApplicationController
 
   def fan_users
     watchers = @user.watchers.includes(:user).order("watchers.created_at desc")
-    watchers = watchers.joins(:user).merge(User.like(params[:search]))
+    watchers = watchers.joins(:user).where("LOWER(concat(users.lastname, users.firstname, users.login)) LIKE ?", "%#{params[:search].split(" ").join('|')}%") if params[:search].present?
+
     @watchers_count = watchers.size
     @watchers = paginate(watchers)
   end
 
-  def hovercard
-  end
-
   def update
-    return render_not_found unless @user = User.find_by(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(", "))
-    end
+    @user = User.find params[:id]
+    @user.update!(user_params)
+    render_ok
   end
 
   def me
@@ -91,12 +70,6 @@ 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
@@ -182,8 +155,7 @@ class UsersController < ApplicationController
   # 其他平台登录后，必须将token同步到forge平台，实现sso登录功能
   def sync_token
     return render_error('未找相关用户!')  unless @user
-
-    token = Token.get_or_create_permanent_login_token(@user, 'autologin')
+    token = Token.get_or_create_permanent_login_token(@user, autologin_cookie_name)
     token.update_column(:value, params[:token])
     render_ok
   end
@@ -260,39 +232,17 @@ class UsersController < ApplicationController
     render_ok
   end
 
-  def sync_user_info
-    user = User.find_by_login params[:login]
-    return render_forbidden unless user === current_user
-
-    sync_params = {
-      email: params[:email],
-      password: params[:password]
-    }
-
-    Users::UpdateInfoForm.new(sync_params.merge(login: params[:login])).validate!
-
-    interactor = Gitea::User::UpdateInteractor.call(user.login, sync_params)
-    if interactor.success?
-      user.update!(password: params[:password], mail: params[:email], status: User::STATUS_ACTIVE)
-      render_ok
-    else
-      render_error(interactor.error)
-    end
-  end
-
   private
   def load_user
     @user = User.find_by_login(params[:id]) || User.find_by(id: params[:id])
   end
 
   def user_params
-    params.require(:user).permit(:nickname, :image,
+    params.require(:user).permit(:nickname, :lastname, :show_realname,:login,:mail,
                                   user_extension_attributes: [
                                   :gender, :location, :location_city,
                                   :occupation, :technical_title,
-                                  :school_id, :department_id, :province, :city,
-                                  :custom_department, :identity, :student_id, :description,
-                                  :show_email, :show_location, :show_department]
+                                  :school_id, :department_id,:identity, :student_id, :description]
                                 )
   end
 

app/controllers/users_for_private_messages_controller.rb

@@ -11,7 +11,7 @@ class UsersForPrivateMessagesController < ApplicationController
       return
     end
 
-    users = users.like(keyword)
+    users = users.where('LOWER(concat(lastname, firstname, nickname)) LIKE ?', "%#{keyword}%")
 
     @users = users.limit(10).includes(:user_extension)
   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, :show]
-  before_action :check_release_authorize, except: [:index, :show]
-  before_action :find_version , only: [:show, :edit, :update, :destroy]
+  before_action :require_login, except: [:index]
+  before_action :find_version , only: [:edit, :update, :destroy]
 
   def index
-    @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?)
+    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).includes(:attachments)
   end
 
   def new
@@ -22,10 +22,6 @@ 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, "名称不能为空")
@@ -41,14 +37,13 @@ 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(current_user.gitea_token, @user.try(:login), @repository.try(:identifier), version_params).call
+            git_version_release = Gitea::Versions::CreateService.new(@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")
@@ -86,7 +81,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(current_user.gitea_token, @user.try(:login), @repository.try(:identifier), version_params, @version.try(:version_gid)).call
+            git_version_release = Gitea::Versions::UpdateService.new(@user.gitea_token, @user.try(:login), @repository.try(:identifier), version_params, @version.try(:version_gid)).call
             unless git_version_release
               raise Error, "更新失败"
             end
@@ -107,7 +102,7 @@ class VersionReleasesController < ApplicationController
     ActiveRecord::Base.transaction do
       begin
         if @version.destroy
-          git_version_release = Gitea::Versions::DeleteService.new(current_user.gitea_token, @user.try(:login), @repository.try(:identifier), @version.try(:version_gid)).call
+          git_version_release = Gitea::Versions::DeleteService.new(@user.gitea_token, @user.try(:login), @repository.try(:identifier), @version.try(:version_gid)).call
 
           if git_version_release.status == 204
             normal_status(0, "删除成功")
@@ -162,8 +157,4 @@ 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,13 +1,13 @@
 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
     @user_admin_or_member = current_user.present? && (current_user.admin || @project.member?(current_user))
+    order_name = params[:order_name] || "created_on"
+    order_type = params[:order_type] || "desc"
     status = params[:status]
     versions = @project.versions.version_includes
     @open_versions_size = versions.where(status: "open")&.size
@@ -26,13 +26,20 @@ class VersionsController < ApplicationController
   end
 
   def show
-    version_issues = @version.issues.issue_issue.issue_includes
+    order_name = params[:order_name] || "created_on"
+    order_type = params[:order_type] || "desc"
+
+    version_issues = @version.issues.issue_includes
 
     status_type = params[:status_type] || "1"
     # @close_issues_size = version_issues.where(status_id: 5).size
     # @open_issues_size = version_issues.size - @close_issues_size
 
-   
+    if status_type.to_s == "1"  #表示开启中的
+      version_issues = version_issues.where.not(status_id: 5)
+    else
+      version_issues = version_issues.where(status_id: 5)
+    end
     version_issues = version_issues.where(author_id: params[:author_id]) if params[:author_id].present? && params[:author_id].to_s != "all"
     version_issues = version_issues.where(assigned_to_id: params[:assigned_to_id]) if params[:assigned_to_id].present? && params[:assigned_to_id].to_s != "all"
     version_issues = version_issues.where(tracker_id: params[:tracker_id]) if params[:tracker_id].present? && params[:tracker_id].to_s != "all"
@@ -44,26 +51,10 @@ class VersionsController < ApplicationController
     version_issues = version_issues.joins(:issue_tags).where(issue_tags: {id: params[:issue_tag_id].to_i}) if params[:issue_tag_id].present? && params[:issue_tag_id].to_s != "all"
 
     version_issues = version_issues.reorder("#{order_name} #{order_type}")
-    has_filter_params = (params[:author_id].present? && params[:author_id].to_s != "all") ||
-                        (params[:assigned_to_id].present? && params[:assigned_to_id].to_s != "all") ||
-                        (params[:tracker_id].present? && params[:tracker_id].to_s != "all")  ||
-                        (params[:status_id].present? && params[:status_id].to_s != "all") || 
-                        (params[:priority_id].present? && params[:priority_id].to_s != "all") || 
-                        (params[:fixed_version_id].present? && params[:fixed_version_id].to_s != "all") || 
-                        (params[:done_ratio].present? && params[:done_ratio].to_s != "all") || 
-                        (params[:issue_type].present? && params[:issue_type].to_s != "all") || 
-                        (params[:issue_tag_id].present? && params[:issue_tag_id].to_s != "all")
-    @version_close_issues_size = has_filter_params ? version_issues.closed.size : @version.issues.issue_issue.issue_includes.closed.size
-    @version_issues_size = has_filter_params ? version_issues.size : @version.issues.issue_issue.issue_includes.size
-    if status_type.to_s == "1"  #表示开启中的
-      version_issues = version_issues.where.not(status_id: 5)
-    else
-      version_issues = version_issues.where(status_id: 5)
-    end
 
     @page  = params[:page]  || 1
     @limit = params[:limit] || 15
-    # @version_issues_size = version_issues.size
+    @version_issues_size = version_issues.size
     @version_issues = version_issues.page(@page).per(@limit)
   end
 
@@ -92,7 +83,7 @@ class VersionsController < ApplicationController
         if version.save
           normal_status(0, "里程碑创建成功")
         else
-          normal_status(-1, "里程碑创建失败")
+          normal_status(-1, version.errors.messages.values[0][0])
         end
       end
 
@@ -130,7 +121,7 @@ class VersionsController < ApplicationController
         if @version.update_attributes(tag_params)
           normal_status(0, "里程碑更新成功")
         else
-          normal_status(-1, "里程碑更新失败")
+          normal_status(-1, version.errors.messages.values[0][0])
         end
       end
     else
@@ -175,16 +166,4 @@ class VersionsController < ApplicationController
     end
   end
 
-   def order_name
-    Version.column_names.include?(params[:order_name]) ? params[:order_name] : 'created_on'
-   end
-
-   def order_type
-    %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,6 +1,5 @@
 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/controllers/weapps/courses_controller.rb

@@ -86,7 +86,7 @@ class Weapps::CoursesController < Weapps::BaseController
     end
 
     if search.present?
-      @teacher_list = @teacher_list.joins(:user).where("LOWER(CONCAT(users.lastname, users.firstname)) like ? OR users.nickname like ?", "%#{search}%", "%#{search}%")
+      @teacher_list = @teacher_list.joins(:user).where("LOWER(CONCAT(users.lastname, users.firstname)) like ?", "%#{search}%")
     end
 
     @teacher_list_size = @teacher_list.size
@@ -127,8 +127,8 @@ class Weapps::CoursesController < Weapps::BaseController
     @students = CourseMember.students(@course)
 
     if search.present?
-      @students = @students.joins(user: :user_extension).where("LOWER(CONCAT(users.lastname, users.firstname)) like ? or users.nickname like ? or
-                                                        user_extensions.student_id like ?", "%#{search}%", "%#{search}%", "%#{search}%")
+      @students = @students.joins(user: :user_extension).where("LOWER(CONCAT(users.lastname, users.firstname)) like ? or
+                                                        user_extensions.student_id like ?", "%#{search}%", "%#{search}%")
     end
 
     if course_group_id.present?

app/controllers/zips_controller.rb

@@ -86,7 +86,7 @@ class ZipsController < ApplicationController
 
           #搜索
           if params[:search].present?
-            @ex_users = @ex_users.joins(user: :user_extension).where("CONCAT(lastname, firstname) like ? OR nickname like ? OR student_id like ?", "%#{params[:search]}%", "%#{params[:search]}%", "%#{params[:search]}%")
+            @ex_users = @ex_users.joins(user: :user_extension).where("CONCAT(lastname, firstname) like ? OR student_id like ?", "%#{params[:search]}%", "%#{params[:search]}%")
           end
 
           default_ex_users_size = @ex_users&.size
@@ -130,8 +130,8 @@ class ZipsController < ApplicationController
       end
 
       unless params[:search].blank?
-        @all_student_works = @all_student_works.joins(user: :user_extension).where("CONCAT(lastname, firstname) like ? or nickname like ? 
-                         or student_id like ?", "%#{params[:search]}%", "%#{params[:search]}%", "%#{params[:search]}%")
+        @all_student_works = @all_student_works.joins(user: :user_extension).where("concat(lastname, firstname) like ?
+                         or student_id like ?", "%#{params[:search]}%", "%#{params[:search]}%")
       end
 
       student_work_sizes = @all_student_works&.size

app/docs/slate/.dockerignore

@@ -0,0 +1,2 @@
+build/
+.github/

app/docs/slate/.editorconfig

@@ -0,0 +1,18 @@
+# EditorConfig is awesome: https://EditorConfig.org
+
+# Top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+
+[*.rb]
+charset = utf-8
+
+[*.md]
+trim_trailing_whitespace = false