diff --git a/casic-web/etl/demo/front_db_demo.ktr b/casic-web/etl/demo/front_db_demo.ktr
index 1a0a6ee..6002b3c 100644
--- a/casic-web/etl/demo/front_db_demo.ktr
+++ b/casic-web/etl/demo/front_db_demo.ktr
@@ -3798,6 +3798,310 @@
Y
+
+ 拥堵字典数据转换
+ JsonInput
+
+ Y
+
+ 1
+
+ none
+
+
+ N
+
+ N
+ N
+ N
+ N
+ N
+ Y
+ Y
+ Y
+
+
+
+
+
+ N
+ N
+
+
+
+ dictory_id
+ $..DICTORY_ID
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ dictory_code
+ $..DICTORY_CODE
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ dictory_name
+ $..DICTORY_NAME
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ dictory_value
+ $..DICTORY_VALUE
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ dictory_name_en
+ $..DICTORY_NAME_EN
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ sequence
+ $..SEQUENCE
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ remark
+ $..REMARK
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ tenant_id
+ $..TENANT_ID
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ org_id
+ $..ORG_ID
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ is_system
+ $..IS_SYSTEM
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ creator
+ $..CREATOR
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ add_time
+ $..ADD_TIME
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ update_time
+ $..UPDATE_TIME
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ parent_id
+ $..PARENT_ID
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ dictory_type
+ $..DICTORY_TYPE
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ status
+ $..STATUS
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ delete_status
+ $..DELETE_STATUS
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ updatestatus
+ $..UPDATESTATUS
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ updatetime
+ $..UPDATETIME
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ 0
+ Y
+ N
+ result
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 551
+ 363
+ Y
+
+
diff --git a/casic-web/etl/demo/front_db_demo.ktr b/casic-web/etl/demo/front_db_demo.ktr
index 1a0a6ee..6002b3c 100644
--- a/casic-web/etl/demo/front_db_demo.ktr
+++ b/casic-web/etl/demo/front_db_demo.ktr
@@ -3798,6 +3798,310 @@
Y
+
+ 拥堵字典数据转换
+ JsonInput
+
+ Y
+
+ 1
+
+ none
+
+
+ N
+
+ N
+ N
+ N
+ N
+ N
+ Y
+ Y
+ Y
+
+
+
+
+
+ N
+ N
+
+
+
+ dictory_id
+ $..DICTORY_ID
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ dictory_code
+ $..DICTORY_CODE
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ dictory_name
+ $..DICTORY_NAME
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ dictory_value
+ $..DICTORY_VALUE
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ dictory_name_en
+ $..DICTORY_NAME_EN
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ sequence
+ $..SEQUENCE
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ remark
+ $..REMARK
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ tenant_id
+ $..TENANT_ID
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ org_id
+ $..ORG_ID
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ is_system
+ $..IS_SYSTEM
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ creator
+ $..CREATOR
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ add_time
+ $..ADD_TIME
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ update_time
+ $..UPDATE_TIME
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ parent_id
+ $..PARENT_ID
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ dictory_type
+ $..DICTORY_TYPE
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ status
+ $..STATUS
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ delete_status
+ $..DELETE_STATUS
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ updatestatus
+ $..UPDATESTATUS
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ updatetime
+ $..UPDATETIME
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ 0
+ Y
+ N
+ result
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 551
+ 363
+ Y
+
+
diff --git a/casic-web/src/main/resources/config/application-test.yml b/casic-web/src/main/resources/config/application-test.yml
index 281d57f..b2777c8 100644
--- a/casic-web/src/main/resources/config/application-test.yml
+++ b/casic-web/src/main/resources/config/application-test.yml
@@ -1,6 +1,5 @@
server:
- port: 8080
-# context-path: /callcenter/api
+ port: 11307
################### spring配置 ###################
spring:
datasource:
@@ -11,24 +10,21 @@
min-idle: 1
jms:
pub-sub-domain: true
- # session:
- # store-type: redis
- redis:
- host: 127.0.0.1
- port: 6379
- password:
-
-#flowable数据源和多数据源配置
+# session:
+# store-type: redis
casic:
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/ws/**,/api/**
- flowable:
- datasource:
- url: jdbc:mysql://11.100.6.163:3306/callcenter_flowable?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull
- username: root
- password: Casic203
-elasticjob:
- enabled: false
+ # kaptcha-open: false #是否开启登录时验证码 (true/false)
+ nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/**,/ws/**,/api/**
+ #flowable数据源和多数据源配置账号 nsltt
+ tomcat: true #判断是否是tomcat启动 配置websocket加载
+ #密码geostar999
+# flowable:
+# datasource:
+# url: jdbc:mysql://localhost:3306/template_flowable?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull
+# username: root
+# password: Casic203!
+flowable:
+ checkProcessDefinitions: false #不校验process文件
logging:
level.root: info
level.com.casic: debug
diff --git a/casic-web/etl/demo/front_db_demo.ktr b/casic-web/etl/demo/front_db_demo.ktr
index 1a0a6ee..6002b3c 100644
--- a/casic-web/etl/demo/front_db_demo.ktr
+++ b/casic-web/etl/demo/front_db_demo.ktr
@@ -3798,6 +3798,310 @@
Y
+
+ 拥堵字典数据转换
+ JsonInput
+
+ Y
+
+ 1
+
+ none
+
+
+ N
+
+ N
+ N
+ N
+ N
+ N
+ Y
+ Y
+ Y
+
+
+
+
+
+ N
+ N
+
+
+
+ dictory_id
+ $..DICTORY_ID
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ dictory_code
+ $..DICTORY_CODE
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ dictory_name
+ $..DICTORY_NAME
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ dictory_value
+ $..DICTORY_VALUE
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ dictory_name_en
+ $..DICTORY_NAME_EN
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ sequence
+ $..SEQUENCE
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ remark
+ $..REMARK
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ tenant_id
+ $..TENANT_ID
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ org_id
+ $..ORG_ID
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ is_system
+ $..IS_SYSTEM
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ creator
+ $..CREATOR
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ add_time
+ $..ADD_TIME
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ update_time
+ $..UPDATE_TIME
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ parent_id
+ $..PARENT_ID
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ dictory_type
+ $..DICTORY_TYPE
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ status
+ $..STATUS
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ delete_status
+ $..DELETE_STATUS
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ updatestatus
+ $..UPDATESTATUS
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ updatetime
+ $..UPDATETIME
+ None
+
+
+
+
+ -1
+ -1
+ none
+ N
+
+
+ 0
+ Y
+ N
+ result
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 551
+ 363
+ Y
+
+
diff --git a/casic-web/src/main/resources/config/application-test.yml b/casic-web/src/main/resources/config/application-test.yml
index 281d57f..b2777c8 100644
--- a/casic-web/src/main/resources/config/application-test.yml
+++ b/casic-web/src/main/resources/config/application-test.yml
@@ -1,6 +1,5 @@
server:
- port: 8080
-# context-path: /callcenter/api
+ port: 11307
################### spring配置 ###################
spring:
datasource:
@@ -11,24 +10,21 @@
min-idle: 1
jms:
pub-sub-domain: true
- # session:
- # store-type: redis
- redis:
- host: 127.0.0.1
- port: 6379
- password:
-
-#flowable数据源和多数据源配置
+# session:
+# store-type: redis
casic:
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/mockToken,/ws/**,/api/**
- flowable:
- datasource:
- url: jdbc:mysql://11.100.6.163:3306/callcenter_flowable?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull
- username: root
- password: Casic203
-elasticjob:
- enabled: false
+ # kaptcha-open: false #是否开启登录时验证码 (true/false)
+ nologin-urls: /user/login,/user/appLogin,/kaptcha,/config/baseConfig,/route/**,/ws/**,/api/**
+ #flowable数据源和多数据源配置账号 nsltt
+ tomcat: true #判断是否是tomcat启动 配置websocket加载
+ #密码geostar999
+# flowable:
+# datasource:
+# url: jdbc:mysql://localhost:3306/template_flowable?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull
+# username: root
+# password: Casic203!
+flowable:
+ checkProcessDefinitions: false #不校验process文件
logging:
level.root: info
level.com.casic: debug
diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml
index fd9bafb..c551992 100644
--- a/casic-web/src/main/resources/config/application.yml
+++ b/casic-web/src/main/resources/config/application.yml
@@ -22,7 +22,7 @@
session-invalidate-time: 86400 #session失效时间(只在单机环境下生效，,多机环境在SpringSessionConfig类中配置) 单位：秒
session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位：秒
nologin-urls: /user/login,/kaptcha,/config/baseConfig
- tomcat: false #判断是否是
+ tomcat: false #判断是否是tomcat启动 配置websocket加载
kettle:
pluginsPath: "D:\\dev-soft\\pdi\\pdi-ce-9.0.0.0-423\\plugins"
config: