From 9adf95e9d7c72e97ec3723d1ba1de115e41d19a5 Mon Sep 17 00:00:00 2001
From: retire <wyf372310383@163.com>
Date: Mon, 14 Oct 2019 12:39:37 +0800
Subject: [PATCH 1/4] jpress3

---
 .../src/main/java/io/jpress/web/front/OauthController.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jpress-web/src/main/java/io/jpress/web/front/OauthController.java b/jpress-web/src/main/java/io/jpress/web/front/OauthController.java
index 537edd4ec..4f2a4b5fd 100644
--- a/jpress-web/src/main/java/io/jpress/web/front/OauthController.java
+++ b/jpress-web/src/main/java/io/jpress/web/front/OauthController.java
@@ -152,7 +152,7 @@ public class OauthController extends Oauth2Controller {
     }
 
     private OauthConnector createDingdingConnector() {
-        boolean enable = JPressOptions.getAsBool("login_gitee_enable");
+        boolean enable = JPressOptions.getAsBool("login_dingding_enable");
         if (enable == false) return null;
 
         String appkey = JPressOptions.get("login_dingding_appkey");
-- 
Gitee


From 05f0993b62f217987b5fd33fe558b67ca654c54f Mon Sep 17 00:00:00 2001
From: retire <wyf372310383@163.com>
Date: Mon, 14 Oct 2019 12:55:15 +0800
Subject: [PATCH 2/4] jpress3

---
 .../webapp/WEB-INF/views/admin/setting/reg.html  | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/jpress-web/src/main/webapp/WEB-INF/views/admin/setting/reg.html b/jpress-web/src/main/webapp/WEB-INF/views/admin/setting/reg.html
index ea7b88bee..b22f19dee 100755
--- a/jpress-web/src/main/webapp/WEB-INF/views/admin/setting/reg.html
+++ b/jpress-web/src/main/webapp/WEB-INF/views/admin/setting/reg.html
@@ -39,8 +39,7 @@
                             <div class="form-group">
                                 <label class="col-sm-2 control-label">启用微信登录功能</label>
                                 <div class="col-sm-6">
-                                    <input type="checkbox" class="switchery" data-for="login_wechat_enable"
-                                           #checkedIf(option("login_wechat_enable"))>
+                                    <input #checkedIf(option( class="switchery" data-for="login_wechat_enable" type="checkbox""login_wechat_enable"))>
                                     <input type="hidden" id="login_wechat_enable" name="login_wechat_enable">
                                 </div>
                             </div>
@@ -104,8 +103,7 @@
                             <div class="form-group">
                                 <label class="col-sm-2 control-label">启用微博登录功能</label>
                                 <div class="col-sm-6">
-                                    <input #checkedIf(option( class="switchery" data-for="login_weibo_enable"
-                                           type="checkbox""login_weibo_enable"))>
+                                    <input #checkedIf(option( class="switchery" data-for="login_weibo_enable" type="checkbox""login_weibo_enable"))>
                                     <input id="login_weibo_enable" name="login_weibo_enable" type="hidden">
                                 </div>
                             </div>
@@ -135,8 +133,7 @@
                             <div class="form-group">
                                 <label class="col-sm-2 control-label">启用GitHub登录功能</label>
                                 <div class="col-sm-6">
-                                    <input #checkedIf(option( class="switchery" data-for="login_github_enable"
-                                           type="checkbox""login_github_enable"))>
+                                    <input #checkedIf(option( class="switchery" data-for="login_github_enable" type="checkbox""login_github_enable"))>
                                     <input id="login_github_enable" name="login_github_enable" type="hidden">
                                 </div>
                             </div>
@@ -166,8 +163,7 @@
                             <div class="form-group">
                                 <label class="col-sm-2 control-label">启用码云登录功能</label>
                                 <div class="col-sm-6">
-                                    <input #checkedIf(option( class="switchery" data-for="login_gitee_enable"
-                                           type="checkbox""login_gitee_enable"))>
+                                    <input #checkedIf(option( class="switchery" data-for="login_gitee_enable" type="checkbox""login_gitee_enable"))>
                                     <input id="login_gitee_enable" name="login_gitee_enable" type="hidden">
                                 </div>
                             </div>
@@ -197,8 +193,8 @@
                             <div class="form-group">
                                 <label class="col-sm-2 control-label">启用钉钉登录功能</label>
                                 <div class="col-sm-6">
-                                    <input #checkedIf(option( class="switchery" data-for="login_dingding_enable"
-                                           type="checkbox""login_dingding_enable"))>
+                                    <input #checkedIf(option( class="switchery" data-for="login_dingding_enable" type="checkbox""login_dingding_enable"))>
+
                                     <input id="login_dingding_enable" name="login_dingding_enable" type="hidden">
                                 </div>
                             </div>
-- 
Gitee


From 981edeb5ae3ac5815a078c7b39f9f0e7cf9273b1 Mon Sep 17 00:00:00 2001
From: retire <wyf372310383@163.com>
Date: Mon, 14 Oct 2019 13:12:40 +0800
Subject: [PATCH 3/4] jpress3

---
 .../webapp/WEB-INF/views/admin/setting/reg.html    | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/jpress-web/src/main/webapp/WEB-INF/views/admin/setting/reg.html b/jpress-web/src/main/webapp/WEB-INF/views/admin/setting/reg.html
index b22f19dee..88aacfeda 100755
--- a/jpress-web/src/main/webapp/WEB-INF/views/admin/setting/reg.html
+++ b/jpress-web/src/main/webapp/WEB-INF/views/admin/setting/reg.html
@@ -39,7 +39,7 @@
                             <div class="form-group">
                                 <label class="col-sm-2 control-label">启用微信登录功能</label>
                                 <div class="col-sm-6">
-                                    <input #checkedIf(option( class="switchery" data-for="login_wechat_enable" type="checkbox""login_wechat_enable"))>
+                                    <input #checkedIf(option( class="switchery" data-for="login_wechat_enable" type="checkbox"'login_wechat_enable'))>
                                     <input type="hidden" id="login_wechat_enable" name="login_wechat_enable">
                                 </div>
                             </div>
@@ -72,8 +72,7 @@
                             <div class="form-group">
                                 <label class="col-sm-2 control-label">启用QQ登录功能</label>
                                 <div class="col-sm-6">
-                                    <input type="checkbox" class="switchery" data-for="login_qq_enable"
-                                           #checkedIf(option("login_qq_enable"))>
+                                    <input #checkedIf(option( class="switchery" data-for="login_qq_enable" type="checkbox"'login_qq_enable'))>
                                     <input type="hidden" id="login_qq_enable" name="login_qq_enable">
                                 </div>
                             </div>
@@ -103,7 +102,7 @@
                             <div class="form-group">
                                 <label class="col-sm-2 control-label">启用微博登录功能</label>
                                 <div class="col-sm-6">
-                                    <input #checkedIf(option( class="switchery" data-for="login_weibo_enable" type="checkbox""login_weibo_enable"))>
+                                    <input #checkedIf(option( class="switchery" data-for="login_weibo_enable" type="checkbox"'login_weibo_enable'))>
                                     <input id="login_weibo_enable" name="login_weibo_enable" type="hidden">
                                 </div>
                             </div>
@@ -133,7 +132,7 @@
                             <div class="form-group">
                                 <label class="col-sm-2 control-label">启用GitHub登录功能</label>
                                 <div class="col-sm-6">
-                                    <input #checkedIf(option( class="switchery" data-for="login_github_enable" type="checkbox""login_github_enable"))>
+                                    <input #checkedIf(option( class="switchery" data-for="login_github_enable" type="checkbox"'login_github_enable'))>
                                     <input id="login_github_enable" name="login_github_enable" type="hidden">
                                 </div>
                             </div>
@@ -163,7 +162,7 @@
                             <div class="form-group">
                                 <label class="col-sm-2 control-label">启用码云登录功能</label>
                                 <div class="col-sm-6">
-                                    <input #checkedIf(option( class="switchery" data-for="login_gitee_enable" type="checkbox""login_gitee_enable"))>
+                                    <input #checkedIf(option( class="switchery" data-for="login_gitee_enable" type="checkbox"'login_gitee_enable'))>
                                     <input id="login_gitee_enable" name="login_gitee_enable" type="hidden">
                                 </div>
                             </div>
@@ -193,8 +192,7 @@
                             <div class="form-group">
                                 <label class="col-sm-2 control-label">启用钉钉登录功能</label>
                                 <div class="col-sm-6">
-                                    <input #checkedIf(option( class="switchery" data-for="login_dingding_enable" type="checkbox""login_dingding_enable"))>
-
+                                    <input  #checkedIf(option( class="switchery" data-for="login_dingding_enable" type="checkbox"'login_dingding_enable'))>
                                     <input id="login_dingding_enable" name="login_dingding_enable" type="hidden">
                                 </div>
                             </div>
-- 
Gitee


From 69a8604d322141febfb72e20c6043396e4ca23dc Mon Sep 17 00:00:00 2001
From: retire <wyf372310383@163.com>
Date: Mon, 14 Oct 2019 13:21:52 +0800
Subject: [PATCH 4/4] jpress3

---
 .../webapp/WEB-INF/views/admin/setting/reg.html     | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/jpress-web/src/main/webapp/WEB-INF/views/admin/setting/reg.html b/jpress-web/src/main/webapp/WEB-INF/views/admin/setting/reg.html
index 88aacfeda..bba69b194 100755
--- a/jpress-web/src/main/webapp/WEB-INF/views/admin/setting/reg.html
+++ b/jpress-web/src/main/webapp/WEB-INF/views/admin/setting/reg.html
@@ -23,7 +23,6 @@
                     <form class="form-horizontal form-setting" autocomplete="off" id="optionForm">
                         <div class="box-body ">
 
-
                             <h4 class="page-first-header">用户登录</h4>
 
                             <div class="form-group">
@@ -39,7 +38,7 @@
                             <div class="form-group">
                                 <label class="col-sm-2 control-label">启用微信登录功能</label>
                                 <div class="col-sm-6">
-                                    <input #checkedIf(option( class="switchery" data-for="login_wechat_enable" type="checkbox"'login_wechat_enable'))>
+                                    <input class="switchery" data-for="login_wechat_enable" type="checkbox" #checkedIf(option('login_wechat_enable'))>
                                     <input type="hidden" id="login_wechat_enable" name="login_wechat_enable">
                                 </div>
                             </div>
@@ -72,7 +71,7 @@
                             <div class="form-group">
                                 <label class="col-sm-2 control-label">启用QQ登录功能</label>
                                 <div class="col-sm-6">
-                                    <input #checkedIf(option( class="switchery" data-for="login_qq_enable" type="checkbox"'login_qq_enable'))>
+                                    <input class="switchery" data-for="login_qq_enable" type="checkbox" #checkedIf(option('login_qq_enable'))>
                                     <input type="hidden" id="login_qq_enable" name="login_qq_enable">
                                 </div>
                             </div>
@@ -102,7 +101,7 @@
                             <div class="form-group">
                                 <label class="col-sm-2 control-label">启用微博登录功能</label>
                                 <div class="col-sm-6">
-                                    <input #checkedIf(option( class="switchery" data-for="login_weibo_enable" type="checkbox"'login_weibo_enable'))>
+                                    <input class="switchery" data-for="login_weibo_enable" type="checkbox" #checkedIf(option('login_weibo_enable'))>
                                     <input id="login_weibo_enable" name="login_weibo_enable" type="hidden">
                                 </div>
                             </div>
@@ -132,7 +131,7 @@
                             <div class="form-group">
                                 <label class="col-sm-2 control-label">启用GitHub登录功能</label>
                                 <div class="col-sm-6">
-                                    <input #checkedIf(option( class="switchery" data-for="login_github_enable" type="checkbox"'login_github_enable'))>
+                                    <input class="switchery" data-for="login_github_enable" type="checkbox" #checkedIf(option('login_github_enable'))>
                                     <input id="login_github_enable" name="login_github_enable" type="hidden">
                                 </div>
                             </div>
@@ -162,7 +161,7 @@
                             <div class="form-group">
                                 <label class="col-sm-2 control-label">启用码云登录功能</label>
                                 <div class="col-sm-6">
-                                    <input #checkedIf(option( class="switchery" data-for="login_gitee_enable" type="checkbox"'login_gitee_enable'))>
+                                    <input class="switchery" data-for="login_gitee_enable" type="checkbox" #checkedIf(option('login_gitee_enable'))>
                                     <input id="login_gitee_enable" name="login_gitee_enable" type="hidden">
                                 </div>
                             </div>
@@ -192,7 +191,7 @@
                             <div class="form-group">
                                 <label class="col-sm-2 control-label">启用钉钉登录功能</label>
                                 <div class="col-sm-6">
-                                    <input  #checkedIf(option( class="switchery" data-for="login_dingding_enable" type="checkbox"'login_dingding_enable'))>
+                                    <input class="switchery" data-for="login_dingding_enable" type="checkbox" #checkedIf(option('login_dingding_enable'))>
                                     <input id="login_dingding_enable" name="login_dingding_enable" type="hidden">
                                 </div>
                             </div>
-- 
Gitee