From 5f128805c630255ede489ec0bb740c73478b5752 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Tue, 24 Nov 2020 09:19:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=AF=E5=90=A6=E9=AA=8C=E8=AF=81=E7=9F=AD?=
 =?UTF-8?q?=E4=BF=A1=E9=AA=8C=E8=AF=81=E7=A0=81=E9=85=8D=E7=BD=AE=E5=88=B0?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=88=91=E5=91=A2=E8=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lz/modules/sys/controller/SysLoginController.java     | 4 +++-
 src/main/java/com/lz/modules/sys/oauth2/OAuth2Filter.java     | 2 +-
 src/main/resources/application-dev.yml                        | 2 ++
 src/main/resources/application-prod.yml                       | 3 ++-
 src/main/resources/application-test.yml                       | 3 ++-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/lz/modules/sys/controller/SysLoginController.java b/src/main/java/com/lz/modules/sys/controller/SysLoginController.java
index 53a71492..7b833e10 100644
--- a/src/main/java/com/lz/modules/sys/controller/SysLoginController.java
+++ b/src/main/java/com/lz/modules/sys/controller/SysLoginController.java
@@ -75,6 +75,8 @@ public class SysLoginController extends AbstractController {
 
     @Autowired
     private StaffService staffService;
+    @Value(value = "${sms.code}")
+    private boolean sendSMSCode;
 
     /**
      * 验证码
@@ -201,7 +203,7 @@ public class SysLoginController extends AbstractController {
             }
         }
         //测试环境将不进行短信验证码，
-        if (true) {
+        if (!sendSMSCode) {
             //账号不存在、密码错误
             if (!user.getPassword().equals(new Sha256Hash(form.getPassword(), user.getSalt()).toHex())) {
                 return R.error("密码不正确!");
diff --git a/src/main/java/com/lz/modules/sys/oauth2/OAuth2Filter.java b/src/main/java/com/lz/modules/sys/oauth2/OAuth2Filter.java
index 91b5e54a..ab61ede1 100644
--- a/src/main/java/com/lz/modules/sys/oauth2/OAuth2Filter.java
+++ b/src/main/java/com/lz/modules/sys/oauth2/OAuth2Filter.java
@@ -62,7 +62,7 @@ public class OAuth2Filter extends AuthenticatingFilter {
             httpResponse.setHeader("Access-Control-Allow-Credentials", "true");
             httpResponse.setHeader("Access-Control-Allow-Origin", HttpContextUtils.getOrigin());
 
-            String json = new Gson().toJson(R.error(HttpStatus.SC_UNAUTHORIZED, "登录已过期，请重新登录"));
+            String json = new Gson().toJson(R.error(HttpStatus.SC_UNAUTHORIZED, "invalid token"));
             httpResponse.getWriter().print(json);
 
             return false;
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index a33a1510..70cd2e92 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -35,6 +35,8 @@ dingtalk:
     appid: 855818566
 domain:
     main: "http://192.168.43.94:8001"
+sms:
+    code: false
 
 ##多数据源的配置
 #dynamic:
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index b6ac0e3a..964f818f 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -34,7 +34,8 @@ dingtalk:
     appid: 856016278
 domain:
     main: "https://lzmanagement.ldxinyong.com"
-
+sms:
+    code: true
 ##多数据源的配置
 #dynamic:
 #  datasource:
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 6552c314..91fd96e5 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -34,7 +34,8 @@ dingtalk:
     appid: 855818566
 domain:
     main: "http:/localhost"
-
+sms:
+    code: false
 
 
 ##多数据源的配置