Browse Source

销售合同pdf

24282 2 years ago
parent
commit
107493bf1f

+ 1 - 1
hx-account/src/main/java/com/fjhx/account/service/account/impl/StatementServiceImpl.java

@@ -49,7 +49,7 @@ public class StatementServiceImpl implements StatementService {
         Date date = new Date();
         try {
             Date parse = DateUtil.parse(dto.getDateBetween(), "yyyy-MM");
-            if (parse.after(DateUtil.endOfMonth(new Date()))) {
+            if (parse.after(DateUtil.endOfMonth(date))) {
                 throw new ServiceException("统计日期不能大于本月");
             }
 

+ 6 - 1
hx-admin/src/main/resources/application.yml

@@ -90,13 +90,18 @@ spring:
         minEvictableIdleTimeMillis: 300000
         # 配置一个连接在池中最大生存的时间,单位是毫秒
         maxEvictableIdleTimeMillis: 900000
+        validationQueryTimeout: 10000
         # 配置检测连接是否有效
-        validationQuery: SELECT 1 FROM DUAL
+        validationQuery: SELECT 1
         testWhileIdle: true
         testOnBorrow: false
         testOnReturn: false
         poolPreparedStatements: true
         maxPoolPreparedStatementPerConnectionSize: 20
+        # 连接池中的minIdle数量以内的连接,空闲时间超过minEvictableIdleTimeMillis,则会执行keepAlive操作
+        keepAlive: true
+        # 允许物理连接最大存活时间,单位是毫秒
+        phyTimeoutMillis: 25200000
 
     druid:
       webStatFilter: