Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/job/DataSourceTask.java

@@ -14,18 +14,18 @@ import java.util.Date;
 @Component
 @Slf4j
 public class DataSourceTask {
-    /**
-     * 定时刷新动态数据源连接池
-     */
-    @Scheduled(cron = "0 */5 * * * ?")
-    public void RefreshConnectionPool() {
-        System.out.printf("定时刷新动态数据源连接池：%s", DateUtils.format(new Date(), DateUtils.DATE_TIME_PATTERN));
-        DataSource datasource = DatasourceUtil.getDataSource(GlobalConstant.DEFAULT_DATASOURCE_KEY);
-        try {
-            Db use = Db.use(datasource);
-            use.query("select 1");
-        } catch (Exception e) {
-            log.error(e.getMessage(), "定时刷新动态数据源连接池");
-        }
-    }
+//    /**
+//     * 定时刷新动态数据源连接池
+//     */
+//    @Scheduled(cron = "0 */5 * * * ?")
+//    public void RefreshConnectionPool() {
+//        System.out.printf("定时刷新动态数据源连接池：%s", DateUtils.format(new Date(), DateUtils.DATE_TIME_PATTERN));
+//        DataSource datasource = DatasourceUtil.getDataSource(GlobalConstant.DEFAULT_DATASOURCE_KEY);
+//        try {
+//            Db use = Db.use(datasource);
+//            use.query("select 1");
+//        } catch (Exception e) {
+//            log.error(e.getMessage(), "定时刷新动态数据源连接池");
+//        }
+//    }
 }

src/main/java/com/xjrsoft/module/workflow/service/impl/WorkflowExecuteServiceImpl.java

@@ -1223,7 +1223,6 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
         List<ProcessParamConfig> processParamConfigs = workflowSchemaConfig.getProcessConfig().getProcessParamConfigs();
 
         long count = historyService.createHistoricProcessInstanceQuery().count();
-
         Map<String, Object> processParam = WorkFlowUtil.getProcessParam(processParamConfigs, workflowSchema, count + 1, null);
 
         //表单赋值
@@ -1294,6 +1293,10 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
                     session.quietRollback();
                 }
                 throw new MyException("【表单id： " + formConfig.getFormId() + "】 提交错误， 请联系管理员!");
+            }finally {
+                for (Session session : sessionList) {
+                    session.close();
+                }
             }
 
         }
@@ -1455,6 +1458,10 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
                     session.quietRollback();
                 }
                 throw new MyException("【表单id： " + formConfig.getFormId() + "】 提交错误， 请联系管理员!");
+            }finally {
+                for (Session session : sessionList) {
+                    session.close();
+                }
             }
 
         }
@@ -2432,6 +2439,10 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
             } else {
                 throw new MyException("表单提交错误， 请联系系统管理员!");
             }
+        }finally {
+            for (Session session : sessionList) {
+                session.close();
+            }
         }