From 82cf4e5eb869e93e057af732719c0c6d000d626d Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 28 一月 2026 09:59:29 +0800
Subject: [PATCH] 提交忽略文件
---
server/services/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java | 26 +++++++++++++++++---------
server/services/src/main/resources/application-test.yml | 8 +++++++-
server/services/src/main/resources/application-pro.yml | 9 ++++++++-
server/services/src/main/resources/application-dev.yml | 5 +++++
server/web/src/main/resources/application.yml | 6 +-----
5 files changed, 38 insertions(+), 16 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java b/server/services/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
index ba21070..8f1b81f 100644
--- a/server/services/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/system/impl/SystemLoginServiceImpl.java
@@ -10,6 +10,7 @@
import com.doumee.service.system.SystemLoginLogService;
import com.doumee.service.system.SystemLoginService;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authc.AuthenticationException;
import org.apache.shiro.authc.UsernamePasswordToken;
@@ -27,6 +28,11 @@
@Value("${project.version}")
private String systemVersion;
+ /**
+ * # 鐜锛岀敓浜х幆澧僷roduction锛屽紑鍙戠幆澧僤evelopment
+ */
+ @Value("${project.env}")
+ private String projectEnv;
@Autowired
private CaptchaService captchaService;
@@ -46,15 +52,17 @@
loginLog.setClientInfo(Utils.User_Client.getBrowser(request));
loginLog.setOsInfo(Utils.User_Client.getOS(request));
loginLog.setServerIp(Utils.Server.getIP());
- // 鏍￠獙楠岃瘉鐮�
- try {
- captchaService.check(dto.getUuid(), dto.getCode());
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- loginLog.setReason(e.getMessage().length() > 200 ? (e.getMessage().substring(0, 190) + "...") : e.getMessage());
- loginLog.setSuccess(Boolean.FALSE);
- systemLoginLogService.create(loginLog);
- throw e;
+ if(StringUtils.equals(projectEnv,"development")){
+ // 鏍￠獙楠岃瘉鐮�
+ try {
+ captchaService.check(dto.getUuid(), dto.getCode());
+ } catch (Exception e) {
+ log.error(e.getMessage(), e);
+ loginLog.setReason(e.getMessage().length() > 200 ? (e.getMessage().substring(0, 190) + "...") : e.getMessage());
+ loginLog.setSuccess(Boolean.FALSE);
+ systemLoginLogService.create(loginLog);
+ throw e;
+ }
}
// 鏍￠獙鐢ㄦ埛鍚嶅拰瀵嗙爜
Subject subject = SecurityUtils.getSubject();
diff --git a/server/services/src/main/resources/application-dev.yml b/server/services/src/main/resources/application-dev.yml
index a93f2ff..0742d5e 100644
--- a/server/services/src/main/resources/application-dev.yml
+++ b/server/services/src/main/resources/application-dev.yml
@@ -83,5 +83,10 @@
upload:
type: ftp
+project:
+ # 鐜锛岀敓浜х幆澧僷roduction锛屽紑鍙戠幆澧僤evelopment
+ env: development
+ # 妯″紡锛宼esting娴嬭瘯妯″紡
+ mode: testing
diff --git a/server/services/src/main/resources/application-pro.yml b/server/services/src/main/resources/application-pro.yml
index b4f7782..d917011 100644
--- a/server/services/src/main/resources/application-pro.yml
+++ b/server/services/src/main/resources/application-pro.yml
@@ -91,4 +91,11 @@
type: blob
qiwei:
- serviceurl: https://wecom-qyapi.unilever-china.com/
\ No newline at end of file
+ serviceurl: https://wecom-qyapi.unilever-china.com/
+
+
+project:
+ # 鐜锛岀敓浜х幆澧僷roduction锛屽紑鍙戠幆澧僤evelopment
+ env: production
+ # 妯″紡锛宼esting娴嬭瘯妯″紡
+ mode: production
\ No newline at end of file
diff --git a/server/services/src/main/resources/application-test.yml b/server/services/src/main/resources/application-test.yml
index cbd34a7..10ab350 100644
--- a/server/services/src/main/resources/application-test.yml
+++ b/server/services/src/main/resources/application-test.yml
@@ -113,4 +113,10 @@
type: blob
qiwei:
- serviceurl: https://qyapi.weixin.qq.com
\ No newline at end of file
+ serviceurl: https://qyapi.weixin.qq.com
+
+project:
+ # 鐜锛岀敓浜х幆澧僷roduction锛屽紑鍙戠幆澧僤evelopment
+ env: production
+ # 妯″紡锛宼esting娴嬭瘯妯″紡
+ mode: testing
\ No newline at end of file
diff --git a/server/web/src/main/resources/application.yml b/server/web/src/main/resources/application.yml
index 17dde0d..04b0236 100644
--- a/server/web/src/main/resources/application.yml
+++ b/server/web/src/main/resources/application.yml
@@ -3,12 +3,8 @@
port: 10011
# 椤圭洰淇℃伅閰嶇疆
project:
- name: 杩戝揩
+ name: 蹇楅偊鐐瑰皢
version: 1.0.0
- # 鐜锛岀敓浜х幆澧僷roduction锛屽紑鍙戠幆澧僤evelopment
- env: development
- # 妯″紡锛宼esting娴嬭瘯妯″紡
- mode: testing
spring:
profiles:
--
Gitblit v1.9.3