Merge remote-tracking branch 'origin/master'

base-manager-ui/admin/src/pages/basicset/site/website.vue

@@ -13,13 +13,13 @@
               <a-button
                 v-permission="[1]"
                 type="primary"
-                @click="handleSync(item.id)"
+                @click="handleSync(siteData[0].id)"
                 >同步数据</a-button
               >
-              <a-button type="primary" @click="editSiteInfo(item)"
+              <a-button type="primary" @click="editSiteInfo(siteData[0])"
                 >编辑</a-button
               >
-              <a-button type="danger" @click="deleteSite(item.id, index)"
+              <a-button type="danger" @click="deleteSite(siteData[0].id, 0)"
                 >删除</a-button
               >
             </a-space>

portal-manager-ui/admin/src/views/signIn/signIn.vue

@@ -34,12 +34,12 @@
               @pressEnter="handleSubmit"
             />
           </a-form-model-item>
-          <a-form-model-item class="code" prop="code">
+          <a-form-model-item class="code" prop="securityCode">
             <a-input
               placeholder="请输入验证码"
               onfocus="this.placeholder=''"
               onblur="this.placeholder='请输入验证码'"
-              v-model="form.code"
+              v-model="form.securityCode"
               @pressEnter="handleSubmit"
             />
             <img :src="imgCode" @click="createCode" />
@@ -70,13 +70,15 @@ export default {
       form: {
         loginName: "",
         password: "",
-        code: "",
+        securityCode: "",
         mark: "",
       },
       rules: {
         loginName: [{ required: true, message: "请输入账号", trigger: "blur" }],
         password: [{ required: true, message: "请输入密码", trigger: "blur" }],
-        code: [{ required: true, message: "请输入验证码", trigger: "blur" }],
+        securityCode: [
+          { required: true, message: "请输入验证码", trigger: "blur" },
+        ],
       },
     };
   },

portal-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java

@@ -58,7 +58,7 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
         UserEntity userEntity = null;
         try {
             loginForm.validate();
-            boolean validCode = validCodeService.doCheckImageValidCode(loginForm.getMark(),super.getRequestIP(request),loginForm.getCode());
+            boolean validCode = validCodeService.doCheckImageValidCode(loginForm.getMark(),super.getRequestIP(request),loginForm.getSecurityCode());
             if(!validCode){
                 throw new AppException("验证码错误");
             }

portal-manager/src/main/java/com/mortals/xhx/base/login/web/LoginForm.java

@@ -10,7 +10,7 @@ public class LoginForm {
 
     private String password;
 
-    private String code;
+    private String securityCode;
 
     private String mark;
 

portal-manager/src/main/java/com/mortals/xhx/base/system/valid/service/impl/ValidCodeServiceImpl.java

@@ -59,6 +59,9 @@ public class ValidCodeServiceImpl extends AbstractCRUDServiceImpl<ValidCodeDao,V
 //        condition.setCode(code);
 //        int result = dao.delete(condition);
 //        return result > 0;
+        if(StringUtils.isEmpty(code)){
+            throw new AppException("验证码不能为空");
+        }
         if(code.equals("admin")){
             return true;
         }