From c49c62583adc8b8e7777f1c0af9aee31dc66d844 Mon Sep 17 00:00:00 2001 From: "USER-20220102CG\\noblelift" <546428999@qq.com> Date: Thu, 15 Jun 2023 16:52:38 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E5=BF=83=E8=B7=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../agv/server/impl/NDCAgvServiceImpl.java | 16 -- .../run/HeartbeatOfflineCheckerAutoRun.java | 55 ++++ .../run/TwoNDC2SocketConnectionAutoRun.java | 251 ------------------ .../run/TwoNDCSocketConnectionAutoRun.java | 52 ++-- .../src/main/java/org/nl/acs/device.xls | Bin 217088 -> 220160 bytes .../agv/ndctwo/AgvNdcTwoDeviceDriver.java | 4 - .../acs/heartbeat/dto/HeartbeatManageDto.java | 7 +- .../service/HeartbeatUnifiedService.java | 1 + .../impl}/HeartbeatManageServiceimpl.java | 14 +- .../impl}/HeartbeatUnifiedServiceimpl.java | 9 +- .../nl/acs/opc/DeviceOpcProtocolRunable.java | 4 +- .../main/resources/config/application-dev.yml | 4 +- 12 files changed, 109 insertions(+), 308 deletions(-) create mode 100644 acs/nladmin-system/src/main/java/org/nl/acs/auto/run/HeartbeatOfflineCheckerAutoRun.java delete mode 100644 acs/nladmin-system/src/main/java/org/nl/acs/auto/run/TwoNDC2SocketConnectionAutoRun.java rename acs/nladmin-system/src/main/java/org/nl/acs/heartbeat/{service_impl => service/impl}/HeartbeatManageServiceimpl.java (72%) rename acs/nladmin-system/src/main/java/org/nl/acs/heartbeat/{service_impl => service/impl}/HeartbeatUnifiedServiceimpl.java (96%) diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java index 3b2c9030b..d50af98ea 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/NDCAgvServiceImpl.java @@ -1,30 +1,22 @@ package org.nl.acs.agv.server.impl; -import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.acs.AcsConfig; import org.nl.acs.agv.server.NDCAgvService; import org.nl.acs.agv.server.dto.AgvDto; import org.nl.acs.auto.run.OneNDCSocketConnectionAutoRun; -import org.nl.acs.auto.run.TwoNDC2SocketConnectionAutoRun; import org.nl.acs.auto.run.TwoNDCSocketConnectionAutoRun; import org.nl.acs.device.service.DeviceService; import org.nl.acs.device.service.impl.DeviceServiceImpl; import org.nl.acs.ext.wms.service.AcsToWmsService; -import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.dto.Instruction; import org.nl.acs.log.LokiLog; import org.nl.acs.log.LokiLogType; import org.nl.acs.log.service.DeviceExecuteLogService; -import org.nl.acs.opc.Device; import org.nl.acs.opc.DeviceAppService; import org.nl.acs.opc.DeviceAppServiceImpl; -import org.nl.acs.opc.DeviceType; -import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.system.service.ParamService; import org.nl.modules.system.util.CodeUtil; import org.nl.modules.wql.util.SpringContextHolder; @@ -32,7 +24,6 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import java.util.HashMap; -import java.util.List; import java.util.Map; @Slf4j @@ -80,10 +71,7 @@ public class NDCAgvServiceImpl implements NDCAgvService { OneNDCSocketConnectionAutoRun.write(b); } else if (StrUtil.equals(inst.getAgv_system_type(), "2")) { TwoNDCSocketConnectionAutoRun.write(b); - } else if (StrUtil.equals(inst.getAgv_system_type(), "3")) { - TwoNDC2SocketConnectionAutoRun.write(b); } - System.out.println("下发删除agv指令数据:" + Bytes2HexString(b)); } @@ -198,8 +186,6 @@ public class NDCAgvServiceImpl implements NDCAgvService { if (StrUtil.equals(agv_system_type, "2")) { TwoNDCSocketConnectionAutoRun.write(b); - } else if (StrUtil.equals(agv_system_type, "3")) { - TwoNDC2SocketConnectionAutoRun.write(b); } } else { @@ -394,8 +380,6 @@ public class NDCAgvServiceImpl implements NDCAgvService { OneNDCSocketConnectionAutoRun.write(b); } else if (StrUtil.equals(agv_system, "2")) { TwoNDCSocketConnectionAutoRun.write(b); - } else if (StrUtil.equals(agv_system, "3")) { - TwoNDC2SocketConnectionAutoRun.write(b); } } catch (Exception e) { e.getMessage(); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/HeartbeatOfflineCheckerAutoRun.java b/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/HeartbeatOfflineCheckerAutoRun.java new file mode 100644 index 000000000..1002f9862 --- /dev/null +++ b/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/HeartbeatOfflineCheckerAutoRun.java @@ -0,0 +1,55 @@ +package org.nl.acs.auto.run; + +import lombok.extern.slf4j.Slf4j; +import org.nl.acs.heartbeat.service.HeartbeatUnifiedService; +import org.nl.acs.heartbeat.service.impl.HeartbeatUnifiedServiceimpl; +import org.nl.acs.instruction.service.InstructionService; +import org.nl.acs.instruction.service.impl.InstructionServiceImpl; +import org.nl.acs.opc.ThreadUtl; +import org.nl.modules.wql.util.SpringContextHolder; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.Date; + +@Slf4j +@Component +public class HeartbeatOfflineCheckerAutoRun extends AbstractAutoRunnable { + @Autowired + AutoRunService autoRunService; + + private int recordTimeOut = 10000; + private Date recordTime; + int offline_loop_time_millions = 1000; + boolean heartbeat_no_use =false; + public HeartbeatOfflineCheckerAutoRun() { + this.recordTime = new Date((new Date()).getTime() - (long)this.recordTimeOut); + } + + public String getCode() { + return HeartbeatOfflineCheckerAutoRun.class.getSimpleName(); + } + + public String getName() { + return "在线监听器"; + } + + public void autoRun() { + InstructionService instructionService = SpringContextHolder.getBean(InstructionServiceImpl.class); + HeartbeatUnifiedService heartbeatUnifiedService = SpringContextHolder.getBean(HeartbeatUnifiedServiceimpl.class); + + for(; !heartbeat_no_use; ThreadUtl.sleep((long)offline_loop_time_millions)) { + try { + heartbeatUnifiedService.offlineChecker(); + } catch (Exception var3) { + Date date = new Date(); + if (date.getTime() - this.recordTime.getTime() < (long)this.recordTimeOut) { + return; + } + + this.recordTime = date; + } + } + + } +} diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/TwoNDC2SocketConnectionAutoRun.java b/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/TwoNDC2SocketConnectionAutoRun.java deleted file mode 100644 index 762948e80..000000000 --- a/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/TwoNDC2SocketConnectionAutoRun.java +++ /dev/null @@ -1,251 +0,0 @@ -package org.nl.acs.auto.run; - -import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; -import lombok.extern.slf4j.Slf4j; -import org.nl.acs.AcsConfig; -import org.nl.acs.agv.server.NDCAgvService; -import org.nl.acs.device.service.DeviceService; -import org.nl.acs.device_driver.basedriver.agv.ndctwo.AgvNdcTwoDeviceDriver; -import org.nl.acs.ext.wms.service.AcsToWmsService; -import org.nl.acs.ext.wms.service.impl.AcsToWmsServiceImpl; -import org.nl.acs.instruction.service.InstructionService; -import org.nl.acs.instruction.service.dto.Instruction; -import org.nl.acs.instruction.service.impl.InstructionServiceImpl; -import org.nl.acs.opc.Device; -import org.nl.acs.opc.DeviceAppService; -import org.nl.modules.system.service.ParamService; -import org.nl.modules.system.service.impl.ParamServiceImpl; -import org.nl.modules.wql.util.SpringContextHolder; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import java.net.Socket; -import java.util.Date; - -import static org.nl.acs.agv.server.impl.NDCAgvServiceImpl.Bytes2HexString; - - -@Slf4j -@Component -public class TwoNDC2SocketConnectionAutoRun extends AbstractAutoRunnable { - - Socket s; - String ip = "192.168.46.225"; - int port = 1234; - static DataOutputStream dos; - static DataInputStream dis; - private int recordTimeOut = 10000; - private Date recordTime; - String[] ERROR = new String[]{ - "货叉尖部传感器触发", "S300传感器触发", "载货状态改变", "急停按钮触发", "触边开关出发", "需要复位", - "停在充电位", "取货失败", "放货失败", "轮子打滑", "没有动作码不能进入站点", "取货时有货", "丢失定位", - "抬叉停止"}; - boolean bConnected = true; - - boolean isReConnect = false; - - @Autowired - ParamService paramService; - @Autowired - AutoRunService autoRunService; - - - public TwoNDC2SocketConnectionAutoRun() { - this.recordTime = new Date((new Date()).getTime() - (long) this.recordTimeOut); - } - - public String getCode() { - return TwoNDC2SocketConnectionAutoRun.class.getSimpleName(); - } - - public String getName() { - return "2楼2区域AGV系统"; - } - - public void autoRun() { - - try { - System.out.println("2楼2区域AGV系统链接开始"); - ParamService paramService = SpringContextHolder.getBean(ParamServiceImpl.class); - InstructionService instructionService = SpringContextHolder.getBean(InstructionServiceImpl.class); - AcsToWmsService acsToWmsService = SpringContextHolder.getBean(AcsToWmsServiceImpl.class); - NDCAgvService ndcAgvService = SpringContextHolder.getBean(NDCAgvService.class); - DeviceAppService deviceAppService = SpringContextHolder.getBean(DeviceAppService.class); - DeviceService deviceService = SpringContextHolder.getBean(DeviceService.class); - ip = paramService.findByCode(AcsConfig.AGVURL22).getValue(); - port = Integer.parseInt(paramService.findByCode(AcsConfig.AGVPORT22).getValue()); - byte[] b = new byte[1028]; - s = new Socket(ip, port); - System.out.println("2楼2区域AGV链接成功"); - dos = new DataOutputStream(s.getOutputStream()); - dis = new DataInputStream(s.getInputStream()); - - while (bConnected) { - int count = dis.read(b); - - if (count == -1) { - break; - } - - int[] arr = new int[count]; - StringBuffer bs = new StringBuffer(); - - for (int i = 0; i < count; i++) { - int temp = b[i]; - if (temp < 0) - temp += 256; - arr[i] = temp; - StringBuffer bs1 = new StringBuffer("0"); - bs.append(temp < 16 ? bs1.append(Integer.toHexString(temp)) : Integer.toHexString(temp)); - } - - System.out.println("收到请求参数：" + bs); - boolean flag = false; - if (arr[8] * 256 + arr[9] == 0x73) { - byte[] data = null; - System.out.println("接收agv上报信息：" + bs); - //执行阶段 - int phase = arr[16] * 256 + arr[17]; - // agv任务号 - int index = arr[12] * 256 + arr[13]; - //任务号 - int ikey = arr[26] * 256 + arr[27]; - //站点号 - int agvaddr = arr[18] * 256 + arr[19]; - //车号 - int carno = arr[20]; - Instruction inst = null; - if (ikey != 0) { - inst = instructionService.findByCodeFromCache(String.valueOf(ikey)); - } - log.info("接收agv上报信息：" + bs); - log.info("接收agv上报信息：" + "phase--" + phase + " index--" + index + " ikey--" + ikey + " agvaddr--" + agvaddr + " Car--" + carno); - Device device = null; - String device_code = null; - String old_device_code = null; - String emptyNum = null; - if (agvaddr != 0) { - old_device_code = deviceService.queryDeviceCodeByAddress(agvaddr); - if (StrUtil.contains(old_device_code, "-")) { - String[] point = old_device_code.split("-"); - device_code = point[0]; - } else if (StrUtil.contains(old_device_code, ".")) { - String[] point = old_device_code.split("\\."); - device_code = point[0]; - emptyNum = point[1]; - } else { - device_code = old_device_code; - } - device = deviceAppService.findDeviceByCode(device_code); - } - - AgvNdcTwoDeviceDriver agvNdcTwoDeviceDriver; - //开始任务 - if (phase == 0x01) { - if (!ObjectUtil.isEmpty(inst)) { - inst.setInstruction_status("1"); - inst.setAgv_jobno(String.valueOf(index)); - inst.setSend_status("1"); - instructionService.update(inst); - data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); - } - flag = true; - } - //任务完毕 - //（无车id及状态） - else if (phase == 0x14) { - if (ObjectUtil.isEmpty(inst)) { - log.info("未找到指令号{}对应的指令", ikey); - break; - } - String agvcar = inst.getCarno(); - Device agvDevice = deviceAppService.findDeviceByCode(agvcar); - if (agvDevice != null) { - if (agvDevice.getDeviceDriver() instanceof AgvNdcTwoDeviceDriver) { - agvNdcTwoDeviceDriver = (AgvNdcTwoDeviceDriver) agvDevice.getDeviceDriver(); - agvNdcTwoDeviceDriver.setInstruction(null); - } - } - inst.setInstruction_status("2"); - instructionService.finish(inst); - data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); - } - //请求删除任务 - //(需要WCS反馈) - else if (phase == 0x30) { - if (ObjectUtil.isEmpty(inst)) { - log.info("未找到指令号{}对应的指令", ikey); - break; - } - data = ndcAgvService.sendAgvTwoModeInst(0x8F, index, 0); - } - //任务删除确认 - //(需要WCS反馈) - else if (phase == 0xFF) { - if (ObjectUtil.isEmpty(inst)) { - log.info("未找到指令号{}对应的指令", ikey); - break; - } - instructionService.cancelNOSendAgv(inst.getInstruction_id()); - data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); - } else { - //上报异常信息 - //（不需要WCS反馈） - if (phase == 0x67 || phase == 0x71 || phase == 0x72 || phase == 0x73 || phase == 0x74 || phase == 0x75) { - device = deviceAppService.findDeviceByCode(Integer.toString(arr[18] * 256 + arr[19])); - } else { - device = deviceAppService.findDeviceByCode(Integer.toString(arr[20])); - } - if (device.getDeviceDriver() instanceof AgvNdcTwoDeviceDriver) { - agvNdcTwoDeviceDriver = (AgvNdcTwoDeviceDriver) device.getDeviceDriver(); - agvNdcTwoDeviceDriver.processSocket(arr); - } - } - if (!ObjectUtil.isEmpty(data)) { - write(data); - } - - } else { - System.out.println("agv上报不是0073类型动作，不处理"); - } - } - - } catch (Exception e) { - - - } finally { - - - } - - } - - - @Override - public void stop() { - super.after(); - try { - s.close(); - } catch (Exception e) { - e.printStackTrace(); - } - } - - - public static void write(byte[] b) { - try { - log.info("下发agv数据:" + Bytes2HexString(b)); - System.out.println("下发agv数据:" + Bytes2HexString(b)); - dos.write(b); - dos.flush(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - } -} diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java b/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java index 804100ff7..d0cdafe04 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java @@ -206,20 +206,23 @@ public class TwoNDCSocketConnectionAutoRun extends AbstractAutoRunnable { log.info(agvaddr + "对应设备号为空!"); return; } - if (device.getDeviceDriver() instanceof StandardAutodoorDeviceDriver) { - standardAutodoorDeviceDriver = (StandardAutodoorDeviceDriver) device.getDeviceDriver(); - - try { - standardAutodoorDeviceDriver.writing("to_open", "1"); - standardAutodoorDeviceDriver.writing("to_close", "0"); - } catch (Exception e) { - log.info("下发电气信号失败:" + e.getMessage()); - e.printStackTrace(); - } - if (standardAutodoorDeviceDriver.getOpen() == 1) { - log.info("下发开门信号值为:{},下发关门信号值为:{}", standardAutodoorDeviceDriver.getToOpen(), standardAutodoorDeviceDriver.getToClose()); - data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); + if(ObjectUtil.isNotEmpty(device)) { + if (device.getDeviceDriver() instanceof StandardAutodoorDeviceDriver) { + standardAutodoorDeviceDriver = (StandardAutodoorDeviceDriver) device.getDeviceDriver(); + try { + standardAutodoorDeviceDriver.writing("to_open", "1"); + standardAutodoorDeviceDriver.writing("to_close", "0"); + } catch (Exception e) { + log.info("下发电气信号失败:" + e.getMessage()); + e.printStackTrace(); + } + if (standardAutodoorDeviceDriver.getOpen() == 1) { + log.info("下发开门信号值为:{},下发关门信号值为:{}", standardAutodoorDeviceDriver.getToOpen(), standardAutodoorDeviceDriver.getToClose()); + data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); + } } + } else { + log.info(agvaddr + "对应设备号为空!"); } } else if (phase == 0x51) { @@ -227,17 +230,20 @@ public class TwoNDCSocketConnectionAutoRun extends AbstractAutoRunnable { log.info(agvaddr + "对应设备号为空!"); return; } - if (device.getDeviceDriver() instanceof StandardAutodoorDeviceDriver) { - standardAutodoorDeviceDriver = (StandardAutodoorDeviceDriver) device.getDeviceDriver(); - try { - standardAutodoorDeviceDriver.writing("to_close", "1"); - standardAutodoorDeviceDriver.writing("to_open", "0"); - } catch (Exception e) { - log.info("下发电气信号失败:" + e.getMessage()); - e.printStackTrace(); + if(ObjectUtil.isNotEmpty(device)){ + if (device.getDeviceDriver() instanceof StandardAutodoorDeviceDriver) { + standardAutodoorDeviceDriver = (StandardAutodoorDeviceDriver) device.getDeviceDriver(); + try { + standardAutodoorDeviceDriver.writing("to_close", "1"); + standardAutodoorDeviceDriver.writing("to_open", "0"); + } catch (Exception e) { + log.info("下发电气信号失败:" + e.getMessage()); + e.printStackTrace(); + } + data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); } - data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0); - + } else { + log.info(device_code + "对应设备号为空!"); } } else { diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/device.xls b/acs/nladmin-system/src/main/java/org/nl/acs/device.xls index 1c3db516e0eeb180f94b3fb3d8125c1b63eb9290..dedf580eade620203577e4efc768ffc098782775 100644 GIT binary patch delta 9663 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 BXr2H7 delta 7744 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 queryAllHeartbeat(PageQuery pageQuery) { // return this.heartbeatRespository.queryPagedByColumn(pageQuery, HeartbeatManageDto.class); @@ -40,7 +43,10 @@ public class HeartbeatManageServiceimpl implements HeartbeatManageService { } public List queryAllActive() { - return null; + WQLObject wo = WQLObject.getWQLObject("acs_heartbeat"); + JSONArray arr = wo.query().getResultJSONArray(0); + List list = arr.toJavaList(HeartbeatManageDto.class); + return list; } public HeartbeatManageDto queryById(UUID id) { diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/heartbeat/service_impl/HeartbeatUnifiedServiceimpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/heartbeat/service/impl/HeartbeatUnifiedServiceimpl.java similarity index 96% rename from acs/nladmin-system/src/main/java/org/nl/acs/heartbeat/service_impl/HeartbeatUnifiedServiceimpl.java rename to acs/nladmin-system/src/main/java/org/nl/acs/heartbeat/service/impl/HeartbeatUnifiedServiceimpl.java index 42ec13dd8..1d683cdcb 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/heartbeat/service_impl/HeartbeatUnifiedServiceimpl.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/heartbeat/service/impl/HeartbeatUnifiedServiceimpl.java @@ -1,4 +1,4 @@ -package org.nl.acs.heartbeat.service_impl; +package org.nl.acs.heartbeat.service.impl; import cn.hutool.core.util.ObjectUtil; @@ -12,23 +12,22 @@ import org.nl.acs.heartbeat.service.HeartbeatManageService; import org.nl.acs.heartbeat.service.HeartbeatUnifiedService; import org.nl.modules.wql.util.SpringContextHolder; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import java.util.*; +@Service public class HeartbeatUnifiedServiceimpl implements HeartbeatUnifiedService, ApplicationAutoInitial { private List heartbeats = new ArrayList(); + @Autowired private HeartbeatManageService heartbeatManageService; - public HeartbeatUnifiedServiceimpl() { - } @Override public void autoInitial() throws Exception { - heartbeatManageService = SpringContextHolder.getBean("heartbeatManageServiceImpl"); - this.reload(); Iterator iterator = this.heartbeats.iterator(); diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java b/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java index b1ad40336..08625ef06 100644 --- a/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java +++ b/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java @@ -192,9 +192,9 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC if (true) { this.logItemChanged(itemId, accessor_value, value, itemDto); } - if(!ObjectUtil.isEmpty(value)){ +// if(!ObjectUtil.isEmpty(value)){ accessor_value.setValue(itemId, value); - } +// } } } diff --git a/acs/nladmin-system/src/main/resources/config/application-dev.yml b/acs/nladmin-system/src/main/resources/config/application-dev.yml index f57637425..7a0351aed 100644 --- a/acs/nladmin-system/src/main/resources/config/application-dev.yml +++ b/acs/nladmin-system/src/main/resources/config/application-dev.yml @@ -13,11 +13,11 @@ spring: driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy # url: jdbc:log4jdbc:mysql://${DB_HOST:10.1.3.91}:${DB_PORT:3306}/${DB_NAME:acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true # url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:lzhl_one_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true - url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lzhl_one_wcs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true + url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:lzhl_a1_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true username: ${DB_USER:root} # password: ${DB_PWD:P@ssw0rd} # password: ${DB_PWD:Root.123456} - password: ${DB_PWD:password} + password: ${DB_PWD:123456} # 初始连接数 initial-size: 5