commit: 优化

Author: yuit

src/main/java/club/yuit/oauth/boot/config/SecurityConfig.java

@@ -1,5 +1,6 @@
 package club.yuit.oauth.boot.config;
 
+import club.yuit.oauth.boot.authentication.sms.SmsAuthenticationProvider;
 import club.yuit.oauth.boot.filter.BootPictureCodeAuthenticationFilter;
 import club.yuit.oauth.boot.support.BootLoginFailureHandler;
 import club.yuit.oauth.boot.support.BootSecurityProperties;
@@ -105,4 +106,11 @@ public PasswordEncoder passwordEncoder() {
     }
 
 
+    @Bean
+    public SmsAuthenticationProvider smsAuthenticationProvider (){
+        return new SmsAuthenticationProvider();
+    }
+
+
+
 }

src/main/java/club/yuit/oauth/boot/controller/BaseMainController.java

@@ -1,8 +1,9 @@
 package club.yuit.oauth.boot.controller;
 
 import club.yuit.oauth.boot.support.BootSecurityProperties;
-import club.yuit.oauth.boot.support.code.picture.BootPictureCodeGenerator;
-import org.springframework.beans.factory.annotation.Autowired;
+import club.yuit.oauth.boot.support.code.BootCodeService;
+import club.yuit.oauth.boot.support.code.picture.PictureCodeGenerator;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -19,9 +20,16 @@
 public class BaseMainController {
 
 
-    @Autowired
     private BootSecurityProperties properties;
 
+    private BootCodeService codeService;
+
+    public BaseMainController(BootSecurityProperties properties,
+                              @Qualifier("sessionPictureCodeService") BootCodeService codeService) {
+        this.properties = properties;
+        this.codeService = codeService;
+    }
+
     @GetMapping("/auth/login")
     public String loginPage(Model model){
 
@@ -33,7 +41,7 @@ public String loginPage(Model model){
 
     @GetMapping("/picture_code")
     public void pictureCodeGenerate(HttpServletResponse response) throws IOException {
-        BootPictureCodeGenerator.generate(response);
+        new PictureCodeGenerator(response).generator(codeService);
     }
 
 }

src/main/java/club/yuit/oauth/boot/filter/BootPictureCodeAuthenticationFilter.java

@@ -1,7 +1,7 @@
 package club.yuit.oauth.boot.filter;
 
 import club.yuit.oauth.boot.support.BootSecurityProperties;
-import club.yuit.oauth.boot.support.code.picture.BootSessionPictureCodeService;
+import club.yuit.oauth.boot.support.code.picture.SessionPictureCodeService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 import org.springframework.util.AntPathMatcher;
@@ -23,9 +23,9 @@ public class BootPictureCodeAuthenticationFilter extends OncePerRequestFilter {
 
     private AntPathMatcher pathMatcher= new AntPathMatcher();
     private BootSecurityProperties properties;
-    private BootSessionPictureCodeService pictureCodeService;
+    private SessionPictureCodeService pictureCodeService;
 
-    public BootPictureCodeAuthenticationFilter(BootSecurityProperties properties, BootSessionPictureCodeService pictureCodeService) {
+    public BootPictureCodeAuthenticationFilter(BootSecurityProperties properties, SessionPictureCodeService pictureCodeService) {
         this.properties = properties;
         this.pictureCodeService = pictureCodeService;
     }

src/main/java/club/yuit/oauth/boot/support/code/BootDefaultVerificationCodeGenerator.java

@@ -26,8 +26,9 @@ public class PictureCodeGenerator implements VerificationCodeGenerator<String> {
     private static  Random random = new Random();
     private HttpServletResponse response;
 
-
-
+    public PictureCodeGenerator(HttpServletResponse response) {
+        this.response = response;
+    }
 
     public   void generator(BootCodeService<String> codeService) throws IOException {
 

src/main/java/club/yuit/oauth/boot/support/code/picture/PictureCodeGenerator.java

@@ -1,5 +1,6 @@
 package club.yuit.oauth.boot.support.code.sms;
 
+import club.yuit.oauth.boot.support.code.BootCodeService;
 import club.yuit.oauth.boot.support.code.VerificationCode;
 import club.yuit.oauth.boot.support.code.VerificationCodeGenerator;
 import org.springframework.web.context.request.ServletWebRequest;
@@ -9,8 +10,9 @@
  * @date 2019/11/20 15:46
  **/
 public class SmsCodeGenerator implements VerificationCodeGenerator {
+
     @Override
-    public VerificationCode generator(ServletWebRequest request) {
-        return null;
+    public void generator(BootCodeService codeService) throws Exception {
+
     }
 }

src/main/java/club/yuit/oauth/boot/support/code/sms/SmsCodeGenerator.java

@@ -6203,8 +6203,6 @@ th.mdui-table-cell-checkbox .mdui-checkbox {
 .mdui-textfield-focus .mdui-textfield-input,
 .mdui-textfield-focus .mdui-textfield-input:hover {
   border-color: #c51162;
-  -webkit-box-shadow: 0 1px 0 0 #c51162;
-          box-shadow: 0 1px 0 0 #c51162;
   cursor: pointer;
 }
 .mdui-textfield-focus .mdui-textfield-label,
@@ -6274,8 +6272,6 @@ th.mdui-table-cell-checkbox .mdui-checkbox {
 .mdui-textfield-invalid.mdui-textfield-focus .mdui-textfield-input,
 .mdui-textfield-invalid-html5.mdui-textfield-focus .mdui-textfield-input {
   border-color: #ff1744 !important;
-  -webkit-box-shadow: 0 1px 0 0 #ff1744 !important;
-          box-shadow: 0 1px 0 0 #ff1744 !important;
 }
 .mdui-textfield-invalid .mdui-textfield-label,
 .mdui-textfield-invalid-html5 .mdui-textfield-label {
@@ -6361,8 +6357,6 @@ th.mdui-table-cell-checkbox .mdui-checkbox {
 .mdui-theme-layout-dark .mdui-textfield-focus .mdui-textfield-input,
 .mdui-theme-layout-dark .mdui-textfield-focus .mdui-textfield-input:hover {
   border-color: #ff4081;
-  -webkit-box-shadow: 0 1px 0 0 #ff4081;
-          box-shadow: 0 1px 0 0 #ff4081;
 }
 .mdui-theme-layout-dark .mdui-textfield-focus .mdui-textfield-label {
   color: #ff4081;

src/main/resources/statics/libs/mdui/css/mdui-1.css

@@ -22,8 +22,8 @@
     }
 </style>
 
-<body class="mdui-theme-primary-indigo mdui-theme-accent-pink mdui-loaded">
-<div class="mdui-container mdui-valign" style="height: 500px ">
+<body class="mdui-theme-primary-purple mdui-theme-accent-purple mdui-loaded">
+<div class="mdui-container mdui-valign" style="height: 600px ">
     <div class="mdui-col-md-6 mdui-col-offset-md-3 mdui-shadow-10 " >
         <div>
             <br>
@@ -40,22 +40,25 @@
             <a href="#social_login" class="mdui-ripple">社交平台登录</a>
         </div>
 
-        <div id="id_login" class="mdui-p-a-2 content mdui-clearfix">
+        <div id="id_login" class="mdui-p-a-2  mdui-clearfix">
 
             <form name="loginForm" method="post" th:action="${loginProcessUrl}">
                 <div class="mdui-container">
                     <div class="mdui-textfield">
                         <input class="mdui-textfield-input" name="username" type="text"  required placeholder="用户名**"/>
+                        <div class="mdui-textfield-error">必填*</div>
                     </div>
 
                     <div class="mdui-textfield">
                         <input class="mdui-textfield-input" name="password" type="password" placeholder="密码**" required/>
+                        <div class="mdui-textfield-error">必填*</div>
                     </div>
 
                     <div class="mdui-row">
                         <div class="mdui-col-md-9">
                             <div class="mdui-textfield">
                                 <input class="mdui-textfield-input" th:name="${pictureCodeParameterName}" type="text" placeholder="验证码**" required/>
+                                <div class="mdui-textfield-error">必填*</div>
                             </div>
 
                         </div>
@@ -69,7 +72,7 @@
                     </div>
                     <br>
                     <div>
-                        <button class="mdui-btn  mdui-btn-raised mdui-btn-block mdui-color-theme-accent mdui-ripple">登 录</button>
+                        <button class="mdui-btn  mdui-btn-raised mdui-btn-block mdui-color-theme-accent mdui-ripple" type="submit">登 录</button>
                     </div>
                 </div>
             </form>
@@ -93,21 +96,23 @@
                             </div>
                         </div>
                         <div class="mdui-col-md-3">
-
+                            <div class="mdui-textfield">
+                                <button class="mdui-btn mdui-btn-raised mdui-color-theme-accent">发送验证码</button>
+                            </div>
                         </div>
                     </div>
 
                     <div>
-                        <button class="mdui-btn mdui-btn-raised mdui-btn-block mdui-ripple mdui-color-theme-accent" disabled>
-                            登 录 （Future）
+                        <button class="mdui-btn mdui-btn-raised mdui-btn-block mdui-ripple mdui-color-theme-accent" type="submit">
+                            登 录
                         </button>
                     </div>
                 </div>
             </form>
         </div>
         <div id="social_login" class="mdui-p-a-2 content">
 
-            social_login
+            social_login  （Future）
         </div>
 
         <p class="mdui-p-a-2" style="color: red;text-align: center" th:if="${param.error}" th:text="${param.error}"></p>