From a0ae0afef6b304fbe008bf1cd7edc9b7115db22a Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 16 Jan 2024 17:19:04 +0800
Subject: [PATCH] 数据库配置
---
src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java | 2 +-
src/main/resources/application-test.yml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
index 9180929..21a8e68 100644
--- a/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
+++ b/src/main/java/org/springblade/modules/evaluate/controller/EvaluateTaskController.java
@@ -180,7 +180,7 @@
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入evaluateTask")
public R submit(@Valid @RequestBody EvaluateTaskEntity evaluateTask) {
- if (DateUtils.isToday(evaluateTask.getEvaluateCutoffTimeStart())) {//是否今天开始
+ if (null != evaluateTask.getEvaluateCutoffTimeStart() && DateUtils.isToday(evaluateTask.getEvaluateCutoffTimeStart())) {//是否今天开始
evaluateTask.setEvaluateState(1);
}
return R.status(evaluateTaskService.saveOrUpdate(evaluateTask));
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 465eed1..ee4b7b9 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -13,9 +13,9 @@
# commandTimeout: 5000
datasource:
# MySql
- url: jdbc:mysql://139.196.94.172:3306/zttj_test?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+ url: jdbc:mysql://182.108.40.114:3308/zttj_test?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
username: root
- password: jxpskj_2018
+ password: yshb@123
#第三方登陆
social:
--
Gitblit v1.9.3