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

fix:数据库连接问题、opc连接问题

Browse Source
This commit is contained in:
songxiaopeng
2024-03-07 10:28:40 +08:00
parent 96c85e9d3d
commit 67a7abb5ca
3 changed files with 22 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
acs/nladmin-system/pom.xml
View File

@@ -73,6 +73,11 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
<version>1.50</version>
</dependency>
<dependency> <dependency>
<groupId>com.squareup.okhttp3</groupId> <groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId> <artifactId>okhttp</artifactId>
@@ -425,22 +430,22 @@
</dependency> </dependency>
</dependencies> </dependencies>
<distributionManagement> <!-- <distributionManagement>-->
<!--正式版本--> <!-- &lt;!&ndash;正式版本&ndash;&gt;-->
<repository> <!-- <repository>-->
<!-- nexus服务器中用户名：在settings.xml中<server>的id--> <!-- &lt;!&ndash; nexus服务器中用户名：在settings.xml中<server>的id&ndash;&gt;-->
<id>nexus</id> <!-- <id>nexus</id>-->
<!-- 这个名称自己定义 --> <!-- &lt;!&ndash; 这个名称自己定义 &ndash;&gt;-->
<name>nexus</name> <!-- <name>nexus</name>-->
<url>http://121.40.234.130:8081/repository/maven-releases/</url> <!-- <url>http://121.40.234.130:8081/repository/maven-releases/</url>-->
</repository> <!-- </repository>-->
<!--快照 <!-- &lt;!&ndash;快照-->
<snapshotRepository> <!-- <snapshotRepository>-->
<id>nexus-snapshots</id> <!-- <id>nexus-snapshots</id>-->
<name>Snapshots repository</name> <!-- <name>Snapshots repository</name>-->
<url>http://192.168.1.105/repository/yang/</url> <!-- <url>http://192.168.1.105/repository/yang/</url>-->
</snapshotRepository>--> <!-- </snapshotRepository>&ndash;&gt;-->
</distributionManagement> <!-- </distributionManagement>-->
<!-- 打包 --> <!-- 打包 -->
<build> <build>

2
acs/nladmin-system/src/main/resources/config/application-prod.yml
View File

@@ -7,7 +7,7 @@ spring:
db-type: com.alibaba.druid.pool.DruidDataSource db-type: com.alibaba.druid.pool.DruidDataSource
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
# url: jdbc:log4jdbc:mysql://${DB_HOST:10.93.41.198}:${DB_PORT:3306}/${DB_NAME:rl_mg_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true # url: jdbc:log4jdbc:mysql://${DB_HOST:10.93.41.198}:${DB_PORT:3306}/${DB_NAME:rl_mg_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:rl_mg_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:rl_mg_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true
username: ${DB_USER:root} username: ${DB_USER:root}
password: ${DB_PWD:123456} password: ${DB_PWD:123456}
# 初始连接数 # 初始连接数

15
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/cockpit/service/dao/DeviceConditionVo.java
View File

@@ -1,15 +0,0 @@
package org.nl.wms.cockpit.service.dao;
import lombok.Data;
/**
* @author Administrator
*/
@Data
public class DeviceConditionVo {
private String deviceName;
private Integer failure;
private Integer shutdown;
private Integer standby;
private Integer running;
}