Skip to content

Commit

Permalink
V1.9版本
Browse files Browse the repository at this point in the history
  • Loading branch information
szvone committed Sep 11, 2019
1 parent d1a323e commit a44f9ee
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 11 deletions.
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ V免签(PHP) 是基于Thinkphp5.1 + mysql 实现的一套免签支付程序,
> V免签仅供个人开发者调试测试使用,请勿用于非法用途,商用请您申请官方商户接口
> v免签开发交流群:992029073
> v免签开发交流群:992029073 (群已被封,作者QQ:7876632【问功能怎样的别加我,不回答,免费开源系统,自行搭建测试,不提供技术支持】)
> bug反馈请建立issues
Expand Down Expand Up @@ -122,6 +122,11 @@ V免签为完全开源项目,开源项目意味着作者没有任何收入来
+ 微信店员收款推送通知

## 更新记录
+ v1.9(2019.09.11)
+ 修复一些已知的BUG
+ 因为很多人的服务器时间不准确,因此删除时间校验,不会出现客户端时间错误了
+ 增加主页服务器基本配置的显示列表

+ v1.8.1(2019.05.22)
+ 增加详细的手机端设置教程
+ 同步最新版监控端App
Expand Down
8 changes: 8 additions & 0 deletions application/admin/controller/Index.php
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,13 @@ public function getMain(){
$v = Db::query("SELECT VERSION();");
$v=$v[0]['VERSION()'];

if(function_exists("gd_info")) {
$gd_info = @gd_info();
$gd = $gd_info["GD Version"];
}else{
$gd = '<font color="red">GD库未开启!</font>';
}

return json($this->getReturn(1,"成功",array(
"todayOrder"=>$todayOrder,
"todaySuccessOrder"=>$todaySuccessOrder,
Expand All @@ -77,6 +84,7 @@ public function getMain(){
"Thinkphp"=>"v".App::VERSION,
"RunTime"=>$this->sys_uptime(),
"ver"=>"v1.9",
"gd"=>$gd,
)));

}
Expand Down
16 changes: 8 additions & 8 deletions application/index/controller/Index.php
Original file line number Diff line number Diff line change
Expand Up @@ -418,10 +418,10 @@ public function appHeart(){
return json($this->getReturn(-1, "签名校验不通过"));
}

$jg = time()*1000 - $t;
if ($jg>50000 || $jg<-50000){
return json($this->getReturn(-1, "客户端时间错误"));
}
// $jg = time()*1000 - $t;
// if ($jg>50000 || $jg<-50000){
// return json($this->getReturn(-1, "客户端时间错误"));
// }

Db::name("setting")->where("vkey","lastheart")->update(array("vvalue"=>time()));
Db::name("setting")->where("vkey","jkstate")->update(array("vvalue"=>1));
Expand All @@ -443,10 +443,10 @@ public function appPush(){
return json($this->getReturn(-1, "签名校验不通过"));
}

$jg = time()*1000 - $t;
if ($jg>50000 || $jg<-50000){
return json($this->getReturn(-1, "客户端时间错误"));
}
// $jg = time()*1000 - $t;
// if ($jg>50000 || $jg<-50000){
// return json($this->getReturn(-1, "客户端时间错误"));
// }

Db::name("setting")
->where("vkey","lastpay")
Expand Down
1 change: 1 addition & 0 deletions public/admin/addwxqrcode.html
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@

qrcode.decode(getObjectURL(file),result);
qrcode.callback = function(imgMsg,img64) {
console.log(imgMsg);

if (imgMsg==""){
$.post("qr-code/test.php","base64="+encodeURIComponent(img64.split(",")[1]),function (data) {
Expand Down
1 change: 0 additions & 1 deletion public/admin/addzfbqrcode.html
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@
if (!data.data) {
data = JSON.parse(data);
}

imgs.push({"index":imgs.length,"money":"","b64":img64,"url":data.data});
mytable.reload({
data: imgs
Expand Down
8 changes: 8 additions & 0 deletions public/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,17 @@
<td><b>ThinkPHP版本</b></td>
<td id="Thinkphp"></td>
</tr>

<tr>
<td><b>GD库版本</b></td>
<td id="gd"></td>
</tr>

<tr>
<td><b>主程序版本</b></td>
<td id="ver"></td>
</tr>

<tr>
<td><b>运行时间</b></td>
<td id="RunTime"></td>
Expand Down Expand Up @@ -137,5 +144,6 @@
$("#Thinkphp").html(data.data.Thinkphp);
$("#RunTime").html(data.data.RunTime);
$("#ver").html(data.data.ver);
$("#gd").html(data.data.gd);
});
</script>
7 changes: 6 additions & 1 deletion public/qr-code/test.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,10 @@

$qrcode = new QrReader(base64_decode($b64),QrReader::SOURCE_TYPE_BLOB); //图片路径
$text = $qrcode->text(); //返回识别后的文本
if ($text){
echo json_encode(array("code"=>1,"msg"=>"成功","data"=>$text));

echo json_encode(array("code"=>1,"msg"=>"成功","data"=>$text));
}else{
echo json_encode(array("code"=>-1,"msg"=>"未识别到二维码","data"=>"二维码识别失败,请删除本张图片"));

}

0 comments on commit a44f9ee

Please sign in to comment.