From 59c5aca4966f6cb4dd052b3840b4ad54a0267c1e Mon Sep 17 00:00:00 2001
From: m1991 <shenglonghua@1rock.net>
Date: Wed, 17 Mar 2021 19:13:16 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=A8=A1=E5=9D=97=E2=80=94?=
 =?UTF-8?q?=E2=80=94=E7=94=A8=E6=88=B7=E9=80=80=E5=87=BA-=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/wisenergy/service/app/impl/UploadServiceImpl.java | 2 +-
 .../java/cn/wisenergy/service/app/impl/UserServiceImpl.java   | 4 ++--
 .../wisenergy/web/admin/controller/app/LoginController.java   | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UploadServiceImpl.java b/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UploadServiceImpl.java
index bcfa063..be223f5 100644
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UploadServiceImpl.java
+++ b/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UploadServiceImpl.java
@@ -176,7 +176,7 @@ public class UploadServiceImpl implements UploadService {
                 System.out.println("上传图片为空，请重新上传");
                 Map map=new HashMap();
                 map.put("code",0);
-                map.put("msg","上传视频为空，请重新上传");
+                map.put("msg","上传图片为空，请重新上传");
              return map;
 
             }
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserServiceImpl.java b/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserServiceImpl.java
index 8fd3974..75a56b3 100644
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserServiceImpl.java
+++ b/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserServiceImpl.java
@@ -109,9 +109,9 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
         //查询数据库，看看是否存在该用户
         User byUserId = usersMapper.getByUserId(userId);
         if (null != byUserId) {
-            R.error(0, "该用户已存在！请直接登录！");
+            R.error(1, "该用户已存在！请直接登录！");
             Map map = new HashMap();
-            map.put("code", 0);
+            map.put("code", 1);
             map.put("msg", "该用户已存在！请直接登录！");
             return map;
         }
diff --git a/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/LoginController.java b/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/LoginController.java
index 3b6c749..50d90ca 100644
--- a/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/LoginController.java
+++ b/wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/LoginController.java
@@ -223,6 +223,7 @@ public class LoginController {
         return result;
     }
 
+
     @ApiOperation(value = "用户注册", notes = "用户注册", httpMethod = "POST")
     @ApiImplicitParam(name = "userVo", value = "用户信息", dataType = "UserRegisterVo")
     @PostMapping("/userRegister")
-- 
2.18.1