diff --git a/tall/src/main/java/com/ccsens/tall/service/ExcelService.java b/tall/src/main/java/com/ccsens/tall/service/ExcelService.java index 6fcfa8fd..7c53cc2a 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ExcelService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ExcelService.java @@ -839,27 +839,27 @@ public class ExcelService implements IExcelService { }else { throw new BaseException(CodeEnum.NOTNAME.addMsgLwb("延迟时间(自动延迟模式可用)")); } - //跳转任务 - if(map.get("任务(节点)")!=null){ - loopTo = ExcelUtil.getCellValue(row.getCell(16)); - - }else { -// throw new BaseException(CodeEnum.NOTNAME.addMsgLwb("")); - } - //跳转次数 - if(map.get("任务(节点)")!=null){ - loopTimes = ExcelUtil.getCellValue(row.getCell(17)); - //这个不知道要不要先给你留着 - }else { -// throw new BaseException(CodeEnum.NOTNAME.addMsgLwb("")); - } - //输入文件 - if(map.get("任务(节点)")!=null){ - input = ExcelUtil.getCellValue(row.getCell(18)); - - }else { -// throw new BaseException(CodeEnum.NOTNAME.addMsgLwb("")); - } +// //跳转任务 +// if(map.get("任务(节点)")!=null){ +// loopTo = ExcelUtil.getCellValue(row.getCell(16)); +// +// }else { +//// throw new BaseException(CodeEnum.NOTNAME.addMsgLwb("")); +// } +// //跳转次数 +// if(map.get("任务(节点)")!=null){ +// loopTimes = ExcelUtil.getCellValue(row.getCell(17)); +// //这个不知道要不要先给你留着 +// }else { +//// throw new BaseException(CodeEnum.NOTNAME.addMsgLwb("")); +// } +// //输入文件 +// if(map.get("任务(节点)")!=null){ +// input = ExcelUtil.getCellValue(row.getCell(18)); +// +// }else { +//// throw new BaseException(CodeEnum.NOTNAME.addMsgLwb("")); +// } //一级任务 if (StrUtil.isNotEmpty(task1)) { ProTaskDetail firstTaskDetail = new ProTaskDetail(); diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index 9e02c3e8..b5408a3a 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: greenvalley - include: util-greenvalley,common + active: dev + include: util-dev,common diff --git a/tall/src/main/resources/druid-dev.yml b/tall/src/main/resources/druid-dev.yml index 109ec223..8744a46b 100644 --- a/tall/src/main/resources/druid-dev.yml +++ b/tall/src/main/resources/druid-dev.yml @@ -15,7 +15,8 @@ spring: maxWait: 60000 minEvictableIdleTimeMillis: 300000 minIdle: 5 - password: 68073a279b399baa1fa12cf39bfbb65bfc1480ffee7b659ccc81cf19be8c4473 +# password: 68073a279b399baa1fa12cf39bfbb65bfc1480ffee7b659ccc81cf19be8c4473 + password: 1b01d55a27843cfc487ce8dd6915fc22 poolPreparedStatements: true servletLogSlowSql: true servletLoginPassword: 111111 @@ -27,8 +28,10 @@ spring: testOnReturn: false testWhileIdle: true timeBetweenEvictionRunsMillis: 60000 - url: jdbc:mysql://49.233.89.188:3306/tall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true +# url: jdbc:mysql://49.233.89.188:3306/tall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true + url: jdbc:mysql://49.232.6.143:3306/tall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true # url: jdbc:mysql://127.0.0.1/tall?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true username: root validationQuery: SELECT 1 FROM DUAL - env: CCSENS_TALL \ No newline at end of file +# env: CCSENS_TALL + env: CCSENS_ENTERPRISE \ No newline at end of file