From 7b7e2cb0a59221fd0e7f77a471bd22e42ece4911 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期四, 25 五月 2023 10:44:30 +0800
Subject: [PATCH] 导出中英文切换日志
---
src/main/java/com/whyc/filter/AccessFilter.java | 3
src/main/java/com/whyc/util/CommonUtil.java | 50 +++++++-----
src/main/java/com/whyc/service/LoginService.java | 42 +---------
src/main/resources/config/application-dev.yml | 2
src/main/java/com/whyc/aop/OperationLogAspect.java | 11 +-
src/main/java/com/whyc/service/UserLogService.java | 17 ++-
src/main/java/com/whyc/service/OperationLogService.java | 6 +
src/main/java/com/whyc/exception/CustomExceptionResultHandler.java | 14 ---
src/main/java/com/whyc/pojo/UserLog.java | 23 +++++
src/main/java/com/whyc/pojo/OperationLog.java | 23 +++++
10 files changed, 100 insertions(+), 91 deletions(-)
diff --git a/src/main/java/com/whyc/aop/OperationLogAspect.java b/src/main/java/com/whyc/aop/OperationLogAspect.java
index c2f5e89..dce713b 100644
--- a/src/main/java/com/whyc/aop/OperationLogAspect.java
+++ b/src/main/java/com/whyc/aop/OperationLogAspect.java
@@ -124,13 +124,10 @@
}
String operationMsg = "鎵ц浜�" + className + "鐨�" + operationTypeName + "鎿嶄綔.";
String operationDetail = "鍏蜂綋璋冪敤鏂规硶涓�:" + methodName + ",鍏蜂綋鍙傛暟涓�:" + map.toString();
- //鏍规嵁褰撳墠鐨勮瑷�鐜璁剧疆涓嶅悓鐨勬棩蹇楄褰�
- String lang = ActionUtil.getLang();
- if (!lang.contains("zh")) {
- operationMsg = "executed:" + className + " " + operationTypeNameEn + " operation ";
- operationDetail = "Specific calling method is " + methodName + ",Specific parameters are " + map.toString();
- }
- service.record(uId, operationType, operationTime, terminalIp, operationMsg, operationDetail);
+ String operationMsgEnUs = "executed:" + className + " " + operationTypeNameEn + " operation ";
+ String operationDetailEnUs = "Specific calling method is " + methodName + ",Specific parameters are " + map.toString();
+
+ service.record(uId, operationType, operationTime, terminalIp, operationMsg, operationDetail, operationMsgEnUs, operationDetailEnUs);
}
}
diff --git a/src/main/java/com/whyc/exception/CustomExceptionResultHandler.java b/src/main/java/com/whyc/exception/CustomExceptionResultHandler.java
index 2e0ea9f..8e628dc 100644
--- a/src/main/java/com/whyc/exception/CustomExceptionResultHandler.java
+++ b/src/main/java/com/whyc/exception/CustomExceptionResultHandler.java
@@ -27,21 +27,11 @@
public Response sendErrorResponse2Defined(Exception e, HttpServletResponse response, HttpServletRequest request){
String exceptionStr = e.toString();
String requestURI = request.getRequestURI();
- //鏍规嵁褰撳墠鐨勮瑷�鐜璁剧疆涓嶅悓鐨勬棩蹇楄褰�
- String lang = ActionUtil.getLang();
//鍗曢」鎻愬彇-鐧诲綍瓒呮椂
if (exceptionStr.contains("login") && exceptionStr.contains("imeout")) {
- if (lang.contains("zh")) {
- CommonUtil.record(ActionUtil.getUser().getUId(), UserOperation.TYPE_LOGIN_TIMEOUT.getType(), "鐧诲綍璇锋眰瓒呮椂", "寮傚父淇℃伅:" + exceptionStr);
- } else {
- CommonUtil.record(ActionUtil.getUser().getUId(), UserOperation.TYPE_LOGIN_TIMEOUT.getType(), UserOperation.TYPE_LOGIN_TIMEOUT.getTypeNameEn(), "exception message:" + exceptionStr);
- }
+ CommonUtil.record(ActionUtil.getUser().getUId(), UserOperation.TYPE_LOGIN_TIMEOUT.getType(), "鐧诲綍璇锋眰瓒呮椂", "寮傚父淇℃伅:" + exceptionStr, UserOperation.TYPE_LOGIN_TIMEOUT.getTypeNameEn(), "exception message:" + exceptionStr);
} else {
- if (lang.contains("zh")) {
- CommonUtil.record(ActionUtil.getUser().getUId(), UserOperation.TYPE_EXCEPTION.getType(), "鎺ュ彛璋冪敤寮傚父:璋冪敤鎺ュ彛" + requestURI + "鍙戠敓閿欒:" + exceptionStr);
- } else {
- CommonUtil.record(ActionUtil.getUser().getUId(), UserOperation.TYPE_EXCEPTION.getType(), UserOperation.TYPE_EXCEPTION.getTypeNameEn() + "Call Interface:" + requestURI + "error occurred:" + exceptionStr);
- }
+ CommonUtil.record(ActionUtil.getUser().getUId(), UserOperation.TYPE_EXCEPTION.getType(), "鎺ュ彛璋冪敤寮傚父:璋冪敤鎺ュ彛" + requestURI + "鍙戠敓閿欒:" + exceptionStr, UserOperation.TYPE_EXCEPTION.getTypeNameEn() + "Call Interface:" + requestURI + "error occurred:" + exceptionStr);
}
return new Response().setII(0, "鎺ュ彛璇锋眰寮傚父,璇疯仈绯昏蒋浠朵汉鍛樿繘琛屽鐞�.寮傚父淇℃伅" + exceptionStr);
}
diff --git a/src/main/java/com/whyc/filter/AccessFilter.java b/src/main/java/com/whyc/filter/AccessFilter.java
index f487214..3673ecd 100644
--- a/src/main/java/com/whyc/filter/AccessFilter.java
+++ b/src/main/java/com/whyc/filter/AccessFilter.java
@@ -150,7 +150,8 @@
if (user == null) {
//瓒婃潈璁块棶
//CommonUtil.record(0, UserOperation.TYPE_UNAUTHORIZED_ACCESS.getType(), "瓒婃潈璁块棶", "瓒婃潈璁块棶鎺ュ彛:" + requestURI);
- CommonUtil.record2(request, 0, UserOperation.TYPE_UNAUTHORIZED_ACCESS.getType(), "瓒婃潈璁块棶", "瓒婃潈璁块棶鎺ュ彛:" + requestURI);
+ CommonUtil.record2(request, 0, UserOperation.TYPE_UNAUTHORIZED_ACCESS.getType()
+ , "瓒婃潈璁块棶", "瓒婃潈璁块棶鎺ュ彛:" + requestURI, "Unauthorized access", "Unauthorized access interface:" + requestURI);
response.setStatus(401);
response.setContentType("text/html;charset=utf-8");
response.getWriter().write("闈炴硶璇锋眰锛岃韩浠芥湭楠岃瘉");
diff --git a/src/main/java/com/whyc/pojo/OperationLog.java b/src/main/java/com/whyc/pojo/OperationLog.java
index e5838c4..51083b3 100644
--- a/src/main/java/com/whyc/pojo/OperationLog.java
+++ b/src/main/java/com/whyc/pojo/OperationLog.java
@@ -22,12 +22,17 @@
private String terminalIp;
@TableField("uOprateMsg")
private String operationMsg;
+ @TableField("uOprateMsgEnUs")
+ private String operationMsgEnUs;
private String operationDetail;
+ private String operationDetailEnUs;
+
public OperationLog() {
}
- public OperationLog(Long num, Integer uId, Integer operationType, Date operationTime, String terminalIp, String operationMsg, String operationDetail) {
+ public OperationLog(Long num, Integer uId, Integer operationType, Date operationTime, String terminalIp
+ , String operationMsg, String operationDetail, String operationMsgEnUs, String operationDetailEnUs) {
this.num = num;
this.uId = uId;
this.operationType = operationType;
@@ -92,4 +97,20 @@
public void setOperationDetail(String operationDetail) {
this.operationDetail = operationDetail;
}
+
+ public String getOperationMsgEnUs() {
+ return operationMsgEnUs;
+ }
+
+ public void setOperationMsgEnUs(String operationMsgEnUs) {
+ this.operationMsgEnUs = operationMsgEnUs;
+ }
+
+ public String getOperationDetailEnUs() {
+ return operationDetailEnUs;
+ }
+
+ public void setOperationDetailEnUs(String operationDetailEnUs) {
+ this.operationDetailEnUs = operationDetailEnUs;
+ }
}
diff --git a/src/main/java/com/whyc/pojo/UserLog.java b/src/main/java/com/whyc/pojo/UserLog.java
index b34adac..dbf5b99 100644
--- a/src/main/java/com/whyc/pojo/UserLog.java
+++ b/src/main/java/com/whyc/pojo/UserLog.java
@@ -19,7 +19,7 @@
@TableField("uOprateType")
private Integer operationType;
@TableField("uOprateDay")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "Asia/Shanghai")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
private Date operationTime;
@TableField("uTerminalIp")
private String terminalIp;
@@ -27,9 +27,12 @@
private String operationMsg;
private String operationDetail;
private Integer readFlag;
+ @TableField("uOprateMsgEnUs")
+ private String operationMsgEnUs;
+ private String operationDetailEnUs;
@TableField(exist = false)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "Asia/Shanghai")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai")
private Date operationTime2;
@TableField(exist = false)
private String operationTypeStr;
@@ -143,4 +146,20 @@
public void setRecordYear(String recordYear) {
this.recordYear = recordYear;
}
+
+ public String getOperationMsgEnUs() {
+ return operationMsgEnUs;
+ }
+
+ public void setOperationMsgEnUs(String operationMsgEnUs) {
+ this.operationMsgEnUs = operationMsgEnUs;
+ }
+
+ public String getOperationDetailEnUs() {
+ return operationDetailEnUs;
+ }
+
+ public void setOperationDetailEnUs(String operationDetailEnUs) {
+ this.operationDetailEnUs = operationDetailEnUs;
+ }
}
diff --git a/src/main/java/com/whyc/service/LoginService.java b/src/main/java/com/whyc/service/LoginService.java
index 7f599db..d35da04 100644
--- a/src/main/java/com/whyc/service/LoginService.java
+++ b/src/main/java/com/whyc/service/LoginService.java
@@ -162,14 +162,7 @@
} else {
servletContext.setAttribute(userName + "_login_fail_times_" + System.currentTimeMillis(), 0);
}
- //鏍规嵁褰撳墠鐨勮瑷�鐜璁剧疆涓嶅悓鐨勬棩蹇楄褰�
- String lang = ActionUtil.getLang();
- if (lang.contains("zh")) {
- CommonUtil.record(0, UserOperation.TYPE_LOGIN_FAIL.getType(), UserOperation.TYPE_LOGIN_FAIL.getTypeName());
- } else {
- CommonUtil.record(0, UserOperation.TYPE_LOGIN_FAIL.getType(), UserOperation.TYPE_LOGIN_FAIL.getTypeNameEn());
- }
-
+ CommonUtil.record(0, UserOperation.TYPE_LOGIN_FAIL.getType(), UserOperation.TYPE_LOGIN_FAIL.getTypeName(), UserOperation.TYPE_LOGIN_FAIL.getTypeNameEn());
return response.set(1, false, MessageUtils.getMessage("PasswordError"));
}
return response.set(1, false, message);
@@ -294,14 +287,7 @@
//鏌ヨ婵�娲荤殑鍦板浘
String mapName = mapOutlineService.selectMapName();
dataList.add(mapName);
- //鏍规嵁褰撳墠鐨勮瑷�鐜璁剧疆涓嶅悓鐨勬棩蹇楄褰�
- String lang = ActionUtil.getLang();
- if (lang.contains("zh")) {
- CommonUtil.record(((UserInf) subject.getPrincipal()).getUId(), UserOperation.TYPE_LOGIN.getType(), UserOperation.TYPE_LOGIN.getTypeName());
- } else {
- CommonUtil.record(((UserInf) subject.getPrincipal()).getUId(), UserOperation.TYPE_LOGIN.getType(), UserOperation.TYPE_LOGIN.getTypeNameEn());
- }
-
+ CommonUtil.record(((UserInf) subject.getPrincipal()).getUId(), UserOperation.TYPE_LOGIN.getType(), UserOperation.TYPE_LOGIN.getTypeName(), UserOperation.TYPE_LOGIN.getTypeNameEn());
return new Response<>().setII(1, true, dataList, MessageUtils.getMessage("LoginSucceeded"));
}
return new Response().set(1, false, MessageUtils.getMessage("AuthenticationFailed"));
@@ -369,13 +355,7 @@
} else {
servletContext.setAttribute(userName + "_login_fail_times_" + System.currentTimeMillis(), 0);
}
- //鏍规嵁褰撳墠鐨勮瑷�鐜璁剧疆涓嶅悓鐨勬棩蹇楄褰�
- String lang = ActionUtil.getLang();
- if (lang.contains("zh")) {
- CommonUtil.record(0, UserOperation.TYPE_LOGIN_FAIL.getType(), UserOperation.TYPE_LOGIN_FAIL.getTypeName());
- } else {
- CommonUtil.record(0, UserOperation.TYPE_LOGIN_FAIL.getType(), UserOperation.TYPE_LOGIN_FAIL.getTypeNameEn());
- }
+ CommonUtil.record(0, UserOperation.TYPE_LOGIN_FAIL.getType(), UserOperation.TYPE_LOGIN_FAIL.getTypeName(), UserOperation.TYPE_LOGIN_FAIL.getTypeNameEn());
return response.set(1, false, "瀵嗙爜閿欒");
}
return response.set(1, false, message);
@@ -499,13 +479,7 @@
int permitGroupId = permitGroup.getPermitGroupId();
dataList.add(permitGroupId);
}
- //鏍规嵁褰撳墠鐨勮瑷�鐜璁剧疆涓嶅悓鐨勬棩蹇楄褰�
- String lang = ActionUtil.getLang();
- if (lang.contains("zh")) {
- CommonUtil.record(((UserInf) subject.getPrincipal()).getUId(), UserOperation.TYPE_LOGIN.getType(), UserOperation.TYPE_LOGIN.getTypeName());
- } else {
- CommonUtil.record(((UserInf) subject.getPrincipal()).getUId(), UserOperation.TYPE_LOGIN.getType(), UserOperation.TYPE_LOGIN.getTypeNameEn());
- }
+ CommonUtil.record(((UserInf) subject.getPrincipal()).getUId(), UserOperation.TYPE_LOGIN.getType(), UserOperation.TYPE_LOGIN.getTypeName(), UserOperation.TYPE_LOGIN.getTypeNameEn());
return new Response<>().setII(1, true, dataList, "鐧诲綍鎴愬姛");
}
return new Response<>().set(1,false,"瀵嗙爜閿欒");
@@ -692,13 +666,7 @@
int permitGroupId = permitGroup.getPermitGroupId();
dataList.add(permitGroupId);
}
- //鏍规嵁褰撳墠鐨勮瑷�鐜璁剧疆涓嶅悓鐨勬棩蹇楄褰�
- String lang = ActionUtil.getLang();
- if (lang.contains("zh")) {
- CommonUtil.record(((UserInf) subject.getPrincipal()).getUId(), UserOperation.TYPE_LOGIN_NO_PASS.getType(), UserOperation.TYPE_LOGIN_NO_PASS.getTypeName());
- } else {
- CommonUtil.record(((UserInf) subject.getPrincipal()).getUId(), UserOperation.TYPE_LOGIN_NO_PASS.getType(), UserOperation.TYPE_LOGIN_NO_PASS.getTypeNameEn());
- }
+ CommonUtil.record(((UserInf) subject.getPrincipal()).getUId(), UserOperation.TYPE_LOGIN_NO_PASS.getType(), UserOperation.TYPE_LOGIN_NO_PASS.getTypeName(), UserOperation.TYPE_LOGIN_NO_PASS.getTypeNameEn());
return new Response<>().setII(1, true, dataList, "鐧诲綍鎴愬姛");
}
return new Response().set(1,false,"璁よ瘉鏈�氳繃");
diff --git a/src/main/java/com/whyc/service/OperationLogService.java b/src/main/java/com/whyc/service/OperationLogService.java
index 48711f6..32bec94 100644
--- a/src/main/java/com/whyc/service/OperationLogService.java
+++ b/src/main/java/com/whyc/service/OperationLogService.java
@@ -13,8 +13,10 @@
@Resource
private OperationLogMapper mapper;
- public void record(Long uId, Integer operationType, Date operationTime, String terminalIp, String operationMsg, String operationDetail) {
- OperationLog operationLog = new OperationLog(null, uId.intValue(), operationType, operationTime, terminalIp, operationMsg, operationDetail);
+ public void record(Long uId, Integer operationType, Date operationTime, String terminalIp
+ , String operationMsg, String operationDetail, String operationMsgEnUs, String operationDetailEnUs) {
+ OperationLog operationLog = new OperationLog(null, uId.intValue(), operationType, operationTime, terminalIp
+ , operationMsg, operationDetail, operationMsgEnUs, operationDetailEnUs);
mapper.insert(operationLog);
}
}
diff --git a/src/main/java/com/whyc/service/UserLogService.java b/src/main/java/com/whyc/service/UserLogService.java
index 5a6d2d8..f24fae5 100644
--- a/src/main/java/com/whyc/service/UserLogService.java
+++ b/src/main/java/com/whyc/service/UserLogService.java
@@ -136,38 +136,43 @@
ExcelUtil.exportExcel("UserLog-" + now, "sheet1", columnTitleArr, value, new HSSFWorkbook(), response);
}
- public void record(long uId, int operationType, String msg) {
+ public void record(long uId, int operationType, String msg, String msgEnUS) {
UserLog userLog = new UserLog();
userLog.setTerminalIp(ActionUtil.getRequest().getRemoteAddr());
//userLog.setTerminalIp(request.getRemoteAddr());
userLog.setOperationTime(new Date());
- userLog.setUId((int)(uId));
+ userLog.setUId((int) (uId));
userLog.setOperationType(operationType);
userLog.setOperationMsg(msg);
+ userLog.setOperationMsgEnUs(msgEnUS);
mapper.insert(userLog);
}
- public void record(long uId, int operationType, String msg,String msgDetail) {
+ public void record(long uId, int operationType, String msg, String msgDetail, String msgEnUs, String msgDetailEnUs) {
UserLog userLog = new UserLog();
userLog.setTerminalIp(ActionUtil.getRequest().getRemoteAddr());
//userLog.setTerminalIp(request.getRemoteAddr());
userLog.setOperationTime(new Date());
- userLog.setUId((int)(uId));
+ userLog.setUId((int) (uId));
userLog.setOperationType(operationType);
userLog.setOperationMsg(msg);
userLog.setOperationDetail(msgDetail);
+ userLog.setOperationMsg(msgEnUs);
+ userLog.setOperationDetail(msgDetailEnUs);
mapper.insert(userLog);
}
- public void record2(HttpServletRequest request,long uId, int operationType, String msg,String msgDetail) {
+ public void record2(HttpServletRequest request, long uId, int operationType, String msg, String msgDetail, String msgEnUs, String msgDetailEnUs) {
UserLog userLog = new UserLog();
userLog.setTerminalIp(request.getRemoteAddr());
//userLog.setTerminalIp(request.getRemoteAddr());
userLog.setOperationTime(new Date());
- userLog.setUId((int)(uId));
+ userLog.setUId((int) (uId));
userLog.setOperationType(operationType);
userLog.setOperationMsg(msg);
userLog.setOperationDetail(msgDetail);
+ userLog.setOperationMsg(msgEnUs);
+ userLog.setOperationDetail(msgDetailEnUs);
mapper.insert(userLog);
}
diff --git a/src/main/java/com/whyc/util/CommonUtil.java b/src/main/java/com/whyc/util/CommonUtil.java
index d3133c8..c08e36b 100644
--- a/src/main/java/com/whyc/util/CommonUtil.java
+++ b/src/main/java/com/whyc/util/CommonUtil.java
@@ -7,7 +7,6 @@
import org.springframework.boot.system.ApplicationHome;
import org.springframework.stereotype.Component;
-import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.io.File;
import java.text.ParseException;
@@ -62,42 +61,49 @@
ApplicationHome applicationHome = new ApplicationHome(CommonUtil.class);
File jarFile = applicationHome.getDir();
String baseDirPath;
- if(YamlProperties.runModel == 1) {
+ if (YamlProperties.runModel == 1) {
//寮�鍙戣矾寰�
baseDirPath = jarFile.getParentFile().toString();
- }else {
+ } else {
//鎵撳寘璺緞
baseDirPath = jarFile.toString();
}
return baseDirPath;
}
- /**鎵嬪姩璁板綍鐗瑰畾鏃ュ織*/
- public static void record(long uId, int operationType, String msg){
- userLogService.record(uId,operationType,msg);
- }
-
- /**鎵嬪姩璁板綍鐗瑰畾鏃ュ織*/
- public static void record(long uId, int operationType, String msg,String msgDetail){
- userLogService.record(uId,operationType,msg,msgDetail);
- }
- /**鎵嬪姩璁板綍鐗瑰畾鏃ュ織*/
- public static void record2(HttpServletRequest request,long uId, int operationType, String msg,String msgDetail){
- userLogService.record2(request,uId,operationType,msg,msgDetail);
+ /**
+ * 鎵嬪姩璁板綍鐗瑰畾鏃ュ織
+ */
+ public static void record(long uId, int operationType, String msg, String msgEnUs) {
+ userLogService.record(uId, operationType, msg, msgEnUs);
}
/**
- *
+ * 鎵嬪姩璁板綍鐗瑰畾鏃ュ織
+ */
+ public static void record(long uId, int operationType, String msg, String msgDetail, String msgEnUs, String msgDetailEnUs) {
+ userLogService.record(uId, operationType, msg, msgDetail, msgEnUs, msgDetailEnUs);
+ }
+
+ /**
+ * 鎵嬪姩璁板綍鐗瑰畾鏃ュ織
+ */
+ public static void record2(HttpServletRequest request, long uId, int operationType, String msg, String msgDetail, String msgEnUs, String msgDetailEnUs) {
+ userLogService.record2(request, uId, operationType, msg, msgDetail, msgEnUs, msgDetailEnUs);
+ }
+
+ /**
* 鍦ㄥ垎琛ㄧ殑鎯呭喌涓嬩娇鐢�,鎸夊勾鍒嗚〃,鏌ヨ闇�瑕佸垏鍓叉煡璇娇鐢�
- *
+ * <p>
* 鏍规嵁浼犲叆鐨勮捣姝㈡椂闂�,鎸夌収骞村垏鍓叉垚涓嶅悓鏃堕棿娈�
+ *
* @param startTimeStr 2021-01-01 10:00:00
- * @param endTimeStr 2023-05-01 10:10:10
- * @return 绀轰緥[2021,2022,2023]
+ * @param endTimeStr 2023-05-01 10:10:10
+ * @return 绀轰緥[2021, 2022, 2023]
* 浣跨敤鏂规硶:
- * 鏍规嵁杩斿洖鐨勭涓�涓暟鎹�,濡傛灉瀛樺湪琛�,鍒欐煡璇㈢瓫閫夋潯浠朵负>=杈撳叆鐨勮捣濮嬫椂闂�;涓嶅瓨鍦ㄥ垯寮冪敤杈撳叆鐨勮捣濮嬫椂闂�
- * 鏍规嵁杩斿洖鐨勬渶鍚庝釜鏁版嵁,濡傛灉琛ㄥ瓨鍦�,鍒欐煡璇㈢瓫閫夋潯浠朵负<=杈撳叆鐨勭粓姝㈡椂闂�;涓嶅瓨鍦ㄥ垯寮冪敤杈撳叆鐨勭粓姝㈡椂闂�
- * 杩斿洖鐨勯潪绗竴鏈�鍚庢暟鎹�,鏌ヨ鍏ㄨ〃
+ * 鏍规嵁杩斿洖鐨勭涓�涓暟鎹�,濡傛灉瀛樺湪琛�,鍒欐煡璇㈢瓫閫夋潯浠朵负>=杈撳叆鐨勮捣濮嬫椂闂�;涓嶅瓨鍦ㄥ垯寮冪敤杈撳叆鐨勮捣濮嬫椂闂�
+ * 鏍规嵁杩斿洖鐨勬渶鍚庝釜鏁版嵁,濡傛灉琛ㄥ瓨鍦�,鍒欐煡璇㈢瓫閫夋潯浠朵负<=杈撳叆鐨勭粓姝㈡椂闂�;涓嶅瓨鍦ㄥ垯寮冪敤杈撳叆鐨勭粓姝㈡椂闂�
+ * 杩斿洖鐨勯潪绗竴鏈�鍚庢暟鎹�,鏌ヨ鍏ㄨ〃
*/
public static List<Integer> getYearList(String startTimeStr,String endTimeStr) throws ParseException {
Integer startYear = Integer.valueOf(startTimeStr.split("-")[0]);
diff --git a/src/main/resources/config/application-dev.yml b/src/main/resources/config/application-dev.yml
index 2d75c6d..f7c5752 100644
--- a/src/main/resources/config/application-dev.yml
+++ b/src/main/resources/config/application-dev.yml
@@ -20,7 +20,7 @@
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://192.168.10.79:3360/db_user?characterEncoding=utf8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&rewriteBatchedStatements=true
+ url: jdbc:mysql://192.168.10.250:3360/db_user?characterEncoding=utf8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&rewriteBatchedStatements=true
# url: jdbc:mysql://192.168.10.80:3360/db_user?characterEncoding=utf8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&rewriteBatchedStatements=true
# url: jdbc:mysql://118.89.139.230:3360/db_user?characterEncoding=utf8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&rewriteBatchedStatements=true
username: root
--
Gitblit v1.9.1