Skip to content

Commit dbec5c1

Browse files
oiuvoiuv
committed
修正BUG，增加微信登录，代码格式化
1 parent 4ddacc4 commit dbec5c1

File tree

2,076 files changed

+51139
-72789
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,076 files changed

+51139
-72789
lines changed

‎.php_cs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,21 @@ This file is part of the phpems/phpems.
99
This source file is subject to the MIT license that is bundled.
1010
EOF;
1111

12-
return PhpCsFixer\Config::create()
12+
$finder = PhpCsFixer\Finder::create()
13+
->exclude(['vendor', 'data', 'files'])
14+
->in(__DIR__)
15+
;
16+
17+
$config = PhpCsFixer\Config::create()
1318
->setRiskyAllowed(true)
14-
->setRules(array(
15-
'@Symfony' => true,
16-
'header_comment' => array('header' => $header),
17-
'array_syntax' => array('syntax' => 'short'),
18-
'ordered_imports' => true,
19-
'no_useless_else' => true,
20-
'no_useless_return' => true,
21-
'php_unit_construct' => true,
22-
'php_unit_strict' => true,
23-
))
24-
->setFinder(
25-
PhpCsFixer\Finder::create()
26-
->exclude(['vendor', 'data', 'files'])
27-
->in(__DIR__)
28-
)
19+
->setRules([
20+
'@PSR2' => true,
21+
'header_comment' => ['header' => $header],
22+
'binary_operator_spaces' => ['operators' => ['=>' => 'align']],
23+
// 'no_useless_else' => true,
24+
// 'no_useless_return' => true,
25+
])
26+
->setFinder($finder)
2927
;
28+
29+
return $config;

‎CHANGELOG.md‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
## 2020-09-20（6.1）更改功能
2+
1. 增加微信一键登录
3+
2. 编辑器支持图片粘贴
4+
3. 修复已知bug
5+
6+
## 2019-09-24（6.0）更改功能
7+
1. 优化手机端
8+
2. 题帽题支持多题型
9+
3. 优化正式考试
10+
4. 优化课程
11+
5. 修复已知bug
12+
13+
## 2018-07-18（5.0）更改功能
14+
1. 增加证书模块
15+
2. 增加邮箱密码验证
16+
3. 优化手机端前台界面
17+
4. 增加教师管理课程功能
18+
5. 修复已知bug
19+
20+
## 2018-01-31（4.2）更改功能
21+
1. 支持PHP7
22+
2. 支持手机端查看视频课程
23+
3. 增加文档模块
24+
4. 优化内容模块后台
25+
5. 优化手机端操作
26+
6. 支持公式编辑（PC端，手机端由于此编辑功能比较消耗资源，暂不启用）

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# [phpems v6.0](https://phpems.is.js.cn)
22

3-
开源免费的PHP无纸化模拟考试系统，基于 [PHPEMS](http://www.phpems.net/) v6.0 优化。本版本重点修复BUG(包括所有非 E_NOTICE 级别错误提示)，并根据需要优化新增一些功能。如果要使用旧版本请参考 [PHPEMS v5.0](https://github.com/oiuv/phpems/tree/5.0)。
3+
开源免费的PHP无纸化模拟考试系统，基于 [PHPEMS](http://www.phpems.net/) v6.1 优化。本版本重点修复BUG(包括所有非 E_NOTICE 级别错误提示)，并根据需要优化新增一些功能。
44

55
因使用部分第三方扩展包，系统要求`php>=7.0`，默认集成扩展包如下：
66

@@ -11,6 +11,7 @@
1111
| [predis/predis](https://packagist.org/packages/predis/predis) | 缓存驱动 Redis 基础扩展包，使系统支持Redis缓存 |
1212
| [overtrue/wechat](https://packagist.org/packages/overtrue/wechat) | 开源的微信非官方 SDK，方便在考试系统开发微信服务号相关功能 |
1313
| [overtrue/easy-sms](https://packagist.org/packages/overtrue/easy-sms) | 一款满足你的多种发送需求的短信发送组件 |
14+
| [aliyuncs/oss-sdk-php](https://packagist.org/packages/aliyuncs/oss-sdk-php) | Aliyun OSS SDK for PHP |
1415

1516
## 优化&新增功能
1617

‎api/alinotify.php‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ public function __construct(&$G)
1919
{
2020
$this->G = $G;
2121
$this->ev = $this->G->make('ev');
22-
$this->sql = $this->G->make('pdosql');
23-
$this->db = $this->G->make('pepdo');
2422
$this->user = $this->G->make('user', 'user');
2523
$this->order = $this->G->make('orders', 'bank');
2624
}

‎api/alireturn.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ public function __construct(&$G)
1919
{
2020
$this->G = $G;
2121
$this->ev = $this->G->make('ev');
22-
$this->sql = $this->G->make('pdosql');
23-
$this->db = $this->G->make('pepdo');
24-
$this->module = $this->G->make('module');
25-
$this->session = $this->G->make('session');
2622
$this->user = $this->G->make('user', 'user');
2723
$this->order = $this->G->make('orders', 'bank');
2824
}
@@ -46,7 +42,11 @@ public function run()
4642
}
4743
}
4844

49-
header('location:../index.php?user-api&ordersn='.$orderid);
45+
if ($this->ev->isMobile()) {
46+
header('location:../index.php?user-phone-payfor-orderdetail&ordersn='.$orderid);
47+
} else {
48+
header('location:../index.php?user-center-payfor-orderdetail&ordersn='.$orderid);
49+
}
5050
exit();
5151
}
5252
}

‎app/autoform/tpls/app/footer.tpl‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<div class="container-fluid box" style="background-color:#337AB7;margin-bottom:0px;" id="footer">
2-
<div class="row-fluid">
3-
<div class="main itembox">
4-
<div class="col-xs-12">
5-
<ul class="list-unstyled">
6-
<li class="text-center"><a href="">PHPEMS在线模拟考试系统 著作权登记号：2013 SR 113189</a></li>
7-
<li class="text-center"><a href="">Copyright © phpems.net {x2;date:TIME,'Y'}</a></li>
8-
</ul>
9-
</div>
10-
</div>
11-
</div>
12-
</div>
2+
<div class="row-fluid">
3+
<div class="main itembox">
4+
<div class="col-xs-12">
5+
<ul class="list-unstyled">
6+
<li class="text-center"><a href="">PHPEMS在线模拟考试系统 著作权登记号：2013 SR 113189</a></li>
7+
<li class="text-center"><a href="">Copyright © phpems.net {x2;date:TIME,'Y'}</a></li>
8+
</ul>
9+
</div>
10+
</div>
11+
</div>
12+
</div>

‎app/autoform/tpls/app/header.tpl‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@
33
<head>
44
<meta charset="UTF-8">
55
<title>PHPEMS模拟考试系统</title>
6-
<meta name="viewport" content="width=device-width, initial-scale=1">
7-
<meta http-equiv="X-UA-Compatible" content="IE=edge">
8-
<link rel="stylesheet" type="text/css" href="app/core/styles/css/bootstrap.css" />
9-
<link rel="stylesheet" type="text/css" href="app/core/styles/css/datetimepicker.css" />
10-
<link rel="stylesheet" type="text/css" href="app/core/styles/css/jquery-ui.min.css" />
11-
<link rel="stylesheet" type="text/css" href="app/core/styles/css/peskin.css" />
12-
<!--[if lt IE 9]>
13-
<script src="app/core/styles/js/html5shiv.min.js"></script>
14-
<script src="app/core/styles/js/respond.min.js"></script>
15-
<![endif]-->
16-
<script src="app/core/styles/js/jquery.min.js"></script>
17-
<script src="app/core/styles/js/jquery-ui.min.js"></script>
18-
<script src="app/core/styles/js/bootstrap.min.js"></script>
19-
<script src="app/core/styles/js/bootstrap-datetimepicker.js"></script>
6+
<meta name="viewport" content="width=device-width, initial-scale=1">
7+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
8+
<link rel="stylesheet" type="text/css" href="app/core/styles/css/bootstrap.css" />
9+
<link rel="stylesheet" type="text/css" href="app/core/styles/css/datetimepicker.css" />
10+
<link rel="stylesheet" type="text/css" href="app/core/styles/css/jquery-ui.min.css" />
11+
<link rel="stylesheet" type="text/css" href="app/core/styles/css/peskin.css" />
12+
<!--[if lt IE 9]>
13+
<script src="app/core/styles/js/html5shiv.min.js"></script>
14+
<script src="app/core/styles/js/respond.min.js"></script>
15+
<![endif]-->
16+
<script src="app/core/styles/js/jquery.min.js"></script>
17+
<script src="app/core/styles/js/jquery-ui.min.js"></script>
18+
<script src="app/core/styles/js/bootstrap.min.js"></script>
19+
<script src="app/core/styles/js/bootstrap-datetimepicker.js"></script>
2020

21-
<script src="app/core/styles/js/all.fine-uploader.min.js"></script>
22-
<script src="app/core/styles/js/ckeditor/js/MathJax.js?config=TeX-AMS_HTML"></script>
23-
<script src="app/core/styles/js/ckeditor/ckeditor.js"></script>
24-
<script src="app/core/styles/js/plugin.js"></script>
25-
<script src="app/core/styles/js/plugin.js"></script>
26-
</head>
21+
<script src="app/core/styles/js/all.fine-uploader.min.js"></script>
22+
<script src="app/core/styles/js/ckeditor/js/MathJax.js?config=TeX-AMS_HTML"></script>
23+
<script src="app/core/styles/js/ckeditor/ckeditor.js"></script>
24+
<script src="app/core/styles/js/plugin.js"></script>
25+
<script src="app/core/styles/js/plugin.js"></script>
26+
</head>

0 commit comments

Comments
 (0)