From f54e9c208c4988fd3df4fecc7a1b1ae54eb708de Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期日, 08 十月 2023 08:57:59 +0800
Subject: [PATCH] 业务数据已处理，数据库连接问题已处理
---
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportCheckTaskFromWorkDTO.java | 2
src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java | 2
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskAnaUnit.java | 138 --------
src/main/java/com/ruoyi/doublePrevention/scheduls/ExecCJReportDateSchedule.java | 2
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskEvent.java | 122 -------
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportDangerInfoDTO.java | 3
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskEventDTO.java | 73 ----
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskControlMeasure.java | 155 ----------
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskControlMeasureDTO.java | 114 -------
/dev/null | 115 -------
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportCheckRecordFromTaskDTO.java | 24 -
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskAnaUnitDTO.java | 88 -----
src/main/resources/application-dev.yml | 6
src/main/resources/application.yml | 5
14 files changed, 28 insertions(+), 821 deletions(-)
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportCheckRecordFromTaskDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportCheckRecordFromTaskDTO.java
index 314b3d8..9fff10f 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportCheckRecordFromTaskDTO.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportCheckRecordFromTaskDTO.java
@@ -33,29 +33,5 @@
*/
private String createByMobile;
-
-
-// /**
-// * 排 查 结 果
-// */
-// private String checkStatus;
-// /**
-// * 修改人手机号
-// */
-// private String updateByMobile;
-// /**
-// * 创建时间
-// */
-// private String createDate;
-// /**
-// * 最后修改时间
-// */
-// private String updateDate;
-// /**
-// * 修改人
-// */
-// private String updateBy;
-
-
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportCheckTaskFromWorkDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportCheckTaskFromWorkDTO.java
index 06b91e8..11aad32 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportCheckTaskFromWorkDTO.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportCheckTaskFromWorkDTO.java
@@ -1,10 +1,8 @@
package com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO;
-import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.io.Serializable;
-import java.util.Date;
@Data
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportDangerInfoDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportDangerInfoDTO.java
index f861f3a..da78735 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportDangerInfoDTO.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportDangerInfoDTO.java
@@ -1,10 +1,7 @@
package com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO;
-import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
-import java.io.Serializable;
-import java.util.Date;
@Data
public class CJReportDangerInfoDTO{
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskAnaUnitDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskAnaUnitDTO.java
index 5c7e590..44bd65f 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskAnaUnitDTO.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskAnaUnitDTO.java
@@ -1,6 +1,8 @@
package com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO;
+import lombok.Data;
+@Data
public class CJReportRiskAnaUnitDTO {
/**
* 主键
@@ -47,92 +49,6 @@
*/
private String updateBy;
- public String getId() {
- return id;
- }
- public void setId(String id) {
- this.id = id;
- }
-
- public String getCompanyCode() {
- return companyCode;
- }
-
- public void setCompanyCode(String companyCode) {
- this.companyCode = companyCode;
- }
-
- public String getRiskUnitName() {
- return riskUnitName;
- }
-
- public void setRiskUnitName(String riskUnitName) {
- this.riskUnitName = riskUnitName;
- }
-
- public String getHazardCode() {
- return hazardCode;
- }
-
- public void setHazardCode(String hazardCode) {
- this.hazardCode = hazardCode;
- }
-
- public String getHazardDep() {
- return hazardDep;
- }
-
- public void setHazardDep(String hazardDep) {
- this.hazardDep = hazardDep;
- }
-
- public String getHazardLiablePerson() {
- return hazardLiablePerson;
- }
-
- public void setHazardLiablePerson(String hazardLiablePerson) {
- this.hazardLiablePerson = hazardLiablePerson;
- }
-
- public String getCreateBy() {
- return createBy;
- }
-
- public void setCreateBy(String createBy) {
- this.createBy = createBy;
- }
-
- public String getUpdateBy() {
- return updateBy;
- }
-
- public void setUpdateBy(String updateBy) {
- this.updateBy = updateBy;
- }
-
- public String getDeleted() {
- return deleted;
- }
-
- public void setDeleted(String deleted) {
- this.deleted = deleted;
- }
-
- public String getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(String createDate) {
- this.createDate = createDate;
- }
-
- public String getUpdateDate() {
- return updateDate;
- }
-
- public void setUpdateDate(String updateDate) {
- this.updateDate = updateDate;
- }
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskControlMeasureDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskControlMeasureDTO.java
index 4cfc0d1..3db282c 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskControlMeasureDTO.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskControlMeasureDTO.java
@@ -1,7 +1,10 @@
package com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO;
+import lombok.Data;
+
import java.io.Serializable;
+@Data
public class CJReportRiskControlMeasureDTO implements Serializable {
/**
* 主键
@@ -61,116 +64,5 @@
*/
private String updateBy;
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getCompanyCode() {
- return companyCode;
- }
-
- public void setCompanyCode(String companyCode) {
- this.companyCode = companyCode;
- }
-
- public String getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(String createDate) {
- this.createDate = createDate;
- }
-
- public String getUpdateDate() {
- return updateDate;
- }
-
- public void setUpdateDate(String updateDate) {
- this.updateDate = updateDate;
- }
-
- public String getCreateBy() {
- return createBy;
- }
-
- public void setCreateBy(String createBy) {
- this.createBy = createBy;
- }
-
- public String getUpdateBy() {
- return updateBy;
- }
-
- public void setUpdateBy(String updateBy) {
- this.updateBy = updateBy;
- }
-
- public String getRiskEventId() {
- return riskEventId;
- }
-
- public void setRiskEventId(String riskEventId) {
- this.riskEventId = riskEventId;
- }
-
- public String getDataSrc() {
- return dataSrc;
- }
-
- public void setDataSrc(String dataSrc) {
- this.dataSrc = dataSrc;
- }
-
- public String getRiskMeasureDesc() {
- return riskMeasureDesc;
- }
-
- public void setRiskMeasureDesc(String riskMeasureDesc) {
- this.riskMeasureDesc = riskMeasureDesc;
- }
-
- public String getTroubleshootContent() {
- return troubleshootContent;
- }
-
- public void setTroubleshootContent(String troubleshootContent) {
- this.troubleshootContent = troubleshootContent;
- }
-
- public String getDeleted() {
- return deleted;
- }
-
- public void setDeleted(String deleted) {
- this.deleted = deleted;
- }
-
- public String getClassify1() {
- return classify1;
- }
-
- public void setClassify1(String classify1) {
- this.classify1 = classify1;
- }
-
- public String getClassify2() {
- return classify2;
- }
-
- public void setClassify2(String classify2) {
- this.classify2 = classify2;
- }
-
- public String getClassify3() {
- return classify3;
- }
-
- public void setClassify3(String classify3) {
- this.classify3 = classify3;
- }
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskEventDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskEventDTO.java
index 7e81d77..f4c534c 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskEventDTO.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskEventDTO.java
@@ -1,8 +1,11 @@
package com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO;
+import lombok.Data;
+
import java.io.Serializable;
+@Data
public class CJReportRiskEventDTO implements Serializable {
/**
* 主键
@@ -41,75 +44,5 @@
*/
private String updateBy;
- public String getDeleted() {
- return deleted;
- }
- public void setDeleted(String deleted) {
- this.deleted = deleted;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getCompanyCode() {
- return companyCode;
- }
-
- public void setCompanyCode(String companyCode) {
- this.companyCode = companyCode;
- }
-
- public String getRiskEventName() {
- return riskEventName;
- }
-
- public void setRiskEventName(String riskEventName) {
- this.riskEventName = riskEventName;
- }
-
- public String getRiskUnitId() {
- return riskUnitId;
- }
-
- public void setRiskUnitId(String riskUnitId) {
- this.riskUnitId = riskUnitId;
- }
-
- public String getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(String createDate) {
- this.createDate = createDate;
- }
-
- public String getCreateBy() {
- return createBy;
- }
-
- public void setCreateBy(String createBy) {
- this.createBy = createBy;
- }
-
- public String getUpdateDate() {
- return updateDate;
- }
-
- public void setUpdateDate(String updateDate) {
- this.updateDate = updateDate;
- }
-
- public String getUpdateBy() {
- return updateBy;
- }
-
- public void setUpdateBy(String updateBy) {
- this.updateBy = updateBy;
- }
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskAnaUnit.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskAnaUnit.java
index 3287958..0c79fb1 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskAnaUnit.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskAnaUnit.java
@@ -4,10 +4,12 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
import java.io.Serializable;
import java.util.Date;
+@Data
@TableName("prevent_cj_report_risk_ana_unit")
public class PreventCJReportRiskAnaUnit implements Serializable {
/**
@@ -24,13 +26,13 @@
*/
private String companyCode;
/**
- * 安全风险分析单元名称
- */
- private String riskUnitName;
- /**
* 安全风险分析对象编码
*/
private String hazardCode;
+ /**
+ * 安全风险分析单元名称
+ */
+ private String riskUnitName;
/**
* 责任部门
*/
@@ -75,134 +77,6 @@
* 风险分析单元id
*/
private Long riskUnitId;
-
- public Long getRiskUnitId() {
- return riskUnitId;
- }
-
- public void setRiskUnitId(Long riskUnitId) {
- this.riskUnitId = riskUnitId;
- }
-
- public String getDeleted() {
- return deleted;
- }
-
- public void setDeleted(String deleted) {
- this.deleted = deleted;
- }
-
- public Byte getReportStatus() {
- return reportStatus;
- }
-
- public void setReportStatus(Byte reportStatus) {
- this.reportStatus = reportStatus;
- }
-
- public Byte getDataSource() {
- return dataSource;
- }
-
- public void setDataSource(Byte dataSource) {
- this.dataSource = dataSource;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getCompanyCode() {
- return companyCode;
- }
-
- public void setCompanyCode(String companyCode) {
- this.companyCode = companyCode;
- }
-
- public String getRiskUnitName() {
- return riskUnitName;
- }
-
- public void setRiskUnitName(String riskUnitName) {
- this.riskUnitName = riskUnitName;
- }
-
- public Integer getIndexId() {
- return indexId;
- }
-
- public void setIndexId(Integer indexId) {
- this.indexId = indexId;
- }
-
- public String getHazardCode() {
- return hazardCode;
- }
-
- public void setHazardCode(String hazardCode) {
- this.hazardCode = hazardCode;
- }
-
- public String getHazardDep() {
- return hazardDep;
- }
-
- public void setHazardDep(String hazardDep) {
- this.hazardDep = hazardDep;
- }
-
- public String getHazardLiablePerson() {
- return hazardLiablePerson;
- }
-
- public void setHazardLiablePerson(String hazardLiablePerson) {
- this.hazardLiablePerson = hazardLiablePerson;
- }
-
- public Date getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(Date createDate) {
- this.createDate = createDate;
- }
-
- public String getCreateBy() {
- return createBy;
- }
-
- public void setCreateBy(String createBy) {
- this.createBy = createBy;
- }
-
- public Date getUpdateDate() {
- return updateDate;
- }
-
- public void setUpdateDate(Date updateDate) {
- this.updateDate = updateDate;
- }
-
- public String getUpdateBy() {
- return updateBy;
- }
-
- public void setUpdateBy(String updateBy) {
- this.updateBy = updateBy;
- }
-
- public Date getReportTime() {
- return reportTime;
- }
-
- public void setReportTime(Date reportTime) {
- this.reportTime = reportTime;
- }
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskControlMeasure.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskControlMeasure.java
index 96edb53..bdde4b5 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskControlMeasure.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskControlMeasure.java
@@ -3,10 +3,12 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
import java.io.Serializable;
import java.util.Date;
+@Data
@TableName("prevent_cj_report_risk_control_measure")
public class PreventCJReportRiskControlMeasure implements Serializable {
/**
@@ -86,159 +88,6 @@
* 管控措施id
*/
private Long riskMeasureId;
-
- public Long getRiskMeasureId() {
- return riskMeasureId;
- }
-
- public void setRiskMeasureId(Long riskMeasureId) {
- this.riskMeasureId = riskMeasureId;
- }
-
- public Integer getIndexId() {
- return indexId;
- }
-
- public void setIndexId(Integer indexId) {
- this.indexId = indexId;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getCompanyCode() {
- return companyCode;
- }
-
- public void setCompanyCode(String companyCode) {
- this.companyCode = companyCode;
- }
-
-
- public Date getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(Date createDate) {
- this.createDate = createDate;
- }
-
- public String getCreateBy() {
- return createBy;
- }
-
- public void setCreateBy(String createBy) {
- this.createBy = createBy;
- }
-
- public Date getUpdateDate() {
- return updateDate;
- }
-
- public void setUpdateDate(Date updateDate) {
- this.updateDate = updateDate;
- }
-
- public String getUpdateBy() {
- return updateBy;
- }
-
- public void setUpdateBy(String updateBy) {
- this.updateBy = updateBy;
- }
-
- public String getRiskEventId() {
- return riskEventId;
- }
-
- public void setRiskEventId(String riskEventId) {
- this.riskEventId = riskEventId;
- }
-
- public String getDataSrc() {
- return dataSrc;
- }
-
- public void setDataSrc(String dataSrc) {
- this.dataSrc = dataSrc;
- }
-
- public String getRiskMeasureDesc() {
- return riskMeasureDesc;
- }
-
- public void setRiskMeasureDesc(String riskMeasureDesc) {
- this.riskMeasureDesc = riskMeasureDesc;
- }
-
- public String getTroubleshootContent() {
- return troubleshootContent;
- }
-
- public void setTroubleshootContent(String troubleshootContent) {
- this.troubleshootContent = troubleshootContent;
- }
-
- public String getDeleted() {
- return deleted;
- }
-
- public void setDeleted(String deleted) {
- this.deleted = deleted;
- }
-
- public String getClassify1() {
- return classify1;
- }
-
- public void setClassify1(String classify1) {
- this.classify1 = classify1;
- }
-
- public String getClassify2() {
- return classify2;
- }
-
- public void setClassify2(String classify2) {
- this.classify2 = classify2;
- }
-
- public String getClassify3() {
- return classify3;
- }
-
- public void setClassify3(String classify3) {
- this.classify3 = classify3;
- }
-
- public Date getReportTime() {
- return reportTime;
- }
-
- public void setReportTime(Date reportTime) {
- this.reportTime = reportTime;
- }
-
- public Byte getReportStatus() {
- return reportStatus;
- }
-
- public void setReportStatus(Byte reportStatus) {
- this.reportStatus = reportStatus;
- }
-
- public Byte getDataSource() {
- return dataSource;
- }
-
- public void setDataSource(Byte dataSource) {
- this.dataSource = dataSource;
- }
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskEvent.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskEvent.java
index 7156867..673558f 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskEvent.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskEvent.java
@@ -3,10 +3,12 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
import java.io.Serializable;
import java.util.Date;
+@Data
@TableName("prevent_cj_report_risk_event")
public class PreventCJReportRiskEvent implements Serializable {
/**
@@ -23,13 +25,13 @@
*/
private String companyCode;
/**
- * 风险事件名称
- */
- private String riskEventName;
- /**
* 关联风险分析单元UUID
*/
private String riskUnitId;
+ /**
+ * 风险事件名称
+ */
+ private String riskEventName;
/**
* 删除标志：0-有效，1-删除
*/
@@ -66,118 +68,6 @@
* 风险事件id
*/
private Long riskEventId;
-
-
- public Long getRiskEventId() {
- return riskEventId;
- }
-
- public void setRiskEventId(Long riskEventId) {
- this.riskEventId = riskEventId;
- }
-
- public String getDeleted() {
- return deleted;
- }
- public void setDeleted(String deleted) {
- this.deleted = deleted;
- }
-
- public Integer getIndexId() {
- return indexId;
- }
-
- public void setIndexId(Integer indexId) {
- this.indexId = indexId;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getCompanyCode() {
- return companyCode;
- }
-
- public void setCompanyCode(String companyCode) {
- this.companyCode = companyCode;
- }
-
- public String getRiskEventName() {
- return riskEventName;
- }
-
- public void setRiskEventName(String riskEventName) {
- this.riskEventName = riskEventName;
- }
-
- public String getRiskUnitId() {
- return riskUnitId;
- }
-
- public void setRiskUnitId(String riskUnitId) {
- this.riskUnitId = riskUnitId;
- }
-
- public Date getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(Date createDate) {
- this.createDate = createDate;
- }
-
- public String getCreateBy() {
- return createBy;
- }
-
- public void setCreateBy(String createBy) {
- this.createBy = createBy;
- }
-
- public Date getUpdateDate() {
- return updateDate;
- }
-
- public void setUpdateDate(Date updateDate) {
- this.updateDate = updateDate;
- }
-
- public String getUpdateBy() {
- return updateBy;
- }
-
- public void setUpdateBy(String updateBy) {
- this.updateBy = updateBy;
- }
-
- public Date getReportTime() {
- return reportTime;
- }
-
- public void setReportTime(Date reportTime) {
- this.reportTime = reportTime;
- }
-
- public Byte getReportStatus() {
- return reportStatus;
- }
-
- public void setReportStatus(Byte reportStatus) {
- this.reportStatus = reportStatus;
- }
-
- public Byte getDataSource() {
- return dataSource;
- }
-
- public void setDataSource(Byte dataSource) {
- this.dataSource = dataSource;
- }
}
diff --git a/src/main/java/com/ruoyi/doublePrevention/scheduls/ExecCJReportDateSchedule.java b/src/main/java/com/ruoyi/doublePrevention/scheduls/ExecCJReportDateSchedule.java
index 78eee97..427c11e 100644
--- a/src/main/java/com/ruoyi/doublePrevention/scheduls/ExecCJReportDateSchedule.java
+++ b/src/main/java/com/ruoyi/doublePrevention/scheduls/ExecCJReportDateSchedule.java
@@ -96,7 +96,7 @@
// @Scheduled(cron = "0 0 23 * * ?") //每天晚上23点执行一次0 0 22,23 * * ?
// @Scheduled(cron = "0 0 22,23 * * ?") //每天晚上22、23点执行一次
// @Scheduled(cron = "0 0/1 * * * ? ") // 分钟
- @Scheduled(cron = "0 0/20 * * * ? ") // 分钟
+// @Scheduled(cron = "0 0/20 * * * ? ") // 分钟
// @Scheduled(cron = "0/30 * * * * ?")
public void execReportDateSchedule() throws UnsupportedEncodingException {
logger.info("【####】上报数据开始...");
diff --git a/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java b/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
index 9bd9cb2..ccf55db 100644
--- a/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
+++ b/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
@@ -109,7 +109,7 @@
@Transactional
// @Scheduled(cron = "0 0/1 * * * ? ") // 分钟
// @Scheduled(cron = "0/30 * * * * ?") // 30秒
- @Scheduled(cron = "0 0/30 * * * ? ") // 分钟
+// @Scheduled(cron = "0 0/30 * * * ? ") // 分钟
public void searchReportDate(){
logger.info("【双重预防】定时检索需要上报数据...");
diff --git a/src/main/resources/application-guotai-uat.yml b/src/main/resources/application-dev.yml
similarity index 93%
rename from src/main/resources/application-guotai-uat.yml
rename to src/main/resources/application-dev.yml
index 5320904..e906704 100644
--- a/src/main/resources/application-guotai-uat.yml
+++ b/src/main/resources/application-dev.yml
@@ -12,9 +12,9 @@
# driver-class-name: com.mysql.cj.jdbc.Driver
#数据库版本5.7
- url: jdbc:mysql://124.221.143.185:23306/gt_double_risk?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai
- username: gt_double_risk
- password: B6CrYp7ZhTNdJF4Y
+ url: jdbc:mysql://twt.sinanoaq.com:13306/trouble_and_risk_connect_hall?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&useAffectedRows=true
+ username: root
+ password: Sinanoaq#415
# url: jdbc:mysql://sinanoaq.com:23306/trouble_and_risk.guotai?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai
# username: riskctrl_gk
diff --git a/src/main/resources/application-druid.yml b/src/main/resources/application-druid.yml
deleted file mode 100644
index 9c857bd..0000000
--- a/src/main/resources/application-druid.yml
+++ /dev/null
@@ -1,116 +0,0 @@
-
-server:
- port: 6801
-
-# 数据源配置
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 主库数据源
- master:
- url: jdbc:mysql://sinanoaq.com:23306/trouble_and_risk.guotai?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-# username: riskctrl_gk
-# password: Sjk@Jbhs98n
- username: riskctrl_gk
- password: Csa8@g89cajnDFd7
-
-# url: jdbc:mysql://localhost:3306/trouble_and_risk.guotai?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-# username: root
-# password: root
-
-# url: jdbc:mysql://localhost:17716/trouble_and_risk?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-# username: trouble_and_risk
-# password: Bw44sxzyiE8SdWzJ
-
-# url: jdbc:mysql://192.168.10.201:3306/trouble_and_risk?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-# username: trouble_and_risk
-# password: LYGstJAYc85jkF7H
-
- # 从库数据源
- slave:
- # 从数据源开关/默认关闭
- enabled: false
- url:
- username:
- password:
- # 初始连接数
- initialSize: 5
- # 最小连接池数量
- minIdle: 10
- # 最大连接池数量
- maxActive: 20
- # 配置获取连接等待超时的时间
- maxWait: 60000
- # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
- timeBetweenEvictionRunsMillis: 60000
- # 配置一个连接在池中最小生存的时间，单位是毫秒
- minEvictableIdleTimeMillis: 300000
- # 配置一个连接在池中最大生存的时间，单位是毫秒
- maxEvictableIdleTimeMillis: 900000
- # 配置检测连接是否有效
- validationQuery: SELECT 1 FROM DUAL
- testWhileIdle: true
- testOnBorrow: false
- testOnReturn: false
- webStatFilter:
- enabled: true
- statViewServlet:
- enabled: true
- # 设置白名单，不填则允许所有访问
- allow:
- url-pattern: /druid/*
- # 控制台管理用户名和密码
- login-username:
- login-password:
- filter:
- stat:
- enabled: true
- # 慢SQL记录
- log-slow-sql: true
- slow-sql-millis: 1000
- merge-sql: true
- wall:
- config:
- multi-statement-allow: true
-
- # redis
- redis:
- host: 192.168.0.52
- port: 6379
- password: SEF98uvs98dUAUEF90Udssa # Redis 服务器密码，默认为空。生产中，一定要设置 Redis 密码！
- database: 0 # Redis 数据库号，默认为 0
- timeout: 15000 # Redis 连接超时时间，单位：毫秒。
- lettuce:
- pool:
- max-active: 4
- # 对应 RedisProperties.Jedis 内部类
- jedis:
- pool:
- max-active: 4 # 连接池最大连接数，默认为 8 。使用负数表示没有限制 同一时间最大只能执行8条sql语句，每执行一条语句就会建立一个连接
- max-idle: 4 # 默认连接数最大空闲的连接数，默认为 8 。使用负数表示没有限制。
- min-idle: 0 # 默认连接池最小空闲的连接数，默认为 0 。允许设置 0 和 正数。
- max-wait: -1
-
-http:
- # HTTP端口，39559
- additionalPorts: 80
-# additionalPorts: 6801
-
-# 项目相关配置
-ruoyi:
- # 名称
- name: TroubleAndRisk
- # 版本
- version: 1.0.3
- # 版权年份
- copyrightYear: 2022-2023
- # 实例演示开关
- demoEnabled: false
- # 文件路径 示例（ Windows配置D:/TroubleAndRisk/uploadPath，Linux配置 /home/TroubleAndRisk/uploadPath）
- # profile: /www/TroubleAndRisk/uploadPath
- profile: D:/ProjFile/TroubleAndRisk
- # profile: /home/troubleAndRisk/upload
- # 获取ip地址开关
- addressEnabled: true
\ No newline at end of file
diff --git a/src/main/resources/application-louge.yml b/src/main/resources/application-louge.yml
deleted file mode 100644
index 888c21a..0000000
--- a/src/main/resources/application-louge.yml
+++ /dev/null
@@ -1,114 +0,0 @@
-
-server:
- port: 6801
-
-# 数据源配置
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 主库数据源
- master:
- url: jdbc:mysql://124.221.179.102:3306/testqhs?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
- username: testqhs
- password: raD2AEaccLRsaFrB
-
-# url: jdbc:mysql://localhost:3306/trouble_and_risk.guotai?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-# username: root
-# password: root
-
-# url: jdbc:mysql://localhost:17716/trouble_and_risk?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-# username: trouble_and_risk
-# password: Bw44sxzyiE8SdWzJ
-
-# url: jdbc:mysql://192.168.10.201:3306/trouble_and_risk?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-# username: trouble_and_risk
-# password: LYGstJAYc85jkF7H
-
- # 从库数据源
- slave:
- # 从数据源开关/默认关闭
- enabled: false
- url:
- username:
- password:
- # 初始连接数
- initialSize: 5
- # 最小连接池数量
- minIdle: 10
- # 最大连接池数量
- maxActive: 20
- # 配置获取连接等待超时的时间
- maxWait: 60000
- # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
- timeBetweenEvictionRunsMillis: 60000
- # 配置一个连接在池中最小生存的时间，单位是毫秒
- minEvictableIdleTimeMillis: 300000
- # 配置一个连接在池中最大生存的时间，单位是毫秒
- maxEvictableIdleTimeMillis: 900000
- # 配置检测连接是否有效
- validationQuery: SELECT 1 FROM DUAL
- testWhileIdle: true
- testOnBorrow: false
- testOnReturn: false
- webStatFilter:
- enabled: true
- statViewServlet:
- enabled: true
- # 设置白名单，不填则允许所有访问
- allow:
- url-pattern: /druid/*
- # 控制台管理用户名和密码
- login-username:
- login-password:
- filter:
- stat:
- enabled: true
- # 慢SQL记录
- log-slow-sql: true
- slow-sql-millis: 1000
- merge-sql: true
- wall:
- config:
- multi-statement-allow: true
-
- # redis
- redis:
- host: 192.168.0.52
- port: 6379
- password: SEF98uvs98dUAUEF90Udssa # Redis 服务器密码，默认为空。生产中，一定要设置 Redis 密码！
- database: 0 # Redis 数据库号，默认为 0
- timeout: 15000 # Redis 连接超时时间，单位：毫秒。
- lettuce:
- pool:
- max-active: 4
- # 对应 RedisProperties.Jedis 内部类
- jedis:
- pool:
- max-active: 4 # 连接池最大连接数，默认为 8 。使用负数表示没有限制 同一时间最大只能执行8条sql语句，每执行一条语句就会建立一个连接
- max-idle: 4 # 默认连接数最大空闲的连接数，默认为 8 。使用负数表示没有限制。
- min-idle: 0 # 默认连接池最小空闲的连接数，默认为 0 。允许设置 0 和 正数。
- max-wait: -1
-
-http:
- # HTTP端口，39559
- additionalPorts: 80
-# additionalPorts: 6801
-
-# 项目相关配置
-ruoyi:
- # 名称
- name: TroubleAndRisk
- # 版本
- version: 1.0.3
- # 版权年份
- copyrightYear: 2022-2023
- # 实例演示开关
- demoEnabled: false
- # 文件路径 示例（ Windows配置D:/TroubleAndRisk/uploadPath，Linux配置 /home/TroubleAndRisk/uploadPath）
- # profile: /www/TroubleAndRisk/uploadPath
- profile: D:/ProjFile/TroubleAndRisk
- # profile: /home/troubleAndRisk/upload
- # 获取ip地址开关
- addressEnabled: true
\ No newline at end of file
diff --git a/src/main/resources/application-show.yml b/src/main/resources/application-show.yml
deleted file mode 100644
index 36052c3..0000000
--- a/src/main/resources/application-show.yml
+++ /dev/null
@@ -1,124 +0,0 @@
-server:
- port: 6601
-
-# 数据源配置
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 主库数据源
- master:
-# driver-class-name: com.mysql.cj.jdbc.Driver
-
- #数据库版本5.7
-# url: jdbc:mysql://121.239.169.27:49037/safeplatform.luoan.uat?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=true&serverTimezone=UTC&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai
-# username: gkhy_safeplatform
-# password: afaQW90b!#n1
-
- url: jdbc:mysql://124.221.179.102:3306/testqhs?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
- username: testqhs
- password: raD2AEaccLRsaFrB
-
-# 数据库版本8
- # url: jdbc:mysql://121.239.169.27:49031/safeplatform.luoan.uat?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=true&serverTimezone=UTC&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai
-# username: gkhy_safeplatform_guotai
-# password: user@GJLSJ828
-
-# url: jdbc:mysql://localhost:3306/trouble_and_risk.guotai?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-# username: root
-# password: root
-
-# url: jdbc:mysql://localhost:17716/trouble_and_risk?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-# username: trouble_and_risk
-# password: Bw44sxzyiE8SdWzJ
-
-# url: jdbc:mysql://192.168.10.201:3306/trouble_and_risk?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-# username: trouble_and_risk
-# password: LYGstJAYc85jkF7H
-
- # 从库数据源
- slave:
- # 从数据源开关/默认关闭
- enabled: false
- url:
- username:
- password:
- # 初始连接数
- initialSize: 5
- # 最小连接池数量
- minIdle: 10
- # 最大连接池数量
- maxActive: 20
- # 配置获取连接等待超时的时间
- maxWait: 60000
- # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
- timeBetweenEvictionRunsMillis: 60000
- # 配置一个连接在池中最小生存的时间，单位是毫秒
- minEvictableIdleTimeMillis: 300000
- # 配置一个连接在池中最大生存的时间，单位是毫秒
- maxEvictableIdleTimeMillis: 900000
- # 配置检测连接是否有效
- validationQuery: SELECT 1 FROM DUAL
- testWhileIdle: true
- testOnBorrow: false
- testOnReturn: false
- webStatFilter:
- enabled: true
- statViewServlet:
- enabled: true
- # 设置白名单，不填则允许所有访问
- allow:
- url-pattern: /druid/*
- # 控制台管理用户名和密码
- login-username:
- login-password:
- filter:
- stat:
- enabled: true
- # 慢SQL记录
- log-slow-sql: true
- slow-sql-millis: 1000
- merge-sql: true
- wall:
- config:
- multi-statement-allow: true
-
- # redis
- redis:
- host: 192.168.30.107
- port: 6362
- password: aHIAC88NB98t8bju89 # Redis 服务器密码，默认为空。生产中，一定要设置 Redis 密码！
- database: 0 # Redis 数据库号，默认为 0
- timeout: 15000 # Redis 连接超时时间，单位：毫秒。
- lettuce:
- pool:
- max-active: 4
- # 对应 RedisProperties.Jedis 内部类
- jedis:
- pool:
- max-active: 4 # 连接池最大连接数，默认为 8 。使用负数表示没有限制 同一时间最大只能执行8条sql语句，每执行一条语句就会建立一个连接
- max-idle: 4 # 默认连接数最大空闲的连接数，默认为 8 。使用负数表示没有限制。
- min-idle: 0 # 默认连接池最小空闲的连接数，默认为 0 。允许设置 0 和 正数。
- max-wait: -1
-
-http:
- # HTTP端口，39559
- additionalPorts: 8014
-# additionalPorts: 6801
-
-# 项目相关配置
-ruoyi:
- # 名称
- name: TroubleAndRisk
- # 版本
- version: 1.0.3
- # 版权年份
- copyrightYear: 2021
- # 实例演示开关
- demoEnabled: false
- # 文件路径 示例（ Windows配置D:/TroubleAndRisk/uploadPath，Linux配置 /home/TroubleAndRisk/uploadPath）
- # profile: /www/TroubleAndRisk/uploadPath
- profile: /home/troubleAndRisk/upload
- # 获取ip地址开关
- addressEnabled: true
\ No newline at end of file
diff --git a/src/main/resources/application-uat.yml b/src/main/resources/application-uat.yml
deleted file mode 100644
index beb5cfc..0000000
--- a/src/main/resources/application-uat.yml
+++ /dev/null
@@ -1,115 +0,0 @@
-server:
- port: 6801
-
-# 数据源配置
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 主库数据源
- master:
-# driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://121.239.169.27:49037/safeplatform.luoan.uat?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=true&serverTimezone=UTC&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai
- username: gkhy_safeplatform
- password: afaQW90b!#n1
-
-
-# url: jdbc:mysql://localhost:3306/trouble_and_risk.guotai?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-# username: root
-# password: root
-
-# url: jdbc:mysql://localhost:17716/trouble_and_risk?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-# username: trouble_and_risk
-# password: Bw44sxzyiE8SdWzJ
-
-# url: jdbc:mysql://192.168.10.201:3306/trouble_and_risk?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-# username: trouble_and_risk
-# password: LYGstJAYc85jkF7H
-
- # 从库数据源
- slave:
- # 从数据源开关/默认关闭
- enabled: false
- url:
- username:
- password:
- # 初始连接数
- initialSize: 5
- # 最小连接池数量
- minIdle: 10
- # 最大连接池数量
- maxActive: 20
- # 配置获取连接等待超时的时间
- maxWait: 60000
- # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
- timeBetweenEvictionRunsMillis: 60000
- # 配置一个连接在池中最小生存的时间，单位是毫秒
- minEvictableIdleTimeMillis: 300000
- # 配置一个连接在池中最大生存的时间，单位是毫秒
- maxEvictableIdleTimeMillis: 900000
- # 配置检测连接是否有效
- validationQuery: SELECT 1 FROM DUAL
- testWhileIdle: true
- testOnBorrow: false
- testOnReturn: false
- webStatFilter:
- enabled: true
- statViewServlet:
- enabled: true
- # 设置白名单，不填则允许所有访问
- allow:
- url-pattern: /druid/*
- # 控制台管理用户名和密码
- login-username:
- login-password:
- filter:
- stat:
- enabled: true
- # 慢SQL记录
- log-slow-sql: true
- slow-sql-millis: 1000
- merge-sql: true
- wall:
- config:
- multi-statement-allow: true
-
- # redis
- redis:
- host: 192.168.0.52
- port: 6379
- password: SEF98uvs98dUAUEF90Udssa # Redis 服务器密码，默认为空。生产中，一定要设置 Redis 密码！
- database: 0 # Redis 数据库号，默认为 0
- timeout: 15000 # Redis 连接超时时间，单位：毫秒。
- lettuce:
- pool:
- max-active: 4
- # 对应 RedisProperties.Jedis 内部类
- jedis:
- pool:
- max-active: 4 # 连接池最大连接数，默认为 8 。使用负数表示没有限制 同一时间最大只能执行8条sql语句，每执行一条语句就会建立一个连接
- max-idle: 4 # 默认连接数最大空闲的连接数，默认为 8 。使用负数表示没有限制。
- min-idle: 0 # 默认连接池最小空闲的连接数，默认为 0 。允许设置 0 和 正数。
- max-wait: -1
-
-http:
- # HTTP端口，39559
- additionalPorts: 80
-# additionalPorts: 6801
-
-# 项目相关配置
-ruoyi:
- # 名称
- name: TroubleAndRisk
- # 版本
- version: 1.0.3
- # 版权年份
- copyrightYear: 2022-2023
- # 实例演示开关
- demoEnabled: false
- # 文件路径 示例（ Windows配置D:/TroubleAndRisk/uploadPath，Linux配置 /home/TroubleAndRisk/uploadPath）
- # profile: /www/TroubleAndRisk/uploadPath
- profile: D:/ProjFile/TroubleAndRisk
- # profile: /home/troubleAndRisk/upload
- # 获取ip地址开关
- addressEnabled: true
\ No newline at end of file
diff --git a/src/main/resources/application-uat8.yml b/src/main/resources/application-uat8.yml
deleted file mode 100644
index cd5e5b8..0000000
--- a/src/main/resources/application-uat8.yml
+++ /dev/null
@@ -1,115 +0,0 @@
-
-server:
- port: 6801
-
-# 数据源配置
-spring:
- datasource:
- type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
- druid:
- # 主库数据源
- master:
-# driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://121.239.169.27:49031/safeplatform.luoan.uat?allowMultiQueries=true&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useSSL=true&serverTimezone=UTC&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai
- username: gkhy_safeplatform_guotai
- password: user@GJLSJ828
-
-# url: jdbc:mysql://localhost:3306/trouble_and_risk.guotai?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-# username: root
-# password: root
-
-# url: jdbc:mysql://localhost:17716/trouble_and_risk?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-# username: trouble_and_risk
-# password: Bw44sxzyiE8SdWzJ
-
-# url: jdbc:mysql://192.168.10.201:3306/trouble_and_risk?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-# username: trouble_and_risk
-# password: LYGstJAYc85jkF7H
-
- # 从库数据源
- slave:
- # 从数据源开关/默认关闭
- enabled: false
- url:
- username:
- password:
- # 初始连接数
- initialSize: 5
- # 最小连接池数量
- minIdle: 10
- # 最大连接池数量
- maxActive: 20
- # 配置获取连接等待超时的时间
- maxWait: 60000
- # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
- timeBetweenEvictionRunsMillis: 60000
- # 配置一个连接在池中最小生存的时间，单位是毫秒
- minEvictableIdleTimeMillis: 300000
- # 配置一个连接在池中最大生存的时间，单位是毫秒
- maxEvictableIdleTimeMillis: 900000
- # 配置检测连接是否有效
- validationQuery: SELECT 1 FROM DUAL
- testWhileIdle: true
- testOnBorrow: false
- testOnReturn: false
- webStatFilter:
- enabled: true
- statViewServlet:
- enabled: true
- # 设置白名单，不填则允许所有访问
- allow:
- url-pattern: /druid/*
- # 控制台管理用户名和密码
- login-username:
- login-password:
- filter:
- stat:
- enabled: true
- # 慢SQL记录
- log-slow-sql: true
- slow-sql-millis: 1000
- merge-sql: true
- wall:
- config:
- multi-statement-allow: true
-
- # redis
- redis:
- host: 192.168.0.52
- port: 6379
- password: SEF98uvs98dUAUEF90Udssa # Redis 服务器密码，默认为空。生产中，一定要设置 Redis 密码！
- database: 0 # Redis 数据库号，默认为 0
- timeout: 15000 # Redis 连接超时时间，单位：毫秒。
- lettuce:
- pool:
- max-active: 4
- # 对应 RedisProperties.Jedis 内部类
- jedis:
- pool:
- max-active: 4 # 连接池最大连接数，默认为 8 。使用负数表示没有限制 同一时间最大只能执行8条sql语句，每执行一条语句就会建立一个连接
- max-idle: 4 # 默认连接数最大空闲的连接数，默认为 8 。使用负数表示没有限制。
- min-idle: 0 # 默认连接池最小空闲的连接数，默认为 0 。允许设置 0 和 正数。
- max-wait: -1
-
-http:
- # HTTP端口，39559
- additionalPorts: 80
-# additionalPorts: 6801
-
-# 项目相关配置
-ruoyi:
- # 名称
- name: TroubleAndRisk
- # 版本
- version: 1.0.3
- # 版权年份
- copyrightYear: 2022-2023
- # 实例演示开关
- demoEnabled: false
- # 文件路径 示例（ Windows配置D:/TroubleAndRisk/uploadPath，Linux配置 /home/TroubleAndRisk/uploadPath）
- # profile: /www/TroubleAndRisk/uploadPath
- profile: D:/ProjFile/TroubleAndRisk
- # profile: /home/troubleAndRisk/upload
- # 获取ip地址开关
- addressEnabled: true
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index b950bc7..110ffe7 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -52,11 +52,8 @@
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
profiles:
- active: guotai-uat
-# active: druid
# druid使用的数据库是5.7.28，过高的版本，可能有部分函数不支持
-# active: uat
-# active: uat8
+ active: dev
# active: local
# 文件上传
servlet:
--
Gitblit v1.9.2