Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safeP...

songhuangfeng123

2022-08-22 652fca264c2468782a2d5a4fbe21a13df448b91a

 safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/database/DruidConfig.java

@@ -46,8 +46,8 @@
        ds.setUniqueResourceName("goalmanage");
        ds.setPoolSize(2);
        ds.setXaProperties(prop);
        ds.setMaxIdleTime(18000000);
        ds.setMaxLifetime(21600000);
        ds.setMaxIdleTime(3600000);
        ds.setMaxLifetime(3000000);
        return ds;

    }
@@ -64,8 +64,8 @@
        ds.setUniqueResourceName("emergency");
        ds.setPoolSize(2);
        ds.setXaProperties(prop);
        ds.setMaxIdleTime(18000000);
        ds.setMaxLifetime(21600000);
        ds.setMaxIdleTime(3600000);
        ds.setMaxLifetime(3000000);
        return ds;
    }

@@ -80,8 +80,8 @@
        ds.setUniqueResourceName("incidentmanage");
        ds.setPoolSize(2);
        ds.setXaProperties(prop);
        ds.setMaxIdleTime(18000000);
        ds.setMaxLifetime(21600000);
        ds.setMaxIdleTime(3600000);
        ds.setMaxLifetime(3000000);
        return ds;
    }

@@ -96,8 +96,8 @@
        ds.setUniqueResourceName("equipment");
        ds.setPoolSize(2);
        ds.setXaProperties(prop);
        ds.setMaxIdleTime(18000000);
        ds.setMaxLifetime(21600000);
        ds.setMaxIdleTime(3600000);
        ds.setMaxLifetime(3000000);
        return ds;
    }