相关配置修改
This commit is contained in:
@@ -2,7 +2,9 @@ package com.fizz.business.constants;
|
||||
|
||||
import com.fizz.business.constants.enums.DeviceEnum;
|
||||
|
||||
import static com.fizz.business.constants.enums.DeviceEnum.INS;
|
||||
import static com.fizz.business.constants.enums.DeviceEnum.COAT;
|
||||
|
||||
|
||||
|
||||
public class CommonConstants {
|
||||
|
||||
@@ -50,7 +52,7 @@ public class CommonConstants {
|
||||
public static final String SEG_STRIP_LEN = "SEG_STRIP_LEN";
|
||||
|
||||
//卷取机前一个设备idx
|
||||
public static final DeviceEnum BEFORE_TR_IDX = INS;
|
||||
public static final DeviceEnum BEFORE_TR_IDX = COAT;
|
||||
|
||||
// 工艺规程点位代码
|
||||
public static final String SETUP_POINT_CODE = "SETUP_POINT_CODE";
|
||||
|
||||
@@ -7,7 +7,7 @@ spring:
|
||||
druid:
|
||||
# 主库数据源
|
||||
master:
|
||||
url: jdbc:mysql://140.143.206.120:3306/cgldb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
url: jdbc:mysql://49.232.87.108:12336/cgldb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
username: klp
|
||||
password: KeLunPu123@
|
||||
# url: jdbc:mysql://47.109.139.82:3306/cgldb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
@@ -28,7 +28,7 @@ spring:
|
||||
initialSize: 5
|
||||
# 最小连接池数量
|
||||
minIdle: 10
|
||||
# 最大连接池数量
|
||||
# 最大连接池数量$
|
||||
maxActive: 20
|
||||
# 配置获取连接等待超时的时间
|
||||
maxWait: 60000
|
||||
|
||||
@@ -169,11 +169,11 @@ knife4j:
|
||||
|
||||
kangaroohy:
|
||||
milo:
|
||||
enabled: false
|
||||
enabled: true
|
||||
primary: default
|
||||
config:
|
||||
default:
|
||||
endpoint: opc.tcp://192.168.0.196:49320
|
||||
endpoint: opc.tcp://192.168.0.231:49320
|
||||
security-policy: none
|
||||
pool:
|
||||
max-idle: 5
|
||||
@@ -181,7 +181,6 @@ kangaroohy:
|
||||
min-idle: 2
|
||||
initial-size: 3
|
||||
|
||||
|
||||
#kangaroohy:
|
||||
# milo:
|
||||
# primary: default
|
||||
|
||||
35352
sql/cgldb.sql
35352
sql/cgldb.sql
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user