root/weiSuWei
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev 新需求

Browse Source
This commit is contained in:
gengby
2023-04-25 11:09:31 +08:00
parent e66b84aa6c
commit 74fd132efd
4 changed files with 54 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_manipulator_stacking_site/StandardManipulatorStackingSiteDeviceDriver.java
View File

@@ -513,7 +513,7 @@ public class StandardManipulatorStackingSiteDeviceDriver extends AbstractOpcDevi
&& standardManipulatorStackingSiteDeviceDriver.getMode() != 0
&& standardManipulatorStackingSiteDeviceDriver.move != 0
&& ObjectUtil.isEmpty(taskserver.findByNextCode(start_device_code))
&& ObjectUtil.isEmpty(taskserver.findByStartCode(this.device_code))) {
/*&& ObjectUtil.isEmpty(taskserver.findByStartCode(this.device_code))*/) {
break;
} else {
start_device_code = "";

4
hd/nladmin-system/src/main/resources/config/application-dev.yml
View File

@@ -8,11 +8,11 @@ spring:
druid:
db-type: com.alibaba.druid.pool.DruidDataSource
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:ssj1_acs}?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:wsw_acs}?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:ssj1_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=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