FIX 更改开源项目相关名称

fix

fix

.gitignore

@@ -10,8 +10,7 @@
 
 # Ignore lock config file
 *.log
-.rubocop.yml
-.env
+
 # mac
 *.DS_Store
 .bashrc
@@ -37,12 +36,13 @@ 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
 /public/react/stats.json
 /public/react/.idea/*
+/public/react/build/*
 /public/h5build
 /public/npm-debug.log
 
@@ -73,7 +73,6 @@ vendor/bundle/
 /log
 /public/admin
 /mysql_data
-/public/repo/
 
 
 .generators
@@ -82,8 +81,5 @@ db/bak/
 docker/
 educoder.sql
 redis_data/
-dump.rdb
-.tags*
-ceshi_user.xlsx
-public/trace_task_results
-public/项目活跃度排行.xls
+Dockerfile
+dump.rdb

.merge_file_a17580

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

CHANGELOG.md

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

Dockerfile

@@ -1,59 +0,0 @@
-FROM ubuntu:20.04
-RUN apt-get update
-
-RUN DEBIAN_FRONTEND=noninteractive apt install -y tzdata
-# basics 
-RUN apt-get install -y libssl-dev curl libmysqlclient-dev imagemagick  nodejs mysql-server redis-server
-RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
-# confirm openssl version
-RUN openssl version
-RUN which openssl
-# install RVM, Ruby, and Bundler
-RUN \curl -L https://get.rvm.io | bash -s stable
-# rvm environment variable
-RUN /bin/bash -l -c "source /etc/profile.d/rvm.sh"
-RUN /bin/bash -l -c "rvm requirements"
-# replace ruby mirror url, accelerate install ruby
-RUN sed -i 's/rvm_remote_server_url2/#rvm_remote_server_url2/g' /usr/local/rvm/config/db
-RUN sed -i 's/cache.ruby-lang.org/cache.ruby-china.com/g' /usr/local/rvm/config/db
-# install ruby
-RUN /bin/bash -l -c "rvm install 2.4.5"
-# confirm ruby version
-RUN /bin/bash -l -c "rvm list"
-RUN /bin/bash -l -c "ruby -v"
-
-#RUN apt-get install -y nodejs
-
-WORKDIR /home/app/gitlink
-
-ADD ./ /home/app/gitlink
-
-RUN cd /home/app/gitlink
-
-RUN /bin/bash -l -c 'gem sources --add https://gems.ruby-china.com/ --remove https://rubygems.org/'
-
-RUN /bin/bash -l -c 'gem update --system'
-
-RUN /bin/bash -l -c 'gem install bundler -v 2.3.26'
-RUN /bin/bash -l -c 'gem install rake'
-RUN /bin/bash -l -c 'gem install puma -v 5.6.5'
-
-RUN rm -rf Gemfile.lock
-
-RUN cp config/configuration.yml.example config/configuration.yml
-RUN cp config/database-docker.yml.example config/database.yml
-RUN touch config/redis.yml
-RUN touch config/elasticsearch.yml
-
-RUN /bin/bash -l -c 'bundle install'
-
-RUN redis-server &
-
-RUN /bin/bash -l -c 'bundle exec rake sync_table_structure:import_csv'
-
-RUN /bin/bash -l -c 'rails db:migrate RAILS_ENV=development'
-
-RUN /bin/bash -l -c 'bundle exec sidekiq -C config/sidekiq.yml -e production -d'
-
-EXPOSE 4000
-RUN /bin/bash -l -c 'RAILS_ENV=production puma -C config/puma.rb'

Dockerfile-ruby

@@ -1,19 +0,0 @@
-FROM ubuntu:20.04
-RUN apt-get update
-# basics 
-RUN apt-get install -y libssl-dev curl libmysqlclient-dev imagemagick nodejs mysql-server redis-server tzdata
-RUN ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
-# confirm openssl version
-RUN openssl version
-RUN which openssl
-# install RVM, Ruby, and Bundler
-RUN \curl -L https://get.rvm.io | bash -s stable
-RUN /bin/bash -l -c "rvm requirements"
-# replace ruby mirror url, accelerate install ruby
-RUN sed -i 's/rvm_remote_server_url2/#rvm_remote_server_url2/g' /usr/local/rvm/config/db
-RUN sed -i 's/cache.ruby-lang.org/cache.ruby-china.com/g' /usr/local/rvm/config/db
-# install ruby
-RUN /bin/bash -l -c "rvm install 2.4.5"
-# confirm ruby version
-RUN /bin/bash -l -c "rvm list"
-RUN /bin/bash -l -c "ruby -v"

Gemfile

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

Gemfile.lock

@@ -1,5 +1,5 @@
 GEM
-  remote: https://mirrors.cloud.tencent.com/rubygems/
+  remote: https://gems.ruby-china.com/
   specs:
     aasm (5.0.6)
       concurrent-ruby (~> 1.0)
@@ -99,7 +99,6 @@ GEM
       archive-zip (~> 0.10)
       nokogiri (~> 1.8)
     chunky_png (1.3.11)
-    coderay (1.1.3)
     concurrent-ruby (1.1.6)
     connection_pool (2.2.2)
     crass (1.0.6)
@@ -107,12 +106,6 @@ GEM
       activerecord (>= 3.1.0, < 7)
     diff-lcs (1.3)
     diffy (3.3.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
-    doorkeeper (5.5.1)
-      railties (>= 5)
-    doorkeeper-jwt (0.4.1)
-      jwt (>= 2.1)
     e2mmap (0.1.0)
     elasticsearch (7.5.0)
       elasticsearch-api (= 7.5.0)
@@ -136,8 +129,6 @@ GEM
     fugit (1.4.1)
       et-orbi (~> 1.1, >= 1.1.8)
       raabro (~> 1.4)
-    gitea-client (1.5.9)
-      rest-client (~> 2.1.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     grape-entity (0.7.1)
@@ -148,9 +139,6 @@ GEM
     harmonious_dictionary (0.0.1)
     hashie (3.6.0)
     htmlentities (4.3.4)
-    http-accept (1.7.0)
-    http-cookie (1.0.8)
-      domain_name (~> 0.5)
     i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     io-like (0.3.1)
@@ -174,13 +162,11 @@ 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)
       ruby_dep (~> 1.2)
-    logger (1.6.6)
-    loofah (2.20.0)
+    loofah (2.4.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -189,13 +175,7 @@ GEM
       mimemagic (~> 0.3.2)
     maruku (0.7.3)
     method_source (0.9.2)
-    mime-types (3.6.0)
-      logger
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2025.0220)
-    mimemagic (0.3.10)
-      nokogiri (~> 1)
-      rake
+    mimemagic (0.3.4)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
     minitest (5.14.0)
@@ -206,7 +186,6 @@ GEM
     mustermann (1.1.1)
       ruby2_keywords (~> 0.0.1)
     mysql2 (0.5.3)
-    netrc (0.11.0)
     nio4r (2.5.2)
     nokogiri (1.10.8)
       mini_portile2 (~> 2.4.0)
@@ -223,21 +202,9 @@ GEM
       addressable (~> 2.3)
       nokogiri (~> 1.5)
       omniauth (~> 1.2)
-    omniauth-gitee (1.0.0)
-      omniauth (>= 1.5, < 3.0)
-      omniauth-oauth2 (>= 1.4.0, < 2.0)
-    omniauth-github (1.4.0)
-      omniauth (~> 1.5)
-      omniauth-oauth2 (>= 1.4.0, < 2.0)
     omniauth-oauth2 (1.6.0)
       oauth2 (~> 1.1)
       omniauth (~> 1.9)
-    omniauth-rails_csrf_protection (0.1.2)
-      actionpack (>= 4.2)
-      omniauth (>= 1.3.1)
-    omniauth-wechat-oauth2 (0.2.2)
-      omniauth (>= 1.3.2)
-      omniauth-oauth2 (>= 1.1.1)
     parallel (1.19.1)
     parser (2.7.1.1)
       ast (~> 2.4.0)
@@ -247,18 +214,14 @@ GEM
     popper_js (1.16.0)
     powerpack (0.1.2)
     prettier (0.18.2)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-rails (0.3.9)
-      pry (>= 0.10.4)
     public_suffix (4.0.3)
-    puma (5.6.5)
-      nio4r (~> 2.0)
+    puma (3.12.2)
     raabro (1.4.0)
     rack (2.0.9)
     rack-cors (1.1.1)
       rack (>= 2.0.0)
+    rack-mini-profiler (2.0.1)
+      rack (>= 1.2.0)
     rack-protection (2.0.8.1)
       rack
     rack-test (1.1.0)
@@ -322,11 +285,6 @@ GEM
     regexp_parser (1.7.0)
     request_store (1.5.0)
       rack (>= 1.4)
-    rest-client (2.1.0)
-      http-accept (>= 1.7.0, < 2.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 4.0)
-      netrc (~> 0.8)
     reverse_markdown (1.4.0)
       nokogiri
     roo (2.8.3)
@@ -404,8 +362,6 @@ GEM
     sidekiq-cron (1.2.0)
       fugit (~> 1.1)
       sidekiq (>= 4.2.1)
-    sidekiq-failures (1.0.4)
-      sidekiq (>= 4.0.0)
     simple_form (5.0.2)
       actionpack (>= 5.0)
       activemodel (>= 5.0)
@@ -455,7 +411,6 @@ GEM
       thread_safe (~> 0.1)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
-    unf (0.2.0)
     unicode-display_width (1.6.1)
     web-console (3.7.0)
       actionview (>= 5.0)
@@ -492,37 +447,27 @@ DEPENDENCIES
   chromedriver-helper
   deep_cloneable (~> 3.0.0)
   diffy
-  doorkeeper
-  doorkeeper-jwt
   enumerize
   faraday (~> 0.15.4)
   font-awesome-sass (= 4.7.0)
-  gitea-client (~> 1.5.8)
   grape-entity (~> 0.7.1)
   groupdate (~> 4.1.0)
   harmonious_dictionary (~> 0.0.1)
   jbuilder (~> 2.5)
   jquery-rails
-  jwt
   kaminari (~> 1.1, >= 1.1.1)
-  letter_avatar
   listen (>= 3.0.5, < 3.2)
-  loofah (~> 2.20.0)
   mysql2 (>= 0.4.4, < 0.6.0)
   oauth2
   omniauth (~> 1.9.0)
   omniauth-cas
-  omniauth-gitee (~> 1.0.0)
-  omniauth-github
   omniauth-oauth2 (~> 1.6.0)
-  omniauth-rails_csrf_protection
-  omniauth-wechat-oauth2
   parallel (~> 1.19, >= 1.19.1)
   pdfkit
   prettier
-  pry-rails
-  puma (~> 5.6.5)
+  puma (~> 3.11)
   rack-cors
+  rack-mini-profiler
   rails (~> 5.2.0)
   rails-i18n (~> 5.1)
   ransack
@@ -540,11 +485,10 @@ DEPENDENCIES
   sass-rails (~> 5.0)
   searchkick
   selenium-webdriver
-  sidekiq (= 5.2.8)
-  sidekiq-cron (= 1.2.0)
-  sidekiq-failures
+  sidekiq
+  sidekiq-cron (~> 1.1)
   simple_form
-  simple_xlsx_reader (~> 1.0.4)
+  simple_xlsx_reader
   sinatra
   solargraph (~> 0.38.0)
   spreadsheet

LICENSE

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

README.md

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

api_document.md

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

app/assets/javascripts/admin.js

@@ -1,137 +1,101 @@
-//= require rails-ujs
-//= require activestorage
-//= require turbolinks
-//= require jquery3
-//= require popper
-//= require bootstrap-sprockets
-//= require jquery.validate.min
-//= require additional-methods.min
-//= require bootstrap-notify
-//= require jquery.cookie.min
-//= require select2
-//= require moment.min
-//= require jquery.cxselect
-//= require bootstrap-datepicker
-//= require bootstrap-datetimepicker
-//= require bootstrap.viewer
-//= require bootstrap/bootstrap-toggle
-//= require jquery.mloading
-//= require jquery-confirm.min
-//= require common
-
-//= require echarts
-//= require codemirror/lib/codemirror
-//= require codemirror/mode/shell/shell
-//= require editormd/editormd
-//= require editormd/languages/zh-tw
-//= require dragula/dragula
-
-//= require_tree ./i18n
-//= require_tree ./admins
-
-
-$.ajaxSetup({
-  beforeSend: function(xhr) {
-    xhr.setRequestHeader('X-CSRF-Token', $('meta[name="csrf-token"]').attr('content'));
-  }
-});
-
-// ******** select2 global config ********
-$.fn.select2.defaults.set('theme', 'bootstrap4');
-$.fn.select2.defaults.set('language', 'zh-CN');
-
-Turbolinks.setProgressBarDelay(200);
-
-$.notifyDefaults({
-  type: 'success',
-  z_index: 9999,
-  delay: 2000
-});
-
-function show_success_flash(){
-  $.notify({
-    message: '操作成功'
-  },{
-    type: 'success'
-  });
-}
-
-$(document).on('turbolinks:load', function(){
-  $('[data-toggle="tooltip"]').tooltip({ trigger : 'hover' });
-  $('[data-toggle="popover"]').popover();
-
-  // 图片查看大图
-  $('img.preview-image').bootstrapViewer();
-
-  // flash alert提示框自动关闭
-  if($('.admin-alert-container .alert').length > 0){
-    setTimeout(function(){
-      $('.admin-alert-container .alert:not(.alert-danger)').alert('close');
-    }, 2000);
-    setTimeout(function(){
-      $('.admin-alert-container .alert.alert-danger').alert('close');
-    }, 5000);
-  }
-});
-
-$(document).on("turbolinks:before-cache", function () {
-  $('[data-toggle="tooltip"]').tooltip('hide');
-  $('[data-toggle="popover"]').popover('hide');
-});
-// var progressBar = new Turbolinks.ProgressBar();
-
-// $(document).on('ajax:send', function(event){
-//   console.log('ajax send', event);
-//   progressBar.setValue(0)
-//   progressBar.show()
-// });
-//
-// $(document).on('ajax:complete', function(event){
-//   console.log('ajax complete', event);
-//   progressBar.setValue(1)
-//   progressBar.hide() // 分页时不触发，奇怪
-// });
-// $(document).on('ajax:success', function(event){
-//   console.log('ajax success', event);
-// });
-// $(document).on('ajax:error', function(event){
-//   console.log('ajax error', event);
-// });
-
-$(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 {
-    }
-  });
-})
+//= require rails-ujs
+//= require activestorage
+//= require turbolinks
+//= require jquery3
+//= require popper
+//= require bootstrap-sprockets
+//= require jquery.validate.min
+//= require additional-methods.min
+//= require bootstrap-notify
+//= require jquery.cookie.min
+//= require select2
+//= require moment.min
+//= require jquery.cxselect
+//= require bootstrap-datepicker
+//= require bootstrap-datetimepicker
+//= require bootstrap.viewer
+//= require jquery.mloading
+//= require jquery-confirm.min
+//= require common
+
+//= require echarts
+//= require codemirror/lib/codemirror
+//= require codemirror/mode/shell/shell
+//= require editormd/editormd
+//= require editormd/languages/zh-tw
+//= require dragula/dragula
+
+//= require_tree ./i18n
+//= require_tree ./admins
+
+
+$.ajaxSetup({
+  beforeSend: function(xhr) {
+    xhr.setRequestHeader('X-CSRF-Token', $('meta[name="csrf-token"]').attr('content'));
+  }
+});
+
+// ******** select2 global config ********
+$.fn.select2.defaults.set('theme', 'bootstrap4');
+$.fn.select2.defaults.set('language', 'zh-CN');
+
+Turbolinks.setProgressBarDelay(200);
+
+$.notifyDefaults({
+  type: 'success',
+  z_index: 9999,
+  delay: 2000
+});
+
+function show_success_flash(){
+  $.notify({
+    message: '操作成功'
+  },{
+    type: 'success'
+  });
+}
+
+$(document).on('turbolinks:load', function(){
+  $('[data-toggle="tooltip"]').tooltip({ trigger : 'hover' });
+  $('[data-toggle="popover"]').popover();
+
+  // 图片查看大图
+  $('img.preview-image').bootstrapViewer();
+
+  // flash alert提示框自动关闭
+  if($('.admin-alert-container .alert').length > 0){
+    setTimeout(function(){
+      $('.admin-alert-container .alert:not(.alert-danger)').alert('close');
+    }, 2000);
+    setTimeout(function(){
+      $('.admin-alert-container .alert.alert-danger').alert('close');
+    }, 5000);
+  }
+});
+
+$(document).on("turbolinks:before-cache", function () {
+  $('[data-toggle="tooltip"]').tooltip('hide');
+  $('[data-toggle="popover"]').popover('hide');
+});
+// var progressBar = new Turbolinks.ProgressBar();
+
+// $(document).on('ajax:send', function(event){
+//   console.log('ajax send', event);
+//   progressBar.setValue(0)
+//   progressBar.show()
+// });
+//
+// $(document).on('ajax:complete', function(event){
+//   console.log('ajax complete', event);
+//   progressBar.setValue(1)
+//   progressBar.hide() // 分页时不触发，奇怪
+// });
+// $(document).on('ajax:success', function(event){
+//   console.log('ajax success', event);
+// });
+// $(document).on('ajax:error', function(event){
+//   console.log('ajax error', event);
+// });
+
+$(function () {
+});

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

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

app/assets/javascripts/admins/faqs.js

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

app/assets/javascripts/admins/glcc_pr_check.js

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

app/assets/javascripts/admins/identity_verifications.js

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

app/assets/javascripts/admins/laboratories/edit.js

@@ -63,7 +63,7 @@ $(document).on('turbolinks:load', function() {
 
       if(!valid) return;
       $.ajax({
-        method: 'PUT',
+        method: 'PATCH',
         dataType: 'json',
         url: $form.attr('action'),
         data: new FormData($form[0]),

app/assets/javascripts/admins/organizations.js

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

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

@@ -1,65 +0,0 @@
-$(document).on('turbolinks:load', function(){
-  if ($('body.admins-organizations-index-page').length > 0) {
-    var showSuccessNotify = function() {
-      $.notify({
-        message: '操作成功'
-      },{
-        type: 'success'
-      });
-    }
-
-    //  organizations open cla
-    $('.organizations-list-container').on('click', '.open-cla-action', function(){
-      var $openClaAction = $(this);
-      var $closeClaAction = $openClaAction.siblings('.close-cla-action');
-
-      var userId = $openClaAction.data('id');
-      customConfirm({
-        content: '确认开通吗？',
-        ok: function () {
-          $.ajax({
-            url: '/admins/organizations/' + userId + '/open_cla',
-            method: 'POST',
-            dataType: 'json',
-            success: function() {
-              showSuccessNotify();
-              $closeClaAction.show();
-              $openClaAction.hide();
-            },
-            error: function(res){
-              $.notify({ message: res.responseJSON.message }, { type: 'danger' });
-            }
-          });
-        }
-      })
-    });
-
-     //  organizations close cla
-    $('.organizations-list-container').on('click', '.close-cla-action', function(){
-      var $closeClaAction  = $(this);
-      var $openClaAction= $closeClaAction.siblings('.open-cla-action');
-
-      var userId = $openClaAction.data('id');
-      customConfirm({
-        content: '确认关闭吗？',
-        ok: function () {
-          $.ajax({
-            url: '/admins/organizations/' + userId + '/close_cla',
-            method: 'POST',
-            dataType: 'json',
-            success: function() {
-              showSuccessNotify();
-              $openClaAction.show();
-              $closeClaAction.hide();
-            },
-            error: function(res){
-              $.notify({ message: res.responseJSON.message }, { type: 'danger' });
-            }
-          });
-        }
-      })
-    });
-
-    
-  }
-});

app/assets/javascripts/admins/page_themes.js

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

app/assets/javascripts/admins/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/site_pages.js

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

app/assets/javascripts/admins/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/admins/users/index.js

@@ -94,20 +94,6 @@ $(document).on('turbolinks:load', function(){
         }
       });
     });
-    // reset user login times
-    $('.users-list-container').on('click', '.fresh-gitea-token-action', function(){
-      var $action = $(this);
-
-      var userId = $action.data('id');
-      $.ajax({
-        url: '/admins/users/' + userId + '/fresh_gitea_token',
-        method: 'POST',
-        dataType: 'json',
-        success: function() {
-          showSuccessNotify();
-        }
-      });
-    });
 
     // ***************** reward grade modal *****************
     var $rewardGradeModal = $('.admin-users-reward-grade-modal');

app/assets/javascripts/api/pm/issue_links.js

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

app/assets/javascripts/api/pm/projects.js

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

app/assets/javascripts/api/v1/pm_issues.js

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

app/assets/javascripts/api/v1/sonarqube/issues.js

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

app/assets/javascripts/api/v1/sonarqubes.js

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

app/assets/javascripts/bootstrap/bootstrap-toggle.js

@@ -1,180 +0,0 @@
-/*! ========================================================================
- * Bootstrap Toggle: bootstrap-toggle.js v2.2.0
- * http://www.bootstraptoggle.com
- * ========================================================================
- * Copyright 2014 Min Hur, The New York Times Company
- * Licensed under MIT
- * ======================================================================== */
-
-
- +function ($) {
- 	'use strict';
-
-	// TOGGLE PUBLIC CLASS DEFINITION
-	// ==============================
-
-	var Toggle = function (element, options) {
-		this.$element  = $(element)
-		this.options   = $.extend({}, this.defaults(), options)
-		this.render()
-	}
-
-	Toggle.VERSION  = '2.2.0'
-
-	Toggle.DEFAULTS = {
-		on: 'On',
-		off: 'Off',
-		onstyle: 'primary',
-		offstyle: 'default',
-		size: 'normal',
-		style: '',
-		width: null,
-		height: null
-	}
-
-	Toggle.prototype.defaults = function() {
-		return {
-			on: this.$element.attr('data-on') || Toggle.DEFAULTS.on,
-			off: this.$element.attr('data-off') || Toggle.DEFAULTS.off,
-			onstyle: this.$element.attr('data-onstyle') || Toggle.DEFAULTS.onstyle,
-			offstyle: this.$element.attr('data-offstyle') || Toggle.DEFAULTS.offstyle,
-			size: this.$element.attr('data-size') || Toggle.DEFAULTS.size,
-			style: this.$element.attr('data-style') || Toggle.DEFAULTS.style,
-			width: this.$element.attr('data-width') || Toggle.DEFAULTS.width,
-			height: this.$element.attr('data-height') || Toggle.DEFAULTS.height
-		}
-	}
-
-	Toggle.prototype.render = function () {
-		this._onstyle = 'btn-' + this.options.onstyle
-		this._offstyle = 'btn-' + this.options.offstyle
-		var size = this.options.size === 'large' ? 'btn-lg'
-			: this.options.size === 'small' ? 'btn-sm'
-			: this.options.size === 'mini' ? 'btn-xs'
-			: ''
-		var $toggleOn = $('<label class="btn">').html(this.options.on)
-			.addClass(this._onstyle + ' ' + size)
-		var $toggleOff = $('<label class="btn">').html(this.options.off)
-			.addClass(this._offstyle + ' ' + size + ' active')
-		var $toggleHandle = $('<span class="toggle-handle btn btn-default">')
-			.addClass(size)
-		var $toggleGroup = $('<div class="toggle-group">')
-			.append($toggleOn, $toggleOff, $toggleHandle)
-		var $toggle = $('<div class="toggle btn" data-toggle="toggle">')
-			.addClass( this.$element.prop('checked') ? this._onstyle : this._offstyle+' off' )
-			.addClass(size).addClass(this.options.style)
-
-		this.$element.wrap($toggle)
-		$.extend(this, {
-			$toggle: this.$element.parent(),
-			$toggleOn: $toggleOn,
-			$toggleOff: $toggleOff,
-			$toggleGroup: $toggleGroup
-		})
-		this.$toggle.append($toggleGroup)
-
-		var width = this.options.width || Math.max($toggleOn.outerWidth(), $toggleOff.outerWidth())+($toggleHandle.outerWidth()/2)
-		var height = this.options.height || Math.max($toggleOn.outerHeight(), $toggleOff.outerHeight())
-		$toggleOn.addClass('toggle-on')
-		$toggleOff.addClass('toggle-off')
-		this.$toggle.css({ width: width, height: height })
-		if (this.options.height) {
-			$toggleOn.css('line-height', $toggleOn.height() + 'px')
-			$toggleOff.css('line-height', $toggleOff.height() + 'px')
-		}
-		this.update(true)
-		this.trigger(true)
-	}
-
-	Toggle.prototype.toggle = function () {
-		if (this.$element.prop('checked')) this.off()
-		else this.on()
-	}
-
-	Toggle.prototype.on = function (silent) {
-		if (this.$element.prop('disabled')) return false
-		this.$toggle.removeClass(this._offstyle + ' off').addClass(this._onstyle)
-		this.$element.prop('checked', true)
-		if (!silent) this.trigger()
-	}
-
-	Toggle.prototype.off = function (silent) {
-		if (this.$element.prop('disabled')) return false
-		this.$toggle.removeClass(this._onstyle).addClass(this._offstyle + ' off')
-		this.$element.prop('checked', false)
-		if (!silent) this.trigger()
-	}
-
-	Toggle.prototype.enable = function () {
-		this.$toggle.removeAttr('disabled')
-		this.$element.prop('disabled', false)
-	}
-
-	Toggle.prototype.disable = function () {
-		this.$toggle.attr('disabled', 'disabled')
-		this.$element.prop('disabled', true)
-	}
-
-	Toggle.prototype.update = function (silent) {
-		if (this.$element.prop('disabled')) this.disable()
-		else this.enable()
-		if (this.$element.prop('checked')) this.on(silent)
-		else this.off(silent)
-	}
-
-	Toggle.prototype.trigger = function (silent) {
-		this.$element.off('change.bs.toggle')
-		if (!silent) this.$element.change()
-		this.$element.on('change.bs.toggle', $.proxy(function() {
-			this.update()
-		}, this))
-	}
-
-	Toggle.prototype.destroy = function() {
-		this.$element.off('change.bs.toggle')
-		this.$toggleGroup.remove()
-		this.$element.removeData('bs.toggle')
-		this.$element.unwrap()
-	}
-
-	// TOGGLE PLUGIN DEFINITION
-	// ========================
-
-	function Plugin(option) {
-		return this.each(function () {
-			var $this   = $(this)
-			var data    = $this.data('bs.toggle')
-			var options = typeof option == 'object' && option
-
-			if (!data) $this.data('bs.toggle', (data = new Toggle(this, options)))
-			if (typeof option == 'string' && data[option]) data[option]()
-		})
-	}
-
-	var old = $.fn.bootstrapToggle
-
-	$.fn.bootstrapToggle             = Plugin
-	$.fn.bootstrapToggle.Constructor = Toggle
-
-	// TOGGLE NO CONFLICT
-	// ==================
-
-	$.fn.toggle.noConflict = function () {
-		$.fn.bootstrapToggle = old
-		return this
-	}
-
-	// TOGGLE DATA-API
-	// ===============
-
-	$(function() {
-		$('input[type=checkbox][data-toggle^=toggle]').bootstrapToggle()
-	})
-
-	$(document).on('click.bs.toggle', 'div[data-toggle^=toggle]', function(e) {
-		var $checkbox = $(this).find('input[type=checkbox]')
-		$checkbox.bootstrapToggle('toggle')
-		e.preventDefault()
-	})
-
-}(jQuery);

app/assets/javascripts/bootstrap/bootstrap-toggle.min.js

@@ -1,9 +0,0 @@
-/*! ========================================================================
- * Bootstrap Toggle: bootstrap-toggle.js v2.2.0
- * http://www.bootstraptoggle.com
- * ========================================================================
- * Copyright 2014 Min Hur, The New York Times Company
- * Licensed under MIT
- * ======================================================================== */
-+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.toggle"),f="object"==typeof b&&b;e||d.data("bs.toggle",e=new c(this,f)),"string"==typeof b&&e[b]&&e[b]()})}var c=function(b,c){this.$element=a(b),this.options=a.extend({},this.defaults(),c),this.render()};c.VERSION="2.2.0",c.DEFAULTS={on:"On",off:"Off",onstyle:"primary",offstyle:"default",size:"normal",style:"",width:null,height:null},c.prototype.defaults=function(){return{on:this.$element.attr("data-on")||c.DEFAULTS.on,off:this.$element.attr("data-off")||c.DEFAULTS.off,onstyle:this.$element.attr("data-onstyle")||c.DEFAULTS.onstyle,offstyle:this.$element.attr("data-offstyle")||c.DEFAULTS.offstyle,size:this.$element.attr("data-size")||c.DEFAULTS.size,style:this.$element.attr("data-style")||c.DEFAULTS.style,width:this.$element.attr("data-width")||c.DEFAULTS.width,height:this.$element.attr("data-height")||c.DEFAULTS.height}},c.prototype.render=function(){this._onstyle="btn-"+this.options.onstyle,this._offstyle="btn-"+this.options.offstyle;var b="large"===this.options.size?"btn-lg":"small"===this.options.size?"btn-sm":"mini"===this.options.size?"btn-xs":"",c=a('<label class="btn">').html(this.options.on).addClass(this._onstyle+" "+b),d=a('<label class="btn">').html(this.options.off).addClass(this._offstyle+" "+b+" active"),e=a('<span class="toggle-handle btn btn-default">').addClass(b),f=a('<div class="toggle-group">').append(c,d,e),g=a('<div class="toggle btn" data-toggle="toggle">').addClass(this.$element.prop("checked")?this._onstyle:this._offstyle+" off").addClass(b).addClass(this.options.style);this.$element.wrap(g),a.extend(this,{$toggle:this.$element.parent(),$toggleOn:c,$toggleOff:d,$toggleGroup:f}),this.$toggle.append(f);var h=this.options.width||Math.max(c.outerWidth(),d.outerWidth())+e.outerWidth()/2,i=this.options.height||Math.max(c.outerHeight(),d.outerHeight());c.addClass("toggle-on"),d.addClass("toggle-off"),this.$toggle.css({width:h,height:i}),this.options.height&&(c.css("line-height",c.height()+"px"),d.css("line-height",d.height()+"px")),this.update(!0),this.trigger(!0)},c.prototype.toggle=function(){this.$element.prop("checked")?this.off():this.on()},c.prototype.on=function(a){return this.$element.prop("disabled")?!1:(this.$toggle.removeClass(this._offstyle+" off").addClass(this._onstyle),this.$element.prop("checked",!0),void(a||this.trigger()))},c.prototype.off=function(a){return this.$element.prop("disabled")?!1:(this.$toggle.removeClass(this._onstyle).addClass(this._offstyle+" off"),this.$element.prop("checked",!1),void(a||this.trigger()))},c.prototype.enable=function(){this.$toggle.removeAttr("disabled"),this.$element.prop("disabled",!1)},c.prototype.disable=function(){this.$toggle.attr("disabled","disabled"),this.$element.prop("disabled",!0)},c.prototype.update=function(a){this.$element.prop("disabled")?this.disable():this.enable(),this.$element.prop("checked")?this.on(a):this.off(a)},c.prototype.trigger=function(b){this.$element.off("change.bs.toggle"),b||this.$element.change(),this.$element.on("change.bs.toggle",a.proxy(function(){this.update()},this))},c.prototype.destroy=function(){this.$element.off("change.bs.toggle"),this.$toggleGroup.remove(),this.$element.removeData("bs.toggle"),this.$element.unwrap()};var d=a.fn.bootstrapToggle;a.fn.bootstrapToggle=b,a.fn.bootstrapToggle.Constructor=c,a.fn.toggle.noConflict=function(){return a.fn.bootstrapToggle=d,this},a(function(){a("input[type=checkbox][data-toggle^=toggle]").bootstrapToggle()}),a(document).on("click.bs.toggle","div[data-toggle^=toggle]",function(b){var c=a(this).find("input[type=checkbox]");c.bootstrapToggle("toggle"),b.preventDefault()})}(jQuery);
-//# sourceMappingURL=bootstrap-toggle.min.js.map

app/assets/javascripts/bootstrap/bootstrap-toggle.min.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"bootstrap-toggle.min.js","sources":["bootstrap-toggle.js"],"names":["$","Plugin","option","this","each","$this","data","options","Toggle","element","$element","extend","defaults","render","VERSION","DEFAULTS","on","off","onstyle","offstyle","size","style","width","height","prototype","attr","_onstyle","_offstyle","$toggleOn","html","addClass","$toggleOff","$toggleHandle","$toggleGroup","append","$toggle","prop","wrap","parent","Math","max","outerWidth","outerHeight","css","update","trigger","toggle","silent","removeClass","enable","removeAttr","disable","change","proxy","destroy","remove","removeData","unwrap","old","fn","bootstrapToggle","Constructor","noConflict","document","e","$checkbox","find","preventDefault","jQuery"],"mappings":";;;;;;;CASE,SAAUA,GACV,YAoID,SAASC,GAAOC,GACf,MAAOC,MAAKC,KAAK,WAChB,GAAIC,GAAUL,EAAEG,MACZG,EAAUD,EAAMC,KAAK,aACrBC,EAA2B,gBAAVL,IAAsBA,CAEtCI,IAAMD,EAAMC,KAAK,YAAcA,EAAO,GAAIE,GAAOL,KAAMI,IACvC,gBAAVL,IAAsBI,EAAKJ,IAASI,EAAKJ,OAtItD,GAAIM,GAAS,SAAUC,EAASF,GAC/BJ,KAAKO,SAAYV,EAAES,GACnBN,KAAKI,QAAYP,EAAEW,UAAWR,KAAKS,WAAYL,GAC/CJ,KAAKU,SAGNL,GAAOM,QAAW,QAElBN,EAAOO,UACNC,GAAI,KACJC,IAAK,MACLC,QAAS,UACTC,SAAU,UACVC,KAAM,SACNC,MAAO,GACPC,MAAO,KACPC,OAAQ,MAGTf,EAAOgB,UAAUZ,SAAW,WAC3B,OACCI,GAAIb,KAAKO,SAASe,KAAK,YAAcjB,EAAOO,SAASC,GACrDC,IAAKd,KAAKO,SAASe,KAAK,aAAejB,EAAOO,SAASE,IACvDC,QAASf,KAAKO,SAASe,KAAK,iBAAmBjB,EAAOO,SAASG,QAC/DC,SAAUhB,KAAKO,SAASe,KAAK,kBAAoBjB,EAAOO,SAASI,SACjEC,KAAMjB,KAAKO,SAASe,KAAK,cAAgBjB,EAAOO,SAASK,KACzDC,MAAOlB,KAAKO,SAASe,KAAK,eAAiBjB,EAAOO,SAASM,MAC3DC,MAAOnB,KAAKO,SAASe,KAAK,eAAiBjB,EAAOO,SAASO,MAC3DC,OAAQpB,KAAKO,SAASe,KAAK,gBAAkBjB,EAAOO,SAASQ,SAI/Df,EAAOgB,UAAUX,OAAS,WACzBV,KAAKuB,SAAW,OAASvB,KAAKI,QAAQW,QACtCf,KAAKwB,UAAY,OAASxB,KAAKI,QAAQY,QACvC,IAAIC,GAA6B,UAAtBjB,KAAKI,QAAQa,KAAmB,SAClB,UAAtBjB,KAAKI,QAAQa,KAAmB,SACV,SAAtBjB,KAAKI,QAAQa,KAAkB,SAC/B,GACCQ,EAAY5B,EAAE,uBAAuB6B,KAAK1B,KAAKI,QAAQS,IACzDc,SAAS3B,KAAKuB,SAAW,IAAMN,GAC7BW,EAAa/B,EAAE,uBAAuB6B,KAAK1B,KAAKI,QAAQU,KAC1Da,SAAS3B,KAAKwB,UAAY,IAAMP,EAAO,WACrCY,EAAgBhC,EAAE,gDACpB8B,SAASV,GACPa,EAAejC,EAAE,8BACnBkC,OAAON,EAAWG,EAAYC,GAC5BG,EAAUnC,EAAE,iDACd8B,SAAU3B,KAAKO,SAAS0B,KAAK,WAAajC,KAAKuB,SAAWvB,KAAKwB,UAAU,QACzEG,SAASV,GAAMU,SAAS3B,KAAKI,QAAQc,MAEvClB,MAAKO,SAAS2B,KAAKF,GACnBnC,EAAEW,OAAOR,MACRgC,QAAShC,KAAKO,SAAS4B,SACvBV,UAAWA,EACXG,WAAYA,EACZE,aAAcA,IAEf9B,KAAKgC,QAAQD,OAAOD,EAEpB,IAAIX,GAAQnB,KAAKI,QAAQe,OAASiB,KAAKC,IAAIZ,EAAUa,aAAcV,EAAWU,cAAeT,EAAcS,aAAa,EACpHlB,EAASpB,KAAKI,QAAQgB,QAAUgB,KAAKC,IAAIZ,EAAUc,cAAeX,EAAWW,cACjFd,GAAUE,SAAS,aACnBC,EAAWD,SAAS,cACpB3B,KAAKgC,QAAQQ,KAAMrB,MAAOA,EAAOC,OAAQA,IACrCpB,KAAKI,QAAQgB,SAChBK,EAAUe,IAAI,cAAef,EAAUL,SAAW,MAClDQ,EAAWY,IAAI,cAAeZ,EAAWR,SAAW,OAErDpB,KAAKyC,QAAO,GACZzC,KAAK0C,SAAQ,IAGdrC,EAAOgB,UAAUsB,OAAS,WACrB3C,KAAKO,SAAS0B,KAAK,WAAYjC,KAAKc,MACnCd,KAAKa,MAGXR,EAAOgB,UAAUR,GAAK,SAAU+B,GAC/B,MAAI5C,MAAKO,SAAS0B,KAAK,aAAoB,GAC3CjC,KAAKgC,QAAQa,YAAY7C,KAAKwB,UAAY,QAAQG,SAAS3B,KAAKuB,UAChEvB,KAAKO,SAAS0B,KAAK,WAAW,QACzBW,GAAQ5C,KAAK0C,aAGnBrC,EAAOgB,UAAUP,IAAM,SAAU8B,GAChC,MAAI5C,MAAKO,SAAS0B,KAAK,aAAoB,GAC3CjC,KAAKgC,QAAQa,YAAY7C,KAAKuB,UAAUI,SAAS3B,KAAKwB,UAAY,QAClExB,KAAKO,SAAS0B,KAAK,WAAW,QACzBW,GAAQ5C,KAAK0C,aAGnBrC,EAAOgB,UAAUyB,OAAS,WACzB9C,KAAKgC,QAAQe,WAAW,YACxB/C,KAAKO,SAAS0B,KAAK,YAAY,IAGhC5B,EAAOgB,UAAU2B,QAAU,WAC1BhD,KAAKgC,QAAQV,KAAK,WAAY,YAC9BtB,KAAKO,SAAS0B,KAAK,YAAY,IAGhC5B,EAAOgB,UAAUoB,OAAS,SAAUG,GAC/B5C,KAAKO,SAAS0B,KAAK,YAAajC,KAAKgD,UACpChD,KAAK8C,SACN9C,KAAKO,SAAS0B,KAAK,WAAYjC,KAAKa,GAAG+B,GACtC5C,KAAKc,IAAI8B,IAGfvC,EAAOgB,UAAUqB,QAAU,SAAUE,GACpC5C,KAAKO,SAASO,IAAI,oBACb8B,GAAQ5C,KAAKO,SAAS0C,SAC3BjD,KAAKO,SAASM,GAAG,mBAAoBhB,EAAEqD,MAAM,WAC5ClD,KAAKyC,UACHzC,QAGJK,EAAOgB,UAAU8B,QAAU,WAC1BnD,KAAKO,SAASO,IAAI,oBAClBd,KAAK8B,aAAasB,SAClBpD,KAAKO,SAAS8C,WAAW,aACzBrD,KAAKO,SAAS+C,SAiBf,IAAIC,GAAM1D,EAAE2D,GAAGC,eAEf5D,GAAE2D,GAAGC,gBAA8B3D,EACnCD,EAAE2D,GAAGC,gBAAgBC,YAAcrD,EAKnCR,EAAE2D,GAAGb,OAAOgB,WAAa,WAExB,MADA9D,GAAE2D,GAAGC,gBAAkBF,EAChBvD,MAMRH,EAAE,WACDA,EAAE,6CAA6C4D,oBAGhD5D,EAAE+D,UAAU/C,GAAG,kBAAmB,2BAA4B,SAASgD,GACtE,GAAIC,GAAYjE,EAAEG,MAAM+D,KAAK,uBAC7BD,GAAUL,gBAAgB,UAC1BI,EAAEG,oBAGFC"}

app/assets/javascripts/bootstrap/bootstrap2-toggle.js

@@ -1,180 +0,0 @@
-/*! ========================================================================
- * Bootstrap Toggle: bootstrap2-toggle.js v2.2.0
- * http://www.bootstraptoggle.com
- * ========================================================================
- * Copyright 2014 Min Hur, The New York Times Company
- * Licensed under MIT
- * ======================================================================== */
-
-
- +function ($) {
- 	'use strict';
-
-	// TOGGLE PUBLIC CLASS DEFINITION
-	// ==============================
-
-	var Toggle = function (element, options) {
-		this.$element  = $(element)
-		this.options   = $.extend({}, this.defaults(), options)
-		this.render()
-	}
-
-	Toggle.VERSION  = '2.2.0'
-
-	Toggle.DEFAULTS = {
-		on: 'On',
-		off: 'Off',
-		onstyle: 'primary',
-		offstyle: 'default',
-		size: 'normal',
-		style: '',
-		width: null,
-		height: null
-	}
-
-	Toggle.prototype.defaults = function() {
-		return {
-			on: this.$element.attr('data-on') || Toggle.DEFAULTS.on,
-			off: this.$element.attr('data-off') || Toggle.DEFAULTS.off,
-			onstyle: this.$element.attr('data-onstyle') || Toggle.DEFAULTS.onstyle,
-			offstyle: this.$element.attr('data-offstyle') || Toggle.DEFAULTS.offstyle,
-			size: this.$element.attr('data-size') || Toggle.DEFAULTS.size,
-			style: this.$element.attr('data-style') || Toggle.DEFAULTS.style,
-			width: this.$element.attr('data-width') || Toggle.DEFAULTS.width,
-			height: this.$element.attr('data-height') || Toggle.DEFAULTS.height
-		}
-	}
-
-	Toggle.prototype.render = function () {
-		this._onstyle = 'btn-' + this.options.onstyle
-		this._offstyle = 'btn-' + this.options.offstyle
-		var size = this.options.size === 'large' ? 'btn-large'
-			: this.options.size === 'small' ? 'btn-small'
-			: this.options.size === 'mini' ? 'btn-mini'
-			: ''
-		var $toggleOn = $('<label class="btn">').html(this.options.on)
-			.addClass(this._onstyle + ' ' + size)
-		var $toggleOff = $('<label class="btn">').html(this.options.off)
-			.addClass(this._offstyle + ' ' + size + ' active')
-		var $toggleHandle = $('<span class="toggle-handle btn btn-default">')
-			.addClass(size)
-		var $toggleGroup = $('<div class="toggle-group">')
-			.append($toggleOn, $toggleOff, $toggleHandle)
-		var $toggle = $('<div class="toggle btn" data-toggle="toggle">')
-			.addClass( this.$element.prop('checked') ? this._onstyle : this._offstyle+' off' )
-			.addClass(size).addClass(this.options.style)
-
-		this.$element.wrap($toggle)
-		$.extend(this, {
-			$toggle: this.$element.parent(),
-			$toggleOn: $toggleOn,
-			$toggleOff: $toggleOff,
-			$toggleGroup: $toggleGroup
-		})
-		this.$toggle.append($toggleGroup)
-
-		var width = this.options.width || Math.max($toggleOn.width(), $toggleOff.width())+($toggleHandle.outerWidth()/2)
-		var height = this.options.height || Math.max($toggleOn.height(), $toggleOff.height())
-		$toggleOn.addClass('toggle-on')
-		$toggleOff.addClass('toggle-off')
-		this.$toggle.css({ width: width, height: height })
-		if (this.options.height) {
-			$toggleOn.css('line-height', $toggleOn.height() + 'px')
-			$toggleOff.css('line-height', $toggleOff.height() + 'px')
-		}
-		this.update(true)
-		this.trigger(true)
-	}
-
-	Toggle.prototype.toggle = function () {
-		if (this.$element.prop('checked')) this.off()
-		else this.on()
-	}
-
-	Toggle.prototype.on = function (silent) {
-		if (this.$element.prop('disabled')) return false
-		this.$toggle.removeClass(this._offstyle + ' off').addClass(this._onstyle)
-		this.$element.prop('checked', true)
-		if (!silent) this.trigger()
-	}
-
-	Toggle.prototype.off = function (silent) {
-		if (this.$element.prop('disabled')) return false
-		this.$toggle.removeClass(this._onstyle).addClass(this._offstyle + ' off')
-		this.$element.prop('checked', false)
-		if (!silent) this.trigger()
-	}
-
-	Toggle.prototype.enable = function () {
-		this.$toggle.removeAttr('disabled')
-		this.$element.prop('disabled', false)
-	}
-
-	Toggle.prototype.disable = function () {
-		this.$toggle.attr('disabled', 'disabled')
-		this.$element.prop('disabled', true)
-	}
-
-	Toggle.prototype.update = function (silent) {
-		if (this.$element.prop('disabled')) this.disable()
-		else this.enable()
-		if (this.$element.prop('checked')) this.on(silent)
-		else this.off(silent)
-	}
-
-	Toggle.prototype.trigger = function (silent) {
-		this.$element.off('change.bs.toggle')
-		if (!silent) this.$element.change()
-		this.$element.on('change.bs.toggle', $.proxy(function() {
-			this.update()
-		}, this))
-	}
-
-	Toggle.prototype.destroy = function() {
-		this.$element.off('change.bs.toggle')
-		this.$toggleGroup.remove()
-		this.$element.removeData('bs.toggle')
-		this.$element.unwrap()
-	}
-
-	// TOGGLE PLUGIN DEFINITION
-	// ========================
-
-	function Plugin(option) {
-		return this.each(function () {
-			var $this   = $(this)
-			var data    = $this.data('bs.toggle')
-			var options = typeof option == 'object' && option
-
-			if (!data) $this.data('bs.toggle', (data = new Toggle(this, options)))
-			if (typeof option == 'string' && data[option]) data[option]()
-		})
-	}
-
-	var old = $.fn.bootstrapToggle
-
-	$.fn.bootstrapToggle             = Plugin
-	$.fn.bootstrapToggle.Constructor = Toggle
-
-	// TOGGLE NO CONFLICT
-	// ==================
-
-	$.fn.toggle.noConflict = function () {
-		$.fn.bootstrapToggle = old
-		return this
-	}
-
-	// TOGGLE DATA-API
-	// ===============
-
-	$(function() {
-		$('input[type=checkbox][data-toggle^=toggle]').bootstrapToggle()
-	})
-
-	$(document).on('click.bs.toggle', 'div[data-toggle^=toggle]', function(e) {
-		var $checkbox = $(this).find('input[type=checkbox]')
-		$checkbox.bootstrapToggle('toggle')
-		e.preventDefault()
-	})
-
-}(jQuery);

app/assets/javascripts/bootstrap/bootstrap2-toggle.min.js

@@ -1,9 +0,0 @@
-/*! ========================================================================
- * Bootstrap Toggle: bootstrap2-toggle.js v2.2.0
- * http://www.bootstraptoggle.com
- * ========================================================================
- * Copyright 2014 Min Hur, The New York Times Company
- * Licensed under MIT
- * ======================================================================== */
-+function(a){"use strict";function b(b){return this.each(function(){var d=a(this),e=d.data("bs.toggle"),f="object"==typeof b&&b;e||d.data("bs.toggle",e=new c(this,f)),"string"==typeof b&&e[b]&&e[b]()})}var c=function(b,c){this.$element=a(b),this.options=a.extend({},this.defaults(),c),this.render()};c.VERSION="2.2.0",c.DEFAULTS={on:"On",off:"Off",onstyle:"primary",offstyle:"default",size:"normal",style:"",width:null,height:null},c.prototype.defaults=function(){return{on:this.$element.attr("data-on")||c.DEFAULTS.on,off:this.$element.attr("data-off")||c.DEFAULTS.off,onstyle:this.$element.attr("data-onstyle")||c.DEFAULTS.onstyle,offstyle:this.$element.attr("data-offstyle")||c.DEFAULTS.offstyle,size:this.$element.attr("data-size")||c.DEFAULTS.size,style:this.$element.attr("data-style")||c.DEFAULTS.style,width:this.$element.attr("data-width")||c.DEFAULTS.width,height:this.$element.attr("data-height")||c.DEFAULTS.height}},c.prototype.render=function(){this._onstyle="btn-"+this.options.onstyle,this._offstyle="btn-"+this.options.offstyle;var b="large"===this.options.size?"btn-large":"small"===this.options.size?"btn-small":"mini"===this.options.size?"btn-mini":"",c=a('<label class="btn">').html(this.options.on).addClass(this._onstyle+" "+b),d=a('<label class="btn">').html(this.options.off).addClass(this._offstyle+" "+b+" active"),e=a('<span class="toggle-handle btn btn-default">').addClass(b),f=a('<div class="toggle-group">').append(c,d,e),g=a('<div class="toggle btn" data-toggle="toggle">').addClass(this.$element.prop("checked")?this._onstyle:this._offstyle+" off").addClass(b).addClass(this.options.style);this.$element.wrap(g),a.extend(this,{$toggle:this.$element.parent(),$toggleOn:c,$toggleOff:d,$toggleGroup:f}),this.$toggle.append(f);var h=this.options.width||Math.max(c.width(),d.width())+e.outerWidth()/2,i=this.options.height||Math.max(c.height(),d.height());c.addClass("toggle-on"),d.addClass("toggle-off"),this.$toggle.css({width:h,height:i}),this.options.height&&(c.css("line-height",c.height()+"px"),d.css("line-height",d.height()+"px")),this.update(!0),this.trigger(!0)},c.prototype.toggle=function(){this.$element.prop("checked")?this.off():this.on()},c.prototype.on=function(a){return this.$element.prop("disabled")?!1:(this.$toggle.removeClass(this._offstyle+" off").addClass(this._onstyle),this.$element.prop("checked",!0),void(a||this.trigger()))},c.prototype.off=function(a){return this.$element.prop("disabled")?!1:(this.$toggle.removeClass(this._onstyle).addClass(this._offstyle+" off"),this.$element.prop("checked",!1),void(a||this.trigger()))},c.prototype.enable=function(){this.$toggle.removeAttr("disabled"),this.$element.prop("disabled",!1)},c.prototype.disable=function(){this.$toggle.attr("disabled","disabled"),this.$element.prop("disabled",!0)},c.prototype.update=function(a){this.$element.prop("disabled")?this.disable():this.enable(),this.$element.prop("checked")?this.on(a):this.off(a)},c.prototype.trigger=function(b){this.$element.off("change.bs.toggle"),b||this.$element.change(),this.$element.on("change.bs.toggle",a.proxy(function(){this.update()},this))},c.prototype.destroy=function(){this.$element.off("change.bs.toggle"),this.$toggleGroup.remove(),this.$element.removeData("bs.toggle"),this.$element.unwrap()};var d=a.fn.bootstrapToggle;a.fn.bootstrapToggle=b,a.fn.bootstrapToggle.Constructor=c,a.fn.toggle.noConflict=function(){return a.fn.bootstrapToggle=d,this},a(function(){a("input[type=checkbox][data-toggle^=toggle]").bootstrapToggle()}),a(document).on("click.bs.toggle","div[data-toggle^=toggle]",function(b){var c=a(this).find("input[type=checkbox]");c.bootstrapToggle("toggle"),b.preventDefault()})}(jQuery);
-//# sourceMappingURL=bootstrap2-toggle.min.js.map

app/assets/javascripts/bootstrap/bootstrap2-toggle.min.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"bootstrap2-toggle.min.js","sources":["bootstrap2-toggle.js"],"names":["$","Plugin","option","this","each","$this","data","options","Toggle","element","$element","extend","defaults","render","VERSION","DEFAULTS","on","off","onstyle","offstyle","size","style","width","height","prototype","attr","_onstyle","_offstyle","$toggleOn","html","addClass","$toggleOff","$toggleHandle","$toggleGroup","append","$toggle","prop","wrap","parent","Math","max","outerWidth","css","update","trigger","toggle","silent","removeClass","enable","removeAttr","disable","change","proxy","destroy","remove","removeData","unwrap","old","fn","bootstrapToggle","Constructor","noConflict","document","e","$checkbox","find","preventDefault","jQuery"],"mappings":";;;;;;;CASE,SAAUA,GACV,YAoID,SAASC,GAAOC,GACf,MAAOC,MAAKC,KAAK,WAChB,GAAIC,GAAUL,EAAEG,MACZG,EAAUD,EAAMC,KAAK,aACrBC,EAA2B,gBAAVL,IAAsBA,CAEtCI,IAAMD,EAAMC,KAAK,YAAcA,EAAO,GAAIE,GAAOL,KAAMI,IACvC,gBAAVL,IAAsBI,EAAKJ,IAASI,EAAKJ,OAtItD,GAAIM,GAAS,SAAUC,EAASF,GAC/BJ,KAAKO,SAAYV,EAAES,GACnBN,KAAKI,QAAYP,EAAEW,UAAWR,KAAKS,WAAYL,GAC/CJ,KAAKU,SAGNL,GAAOM,QAAW,QAElBN,EAAOO,UACNC,GAAI,KACJC,IAAK,MACLC,QAAS,UACTC,SAAU,UACVC,KAAM,SACNC,MAAO,GACPC,MAAO,KACPC,OAAQ,MAGTf,EAAOgB,UAAUZ,SAAW,WAC3B,OACCI,GAAIb,KAAKO,SAASe,KAAK,YAAcjB,EAAOO,SAASC,GACrDC,IAAKd,KAAKO,SAASe,KAAK,aAAejB,EAAOO,SAASE,IACvDC,QAASf,KAAKO,SAASe,KAAK,iBAAmBjB,EAAOO,SAASG,QAC/DC,SAAUhB,KAAKO,SAASe,KAAK,kBAAoBjB,EAAOO,SAASI,SACjEC,KAAMjB,KAAKO,SAASe,KAAK,cAAgBjB,EAAOO,SAASK,KACzDC,MAAOlB,KAAKO,SAASe,KAAK,eAAiBjB,EAAOO,SAASM,MAC3DC,MAAOnB,KAAKO,SAASe,KAAK,eAAiBjB,EAAOO,SAASO,MAC3DC,OAAQpB,KAAKO,SAASe,KAAK,gBAAkBjB,EAAOO,SAASQ,SAI/Df,EAAOgB,UAAUX,OAAS,WACzBV,KAAKuB,SAAW,OAASvB,KAAKI,QAAQW,QACtCf,KAAKwB,UAAY,OAASxB,KAAKI,QAAQY,QACvC,IAAIC,GAA6B,UAAtBjB,KAAKI,QAAQa,KAAmB,YAClB,UAAtBjB,KAAKI,QAAQa,KAAmB,YACV,SAAtBjB,KAAKI,QAAQa,KAAkB,WAC/B,GACCQ,EAAY5B,EAAE,uBAAuB6B,KAAK1B,KAAKI,QAAQS,IACzDc,SAAS3B,KAAKuB,SAAW,IAAMN,GAC7BW,EAAa/B,EAAE,uBAAuB6B,KAAK1B,KAAKI,QAAQU,KAC1Da,SAAS3B,KAAKwB,UAAY,IAAMP,EAAO,WACrCY,EAAgBhC,EAAE,gDACpB8B,SAASV,GACPa,EAAejC,EAAE,8BACnBkC,OAAON,EAAWG,EAAYC,GAC5BG,EAAUnC,EAAE,iDACd8B,SAAU3B,KAAKO,SAAS0B,KAAK,WAAajC,KAAKuB,SAAWvB,KAAKwB,UAAU,QACzEG,SAASV,GAAMU,SAAS3B,KAAKI,QAAQc,MAEvClB,MAAKO,SAAS2B,KAAKF,GACnBnC,EAAEW,OAAOR,MACRgC,QAAShC,KAAKO,SAAS4B,SACvBV,UAAWA,EACXG,WAAYA,EACZE,aAAcA,IAEf9B,KAAKgC,QAAQD,OAAOD,EAEpB,IAAIX,GAAQnB,KAAKI,QAAQe,OAASiB,KAAKC,IAAIZ,EAAUN,QAASS,EAAWT,SAAUU,EAAcS,aAAa,EAC1GlB,EAASpB,KAAKI,QAAQgB,QAAUgB,KAAKC,IAAIZ,EAAUL,SAAUQ,EAAWR,SAC5EK,GAAUE,SAAS,aACnBC,EAAWD,SAAS,cACpB3B,KAAKgC,QAAQO,KAAMpB,MAAOA,EAAOC,OAAQA,IACrCpB,KAAKI,QAAQgB,SAChBK,EAAUc,IAAI,cAAed,EAAUL,SAAW,MAClDQ,EAAWW,IAAI,cAAeX,EAAWR,SAAW,OAErDpB,KAAKwC,QAAO,GACZxC,KAAKyC,SAAQ,IAGdpC,EAAOgB,UAAUqB,OAAS,WACrB1C,KAAKO,SAAS0B,KAAK,WAAYjC,KAAKc,MACnCd,KAAKa,MAGXR,EAAOgB,UAAUR,GAAK,SAAU8B,GAC/B,MAAI3C,MAAKO,SAAS0B,KAAK,aAAoB,GAC3CjC,KAAKgC,QAAQY,YAAY5C,KAAKwB,UAAY,QAAQG,SAAS3B,KAAKuB,UAChEvB,KAAKO,SAAS0B,KAAK,WAAW,QACzBU,GAAQ3C,KAAKyC,aAGnBpC,EAAOgB,UAAUP,IAAM,SAAU6B,GAChC,MAAI3C,MAAKO,SAAS0B,KAAK,aAAoB,GAC3CjC,KAAKgC,QAAQY,YAAY5C,KAAKuB,UAAUI,SAAS3B,KAAKwB,UAAY,QAClExB,KAAKO,SAAS0B,KAAK,WAAW,QACzBU,GAAQ3C,KAAKyC,aAGnBpC,EAAOgB,UAAUwB,OAAS,WACzB7C,KAAKgC,QAAQc,WAAW,YACxB9C,KAAKO,SAAS0B,KAAK,YAAY,IAGhC5B,EAAOgB,UAAU0B,QAAU,WAC1B/C,KAAKgC,QAAQV,KAAK,WAAY,YAC9BtB,KAAKO,SAAS0B,KAAK,YAAY,IAGhC5B,EAAOgB,UAAUmB,OAAS,SAAUG,GAC/B3C,KAAKO,SAAS0B,KAAK,YAAajC,KAAK+C,UACpC/C,KAAK6C,SACN7C,KAAKO,SAAS0B,KAAK,WAAYjC,KAAKa,GAAG8B,GACtC3C,KAAKc,IAAI6B,IAGftC,EAAOgB,UAAUoB,QAAU,SAAUE,GACpC3C,KAAKO,SAASO,IAAI,oBACb6B,GAAQ3C,KAAKO,SAASyC,SAC3BhD,KAAKO,SAASM,GAAG,mBAAoBhB,EAAEoD,MAAM,WAC5CjD,KAAKwC,UACHxC,QAGJK,EAAOgB,UAAU6B,QAAU,WAC1BlD,KAAKO,SAASO,IAAI,oBAClBd,KAAK8B,aAAaqB,SAClBnD,KAAKO,SAAS6C,WAAW,aACzBpD,KAAKO,SAAS8C,SAiBf,IAAIC,GAAMzD,EAAE0D,GAAGC,eAEf3D,GAAE0D,GAAGC,gBAA8B1D,EACnCD,EAAE0D,GAAGC,gBAAgBC,YAAcpD,EAKnCR,EAAE0D,GAAGb,OAAOgB,WAAa,WAExB,MADA7D,GAAE0D,GAAGC,gBAAkBF,EAChBtD,MAMRH,EAAE,WACDA,EAAE,6CAA6C2D,oBAGhD3D,EAAE8D,UAAU9C,GAAG,kBAAmB,2BAA4B,SAAS+C,GACtE,GAAIC,GAAYhE,EAAEG,MAAM8D,KAAK,uBAC7BD,GAAUL,gBAAgB,UAC1BI,EAAEG,oBAGFC"}

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/javascripts/identity_verifications.js

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

app/assets/javascripts/organizations/clas.js

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

app/assets/javascripts/pages.js

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

app/assets/javascripts/pm/journals.js

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

app/assets/javascripts/users/clas.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

@@ -8,7 +8,6 @@
 @import "jquery.mloading";
 @import "jquery-confirm.min";
 @import "bootstrap-datetimepicker.min";
-@import "bootstrap/bootstrap-toggle.min";
 
 @import "codemirror/lib/codemirror";
 @import "editormd/css/editormd.min";
@@ -40,13 +39,6 @@ body {
     }
   }
 }
-.editormd .CodeMirror{
-  margin-top: 35px!important;
-}
-
-.CodeMirror-gutter .CodeMirror-linenumbers {
-  width: 28px!important;
-}
 
 input.form-control {
   font-size: 14px;
@@ -66,159 +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;
-  }
-}
-
-.table th, .table td {
-  padding: 0.75rem 0.1rem;
-  vertical-align: top;
-  border-top: 1px solid #dee2e6;
-}
-
-.table .thead-light th{
-  white-space: nowrap;
-}

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/glcc_pr_check.scss

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

app/assets/stylesheets/admins/identity_verifications.scss

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

app/assets/stylesheets/admins/organizations.scss

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

app/assets/stylesheets/admins/page_themes.scss

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

app/assets/stylesheets/admins/site_pages.scss

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

app/assets/stylesheets/api/pm/issue_links.scss

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

app/assets/stylesheets/api/pm/projects.scss

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

app/assets/stylesheets/api/v1/pm_issues.scss

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

app/assets/stylesheets/api/v1/sonarqube/issues.scss

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

app/assets/stylesheets/api/v1/sonarqubes.scss

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

app/assets/stylesheets/bootstrap/bootstrap-toggle.css

@@ -1,83 +0,0 @@
-/*! ========================================================================
- * Bootstrap Toggle: bootstrap-toggle.css v2.2.0
- * http://www.bootstraptoggle.com
- * ========================================================================
- * Copyright 2014 Min Hur, The New York Times Company
- * Licensed under MIT
- * ======================================================================== */
-
-
-.checkbox label .toggle,
-.checkbox-inline .toggle {
-	margin-left: -20px;
-	margin-right: 5px;
-}
-
-.toggle {
-	position: relative;
-	overflow: hidden;
-}
-.toggle input[type="checkbox"] {
-	display: none;
-}
-.toggle-group {
-	position: absolute;
-	width: 200%;
-	top: 0;
-	bottom: 0;
-	left: 0;
-	transition: left 0.35s;
-	-webkit-transition: left 0.35s;
-	-moz-user-select: none;
-	-webkit-user-select: none;
-}
-.toggle.off .toggle-group {
-	left: -100%;
-}
-.toggle-on {
-	position: absolute;
-	top: 0;
-	bottom: 0;
-	left: 0;
-	right: 50%;
-	margin: 0;
-	border: 0;
-	border-radius: 0;
-}
-.toggle-off {
-	position: absolute;
-	top: 0;
-	bottom: 0;
-	left: 50%;
-	right: 0;
-	margin: 0;
-	border: 0;
-	border-radius: 0;
-}
-.toggle-handle {
-	position: relative;
-	margin: 0 auto;
-	padding-top: 0px;
-	padding-bottom: 0px;
-	height: 100%;
-	width: 0px;
-	border-width: 0 1px;
-}
-
-.toggle.btn { min-width: 59px; min-height: 34px; }
-.toggle-on.btn { padding-right: 24px; }
-.toggle-off.btn { padding-left: 24px; }
-
-.toggle.btn-lg { min-width: 79px; min-height: 45px; }
-.toggle-on.btn-lg { padding-right: 31px; }
-.toggle-off.btn-lg { padding-left: 31px; }
-.toggle-handle.btn-lg { width: 40px; }
-
-.toggle.btn-sm { min-width: 50px; min-height: 30px;}
-.toggle-on.btn-sm { padding-right: 20px; }
-.toggle-off.btn-sm { padding-left: 20px; }
-
-.toggle.btn-xs { min-width: 35px; min-height: 22px;}
-.toggle-on.btn-xs { padding-right: 12px; }
-.toggle-off.btn-xs { padding-left: 12px; }
-

app/assets/stylesheets/bootstrap/bootstrap-toggle.min.css

@@ -1,28 +0,0 @@
-/*! ========================================================================
- * Bootstrap Toggle: bootstrap-toggle.css v2.2.0
- * http://www.bootstraptoggle.com
- * ========================================================================
- * Copyright 2014 Min Hur, The New York Times Company
- * Licensed under MIT
- * ======================================================================== */
-.checkbox label .toggle,.checkbox-inline .toggle{margin-left:-20px;margin-right:5px}
-.toggle{position:relative;overflow:hidden}
-.toggle input[type=checkbox]{display:none}
-.toggle-group{position:absolute;width:200%;top:0;bottom:0;left:0;transition:left .35s;-webkit-transition:left .35s;-moz-user-select:none;-webkit-user-select:none}
-.toggle.off .toggle-group{left:-100%}
-.toggle-on{position:absolute;top:0;bottom:0;left:0;right:50%;margin:0;border:0;border-radius:0}
-.toggle-off{position:absolute;top:0;bottom:0;left:50%;right:0;margin:0;border:0;border-radius:0}
-.toggle-handle{position:relative;margin:0 auto;padding-top:0;padding-bottom:0;height:100%;width:0;border-width:0 1px}
-.toggle.btn{min-width:59px;min-height:34px}
-.toggle-on.btn{padding-right:24px}
-.toggle-off.btn{padding-left:24px}
-.toggle.btn-lg{min-width:79px;min-height:45px}
-.toggle-on.btn-lg{padding-right:31px}
-.toggle-off.btn-lg{padding-left:31px}
-.toggle-handle.btn-lg{width:40px}
-.toggle.btn-sm{min-width:50px;min-height:30px}
-.toggle-on.btn-sm{padding-right:20px}
-.toggle-off.btn-sm{padding-left:20px}
-.toggle.btn-xs{min-width:35px;min-height:22px}
-.toggle-on.btn-xs{padding-right:12px}
-.toggle-off.btn-xs{padding-left:12px}

app/assets/stylesheets/bootstrap/bootstrap2-toggle.css

@@ -1,85 +0,0 @@
-/*! ========================================================================
- * Bootstrap Toggle: bootstrap2-toggle.css v2.2.0
- * http://www.bootstraptoggle.com
- * ========================================================================
- * Copyright 2014 Min Hur, The New York Times Company
- * Licensed under MIT
- * ======================================================================== */
-
-
-label.checkbox .toggle,
-label.checkbox.inline .toggle {
-	margin-left: -20px;
-	margin-right: 5px;
-}
-.toggle {
-	min-width: 40px;
-	height: 20px;
-	position: relative;
-	overflow: hidden;
-}
-.toggle input[type="checkbox"] {
-	display: none;
-}
-.toggle-group {
-	position: absolute;
-	width: 200%;
-	top: 0;
-	bottom: 0;
-	left: 0;
-	transition: left 0.35s;
-	-webkit-transition: left 0.35s;
-	-moz-user-select: none;
-	-webkit-user-select: none;
-}
-.toggle.off .toggle-group {
-	left: -100%;
-}
-.toggle-on {
-	position: absolute;
-	top: 0;
-	bottom: 0;
-	left: 0;
-	right: 50%;
-	margin: 0;
-	border: 0;
-	border-radius: 0;
-}
-.toggle-off {
-	position: absolute;
-	top: 0;
-	bottom: 0;
-	left: 50%;
-	right: 0;
-	margin: 0;
-	border: 0;
-	border-radius: 0;
-}
-.toggle-handle {
-	position: relative;
-	margin: 0 auto;
-	padding-top: 0px;
-	padding-bottom: 0px;
-	height: 100%;
-	width: 0px;
-	border-width: 0 1px;
-}
-.toggle-handle.btn-mini {
-	top: -1px;
-}
-.toggle.btn { min-width: 30px; }
-.toggle-on.btn { padding-right: 24px; }
-.toggle-off.btn { padding-left: 24px; }
-
-.toggle.btn-large { min-width: 40px; }
-.toggle-on.btn-large { padding-right: 35px; }
-.toggle-off.btn-large { padding-left: 35px; }
-
-.toggle.btn-small { min-width: 25px; }
-.toggle-on.btn-small { padding-right: 20px; }
-.toggle-off.btn-small { padding-left: 20px; }
-
-.toggle.btn-mini { min-width: 20px; }
-.toggle-on.btn-mini { padding-right: 12px; }
-.toggle-off.btn-mini { padding-left: 12px; }
-

app/assets/stylesheets/bootstrap/bootstrap2-toggle.min.css

@@ -1,28 +0,0 @@
-/*! ========================================================================
- * Bootstrap Toggle: bootstrap2-toggle.css v2.2.0
- * http://www.bootstraptoggle.com
- * ========================================================================
- * Copyright 2014 Min Hur, The New York Times Company
- * Licensed under MIT
- * ======================================================================== */
-label.checkbox .toggle,label.checkbox.inline .toggle{margin-left:-20px;margin-right:5px}
-.toggle{min-width:40px;height:20px;position:relative;overflow:hidden}
-.toggle input[type=checkbox]{display:none}
-.toggle-group{position:absolute;width:200%;top:0;bottom:0;left:0;transition:left .35s;-webkit-transition:left .35s;-moz-user-select:none;-webkit-user-select:none}
-.toggle.off .toggle-group{left:-100%}
-.toggle-on{position:absolute;top:0;bottom:0;left:0;right:50%;margin:0;border:0;border-radius:0}
-.toggle-off{position:absolute;top:0;bottom:0;left:50%;right:0;margin:0;border:0;border-radius:0}
-.toggle-handle{position:relative;margin:0 auto;padding-top:0;padding-bottom:0;height:100%;width:0;border-width:0 1px}
-.toggle-handle.btn-mini{top:-1px}
-.toggle.btn{min-width:30px}
-.toggle-on.btn{padding-right:24px}
-.toggle-off.btn{padding-left:24px}
-.toggle.btn-large{min-width:40px}
-.toggle-on.btn-large{padding-right:35px}
-.toggle-off.btn-large{padding-left:35px}
-.toggle.btn-small{min-width:25px}
-.toggle-on.btn-small{padding-right:20px}
-.toggle-off.btn-small{padding-left:20px}
-.toggle.btn-mini{min-width:20px}
-.toggle-on.btn-mini{padding-right:12px}
-.toggle-off.btn-mini{padding-left:12px}

app/assets/stylesheets/helps/faqs.scss

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

app/assets/stylesheets/identity_verifications.scss

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

app/assets/stylesheets/organizations/clas.scss

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

app/assets/stylesheets/pages.scss

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

app/assets/stylesheets/pm/journals.scss

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

app/assets/stylesheets/users/clas.scss

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

app/controllers/action/node_inputs_controller.rb

@@ -1,75 +0,0 @@
-class Action::NodeInputsController < ApplicationController
-  before_action :require_admin, except: [:index]
-  before_action :find_action_node
-
-  def index
-    @node_inputs = @node.action_node_inputs
-    respond_to do |format|
-      format.html
-      format.json{ render_ok(data: @node_inputs.as_json) }
-    end
-  end
-
-  def create
-    @node_input = Action::NodeInput.new(node_input_params)
-    @node_input.action_node = @node
-    respond_to do |format|
-      if @node_input.save
-        format.html { redirect_to action_node_node_inputs_path(@node), notice: '创建成功.' }
-        format.json { render_ok(data: @node_input.as_json) }
-      else
-        format.html { render :new }
-        format.json { render json: @node_input.errors, status: -1 }
-      end
-    end
-  end
-
-  def new
-
-  end
-
-  def show
-
-  end
-
-  def edit
-
-  end
-
-  def update
-    @node_input.update(node_input_params)
-    respond_to do |format|
-      format.html { redirect_to action_node_node_inputs_path(@node), notice: '更新成功.' }
-      format.json { render_ok(data: @node_input.as_json) }
-    end
-  end
-
-  def destroy
-    if @node_input.destroy!
-      flash[:success] = '删除成功'
-    else
-      flash[:danger] = '删除失败'
-    end
-    redirect_to "api/actions/nodes"
-  end
-
-  private
-
-  def find_action_node
-    @node = Action::Node.find(params[:node_id])
-    if params[:id].present?
-      @node_input = @node.action_node_inputs.find(params[:id])
-    else
-      @node_input = Action::NodeInput.new
-    end
-
-  end
-
-  def node_input_params
-    if params.require(:action_node_input)
-      params.require(:action_node_input).permit(:name, :input_type, :description, :is_required, :sort_no, :default_value)
-    else
-      params.permit(:name, :input_type, :description, :is_required, :sort_no, :default_value)
-    end
-  end
-end

app/controllers/action/node_selects_controller.rb

@@ -1,76 +0,0 @@
-class Action::NodeSelectsController < ApplicationController
-
-  before_action :require_admin, except: [:index]
-  before_action :find_action_node
-
-  def index
-    @node_selects = @node.action_node_selects
-    respond_to do |format|
-      format.html
-      format.json
-    end
-  end
-
-  def create
-    @node_select = Action::NodeSelect.new(node_select_params)
-    @node_select.action_node = @node
-    respond_to do |format|
-      if @node_select.save
-        format.html { redirect_to action_node_node_selects_path(@node), notice: '创建成功.' }
-        format.json { render_ok(data: @node_select.as_json) }
-      else
-        format.html { render :new }
-        format.json { render json: @node_select.errors, status: -1 }
-      end
-    end
-  end
-
-  def new
-
-  end
-
-  def show
-
-  end
-
-  def edit
-
-  end
-
-  def update
-    @node_select.update(node_select_params)
-    respond_to do |format|
-      format.html { redirect_to action_node_node_selects_path(@node), notice: '更新成功.' }
-      format.json { render_ok(data: @node_select.as_json) }
-    end
-  end
-
-  def destroy
-    if @node_select.destroy!
-      flash[:success] = '删除成功'
-    else
-      flash[:danger] = '删除失败'
-    end
-    redirect_to "api/actions/nodes"
-  end
-
-  private
-
-  def find_action_node
-    @node = Action::Node.find(params[:node_id])
-    if params[:id].present?
-      @node_select = @node.action_node_selects.find(params[:id])
-    else
-      @node_select = Action::NodeSelect.new
-    end
-
-  end
-
-  def node_select_params
-    if params.require(:action_node_select)
-      params.require(:action_node_select).permit(:name, :val, :val_ext, :description, :sort_no)
-    else
-      params.permit(:name, :val, :val_ext, :description, :sort_no)
-    end
-  end
-end

app/controllers/action/node_types_controller.rb

@@ -1,74 +0,0 @@
-class Action::NodeTypesController < ApplicationController
-  before_action :require_admin, except: [:index]
-  before_action :find_node_type, except: [:index, :create, :new]
-
-  def index
-    @node_types = Action::NodeType.all
-    respond_to do |format|
-      format.html
-      format.json { render_ok(data: @node_types.as_json) }
-    end
-  end
-
-  def create
-    @node_type = Action::NodeType.new(node_types_params)
-    respond_to do |format|
-      if @node_type.save
-        format.html { redirect_to action_node_types_path, notice: '创建成功.' }
-        format.json { render_ok(data: @node_type.as_json) }
-      else
-        format.html { render :new }
-        format.json { render json: @node_type.errors, status: -1 }
-      end
-    end
-  end
-
-  def show
-    respond_to do |format|
-      format.html
-      format.json { render_ok(data: @node_type.as_json) }
-    end
-  end
-
-  def new
-    @node_type = Action::NodeType.new
-  end
-
-  def edit
-
-  end
-
-  def update
-    @node_type.update(node_types_params)
-    respond_to do |format|
-      format.html { redirect_to action_node_types_path, notice: '更新成功.' }
-      format.json { render_ok(data: @node_type.as_json) }
-    end
-  end
-
-  def destroy
-    if @node_type.destroy!
-      flash[:success] = '删除成功'
-    else
-      flash[:danger] = '删除失败'
-    end
-    respond_to do |format|
-      format.html { redirect_to action_node_types_path }
-      format.json { render_ok }
-    end
-  end
-
-  private
-
-  def find_node_type
-    @node_type = Action::NodeType.find(params[:id])
-  end
-
-  def node_types_params
-    if params.require(:action_node_type)
-      params.require(:action_node_type).permit(:name, :description, :sort_no)
-    else
-      params.permit(:name, :description, :sort_no)
-    end
-  end
-end

app/controllers/action/nodes_controller.rb

@@ -1,87 +0,0 @@
-class Action::NodesController < ApplicationController
-  # before_action :require_admin, except: [:index]
-  before_action :require_login
-  before_action :find_action_node, except: [:index, :create, :new]
-
-  def index
-    @node_types = Action::NodeType.all
-    no_node_type = Action::NodeType.find_by(name: "未分类")
-    @no_type_nodes = Action::Node.where(action_node_types_id: nil)
-    @no_type_nodes = Action::Node.where(action_node_types_id: nil).or(Action::Node.where(action_node_types_id: no_node_type.id)) if no_node_type.present?
-    respond_to do |format|
-      format.html { @nodes = Action::Node.where("name LIKE :search OR full_name LIKE :search", :search => "%#{params[:search]}%") }
-      format.json
-    end
-  end
-
-  def create
-    @node = Action::Node.new(node_params)
-    if params.require(:node).present? && params.require(:node)[:link_type_array].present?
-      @node.link_type = (params.require(:node)[:link_type_array] - [""]).join(",")
-    end
-    @node.user_id = current_user.id
-    respond_to do |format|
-      if @node.save
-        format.html { redirect_to action_nodes_path, notice: '创建成功.' }
-        format.json { render_ok(data: @node.as_json) }
-      else
-        format.html { render :new }
-        format.json { render json: @node.errors, status: -1 }
-      end
-    end
-  end
-
-  def new
-    @node = Action::Node.new
-  end
-
-  def show
-
-  end
-
-  def edit
-    if @node.link_type.present?
-      @node.link_type_array = @node.link_type.to_s.split(",")
-    end
-  end
-
-  def update
-    if params.require(:node).present?  && params.require(:node)[:link_type_array].present?
-      @node.link_type = (params.require(:node)[:link_type_array] - [""]).join(",")
-    end
-    @node.user_id = current_user.id if @node.user_id.blank?
-    @node.update(node_params)
-    respond_to do |format|
-      format.html { redirect_to action_nodes_path, notice: '更新成功.' }
-      format.json { render_ok(data: @node.as_json) }
-    end
-  end
-
-  def destroy
-    if @node.destroy!
-      flash[:success] = '删除成功'
-    else
-      flash[:danger] = '删除失败'
-    end
-    respond_to do |format|
-      format.html { redirect_to action_nodes_path }
-      format.json { render_ok() }
-    end
-  end
-
-  private
-
-  def find_action_node
-    @node = Action::Node.find(params[:id])
-  end
-
-  def node_params
-    if params.require(:action_node)
-      params.require(:action_node).permit(:name, :label, :full_name, :description, :icon, :action_node_types_id,
-                                          :is_local, :local_url, :yaml, :sort_no, :node_type, :is_mutil_link, :link_type, :link_type_array)
-    else
-      params.permit(:name, :label, :full_name, :description, :icon, :action_node_types_id, :is_local, :local_url,
-                    :yaml, :sort_no, :node_type, :is_mutil_link, :link_type, :link_type_array)
-    end
-  end
-end

app/controllers/action/templates_controller.rb

@@ -1,71 +0,0 @@
-class Action::TemplatesController < ApplicationController
-  before_action :require_admin, except: [:index]
-  before_action :find_action_template, except: [:index, :create, :new]
-
-  def index
-    @templates = Action::Template.all
-    respond_to do |format|
-      format.html
-      format.json
-    end
-  end
-
-  def create
-    @template = Action::Template.new(templates_params)
-    respond_to do |format|
-      if @template.save
-        format.html { redirect_to action_templates_path, notice: '创建成功.' }
-        format.json { render_ok(data: @template.as_json) }
-      else
-        format.html { render :new }
-        format.json { render json: @template.errors, status: -1 }
-      end
-    end
-  end
-
-  def show
-
-  end
-
-  def new
-    @template = Action::Template.new
-  end
-
-  def edit
-
-  end
-
-  def update
-    @template.update(templates_params)
-    respond_to do |format|
-      format.html { redirect_to action_templates_path, notice: '更新成功.' }
-      format.json { render_ok(data: @template.as_json) }
-    end
-  end
-
-  def destroy
-    if @template.destroy!
-      flash[:success] = '删除成功'
-    else
-      flash[:danger] = '删除失败'
-    end
-    respond_to do |format|
-      format.html { redirect_to action_templates_path }
-      format.json { render_ok }
-    end
-  end
-
-  private
-
-  def find_action_template
-    @template = Action::Template.find(params[:id])
-  end
-
-  def templates_params
-    if params.require(:action_template)
-      params.require(:action_template).permit(:name, :description, :img, :sort_no, :json, :yaml)
-    else
-      params.permit(:name, :description, :img, :sort_no, :json, :yaml)
-    end
-  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/base_controller.rb

@@ -23,23 +23,10 @@ class Admins::BaseController < ApplicationController
   def require_admin!
     return if current_user.blank? || !current_user.logged?
     return if current_user.admin_or_business?
-    return if current_user.admin_or_glcc_admin?
 
     render_forbidden
   end
 
-  def require_admin
-		render_forbidden unless User.current.admin?
-	end
-
-	def require_business
-		render_forbidden unless admin_or_business?
-	end
-
-	def require_glcc_admin 
-		render_forbidden unless admin_or_glcc_admin?
-	end
-
   # 触发after ajax render partial hooks，执行一些因为局部刷新后失效的绑定事件
   def rebind_event_if_ajax_render_partial
     return if request.format.symbol != :js

app/controllers/admins/dashboards_controller.rb

@@ -1,99 +1,10 @@
 class Admins::DashboardsController < Admins::BaseController
   def index
-    # 查询优化
-    week_greater_id  =  CommitLog.where(created_at: current_week).limit(1)[0]&.id
-    #月份统计还需要优化
-    month_greater_id  =  CommitLog.where(created_at: current_month).limit(1)[0]&.id
-    # 用户活跃数
-    day_user_ids = CommitLog.where(created_at: today).pluck(:user_id).uniq
-    weekly_user_ids = CommitLog.where(created_at: current_week).where("id>= ?", week_greater_id).distinct.pluck(:user_id)
-    month_user_ids = CommitLog.where(created_at: current_month).where("id>= ?", month_greater_id).distinct.pluck(:user_id)
-    @active_user_count = User.where(last_login_on: today).or(User.where(id: day_user_ids)).count
-    @weekly_active_user_count = User.where(last_login_on: current_week).or(User.where(id: weekly_user_ids)).count
-    @month_active_user_count = User.where(last_login_on: current_month).or(User.where(id: month_user_ids)).count
-    user_ids = User.where(created_on: pre_week).pluck(:id).uniq
-    weekly_keep_user_count = User.where(id: user_ids).where(last_login_on: current_week).count
-    @weekly_keep_rate = format("%.2f", user_ids.size > 0 ? weekly_keep_user_count.to_f / user_ids.size : 0)
-
-    # 新用户注册数
-    @day_new_user_count = User.where(created_on: today).count
-    @weekly_new_user_count = User.where(created_on: current_week).count
-    @month_new_user_count = User.where(created_on: current_month).count
-
-    # 活跃项目数
-    day_project_ids = (CommitLog.where(created_at: today).pluck(:project_id).uniq + Issue.where(created_on: today).pluck(:project_id).uniq).uniq
-    weekly_project_ids = (CommitLog.where(created_at: current_week).where("id>= ?", week_greater_id).distinct.pluck(:project_id) + Issue.where(created_on: current_week).pluck(:project_id).uniq).uniq
-    month_project_ids = (CommitLog.where(created_at: current_month).where("id>= ?", month_greater_id).distinct.pluck(:project_id) + Issue.where(created_on: current_month).pluck(:project_id).uniq).uniq
-    @day_active_project_count = Project.where(updated_on: today).or(Project.where(id: day_project_ids)).count
-    @weekly_active_project_count = Rails.cache.fetch("dashboardscontroller:weekly_active_project_count", expires_in: 10.minutes) do
-      Project.where(updated_on: current_week).or(Project.where(id: weekly_project_ids)).count
-    end
-    @month_active_project_count = Rails.cache.fetch("dashboardscontroller:month_active_project_count", expires_in: 1.hours) do
-      Project.where(updated_on: current_month).or(Project.where(id: month_project_ids)).count
-    end
-    # 新增项目数
-    @day_new_project_count = Rails.cache.fetch("dashboardscontroller:day_new_project_count", expires_in: 10.minutes) do
-      Project.where(created_on: today).count
-    end
-    @weekly_new_project_count = Rails.cache.fetch("dashboardscontroller:weekly_new_project_count", expires_in: 10.minutes) do
-      Project.where(created_on: current_week).count
-    end
-    @month_new_project_count = Rails.cache.fetch("dashboardscontroller:month_new_project_count", expires_in: 1.hours) do
-      Project.where(created_on: current_month).count
-    end
-
-
-    # 总的平台用户数
-    # 总的平台项目数
-    # 总的平台组织数
-    # 总的平台Issue数、评论数、PR数、Commit数
-    @user_count = Rails.cache.fetch("dashboardscontroller:platform:user_count", expires_in: 1.days) do
-      User.count
-    end
-    @project_count = Rails.cache.fetch("dashboardscontroller:platform:project_count", expires_in: 1.days) do
-      Project.count
-    end
-    @organization_count = Rails.cache.fetch("dashboardscontroller:platform:organization_count", expires_in: 1.days) do
-      Organization.count
-    end
-    @issue_count = Rails.cache.fetch("dashboardscontroller:platform:issue_count", expires_in: 1.days) do
-      Issue.count
-    end
-    @comment_count = Rails.cache.fetch("dashboardscontroller:platform:comment_count", expires_in: 1.days) do
-      Journal.count
-    end
-    @pr_count = Rails.cache.fetch("dashboardscontroller:platform:pr_count", expires_in: 1.days) do
-      PullRequest.count
-    end
-    @commit_count = Rails.cache.fetch("dashboardscontroller:platform:commit_count", expires_in: 1.days) do
-      CommitLog.count
-    end
-
-    @subject_name = ["用户数", "项目数", "组织数", "Issue数", "Issue评论数", "PR数", "Commit数"]
-    @subject_icon = ["fa-user","fa-git", "fa-sitemap", "fa-warning", "fa-comments", "fa-share-alt", "fa-upload"]
-    @subject_data = [@user_count, @project_count, @organization_count, @issue_count, @comment_count, @pr_count, @commit_count]
-
-    if EduSetting.get("open_baidu_tongji").to_s == "true"
-      tongji_service = Baidu::TongjiService.new
-      @access_token = tongji_service.access_token
-      Rails.logger.info "baidu_tongji_auth access_token ===== #{@access_token}"
-      # @overview_data = tongji_service.api_overview
-      last_date = DailyPlatformStatistic.order(:date).last || Time.now
-      start_date = last_date.date
-      end_date = Time.now
-      if @access_token.present?
-        @overview_data = Rails.cache.fetch("dashboardscontroller:baidu_tongji:overview_data", expires_in: 10.minutes) do
-          tongji_service.source_from_batch_add(start_date, end_date)
-          @overview_data = tongji_service.overview_batch_add(start_date, end_date)
-          @overview_data
-        end
-      end
-
-      @current_week_statistic = DailyPlatformStatistic.where(date: current_week)
-      @pre_week_statistic = DailyPlatformStatistic.where(date: pre_week)
-    end
-
+    @active_user_count = User.where(last_login_on: today).count
+    @weekly_active_user_count = User.where(last_login_on: current_week).count
+    @month_active_user_count = User.where(last_login_on: current_month).count
 
+    @new_user_count = User.where(created_on: current_month).count
   end
 
   def month_active_user
@@ -105,22 +16,10 @@ class Admins::DashboardsController < Admins::BaseController
       { value: count['professional'].to_i, name: '专业人士' },
       { value: count[nil].to_i, name: '未选职业' },
     ]
+
     render_ok(data: data)
   end
 
-  def baidu_tongji
-    tongji_service = Baidu::TongjiService.new
-    redirect_to tongji_service.code_url
-  end
-
-  def baidu_tongji_auth
-    if params[:code].present?
-      tongji_service = Baidu::TongjiService.new
-      tongji_service.get_access_token(params[:code])
-    end
-    redirect_to "/admins/"
-  end
-
   def evaluate
     names = []
     data = []
@@ -142,20 +41,11 @@ class Admins::DashboardsController < Admins::BaseController
     Time.now.beginning_of_day..Time.now.end_of_day
   end
 
-  def pre_7_days
-    7.days.ago.end_of_day..Time.now.end_of_day
-    end
-
   def current_week
-    Time.now.beginning_of_week..Time.now.end_of_day
+    7.days.ago.beginning_of_day..Time.now.end_of_day
   end
 
   def current_month
-    30.days.ago.end_of_day..Time.now.end_of_day
-  end
-
-  def pre_week
-    # 14.days.ago.end_of_day..7.days.ago.end_of_day
-    Time.now.prev_week..Time.now.prev_week.end_of_week
+    30.days.ago.beginning_of_day..Time.now.end_of_day
   end
 end

app/controllers/admins/edu_settings_controller.rb

@@ -1,56 +0,0 @@
-class Admins::EduSettingsController < Admins::BaseController
-  before_action :require_admin
-  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,59 +0,0 @@
-class Admins::FaqsController < Admins::BaseController
-  before_action :require_business
-  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/feedbacks_controller.rb

@@ -1,50 +0,0 @@
-class Admins::FeedbacksController < Admins::BaseController
-  before_action :require_business
-  before_action :get_feedback, only: [:new_history, :create_history, :destroy]
-
-  def index 
-    sort_by = Feedback.column_names.include?(params[:sort_by]) ? params[:sort_by] : 'created_at'
-    sort_direction = %w(desc asc).include?(params[:sort_direction]) ? params[:sort_direction] : 'desc'
-    feedbacks = Feedback.order("#{sort_by} #{sort_direction}")
-    @feedbacks = paginate(feedbacks)
-  end
-
-  def destroy 
-    if @feedback.destroy 
-      redirect_to admins_feedbacks_path 
-      flash[:success] = "反馈意见删除成功"
-    else 
-      redirect_to admins_feedbacks_path 
-      flash[:danger] = "反馈意见删除失败"
-    end
-  end
-
-  def new_history 
-    @feedback_message_history = FeedbackMessageHistory.new
-  end
-
-  def create_history 
-    @feedback_message_history = @feedback.feedback_message_histories.new(feedback_message_history_params)
-    @feedback_message_history.user = current_user
-    if @feedback_message_history.save
-      redirect_to admins_feedbacks_path 
-      flash[:success] = "发送通知成功"
-    else 
-      redirect_to admins_feedbacks_path 
-      flash[:danger] = @feedback_message_history.errors.full_messages.join(", ")
-    end
-  end
-
-  private  
-  def feedback_params 
-    params.require(:feedback).permit!
-  end
-
-  def feedback_message_history_params 
-    params.require(:feedback_message_history).permit(:title, :content)
-  end
-
-  def get_feedback 
-    @feedback = Feedback.find_by_id(params[:id])
-  end
-end

app/controllers/admins/glcc_pr_check_controller.rb

@@ -1,34 +0,0 @@
-class Admins::GlccPrCheckController < Admins::BaseController
-    before_action :require_glcc_admin
-
-    def index
-        params[:sort_by] = params[:sort_by].presence || 'created_on'
-        params[:sort_direction] = params[:sort_direction].presence || 'desc'
-        examine_materials = Admins::GlccExamineMaterial.call(params)
-        @examine_materials = paginate examine_materials.includes(:glcc_student)
-    end
-
-    def send_mail
-        year = if params[:date].present?
-            params[:date][:year]
-        end
-        if year.nil?
-            return redirect_to admins_glcc_pr_check_index_path
-            flash[:error]  = "时间不能为空"
-        end
-        if params[:term].blank?
-            return redirect_to admins_glcc_pr_check_index_path
-            flash[:error]  = "考核选项不能为空"
-        end
-
-        examine_materials = GlccMediumTermExamineMaterial.where(\
-            term: params[:term],
-            created_on: [Time.now.change(year:year).beginning_of_year .. Time.now.change(year:year).end_of_year]
-        )
-        examine_materials.map{ |e| 
-            e.send_mail
-        }
-        flash[:danger] = "#{year} 年 #{params[:term].to_i == 1 ? "中期考核": "结项考核"} PR 检测邮件已全部发送完毕，一共#{examine_materials.count}封邮件"
-        redirect_to admins_glcc_pr_check_index_path
-    end
-end

app/controllers/admins/identity_verifications_controller.rb

@@ -1,38 +0,0 @@
-class Admins::IdentityVerificationsController < Admins::BaseController
-    before_action :require_business
-    before_action :finder_identity_verification, except: [:index]
-    def index
-        params[:sort_by] = params[:sort_by].presence || 'created_at'
-        params[:sort_direction] = params[:sort_direction].presence || 'desc'
-        identity_verifications = Admins::IdentityVerificationQuery.call(params)
-        @identity_verifications = paginate identity_verifications.preload(:user)
-    end
-
-    def show
-        render 'edit'
-    end
-    def edit
-    end
-
-    def update
-        if update_params[:state] == "已拒绝" && update_params[:description].blank?
-            flash[:danger] = '拒绝理由不能为空'
-            render 'edit'
-        else
-            UserAction.create(action_id: @identity_verification.id, action_type: "UpdateIdentityVerifications", user_id: current_user.id, :ip => request.remote_ip, data_bank: @identity_verification.attributes.to_json)
-            @identity_verification.update(update_params)
-            redirect_to admins_identity_verifications_path
-            flash[:success] = "更新成功"
-        end
-    end
-
-    private
-    def finder_identity_verification
-        @identity_verification = IdentityVerification.find(params[:id])
-        @user = @identity_verification.user
-    end
-
-    def update_params
-        params.require(:identity_verification).permit(:state, :description)
-    end
-end

app/controllers/admins/import_users_controller.rb

@@ -2,7 +2,7 @@ class Admins::ImportUsersController < Admins::BaseController
   def create
     return render_error('请上传正确的文件') if params[:file].blank? || !params[:file].is_a?(ActionDispatch::Http::UploadedFile)
 
-    result = Admins::ImportUserFromExcelService.call(params[:file].to_io)
+    result = Admins::ImportUserService.call(params[:file].to_io)
     render_ok(result)
   rescue Admins::ImportUserService::Error => ex
     render_error(ex)

app/controllers/admins/issues_rank_controller.rb

@@ -1,30 +0,0 @@
-class Admins::IssuesRankController < Admins::BaseController
-  before_action :require_admin
-
-  def index 
-    @statistics = DailyProjectStatistic.where('date >= ? AND date <= ?', begin_date, end_date)
-    @statistics = @statistics.group(:project_id).joins(:project).select("project_id,
-                                                                         sum(issues) as issues,
-                                                                         sum(closed_issues) as closed_issues,
-                                                                         projects.issues_count as issues_count")
-    @statistics = @statistics.order("#{sort_by} #{sort_direction}").limit(50)
-  end
-
-  private 
-  def begin_date 
-    params.fetch(:begin_date, (Date.yesterday-7.days).to_s)
-  end
-
-  def end_date 
-    params.fetch(:end_date, Date.yesterday.to_s)
-  end
-
-  def sort_by
-    DailyProjectStatistic.column_names.include?(params.fetch(:sort_by, "issues")) ? params.fetch(:sort_by, "issues") : "issues"
-  end
-
-  def sort_direction
-    %w(desc asc).include?(params.fetch(:sort_direction, "desc")) ? params.fetch(:sort_direction, "desc") : "desc"
-  end
-
-end

app/controllers/admins/laboratories_controller.rb

@@ -1,5 +1,4 @@
 class Admins::LaboratoriesController < Admins::BaseController
-  before_action :require_admin
   def index
     default_sort('id', 'desc')
 
@@ -34,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
 
@@ -49,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/laboratory_settings_controller.rb

@@ -25,6 +25,6 @@ class Admins::LaboratorySettingsController < Admins::BaseController
     params.permit(:identifier, :name,
                   :nav_logo, :login_logo, :tab_logo, :oj_banner,
                   :subject_banner, :course_banner, :competition_banner, :moop_cases_banner,
-                  :footer, navbar: %i[name link hidden index])
+                  :footer, navbar: %i[name link hidden])
   end
 end

app/controllers/admins/message_templates_controller.rb

@@ -1,61 +0,0 @@
-class Admins::MessageTemplatesController < Admins::BaseController 
-  before_action :require_admin
-  before_action :get_template, only: [:edit, :update, :destroy]
-
-  def index 
-    message_templates = MessageTemplate.ransack(sys_notice_or_email_or_email_title_cont: params[:search]).result
-    @message_templates = kaminari_paginate(message_templates)
-  end
-
-  def new 
-    @message_template = MessageTemplate::CustomTip.new
-  end
-
-  def create 
-    @message_template = MessageTemplate::CustomTip.new
-    @message_template.attributes = message_template_params
-    if @message_template.save!
-      redirect_to admins_message_templates_path 
-      flash[:success] = "创建消息模板成功"
-    else
-      render :new
-      flash[:danger] = "创建消息模板失败"
-    end
-  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/nps_controller.rb

@@ -1,27 +0,0 @@
-class Admins::NpsController < Admins::BaseController
-  before_action :require_business
-  def index
-    @on_off_switch = EduSetting.get("nps-on-off-switch").to_s == 'true'
-    @user_nps = UserNp.order(created_at: :desc)
-    keyword = params[:keyword].to_s.strip.presence
-    if keyword
-      sql = 'CONCAT(users.lastname, users.firstname) LIKE :keyword OR users.nickname LIKE :keyword OR users.login LIKE :keyword OR users.mail LIKE :keyword OR users.phone LIKE :keyword'
-      @user_nps = @user_nps.where(sql, keyword: "%#{keyword}%")
-    end
-    @user_nps = @user_nps.where("action_type != 'close'") if params[:done_score].present?
-    @min_score = @user_nps.where("action_type != 'close'").minimum("score")
-    @max_score = @user_nps.where("action_type != 'close'").maximum("score")
-    @score_total_count = UserNp.where("action_type !='close'").count
-    @user_nps = paginate @user_nps.includes(:user)
-  end
-
-  def switch_change
-    edu_setting = EduSetting.find_by(name: "nps-on-off-switch")
-    if edu_setting.blank?
-      edu_setting = EduSetting.new(name: "nps-on-off-switch")
-    end
-    edu_setting.value = params[:switch].to_s
-    edu_setting.save
-    render_ok
-  end
-end

app/controllers/admins/organizations_controller.rb

@@ -1,45 +0,0 @@
-class Admins::OrganizationsController < Admins::BaseController
-  before_action :require_admin
-  before_action :finder_org, except: [:index]
-
-  def index
-    params[:sort_by] = params[:sort_by].presence || 'created_on'
-    params[:sort_direction] = params[:sort_direction].presence || 'desc'
-
-    orgs = Admins::OrganizationQuery.call(params)
-    @orgs = paginate orgs
-  end
-
-
-  def open_cla
-    @org.open_cla!
-    render_ok
-  end
-
-  def close_cla
-    if @org.cla.nil?
-      @org.close_cla!
-      render_ok
-    else
-      render_error(' 该组织已创建CLA 不允许关闭')
-    end
-    
-  end
-
-  def show
-  end
-
-  def destroy
-    @org.destroy!
-    Admins::DeleteOrganizationService.call(@org.login)
-    UserAction.create(action_id: @org.id, action_type: "DestroyOrganization", user_id: current_user.id, :ip => request.remote_ip, data_bank: @org.attributes.to_json)
-    render_delete_success
-  end
-
-  private
-
-  def finder_org
-    @org = Organization.find(params[:id])
-  end
-  
-end

app/controllers/admins/page_themes_controller.rb

@@ -1,80 +0,0 @@
-class Admins::PageThemesController <   Admins::BaseController 
-    before_action :require_admin
-    before_action :finder_page_theme, only: [:edit, :update, :destroy]
-
-    def index
-        params[:sort_by] = params[:sort_by].presence || 'created_at'
-        params[:sort_direction] = params[:sort_direction].presence || 'desc'
-    
-        page_themes = Admins::PageThemesQuery.call(params)
-    
-        @page_themes = paginate page_themes
-    end
-
-    def show
-        render 'edit'
-    end
-
-    def edit
-    end  
-
-    def create 
-        @page_theme = PageTheme.new theme_params
-        if @page_theme.save 
-            save_image_file(params[:image])
-            redirect_to admins_page_themes_path
-            flash[:success] = "新增主题成功"
-        else
-            redirect_to admins_page_themes_path
-            flash[:danger] = "新增主题失败: #{@page_theme.errors.messages.values.flatten.join(',')}"
-        end
-    end
-
-    def destroy
-        if PageTheme.where(language_frame: @page_theme.language_frame).count <= 1
-            flash[:danger] = "删除主题失败,必须存在一个主题"
-            return redirect_to admins_page_themes_path
-        end
-        
-        if @page_theme.destroy 
-            redirect_to admins_page_themes_path
-            flash[:success] = "删除主题成功"
-        else  
-            redirect_to admins_page_themes_path
-            flash[:danger] = "删除主题失败"
-        end
-    end
-
-    def new
-        @page_theme = PageTheme.new
-    end
-
-    def update
-        @page_theme.attributes = theme_params
-        if @page_theme.save 
-            save_image_file(params[:image])
-            redirect_to admins_page_themes_path
-            flash[:success] = "更新成功"
-        else  
-            redirect_to admins_page_themes_path
-            flash[:danger] = "更新失败"
-        end
-    end
-
-    private
-    def finder_page_theme
-        @page_theme = PageTheme.find(params[:id])
-    end
-
-    def theme_params
-        params.require(:page_theme).permit(:language_frame, :name, :cate, :image_url, :clone_url, :order_index)
-    end
-
-    def save_image_file(file)
-        return unless file.present? && file.is_a?(ActionDispatch::Http::UploadedFile)
-        file_path = Util::FileManage.source_disk_filename(@page_theme, "image")
-        File.delete(file_path) if File.exist?(file_path) # 删除之前的文件
-        Util.write_file(file, file_path)
-    end
-
-end

app/controllers/admins/project_categories_controller.rb

@@ -1,11 +1,10 @@
 class Admins::ProjectCategoriesController < Admins::BaseController 
-  before_action :require_admin
   before_action :get_category, only: [:edit,:update, :destroy]
   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)
@@ -23,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] = '创建成功'
@@ -34,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 
@@ -82,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

@@ -1,11 +1,10 @@
 class Admins::ProjectIgnoresController < Admins::BaseController 
-  before_action :require_admin
   before_action :set_ignore, only: [:edit,:update, :destroy,:show]
-  # before_action :validate_params, only: [:create, :update]
+  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)
@@ -32,12 +31,12 @@ class Admins::ProjectIgnoresController < Admins::BaseController
     # }
     @project_ignore = Ignore.new(ignore_params)
 
-    if @project_ignore.save
+    if @project_ignore.save!
       redirect_to admins_project_ignores_path 
       flash[:success] = "创建成功"
     else
-      redirect_to admins_project_ignores_path 
-      flash[:danger] = @project_ignore.errors.full_messages.join(",")
+      render :new
+      flash[:danger] = "创建失败"
     end
   end
 
@@ -59,8 +58,8 @@ class Admins::ProjectIgnoresController < Admins::BaseController
       redirect_to admins_project_ignores_path 
       flash[:success] = "更新成功"
     else
-      redirect_to admins_project_ignores_path 
-      flash[:danger] = @project_ignore.errors.full_messages.join(",")
+      render :edit
+      flash[:danger] = "更新失败"
     end
   end
 
@@ -99,23 +98,23 @@ class Admins::ProjectIgnoresController < Admins::BaseController
     params.require(:ignore).permit(:name,:content)
   end
 
-  # def validate_params
-  #   name = params[:ignore][:name]
-  #   if name.blank? 
-  #     flash[:danger] = "名称不允许为空"
-  #     redirect_to admins_project_ignores_path
-  #   elsif check_ignore_present?(name) && @project_ignore.blank?
-  #     flash[:danger] = "创建失败:名称已存在"
-  #     redirect_to admins_project_ignores_path
-  #   end
-  # end
+  def validate_params
+    name = params[:ignore][:name]
+    if name.blank? 
+      flash[:danger] = "名称不允许为空"
+      redirect_to admins_project_ignores_path
+    elsif check_ignore_present?(name) && @project_ignore.blank?
+      flash[:danger] = "创建失败:名称已存在"
+      redirect_to admins_project_ignores_path
+    end
+  end
 
-  # def check_ignore_present?(name)
-  #   return true if name.blank?
-  #   name_downcase = name.downcase
-  #   name_upcase = name.upcase
-  #   name_first_big = name.capitalize
-  #   Ignore.exists?(name: name_downcase) || Ignore.exists?(name: name_upcase) || Ignore.exists?(name: name_first_big)
-  # end
+  def check_ignore_present?(name)
+    return true if name.blank?
+    name_downcase = name.downcase
+    name_upcase = name.upcase
+    name_first_big = name.capitalize
+    Ignore.exists?(name: name_downcase) || Ignore.exists?(name: name_upcase) || Ignore.exists?(name: name_first_big)
+  end
 
 end

app/controllers/admins/project_languages_controller.rb

@@ -1,11 +1,10 @@
 class Admins::ProjectLanguagesController < Admins::BaseController 
-  before_action :require_admin
   before_action :get_language, only: [:edit,:update, :destroy]
   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)
@@ -28,18 +27,17 @@ class Admins::ProjectLanguagesController < Admins::BaseController
       flash[:success] = '创建成功'
     else
       redirect_to admins_project_languages_path
-      flash[:danger] = @project_language.errors.full_messages.join(",")
+      flash[:danger] = '创建失败'
     end
   end
 
   def update 
-    @project_language.attributes = {name: @name}
-    if @project_language.save
+    if @project_language.update_attribute(:name, @name)
       redirect_to admins_project_languages_path
       flash[:success] = '更新成功'
     else 
       redirect_to admins_project_languages_path
-      flash[:danger] = @project_language.errors.full_messages.join(",")
+      flash[:success] = '更新失败'
     end
   end
 

app/controllers/admins/project_licenses_controller.rb

@@ -1,13 +1,12 @@
 class Admins::ProjectLicensesController < Admins::BaseController 
-  before_action :require_admin
   before_action :set_license, only: [:edit,:update, :destroy,:show]
-  # before_action :validate_params, only: [:create, :update]
+  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).reorder("#{sort_by} #{sort_direction}")
+    project_licenses = q.result(distinct: true).order("#{sort_by} #{sort_direction}")
     @project_licenses = paginate(project_licenses)
   end
 
@@ -31,12 +30,13 @@ class Admins::ProjectLicensesController < Admins::BaseController
     #   position: max_position
     # }
     @project_license = License.new(license_params)
-    if @project_license.save
+
+    if @project_license.save!
       redirect_to admins_project_licenses_path 
       flash[:success] = "创建成功"
     else
-      redirect_to admins_project_licenses_path 
-      flash[:danger] = @project_license.errors.full_messages.join(",")
+      render :new
+      flash[:danger] = "创建失败"
     end
   end
 
@@ -54,13 +54,12 @@ class Admins::ProjectLicensesController < Admins::BaseController
     #   permissions: permissions.to_s,
     #   limitations: limitations.to_s
     # }
-    @project_license.attributes = license_params
-    if @project_license.save
+    if @project_license.update_attributes(license_params)
       redirect_to admins_project_licenses_path 
       flash[:success] = "更新成功"
     else
-      render admins_project_licenses_path 
-      flash[:danger] = @project_license.errors.full_messages.join(",")
+      render :edit
+      flash[:danger] = "更新失败"
     end
   end
 
@@ -96,26 +95,26 @@ class Admins::ProjectLicensesController < Admins::BaseController
   end
 
   def license_params
-    params.require(:license).permit(:name,:content,:position)
+    params.require(:license).permit(:name,:content)
   end
 
-  # def validate_params
-  #   name = params[:license][:name]
-  #   if name.blank? 
-  #     flash[:danger] = "名称不允许为空"
-  #     redirect_to admins_project_licenses_path
-  #   elsif check_license_present?(name) && @project_license.blank?
-  #     flash[:danger] = "创建失败:名称已存在"
-  #     redirect_to admins_project_licenses_path
-  #   end
-  # end
+  def validate_params
+    name = params[:license][:name]
+    if name.blank? 
+      flash[:danger] = "名称不允许为空"
+      redirect_to admins_project_licenses_path
+    elsif check_license_present?(name) && @project_license.blank?
+      flash[:danger] = "创建失败:名称已存在"
+      redirect_to admins_project_licenses_path
+    end
+  end
 
-  # def check_license_present?(name)
-  #   return true if name.blank?
-  #   name_downcase = name.downcase
-  #   name_upcase = name.upcase
-  #   name_first_big = name.capitalize
-  #   License.exists?(name: name_downcase) || License.exists?(name: name_upcase) || License.exists?(name: name_first_big)
-  # end
+  def check_license_present?(name)
+    return true if name.blank?
+    name_downcase = name.downcase
+    name_upcase = name.upcase
+    name_first_big = name.capitalize
+    License.exists?(name: name_downcase) || License.exists?(name: name_upcase) || License.exists?(name: name_first_big)
+  end
 
 end

app/controllers/admins/projects_controller.rb

@@ -1,56 +1,20 @@
 class Admins::ProjectsController < Admins::BaseController
-  before_action :require_admin
-  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("id = ? OR name like ? OR identifier LIKE ?", search, "%#{search}%", "%#{search}%").order("#{sort_by} #{sort_direction}")
-    case params[:category]
-    when 'public'
-      projects = projects.where(is_public: true)
-    when 'private'
-      projects = projects.where(is_public: false)
-    when 'fork'
-      projects = projects.where.not(forked_from_project_id: nil)
-    when 'original'
-      projects = projects.where(forked_from_project_id: nil, project_type: 'common')
-    end
+    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
-      close_fork_pull_requests_by(project)
-      Gitea::Repository::DeleteService.new(project.owner, project.identifier, current_user.gitea_token).call
+      Gitea::Repository::DeleteService.new(project.owner, project.identifier).call
       project.destroy!
-      project.forked_projects.update_all(forked_from_project_id: nil)
-      # 如果该项目有所属的项目分类以及为私有项目，需要更新对应数量
-      project.project_category.decrement!(:private_projects_count, 1) if project.project_category.present? && !project.is_public
       # render_delete_success
-      UserAction.create(action_id: project.id, action_type: "DestroyProject", user_id: current_user.id, :ip => request.remote_ip, data_bank: project.attributes.to_json)
       redirect_to admins_projects_path
       flash[:success] = "删除成功"
     end
@@ -58,28 +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
-
-  def close_fork_pull_requests_by(project)
-    open_pull_requests = PullRequest.where(fork_project_id: project.id)
-    if open_pull_requests.present?
-      open_pull_requests.each do |pull_request|
-        closed = PullRequests::CloseService.call(pull_request&.project.owner, pull_request&.project.repository, pull_request, current_user)
-        if closed === true
-          pull_request.project_trends.create!(user: current_user, project: pull_request&.project,action_type: ProjectTrend::CLOSE)
-          # 合并请求下issue处理为关闭
-          pull_request.issue&.update_attributes!({status_id:5})
-          SendTemplateMessageJob.perform_later('PullRequestClosed', current_user.id, pull_request.id) if Site.has_notice_menu?
-        end
-      end 
-    end
-  end
 end

app/controllers/admins/projects_rank_controller.rb

@@ -1,60 +0,0 @@
-class Admins::ProjectsRankController < Admins::BaseController
-  before_action :require_admin
-
-  def index 
-    @statistics = DailyProjectStatistic.where("date >= ? AND date <= ?", begin_date, end_date)
-    @statistics = @statistics.group(:project_id).select("project_id, 
-                                                         sum(score) as score,
-                                                         sum(visits) as visits,
-                                                         sum(watchers) as watchers,
-                                                         sum(praises) as praises,
-                                                         sum(forks) as forks,
-                                                         sum(issues) as issues,
-                                                         sum(pullrequests) as pullrequests,
-                                                         sum(commits) as commits").includes(:project)
-    @statistics = paginate @statistics.order("#{sort_by} #{sort_direction}")
-    export_excel(@statistics.limit(50))
-  end
-
-  private 
-
-  def begin_date 
-    params.fetch(:begin_date, (Date.yesterday-7.days).to_s)
-  end
-
-  def end_date 
-    params.fetch(:end_date, Date.yesterday.to_s)
-  end
-
-  def sort_by
-    DailyProjectStatistic.column_names.include?(params.fetch(:sort_by, "score")) ? params.fetch(:sort_by, "score") : "score"
-  end
-
-  def sort_direction
-    %w(desc asc).include?(params.fetch(:sort_direction, "desc")) ? params.fetch(:sort_direction, "desc") : "desc"
-  end
-
-  def export_excel(data)
-    book = Spreadsheet::Workbook.new 
-    sheet = book.create_worksheet :name => "项目活跃度排行"
-    sheet.row(0).concat %w(排名 项目全称 项目地址 项目分类	首次创建时间	外部迁移/独立创建 得分 访问数 关注数 点赞数 fork数 疑修数 合并请求数 提交数)
-    data.each_with_index do |d, index|
-      sheet[index+1,0] = index+1
-      sheet[index+1,1] = "#{d&.project&.owner&.real_name}/#{d&.project&.name}"
-      sheet[index+1,2] = "#{Rails.application.config_for(:configuration)['platform_url']}/#{d&.project&.owner&.login}/#{d&.project&.identifier}"
-      sheet[index+1,3] = d&.project&.project_category&.name
-      sheet[index+1,4] = d&.project&.created_on.present? ? d&.project&.created_on.strftime("%Y-%m-%d %H:%M:%S") : ""
-      sheet[index+1,5] = d&.project&.common? ? "独立创建" : "外部迁移"
-      sheet[index+1,6] = d.score
-      sheet[index+1,7] = d.visits
-      sheet[index+1,8] = d.watchers
-      sheet[index+1,9] = d.praises
-      sheet[index+1,10] = d.forks
-      sheet[index+1,11] = d.issues
-      sheet[index+1,12] = d.pullrequests
-      sheet[index+1,13] = d.commits
-    end
-    book.write "#{Rails.root}/public/项目活跃度排行.xls"
-  end
-
-end

app/controllers/admins/reversed_keywords_controller.rb

@@ -1,85 +0,0 @@
-class Admins::ReversedKeywordsController < Admins::BaseController 
-  before_action :require_admin
-  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/site_pages_controller.rb

@@ -1,51 +0,0 @@
-class Admins::SitePagesController <  Admins::BaseController
-    before_action :require_admin
-    before_action :finder_site_page, except: [:index]
-
-    def index
-        params[:sort_by] = params[:sort_by].presence || 'created_at'
-        params[:sort_direction] = params[:sort_direction].presence || 'desc'
-    
-        pages = Admins::SitePagesQuery.call(params)
-    
-        @site_pages = paginate pages.preload(:user)
-    end
-
-    def show
-        render 'edit'
-    end
-
-    def edit
-    end
-
-
-    def destroy
-        if @site_page.destroy 
-            redirect_to admins_site_pages_path
-            flash[:success] = "删除站点成功"
-        else  
-            redirect_to admins_site_pages_path
-            flash[:danger] = "删除站点失败"
-        end
-    end
-
-    def update
-        if update_params[:state] == "false" && update_params[:state_description].blank?
-            flash[:danger] = '关闭站点理由不能为空'
-        else
-            @site_page.update(update_params)
-            flash[:success] = '保存成功'
-        end
-        render 'edit'
-    end
-
-    private
-    def finder_site_page
-        @site_page = Page.find(params[:id])
-        @user = @site_page.user
-    end
-
-    def update_params
-        params.require(:page).permit(:state, :state_description)
-    end
-end

app/controllers/admins/sites_controller.rb

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

app/controllers/admins/topic/activity_forums_controller.rb

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

app/controllers/admins/topic/banners_controller.rb

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

app/controllers/admins/topic/base_controller.rb

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