fixed 批量去掉测试拦截

* 板块管理中的审核帖子添加超级管理员权限

.gitignore

@@ -36,8 +36,6 @@ public/react/yarn.lock
 /.idea/*
 
 # Ignore react node_modules
-public/system/*
-public/react/*
 /public/react/.cache
 /public/react/node_modules/
 /public/react/config/stats.json
@@ -74,7 +72,6 @@ vendor/bundle/
 /log
 /public/admin
 /mysql_data
-/public/repo/
 
 
 .generators
@@ -84,6 +81,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);

.trustie-pipeline.yml

@@ -1,22 +0,0 @@
-kind: pipeline
-name: default
-
-platform:
-  os: linux
-  arch: arm64
-
-steps:
-- name: install
-  image: ruby:2.4.5
-  commands:
-  - gem install bundler
-  - bundle -v
-  - bundle  install --jobs=1 --retry=1
-
-- name: test
-  image: ruby:2.4.5
-  volumes:
-  - name: bundle
-    path: /usr/local/bundle
-  commands:
-  - rake

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

@@ -1,6 +1,8 @@
 source 'https://gems.ruby-china.com'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
+ruby '2.3.7'
+
 gem 'rails', '~> 5.2.0'
 gem 'mysql2', '>= 0.4.4', '< 0.6.0'
 gem 'puma', '~> 3.11'
@@ -12,11 +14,14 @@ gem 'turbolinks', '~> 5'
 gem 'jbuilder', '~> 2.5'
 gem 'groupdate', '~> 4.1.0'
 gem 'chartkick'
+# gem 'grape', '~> 0.9.0'
 gem 'grape-entity', '~> 0.7.1'
 gem 'kaminari', '~> 1.1', '>= 1.1.1'
 
 gem 'bootsnap', '>= 1.1.0', require: false
 
+gem 'gitlab', path: 'lib/gitlab-cli'
+
 gem 'chinese_pinyin'
 
 gem 'rack-cors'
@@ -43,7 +48,7 @@ gem 'redcarpet', '~> 3.4'
 
 gem 'rqrcode', '~> 0.10.1'
 gem 'rqrcode_png'
-
+gem 'acts_as_tree', '~> 2.9', '>= 2.9.1'
 gem 'acts-as-taggable-on', '~> 6.0'
 
 # a tree structure
@@ -70,7 +75,6 @@ group :development do
   gem 'listen', '>= 3.0.5', '< 3.2'
   gem 'spring'
   gem 'spring-watcher-listen', '~> 2.0.0'
-  gem "annotate", "~> 2.6.0"
 end
 
 group :test do
@@ -100,7 +104,6 @@ gem 'rails-i18n', '~> 5.1'
 # job
 gem 'sidekiq'
 gem 'sinatra'
-gem "sidekiq-cron", "~> 1.1"
 
 # batch insert
 gem 'bulk_insert'
@@ -127,4 +130,3 @@ gem 'harmonious_dictionary', '~> 0.0.1'
 
 gem 'parallel', '~> 1.19', '>= 1.19.1'
 
-gem 'letter_avatar'

Gemfile.lock

@@ -1,3 +1,10 @@
+PATH
+  remote: lib/gitlab-cli
+  specs:
+    gitlab (3.2.0)
+      httparty
+      terminal-table
+
 GEM
   remote: https://gems.ruby-china.com/
   specs:
@@ -50,13 +57,12 @@ GEM
       activerecord (>= 5.0, < 6.1)
     acts_as_list (0.9.19)
       activerecord (>= 3.0)
+    acts_as_tree (2.9.1)
+      activerecord (>= 3.0.0)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     ancestry (3.0.7)
       activerecord (>= 3.2.0)
-    annotate (2.6.5)
-      activerecord (>= 2.3.0)
-      rake (>= 0.8.7)
     archive-zip (0.12.0)
       io-like (~> 0.3.0)
     arel (9.0.0)
@@ -118,17 +124,12 @@ GEM
     enumerize (2.3.1)
       activesupport (>= 3.2)
     erubi (1.9.0)
-    et-orbi (1.2.4)
-      tzinfo
     execjs (2.7.0)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     ffi (1.12.2)
     font-awesome-sass (4.7.0)
       sass (>= 3.2)
-    fugit (1.4.1)
-      et-orbi (~> 1.1, >= 1.1.8)
-      raabro (~> 1.4)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     grape-entity (0.7.1)
@@ -139,6 +140,9 @@ GEM
     harmonious_dictionary (0.0.1)
     hashie (3.6.0)
     htmlentities (4.3.4)
+    httparty (0.18.0)
+      mime-types (~> 3.0)
+      multi_xml (>= 0.5.2)
     i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     io-like (0.3.1)
@@ -162,7 +166,6 @@ GEM
       activerecord
       kaminari-core (= 1.2.0)
     kaminari-core (1.2.0)
-    letter_avatar (0.3.8)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -176,9 +179,10 @@ GEM
       mimemagic (~> 0.3.2)
     maruku (0.7.3)
     method_source (0.9.2)
-    mimemagic (0.3.10)
-      nokogiri (~> 1)
-      rake
+    mime-types (3.3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2019.1009)
+    mimemagic (0.3.4)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minitest (5.14.0)
@@ -219,7 +223,6 @@ GEM
     prettier (0.18.2)
     public_suffix (4.0.3)
     puma (3.12.2)
-    raabro (1.4.0)
     rack (2.0.9)
     rack-cors (1.1.1)
       rack (>= 2.0.0)
@@ -362,9 +365,6 @@ GEM
       rack (< 2.1.0)
       rack-protection (>= 1.5.0)
       redis (>= 3.3.5, < 5)
-    sidekiq-cron (1.2.0)
-      fugit (~> 1.1)
-      sidekiq (>= 4.2.1)
     simple_form (5.0.2)
       actionpack (>= 5.0)
       activemodel (>= 5.0)
@@ -404,6 +404,8 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
     thor (1.0.1)
     thread_safe (0.3.6)
     tilt (2.0.10)
@@ -436,8 +438,8 @@ DEPENDENCIES
   active_decorator
   acts-as-taggable-on (~> 6.0)
   acts_as_list
+  acts_as_tree (~> 2.9, >= 2.9.1)
   ancestry
-  annotate (~> 2.6.0)
   awesome_print
   axlsx (~> 3.0.0.pre)
   axlsx_rails (~> 0.5.2)
@@ -453,13 +455,13 @@ DEPENDENCIES
   enumerize
   faraday (~> 0.15.4)
   font-awesome-sass (= 4.7.0)
+  gitlab!
   grape-entity (~> 0.7.1)
   groupdate (~> 4.1.0)
   harmonious_dictionary (~> 0.0.1)
   jbuilder (~> 2.5)
   jquery-rails
   kaminari (~> 1.1, >= 1.1.1)
-  letter_avatar
   listen (>= 3.0.5, < 3.2)
   mysql2 (>= 0.4.4, < 0.6.0)
   oauth2
@@ -490,7 +492,6 @@ DEPENDENCIES
   searchkick
   selenium-webdriver
   sidekiq
-  sidekiq-cron (~> 1.1)
   simple_form
   simple_xlsx_reader
   sinatra
@@ -504,5 +505,8 @@ DEPENDENCIES
   web-console (>= 3.3.0)
   wkhtmltopdf-binary
 
+RUBY VERSION
+   ruby 2.3.7p456
+
 BUNDLED WITH
    2.1.4

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.

app/assets/javascripts/admin.js

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

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

@@ -1,7 +1,7 @@
 $(document).on('turbolinks:load', function() {
   if ($('body.admins-courses-index-page').length > 0) {
-    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/forum_sections/index.js

@@ -0,0 +1,4 @@
+$(document).on('turbolinks:load', function() {
+  var $addSectionModal = $('.admin-import-user-modal');
+  
+});

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

@@ -1,141 +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
-    $('.project-list-container').on('click', '.recommend-action', function(){
-      var $closeAction = $(this);
-      var $uncloseAction = $closeAction.siblings('.unrecommend-action');
-      var $editAction = $closeAction.siblings('.edit-recommend-action');
-
-      var keywordID = $closeAction.data('id');
-      customConfirm({
-        content: '确认将该项目设置为推荐项目吗?',
-        ok: function(){
-          $.ajax({
-            url: '/admins/projects/' + keywordID,
-            method: 'PUT',
-            dataType: 'json',
-            data: {
-              project: {
-                recommend: true,
-                recommend_index: 1
-              }
-            },
-            success: function() {
-              showSuccessNotify();
-              $closeAction.hide();
-              $uncloseAction.show();
-              $editAction.show();
-              $(".project-item-"+keywordID).children('td').eq(5).text("√")
-            }
-          });
-        }
-      });
-    });
-
-    // unclose user
-    $('.project-list-container').on('click', '.unrecommend-action', function(){
-      var $uncloseAction = $(this);
-      var $closeAction = $uncloseAction.siblings('.recommend-action');
-      var $editAction = $closeAction.siblings('.edit-recommend-action');
-
-      var keywordID = $uncloseAction.data('id');
-      customConfirm({
-        content: '确认取消该推荐项目吗？',
-        ok: function () {
-          $.ajax({
-            url: '/admins/projects/' + keywordID,
-            method: 'PUT',
-            dataType: 'json',
-            data: {
-              project: {
-                recommend: false,
-                recommend_index: 0
-              }
-            },
-            success: function() {
-              showSuccessNotify();
-              $closeAction.show();
-              $uncloseAction.hide();
-              $editAction.hide();
-              $(".project-item-"+keywordID).children('td').eq(5).text("")
-            }
-          });
-        }
-      })
-    });
-
-
-    // close user
-    $('.project-list-container').on('click', '.pinned-action', function(){
-      var $closeAction = $(this);
-      var $uncloseAction = $closeAction.siblings('.unpinned-action');
-
-      var keywordID = $closeAction.data('id');
-      customConfirm({
-        content: '确认将该项目设置为精选项目吗?',
-        ok: function(){
-          $.ajax({
-            url: '/admins/projects/' + keywordID,
-            method: 'PUT',
-            dataType: 'json',
-            data: {
-              project: {
-                is_pinned: true,
-              }
-            },
-            success: function() {
-              showSuccessNotify();
-              $closeAction.hide();
-              $uncloseAction.show();
-              $(".project-item-"+keywordID).children('td').eq(4).text("√")
-            }
-          });
-        }
-      });
-    });
-
-    // unclose user
-    $('.project-list-container').on('click', '.unpinned-action', function(){
-      var $uncloseAction = $(this);
-      var $closeAction = $uncloseAction.siblings('.pinned-action');
-
-      var keywordID = $uncloseAction.data('id');
-      customConfirm({
-        content: '确认取消该精选项目吗？',
-        ok: function () {
-          $.ajax({
-            url: '/admins/projects/' + keywordID,
-            method: 'PUT',
-            dataType: 'json',
-            data: {
-              project: {
-                is_pinned: false,
-              }
-            },
-            success: function() {
-              showSuccessNotify();
-              $closeAction.show();
-              $uncloseAction.hide();
-              $(".project-item-"+keywordID).children('td').eq(4).text("")
-            }
-          });
-        }
-      })
-    });
-})

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

@@ -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/admin.scss

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

app/assets/stylesheets/admins/banned_users.scss

@@ -0,0 +1,7 @@
+// .admins-banned-users-index-page {
+//   .width240 {
+//     width: 240px;
+//   }
+//   .mr15{margin-right: 15px;}
+//   .mt2{margin-top: 2px;}
+// }

app/assets/stylesheets/admins/common.scss

@@ -136,5 +136,36 @@
     background: #fff;
   }
   .mt-10{margin-top: 10px;}
+  .nav_blueline_status{
+    list-style-type: none;
+    padding: 0;
+    margin: 0;
+    li {
+      padding: 0px 15px;
+      border-radius: 15px;
+      border: 1px solid #CDCDCD;
+      height: 30px;
+      line-height: 30px;
+      float: left;
+      margin-right: 30px;
+      a {
+        color: #CDCDCD!important;
+        display: block;
+      }
+    };
+    li.active {
+      border: 1px solid #4CACFF;
+      a {
+        color: #4CACFF!important;
+    }
+    }
+  }
+  .fr{float: right;}
+  .width240 {
+    width: 240px;
+  }
+  .mr15{margin-right: 15px;}
+  .mt2{margin-top: 2px;}
 }
 
+

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/admins/forum_moderators.scss

@@ -0,0 +1,11 @@
+.admins-forum-moderators-index-page {
+  .df{
+    display: flex;
+  }
+  .flex1 {
+    flex: 1;
+}
+.text-center {
+  text-align: center;
+}
+}

app/assets/stylesheets/admins/forum_sections.scss

@@ -0,0 +1,128 @@
+.admins-forum-sections-index-page {
+  .color-grey{color: #888;}
+  .grid-item-top {
+    display: grid;
+    grid-template-columns: max-content 1fr;
+    align-self: start;
+  }
+  .mt20{margin-top: 20px;}
+  .none{display: none;}
+  .color-red{color: red!important;}
+  .upload-image-100 {
+    height: 100px;
+    width: 100px;
+    border-radius: 8px;
+    text-align: center;
+    /* line-height: 100px; */
+    background: #f5f5f5;
+    color: #999;
+    position: relative;
+  }
+  .pointer {
+    cursor: pointer;
+  }
+  .avatar100{
+    height: 100px;
+    width: 100px;
+    border-radius: 8px;
+}
+.upload-image-100:hover .admin-show-again-upload{display: block;}
+.admin-show-again-upload {
+  bottom: 0;
+  width: 100px;
+  height: 100%;
+  line-height: 100px;
+  /* top: 0; */
+  background: rgba(0,0,0,0.6);
+  color: #fff;
+  position: absolute;
+  border-radius: 8px;
+}
+.menu_operate {
+  position: relative;
+  cursor: pointer;
+  .operateList {
+    position: absolute;
+    right: -110px;
+    top: 9px;
+    background: #fff;
+    width: 100px;
+    color: #999;
+    box-shadow: 0px 0px 9px rgba(0,0,0,0.2);
+    z-index: 100;
+    display: none;
+    a {
+      display: block;
+      height: 30px;
+      line-height: 30px;
+      padding: 0px 10px;
+  }
+
+}
+.operateList.active {
+  display: block !important;
+}
+}
+.color-grey-6 {
+  color: #666!important;
+}
+.set_l_submenu {
+  padding-left: 50px;
+  display: none;
+  width: 180px;
+  list-style-type: none;
+  li{
+    padding: 4px 0;
+  }
+}
+.set_l_submenu.active {
+  display: block;
+}
+.set_l_premenu {
+  position: relative;
+  display: flex;
+  height: 30px;
+  line-height: 30px;
+  cursor: pointer;
+}
+.df{
+  display: flex;
+}
+.flex1 {
+  flex: 1;
+}
+.text-center {
+text-align: center;
+}
+.grid-item-left {
+  display: grid;
+  grid-template-columns:1fr max-content;
+  align-self: start;
+}
+.ml20{margin-left: 20px;}
+
+.forum-moderators-items {
+  padding: 10px 30px;
+  max-height: 175px;
+  overflow-y: auto;
+  background: #F4FAFF;
+  margin-top: 20px;
+}
+.mr4 {margin-right: 4px;}
+.blue-user-btn {
+  margin: 0 5px;
+  padding: 2px 8px;
+  background: #F4F8FA!important;
+  color: #fff!important;
+  border: 1px solid #4CACFF;
+  border-radius: 4px;
+  white-space: nowrap;
+}
+.mr5 {
+  margin-right: 5px;
+}
+.moderator-list-content{
+  display: inline-block;
+  margin: 5px 0;
+}
+}

app/assets/stylesheets/admins/memos.scss

@@ -0,0 +1,5 @@
+.admins-memos-index-page {
+  .users-list-container {
+    text-align: center;
+  }
+}

app/assets/stylesheets/customers.scss

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

app/controllers/accounts_controller.rb

@@ -1,5 +1,4 @@
 class AccountsController < ApplicationController
-  include ApplicationHelper
 
   #skip_before_action :check_account, :only => [:logout]
 
@@ -10,7 +9,6 @@ class AccountsController < ApplicationController
   # 其他平台同步注册的用户
   def remote_register
     username = params[:username]&.gsub(/\s+/, "")
-    tip_exception("无法使用以下关键词：#{username}，请重新命名") if ReversedKeyword.check_exists?(username)
     email = params[:email]&.gsub(/\s+/, "")
     password = params[:password]
     platform = (params[:platform] || 'forge')&.gsub(/\s+/, "")
@@ -110,46 +108,63 @@ class AccountsController < ApplicationController
   # 用户注册
   # 注意：用户注册需要兼顾本地版，本地版是不需要验证码及激活码以及使用授权的，注册完成即可使用
   # params[:login] 邮箱或者手机号
-  # params[:namespace] 登录名
   # params[:code]  验证码
   # code_type 1：注册手机验证码  8：邮箱注册验证码
-  # 本地forge注册入口需要重新更改逻辑
   def register
-    # type只可能是1或者8
-    user = nil
     begin
-      Register::Form.new(register_params).validate!
+      # 查询验证码是否正确;type只可能是1或者8
+      type = phone_mail_type(params[:login].strip)
+      code = params[:code].strip
 
-      user = Users::RegisterService.call(register_params)
-      password = register_params[:password].strip
-
-      # gitea用户注册, email, username, password
-      interactor = Gitea::RegisterInteractor.call({username: user.login, email: user.mail, password: password})
-      if interactor.success?
-        gitea_user = interactor.result
-        result = Gitea::User::GenerateTokenService.call(user.login, password)
-        user.gitea_token = result['sha1']
-        user.gitea_uid = gitea_user[:body]['id']
-        if user.save!
-          UserExtension.create!(user_id: user.id)
-          successful_authentication(user)
-          render_ok
-        end
+      if type == 1
+        uid_logger("start register by phone:  type is #{type}")
+        pre = 'p'
+        email = nil
+        phone = params[:login]
+        verifi_code = VerificationCode.where(phone: phone, code: code, code_type: 1).last
       else
-        tip_exception(-1, interactor.error)
+        uid_logger("start register by email:  type is #{type}")
+        pre = 'm'
+        email = params[:login]
+        phone = nil
+        verifi_code = VerificationCode.where(email: email, code: code, code_type: 8).last
+      end
+      uid_logger("start register:  verifi_code is #{verifi_code}, code is #{code}, time is #{Time.now.to_i - verifi_code.try(:created_at).to_i}")
+      # check_code = (verifi_code.try(:code) == code.strip && (Time.now.to_i - verifi_code.created_at.to_i) <= 10*60)
+      # todo 上线前请删除万能验证码"513231"
+      unless code == "513231" && request.subdomain == "test-newweb"
+        return normal_status(-2, "验证码不正确") if verifi_code.try(:code) != code.strip
+        return normal_status(-2, "验证码已失效") if !verifi_code&.effective?
+      end
+
+      return normal_status(-1, "8~16位密码，支持字母数字和符号") unless params[:password] =~ CustomRegexp::PASSWORD
+
+      code = generate_identifier User, 8, pre
+      login = pre + code
+      @user = User.new(admin: false, login: login, mail: email, phone: phone, type: "User")
+      @user.password = params[:password]
+      # 现在因为是验证码，所以在注册的时候就可以激活
+      @user.activate
+      # 必须要用save操作，密码的保存是在users中
+      if @user.save!
+        # todo user_extension
+        UserExtension.create!(user_id: @user.id)
+        # 注册完成，手机号或邮箱想可以奖励500金币
+        # RewardGradeService.call(
+        #   @user,
+        #   container_id: @user.id,
+        #   container_type: pre == 'p' ? 'Phone' : 'Mail',
+        #   score: 500
+        # )
+        # 注册时，记录是否是引流用户
+        ip = request.remote_ip
+        ua = UserAgent.find_by_ip(ip)
+        ua.update_column(:agent_type, UserAgent::USER_REGISTER) if ua
+        successful_authentication(@user)
+        # session[:user_id] = @user.id
+        normal_status("注册成功")
       end
-    rescue Register::BaseForm::EmailError => e
-      render_error(-2, e.message)
-    rescue Register::BaseForm::LoginError => e
-      render_error(-3, e.message)
-    rescue Register::BaseForm::PhoneError => e
-      render_error(-4, e.message)
-    rescue Register::BaseForm::PasswordFormatError => e
-      render_error(-5, e.message)
-    rescue Register::BaseForm::VerifiCodeError => e
-      render_error(-6, e.message)
     rescue Exception => e
-      Gitea::User::DeleteService.call(user.login) unless user.nil?
       uid_logger_error(e.message)
       tip_exception(-1, e.message)
     end
@@ -157,7 +172,6 @@ class AccountsController < ApplicationController
 
   # 用户登录
   def login
-    Users::LoginForm.new(account_params).validate!
     @user = User.try_to_login(params[:login], params[:password])
 
     return normal_status(-2, "错误的账号或密码") if @user.blank?
@@ -184,25 +198,6 @@ class AccountsController < ApplicationController
     # session[:user_id] = @user.id
   end
 
-  def change_password 
-    @user = User.find_by(login: params[:login])
-    return render_error("未找到相关用户!") if @user.blank?
-    return render_error("旧密码不正确") unless @user.check_password?(params[:old_password])
-
-    sync_params = {
-      password: params[:password].to_s,
-      email: @user.mail
-    }
-
-    interactor = Gitea::User::UpdateInteractor.call(@user.login, sync_params)
-    if interactor.success?
-      @user.update_attribute(:password, params[:password])
-      render_ok
-    else
-      render_error(interactor.error)
-    end
-  end
-
   # 忘记密码
   def reset_password
     begin
@@ -284,7 +279,7 @@ class AccountsController < ApplicationController
 
   # 发送验证码
   # params[:login]  手机号或者邮箱号
-  # params[:type]为事件通知类型 1：用户注册 2：忘记密码 3: 绑定手机 4: 绑定邮箱, 5: 验收手机号有效 # 如果有新的继续后面加
+  # params[:type]为事件通知类型 1：用户注册注册 2：忘记密码 3: 绑定手机 4: 绑定邮箱, 5: 验收手机号有效 # 如果有新的继续后面加
   # 发送验证码：send_type 1：注册手机验证码 2：找回密码手机验证码 3：找回密码邮箱验证码 4：绑定手机 5：绑定邮箱
   # 6：手机验证码登录 7：邮箱验证码登录 8：邮箱注册验证码 9: 验收手机号有效
   def get_verification_code
@@ -298,22 +293,19 @@ class AccountsController < ApplicationController
     sign = Digest::MD5.hexdigest("#{OPENKEY}#{value}")
     tip_exception(501, "请求不合理") if sign != params[:smscode]
 
-    logger.info "########### 验证码：#{verification_code}"
     logger.info("########get_verification_code: login_type： #{login_type}， send_type：#{send_type}, ")
 
     # 记录验证码
     check_verification_code(verification_code, send_type, value)
-    render_ok
+    sucess_status
   end
 
-  # check user's login or email or phone is used
-  # params[:value]  手机号或者邮箱号或者登录名
-  # params[:type] 为事件类型 1：登录名(login) 2：email(邮箱) 3：phone(手机号)
-  def check
-    Register::CheckColumnsForm.new(check_params).validate!
-    render_ok
+  # 1 手机类型；0 邮箱类型
+  # 注意新版的login是自动名生成的
+  def phone_mail_type value
+    value =~ /^1\d{10}$/ ? 1 : 0
   end
-  
+
   private
 
   # type 事件类型 1：用户注册 2：忘记密码 3: 绑定手机 4: 绑定邮箱, 5: 验证手机号是否有效 # 如果有新的继续后面加
@@ -356,16 +348,4 @@ class AccountsController < ApplicationController
     params.require(:user).permit(:login, :email, :phone)
   end
 
-  def account_params 
-    params.require(:account).permit(:login, :password)
-  end
-
-  def check_params
-    params.permit(:type, :value)
-  end
-
-  def register_params
-    params.permit(:login, :namespace, :password, :code)
-  end
-  
 end

app/controllers/admins/apply_destroy_controller.rb

@@ -0,0 +1,31 @@
+class Admins::ApplyDestroyController < Admins::BaseController
+  def index 
+    memos = Memo.where(destroy_status: 1).includes(:author).order("created_at desc")
+    @memos = paginate memos
+    respond_to do |format|
+      format.html
+      format.js
+    end
+  end
+
+  def confirm_apply_destroy
+    memo = Memo.find(params[:id])
+    apply_status = params[:confirm]
+    if apply_status == "delete"
+      memo.destroy
+      extra = "d_2"
+      Tiding.create!(:user_id => memo.author_id, :trigger_user_id => 0,
+        container_id: memo.id, container_type: 'Memo',
+        :viewed => 0, :tiding_type => "System", :extra => "d_2")
+    else
+      memo.common!
+      memo.save
+      extra = "d_3"
+      Tiding.create!(:user_id => memo.author_id, :trigger_user_id => 0,
+        container_id: memo.id, container_type: 'Memo',
+        :viewed => 0, :tiding_type => "System", :extra => "d_3")
+    end
+    @status = 1
+    @message = "操作成功"
+  end
+end

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/banned_users_controller.rb

@@ -0,0 +1,66 @@
+class Admins::BannedUsersController < Admins::BaseController
+  # include Admins::BaseHelper
+
+  def index
+    @menu_type = 8
+    @sub_type = 6
+    #被禁言的用户
+    all_banned_users = BannedForum.includes(:memo, :author, user: :user_extensions)
+    banned_true = all_banned_users.where(is_banned: true)
+    @banned_users_size = banned_true.size
+    @banned_type = params[:banned_type] || "banned"
+    @search_params = params[:search] || nil
+    if @banned_type == "banned"
+      banned_users = banned_true
+
+    else
+      banned_users = all_banned_users.where(is_banned: false)
+    end
+
+    if @search_params.present?
+      banned_users = banned_users.joins(:user).where("LOWER(users.login) LIKE ? or LOWER(concat(users.lastname, users.firstname)) LIKE ?", "%#{@search_params}%", "%#{@search_params}%")
+    end
+
+    banned_users = banned_users.order("updated_at desc")
+    @banned_users_count = banned_users.size
+    @banned_users = paginate banned_users
+    # page = (params[:page] || 1).to_i
+    # per_page = 15
+
+    
+    # @banned_users_pages = Paginator.new @banned_users_count, per_page, page
+    # @banned_users = banned_users.limit(@banned_users_pages.per_page).offset(@banned_users_pages.offset).to_a
+
+  end
+
+  def confirm_banned
+    if params[:user_id].blank? || params[:id].blank?
+      @status = -1
+      @message = "参数缺失"
+    else
+      before_users_banned = BannedForum.where(user_id:params[:user_id])
+
+      banned_params = {
+        user_id: params[:user_id],
+        author_id: current_user.id,
+        memo_id: params[:id],
+        is_banned: false,
+        banned_count: before_users_banned.present? ? (before_users_banned.last.banned_count + 1) : 1
+      }
+      new_banned = BannedForum.new(banned_params)
+      if new_banned.save
+        before_users_banned&.update_all(is_banned: false) if before_users_banned.present?
+        @status = 1
+        @message = "取消禁言成功"
+      else
+        @status = -1
+        @message = "取消禁言失败，请稍后重试"
+      end
+    end
+
+
+  end
+
+
+
+end

app/controllers/admins/base_controller.rb

@@ -43,4 +43,30 @@ class Admins::BaseController < ApplicationController
   def setup_laboratory
     Laboratory.current = Laboratory.find_by_subdomain(request.subdomain) || Laboratory.find(1)
   end
+
+  def up_and_down(opr,current_target,position,model_name)
+    modal_target = model_name.capitalize.classify.constantize
+    if model_name == "forum_section"  #只有root才能移动
+      modal_target = modal_target.roots
+    end
+    if opr.to_s == "up"
+      last_target = modal_target.where("position > ?",position)&.first
+      if last_target.present?
+        current_target.update_attribute(:position, last_target.position)
+        last_target.update_attribute(:position, position) # 重新获取当前问题的位置
+        return 0
+      else
+        return -1
+      end
+    elsif opr.to_s == "down"
+      next_target = modal_target.where("position < ?",position)&.last
+      if next_target.present?
+        current_target.update_attribute(:position, next_target.position)
+        next_target.update_attribute(:position, position)
+        return 0
+      else
+        return -1
+      end
+    end
+  end
 end

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/forum_applies_controller.rb

@@ -0,0 +1,89 @@
+class Admins::ForumAppliesController < Admins::BaseController
+  # include Admins::BaseHelper
+
+  def index
+    @menu_type = 8
+    @sub_type = 7
+    all_forum_applies = ApplyForum.includes(:forum_section,:reviews, user: :user_extensions)
+    @select_type = params[:select_type] || "unconfirm"
+    @section_name = params[:section_name] || nil
+    @search_name = params[:user_name] || nil
+    if @select_type == "unconfirm"
+      forum_applies = all_forum_applies.where(is_confirm: 0)
+    else
+      forum_applies = all_forum_applies.where(is_confirm: [1,2])
+    end
+
+    if @section_name.present?
+      forum_applies = forum_applies.joins(:forum_section).where("forum_sections.title like ?", "%#{@section_name}%")
+    end
+
+    if @search_name.present?
+      forum_applies = forum_applies.joins(:user).where("LOWER(users.login) LIKE ? or LOWER(concat(users.lastname, users.firstname)) LIKE ?", "%#{@search_name}%", "%#{@search_name}%")
+    end
+    forum_applies = forum_applies.order("apply_forums.updated_at desc")
+    @forum_applies_count = forum_applies.size
+    @forum_applies = paginate forum_applies
+    # page = (params[:page] || 1).to_i
+    # per_page = 15
+
+   
+    # @forum_applies_pages = Paginator.new @forum_applies_count, per_page, page
+    # @forum_applies = forum_applies.limit(@forum_applies_pages.per_page).offset(@forum_applies_pages.offset).to_a
+
+  end
+
+  def confirm_apply
+    @forum_apply = ApplyForum.find(params[:id])
+    @is_confirm = params[:is_confirm].to_i
+
+    review_result = params[:review_result].to_i
+    review_params = {
+      review_status: review_result,
+      reason: params[:reason].present? ? params[:reason] : nil,
+      user_id: current_user.id,
+      reviewable_type: "ApplyForum",
+      reviewable_id: params[:id],
+      source: "apply_forum"
+    }
+    if Review.exists?(reviewable_type: "ApplyForum", reviewable_id: params[:id], source: "apply_forum")
+      this_review = Review.where(reviewable_type: "ApplyForum", reviewable_id: params[:id], source: "apply_forum").first
+      if this_review.update_attributes(review_params)
+        @status = 1
+        @message = "操作成功"
+      else
+        @status = -1
+        @message = "操作失败"
+      end
+    else
+      review = Review.new(review_params)
+      if review.save
+        @status = 1
+        @message = "操作成功"
+      else
+        @status = -1
+        @message = "操作失败"
+      end
+    end
+
+    if @status > 0
+      @forum_apply.update_attributes(is_confirm: (review_result+1),deal_time: Time.now)
+      exists_moder = ForumModerator.where(user_id: @forum_apply.user_id,forum_section_id: @forum_apply.forum_section_id)
+      if review_result == 1
+        exists_moder.delete_all if exists_moder.exists?
+      elsif review_result == 0
+        unless exists_moder.exists?
+          ForumModerator.create(user_id: @forum_apply.user_id, forum_section_id: @forum_apply.forum_section_id,is_children: @forum_apply.forum_section.try(:parent_id).present?)
+        end
+      end
+
+      Tiding.where(container_type: "ForumSection", container_id: @forum_apply.forum_section_id, status: 0).update_all(status: 1)
+      Tiding.create(:user_id => @forum_apply.user_id, :trigger_user_id => 1,
+                    container_id: @forum_apply.forum_section_id, container_type: 'ForumSection',
+                    :parent_container_id => @forum_apply.id, :parent_container_type => "ApplyForum",
+                    :viewed => 0,status: 1, :tiding_type => "System",extra: "4")
+    end
+
+  end
+
+end

app/controllers/admins/forum_moderators_controller.rb

@@ -0,0 +1,59 @@
+class Admins::ForumModeratorsController < Admins::BaseController
+  before_action :set_forum
+
+  def new
+
+  end
+
+  def create
+    user_ids = params[:member_ids]
+    is_children = @forum_section.parent_id.present?
+    if user_ids.present? && user_ids.size > 0
+      user_ids = user_ids.reject(&:blank?)
+      user_ids.each do |user_id|
+        unless ForumModerator.exists?(user_id: user_id, forum_section_id: @forum_section.id)
+          @forum_section.forum_moderators.create!(user_id: user_id, is_children: is_children)
+        end
+        unless is_children
+          children_forum_sections = @forum_section.children_forum
+          children_forum_sections.each do |children|
+            unless ForumModerator.exists?(user_id: user_id, forum_section_id: children.id)
+              children.forum_moderators.create!(user_id: user_id, is_children: true)
+            end
+          end
+        end
+      end
+
+      @forum_moderators = @forum_section.forum_moderators
+      @forum_status = 1
+    else
+      @forum_status = -1
+    end
+  end
+
+  def destroy
+    @forum_moderator = ForumModerator.find_by_id(params[:id])
+    @forum_moderator.destroy
+  end
+
+  def search_user
+    return_html = ""
+    user_name = params[:user_name].strip
+    if user_name.present?
+      users = User.where("( LOWER(login) LIKE ? or LOWER(concat(lastname, firstname)) LIKE ? or LOWER(mail) LIKE ? )",
+                         "%#{user_name}%","%#{user_name}%","%#{user_name}%")
+      users.each do |u|
+        check_html = "<div class='search-user-check'><input id='check_user_#{u.login}' class='magic-checkbox mr4' type='checkbox' name='member_ids[]' value=""#{u.id}"" checked='false'><label for='check_user_#{u.login}'>#{u.try(:show_real_name)}</label></div>"
+        return_html << check_html
+      end
+    end
+    render json: {html: return_html }
+  end
+
+  private
+
+  def set_forum
+    @forum_section = ForumSection.find_by_id(params[:forum_section_id])
+  end
+
+end

app/controllers/admins/forum_sections_controller.rb

@@ -0,0 +1,153 @@
+#论坛的板块设置
+class Admins::ForumSectionsController < Admins::BaseController
+  before_action :set_forum, except: [:index, :new,:create]
+
+  def index
+    @menu_type = 8
+    @sub_type = 5
+
+    forum_sections = ForumSection.roots.includes(:forum_moderators).order("position desc")
+    @max_position = forum_sections&.maximum(:position).to_i
+    @min_position = forum_sections&.minimum(:position).to_i
+    @forum_sections_count = forum_sections.size
+    # page = (params[:page] || 1).to_i
+    # per_page = 15
+    # @forum_sections_pages = Paginator.new @forum_sections_count, per_page, page
+    # @forum_sections = forum_sections.limit(@forum_sections_pages.per_page).offset(@forum_sections_pages.offset).to_a
+    @forum_sections = paginate forum_sections
+    respond_to do |format|
+      format.html
+      format.js
+    end
+  end
+
+  def new
+    @parent_id = params[:parent_id]
+    @forum_section = ForumSection.new
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  def create
+    attachment_id = params[:attachments]&.first
+    positions = ForumSection.pluck(:position).select { |a| a.is_a? Integer }
+    positions = positions.max.to_i
+    if params[:forum_section][:parent_id].present?
+      @parent_forum = ForumSection.find_by_id(params[:forum_section][:parent_id])
+    end
+    if params[:forum_section][:title].blank?
+      forum_status = 0
+      forum_msg = "标题不能为空"
+    elsif params[:forum_section][:title].strip.length > 20
+      forum_status = 0
+      forum_msg = "不能超过最大限制：20个字符"
+    elsif ForumSection.exists?(title: params[:forum_section][:title].strip)
+      forum_status = 0
+      forum_msg = "不能重名"
+    else
+      forum_section_params = {
+        user_id: current_user.id,
+        title: params[:forum_section][:title].strip,
+        position: positions + 1,
+        parent_id: params[:forum_section][:parent_id],
+        is_recommend: false,
+        description: params[:forum_section][:description].to_s.truncate(200)
+      }
+      @forum_section = ForumSection.new(forum_section_params)
+      if @forum_section.save
+        if attachment_id.present?
+          attachment = Attachment.find(attachment_id)
+          attachment.container = @forum_section
+          attachment.save
+          @forum_section.attachment_id = attachment_id
+          @forum_section.save
+        end
+        forum_status = 1
+        forum_msg = "创建成功"
+      else
+        forum_status = -1
+        forum_msg = "创建失败,请重试"
+      end
+    end
+    @forum_status = {status: forum_status, msg: forum_msg}
+  end
+
+  def edit
+    @children_forum = params[:children_forum]
+    @attachment = @forum_section.image_attachment
+  end
+
+  def update
+    attachment_id = params[:attachments]&.first
+    if params[:forum_section][:title].blank?
+      forum_status = 0
+      forum_msg = "名称不能为空"
+    elsif params[:forum_section][:title].strip.length > 20
+      forum_status = 0
+      forum_msg = "不能超过最大限制：20个字符"
+    elsif params[:forum_section][:title].strip != @forum_section.title && ForumSection.exists?(title: params[:forum_section][:title].strip)
+      forum_status = 0
+      forum_msg = "不能重名"
+    else
+      
+      if @forum_section.update_attributes(title: params[:forum_section][:title].strip, description: params[:forum_section][:description].to_s.truncate(200))
+
+        unless attachment_id.blank? ||  @forum_section.attachment_id.to_i == attachment_id.to_i
+          Attachment.where(id: @forum_section.attachment_id.to_i).destroy_all if @forum_section.attachment_id.present?
+          attachment = Attachment.find(attachment_id)
+          attachment.container = @forum_section
+          attachment.save
+          @forum_section.attachment_id = attachment_id
+          @forum_section.save
+        end
+        forum_status = 1
+        forum_msg = "更新成功"
+      else
+        forum_status = -1
+        forum_msg = "更新失败,请重试"
+      end
+    end
+    @edit_forum_status = {status: forum_status, msg: forum_msg}
+  end
+
+  def destroy
+    if @forum_section.destroy
+      delete_status = 1
+      delete_msg = "删除成功"
+    else
+      delete_status = -1
+      delete_msg = "删除失败,请稍后重试"
+    end
+    @delete_status = {status: delete_status, msg: delete_msg}
+  end
+
+  def order_forums
+    @children_forums = @forum_section.get_children_section("asc")
+  end
+
+  def recommend_forums
+    @forum_section.update_attribute(:is_recommend, params[:is_recommend])
+  end
+
+  def move
+    cate_opt = params[:opr]
+    cate_position = @forum_section.position.to_i
+    move_status = up_and_down(cate_opt,@forum_section,cate_position,"forum_section")
+    if move_status == 0
+      @c_msg = "移动成功"
+    else
+      @c_msg = "移动失败"
+    end
+    redirect_to admins_forum_sections_path
+  end
+
+  private
+
+  def set_forum
+    @forum_section = ForumSection.find_by_id(params[:id])
+  end
+
+
+
+end

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/memo_reply_lists_controller.rb

@@ -0,0 +1,16 @@
+class Admins::MemoReplyListsController < Admins::BaseController
+
+  def index 
+    @memo_hidden_type = params[:hidden] || ""
+    memos = Memo.where("parent_id is not null").includes(:author, :parent)
+    if @memo_hidden_type.present?
+      memos = memos.where(hidden: @memo_hidden_type.to_s == "hidden")
+    end
+    memos = memos.order("created_at desc")
+    @memos = paginate memos
+    respond_to do |format|
+      format.html
+      format.js
+    end
+  end
+end

app/controllers/admins/memos_controller.rb

@@ -0,0 +1,79 @@
+class Admins::MemosController < Admins::BaseController
+  # include Admins::BaseHelper
+  # 帖子
+  def index
+    @memo_hidden_type = params[:hidden] || ""
+
+    memos = Memo.where(parent_id: nil).includes(:author)
+    if @memo_hidden_type.present?
+      memos = memos.where(hidden: @memo_hidden_type.to_s == "hidden")
+    end
+    memos = memos.order("created_at desc")
+    @memos = paginate memos
+    respond_to do |format|
+      format.html
+      format.js
+    end
+  end
+
+  def memo_homepage_show
+    memo = Memo.find params[:id]
+    memo.update_column(:homepage_show, params[:checked]) unless memo.hidden?
+    render :json => {status: 1, message: "设置成功!"}
+  end
+
+  def memo_hidden
+    memo = Memo.find params[:id]
+    if params[:checked].to_s == 'true'
+      publish_time = Time.now
+      action_type = "passed"
+      extra = "1"
+    else
+      publish_time = nil
+      action_type = "refuse"
+      extra = "2"
+    end
+    memo.update_attributes(hidden: !(params[:checked].to_s == 'true'), published_at: publish_time) # 勾选代表不隐藏，所以要取反
+    CheckedAction.create!(user_id: current_user.id,checkable_type: "Memo",checkable_id: params[:id], action_type: action_type, action_at: Time.now)
+
+
+    if !memo.hidden? && memo.parent_id.present? && !memo.tidings.exists?(user_id: memo.parent.author_id,trigger_user_id: memo.author_id, extra: "3")
+      Tiding.create(:user_id => memo.parent.author_id, :trigger_user_id => memo.author_id,
+                 container_id: memo.id, container_type: 'Memo',
+                 :parent_container_id => memo.root_id, :parent_container_type => "Memo",
+                 :viewed => 0, :tiding_type => "Comment", :extra => "3")
+
+    elsif !memo.hidden?  && memo.parent_id.blank?
+      Tiding.create(:user_id => memo.author_id, :trigger_user_id => current_user.id,
+                    container_id: memo.id, container_type: 'Memo',
+                    :viewed => 0, :tiding_type => "Comment",:extra => extra)
+
+    end
+    render :json => {status: 1, message: "设置成功!"}
+  end
+
+  def delete_memo
+    memo = Memo.find params[:id]
+    memo.destroy if memo.hidden?
+    redirect_to memo.parent_id.present? ? admins_memo_reply_lists_path : admins_memos_path
+  end
+
+  # def memo_reply_list
+  #   @menu_type = 8
+  #   @sub_type = 4
+  #   @memo_hidden_type = params[:hidden] || ""
+  #   Rails.logger.info("======================sub_type==================#@sub_type")
+
+  #   memos = Memo.where("parent_id is not null").includes(:author, :parent)
+  #   if @memo_hidden_type.present?
+  #     memos = memos.where(hidden: @memo_hidden_type.to_s == "hidden")
+  #   end
+  #   memos = memos.order("created_at desc")
+  #   @memos = paginate memos
+  #   respond_to do |format|
+  #     format.html
+  #     format.js
+  #   end
+  # end
+
+end

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

app/controllers/admins/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,34 +1,14 @@
 class Admins::ProjectsController < Admins::BaseController
-  before_action :find_project, only: [:edit, :update]
 
   def index
-    sort_by = Project.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'created_on'
-    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)
   end
 
-  def edit ;end
-
-  def update
-    respond_to do |format|
-      if @project.update_attributes(project_update_params)
-        format.html do 
-          redirect_to admins_projects_path
-          flash[:sucess] = "更新成功"
-        end
-        format.js {render_ok}
-      else 
-        format.html do 
-          redirect_to admins_projects_path
-          flash[:danger] = "更新失败"
-        end
-        format.js {render_js_error}
-      end
-    end
-  end
-
   def destroy
     project = Project.find_by!(id: params[:id])
     ActiveRecord::Base.transaction do
@@ -42,13 +22,4 @@ class Admins::ProjectsController < Admins::BaseController
       redirect_to admins_projects_path
       flash[:danger] = "删除失败"
   end
-
-  private 
-  def find_project
-    @project = Project.find_by_id(params[:id])
-  end
-
-  def project_update_params 
-    params.require(:project).permit(:is_pinned, :recommend, :recommend_index)
-  end
 end

app/controllers/admins/reversed_keywords_controller.rb

@@ -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,75 +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 history
-    @users = @notification.users
-  end
-
-  def new 
-    @notification = SystemNotification.new
-  end
-
-  def edit 
-  end
-
-  def create 
-    @notification = SystemNotification.new(notification_params)
-    if @notification.save
-      redirect_to admins_system_notifications_path
-      flash[:success] = '系统消息创建成功'
-    else
-      redirect_to admins_system_notifications_path
-      flash[:danger] = @notification.errors.full_messages.join(",")
-    end
-  end
-
-  def update 
-    respond_to do |format|
-      if @notification.update_attributes(notification_params)
-        format.html do 
-          redirect_to admins_system_notifications_path
-          flash[:success] = '系统消息更新成功'
-        end
-        format.js {render_ok}
-      else 
-        format.html do 
-          redirect_to admins_system_notifications_path
-          flash[:danger] = @notification.errors.full_messages.join(",")
-        end
-        format.js {render_js_error}
-      end
-    end
-  end
-
-  def destroy 
-    if @notification.destroy 
-      redirect_to admins_system_notifications_path 
-      flash[:success] = "系统消息删除成功"
-    else 
-      redirect_to admins_system_notifications_path 
-      flash[:danger] = "系统消息删除失败"
-    end
-  end
-
-  private 
-  def notification_params 
-    params.require(:system_notification).permit!
-  end
-
-  def get_notification
-    @notification = SystemNotification.find_by(id: params[:id])
-    unless @notification.present?
-      redirect_to admins_system_notifications_path 
-      flash[:danger] = "系统消息不存在"
-    end
-  end
-end

app/controllers/admins/users_controller.rb

@@ -1,6 +1,4 @@
 class Admins::UsersController < Admins::BaseController
-  before_action :finder_user, except: [:index]
-
   def index
     params[:sort_by] = params[:sort_by].presence || 'created_on'
     params[:sort_direction] = params[:sort_direction].presence || 'desc'
@@ -10,9 +8,12 @@ class Admins::UsersController < Admins::BaseController
   end
 
   def edit
+    @user = User.find(params[:id])
   end
 
   def update
+    @user = User.find(params[:id])
+
     Admins::UpdateUserService.call(@user, update_params)
     flash[:success] = '保存成功'
     redirect_to edit_admins_user_path(@user)
@@ -25,47 +26,43 @@ class Admins::UsersController < Admins::BaseController
   end
 
   def destroy
-    @user.destroy!
-    Gitea::User::DeleteService.call(@user.login)
+    User.find(params[:id]).destroy!
 
     render_delete_success
   end
 
   def lock
-    @user.lock!
+    User.find(params[:id]).lock!
 
     render_ok
   end
 
   def unlock
-    @user.activate!
+    User.find(params[:id]).activate!
 
     render_ok
   end
 
   def reward_grade
+    user = User.find(params[:user_id])
     return render_unprocessable_entity('金币数量必须大于0') if params[:grade].to_i <= 0
 
-    RewardGradeService.call(@user, container_id: @user.id, container_type: 'Feedback', score: params[:grade].to_i, not_unique: true)
+    RewardGradeService.call(user, container_id: user.id, container_type: 'Feedback', score: params[:grade].to_i, not_unique: true)
 
-    render_ok(grade: @user.grade)
+    render_ok(grade: user.grade)
   end
 
   def reset_login_times
-    @user.reset_login_times!
+    User.find(params[:id]).reset_login_times!
 
     render_ok
   end
 
   private
 
-  def finder_user
-    @user = User.find(params[:id])
-  end
-
   def update_params
     params.require(:user).permit(%i[lastname nickname gender identity technical_title student_id is_shixun_marker
                                     mail phone location location_city school_id department_id admin business is_test
-                                    password professional_certification authentication login])
+                                    password professional_certification authentication])
   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
@@ -70,11 +70,49 @@ class ApplicationController < ActionController::Base
 																									(current_user.professional_certification && (ue.teacher? || ue.professional?))
 	end
 
+	def shixun_marker
+		unless current_user.is_shixun_marker? || current_user.admin_or_business?
+			tip_exception(403, "..")
+		end
+	end
+
+	# 实训的访问权限
+	def shixun_access_allowed
+		if !current_user.shixun_permission(@shixun)
+			tip_exception(403, "..")
+		end
+	end
 
 	def admin_or_business?
 		User.current.admin? || User.current.business?
 	end
 
+	# 访问课堂时没权限直接弹加入课堂的弹框 ：409
+	def user_course_identity
+		@user_course_identity = current_user.course_identity(@course)
+		if @user_course_identity > Course::STUDENT && @course.is_public == 0
+			tip_exception(401, "..") unless User.current.logged?
+			check_account
+			tip_exception(@course.excellent ? 410 : 409, "您没有权限进入")
+		end
+		if @user_course_identity > Course::CREATOR && @user_course_identity <= Course::STUDENT && @course.tea_id != current_user.id
+			# 实名认证和职业认证的身份判断
+			tip_exception(411, "你的实名认证和职业认证审核未通过") if @course.authentication &&
+				@course.professional_certification && (!current_user.authentication && !current_user.professional_certification)
+			tip_exception(411, "你的实名认证审核未通过") if @course.authentication && !current_user.authentication
+			tip_exception(411, "你的职业认证审核未通过") if @course.professional_certification && !current_user.professional_certification
+		end
+		uid_logger("###############user_course_identity:#{@user_course_identity}")
+	end
+
+	# 题库的访问权限
+	def bank_visit_auth
+		tip_exception(-2,"未通过职业认证") if current_user.is_teacher? && !current_user.certification_teacher? && !current_user.admin_or_business? && @bank.user_id != current_user.id && @bank.is_public
+		tip_exception(403, "无权限") unless @bank.user_id == current_user.id || current_user.admin_or_business? ||
+			(current_user.certification_teacher? && @bank.is_public)
+	end
+
+
 	# 判断用户的邮箱或者手机是否可用
 	# params[:type] 1: 注册；2：忘记密码；3：绑定
 	def  check_mail_and_phone_valid login, type
@@ -82,16 +120,16 @@ class ApplicationController < ActionController::Base
 					 login =~ /^[a-zA-Z0-9]+([._\\]*[a-zA-Z0-9])$/
 			tip_exception(-2, "请输入正确的手机号或邮箱")
 		end
-	
-		user_exist = Owner.exists?(phone: login) || Owner.exists?(mail: login)
-		if user_exist && type.to_i == 1
+		# 考虑到安全参数问题，多一次查询，去掉Union
+		user = User.where(phone: login).first ||  User.where(mail: login).first
+		if type.to_i == 1 && !user.nil?
 			tip_exception(-2, "该手机号码或邮箱已被注册")
-		elsif type.to_i == 2 && !user_exist
+		elsif type.to_i == 2 && user.nil?
 			tip_exception(-2, "该手机号码或邮箱未注册")
-		elsif type.to_i == 3 && user_exist
+		elsif type.to_i == 3 && user.present?
 			tip_exception(-2, "该手机号码或邮箱已绑定")
 		end
-		render_ok
+		sucess_status
 	end
 
 	# 发送及记录激活码
@@ -102,7 +140,7 @@ class ApplicationController < ActionController::Base
 		when 1, 2, 4, 9
 			# 手机类型的发送
 			sigle_para = {phone: value}
-			status = Gitlink::Sms.send(mobile: value, code: code)
+			status = Educoder::Sms.send(mobile: value, code: code)
 			tip_exception(-2, code_msg(status)) if status != 0
 		when 8, 3, 5
 			# 邮箱类型的发送
@@ -148,6 +186,26 @@ class ApplicationController < ActionController::Base
 		end
 	end
 
+	def find_course
+		return normal_status(2, '缺少course_id参数！') if params[:course_id].blank?
+		@course = Course.find(params[:course_id])
+		tip_exception(404, "") if @course.is_delete == 1 && !current_user.admin_or_business?
+	rescue Exception => e
+		tip_exception(e.message)
+	end
+
+	def course_manager
+		return normal_status(403, '只有课堂管理员才有权限') if @user_course_identity > Course::CREATOR
+	end
+
+	def find_board
+		return normal_status(2, "缺少board_id参数") if params[:board_id].blank?
+		@board = Board.find(params[:board_id])
+	rescue Exception => e
+		uid_logger_error(e.message)
+		tip_exception(e.message)
+	end
+
 	def validate_type(object_type)
 		normal_status(2, "参数") if params.has_key?(:sort_type) && !SORT_TYPE.include?(params[:sort_type].strip)
 	end
@@ -157,6 +215,21 @@ class ApplicationController < ActionController::Base
 		@page_size = params[:page_size] || 15
 	end
 
+	# 课堂教师权限
+	def teacher_allowed
+		logger.info("#####identity: #{current_user.course_identity(@course)}")
+		unless current_user.course_identity(@course) < Course::STUDENT
+			normal_status(403, "")
+		end
+	end
+
+	# 课堂教师、课堂管理员、超级管理员的权限(不包含助教)
+	def teacher_or_admin_allowed
+		unless current_user.course_identity(@course) < Course::ASSISTANT_PROFESSOR
+			normal_status(403, "")
+		end
+	end
+
 	def require_admin
 		normal_status(403, "") unless User.current.admin?
 	end
@@ -173,17 +246,9 @@ 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 Gitlink::TipException.new(status, message)
+		raise Educoder::TipException.new(status, message)
 	end
 
 	def missing_template
@@ -192,7 +257,7 @@ class ApplicationController < ActionController::Base
 
 	# 弹框提醒
 	def tip_show_exception(status = -2, message)
-		raise Gitlink::TipException.new(status, message)
+		raise Educoder::TipException.new(status, message)
 	end
 
 	def normal_status(status = 0, message)
@@ -207,12 +272,28 @@ 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
 	end
 
+	def check_batch_requests
+		if request.method.to_s.upcase == "POST"
+			check_key = "request.remote_ip:#{request.remote_ip}"
+			result = Rails.cache.read(check_key)
+			if result.present?
+				if result.to_i > 1000
+					tip_exception(401, '暂时无法请求，请稍后再试')
+				else
+					Rails.cache.write(check_key, result.to_i + 1)
+				end
+			else
+				Rails.cache.write(check_key, 1, expires_in: 1.hour)
+			end
+		end
+	end
+
 	# 系统全局认证(暂时隐藏试用申请的判断)
 	def check_auth
 		# day_cer = UserDayCertification.find_by(user_id: current_user.id)
@@ -272,18 +353,17 @@ class ApplicationController < ActionController::Base
 
 		# 测试版前端需求
 		logger.info("subdomain:#{request.subdomain}")
-		# if request.subdomain != "www"
-		# 	if params[:debug] == 'teacher' #todo 为了测试,记得讲debug删除
-		# 		User.current = User.find 81403
-		# 	elsif params[:debug] == 'student'
-		# 		User.current = User.find 8686
-		# 	elsif params[:debug] == 'admin'
-		# 		logger.info "@@@@@@@@@@@@@@@@@@@@@@ debug mode....."
-		# 		user =  User.find 36480
-		# 		User.current = user
-		# 		cookies.signed[:user_id] = user.id
-		# 	end
-		# end
+		if request.subdomain != "www"
+			if params[:debug] == 'teacher' #todo 为了测试,记得讲debug删除
+				User.current = User.find 81403
+			elsif params[:debug] == 'student'
+				User.current = User.find 8686
+			elsif params[:debug] == 'admin'
+				user = User.find 1
+				User.current = user
+				cookies.signed[:user_id] = user.id
+			end
+		end
 		# User.current = User.find 81403
 	end
 
@@ -320,7 +400,11 @@ class ApplicationController < ActionController::Base
 	end
 
 	def current_user
-		User.current
+		if Rails.env.development?
+			User.current = User.find 1
+		else
+			User.current
+		end
 	end
 
 	## 默认输出json
@@ -373,7 +457,7 @@ class ApplicationController < ActionController::Base
 			JSON.parse(res)
 		rescue Exception => e
 			uid_logger_error("--uri_exec: exception #{e.message}")
-			raise Gitlink::TipException.new("实训平台繁忙（繁忙等级：84）")
+			raise Educoder::TipException.new("实训平台繁忙（繁忙等级：84）")
 		end
 	end
 
@@ -392,7 +476,7 @@ class ApplicationController < ActionController::Base
 			end
 		rescue Exception => e
 			uid_logger("--uri_exec: exception #{e.message}")
-			raise Gitlink::TipException.new(message)
+			raise Educoder::TipException.new(message)
 		end
 	end
 
@@ -416,7 +500,7 @@ class ApplicationController < ActionController::Base
 			end
 		rescue Exception => e
 			uid_logger("--uri_exec: exception #{e.message}")
-			raise Gitlink::TipException.new("服务器繁忙")
+			raise Educoder::TipException.new("服务器繁忙")
 		end
 	end
 
@@ -550,8 +634,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"
@@ -588,8 +672,8 @@ class ApplicationController < ActionController::Base
 
 	# 获取Oauth Client
 	def get_client(site)
-		client_id = Rails.configuration.Gitlink['client_id']
-		client_secret = Rails.configuration.Gitlink['client_secret']
+		client_id = Rails.configuration.educoder['client_id']
+		client_secret = Rails.configuration.educoder['client_secret']
 
 		OAuth2::Client.new(client_id, client_secret, site: site)
 	end
@@ -615,14 +699,6 @@ class ApplicationController < ActionController::Base
 		relation.page(page).per(limit)
 	end
 
-	def kaminari_array_paginate(relation)
-		limit = params[:limit] || params[:per_page]
-		limit = (limit.to_i.zero? || limit.to_i > 15) ? 15 : limit.to_i
-		page  = params[:page].to_i.zero? ? 1 : params[:page].to_i
-
-		Kaminari.paginate_array(relation).page(page).per(limit)
-	end
-
 	def strf_time(time)
 		time.blank? ? '' : time.strftime("%Y-%m-%d %H:%M:%S")
 	end
@@ -684,15 +760,15 @@ class ApplicationController < ActionController::Base
     namespace = params[:owner]
     id = params[:repo] || params[:id]
 
-    @project, @owner = Project.find_with_namespace(namespace, id)
+    @project = Project.find_with_namespace(namespace, id)
 
     if @project and current_user.can_read_project?(@project)
 			logger.info "###########： has project and can read project"
 			@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
@@ -702,34 +778,9 @@ class ApplicationController < ActionController::Base
 	end
 
 	def load_repository
-		@repository ||= load_project&.repository
+		@repository ||= load_project.repository
 	end
 
-	def base_url
-		Rails.application.config_for(:configuration)['platform_url'] || request.base_url
-	end
-
-	def convert_image!
-		@image = params[:image] 
-		@image = @image.nil? && params[:user].present? ? params[:user][:image] : @image
-    return unless @image.present?
-    max_size = EduSetting.get('upload_avatar_max_size') || 2 * 1024 * 1024 # 2M
-    if @image.class == ActionDispatch::Http::UploadedFile
-      render_error('请上传文件') if @image.size.zero?
-      render_error('文件大小超过限制') if @image.size > max_size.to_i
-    else
-      image = @image.to_s.strip
-      return render_error('请上传正确的图片') if image.blank?
-      @image = Util.convert_base64_image(image, max_size: max_size.to_i)
-    end
-  rescue Base64ImageConverter::Error => ex
-    render_error(ex.message)
-	end
-	
-  def avatar_path(object)
-    ApplicationController.helpers.disk_filename(object.class, object.id)
-  end
-
   private
 	def object_not_found
 		uid_logger("Missing template or cant't find record, responding with 404")
@@ -782,8 +833,4 @@ class ApplicationController < ActionController::Base
 		HotSearchKeyword.add(keyword)
 	end
 
-  def find_atme_receivers
-    @atme_receivers = User.where(login: params[:receivers_login])
-  end
-
 end

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/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
 
@@ -101,6 +92,52 @@ class AttachmentsController < ApplicationController
     end
   end
 
+  #后台上传图片
+  def upload_images
+    upload_file = params["file"] || params["#{params[:file_param_name]}"]# 这里的file_param_name是为了方便其他插件名称
+    raise "未上传文件" unless upload_file
+
+    folder = file_storage_directory
+    raise "存储目录未定义" unless folder.present?
+    month_folder = current_month_folder
+    save_path = File.join(folder, month_folder)
+
+    ext = file_ext(upload_file.original_filename)
+
+    local_path, digest = file_save_to_local(save_path, upload_file.tempfile, ext)
+
+    content_type = upload_file.content_type.presence || 'application/octet-stream'
+    remote_path = nil # TODO 暂时本地上传，待域名配置后方可上传至云端
+
+    logger.info "local_path: #{local_path}"
+    logger.info "remote_path: #{remote_path}"
+
+    disk_filename = local_path[save_path.size + 1, local_path.size]
+
+    @attachment = Attachment.where(disk_filename: disk_filename,
+                                   author_id: current_user.id,
+                                   cloud_url: remote_path).first
+
+    if @attachment.blank?
+      @attachment = Attachment.new
+      @attachment.filename = upload_file.original_filename
+      @attachment.disk_filename = local_path[save_path.size + 1, local_path.size]
+      @attachment.filesize = upload_file.tempfile.size
+      @attachment.content_type = content_type
+      @attachment.digest = digest
+      @attachment.author_id = current_user.id
+      @attachment.disk_directory = month_folder
+      @attachment.cloud_url = remote_path
+      @attachment.save!
+      @status = 1
+    else
+      @status = -1
+    end
+    respond_to do |format|
+      format.js
+    end
+  end
+
   def destroy
     begin
       @file_path = absolute_path(local_path(@file))
@@ -196,7 +233,7 @@ class AttachmentsController < ApplicationController
   end
 
   def file_save_to_ucloud(path, file, content_type)
-    ufile = Gitlink::Ufile.new(
+    ufile = Educoder::Ufile.new(
         ucloud_public_key: edu_setting('public_key'),
         ucloud_private_key: edu_setting('private_key'),
         ucloud_public_read: true,

app/controllers/categories_controller.rb

@@ -0,0 +1,36 @@
+# encoding=utf-8
+class CategoriesController < ApplicationController
+  before_action :require_login, :except => [:all]
+  include ApplicationHelper
+
+  # 所有类型，通过参数过滤
+  def all
+    render_react
+  end
+
+  def guide
+    render_react
+  end
+
+  def techShare
+    render_react
+  end
+
+  def show
+    render_react
+  end
+
+  def shixun_discuss
+    render_react
+  end
+
+  # 我的发布
+  def my_published
+
+  end
+
+  private
+  def render_react
+    render "/common/index", :layout => false
+  end
+end

app/controllers/ci/base_controller.rb

@@ -1,76 +0,0 @@
-class Ci::BaseController < ApplicationController
-  include Ci::DbConnectable
-
-  before_action :require_login
-  before_action :connect_to_ci_db
-
-  def load_repo
-    namespace = params[:owner]
-    id = params[:repo] || params[:id]
-
-    @ci_user, @repo = Ci::Repo.find_with_namespace(namespace, id)
-  end
-
-  def load_all_repo
-    namespace = current_user.login
-    @repos = Ci::Repo.find_all_with_namespace(namespace)
-  end
-
-  def load_repo_by_repo_slug(slug)
-    @repo_slug = Ci::Repo.load_repo_by_repo_slug(slug)
-  end
-
-  private
-    def authorize_access_project!
-      unless @project.manager?(current_user)
-        return render_forbidden
-      end
-    end
-
-    def authenticate_manager!
-      unless @project.manager?(current_user)
-        return render_forbidden
-      end
-    end
-
-    def authenticate_admin!
-      return render_forbidden unless current_user.admin?
-    end
-
-    def authorize_owner!
-      unless @project.owner?(current_user)
-        return render_forbidden
-      end
-    end
-
-    def find_cloud_account
-      @cloud_account ||= current_user.ci_cloud_account
-      @cloud_account.blank? ? nil : @cloud_account
-    end
-
-    def load_ci_user
-      @ci_user ||= Ci::User.find_by(user_login: params[:owner])
-      @ci_user.blank? ? raise("未找到相关的记录") : @ci_user
-    end
-
-  def connect_to_ci_db(options={})
-    current = current_user
-    owner = params[:owner]
-    if owner
-      current = User.find_by(login: owner)
-    end
-
-    if !(current && !current.is_a?(AnonymousUser) && !current.devops_uninit?)
-      return
-    end
-
-    if current.ci_cloud_account.server_type == Ci::CloudAccount::SERVER_TYPE_TRUSTIE
-      connect_to_trustie_ci_database(options)
-    else
-      options = options.merge(db_name: current.login)
-      connect_to_ci_database(options)
-    end
-
-  end
-
-end

app/controllers/ci/builds_controller.rb

@@ -1,53 +0,0 @@
-class Ci::BuildsController < Ci::BaseController
-  include RepositoriesHelper
-
-  before_action :load_project
-  before_action :authorize_owner!, only: [:restart, :stop]
-  before_action :load_repo
-  before_action :find_cloud_account, except: [:index, :show]
-
-  def index
-    @user = current_user
-
-    scope = Ci::Builds::ListQuery.call(@repo, params)
-
-    @total_count = scope.map(&:build_id).size
-    @builds = paginate scope
-  end
-
-  def show
-    @build = @repo.builds.includes(stages: [:steps]).find_by(build_number: params[:build])
-  end
-
-  def restart
-    result = Ci::Drone::API.new(@ci_user.user_hash, @cloud_account.drone_url, @repo.repo_namespace, @repo.repo_name, number: params[:build]).restart
-
-    render json: result
-  end
-
-  def stop
-    result = Ci::Drone::API.new(@ci_user.user_hash, @cloud_account.drone_url, @repo.repo_namespace, @repo.repo_name, number: params[:build]).stop
-    render json: result
-  end
-
-  def logs
-    # TODO **待优化**
-    # 因直接操作ci库，如下查询待优化，可直接根据log id查询即可
-    build = @repo.builds.find_by(build_number: params[:build])
-    return render_not_found("Couldn't found build with 'number'= #{params[:build]}") if build.blank?
-
-    stage = build.stages.includes(steps: [:log]).find_by(stage_number: params[:stage])
-    return render_not_found("Couldn't found build with 'number'= #{params[:stage]}") if stage.blank?
-
-    step = stage.steps.find_by(step_number: params[:step])
-    return render_not_found("Couldn't found build with 'number'= #{params[:step]}") if step.blank?
-
-    log = step.log
-
-    result = log.blank? ? nil : (log.log_data[0..5].include?('null') ? nil : JSON.parse(log.log_data))
-
-    # result = Ci::Drone::API.new(@user.user_hash, @cloud_account.drone_url, @repo.repo_namespace, @repo.repo_name, build: params[:build], stage: params[:stage], step: params[:step]).logs
-
-    render json: result
-  end
-end

app/controllers/ci/cloud_accounts_controller.rb

@@ -1,129 +0,0 @@
-class Ci::CloudAccountsController < Ci::BaseController
-  include Ci::CloudAccountManageable
-
-  skip_before_action :connect_to_ci_db, only: %i[create bind trustie_bind]
-  before_action :load_project, only: %i[create activate]
-  before_action :authorize_owner!, only: %i[create activate]
-  before_action :load_repo, only: %i[activate]
-  before_action :load_all_repo, only: %i[unbind]
-  before_action :find_cloud_account, only: %i[show oauth_grant]
-  before_action :validate_params!, only: %i[create bind]
-  before_action only: %i[create bind] do
-    connect_to_ci_database(master_db: true)
-  end
-
-  def create
-    flag, msg = check_bind_cloud_account!
-    return render_error(msg) if flag === true
-
-    ActiveRecord::Base.transaction do
-      @cloud_account = bind_account!
-      if @cloud_account.blank?
-        render_error('激活失败, 请检查你的云服务器信息是否正确.')
-        raise ActiveRecord::Rollback
-      else
-        current_user.set_drone_step!(User::DEVOPS_UNVERIFIED)
-        render_ok(redirect_url: @cloud_account.authenticate_url)
-      end
-    end
-  rescue Exception => ex
-    render_error(ex.message)
-  end
-
-  def activate
-    return render_error('请先认证') unless current_user.ci_certification?
-
-    begin
-      @cloud_account = Ci::CloudAccount.find params[:id]
-      ActiveRecord::Base.transaction do
-        if @repo
-          return render_error('该项目已经激活') if @repo.repo_active?
-          @repo.activate!(@project)
-        else
-          @repo = Ci::Repo.auto_create!(@ci_user, @project)
-          @user.update_column(:user_syncing, false)
-        end
-
-        result = bind_hook!(current_user, @cloud_account, @repo)
-        @project.update_columns(open_devops: true, gitea_webhook_id: result['id'])
-        @cloud_account.update_column(:ci_user_id, @ci_user.user_id)
-      end
-      render_ok
-    rescue Exception => ex
-      render_error(ex.message)
-    end
-  end
-
-  def show
-  end
-
-  def bind
-    flag, msg = check_bind_cloud_account!
-    return render_error(msg) if flag === true
-
-    ActiveRecord::Base.transaction do
-      @cloud_account = bind_account!
-      if @cloud_account.blank?
-        render_error('激活失败, 请检查你的云服务器信息是否正确.')
-        raise ActiveRecord::Rollback
-      else
-        current_user.set_drone_step!(User::DEVOPS_UNVERIFIED)
-      end
-    end
-  rescue Exception => ex
-    render_error(ex.message)
-  end
-
-  def trustie_bind
-    account = params[:account].to_s
-    return render_error("account不能为空.") if account.blank?
-
-    flag, msg = check_trustie_bind_cloud_account!
-    return render_error(msg) if flag === true
-
-    ActiveRecord::Base.transaction do
-      @cloud_account = trustie_bind_account!
-      if @cloud_account.blank?
-        render_error('激活失败, 请检查你的云服务器信息是否正确.')
-        raise ActiveRecord::Rollback
-      else
-        current_user.set_drone_step!(User::DEVOPS_UNVERIFIED)
-      end
-    end
-  rescue Exception => ex
-    render_error(ex.message)
-  end
-
-  def unbind
-    ActiveRecord::Base.transaction do
-      if current_user.ci_cloud_account.server_type == Ci::CloudAccount::SERVER_TYPE_TRUSTIE
-        if @repos
-          @repos.each do |repo|
-            repo.deactivate!
-          end
-        end
-      end
-      unbind_account!
-      render_ok
-    end
-  rescue Exception => ex
-    render_error(ex.message)
-  end
-
-  def oauth_grant
-    password = params[:password].to_s
-    return render_error('你输入的密码不正确.') unless current_user.check_password?(password)
-
-    oauth = current_user.oauths.last
-    return render_error("服务器出小差了.") if oauth.blank?
-
-    result = gitea_oauth_grant!(password, oauth)
-    return render_error('授权失败.') unless result === true
-    current_user.set_drone_step!(User::DEVOPS_CERTIFICATION)
-  end
-
-  private
-    def validate_params!
-      Ci::CreateCloudAccountForm.new(devops_params).validate!
-    end
-end

app/controllers/ci/languages_controller.rb

@@ -1,20 +0,0 @@
-class Ci::LanguagesController < Ci::BaseController
-  # TODO 需要开启权限认证，只有该项目devops初始化成功后才能获取语言列表
-  before_action :find_langugae, only: :show
-
-  def index
-    @languages = Ci::Language.by_usage_amount_desc
-  end
-
-  def show
-  end
-
-  def common
-    @languages = Ci::Language.six_common
-  end
-
-  private
-    def find_langugae
-      @language = Ci::Language.find params[:id]
-    end
-end

app/controllers/ci/pipelines_controller.rb

@@ -1,294 +0,0 @@
-class Ci::PipelinesController < Ci::BaseController
-
-  before_action :require_login, only: %i[list create content]
-  skip_before_action :connect_to_ci_db, except: %i[list create destroy content]
-  before_action :load_project, only: %i[create content]
-  before_action :load_repo, only: %i[create content]
-
-  # ======流水线相关接口========== #
-  def list
-    @result = Array.new
-    list = Ci::Pipeline.where('identifier=? and owner=?', params[:identifier], params[:owner])
-    # 查询build状态
-    list.collect do |pipeline|
-      pipeline.last_build_time = nil
-      repo = load_repo_by_repo_slug("#{pipeline.owner}/#{pipeline.identifier}")
-      if repo
-        build = repo.builds.order("build_created desc").find_by(build_target: pipeline.branch)
-        if build
-          pipeline.pipeline_status = build.build_status
-          pipeline.last_build_time = Time.at(build.build_created)
-        end
-      end
-      @result.push(pipeline)
-    end
-    @total_count = @result.size
-    @pipelines = paginate @result
-  end
-
-  def create
-    ActiveRecord::Base.transaction do
-      size = Ci::Pipeline.where('branch=? and identifier=? and owner=?', params[:branch], params[:repo], params[:owner]).size
-      if size > 0
-        render_error("#{params[:branch]}分支已经存在流水线！")
-        return
-      end
-      pipeline = Ci::Pipeline.new(pipeline_name: params[:pipeline_name], file_name: params[:file_name],owner: params[:owner],
-                                  login: current_user.login, identifier: params[:repo], branch: params[:branch], event: params[:event])
-      pipeline.save!
-
-      # 默认创建四个初始阶段
-      init_stages = Ci::PipelineStage::INIT_STAGES
-      index = 1
-      init_stages.each do |type, name|
-        pipeline.pipeline_stages.build(
-          stage_name: name,
-          stage_type: type,
-          show_index: index
-        ).save!
-        index += 1
-      end
-      create_pipeline_file(pipeline)
-      create_ci_repo(pipeline)
-      render_ok({id: pipeline.id})
-    end
-  rescue Exception => ex
-    render_error(ex.message)
-  end
-
-  # 在代码库创建文件
-  def create_pipeline_file(pipeline)
-    sha = get_pipeline_file_sha(pipeline.file_name, pipeline.branch)
-    if sha
-      logger.info "#{pipeline.file_name}已存在"
-    else
-      interactor = Gitea::CreateFileInteractor.call(current_user.gitea_token, @owner.login, content_params)
-      if interactor.success?
-        logger.info "#{pipeline.file_name}创建成功"
-      end
-    end
-  end
-
-  # 在drone数据库repo表新增一条repo记录
-  def create_ci_repo(pipeline)
-    if pipeline.branch != 'master'
-      create_params = {
-        repo_user_id: @ci_user.user_id,
-        repo_namespace: @project.owner.login,
-        repo_name: @project.identifier,
-        repo_slug: "#{@project.owner.login}/#{@project.identifier}-" + pipeline.id.to_s,
-        repo_clone_url: @project.repository.url,
-        repo_branch: pipeline.branch,
-        repo_config: pipeline.file_name
-      }
-      repo = Ci::Repo.create_repo(create_params)
-      repo
-    end
-    nil
-  end
-
-  def get_pipeline_file_sha(file_name, branch)
-    file_path_uri = URI.parse(file_name)
-    interactor = Repositories::EntriesInteractor.call(@project.owner, @project.identifier, file_path_uri, ref: branch || 'master')
-    if interactor.success?
-      file = interactor.result
-      file['sha']
-    end
-  end
-
-  def content_params
-    {
-      filepath: params[:file_name],
-      branch: params[:branch],
-      new_branch: params[:new_branch],
-      content: "#pipeline \n",
-      message: 'create pipeline',
-      committer: {
-        email: current_user.mail,
-        name: current_user.login
-      },
-      identifier: params[:repo]
-    }
-  end
-
-  def update
-    pipeline = Ci::Pipeline.find(params[:id])
-    if pipeline
-      pipeline.update!(pipeline_name: params[:pipeline_name],branch: params[:branch], event: params[:event])
-    end
-    render_ok
-  rescue Exception => ex
-    render_error(ex.message)
-  end
-
-  def destroy
-    pipeline = Ci::Pipeline.find(params[:id])
-    if pipeline
-      repo = load_repo_by_repo_slug("#{pipeline.login}/#{pipeline.identifier}-" + pipeline.id.to_s)
-      if repo
-        repo.destroy!
-      end
-      pipeline.destroy!
-    end
-    render_ok
-  rescue Exception => ex
-    render_error(ex.message)
-  end
-
-  def content
-    @yaml = "\n"
-    pipeline = Ci::Pipeline.find(params[:id])
-    stages = pipeline.pipeline_stages
-    if stages && !stages.empty?
-      init_step = stages.first.pipeline_stage_steps.first
-      @yaml += init_step.content + "\n" + "steps:\n"
-      stages = stages.slice(1, stages.size - 1)
-      unless stages.empty?
-        stages.each do |stage|
-          steps = stage.pipeline_stage_steps
-          next unless steps && !steps.empty?
-          steps.each do |step|
-            @yaml += step.content + "\n"
-          end
-        end
-      end
-    end
-    @sha = get_pipeline_file_sha(pipeline.file_name, pipeline.branch)
-    trigger = ''
-    trigger += "  branch:\r\n  - #{pipeline.branch}\r\n" unless pipeline.branch.blank?
-    unless pipeline.event.blank?
-      trigger += "  event:\r\n"
-      pipeline.event.split(',').each { |event| trigger += "  - #{event}\r\n"}
-    end
-    @yaml += "trigger:\r\n" + trigger unless trigger.blank?
-    @branch = pipeline.branch
-  end
-
-  # =========阶段相关接口========= #
-  def stages
-    pipeline_id = params[:id]
-    @pipeline_name = Ci::Pipeline.find(pipeline_id).pipeline_name
-    @pipeline_stages = Ci::PipelineStage.where('pipeline_id=?', pipeline_id).order('show_index asc')
-  end
-
-  def create_stage
-    ActiveRecord::Base.transaction do
-      # 修改stage排序
-      update_stage_index(params[:id], params[:show_index], 1)
-      pipeline_stage = Ci::PipelineStage.new(stage_name: params[:stage_name],
-                                             stage_type: params[:stage_type].blank? ? 'customize' : params[:stage_type],
-                                             pipeline_id: params[:id], show_index: params[:show_index])
-      pipeline_stage.save!
-      render_ok
-    end
-  rescue Exception => ex
-    render_error(ex.message)
-  end
-
-  def update_stage
-    pipeline_stage = Ci::PipelineStage.find(params[:stage_id])
-    if pipeline_stage
-      pipeline_stage.update!(stage_name: params[:stage_name])
-    end
-    render_ok
-  rescue Exception => ex
-    render_error(ex.message)
-  end
-
-  def delete_stage
-    ActiveRecord::Base.transaction do
-      update_stage_index(params[:id], params[:show_index].to_i, -1)
-      pipeline_stage = Ci::PipelineStage.find(params[:stage_id])
-      if pipeline_stage
-        pipeline_stage.destroy!
-      end
-      render_ok
-    end
-  rescue Exception => ex
-    render_error(ex.message)
-  end
-
-  def update_stage_index(pipeline_id, show_index, diff)
-    stages = Ci::Pipeline.find(pipeline_id).pipeline_stages
-    stages.each do |stage|
-      if stage.show_index >= show_index
-        stage.update!(show_index: stage.show_index + diff)
-      end
-    end
-  end
-
-  # ========步骤相关接口========= #
-  def steps
-    @stage_type = Ci::PipelineStage.find(params[:stage_id]).stage_type
-    @pipeline_stage_steps = Ci::PipelineStageStep.where('stage_id=?', params[:stage_id]).order('show_index asc')
-  end
-
-  def stage_step
-    ActiveRecord::Base.transaction do
-      steps = params[:steps]
-      unless steps.empty?
-        steps.each do |step|
-          unless step[:template_id]
-            render_error('请选择模板！')
-            return
-          end
-          if !step[:id]
-            step = Ci::PipelineStageStep.new(step_name: step[:step_name], stage_id: params[:stage_id],
-                                             template_id: step[:template_id], content: step[:content], show_index: step[:show_index])
-            step.save!
-          else
-            pipeline_stage_step = Ci::PipelineStageStep.find(step[:id])
-            pipeline_stage_step.update(step_name: step[:step_name], content: step[:content],
-                                       show_index: step[:show_index], template_id: step[:template_id])
-          end
-        end
-      end
-      render_ok
-    end
-  rescue Exception => ex
-    render_error(ex.message)
-  end
-
-  def create_stage_step
-    ActiveRecord::Base.transaction do
-      steps = params[:steps]
-      unless steps.empty?
-        steps.each do |step|
-          step = Ci::PipelineStageStep.new(step_name: step[:step_name], stage_id: params[:stage_id],
-                                           template_id: step[:template_id], content: step[:content], show_index: step[:show_index])
-          step.save!
-        end
-      end
-      render_ok
-    end
-  rescue Exception => ex
-    render_error(ex.message)
-  end
-
-  def update_stage_step
-    ActiveRecord::Base.transaction do
-      steps = params[:steps]
-      unless steps.empty?
-        steps.each do |step|
-          pipeline_stage_step = Ci::PipelineStageStep.find(step[:id])
-          if pipeline_stage_step
-            pipeline_stage_step.update(step_name: step[:step_name], content: step[:content], template_id: step[:template_id])
-          end
-        end
-      end
-      render_ok
-    end
-  rescue Exception => ex
-    render_error(ex.message)
-  end
-
-  def delete_stage_step
-    pipeline_stage_step = Ci::PipelineStageStep.find(params[:step_id])
-    if pipeline_stage_step
-      pipeline_stage_step.destroy!
-    end
-    render_ok
-  rescue Exception => ex
-    render_error(ex.message)
-  end
-end

app/controllers/ci/projects_controller.rb

@@ -1,70 +0,0 @@
-class Ci::ProjectsController < Ci::BaseController
-  include RepositoriesHelper
-  include Ci::CloudAccountManageable
-
-  before_action :load_project
-  before_action :load_repo, only: [:update_trustie_pipeline, :activate, :deactivate]
-  before_action :authorize_owner!, only: [:authorize]
-  before_action :find_cloud_account, only: [:authorize, :activate, :deactivate]
-
-  def authorize
-    @user = current_user
-  end
-
-  # get .trustie-pipeline.yml file
-  def get_trustie_pipeline
-    file_path_uri = URI.parse('.trustie-pipeline.yml')
-    interactor = Repositories::EntriesInteractor.call(@project.owner, @project.identifier, file_path_uri, ref: params[:ref] || "master")
-    if interactor.success?
-      file = interactor.result
-      return render json: {} if file[:status]
-
-      json = {name: file['name'], path: file['path'], sha: file['sha'], content: render_decode64_content(file['content'])}
-      render json: json
-    end
-  end
-
-  def update_trustie_pipeline
-    interactor = Gitea::UpdateFileInteractor.call(current_user.gitea_token, params[:owner], params.merge(identifier: @project.identifier))
-    if interactor.success?
-      @file = interactor.result
-      render_result(1, "更新成功")
-    else
-      render_error(interactor.error)
-    end
-  end
-
-  def activate
-    return render_error('你还未认证') unless current_user.ci_certification?
-
-    begin
-      ActiveRecord::Base.transaction do
-        if @repo
-          return render_error('该项目已经激活') if @repo.repo_active?
-          @repo.activate!(@project)
-          return render_ok
-        else
-          @repo = Ci::Repo.auto_create!(@ci_user, @project)
-          @ci_user.update_column(:user_syncing, false)
-        end
-
-        result = bind_hook!(current_user, @cloud_account, @repo)
-        @project.update_columns(open_devops: true, gitea_webhook_id: result['id'])
-        @project.increment!(:open_devops_count)
-        @cloud_account.update_column(:ci_user_id, @ci_user.user_id)
-      end
-      render_ok
-    rescue Exception => ex
-      render_error(ex.message)
-    end
-  end
-
-  def deactivate
-    return render_error('该项目已经取消激活') if !@repo.repo_active?
-
-    @project.update_column(:open_devops, false)
-    @repo.deactivate_repos!
-    render_ok
-  end
-
-end

app/controllers/ci/secrets_controller.rb

@@ -1,53 +0,0 @@
-class Ci::SecretsController < Ci::BaseController
-
-  before_action :load_repo
-
-  # 参数列表
-  def index
-    result = Ci::Drone::API.new(@ci_user.user_hash, ci_drone_url, params[:owner], params[:repo], nil).secrets
-    @secrets = result
-  end
-
-  #新增、更新参数
-  def create
-    options = {
-        name: params[:name],
-        data: params[:data]
-    }
-    id = params[:id]
-    if id
-      result = Ci::Drone::API.new(@ci_user.user_hash, ci_drone_url, params[:owner], params[:repo], options).update_secret
-      if result["id"]
-        render_ok
-      else
-        render_error(result["message"])
-      end
-    else
-      result = Ci::Drone::API.new(@ci_user.user_hash, ci_drone_url, params[:owner], params[:repo], options).create_secret
-      if result["id"]
-        render_ok
-      else
-        render_error(result["message"])
-      end
-    end
-  end
-
-  #删除参数
-  def destroy
-    name = params[:name]
-    if !name.blank?
-      Ci::Drone::API.new(@ci_user.user_hash, ci_drone_url, params[:owner], params[:repo], {name: name}).delete_secret
-      render_ok
-    else
-      render_error("参数名不能为空")
-    end
-  rescue Exception => ex
-    render_ok
-  end
-
-  def ci_drone_url
-    user = User.find_by(login: params[:owner])
-    user&.ci_cloud_account.drone_url
-  end
-
-end

app/controllers/ci/templates_controller.rb

@@ -1,104 +0,0 @@
-class Ci::TemplatesController < Ci::BaseController
-
-  before_action :require_login, only: %i[list create]
-  skip_before_action :connect_to_ci_db
-
-  #======模板管理======#
-  def list
-    stage_type = params[:stage_type]
-    template_name = params[:name]
-    templates = template_name.blank? ? Ci::Template.all : Ci::Template.where("template_name like ?", "%#{template_name}%")
-    templates = templates.select{ |template| template.login == current_user.login} unless current_user.admin?
-    if !stage_type.blank?  && stage_type != 'all'
-      templates = templates.select{ |template| template.stage_type == stage_type}
-    end
-    @total_count = templates.map(&:id).count
-    @templates = paginate templates
-  end
-
-  def show
-    @template = Ci::Template.find(params[:id])
-  end
-
-  def create
-    stage_type = params[:stage_type]
-    category = params[:category]
-    if category.blank?
-      category = Ci::Template::STAGE_TYPES[:"#{stage_type}"]
-    end
-
-    if params[:id]
-      template = Ci::Template.find(params[:id])
-      if template
-        template.update!(template_name: params[:template_name],
-                         stage_type: stage_type,
-                         category: category,
-                         parent_category: Ci::Template::STAGE_TYPES[:"#{stage_type}"],
-                         content: params[:content],
-                         login: current_user.admin? ? 'admin' : current_user.login
-        )
-      end
-    else
-      template = Ci::Template.new(template_name: params[:template_name],
-                                  stage_type: stage_type,
-                                  category: category,
-                                  parent_category: Ci::Template::STAGE_TYPES[:"#{stage_type}"],
-                                  content: params[:content],
-                                  login: current_user.admin? ? 'admin' : current_user.login
-      )
-      template.save!
-    end
-    render_ok
-  rescue Exception => ex
-    render_error(ex.message)
-  end
-
-  def update
-    template = Ci::Template.find(params[:id])
-    template.update!(template_name: params[:template_name],
-                     stage_type: params[:stage_type],
-                     category: params[:category],
-                     parent_category: params[:parent_category],
-                     content: params[:content]
-    )
-    render_ok
-  rescue Exception => ex
-    render_error(ex.message)
-  end
-
-  def destroy
-    template = Ci::Template.find(params[:id])
-    if template
-      template.destroy!
-    end
-    render_ok
-  rescue Exception => ex
-    render_error(ex.message)
-  end
-
-  #======流水线模板查询=====#
-  def templates_by_stage
-    stage_type = params[:stage_type]
-    if stage_type != Ci::PipelineStage::CUSTOMIZE_STAGE_TYPE
-      @templates = Ci::Template.where("stage_type = ?", stage_type)
-      @templates = @templates.select{ |template| template.login == current_user.login || template.login == 'admin'} unless current_user.admin?
-      if stage_type == Ci::PipelineStage::INIT_STAGE_TYPE && !@templates.nil?
-        @templates.each do |template|
-          content = template.content
-          unless content.blank?
-            pipeline = Ci::Pipeline.find(params[:id])
-            template.content = content.gsub(/{name}/, pipeline.pipeline_name) unless pipeline.nil?
-          end
-        end
-      end
-      # 根据模板类别分组
-      @category_templates = @templates.group_by{ |template| template.category }
-    else
-      # 自定义阶段，按阶段分类分类返回模板列表
-      @templates = Ci::Template.where("stage_type != ?", Ci::PipelineStage::INIT_STAGE_TYPE)
-      @templates = @templates.select{ |template| template.login == current_user.login || template.login == 'admin'} unless current_user.admin?
-      @category_templates = @templates.group_by{ |template| template.parent_category }
-    end
-  end
-
-end

app/controllers/compare_controller.rb

@@ -1,53 +0,0 @@
-class CompareController < ApplicationController
-  # skip_before_action :require_login
-  before_action :load_repository
-
-  def index
-  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
-
-    # TODO: 处理fork的项目向源项目发送PR的base、head参数问题
-    @compare_result ||=
-      @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]
-
-  end
-
-  def gitea_compare(base, head)
-    Gitea::Repository::Commits::CompareService.call(@owner.login, @project.identifier, base, head, current_user.gitea_token)
-  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/ci/cloud_account_manageable.rb

@@ -1,209 +0,0 @@
-module Ci::CloudAccountManageable
-  extend ActiveSupport::Concern
-
-  included do
-  end
-
-  # 自有服务器绑定流程
-  def bind_account!
-    # 1. 保存华为云服务器帐号
-    create_params = devops_params.merge(ip_num: IPAddr.new(devops_params[:ip_num].strip).to_i, secret: Ci::CloudAccount.encrypted_secret(devops_params[:secret]), server_type: Ci::CloudAccount::SERVER_TYPE_SELF)
-
-    cloud_account = Ci::CloudAccount.new(create_params)
-    cloud_account.user = current_user
-    cloud_account.save!
-
-    # 2. 生成oauth2应用程序的client_id和client_secrete
-    gitea_oauth = Gitea::Oauth2::CreateService.call(current_user.gitea_token, {name: "pipeline-#{SecureRandom.hex(8)}", redirect_uris: ["#{cloud_account.drone_url}/login"]})
-    logger.info "######### gitea_oauth: #{gitea_oauth}"
-
-    raise 'Gitea接口异常' if gitea_oauth['client_id'].blank?
-
-    oauth = Oauth.new(client_id: gitea_oauth['client_id'],
-      client_secret: gitea_oauth['client_secret'],
-      redirect_uri: gitea_oauth['redirect_uris'],
-      gitea_oauth_id: gitea_oauth['id'],
-      user_id: current_user.id)
-    oauth.save!
-
-    # 创建数据ci端数据库
-    database_result = auto_create_database!(@connection, "#{current_user.login}_drone")
-    logger.info "[CI::DbConnectable] auto_create_database's result: #{database_result}"
-
-    # 初始化表结构
-    sub_connection = connect_to_ci_database
-    auto_create_table_structure!(sub_connection)
-
-    rpc_secret = SecureRandom.hex 16
-    logger.info "######### rpc_secret: #{rpc_secret}"
-
-    # 3. 创建drone server
-    drone_server_cmd = Ci::Drone::Server.new(current_user.login, oauth.client_id, oauth.client_secret, cloud_account.drone_host, rpc_secret).generate_cmd
-    logger.info "######### drone_server_cmd: #{drone_server_cmd}"
-
-    # 4. 创建drone client
-    drone_client_cmd = Ci::Drone::Client.new(oauth.client_id, cloud_account.drone_ip, rpc_secret).generate_cmd
-    logger.info "######### drone_client_cmd: #{drone_client_cmd}"
-
-    # 5. 登录远程服务器，启动drone服务
-    result = Ci::Drone::Start.new(cloud_account.account, cloud_account.visible_secret, cloud_account.drone_ip, drone_server_cmd, drone_client_cmd).run
-    logger.info "######### result: #{result}"
-
-
-    redirect_url = "#{cloud_account.drone_url}/login"
-    logger.info "######### redirect_url: #{redirect_url}"
-
-    return nil unless result.present?
-    result && !result.blank? ? cloud_account : nil
-  end
-
-  def trustie_drone_server_config
-    # 读取drone配置信息
-    config = Rails.application.config_for(:configuration).symbolize_keys!
-    trustie_drone_config = config[:trustie_drone].symbolize_keys!
-    return trustie_drone_config
-  end
-
-  # trustie提供服务器,绑定流程
-  def trustie_bind_account!
-    trustie_drone_config = trustie_drone_server_config
-    raise 'trustie_drone config missing' if trustie_drone_config.blank?
-
-    # 创建云账号
-    create_params = devops_params.merge(ip_num: IPAddr.new(trustie_drone_config[:ip_num].strip).to_i, secret: Ci::CloudAccount.encrypted_secret(trustie_drone_config[:secret]), server_type: Ci::CloudAccount::SERVER_TYPE_TRUSTIE)
-    cloud_account = Ci::CloudAccount.new(create_params)
-    cloud_account.user = current_user
-    cloud_account.save!
-
-    #生成oauth2应用程序的client_id和client_secrete
-    gitea_oauth = Gitea::Oauth2::CreateService.call(current_user.gitea_token, {name: "pipeline-#{SecureRandom.hex(8)}", redirect_uris: ["#{cloud_account.drone_url}/login"]})
-    logger.info "######### gitea_oauth: #{gitea_oauth}"
-
-    raise 'Gitea接口异常' if gitea_oauth['client_id'].blank?
-
-    oauth = Oauth.new(client_id: gitea_oauth['client_id'],
-                      client_secret: gitea_oauth['client_secret'],
-                      redirect_uri: gitea_oauth['redirect_uris'],
-                      gitea_oauth_id: gitea_oauth['id'],
-                      user_id: current_user.id)
-    result = oauth.save!
-
-    redirect_url = "#{cloud_account.drone_url}/login"
-    logger.info "######### redirect_url: #{redirect_url}"
-
-    return nil unless result.present?
-    result ? cloud_account : nil
-  end
-
-  def unbind_account!
-    cloud_account = current_user.ci_cloud_account
-    return render_error('你未绑定CI服务器') if current_user.devops_step == User::DEVOPS_UNINIT || cloud_account.blank?
-
-    if cloud_account.server_type == Ci::CloudAccount::SERVER_TYPE_SELF
-      @connection.execute("DROP DATABASE IF EXISTS #{current_user.login}_drone") # TOTO drop drone database
-    end
-
-    cloud_account.destroy! unless cloud_account.blank?
-    current_user.unbind_account!
-  end
-
-  def bind_hook!(user, cloud_account, repo)
-    hook_params = {
-      active: true,
-      config: {
-        content_type: "json",
-        url: cloud_account.drone_url + "/hook?secret=#{repo.repo_signer}"
-      },
-      type: "gitea"
-    }
-    result = Gitea::Hooks::CreateService.call(user.gitea_token, user.login, repo.repo_name, hook_params)
-
-    result[:status].present? ? nil : result
-  end
-
-  def check_bind_cloud_account!
-    return [true, "你已经绑定了云帐号."] unless current_user.ci_cloud_account.blank?
-
-    ip_num = IPAddr.new(devops_params[:ip_num]).to_i
-
-    #自有服务器进行判断
-    cloud_account = current_user.ci_cloud_account
-    if cloud_account && cloud_account.server_type == Ci::CloudAccount::SERVER_TYPE_SELF
-      Ci::CloudAccount.exists?(ip_num: ip_num) ? [true, "#{devops_params[:ip_num]}服务器已被使用."] : [false, nil]
-    end
-  end
-
-  def check_trustie_bind_cloud_account!
-    return [true, "你已经绑定了云帐号."] unless current_user.ci_cloud_account.blank?
-  end
-
-  def gitea_auto_create_auth_grant!(gitea_oauth_id)
-    connection = Gitea::Database.set_connection.connection
-    unix_time = Time.now.to_i
-
-    # 目前直接操作db，可以建立对应的model进行操作
-    sql = "REPLACE INTO oauth2_grant ( user_id, application_id, counter, created_unix, updated_unix ) VALUES ( #{current_user.gitea_uid}, #{gitea_oauth_id}, 0, #{unix_time}, #{unix_time} );"
-    connection.execute(sql)
-
-    #如果使用trustie提供的服务器，需要多增加一条授权信息
-    if current_user.ci_cloud_account.server_type == Ci::CloudAccount::SERVER_TYPE_TRUSTIE
-      trustie_drone_config = trustie_drone_server_config
-      admin_application_id = trustie_drone_config[:admin_application_id]
-      sql = "REPLACE INTO oauth2_grant ( user_id, application_id, counter, created_unix, updated_unix ) VALUES ( #{current_user.gitea_uid}, #{admin_application_id}, 0, #{unix_time}, #{unix_time} );"
-      connection.execute(sql)
-    end
-  end
-
-  def gitea_oauth_grant!(password, oauth)
-    gitea_auto_create_auth_grant!(oauth&.gitea_oauth_id)
-
-    state = SecureRandom.hex(8)
-    # redirect_uri eg:
-    #  https://localhost:3000/login/oauth/authorize?client_id=94976481-ad0e-4ed4-9247-7eef106007a2&redirect_uri=http%3A%2F%2F121.69.81.11%3A80%2Flogin&response_type=code&state=9cab990b9cfb1805
-    redirect_uri = CGI.escape("#{@cloud_account.drone_url}/login")
-    clientId = client_id(oauth)
-    grant_url = "#{Gitea.gitea_config[:domain]}/login/oauth/authorize?client_id=#{clientId}&redirect_uri=#{redirect_uri}&response_type=code&state=#{state}"
-    logger.info "[gitea] grant_url: #{grant_url}"
-
-    conn = Faraday.new(url: grant_url) do |req|
-      req.request :url_encoded
-      req.adapter Faraday.default_adapter
-      req.basic_auth(current_user.login, password)
-    end
-
-    response = conn.get
-    logger.info "[gitea] response headers: #{response.headers}"
-
-    drone_oauth_user!(response.headers.to_h['location'], state)
-  end
-
-  def drone_oauth_user!(url, state)
-    logger.info "[drone] drone_oauth_user url: #{url}"
-    conn = Faraday.new(url: url) do |req|
-      req.request :url_encoded
-      req.adapter Faraday.default_adapter
-      req.headers["cookie"] = "_session_=#{SecureRandom.hex(28)}; _oauth_state_=#{state}"
-    end
-
-    response = conn.get
-    logger.info "[drone] response headers: #{response.headers}"
-
-    response.headers['location'].include?('error') ? false : true
-  end
-
-  private
-    def devops_params
-      params.permit(:account, :secret, :ip_num)
-    end
-
-  def client_id(oauth)
-    #如果是使用trustie服务器使用管理员用户的clientId
-    if current_user.ci_cloud_account.server_type == Ci::CloudAccount::SERVER_TYPE_TRUSTIE
-      trustie_drone_config = trustie_drone_server_config
-      return trustie_drone_config[:client_id]
-    else
-      return oauth&.client_id
-    end
-  end
-
-end

app/controllers/concerns/ci/db_connectable.rb

@@ -1,59 +0,0 @@
-module Ci::DbConnectable
-  extend ActiveSupport::Concern
-
-  included do
-  end
-
-  # Dynamically sets the database connection.
-  def connect_to_ci_database(options={})
-    master_db = options[:master_db] || false
-    config = Rails.application.config_for(:configuration).symbolize_keys!
-    db_config = config[:ci_db_server].symbolize_keys!
-    raise 'ci database config missing' if db_config.blank?
-
-    req_params = {
-      host: db_config[:host],
-      username: db_config[:username],
-      password: db_config[:password],
-      port: db_config[:port]
-    }
-    db_name = options[:db_name].blank? ? current_user.login : options[:db_name]
-    req_params = req_params.merge(database: "#{db_name}_#{db_config[:database]}") unless master_db === true
-
-    db_params = Ci::Database.get_connection_params(req_params)
-    @connection = Ci::Database.set_connection(db_params).connection
-  end
-
-  def connect_to_trustie_ci_database(options={})
-    master_db = options[:master_db] || false
-    config = Rails.application.config_for(:configuration).symbolize_keys!
-    db_config = config[:ci_db_server_trustie].symbolize_keys!
-    raise 'ci database config missing' if db_config.blank?
-
-    req_params = {
-        host: db_config[:host],
-        username: db_config[:username],
-        password: db_config[:password],
-        port: db_config[:port]
-    }
-
-    req_params = req_params.merge(database: "#{db_config[:database]}") unless master_db === true
-    db_params = Ci::Database.get_connection_params(req_params)
-    @trustie_db_connection = Ci::Database.set_connection(db_params).connection
-  end
-
-  def auto_create_database!(connection, database)
-    Rails.logger.info "[CI::DbConnectable] auto_create_database's connection: #{connection}"
-    connection.execute("CREATE DATABASE IF NOT EXISTS #{database}")
-  end
-
-  def auto_create_table_structure!(connection)
-    Rails.logger.info "[CI::DbConnectable] auto_create_table_structure's connection: #{connection}"
-
-    sqls = Ci::Schema.statement.split(';').map(&:strip).reject { |e| e.to_s.empty? }
-    sqls.each do |sql|
-      con_result = connection.execute(sql)
-      Rails.logger.info "=============> ci create tabels result: #{con_result}"
-    end
-  end
-end

app/controllers/concerns/controller_rescue_handler.rb

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

app/controllers/concerns/git_common.rb

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

app/controllers/concerns/git_helper.rb

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

app/controllers/concerns/laboratory_helper.rb

@@ -35,15 +35,15 @@ module LaboratoryHelper
     # my_projects: "/users/#{current_user.try(:login)}/projects",
     #       my_projects: "https://www.trustie.net/users/#{current_user.try(:login)}/user_projectlist",
     {
-      new_syllabuses: "https://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",
+      new_syllabuses: "#{Rails.application.config_for(:configuration)['platform_url']}/syllabuses/new",
+      new_course: "#{Rails.application.config_for(:configuration)['platform_url']}/courses/new",
+      edit_account: "#{Rails.application.config_for(:configuration)['platform_url']}/my/account",
+      my_courses: "#{Rails.application.config_for(:configuration)['platform_url']}/users/#{current_user.try(:login)}/user_courselist",
+      my_projects: "#{Rails.application.config_for(:configuration)['platform_url']}/users/#{current_user.try(:login)}/projects",
+      my_organ: "#{Rails.application.config_for(:configuration)['platform_url']}/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"
+      tiding_url: "#{Rails.application.config_for(:configuration)['platform_url']}/settings/notice",
+      register_url: "#{Rails.application.config_for(:configuration)['platform_url']}/login?login=false"
     }
   end
 end

app/controllers/concerns/login_helper.rb

@@ -127,8 +127,6 @@ module LoginHelper
     token = config[:sync_token]
     api_host = config[:sync_url]
 
-    return if api_host.blank?
-
     url = "#{api_host}/api/v1/users/sync_user_token"
     sync_json = {
       "token": token,

app/controllers/concerns/paginate_helper.rb

@@ -1,14 +1,12 @@
 module PaginateHelper
+  def paginate(objs, **opts)
+    page     = params[:page].to_i <= 0 ? 1 : params[:page].to_i
+    per_page = params[:per_page].to_i > 0 && params[:per_page].to_i < 50 ? params[:per_page].to_i : opts[:per_page] || 20
 
-  def paginate(relation)
-    limit = params[:limit] || params[:per_page]
-    limit = (limit.to_i.zero? || limit.to_i > 15) ? 15 : limit.to_i
-    page  = params[:page].to_i.zero? ? 1 : params[:page].to_i
-
-    if relation.is_a?(Array)
-      Kaminari.paginate_array(relation).page(page).per(limit)
+    if objs.is_a?(Array)
+      Kaminari.paginate_array(objs).page(page).per(per_page)
     else
-      relation.page(page).per(limit)
+      objs.page(page).per(per_page)
     end
   end
 end

app/controllers/concerns/register_helper.rb

@@ -1,22 +1,20 @@
 module RegisterHelper
   extend ActiveSupport::Concern
 
-  def autologin_register(username, email, password, platform= 'forge')
+  def autologin_register(username, email, password, platform= '')
     result = {message: nil, user: nil}
 
     user = User.new(admin: false, login: username, mail: email, type: "User")
     user.password = password
     user.platform = platform
     user.activate
-    
-    return unless user.valid?
 
     interactor = Gitea::RegisterInteractor.call({username: username, email: email, password: password})
     if interactor.success?
       gitea_user = interactor.result
-      result = Gitea::User::GenerateTokenService.call(username, password)
+      result = Gitea::User::GenerateTokenService.new(username, password).call
       user.gitea_token = result['sha1']
-      user.gitea_uid = gitea_user[:body]['id']
+      user.gitea_uid = gitea_user['id']
       if user.save!
         UserExtension.create!(user_id: user.id)
         result[:user] = {id: user.id, token: user.gitea_token}

app/controllers/concerns/render_helper.rb

@@ -3,8 +3,8 @@ module RenderHelper
     render json: { status: 0, message: 'success' }.merge(data)
   end
 
-  def render_error(status = -1, message = '')
-    render json: { status: status, message: message }
+  def render_error(message = '')
+    render json: { status: -1, message: message }
   end
 
   def render_not_acceptable(message = '请求已拒绝')

app/controllers/concerns/repository/languages_percentagable.rb

@@ -1,19 +0,0 @@
-module Repository::LanguagesPercentagable
-  extend ActiveSupport::Concern
-
-  def languages_precentagable
-    result = Gitea::Repository::Languages::ListService.call(@owner.login,
-      @repository.identifier, current_user&.gitea_token)
-
-    result[:status] === :success ? hash_transform_precentagable(result[:body]) : nil
-  end
-
-  # hash eq:{"JavaScript": 301681522,"Ruby": 1444004,"Roff": 578781}
-  def hash_transform_precentagable(hash)
-    total_byte_size = hash.values.sum
-    hash.transform_values { |v|
-      ActionController::Base.helpers
-        .number_to_percentage((v * 100.0 / total_byte_size), precision: 1)
-    }.select{|k,v| v != "0.0%"}
-  end
-end

app/controllers/customers_controller.rb

@@ -0,0 +1,11 @@
+class CustomersController < ApplicationController
+  def show 
+    targets = UsersService.new.user_info params, current_user
+    render json: targets
+  end
+
+  def edit_brief 
+    targets = UsersService.new.edit_brief params, current_user
+    render json: targets
+  end
+end

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/forum_sections_controller.rb

@@ -0,0 +1,101 @@
+class ForumSectionsController < ApplicationController
+
+  def index 
+    targets = ForumSectionsService.new.index params
+    render json: targets
+  end
+
+  def select_sections
+    targets = ForumSectionsService.new.select_sections
+    render json: targets
+  end
+
+  def user_apply
+    targets = ForumSectionsService.new.user_apply params, current_user, current_user_ip
+    render json: targets
+  end
+
+  def edit_notice
+    targets = ForumSectionsService.new.edit_notice params
+    render json: targets
+  end
+
+  def forum_section_header
+    targets = ForumSectionsService.new.forum_section_header params, current_user
+    render json: targets
+  end
+
+  def create 
+    targets = ForumSectionsService.new.create params, current_user
+    render json: targets
+  end
+
+  def rename 
+    targets = ForumSectionsService.new.rename params, current_user
+    render json: targets
+  end
+
+  def destroy_forum 
+    targets = ForumSectionsService.new.destroy params, current_user
+    render json: targets
+  end
+
+  def order_forums
+    targets = ForumSectionsService.new.order_forums params, current_user
+    render json: targets
+  end
+
+  def search_users
+    targets = ForumSectionsService.new.search_users params, current_user
+    render json: targets
+  end
+
+  def add_users
+    targets = ForumSectionsService.new.add_users params, current_user
+    render json: targets
+  end
+
+  def managements
+    targets = ForumSectionsService.new.managements params, current_user
+    render json: targets
+  end
+
+  def applied_forums
+    targets = ForumSectionsService.new.applied_forums params, current_user
+    render json: targets
+  end
+
+  def deal_applies
+    targets = ForumSectionsService.new.deal_applies params, current_user
+    render json: targets
+  end
+
+  def destroy_moderator
+    targets = ForumSectionsService.new.destroy_moderator params, current_user
+    render json: targets
+  end
+
+  def unchecked_memos
+    targets = ForumSectionsService.new.unchecked_memos params, current_user
+    render json: targets
+  end
+
+  def unchecked_replies
+    targets = ForumSectionsService.new.unchecked_replies params, current_user
+    render json: targets
+  end
+
+  def checked_memos
+    targets = ForumSectionsService.new.checked_memos params, current_user
+    render json: targets
+  end
+
+  private 
+
+  def current_user_ip
+    env['REMOTE_ADDR']
+  end
+
+
+
+end

app/controllers/forums_controller.rb

@@ -0,0 +1,434 @@
+# encoding=utf-8
+# For react
+class ForumsController < ApplicationController
+  before_action :require_login, :only => [:new, :edit]
+  include ApplicationHelper
+
+  def show
+    render_react
+  end
+
+  def new
+    render_react
+  end
+
+  def index
+    render_react
+  end
+
+
+  def edit
+    render_react
+  end
+
+  def shixun_discuss
+    render_react
+  end
+
+  def manage
+    render_react
+  end
+
+  def detail
+    render_react
+  end
+
+  def theme
+    render_react
+  end
+
+  private
+  def render_react
+    render file: 'public/react/build/index.html', :layout => false
+  end
+
+end
+
+
+# # encoding: utf-8
+# # added by fq
+# class ForumsController < ApplicationController
+#   layout "users_base"
+#   include ApplicationHelper
+#   # GET /forums
+#   # GET /forums.json
+#   before_action :find_forum_if_available
+#   before_action :authenticate_user_edit, :only => [:edit, :update]
+#   before_action :authenticate_user_destroy, :only => [:destroy]
+#   before_action :require_login, :only => [:new, :create,:destroy,:update,:edit]
+#   before_action :check_authentication
+#
+#   helper :sort
+#   include SortHelper
+#
+#   PageLimit = 20
+#   def create_feedback
+#     if User.current.logged?
+#       #@memo = Memo.new(params[:memo])
+#       #@memo.forum_id = "1"
+#       #@memo.author_id = User.current.id
+#       #@forum = @memo.forum
+#       cs = CommentService.new
+#       @memo,message = cs.create_feedback params,User.current
+#       respond_to do |format|
+#         if !@memo.new_record?
+#           if params[:direct]
+#             format.html { redirect_to forums_path() }
+#           else
+#             format.html { redirect_to forum_path(@memo.forum) }
+#           end
+#           # format.html { redirect_to forum_path(@memo.forum) }
+#         else
+#           sort_init 'updated_at', 'desc'
+#           sort_update 'created_at' => "#{Memo.table_name}.created_at",
+#                       'replies' => "#{Memo.table_name}.replies_count",
+#                       'updated_at' => "COALESCE (last_replies_memos.created_at, #{Memo.table_name}.created_at)"
+#
+#           @topic_count = @forum.topics.count
+#           @topic_pages = Paginator.new @topic_count, per_page_option, params['page']
+#           @memos = @forum.topics.
+#               reorder("#{Memo.table_name}.sticky DESC").
+#               includes(:last_reply).
+#               limit(@topic_pages.per_page).
+#               offset(@topic_pages.offset).
+#               order(sort_clause).
+#               preload(:author, {:last_reply => :author}).
+#               all
+#
+#           flash.now[:error] = "#{l :label_memo_create_fail}: #{@memo.errors.full_messages[0]}"
+#           # back_error_page = @memo.parent_id.nil? ? forum_path(@forum) : forum_memo_path(@forum, @memo.parent_id)
+#           format.html { render action: :show, layout: 'base_forums' }#, error: "#{l :label_memo_create_fail}: #{@memo.errors.full_messages[0]}" }
+#           format.json { render json: @memo.errors, status: :unprocessable_entity }
+#         end
+#       end
+#     else
+#       respond_to do |format|
+#         format.html { redirect_to signin_path }
+#       end
+#     end
+#   end
+#
+#   def mail_feedback
+#     @user = User.where(:id => params[:user_id]).first
+#     unless @user.nil?
+#       cs = CommentService.new
+#       @memo, message = cs.create_feedback params, @user
+#     end
+#     respond_to do |format|
+#       format.js
+#     end
+#   end
+#
+#   def forum_create_memo
+#     @memo = Memo.new
+#     @my_forums_count = Forum.where(:creator_id => User.current.id).count
+#     @my_memos_count = Memo.where(:author_id => User.current.id).count
+#     @forums = Forum.reorder("topic_count desc,updated_at desc")
+#     respond_to do |format|
+#       format.js
+#       format.html {render layout: 'base_new_forum'}
+#     end
+#   end
+#
+#   def create_memo
+#     @memo = Memo.new(params[:memo])
+#     @memo.forum_id = @forum.id
+#     @memo.author_id = User.current.id
+#
+#     @memo.save_attachments(params[:attachments] || (params[:memo] && params[:memo][:uploads]))
+#
+#     respond_to do |format|
+#       if @memo.save
+#         if params[:asset_id]
+#          ids = params[:asset_id].split(',')
+#          update_kindeditor_assets_owner ids ,@memo.id,OwnerTypeHelper::MEMO
+#         end
+#         #end
+#         format.html { redirect_to (forum_memo_url(@forum, (@memo.parent_id.nil? ? @memo : @memo.parent_id))), notice: "#{l :label_memo_create_succ}" }
+#         format.json { render json: @memo, status: :created, location: @memo }
+#       else
+#         sort_init 'updated_at', 'desc'
+#         sort_update 'created_at' => "#{Memo.table_name}.created_at",
+#                     'replies' => "#{Memo.table_name}.replies_count",
+#                     'updated_at' => "COALESCE (last_replies_memos.created_at, #{Memo.table_name}.created_at)"
+#
+#         @topic_count = @forum.topics.count
+#         @topic_pages = Paginator.new @topic_count, per_page_option, params['page']
+#         @memos = @forum.topics.
+#                         reorder("#{Memo.table_name}.sticky DESC").
+#                         includes(:last_reply).
+#                         limit(@topic_pages.per_page).
+#                         offset(@topic_pages.offset).
+#                         order(sort_clause).
+#                         preload(:author, {:last_reply => :author}).
+#                         all
+#         @memos
+#         flash.now[:error] = "#{l :label_memo_create_fail}: #{@memo.errors.full_messages[0]}"
+#         # back_error_page = @memo.parent_id.nil? ? forum_path(@forum) : forum_memo_path(@forum, @memo.parent_id)
+#         format.html { render action: :show, layout: 'base_forums' }#, error: "#{l :label_memo_create_fail}: #{@memo.errors.full_messages[0]}" }
+#         format.json { render json: @memo.errors, status: :unprocessable_entity }
+#       end
+#     end
+#   end
+#
+#   # id: 1 问题反馈   3 操作指南  5 技术分享
+#   def index
+#
+#     render "/common/index", :layout => false
+#   end
+#
+#   # GET /forums/1
+#   # GET /forums/1.json
+#   def show
+#     # sort_init 'updated_at', 'desc'
+#     # sort_update 'created_at' => "#{Memo.table_name}.created_at",
+#     #             'replies' => "#{Memo.table_name}.replies_count",
+#     #             'updated_at' => "COALESCE (last_replies_memos.created_at, #{Memo.table_name}.created_at)"
+#     order = ""
+#     @order_str = ""
+#     if(params[:reorder_complex])
+#       order = "#{Memo.table_name}.sticky desc, last_replies_memos.created_at #{params[:reorder_complex]}, #{Memo.table_name}.created_at #{params[:reorder_complex]}"
+#       @order_str = "reorder_complex="+params[:reorder_complex]
+#     elsif(params[:reorder_popu])
+#       order = "#{Memo.table_name}.sticky desc, replies_count #{params[:reorder_popu]}"
+#       @order_str = "reorder_popu="+params[:reorder_popu]
+#     elsif(params[:reorder_time])
+#      order = "#{Memo.table_name}.sticky desc, #{Memo.table_name}.updated_at #{params[:reorder_time]}"
+#      @order_str = "reorder_time="+params[:reorder_time]
+#     else
+#       order = "#{Memo.table_name}.sticky desc, #{Memo.table_name}.updated_at desc"
+#       @order_str = "reorder_time=desc"
+#     end
+#     @memo = Memo.new(:forum => @forum)
+#     @topic_count = @forum.topics.count
+#     @limit = 20
+#     @is_remote = true
+#     @topic_pages = Paginator.new @topic_count, @limit, params['page'] || 1
+#     @memos =  paginateHelper @forum.topics.includes(:last_reply).reorder(order).preload(:author, {:last_reply => :author}), @limit
+#     @my_topic_count =   Memo.where("forum_id = #{@memo.forum_id} and parent_id is null").count
+#     @my_replies_count =  Memo.where("forum_id = #{@memo.forum_id} and parent_id is not null").count
+#     @errors = params[:errors]
+#     # 推荐贴吧
+#     @forums = Forum.where("id !=?", @forum.id).reorder("topic_count desc,updated_at desc").first(3)
+#     respond_to do |format|
+#       format.js
+#       format.html {
+#         render :layout => 'base_new_forum'
+#       }# show.html.erb
+#       format.json { render json: @forum }
+#     end
+#   end
+#
+#   # GET /forums/new
+#   # GET /forums/new.json
+#   def new
+#     @forum = Forum.new
+#     respond_to do |format|
+#       format.html # new.html.erb
+#       format.js
+#       format.json { render json: @forum }
+#     end
+#   end
+#
+#   # GET /forums/1/edit
+#   def edit
+#     @forum = Forum.find(params[:id])
+#     respond_to do |format|
+#       format.html
+#       format.js
+#     end
+#   end
+#
+#   # POST /forums
+#   # POST /forums.json
+#   def create
+#     @forum = Forum.new(params[:forum])
+#     @forum.creator_id = User.current.id
+#     if @forum.save
+#       # Time 2015-03-24 17:07:05
+#       # Author lizanle
+#       # Description after save后需要进行资源记录的更新
+#       # owner_type = 2 对应的是 forum
+#       @save_flag = true
+#       if params[:asset_id]
+#         ids = params[:asset_id].split(',')
+#         update_kindeditor_assets_owner ids, @forum.id, OwnerTypeHelper::FORUM
+#       end
+#       #end
+#       respond_to do |format|
+#           format.js{ redirect_to forums_path, notice: l(:label_forum_create_succ)}
+#           format.html { redirect_to @forum, notice: l(:label_forum_create_succ) }
+#           format.json { render json: @forum, status: :created, location: @forum }
+#       end
+#     else
+#       @save_flag=false
+#       respond_to do |format|
+#         flash.now[:error] = "#{l :label_forum_create_fail}: #{@forum.errors.full_messages[0]}"
+#         format.js
+#         format.html { render action: "new" }
+#         format.json { render json: @forum.errors, status: :unprocessable_entity }
+#       end
+#     end
+#   end
+#
+#   # PUT /forums/1
+#   # PUT /forums/1.json
+#   def update
+#     @forum = Forum.find(params[:id])
+#     respond_to do |format|
+#       if @forum.update_attributes(params[:forum])
+#         format.js
+#         format.html { redirect_to @forum, notice: l(:label_forum_update_succ) }
+#         format.json { head :no_content }
+#       else
+#         flash.now[:error] = "#{l :label_forum_update_fail}: #{@forum.errors.full_messages[0]}"
+#         format.js
+#         format.html { render action: "edit" }
+#         format.json { render json: @forum.errors, status: :unprocessable_entity }
+#       end
+#     end
+#   end
+#
+#   # DELETE /forums/1
+#   # DELETE /forums/1.json
+#   def destroy
+#     @forum = Forum.find(params[:id])
+#     @forum.destroy
+#
+#     respond_to do |format|
+#       format.html { redirect_to forums_url }
+#       format.json { head :no_content }
+#     end
+#   end
+#
+#   # 更新贴吧描述
+#   def update_memo_description
+#     @forum = Forum.find(params[:id])
+#     if @forum.blank?
+#       result = { :result => false }
+#     else
+#       forum_decription = params[:forum][:description]
+#       @forum.update_attributes(:description => forum_decription )
+#       result = { :result => true }
+#     end
+#     render :json => result
+#   end
+#
+#   def search_forum
+#     # @forums = paginateHelper Forum.where("name LIKE '%#{params[:name]}%'")
+#     q = "%#{params[:name].strip}%"
+#     (redirect_to forums_url, :notice => l(:label_sumbit_empty);return) if params[:name].blank?
+#     @offset, @limit = api_offset_and_limit({:limit => 10})
+#     @forums_all = Forum.where("name LIKE ?", q)
+#     @forums_count = @forums_all.count
+#     @forums_pages = Paginator.new @forums_count, @limit, params['page']
+#
+#     @offset ||= @forums_pages.offset
+#     @forums = @forums_all.offset(@offset).limit(@limit).all
+#     respond_to do |format|
+#       format.html {
+#         render 'index'
+#       }
+#       format.json { render json: @forums }
+#     end
+#   end
+#
+#   def search_memo
+#     q = "%#{params[:name].strip}%"
+#
+#     limit = PageLimit
+#     @memo = Memo.new
+#     @offset, @limit = api_offset_and_limit({:limit => limit})
+#     @forum = Forum.find(params[:id])
+#     @memos_all = @forum.topics.where("subject LIKE ?", q)
+#     @topic_count = @memos_all.count
+#     @topic_pages = Paginator.new @topic_count, @limit, params['page']
+#
+#     @offset ||= @topic_pages.offset
+#     @memos = @memos_all.offset(@offset).limit(@limit).all
+#     respond_to do |format|
+#       format.html {
+#         render 'show', :layout => 'base_forums'
+#       }
+#       format.json { render json: @forum }
+#     end
+#   end
+#
+#   #检查forum的名字
+#   def check_forum_name
+#     begin
+#       forum_name = params[:forum_name]
+#       if params[:forum_id]
+#         result = Forum.where("name = '#{forum_name}' and id != #{params[:forum_id]}").first.blank? ? {:result => true} : {:result => false}
+#       else
+#         result = Forum.where(:name => forum_name).first.blank? ? {:result => true} : {:result => false}
+#       end
+#     rescue Exception => e
+#       puts e
+#     end
+#     render :json => result
+#    # if params[:forum_id]
+#    #   forum_name_exist = Forum.where("name = '#{params[:forum_name]}' and id != #{params[:forum_id]}").count >= 1 ? true : false
+#    # else
+#    #   forum_name_exist = Forum.where("name = '#{params[:forum_name]}' ").count >= 1 ? true : false
+#    # end
+#    # render :text => forum_name_exist
+#   end
+#
+#
+#
+#
+#   #添加论坛tag
+#   def add_forum_tag
+#     @forum = Forum.find(params[:id])
+#     unless @forum.nil?
+#       @forum.tag_list.add(params[:tag_str].split(','))
+#       @forum.save
+#     end
+#     respond_to do |format|
+#       format.js {render :delete_forum_tag}
+#     end
+#   end
+#
+#   #删除forum的tag
+#   def delete_forum_tag
+#     @tag_id = (ActsAsTaggableOn::Tag.find_by_name(params[:tag_name])).id
+#     #forum的taggable_type = 5
+#     @taggings = ActsAsTaggableOn::Tagging.find_by_tag_id_and_taggable_id_and_taggable_type(@tag_id,params[:id],'Forum')
+#
+#     unless @taggings.nil?
+#       @taggings.delete
+#     end
+#
+#     # 是否还有其他记录 引用了 tag_id
+#     @tagging = ActsAsTaggableOn::Tagging.find_by_tag_id(@tag_id)
+#     # 如果taggings表中记录已经不存在 ，那么检查tags表 作删除动作
+#     if @tagging.nil?
+#       @tag = ActsAsTaggableOn::Tag.find_by_id(@tag_id)
+#       @tag.delete unless @tag.nil?
+#     end
+#     @forum = Forum.find(params[:id])
+#     respond_to do |format|
+#       format.js
+#     end
+#   end
+#
+#   private
+#
+#   def find_forum_if_available
+#     @forum = Forum.find(params[:id]) if params[:id]
+#   rescue ActiveRecord::RecordNotFound
+#     render_404
+#     nil
+#     end
+#
+#   def authenticate_user_edit
+#     find_forum_if_available
+#     render_403 unless @forum.editable_by? User.current
+#   end
+#
+#   def authenticate_user_destroy
+#     find_forum_if_available
+#     render_403 unless @forum.destroyable_by? User.current
+#   end
+# end

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/hooks_controller.rb

@@ -4,18 +4,18 @@ class HooksController < ApplicationController
   before_action :check_user
   before_action :set_repository
 
-  def index
-    hooks_response = Gitea::Hooks::ListService.new(@user.gitea_token, @user.login, @repository.try(:identifier)).call
-    if hooks_response.status == 200
+  def index 
+    hooks_response = Gitea::Hooks::ListService.new(@user, @repository.try(:identifier)).call
+    if hooks_response.status == 200 
       lists = JSON.parse(hooks_response.body)
       @hooks_size = lists.size
       @hooks = paginate(lists)
-    else
+    else 
       normal_status(-1, "出现错误")
     end
   end
 
-  def create
+  def create 
     #根据gitea的api
     # hook_params = {
     #   active: true,
@@ -36,17 +36,17 @@ class HooksController < ApplicationController
     #   content_type: params[:content_type].to_i,
     #   secret: params[:secret],
     #   events: {
-    #     push_only: params[:push_only] || false, # 是否为推送事件
-    #     send_everything: params[:send_everything] || false, #是否为所有事件
+    #     push_only: params[:push_only] || false, # 是否为推送事件 
+    #     send_everything: params[:send_everything] || false, #是否为所有事件 
     #     choose_events: params[:choose_events] || false, #是否为自定义事件
     #     branch_filter: params[:branch_filter] || "*",
     #     events: {
     #       create: params[:create] || false,  #创建分支/标签
-    #       delete: params[:delete] || false, #删除分支/标签
-    #       fork: params[:fork] || false, #仓库被派生
+    #       delete: params[:delete] || false, #删除分支/标签 
+    #       fork: params[:fork] || false, #仓库被派生 
     #       issues: params[:issues] || false, #工单
-    #       issue_comment: params[:issue_comment] || false, #评论
-    #       push: params[:push] || false # 推送
+    #       issue_comment: params[:issue_comment] || false, #评论 
+    #       push: params[:push] || false # 推送 
     #       pull_request: params[:pull_request] || false #合并请求
     #       repository: params[:repository] || false #仓库
     #       release: params[:release] || false #版本发布
@@ -58,28 +58,28 @@ class HooksController < ApplicationController
     Gitea::Hooks::CreateService.new(@user, @repository.try(:identifier), hook_params).call  #创建gitea的hook功能
     Gitea::Hooks::CreateService.new(user, p.try(:identifier), hook_params).call  #创建gitea的hook功能
 
-  end
+  end 
 
-  def update
+  def update 
     hook_params = params[:hook_params]
     response = Gitea::Hooks::UpdateService.new(@user, @repository.try(:identifier), hook_params, params[:id]).call
-    if response.status == 200
+    if response.status == 200 
       normal_status(1, "更新成功")
-    else
+    else 
       normal_status(-1, "更新失败")
     end
-  end
+  end 
 
-  def destroy
+  def destroy 
     response = Gitea::Hooks::DestroyService.new(@user, @repository.try(:identifier), params[:id]).call
     if response.status == 204
       normal_status(1, "删除成功")
-    else
+    else 
       normal_status(-1, "删除失败")
     end
-  end
+  end 
 
-  private
+  private 
 
   def set_repository
     @repository = @project.repository
@@ -88,9 +88,9 @@ class HooksController < ApplicationController
     normal_status(-1, "用户不存在") unless @user.present?
   end
 
-  def check_user
-    unless @project.user_id == current_user.id
-      tip_exception(403, "您没有权限进入")
+  def check_user 
+    unless @project.user_id == current_user.id 
+      tip_exception(403, "您没有权限进入") 
     end
   end
 end

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,26 @@
 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, :find_atme_receivers, only: [:create, :update]
+  before_action :get_branches, only: [:new, :edit]
 
   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 +96,80 @@ class IssuesController < ApplicationController
   end
 
   def new
-    @issue_chosen = get_associated_data(@project)
+    @all_branches = get_branches
+    @issue_chosen = issue_left_chosen(@project, nil)
   end
 
   def create
-    issue_params = issue_send_params(params)
-    Issues::CreateForm.new({subject:issue_params[:subject]}).validate!
-    @issue = Issue.new(issue_params)
-    if @issue.save!
-      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个字符")
+    elsif (params[:issue_type].to_s == "2")
+      return normal_status(-1, "悬赏的奖金必须大于0") if params[:token].to_i == 0
+
+    else
+      issue_params = issue_send_params(params)
+
+      @issue = Issue.new(issue_params)
+      if @issue.save!
+        if params[:attachment_ids].present?
+          params[:attachment_ids].each do |id|
+            attachment = Attachment.select(:id, :container_id, :container_type)&.find_by_id(id)
+            unless attachment.blank?
+              attachment.container = @issue
+              attachment.author_id = current_user.id
+              attachment.description = ""
+              attachment.save
+            end
+          end
+        end
+        if params[:issue_tag_ids].present?
+          params[:issue_tag_ids].each do |tag|
+            IssueTagsRelate.create!(issue_id: @issue.id, issue_tag_id: tag)
+          end
+        end
+        if params[:assigned_to_id].present?
+          Tiding.create!(user_id: params[:assigned_to_id], trigger_user_id: current_user.id,
+                         container_id: @issue.id, container_type: 'Issue',
+                         parent_container_id: @project.id, parent_container_type: "Project",
+                         tiding_type: 'issue', status: 0)
+        end
+
+        @issue.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "create")
+        # normal_status(0, "创建成功",)
+        render :json => { status: 0, message: "创建成功", id:  @issue.id}
+      else
+        normal_status(-1, "创建失败")
+      end
+    end
+
+  end
+
+  def edit
+    # @all_branches = get_branches
+    # @issue_chosen = issue_left_chosen(@project, @issue.id)
+    @issue_attachments = @issue.attachments
+  end
+
+  def update
+    issue_params = issue_send_params(params).except(:issue_classify, :author_id, :project_id)
+    return normal_status(-1, "您没有权限修改token") if @issue.will_save_change_to_token? && @issue.user_id != current_user&.id
+    if params[:issue_tag_ids].present? && !@issue&.issue_tags_relates.where(issue_tag_id: params[:issue_tag_ids]).exists?
+      @issue&.issue_tags_relates&.destroy_all
+      params[:issue_tag_ids].each do |tag|
+        IssueTagsRelate.create(issue_id: @issue.id, issue_tag_id: tag)
+      end
+    end
+
+    if @issue.update_attributes(issue_params)
+      issue_files = params[:attachment_ids]
+      change_files = false
+      issue_file_ids = []
+
+      if issue_files.present?
+        change_files = true
+        issue_files.each do |id|
           attachment = Attachment.select(:id, :container_id, :container_type)&.find_by_id(id)
           unless attachment.blank?
             attachment.container = @issue
@@ -124,70 +179,6 @@ class IssuesController < ApplicationController
           end
         end
       end
-      if params[:issue_tag_ids].present?
-        params[:issue_tag_ids].each do |tag|
-          IssueTagsRelate.create!(issue_id: @issue.id, issue_tag_id: tag)
-        end
-      end
-      if params[:assigned_to_id].present?
-        Tiding.create!(user_id: params[:assigned_to_id], trigger_user_id: current_user.id,
-                       container_id: @issue.id, container_type: 'Issue',
-                       parent_container_id: @project.id, parent_container_type: "Project",
-                       tiding_type: 'issue', status: 0)
-      end
-
-      #为悬赏任务时, 扣除当前用户的积分
-      if params[:issue_type].to_s == "2"
-        post_to_chain("minus", params[:token].to_i, current_user.try(:login))
-      end
-
-      @issue.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "create")
-
-      Rails.logger.info "[ATME] maybe to at such users: #{@atme_receivers.pluck(:login)}"
-      AtmeService.call(current_user, @atme_receivers, @issue) if @atme_receivers.size > 0
-
-      render json: {status: 0, message: "创建成", id: @issue.id}
-    else
-      normal_status(-1, "创建失败")
-    end
-  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)
@@ -203,67 +194,21 @@ 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? 
-
-        Rails.logger.info "[ATME] maybe to at such users: #{@atme_receivers.pluck(:login)}"
-        AtmeService.call(current_user, @atme_receivers, @issue) if @atme_receivers.size > 0
-
-        normal_status(0, "更新成功")
-      else
-        normal_status(-1, "更新失败")
+      if params[:status_id].to_i == 5
+        @issue.issue_times.update_all(end_time: Time.now)
+        # @issue.update_closed_issues_count_in_project!   #已经有after_update方法了，这里就不需要了
       end
+
+      @issue.create_journal_detail(change_files, issue_files, issue_file_ids, current_user&.id)
+      normal_status(0, "更新成功")
+    else
+      normal_status(-1, "更新失败")
     end
-  rescue Exception => exception
-    puts exception.message
-    normal_status(-1, exception.message)
+
   end
 
   def show
-    @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
@@ -279,37 +224,17 @@ class IssuesController < ApplicationController
   end
 
   def destroy
-    begin
-      issue_type = @issue.issue_type
-      status_id = @issue.status_id
-      token = @issue.token
-      login =  @issue.user.try(:login)
-      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, "删除失败")
@@ -339,28 +264,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, "批量更新失败")
@@ -372,10 +278,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|
@@ -403,9 +306,6 @@ class IssuesController < ApplicationController
       if type == 5
         @issue&.project_trends&.update_all(action_type: "close")
         @issue.issue_times.update_all(end_time: Time.now)
-        if @issue.issue_type.to_s == "2"
-          post_to_chain("add", @issue.token, @issue.get_assign_user.try(:login))
-        end
         if @issue.issue_classify.to_s == "pull_request"
           @issue&.pull_request&.update_attribute(:status, 2)
         end
@@ -453,29 +353,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 = []
@@ -503,6 +399,17 @@ class IssuesController < ApplicationController
     tracker_array
   end
 
+  def get_branches
+    all_branches = []
+    get_all_branches = Gitea::Repository::Branches::ListService.new(@user, @project&.repository.try(:identifier)).call
+    if get_all_branches && get_all_branches.size > 0
+      get_all_branches.each do |b|
+        all_branches.push(b["name"])
+      end
+    end
+    all_branches
+  end
+
   def issue_send_params(params)
     {
         subject: params[:subject],
@@ -527,36 +434,4 @@ class IssuesController < ApplicationController
         project_id: @project.id
       }
   end
-
-  def post_to_chain(type, amount,login)
-    change_params = {
-      type: type,
-      chain_params: {
-        amount: amount,
-        reponame: @project.try(:identifier),
-        username: login
-      }
-    }
-    PostChainJob.perform_later(change_params)
-  end
-
-  def check_token_enough
-    if params[:issue_type].to_s == "2" && (@issue.blank? || (@issue.present? && @issue.author_id == current_user.try(:id)))
-      return normal_status(-1, "悬赏的奖金必须大于0") if params[:token].to_i == 0
-      query_params = {
-        type: "query",
-        chain_params: {
-          reponame: @project.try(:identifier),
-          username: current_user.try(:login)
-        }
-      }
-      response = Gitea::Chain::ChainGetService.new(query_params).call
-      return normal_status(-1, "获取token失败，请稍后重试") if response.status != 200
-      return normal_status(-1, "您的token值不足") if JSON.parse(response.body)["balance"].to_i < params[:token].to_i
-    end
-  end
-
-  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, :find_atme_receivers, only: [:create]
   before_action :set_issue
   before_action :check_issue_permission
   before_action :set_journal, only: [:destroy, :edit, :update]
@@ -22,35 +21,32 @@ class JournalsController < ApplicationController
     if notes.blank?
       normal_status(-1, "评论内容不能为空")
     else
-      ActiveRecord::Base.transaction do
-        journal_params = {
-          journalized_id: @issue.id ,
-          journalized_type: "Issue",
-          user_id: current_user.id ,
-          notes: notes.to_s.strip,
-          parent_id: params[:parent_id]
-        }
-        journal = Journal.new journal_params
-        if journal.save
-          if params[:attachment_ids].present?
-            params[:attachment_ids].each do |id|
-              attachment = Attachment.select(:id, :container_id, :container_type)&.find_by_id(id)
-              unless attachment.blank?
-                attachment.container = journal
-                attachment.author_id = current_user.id
-                attachment.description = ""
-                attachment.save
-              end
+      journal_params = {
+        journalized_id: @issue.id ,
+        journalized_type: "Issue",
+        user_id: current_user.id ,
+        notes: notes.to_s.strip,
+        parent_id: params[:parent_id]
+      }
+      journal = Journal.new journal_params
+      if journal.save
+        if params[:attachment_ids].present?
+          params[:attachment_ids].each do |id|
+            attachment = Attachment.select(:id, :container_id, :container_type)&.find_by_id(id)
+            unless attachment.blank?
+              attachment.container = journal
+              attachment.author_id = current_user.id
+              attachment.description = ""
+              attachment.save
             end
           end
-          Rails.logger.info "[ATME] maybe to at such users: #{@atme_receivers.pluck(:login)}"
-          AtmeService.call(current_user, @atme_receivers, journal) if @atme_receivers.size > 0
-          # @issue.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "journal")
-          render :json => { status: 0, message: "评论成功", id:  journal.id}
-          # normal_status(0, "评论成功")
-        else
-          normal_status(-1, "评论失败")
         end
+
+        # @issue.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "journal")
+        render :json => { status: 0, message: "评论成功", id:  journal.id}
+        # normal_status(0, "评论成功")
+      else
+        normal_status(-1, "评论失败")
       end
     end
   end

app/controllers/main_controller.rb

@@ -2,7 +2,7 @@ class MainController < ApplicationController
   protect_from_forgery except: :index
   skip_before_action :check_sign
   skip_before_action :user_setup
-  skip_before_action :setup_laboratory
+  # skip_before_action :setup_laboratory
 
   def first_stamp
     render :json => { status: 0, message: Time.now.to_i }
@@ -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(users.lastname, users.firstname, users.login, users.mail)) LIKE ?", "%#{search.split(" ").join('|')}%") if search.present?
     scope = scope.joins(:roles).where("roles.name LIKE ?", "%#{role}%") if role.present?
 
     @total_count = scope.size
@@ -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/memos_controller.rb

@@ -0,0 +1,116 @@
+class MemosController < ApplicationController
+  before_action :require_login, only: [:create, :edit, :update, :watch_memo]
+
+  before_action :check_batch_requests, only: [:create]
+
+  def index 
+    memos = MemosService.new.index params, current_user
+    render json: memos
+  end
+
+  def related_memos
+    targets = MemosService.new.related_memos params, current_user
+    render json: targets
+  end
+
+  def edit 
+    targets = MemosService.new.edit params, current_user
+    render json: targets
+  end
+
+  def update 
+    targets = MemosService.new.update params, current_user
+    render json: targets
+  end
+
+  def create 
+    params.permit!
+    targets = MemosService.new.create params, current_user
+    render json: targets
+  end
+
+  def show_simple 
+    targets = MemosService.new.show_simple params, current_user
+    render json: targets
+  end
+
+  def show 
+    targets = MemosService.new.show params, current_user
+    render json: targets
+  end
+
+  def watch_memo
+    targets = MemosService.new.watch_memo params, current_user
+    render json: targets
+  end
+
+  def hidden 
+    Memo.find(params[:id]).update_attribute(:hidden, true)
+    {status: 0, message: "隐藏成功"}
+  end
+
+  def memo_hidden
+    targets = MemosService.new.memo_hidden params, current_user
+    render json: targets
+  end
+
+  def reply
+    targets = MemosService.new.reply params, current_user
+    render json: targets
+  end
+
+  def destroy
+    targets = MemosService.new.destroy params, current_user
+    render json: targets
+  end
+
+  def set_top_or_down
+    targets = MemosService.new.set_top_or_down params, current_user
+    render json: targets
+  end
+
+  def is_fine
+    targets = MemosService.new.is_fine params, current_user
+    render json: targets
+  end
+
+  def banned_user
+    targets = MemosService.new.banned_user params, current_user
+    render json: targets
+  end
+
+  def more_reply
+    targets = MemosService.new.more_reply params, current_user
+    render json: targets
+  end
+
+  def forum_memos
+    targets = MemosService.new.forum_memos params, current_user
+    render json: targets
+  end
+
+  def forum_memos_head
+    targets = MemosService.new.forum_memos_head params, current_user
+    render json: targets
+  end
+
+  def forum_memos_right
+    targets = MemosService.new.forum_memos_right params, current_user
+    render json: targets
+  end
+
+  def is_watch
+    targets =  MemosService.new.is_watch params, current_user
+    render json: targets
+  end
+
+  def confirm_delete
+    targets = MemosService.new.confirm_delete params, current_user
+    render json: targets
+  end
+
+  def plus
+    targets = MemosService.new.plus params, current_user
+    render json: targets
+  end
+end

app/controllers/my_memos_controller.rb

@@ -0,0 +1,22 @@
+class MyMemosController < ApplicationController 
+
+  def index 
+    targets = MyMemosService.new.index params, current_user
+    render json: targets
+  end
+
+  def my_interested
+    targets = MyMemosService.new.my_interested params, current_user
+    render json: targets
+  end
+
+  def replies_memos
+    targets = MyMemosService.new.replies_memos params,current_user
+    render json: targets
+  end
+
+  def recommend_memos
+    targets = MyMemosService.new.recommend_memos current_user
+    render json: targets
+  end
+end

app/controllers/organizations/base_controller.rb

@@ -1,35 +0,0 @@
-class Organizations::BaseController < ApplicationController
-  include ApplicationHelper
-  include PaginateHelper
-
-  protected
-
-  def can_edit_org?
-    current_user.admin? || @organization.is_owner?(current_user.id)
-  end
-
-  def check_user_can_edit_org
-    tip_exception("您没有权限进行该操作") unless can_edit_org?
-  end
-
-  def org_limited_condition
-    @organization.organization_extension.limited? && !current_user.logged?
-  end
-
-  def org_privacy_condition
-    return false if current_user.admin?
-    @organization.organization_extension.privacy? && @organization.organization_users.where(user_id: current_user.id).blank?
-  end
-
-  def team_not_found_condition
-    !current_user&.admin? && @team.team_users.where(user_id: current_user.id).blank? && !@organization.is_owner?(current_user.id)
-  end
-
-  def user_mark
-    params[:username] || params[:id]
-  end
-
-  def project_mark
-    params[:repo_name] || params[:id]
-  end
-end

app/controllers/organizations/organization_users_controller.rb

@@ -1,57 +0,0 @@
-class Organizations::OrganizationUsersController < Organizations::BaseController
-  before_action :load_organization
-  before_action :load_operate_user, :load_organization_user, :check_user_can_edit_org, only: [:destroy]
-
-  def index
-    @organization_users = @organization.organization_users.includes(:user)
-    search = params[:search].to_s.downcase
-    @organization_users = @organization_users.joins(:user).merge(User.like(search))
-
-    @organization_users = kaminari_paginate(@organization_users)
-  end
-
-  def destroy
-    tip_exception("您不能从所有者团队中删除最后一个用户") if @organization.is_owner_team_last_one?(@operate_user.id)
-    ActiveRecord::Base.transaction do
-      @organization_user.destroy!
-      TeamUser.where(organization_id: @organization.id, user_id: @operate_user.id).map{|u| u.destroy!}
-      Gitea::Organization::OrganizationUser::DeleteService.call(@organization.gitea_token, @organization.login, @operate_user.login)
-      render_ok
-    end
-  rescue Exception => e
-    uid_logger_error(e.message)
-    tip_exception(e.message)
-  end
-
-  def quit
-    @organization_user = @organization.organization_users.find_by(user_id: current_user.id)
-    tip_exception("您不在该组织中") if @organization_user.nil?
-    tip_exception("您不能从所有者团队中删除最后一个用户") if @organization.is_owner_team_last_one?(current_user.id)
-    ActiveRecord::Base.transaction do
-      @organization_user.destroy!
-      TeamUser.where(organization_id: @organization.id, user_id: current_user.id).map{|u| u.destroy!}
-      Gitea::Organization::OrganizationUser::DeleteService.call(@organization.gitea_token, @organization.login, current_user.login)
-      render_ok
-    end
-  rescue Exception => e
-    uid_logger_error(e.message)
-    tip_exception(e.message)
-  end
-
-  private
-  def load_organization
-    @organization = Organization.find_by(login: params[:organization_id]) || Organization.find_by(id: params[:organization_id])
-    return render_not_found("组织不存在") if @organization.nil?
-    return render_forbidden("没有查看组织的权限") if org_limited_condition || org_privacy_condition
-  end
-
-  def load_operate_user
-    @operate_user = User.find_by(login: user_mark) if user_mark.present?
-    tip_exception("平台用户不存在") if @operate_user.nil?
-  end
-
-  def load_organization_user
-    @organization_user = OrganizationUser.find_by(organization_id: @organization.id, user_id: @operate_user.id)
-    tip_exception("组织成员不存在") if @organization_user.nil?
-  end
-end

app/controllers/organizations/organizations_controller.rb

@@ -1,119 +0,0 @@
-class Organizations::OrganizationsController < Organizations::BaseController
-  before_action :require_login, except: [:index, :show, :recommend]
-  before_action :require_profile_completed, only: [:create]
-  before_action :convert_image!, only: [:create, :update]
-  before_action :load_organization, only: [:show, :update, :destroy]
-  before_action :check_user_can_edit_org, only: [:update, :destroy]
-
-  def index
-    if current_user.logged?
-      logged_organizations_sql = Organization.with_visibility(%w(common limited)).to_sql
-      privacy_organizations_sql = Organization.with_visibility("privacy").joins(:organization_users).where(organization_users: {user_id: current_user.id}).to_sql
-      @organizations = Organization.from("( #{ logged_organizations_sql } UNION #{ privacy_organizations_sql } ) AS users")
-    else
-      @organizations = Organization.with_visibility("common")
-    end
-    @organizations = @organizations.ransack(login_cont: params[:search]).result if params[:search].present?
-    @organizations = @organizations.includes(:organization_extension).order("organization_extensions.#{sort_by} #{sort_direction}")
-    @organizations = kaminari_paginate(@organizations)
-  end
-
-  def show
-    @can_create_project = @organization.can_create_project?(current_user.id)
-    @is_admin = can_edit_org?
-    @is_member = @organization.is_member?(current_user.id)
-    Cache::V2::OwnerCommonService.new(@organization.id).read
-  end
-
-  def create
-    ActiveRecord::Base.transaction do
-      tip_exception("无法使用以下关键词：#{organization_params[:name]}，请重新命名") if ReversedKeyword.check_exists?(organization_params[:name])
-      Organizations::CreateForm.new(organization_params).validate!
-      @organization = Organizations::CreateService.call(current_user, organization_params)
-      Util.write_file(@image, avatar_path(@organization)) if params[:image].present?
-    end
-  rescue Exception => e
-    uid_logger_error(e.message)
-    tip_exception(e.message)
-  end
-
-  def update
-    ActiveRecord::Base.transaction do
-      Organizations::CreateForm.new(organization_params).validate!
-      login = @organization.login
-      @organization.login = organization_params[:name] if organization_params[:name].present?
-      @organization.nickname = organization_params[:nickname] if organization_params[:nickname].present?
-      @organization.save!
-      sync_organization_extension!
-      
-      Gitea::Organization::UpdateService.call(@organization.gitea_token, login, @organization.reload)
-      Util.write_file(@image, avatar_path(@organization)) if params[:image].present?
-    end
-  rescue Exception => e
-    uid_logger_error(e.message)
-    tip_exception(e.message)
-  end
-
-  def destroy
-    tip_exception("密码不正确") unless current_user.check_password?(password)
-    ActiveRecord::Base.transaction do
-      Gitea::Organization::DeleteService.call(@organization.gitea_token, @organization.login)
-      @organization.destroy!
-    end
-    render_ok
-  rescue Exception => e
-    uid_logger_error(e.message)
-    tip_exception(e.message)
-  end
-
-  def recommend
-    recommend = %W(xuos Huawei_Technology openatom_foundation pkecosystem TensorLayer)
-    
-    @organizations = Organization.includes(:organization_extension).where(organization_extensions: {recommend: true}).to_a.each_slice(group_size).to_a
-  end
-
-  private
-
-  def organization_params
-    params.permit(:name, :description, :website, :location,
-                  :repo_admin_change_team_access, :visibility,
-                  :max_repo_creation, :nickname)
-  end
-
-  def group_size 
-    params.fetch(:group_size, 4).to_i
-  end
-
-  def password
-    params.fetch(:password, "")
-  end
-
-  def load_organization
-    @organization = Organization.find_by(login: params[:id]) || Organization.find_by(id: params[:id])
-    return render_not_found("组织不存在") if @organization.nil?
-    return render_forbidden("没有查看组织的权限") if org_limited_condition || org_privacy_condition
-  end
-
-  def sort_by
-    OrganizationExtension.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'created_at'
-  end
-
-  def sort_direction
-    %w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : 'desc'
-  end
-
-  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

@@ -1,45 +0,0 @@
-class Organizations::ProjectsController < Organizations::BaseController
-  before_action :load_organization
-
-  def index
-    public_projects_sql = @organization.projects.where(is_public: true).to_sql
-    private_projects_sql = @organization.projects
-                               .where(is_public: false)
-                               .joins(team_projects: {team: :team_users})
-                               .where(team_users: {user_id: current_user.id}).to_sql
-    @projects = Project.from("( #{ public_projects_sql} UNION #{ private_projects_sql } ) AS projects")
-
-    @projects = @projects.ransack(name_or_identifier_cont: params[:search]).result if params[:search].present?
-    @projects = @projects.includes(:owner).order("projects.#{sort} #{sort_direction}")
-    @projects = paginate(@projects)
-  end
-
-  def search
-    tip_exception("请输入搜索关键词") if params[:search].nil?
-    public_projects_sql = @organization.projects.where(is_public: true).to_sql
-    private_projects_sql = @organization.projects
-                               .where(is_public: false)
-                               .joins(team_projects: {team: :team_users})
-                               .where(team_users: {user_id: current_user.id}).to_sql
-    @projects = Project.from("( #{ public_projects_sql} UNION #{ private_projects_sql } ) AS projects")
-
-    @projects = @projects.ransack(name_or_identifier_cont: params[:search]).result
-    @projects = @projects.includes(:owner).order("projects.#{sort} #{sort_direction}")
-  end
-
-  private
-
-  def load_organization
-    @organization = Organization.find_by(login: params[:organization_id]) || Organization.find_by(id: params[:organization_id])
-    return render_not_found("组织不存在") if @organization.nil?
-    return render_forbidden("没有查看组织的权限") if org_limited_condition || org_privacy_condition
-  end
-
-  def sort
-    Project.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'updated_on'
-  end
-
-  def sort_direction
-    %w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : 'desc'
-  end
-end

app/controllers/organizations/team_projects_controller.rb

@@ -1,58 +0,0 @@
-class Organizations::TeamProjectsController < Organizations::BaseController
-  before_action :load_organization
-  before_action :load_team
-  before_action :load_operate_project, :check_user_can_edit_org, only: [:create, :destroy]
-  before_action :load_team_project, only: [:destroy]
-
-  def index
-    @team_projects = @team.team_projects
-
-    @team_projects = paginate(@team_projects)
-  end
-
-  def create
-    tip_exception("该组织团队项目包括组织所有项目,不允许更改") if @team.includes_all_project
-    ActiveRecord::Base.transaction do
-      @team_project = TeamProject.build(@organization.id, @team.id, @operate_project.id)
-      Gitea::Organization::TeamProject::CreateService.call(@organization.gitea_token, @team.gtid, @organization.login, @operate_project.identifier)
-    end
-  rescue Exception => e
-    uid_logger_error(e.message)
-    tip_exception(e.message)
-  end
-
-  def destroy
-    tip_exception("该组织团队项目包括组织所有项目,不允许更改") if @team.includes_all_project
-    ActiveRecord::Base.transaction do
-      @team_project.destroy!
-      Gitea::Organization::TeamProject::DeleteService.call(@organization.gitea_token, @team.gtid, @organization.login, @operate_project.identifier)
-      render_ok
-    end
-  rescue Exception => e
-    uid_logger_error(e.message)
-    tip_exception(e.message)
-  end
-
-  private
-  def load_organization
-    @organization = Organization.find_by(login: params[:organization_id]) || Organization.find_by(id: params[:organization_id])
-    return render_not_found("组织不存在") if @organization.nil?
-    return render_forbidden("没有查看组织的权限") if org_limited_condition || org_privacy_condition
-  end
-
-  def load_team
-    @team = Team.find_by_id(params[:team_id])
-    return render_not_found("组织团队不存在") if @team.nil?
-    return render_forbidden("没有查看组织团队的权限") if team_not_found_condition
-  end
-
-  def load_operate_project
-    @operate_project = Project.find_by(id: project_mark) || Project.find_by(identifier: project_mark)
-    tip_exception("项目不存在") if @operate_project.nil?
-  end
-
-  def load_team_project
-    @team_project = TeamProject.find_by(organization_id: @organization.id, team_id: @team.id, project_id: @operate_project.id)
-    tip_exception("组织团队项目不存在") if @team_project.nil?
-  end
-end

app/controllers/organizations/team_users_controller.rb

@@ -1,92 +0,0 @@
-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]
-
-  def index
-    @team_users = @team.team_users.includes(:user)
-
-    search = params[:search].to_s.downcase
-    @team_users = @team_users.joins(:user).merge(User.like(search))
-
-    @team_users = kaminari_paginate(@team_users)
-  end
-
-  def create
-    ActiveRecord::Base.transaction do
-      @team_user = TeamUser.build(@organization.id, @operate_user.id, @team.id)
-      @organization_user = OrganizationUser.build(@organization.id, @operate_user.id)
-      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
-    uid_logger_error(e.message)
-    tip_exception(e.message)
-  end
-
-  def destroy
-    tip_exception("您不能从所有者团队中删除最后一个用户") if @team.owner? && @organization.is_owner_team_last_one?(@operate_user.id)
-    ActiveRecord::Base.transaction do
-      @team_user.destroy!
-      Gitea::Organization::TeamUser::DeleteService.call(@organization.gitea_token, @team.gtid, @operate_user.login)
-      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
-    uid_logger_error(e.message)
-    tip_exception(e.message)
-  end
-
-  def quit
-    @team_user = @team.team_users.find_by(user_id: current_user.id)
-    tip_exception("您不在该组织团队中") if @team_user.nil?
-    tip_exception("您不能从所有者团队中删除最后一个用户") if @team.owner? && @organization.is_owner_team_last_one?(current_user.id)
-    ActiveRecord::Base.transaction do
-      @team_user.destroy!
-      Gitea::Organization::TeamUser::DeleteService.call(@organization.gitea_token, @team.gtid, current_user.login)
-      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
-    uid_logger_error(e.message)
-    tip_exception(e.message)
-  end
-
-  private
-  def load_organization
-    @organization = Organization.find_by(login: params[:organization_id]) || Organization.find_by(id: params[:organization_id])
-    return render_not_found("组织不存在") if @organization.nil?
-    return render_forbidden("没有查看组织的权限") if org_limited_condition || org_privacy_condition
-  end
-
-  def load_team
-    @team = Team.find_by_id(params[:team_id])
-    return render_not_found("组织团队不存在") if @team.nil?
-    return render_forbidden("没有查看组织团队的权限") if team_not_found_condition
-  end
-
-  def load_operate_user
-    @operate_user = User.find_by(login: user_mark) if user_mark.present?
-    tip_exception("平台用户不存在") if @operate_user.nil?
-  end
-
-  def load_team_user
-    @team_user = TeamUser.find_by(team_id: @team.id, user_id: @operate_user.id)
-    tip_exception("组织团队成员不存在") if @team_user.nil?
-  end
-
-  def check_user_profile_completed
-    require_user_profile_completed(@operate_user)
-  end
-
-end

app/controllers/organizations/teams_controller.rb

@@ -1,81 +0,0 @@
-class Organizations::TeamsController < Organizations::BaseController
-  before_action :load_organization
-  before_action :load_team, only: [:show, :update, :destroy]
-  before_action :check_user_can_edit_org, only: [:create, :update, :destroy]
-
-  def index
-    #if @organization.is_owner?(current_user) || current_user.admin?
-      @teams = @organization.teams
-    #else
-    #  @teams = @organization.teams.joins(:team_users).where(team_users: {user_id: current_user.id})
-    #end
-    @is_admin = can_edit_org?
-    @teams = @teams.includes(:team_units, :team_users)
-
-    @teams = kaminari_paginate(@teams)
-  end
-
-  def search
-    tip_exception("请输入搜索关键词") if params[:search].nil?
-    if @organization.is_owner?(current_user) || current_user.admin?
-      @teams = @organization.teams
-    else
-      @teams = @organization.teams.joins(:team_users).where(team_users: {user_id: current_user.id})
-    end
-    @is_admin = can_edit_org?
-    @teams  = @teams.ransack(name_cont: params[:search]).result if params[:search].present?
-    @teams = @teams.includes(:team_units, :team_users)
-  end
-
-  def show
-    @is_admin = can_edit_org?
-    @is_member = @team.is_member?(current_user.id)
-  end
-
-  def create
-    ActiveRecord::Base.transaction do
-      Organizations::CreateTeamForm.new(team_params).validate!
-      @team = Organizations::Teams::CreateService.call(current_user, @organization, team_params)
-    end
-  rescue Exception => e
-    uid_logger_error(e.message)
-    tip_exception(e.message)
-  end
-
-  def update
-    Organizations::CreateTeamForm.new(team_params).validate!
-    @team = Organizations::Teams::UpdateService.call(current_user, @team, team_params)
-  rescue Exception => e
-    uid_logger_error(e.message)
-    tip_exception(e.message)
-  end
-
-  def destroy
-    tip_exception("组织团队不允许被删除") if @team.owner?
-    ActiveRecord::Base.transaction do
-      Gitea::Organization::Team::DeleteService.call(@organization.gitea_token, @team.gtid)
-      @team.destroy!
-    end
-    render_ok
-  rescue Exception => e
-    uid_logger_error(e.message)
-    tip_exception(e.message)
-  end
-
-  private
-  def team_params
-    params.permit(:name, :nickname, :description, :authorize, :includes_all_project, :can_create_org_project, :unit_types => [])
-  end
-
-  def load_organization
-    @organization = Organization.find_by(login: params[:organization_id]) || Organization.find_by(id: params[:organization_id])
-    return render_not_found("组织不存在") if @organization.nil?
-    return render_forbidden("没有查看组织的权限") if org_limited_condition || org_privacy_condition
-  end
-
-  def load_team
-    @team = Team.find_by_id(params[:id])
-    return render_not_found("组织团队不存在") if @team.nil?
-    return render_forbidden("没有查看组织团队的权限") if team_not_found_condition
-  end
-end

app/controllers/owners_controller.rb

@@ -1,61 +0,0 @@
-class OwnersController < ApplicationController
-  before_action :require_login, only: [:index]
-
-  def index
-    @owners = []
-    @owners += [current_user]
-    @owners += Organization.joins(team_users: :team)
-                   .where(team_users: {user_id: current_user.id},
-                          teams: {can_create_org_project: true})
-                   .distinct
-  end
-
-  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

app/controllers/plates_controller.rb

@@ -0,0 +1,30 @@
+class PlatesController < ApplicationController
+  def index
+    render_react
+  end
+
+  def show
+    render_react
+  end
+
+  def all
+    render_react
+  end
+
+  def is_fine
+    render_react
+  end
+
+  def my_memos
+    render_react
+  end
+
+  def my_topics
+    render_react
+  end
+
+  private
+  def render_react
+    render "/common/index", :layout => false
+  end
+end