From 2bc2cd226f4daad1d2977598db38fe2b79539585 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Tue, 13 Dec 2022 08:40:33 +0800 Subject: [PATCH 1/7] 'commit' --- .../dsideal/FengHuang/TouPiao/Controller/TouPiaoController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/dsideal/FengHuang/TouPiao/Controller/TouPiaoController.java b/src/main/java/com/dsideal/FengHuang/TouPiao/Controller/TouPiaoController.java index 7710509..d2f4a48 100644 --- a/src/main/java/com/dsideal/FengHuang/TouPiao/Controller/TouPiaoController.java +++ b/src/main/java/com/dsideal/FengHuang/TouPiao/Controller/TouPiaoController.java @@ -62,7 +62,7 @@ public class TouPiaoController extends Controller { if (tm.haveFinishTouPiao(toupiaoren_tel)) { Kv kv = Kv.create(); kv.put("success", false); - kv.put("msg", "您已经投票完成，不能再次进入系统！"); + kv.put("msg", "您已经投票完成，不能重复投票！"); renderJson(kv); return; } From 6903fcbead5512158fed68fdfd8f4d26be8e4dd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Tue, 13 Dec 2022 08:56:42 +0800 Subject: [PATCH 2/7] 'commit' --- WebRoot/html/toupiao_login.html | 2 +- .../LoginPerson/Controller/LoginPersonController.java | 2 +- .../FengHuang/TouPiao/Controller/TouPiaoController.java | 2 +- .../dsideal/FengHuang/TouPiao/Model/TouPiaoModel.java | 9 +++++---- 一键推拉.cmd | 3 ++- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/WebRoot/html/toupiao_login.html b/WebRoot/html/toupiao_login.html index 3f96a6a..50de533 100644 --- a/WebRoot/html/toupiao_login.html +++ b/WebRoot/html/toupiao_login.html @@ -114,7 +114,7 @@ if (result.success) { window.location.href = '/FengHuang/html/tp/index.html'; } else { - alert(result.msg); + alert(result.message); refreshCaptcha(); } } diff --git a/src/main/java/com/dsideal/FengHuang/LoginPerson/Controller/LoginPersonController.java b/src/main/java/com/dsideal/FengHuang/LoginPerson/Controller/LoginPersonController.java index cc3c079..f5162a9 100644 --- a/src/main/java/com/dsideal/FengHuang/LoginPerson/Controller/LoginPersonController.java +++ b/src/main/java/com/dsideal/FengHuang/LoginPerson/Controller/LoginPersonController.java @@ -166,7 +166,7 @@ public class LoginPersonController extends Controller { TouPiaoModel tm = new TouPiaoModel(); if (tm.haveFinishTouPiao(username)) { resultJson.put("success", false); - resultJson.put("msg", "您已经投票完成，不能再次进入系统！"); + resultJson.put("message", "您已经投票完成，不能再次进入系统！"); renderJson(resultJson); return; } diff --git a/src/main/java/com/dsideal/FengHuang/TouPiao/Controller/TouPiaoController.java b/src/main/java/com/dsideal/FengHuang/TouPiao/Controller/TouPiaoController.java index d2f4a48..cdf4fb5 100644 --- a/src/main/java/com/dsideal/FengHuang/TouPiao/Controller/TouPiaoController.java +++ b/src/main/java/com/dsideal/FengHuang/TouPiao/Controller/TouPiaoController.java @@ -62,7 +62,7 @@ public class TouPiaoController extends Controller { if (tm.haveFinishTouPiao(toupiaoren_tel)) { Kv kv = Kv.create(); kv.put("success", false); - kv.put("msg", "您已经投票完成，不能重复投票！"); + kv.put("message", "您已经投票完成，不能重复投票！"); renderJson(kv); return; } diff --git a/src/main/java/com/dsideal/FengHuang/TouPiao/Model/TouPiaoModel.java b/src/main/java/com/dsideal/FengHuang/TouPiao/Model/TouPiaoModel.java index 6b2a836..396b45e 100644 --- a/src/main/java/com/dsideal/FengHuang/TouPiao/Model/TouPiaoModel.java +++ b/src/main/java/com/dsideal/FengHuang/TouPiao/Model/TouPiaoModel.java @@ -14,7 +14,7 @@ import java.util.Map; public class TouPiaoModel { public List getHouXuanRenList(int type_id) { - String sql = "select * from t_toupiao_houxuanren where houxuanren_type_id=?"; + String sql = "select * from t_toupiao_houxuanren where houxuanren_type_id=? order by sort_id"; return Db.find(sql, type_id); } @@ -34,7 +34,8 @@ public class TouPiaoModel { public boolean haveFinishTouPiao(String toupiaoren_tel) { String sql = "select count(1) as c from t_toupiao_result where toupiaoren_tel=?"; - return Db.findFirst(sql, toupiaoren_tel).getInt("c") > 0; + int cnt=Db.findFirst(sql, toupiaoren_tel).getInt("c"); + return cnt > 0; } public void save(String toupiaoren_tel, String[] gaojiArray, String[] zhongjiArray) { @@ -52,7 +53,7 @@ public class TouPiaoModel { record.set("houxuanren_name", _map.get(s).getStr("toupiaoren_name")); record.set("houxuanren_type_id", 1); - record.set("toupiaoren_tel", s); + record.set("toupiaoren_tel", toupiaoren_tel); record.set("toupiaoren_name", _map.get(s).getStr("toupiaoren_name")); record.set("toupiaoren_type_id", toupiaoren_type_id); saveList.add(record); @@ -63,7 +64,7 @@ public class TouPiaoModel { record.set("houxuanren_name", _map.get(s).getStr("toupiaoren_name")); record.set("houxuanren_type_id", 2); - record.set("toupiaoren_tel", s); + record.set("toupiaoren_tel", toupiaoren_tel); record.set("toupiaoren_name", _map.get(s).getStr("toupiaoren_name")); record.set("toupiaoren_type_id", toupiaoren_type_id); saveList.add(record); diff --git a/一键推拉.cmd b/一键推拉.cmd index 5351539..4b600b2 100644 --- a/一键推拉.cmd +++ b/一键推拉.cmd @@ -8,4 +8,5 @@ git add -A . git commit -am 'commit' git fetch git pull -git push origin master \ No newline at end of file +git push origin master +pause \ No newline at end of file From a1ac24eca92a7624655234745b00b86890258b13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Tue, 13 Dec 2022 08:57:46 +0800 Subject: [PATCH 3/7] 'commit' --- log/1.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 log/1.txt diff --git a/log/1.txt b/log/1.txt new file mode 100644 index 0000000..e69de29 From a653398a5db27b378b9a99abbfea8971cfcd4b4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Tue, 13 Dec 2022 08:58:40 +0800 Subject: [PATCH 4/7] 'commit' --- 一键推拉.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/一键推拉.cmd b/一键推拉.cmd index 4b600b2..f687bee 100644 --- a/一键推拉.cmd +++ b/一键推拉.cmd @@ -6,7 +6,7 @@ git config --global core.autocrlf false git add -A . git commit -am 'commit' -git fetch +::git fetch git pull git push origin master pause \ No newline at end of file From 1430760860c6d3d96c67433df03cb28d6816e63a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Tue, 13 Dec 2022 09:00:16 +0800 Subject: [PATCH 5/7] 'commit' --- 一键推拉.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/一键推拉.cmd b/一键推拉.cmd index f687bee..0d62f41 100644 --- a/一键推拉.cmd +++ b/一键推拉.cmd @@ -8,5 +8,5 @@ git add -A . git commit -am 'commit' ::git fetch git pull -git push origin master +git push origin main pause \ No newline at end of file From 720f4a74c8c166d75d0c2699b3dacf6488da9210 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Tue, 13 Dec 2022 09:01:01 +0800 Subject: [PATCH 6/7] 'commit' --- 一键推拉.cmd | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/一键推拉.cmd b/一键推拉.cmd index 0d62f41..d10b499 100644 --- a/一键推拉.cmd +++ b/一键推拉.cmd @@ -8,5 +8,8 @@ git add -A . git commit -am 'commit' ::git fetch git pull + +:: GitHuberror: src refspec master does not match any +:: https://www.deep-os.com/?id=73 + git push origin main -pause \ No newline at end of file From c8a0ea0a08d67c1417e9e4fcaf4ddf76e351a0e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Tue, 13 Dec 2022 09:01:13 +0800 Subject: [PATCH 7/7] 'commit' --- 一键推拉.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/一键推拉.cmd b/一键推拉.cmd index d10b499..ca255c1 100644 --- a/一键推拉.cmd +++ b/一键推拉.cmd @@ -6,7 +6,7 @@ git config --global core.autocrlf false git add -A . git commit -am 'commit' -::git fetch +git fetch git pull :: GitHuberror: src refspec master does not match any