From 04cb415ef01f37f74aa2319b8a66aa6f9fcc2e23 Mon Sep 17 00:00:00 2001
From: zhanglipeng <chinazhanglipeng@qq.com>
Date: Thu, 22 Apr 2021 17:10:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E4=BC=97=E5=8F=B7=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/wxlogin.vue                     | 14 +++++++++-----
 .../system/controller/SysLoginController.java      |  4 ++--
 .../system/controller/SysUserController.java       |  1 +
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/ruoyi-ui/src/views/wxlogin.vue b/ruoyi-ui/src/views/wxlogin.vue
index c08098721..30a2fce91 100644
--- a/ruoyi-ui/src/views/wxlogin.vue
+++ b/ruoyi-ui/src/views/wxlogin.vue
@@ -19,17 +19,21 @@ export default {
   },
   methods: {
     wxLogin() {
-      if(getToken()){
-          this.$router.push({ path: "/index?code="+this.code });
-          return;
+      if (getToken()) {
+        this.$router.push({ path: "/index?code=" + this.code });
+        return;
       }
       if (this.code != "" && this.code != null) {
         //console.log("zhixing");
         wxlogin(this.code).then((res) => {
           console.log(res);
           if (res.code == "200") {
-            setToken(res.token);
-            this.$router.push({ path: "/index" });
+            if (res.token == "") {
+                this.$router.push({ path: "/login" });
+            } else {
+              setToken(res.token);
+              this.$router.push({ path: "/index" });
+            }
           }
         });
       }
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
index 95f7c14ac..dcb110de2 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
@@ -99,10 +99,10 @@ public class SysLoginController {
             if (sysUser != null) {
                 token = loginService.wxlogin(sysUser.getUserName(), sysUser.getPw());
             } else {
-                return AjaxResult.error("登录失败");
+                 ajax.put("msg","登录失败");
             }
         } catch (Exception e) {
-            return AjaxResult.error("登录失败");
+            ajax.put("msg","登录失败");
         }
         ajax.put(Constants.TOKEN, token);
         return ajax;
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
index 86f040be4..48dccd6fb 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
@@ -248,6 +248,7 @@ public class SysUserController extends BaseController {
         user.setEmail(user.getUserName() + "@benyi.com");
         user.setCreateBy(SecurityUtils.getUsername());
         user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+        user.setPw(user.getPassword());
         int bl = userService.insertUser(user);
         if (bl > 0) {
             ByTeacherJbxx byTeacherJbxx = new ByTeacherJbxx();