diff --git a/casic-iot-web/pom.xml b/casic-iot-web/pom.xml
index c722e4b..d3ab3f8 100644
--- a/casic-iot-web/pom.xml
+++ b/casic-iot-web/pom.xml
@@ -69,9 +69,27 @@
maven-war-plugin
${maven.war.plugin.version}
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+ true
+ true
+
+
+ src/main/resources
+
+
+ /config/*/*
+ /config/*-*.yml
+
+ true
+
+
src/main/java
**/*.xml
diff --git a/casic-iot-web/pom.xml b/casic-iot-web/pom.xml
index c722e4b..d3ab3f8 100644
--- a/casic-iot-web/pom.xml
+++ b/casic-iot-web/pom.xml
@@ -69,9 +69,27 @@
maven-war-plugin
${maven.war.plugin.version}
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+ true
+ true
+
+
+ src/main/resources
+
+
+ /config/*/*
+ /config/*-*.yml
+
+ true
+
+
src/main/java
**/*.xml
diff --git a/casic-iot-web/src/main/resources/application-dev.yml b/casic-iot-web/src/main/resources/application-dev.yml
deleted file mode 100644
index bea40b6..0000000
--- a/casic-iot-web/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-server:
- port: 7093
-################### spring配置 ###################
-spring:
- datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://111.198.10.15:11336/casic_iot?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true
- username: root
- password: Casic203
- dynamic:
- primary: master #设置默认的数据源或者数据源组,默认值即为master
- strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
- datasource:
- master:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://111.198.10.15:11336/casic_iot?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true
- username: root
- password: Casic203
- use-ping-method: false
- sensorhub: #实现动态的双库操作,暂时不想合并
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://111.198.10.15:11336/smartwell_sensorhub?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&&useSSL=true
- username: root
- password: Casic203
- use-ping-method: false
- session:
- store-type: redis
- redis:
- host: 111.198.10.15
- port: 11412
- password: ew5T4K3#203lwh
- redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
-
-casic:
- device:
- redis:
- invalid-time: 86400
- config-prefix: 'Casic:'
- sysUrl: /sys
- #kaptcha-open: false #是否开启登录时验证码 (true/false)
- no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/v2/api-docs,/v2/api-docs-ext,/doc.html,/cockpit/**,/websocket/**,/webjars/**,/swagger-ui.html,/swagger-resources,/push/data
- #flowable数据源和多数据源配置
- db:
- init:
- enable: false
-logging:
- level.root: error
- level.com.casic: debug
- file:
- path: logs/
- name: missiles.log
\ No newline at end of file
diff --git a/casic-iot-web/pom.xml b/casic-iot-web/pom.xml
index c722e4b..d3ab3f8 100644
--- a/casic-iot-web/pom.xml
+++ b/casic-iot-web/pom.xml
@@ -69,9 +69,27 @@
maven-war-plugin
${maven.war.plugin.version}
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+ true
+ true
+
+
+ src/main/resources
+
+
+ /config/*/*
+ /config/*-*.yml
+
+ true
+
+
src/main/java
**/*.xml
diff --git a/casic-iot-web/src/main/resources/application-dev.yml b/casic-iot-web/src/main/resources/application-dev.yml
deleted file mode 100644
index bea40b6..0000000
--- a/casic-iot-web/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-server:
- port: 7093
-################### spring配置 ###################
-spring:
- datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://111.198.10.15:11336/casic_iot?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true
- username: root
- password: Casic203
- dynamic:
- primary: master #设置默认的数据源或者数据源组,默认值即为master
- strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
- datasource:
- master:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://111.198.10.15:11336/casic_iot?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true
- username: root
- password: Casic203
- use-ping-method: false
- sensorhub: #实现动态的双库操作,暂时不想合并
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://111.198.10.15:11336/smartwell_sensorhub?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&&useSSL=true
- username: root
- password: Casic203
- use-ping-method: false
- session:
- store-type: redis
- redis:
- host: 111.198.10.15
- port: 11412
- password: ew5T4K3#203lwh
- redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
-
-casic:
- device:
- redis:
- invalid-time: 86400
- config-prefix: 'Casic:'
- sysUrl: /sys
- #kaptcha-open: false #是否开启登录时验证码 (true/false)
- no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/v2/api-docs,/v2/api-docs-ext,/doc.html,/cockpit/**,/websocket/**,/webjars/**,/swagger-ui.html,/swagger-resources,/push/data
- #flowable数据源和多数据源配置
- db:
- init:
- enable: false
-logging:
- level.root: error
- level.com.casic: debug
- file:
- path: logs/
- name: missiles.log
\ No newline at end of file
diff --git a/casic-iot-web/src/main/resources/application.yml b/casic-iot-web/src/main/resources/application.yml
deleted file mode 100644
index 54e4a9c..0000000
--- a/casic-iot-web/src/main/resources/application.yml
+++ /dev/null
@@ -1,80 +0,0 @@
-#??sensorhub
-spring:
- profiles:
- active: dev
- main:
- allow-bean-definition-overriding: true #当遇到同样名字的时候,是否允许覆盖注册
- servlet:
- multipart:
- max-file-size: 50MB
- max-request-size: 80MB
- kafka:
- #kafka配置
- producer:
- # Kafka服务器
- bootstrap-servers: '111.198.10.15:12502'
- transaction-id-prefix: kafkaTx-
- retries: 3
- acks: all
- batch-size: 16384
- buffer-memory: 1024000
- consumer:
- # Kafka服务器
- bootstrap-servers: '111.198.10.15:12502'
- group-id: 1
- auto-offset-reset: latest
- enable-auto-commit: false
- max-poll-records: 3
- properties:
- max:
- poll:
- interval:
- ms: 600000
- session:
- timeout:
- ms: 10000
- listener:
- concurrency: 4
- ack-mode: manual_immediate
- missing-topics-fatal: false
-mybatis-plus:
- global-config:
- #字段策略 0:"所有字段都更新和插入" 1:"只更新和插入非NULL值" 2:"只更新和插入非NULL值且非空字符串"
- #field-strategy: 1
- enable-sql-runner: true
- db-config:
- insert-strategy: not_empty
- update-strategy: not_empty
- where-strategy: not_empty
- logic-delete-field: valid #全局逻辑删除实体字段名
- logic-delete-value: 0 #逻辑已删除值
- logic-not-delete-value: 1 #逻辑未删除值
- #MyBatis-Plus默认的主键策略是:ASSIGN_ID (使用了雪花算法)
- configuration:
- # 配置结果集属性为空时 是否映射返回结果
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
- map-underscore-to-camel-case: true
- mapper-locations: classpath*:/mapper/**/*.xml,classpath:com/casic/missiles/modular/system/dao/**/*.xml
-
-################### spring?? ###################
-casic:
- swagger-open: false #是否开启swagger (true/false)
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- muti-datasource-open: false #是否开启多数据源(true/false)
- spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
- session-invalidate-time: 86400 #session失效时间(只在单机环境下生效,,多机环境在SpringSessionConfig类中配置) 单位:秒
- session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位:秒
- no-login-urls: /user/login,/kaptcha,/config/baseConfig
- sensorhub:
- enable: true
-sensorhub:
- config:
- port: 7092
-
-#代码生成器配置
-code:
- generate:
- #作者
- author: cz
- #待生成对象表名
- table-name: product_data_item,product_config_item
\ No newline at end of file
diff --git a/casic-iot-web/pom.xml b/casic-iot-web/pom.xml
index c722e4b..d3ab3f8 100644
--- a/casic-iot-web/pom.xml
+++ b/casic-iot-web/pom.xml
@@ -69,9 +69,27 @@
maven-war-plugin
${maven.war.plugin.version}
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+ true
+ true
+
+
+ src/main/resources
+
+
+ /config/*/*
+ /config/*-*.yml
+
+ true
+
+
src/main/java
**/*.xml
diff --git a/casic-iot-web/src/main/resources/application-dev.yml b/casic-iot-web/src/main/resources/application-dev.yml
deleted file mode 100644
index bea40b6..0000000
--- a/casic-iot-web/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-server:
- port: 7093
-################### spring配置 ###################
-spring:
- datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://111.198.10.15:11336/casic_iot?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true
- username: root
- password: Casic203
- dynamic:
- primary: master #设置默认的数据源或者数据源组,默认值即为master
- strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
- datasource:
- master:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://111.198.10.15:11336/casic_iot?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true
- username: root
- password: Casic203
- use-ping-method: false
- sensorhub: #实现动态的双库操作,暂时不想合并
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://111.198.10.15:11336/smartwell_sensorhub?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&&useSSL=true
- username: root
- password: Casic203
- use-ping-method: false
- session:
- store-type: redis
- redis:
- host: 111.198.10.15
- port: 11412
- password: ew5T4K3#203lwh
- redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
-
-casic:
- device:
- redis:
- invalid-time: 86400
- config-prefix: 'Casic:'
- sysUrl: /sys
- #kaptcha-open: false #是否开启登录时验证码 (true/false)
- no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/v2/api-docs,/v2/api-docs-ext,/doc.html,/cockpit/**,/websocket/**,/webjars/**,/swagger-ui.html,/swagger-resources,/push/data
- #flowable数据源和多数据源配置
- db:
- init:
- enable: false
-logging:
- level.root: error
- level.com.casic: debug
- file:
- path: logs/
- name: missiles.log
\ No newline at end of file
diff --git a/casic-iot-web/src/main/resources/application.yml b/casic-iot-web/src/main/resources/application.yml
deleted file mode 100644
index 54e4a9c..0000000
--- a/casic-iot-web/src/main/resources/application.yml
+++ /dev/null
@@ -1,80 +0,0 @@
-#??sensorhub
-spring:
- profiles:
- active: dev
- main:
- allow-bean-definition-overriding: true #当遇到同样名字的时候,是否允许覆盖注册
- servlet:
- multipart:
- max-file-size: 50MB
- max-request-size: 80MB
- kafka:
- #kafka配置
- producer:
- # Kafka服务器
- bootstrap-servers: '111.198.10.15:12502'
- transaction-id-prefix: kafkaTx-
- retries: 3
- acks: all
- batch-size: 16384
- buffer-memory: 1024000
- consumer:
- # Kafka服务器
- bootstrap-servers: '111.198.10.15:12502'
- group-id: 1
- auto-offset-reset: latest
- enable-auto-commit: false
- max-poll-records: 3
- properties:
- max:
- poll:
- interval:
- ms: 600000
- session:
- timeout:
- ms: 10000
- listener:
- concurrency: 4
- ack-mode: manual_immediate
- missing-topics-fatal: false
-mybatis-plus:
- global-config:
- #字段策略 0:"所有字段都更新和插入" 1:"只更新和插入非NULL值" 2:"只更新和插入非NULL值且非空字符串"
- #field-strategy: 1
- enable-sql-runner: true
- db-config:
- insert-strategy: not_empty
- update-strategy: not_empty
- where-strategy: not_empty
- logic-delete-field: valid #全局逻辑删除实体字段名
- logic-delete-value: 0 #逻辑已删除值
- logic-not-delete-value: 1 #逻辑未删除值
- #MyBatis-Plus默认的主键策略是:ASSIGN_ID (使用了雪花算法)
- configuration:
- # 配置结果集属性为空时 是否映射返回结果
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
- map-underscore-to-camel-case: true
- mapper-locations: classpath*:/mapper/**/*.xml,classpath:com/casic/missiles/modular/system/dao/**/*.xml
-
-################### spring?? ###################
-casic:
- swagger-open: false #是否开启swagger (true/false)
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- muti-datasource-open: false #是否开启多数据源(true/false)
- spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
- session-invalidate-time: 86400 #session失效时间(只在单机环境下生效,,多机环境在SpringSessionConfig类中配置) 单位:秒
- session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位:秒
- no-login-urls: /user/login,/kaptcha,/config/baseConfig
- sensorhub:
- enable: true
-sensorhub:
- config:
- port: 7092
-
-#代码生成器配置
-code:
- generate:
- #作者
- author: cz
- #待生成对象表名
- table-name: product_data_item,product_config_item
\ No newline at end of file
diff --git a/casic-iot-web/src/main/resources/config/application-dev.yml b/casic-iot-web/src/main/resources/config/application-dev.yml
new file mode 100644
index 0000000..bea40b6
--- /dev/null
+++ b/casic-iot-web/src/main/resources/config/application-dev.yml
@@ -0,0 +1,51 @@
+server:
+ port: 7093
+################### spring配置 ###################
+spring:
+ datasource:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://111.198.10.15:11336/casic_iot?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true
+ username: root
+ password: Casic203
+ dynamic:
+ primary: master #设置默认的数据源或者数据源组,默认值即为master
+ strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
+ datasource:
+ master:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://111.198.10.15:11336/casic_iot?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true
+ username: root
+ password: Casic203
+ use-ping-method: false
+ sensorhub: #实现动态的双库操作,暂时不想合并
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://111.198.10.15:11336/smartwell_sensorhub?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&&useSSL=true
+ username: root
+ password: Casic203
+ use-ping-method: false
+ session:
+ store-type: redis
+ redis:
+ host: 111.198.10.15
+ port: 11412
+ password: ew5T4K3#203lwh
+ redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
+
+casic:
+ device:
+ redis:
+ invalid-time: 86400
+ config-prefix: 'Casic:'
+ sysUrl: /sys
+ #kaptcha-open: false #是否开启登录时验证码 (true/false)
+ no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/v2/api-docs,/v2/api-docs-ext,/doc.html,/cockpit/**,/websocket/**,/webjars/**,/swagger-ui.html,/swagger-resources,/push/data
+ #flowable数据源和多数据源配置
+ db:
+ init:
+ enable: false
+logging:
+ level.root: error
+ level.com.casic: debug
+ file:
+ path: logs/
+ name: missiles.log
\ No newline at end of file
diff --git a/casic-iot-web/pom.xml b/casic-iot-web/pom.xml
index c722e4b..d3ab3f8 100644
--- a/casic-iot-web/pom.xml
+++ b/casic-iot-web/pom.xml
@@ -69,9 +69,27 @@
maven-war-plugin
${maven.war.plugin.version}
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+ true
+ true
+
+
+ src/main/resources
+
+
+ /config/*/*
+ /config/*-*.yml
+
+ true
+
+
src/main/java
**/*.xml
diff --git a/casic-iot-web/src/main/resources/application-dev.yml b/casic-iot-web/src/main/resources/application-dev.yml
deleted file mode 100644
index bea40b6..0000000
--- a/casic-iot-web/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-server:
- port: 7093
-################### spring配置 ###################
-spring:
- datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://111.198.10.15:11336/casic_iot?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true
- username: root
- password: Casic203
- dynamic:
- primary: master #设置默认的数据源或者数据源组,默认值即为master
- strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
- datasource:
- master:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://111.198.10.15:11336/casic_iot?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true
- username: root
- password: Casic203
- use-ping-method: false
- sensorhub: #实现动态的双库操作,暂时不想合并
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://111.198.10.15:11336/smartwell_sensorhub?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&&useSSL=true
- username: root
- password: Casic203
- use-ping-method: false
- session:
- store-type: redis
- redis:
- host: 111.198.10.15
- port: 11412
- password: ew5T4K3#203lwh
- redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
-
-casic:
- device:
- redis:
- invalid-time: 86400
- config-prefix: 'Casic:'
- sysUrl: /sys
- #kaptcha-open: false #是否开启登录时验证码 (true/false)
- no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/v2/api-docs,/v2/api-docs-ext,/doc.html,/cockpit/**,/websocket/**,/webjars/**,/swagger-ui.html,/swagger-resources,/push/data
- #flowable数据源和多数据源配置
- db:
- init:
- enable: false
-logging:
- level.root: error
- level.com.casic: debug
- file:
- path: logs/
- name: missiles.log
\ No newline at end of file
diff --git a/casic-iot-web/src/main/resources/application.yml b/casic-iot-web/src/main/resources/application.yml
deleted file mode 100644
index 54e4a9c..0000000
--- a/casic-iot-web/src/main/resources/application.yml
+++ /dev/null
@@ -1,80 +0,0 @@
-#??sensorhub
-spring:
- profiles:
- active: dev
- main:
- allow-bean-definition-overriding: true #当遇到同样名字的时候,是否允许覆盖注册
- servlet:
- multipart:
- max-file-size: 50MB
- max-request-size: 80MB
- kafka:
- #kafka配置
- producer:
- # Kafka服务器
- bootstrap-servers: '111.198.10.15:12502'
- transaction-id-prefix: kafkaTx-
- retries: 3
- acks: all
- batch-size: 16384
- buffer-memory: 1024000
- consumer:
- # Kafka服务器
- bootstrap-servers: '111.198.10.15:12502'
- group-id: 1
- auto-offset-reset: latest
- enable-auto-commit: false
- max-poll-records: 3
- properties:
- max:
- poll:
- interval:
- ms: 600000
- session:
- timeout:
- ms: 10000
- listener:
- concurrency: 4
- ack-mode: manual_immediate
- missing-topics-fatal: false
-mybatis-plus:
- global-config:
- #字段策略 0:"所有字段都更新和插入" 1:"只更新和插入非NULL值" 2:"只更新和插入非NULL值且非空字符串"
- #field-strategy: 1
- enable-sql-runner: true
- db-config:
- insert-strategy: not_empty
- update-strategy: not_empty
- where-strategy: not_empty
- logic-delete-field: valid #全局逻辑删除实体字段名
- logic-delete-value: 0 #逻辑已删除值
- logic-not-delete-value: 1 #逻辑未删除值
- #MyBatis-Plus默认的主键策略是:ASSIGN_ID (使用了雪花算法)
- configuration:
- # 配置结果集属性为空时 是否映射返回结果
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
- map-underscore-to-camel-case: true
- mapper-locations: classpath*:/mapper/**/*.xml,classpath:com/casic/missiles/modular/system/dao/**/*.xml
-
-################### spring?? ###################
-casic:
- swagger-open: false #是否开启swagger (true/false)
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- muti-datasource-open: false #是否开启多数据源(true/false)
- spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
- session-invalidate-time: 86400 #session失效时间(只在单机环境下生效,,多机环境在SpringSessionConfig类中配置) 单位:秒
- session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位:秒
- no-login-urls: /user/login,/kaptcha,/config/baseConfig
- sensorhub:
- enable: true
-sensorhub:
- config:
- port: 7092
-
-#代码生成器配置
-code:
- generate:
- #作者
- author: cz
- #待生成对象表名
- table-name: product_data_item,product_config_item
\ No newline at end of file
diff --git a/casic-iot-web/src/main/resources/config/application-dev.yml b/casic-iot-web/src/main/resources/config/application-dev.yml
new file mode 100644
index 0000000..bea40b6
--- /dev/null
+++ b/casic-iot-web/src/main/resources/config/application-dev.yml
@@ -0,0 +1,51 @@
+server:
+ port: 7093
+################### spring配置 ###################
+spring:
+ datasource:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://111.198.10.15:11336/casic_iot?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true
+ username: root
+ password: Casic203
+ dynamic:
+ primary: master #设置默认的数据源或者数据源组,默认值即为master
+ strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
+ datasource:
+ master:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://111.198.10.15:11336/casic_iot?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true
+ username: root
+ password: Casic203
+ use-ping-method: false
+ sensorhub: #实现动态的双库操作,暂时不想合并
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://111.198.10.15:11336/smartwell_sensorhub?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&&useSSL=true
+ username: root
+ password: Casic203
+ use-ping-method: false
+ session:
+ store-type: redis
+ redis:
+ host: 111.198.10.15
+ port: 11412
+ password: ew5T4K3#203lwh
+ redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
+
+casic:
+ device:
+ redis:
+ invalid-time: 86400
+ config-prefix: 'Casic:'
+ sysUrl: /sys
+ #kaptcha-open: false #是否开启登录时验证码 (true/false)
+ no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/v2/api-docs,/v2/api-docs-ext,/doc.html,/cockpit/**,/websocket/**,/webjars/**,/swagger-ui.html,/swagger-resources,/push/data
+ #flowable数据源和多数据源配置
+ db:
+ init:
+ enable: false
+logging:
+ level.root: error
+ level.com.casic: debug
+ file:
+ path: logs/
+ name: missiles.log
\ No newline at end of file
diff --git a/casic-iot-web/src/main/resources/config/application.yml b/casic-iot-web/src/main/resources/config/application.yml
new file mode 100644
index 0000000..54e4a9c
--- /dev/null
+++ b/casic-iot-web/src/main/resources/config/application.yml
@@ -0,0 +1,80 @@
+#??sensorhub
+spring:
+ profiles:
+ active: dev
+ main:
+ allow-bean-definition-overriding: true #当遇到同样名字的时候,是否允许覆盖注册
+ servlet:
+ multipart:
+ max-file-size: 50MB
+ max-request-size: 80MB
+ kafka:
+ #kafka配置
+ producer:
+ # Kafka服务器
+ bootstrap-servers: '111.198.10.15:12502'
+ transaction-id-prefix: kafkaTx-
+ retries: 3
+ acks: all
+ batch-size: 16384
+ buffer-memory: 1024000
+ consumer:
+ # Kafka服务器
+ bootstrap-servers: '111.198.10.15:12502'
+ group-id: 1
+ auto-offset-reset: latest
+ enable-auto-commit: false
+ max-poll-records: 3
+ properties:
+ max:
+ poll:
+ interval:
+ ms: 600000
+ session:
+ timeout:
+ ms: 10000
+ listener:
+ concurrency: 4
+ ack-mode: manual_immediate
+ missing-topics-fatal: false
+mybatis-plus:
+ global-config:
+ #字段策略 0:"所有字段都更新和插入" 1:"只更新和插入非NULL值" 2:"只更新和插入非NULL值且非空字符串"
+ #field-strategy: 1
+ enable-sql-runner: true
+ db-config:
+ insert-strategy: not_empty
+ update-strategy: not_empty
+ where-strategy: not_empty
+ logic-delete-field: valid #全局逻辑删除实体字段名
+ logic-delete-value: 0 #逻辑已删除值
+ logic-not-delete-value: 1 #逻辑未删除值
+ #MyBatis-Plus默认的主键策略是:ASSIGN_ID (使用了雪花算法)
+ configuration:
+ # 配置结果集属性为空时 是否映射返回结果
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
+ map-underscore-to-camel-case: true
+ mapper-locations: classpath*:/mapper/**/*.xml,classpath:com/casic/missiles/modular/system/dao/**/*.xml
+
+################### spring?? ###################
+casic:
+ swagger-open: false #是否开启swagger (true/false)
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ muti-datasource-open: false #是否开启多数据源(true/false)
+ spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
+ session-invalidate-time: 86400 #session失效时间(只在单机环境下生效,,多机环境在SpringSessionConfig类中配置) 单位:秒
+ session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位:秒
+ no-login-urls: /user/login,/kaptcha,/config/baseConfig
+ sensorhub:
+ enable: true
+sensorhub:
+ config:
+ port: 7092
+
+#代码生成器配置
+code:
+ generate:
+ #作者
+ author: cz
+ #待生成对象表名
+ table-name: product_data_item,product_config_item
\ No newline at end of file
diff --git a/casic-iot-web/pom.xml b/casic-iot-web/pom.xml
index c722e4b..d3ab3f8 100644
--- a/casic-iot-web/pom.xml
+++ b/casic-iot-web/pom.xml
@@ -69,9 +69,27 @@
maven-war-plugin
${maven.war.plugin.version}
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+ true
+ true
+
+
+ src/main/resources
+
+
+ /config/*/*
+ /config/*-*.yml
+
+ true
+
+
src/main/java
**/*.xml
diff --git a/casic-iot-web/src/main/resources/application-dev.yml b/casic-iot-web/src/main/resources/application-dev.yml
deleted file mode 100644
index bea40b6..0000000
--- a/casic-iot-web/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-server:
- port: 7093
-################### spring配置 ###################
-spring:
- datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://111.198.10.15:11336/casic_iot?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true
- username: root
- password: Casic203
- dynamic:
- primary: master #设置默认的数据源或者数据源组,默认值即为master
- strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
- datasource:
- master:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://111.198.10.15:11336/casic_iot?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true
- username: root
- password: Casic203
- use-ping-method: false
- sensorhub: #实现动态的双库操作,暂时不想合并
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://111.198.10.15:11336/smartwell_sensorhub?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&&useSSL=true
- username: root
- password: Casic203
- use-ping-method: false
- session:
- store-type: redis
- redis:
- host: 111.198.10.15
- port: 11412
- password: ew5T4K3#203lwh
- redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
-
-casic:
- device:
- redis:
- invalid-time: 86400
- config-prefix: 'Casic:'
- sysUrl: /sys
- #kaptcha-open: false #是否开启登录时验证码 (true/false)
- no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/v2/api-docs,/v2/api-docs-ext,/doc.html,/cockpit/**,/websocket/**,/webjars/**,/swagger-ui.html,/swagger-resources,/push/data
- #flowable数据源和多数据源配置
- db:
- init:
- enable: false
-logging:
- level.root: error
- level.com.casic: debug
- file:
- path: logs/
- name: missiles.log
\ No newline at end of file
diff --git a/casic-iot-web/src/main/resources/application.yml b/casic-iot-web/src/main/resources/application.yml
deleted file mode 100644
index 54e4a9c..0000000
--- a/casic-iot-web/src/main/resources/application.yml
+++ /dev/null
@@ -1,80 +0,0 @@
-#??sensorhub
-spring:
- profiles:
- active: dev
- main:
- allow-bean-definition-overriding: true #当遇到同样名字的时候,是否允许覆盖注册
- servlet:
- multipart:
- max-file-size: 50MB
- max-request-size: 80MB
- kafka:
- #kafka配置
- producer:
- # Kafka服务器
- bootstrap-servers: '111.198.10.15:12502'
- transaction-id-prefix: kafkaTx-
- retries: 3
- acks: all
- batch-size: 16384
- buffer-memory: 1024000
- consumer:
- # Kafka服务器
- bootstrap-servers: '111.198.10.15:12502'
- group-id: 1
- auto-offset-reset: latest
- enable-auto-commit: false
- max-poll-records: 3
- properties:
- max:
- poll:
- interval:
- ms: 600000
- session:
- timeout:
- ms: 10000
- listener:
- concurrency: 4
- ack-mode: manual_immediate
- missing-topics-fatal: false
-mybatis-plus:
- global-config:
- #字段策略 0:"所有字段都更新和插入" 1:"只更新和插入非NULL值" 2:"只更新和插入非NULL值且非空字符串"
- #field-strategy: 1
- enable-sql-runner: true
- db-config:
- insert-strategy: not_empty
- update-strategy: not_empty
- where-strategy: not_empty
- logic-delete-field: valid #全局逻辑删除实体字段名
- logic-delete-value: 0 #逻辑已删除值
- logic-not-delete-value: 1 #逻辑未删除值
- #MyBatis-Plus默认的主键策略是:ASSIGN_ID (使用了雪花算法)
- configuration:
- # 配置结果集属性为空时 是否映射返回结果
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
- map-underscore-to-camel-case: true
- mapper-locations: classpath*:/mapper/**/*.xml,classpath:com/casic/missiles/modular/system/dao/**/*.xml
-
-################### spring?? ###################
-casic:
- swagger-open: false #是否开启swagger (true/false)
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- muti-datasource-open: false #是否开启多数据源(true/false)
- spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
- session-invalidate-time: 86400 #session失效时间(只在单机环境下生效,,多机环境在SpringSessionConfig类中配置) 单位:秒
- session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位:秒
- no-login-urls: /user/login,/kaptcha,/config/baseConfig
- sensorhub:
- enable: true
-sensorhub:
- config:
- port: 7092
-
-#代码生成器配置
-code:
- generate:
- #作者
- author: cz
- #待生成对象表名
- table-name: product_data_item,product_config_item
\ No newline at end of file
diff --git a/casic-iot-web/src/main/resources/config/application-dev.yml b/casic-iot-web/src/main/resources/config/application-dev.yml
new file mode 100644
index 0000000..bea40b6
--- /dev/null
+++ b/casic-iot-web/src/main/resources/config/application-dev.yml
@@ -0,0 +1,51 @@
+server:
+ port: 7093
+################### spring配置 ###################
+spring:
+ datasource:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://111.198.10.15:11336/casic_iot?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true
+ username: root
+ password: Casic203
+ dynamic:
+ primary: master #设置默认的数据源或者数据源组,默认值即为master
+ strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
+ datasource:
+ master:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://111.198.10.15:11336/casic_iot?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true
+ username: root
+ password: Casic203
+ use-ping-method: false
+ sensorhub: #实现动态的双库操作,暂时不想合并
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://111.198.10.15:11336/smartwell_sensorhub?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&&useSSL=true
+ username: root
+ password: Casic203
+ use-ping-method: false
+ session:
+ store-type: redis
+ redis:
+ host: 111.198.10.15
+ port: 11412
+ password: ew5T4K3#203lwh
+ redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
+
+casic:
+ device:
+ redis:
+ invalid-time: 86400
+ config-prefix: 'Casic:'
+ sysUrl: /sys
+ #kaptcha-open: false #是否开启登录时验证码 (true/false)
+ no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/v2/api-docs,/v2/api-docs-ext,/doc.html,/cockpit/**,/websocket/**,/webjars/**,/swagger-ui.html,/swagger-resources,/push/data
+ #flowable数据源和多数据源配置
+ db:
+ init:
+ enable: false
+logging:
+ level.root: error
+ level.com.casic: debug
+ file:
+ path: logs/
+ name: missiles.log
\ No newline at end of file
diff --git a/casic-iot-web/src/main/resources/config/application.yml b/casic-iot-web/src/main/resources/config/application.yml
new file mode 100644
index 0000000..54e4a9c
--- /dev/null
+++ b/casic-iot-web/src/main/resources/config/application.yml
@@ -0,0 +1,80 @@
+#??sensorhub
+spring:
+ profiles:
+ active: dev
+ main:
+ allow-bean-definition-overriding: true #当遇到同样名字的时候,是否允许覆盖注册
+ servlet:
+ multipart:
+ max-file-size: 50MB
+ max-request-size: 80MB
+ kafka:
+ #kafka配置
+ producer:
+ # Kafka服务器
+ bootstrap-servers: '111.198.10.15:12502'
+ transaction-id-prefix: kafkaTx-
+ retries: 3
+ acks: all
+ batch-size: 16384
+ buffer-memory: 1024000
+ consumer:
+ # Kafka服务器
+ bootstrap-servers: '111.198.10.15:12502'
+ group-id: 1
+ auto-offset-reset: latest
+ enable-auto-commit: false
+ max-poll-records: 3
+ properties:
+ max:
+ poll:
+ interval:
+ ms: 600000
+ session:
+ timeout:
+ ms: 10000
+ listener:
+ concurrency: 4
+ ack-mode: manual_immediate
+ missing-topics-fatal: false
+mybatis-plus:
+ global-config:
+ #字段策略 0:"所有字段都更新和插入" 1:"只更新和插入非NULL值" 2:"只更新和插入非NULL值且非空字符串"
+ #field-strategy: 1
+ enable-sql-runner: true
+ db-config:
+ insert-strategy: not_empty
+ update-strategy: not_empty
+ where-strategy: not_empty
+ logic-delete-field: valid #全局逻辑删除实体字段名
+ logic-delete-value: 0 #逻辑已删除值
+ logic-not-delete-value: 1 #逻辑未删除值
+ #MyBatis-Plus默认的主键策略是:ASSIGN_ID (使用了雪花算法)
+ configuration:
+ # 配置结果集属性为空时 是否映射返回结果
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
+ map-underscore-to-camel-case: true
+ mapper-locations: classpath*:/mapper/**/*.xml,classpath:com/casic/missiles/modular/system/dao/**/*.xml
+
+################### spring?? ###################
+casic:
+ swagger-open: false #是否开启swagger (true/false)
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ muti-datasource-open: false #是否开启多数据源(true/false)
+ spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
+ session-invalidate-time: 86400 #session失效时间(只在单机环境下生效,,多机环境在SpringSessionConfig类中配置) 单位:秒
+ session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位:秒
+ no-login-urls: /user/login,/kaptcha,/config/baseConfig
+ sensorhub:
+ enable: true
+sensorhub:
+ config:
+ port: 7092
+
+#代码生成器配置
+code:
+ generate:
+ #作者
+ author: cz
+ #待生成对象表名
+ table-name: product_data_item,product_config_item
\ No newline at end of file
diff --git a/casic-iot-web/src/main/resources/config/logback-spring.xml b/casic-iot-web/src/main/resources/config/logback-spring.xml
new file mode 100644
index 0000000..c0c7ac9
--- /dev/null
+++ b/casic-iot-web/src/main/resources/config/logback-spring.xml
@@ -0,0 +1,113 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ ${CONSOLE_LOG_PATTERN}
+ utf-8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${CONSOLE_LOG_PATTERN}
+ utf-8
+
+
+
+
+
+
+
+ ${LOG_PATH}/missiles_error.log
+
+
+
+
+
+ ${LOG_PATH}/error/log-error-%d{yyyy-MM-dd}.%i.log
+
+
+
+ 10MB
+
+
+
+
+ true
+
+
+
+ ${FILE_LOG_PATTERN}
+ utf-8
+
+
+
+
+ error
+ ACCEPT
+ DENY
+
+
+
+
+
+
+
+ ${LOG_PATH}/missiles_total.log
+
+
+
+
+
+ ${LOG_PATH}/total/log-total-%d{yyyy-MM-dd}.%i.log
+
+
+
+ 10MB
+
+
+
+
+ true
+
+
+
+ ${FILE_LOG_PATTERN}
+ utf-8
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/casic-iot-web/pom.xml b/casic-iot-web/pom.xml
index c722e4b..d3ab3f8 100644
--- a/casic-iot-web/pom.xml
+++ b/casic-iot-web/pom.xml
@@ -69,9 +69,27 @@
maven-war-plugin
${maven.war.plugin.version}
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+ true
+ true
+
+
+ src/main/resources
+
+
+ /config/*/*
+ /config/*-*.yml
+
+ true
+
+
src/main/java
**/*.xml
diff --git a/casic-iot-web/src/main/resources/application-dev.yml b/casic-iot-web/src/main/resources/application-dev.yml
deleted file mode 100644
index bea40b6..0000000
--- a/casic-iot-web/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-server:
- port: 7093
-################### spring配置 ###################
-spring:
- datasource:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://111.198.10.15:11336/casic_iot?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true
- username: root
- password: Casic203
- dynamic:
- primary: master #设置默认的数据源或者数据源组,默认值即为master
- strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
- datasource:
- master:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://111.198.10.15:11336/casic_iot?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true
- username: root
- password: Casic203
- use-ping-method: false
- sensorhub: #实现动态的双库操作,暂时不想合并
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://111.198.10.15:11336/smartwell_sensorhub?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&&useSSL=true
- username: root
- password: Casic203
- use-ping-method: false
- session:
- store-type: redis
- redis:
- host: 111.198.10.15
- port: 11412
- password: ew5T4K3#203lwh
- redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
-
-casic:
- device:
- redis:
- invalid-time: 86400
- config-prefix: 'Casic:'
- sysUrl: /sys
- #kaptcha-open: false #是否开启登录时验证码 (true/false)
- no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/v2/api-docs,/v2/api-docs-ext,/doc.html,/cockpit/**,/websocket/**,/webjars/**,/swagger-ui.html,/swagger-resources,/push/data
- #flowable数据源和多数据源配置
- db:
- init:
- enable: false
-logging:
- level.root: error
- level.com.casic: debug
- file:
- path: logs/
- name: missiles.log
\ No newline at end of file
diff --git a/casic-iot-web/src/main/resources/application.yml b/casic-iot-web/src/main/resources/application.yml
deleted file mode 100644
index 54e4a9c..0000000
--- a/casic-iot-web/src/main/resources/application.yml
+++ /dev/null
@@ -1,80 +0,0 @@
-#??sensorhub
-spring:
- profiles:
- active: dev
- main:
- allow-bean-definition-overriding: true #当遇到同样名字的时候,是否允许覆盖注册
- servlet:
- multipart:
- max-file-size: 50MB
- max-request-size: 80MB
- kafka:
- #kafka配置
- producer:
- # Kafka服务器
- bootstrap-servers: '111.198.10.15:12502'
- transaction-id-prefix: kafkaTx-
- retries: 3
- acks: all
- batch-size: 16384
- buffer-memory: 1024000
- consumer:
- # Kafka服务器
- bootstrap-servers: '111.198.10.15:12502'
- group-id: 1
- auto-offset-reset: latest
- enable-auto-commit: false
- max-poll-records: 3
- properties:
- max:
- poll:
- interval:
- ms: 600000
- session:
- timeout:
- ms: 10000
- listener:
- concurrency: 4
- ack-mode: manual_immediate
- missing-topics-fatal: false
-mybatis-plus:
- global-config:
- #字段策略 0:"所有字段都更新和插入" 1:"只更新和插入非NULL值" 2:"只更新和插入非NULL值且非空字符串"
- #field-strategy: 1
- enable-sql-runner: true
- db-config:
- insert-strategy: not_empty
- update-strategy: not_empty
- where-strategy: not_empty
- logic-delete-field: valid #全局逻辑删除实体字段名
- logic-delete-value: 0 #逻辑已删除值
- logic-not-delete-value: 1 #逻辑未删除值
- #MyBatis-Plus默认的主键策略是:ASSIGN_ID (使用了雪花算法)
- configuration:
- # 配置结果集属性为空时 是否映射返回结果
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
- map-underscore-to-camel-case: true
- mapper-locations: classpath*:/mapper/**/*.xml,classpath:com/casic/missiles/modular/system/dao/**/*.xml
-
-################### spring?? ###################
-casic:
- swagger-open: false #是否开启swagger (true/false)
- kaptcha-open: false #是否开启登录时验证码 (true/false)
- muti-datasource-open: false #是否开启多数据源(true/false)
- spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
- session-invalidate-time: 86400 #session失效时间(只在单机环境下生效,,多机环境在SpringSessionConfig类中配置) 单位:秒
- session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位:秒
- no-login-urls: /user/login,/kaptcha,/config/baseConfig
- sensorhub:
- enable: true
-sensorhub:
- config:
- port: 7092
-
-#代码生成器配置
-code:
- generate:
- #作者
- author: cz
- #待生成对象表名
- table-name: product_data_item,product_config_item
\ No newline at end of file
diff --git a/casic-iot-web/src/main/resources/config/application-dev.yml b/casic-iot-web/src/main/resources/config/application-dev.yml
new file mode 100644
index 0000000..bea40b6
--- /dev/null
+++ b/casic-iot-web/src/main/resources/config/application-dev.yml
@@ -0,0 +1,51 @@
+server:
+ port: 7093
+################### spring配置 ###################
+spring:
+ datasource:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://111.198.10.15:11336/casic_iot?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true
+ username: root
+ password: Casic203
+ dynamic:
+ primary: master #设置默认的数据源或者数据源组,默认值即为master
+ strict: false #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
+ datasource:
+ master:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://111.198.10.15:11336/casic_iot?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true
+ username: root
+ password: Casic203
+ use-ping-method: false
+ sensorhub: #实现动态的双库操作,暂时不想合并
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://111.198.10.15:11336/smartwell_sensorhub?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&&allowMultiQueries=true&&useSSL=true
+ username: root
+ password: Casic203
+ use-ping-method: false
+ session:
+ store-type: redis
+ redis:
+ host: 111.198.10.15
+ port: 11412
+ password: ew5T4K3#203lwh
+ redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
+
+casic:
+ device:
+ redis:
+ invalid-time: 86400
+ config-prefix: 'Casic:'
+ sysUrl: /sys
+ #kaptcha-open: false #是否开启登录时验证码 (true/false)
+ no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/v2/api-docs,/v2/api-docs-ext,/doc.html,/cockpit/**,/websocket/**,/webjars/**,/swagger-ui.html,/swagger-resources,/push/data
+ #flowable数据源和多数据源配置
+ db:
+ init:
+ enable: false
+logging:
+ level.root: error
+ level.com.casic: debug
+ file:
+ path: logs/
+ name: missiles.log
\ No newline at end of file
diff --git a/casic-iot-web/src/main/resources/config/application.yml b/casic-iot-web/src/main/resources/config/application.yml
new file mode 100644
index 0000000..54e4a9c
--- /dev/null
+++ b/casic-iot-web/src/main/resources/config/application.yml
@@ -0,0 +1,80 @@
+#??sensorhub
+spring:
+ profiles:
+ active: dev
+ main:
+ allow-bean-definition-overriding: true #当遇到同样名字的时候,是否允许覆盖注册
+ servlet:
+ multipart:
+ max-file-size: 50MB
+ max-request-size: 80MB
+ kafka:
+ #kafka配置
+ producer:
+ # Kafka服务器
+ bootstrap-servers: '111.198.10.15:12502'
+ transaction-id-prefix: kafkaTx-
+ retries: 3
+ acks: all
+ batch-size: 16384
+ buffer-memory: 1024000
+ consumer:
+ # Kafka服务器
+ bootstrap-servers: '111.198.10.15:12502'
+ group-id: 1
+ auto-offset-reset: latest
+ enable-auto-commit: false
+ max-poll-records: 3
+ properties:
+ max:
+ poll:
+ interval:
+ ms: 600000
+ session:
+ timeout:
+ ms: 10000
+ listener:
+ concurrency: 4
+ ack-mode: manual_immediate
+ missing-topics-fatal: false
+mybatis-plus:
+ global-config:
+ #字段策略 0:"所有字段都更新和插入" 1:"只更新和插入非NULL值" 2:"只更新和插入非NULL值且非空字符串"
+ #field-strategy: 1
+ enable-sql-runner: true
+ db-config:
+ insert-strategy: not_empty
+ update-strategy: not_empty
+ where-strategy: not_empty
+ logic-delete-field: valid #全局逻辑删除实体字段名
+ logic-delete-value: 0 #逻辑已删除值
+ logic-not-delete-value: 1 #逻辑未删除值
+ #MyBatis-Plus默认的主键策略是:ASSIGN_ID (使用了雪花算法)
+ configuration:
+ # 配置结果集属性为空时 是否映射返回结果
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
+ map-underscore-to-camel-case: true
+ mapper-locations: classpath*:/mapper/**/*.xml,classpath:com/casic/missiles/modular/system/dao/**/*.xml
+
+################### spring?? ###################
+casic:
+ swagger-open: false #是否开启swagger (true/false)
+ kaptcha-open: false #是否开启登录时验证码 (true/false)
+ muti-datasource-open: false #是否开启多数据源(true/false)
+ spring-session-open: false #是否开启spring session,如果是多机环境需要开启(true/false)
+ session-invalidate-time: 86400 #session失效时间(只在单机环境下生效,,多机环境在SpringSessionConfig类中配置) 单位:秒
+ session-validation-interval: 900 #多久检测一次失效的session(只在单机环境下生效) 单位:秒
+ no-login-urls: /user/login,/kaptcha,/config/baseConfig
+ sensorhub:
+ enable: true
+sensorhub:
+ config:
+ port: 7092
+
+#代码生成器配置
+code:
+ generate:
+ #作者
+ author: cz
+ #待生成对象表名
+ table-name: product_data_item,product_config_item
\ No newline at end of file
diff --git a/casic-iot-web/src/main/resources/config/logback-spring.xml b/casic-iot-web/src/main/resources/config/logback-spring.xml
new file mode 100644
index 0000000..c0c7ac9
--- /dev/null
+++ b/casic-iot-web/src/main/resources/config/logback-spring.xml
@@ -0,0 +1,113 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ ${CONSOLE_LOG_PATTERN}
+ utf-8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${CONSOLE_LOG_PATTERN}
+ utf-8
+
+
+
+
+
+
+
+ ${LOG_PATH}/missiles_error.log
+
+
+
+
+
+ ${LOG_PATH}/error/log-error-%d{yyyy-MM-dd}.%i.log
+
+
+
+ 10MB
+
+
+
+
+ true
+
+
+
+ ${FILE_LOG_PATTERN}
+ utf-8
+
+
+
+
+ error
+ ACCEPT
+ DENY
+
+
+
+
+
+
+
+ ${LOG_PATH}/missiles_total.log
+
+
+
+
+
+ ${LOG_PATH}/total/log-total-%d{yyyy-MM-dd}.%i.log
+
+
+
+ 10MB
+
+
+
+
+ true
+
+
+
+ ${FILE_LOG_PATTERN}
+ utf-8
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/casic-iot-web/src/main/resources/logback-spring.xml b/casic-iot-web/src/main/resources/logback-spring.xml
deleted file mode 100644
index c0c7ac9..0000000
--- a/casic-iot-web/src/main/resources/logback-spring.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- ${CONSOLE_LOG_PATTERN}
- utf-8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${CONSOLE_LOG_PATTERN}
- utf-8
-
-
-
-
-
-
-
- ${LOG_PATH}/missiles_error.log
-
-
-
-
-
- ${LOG_PATH}/error/log-error-%d{yyyy-MM-dd}.%i.log
-
-
-
- 10MB
-
-
-
-
- true
-
-
-
- ${FILE_LOG_PATTERN}
- utf-8
-
-
-
-
- error
- ACCEPT
- DENY
-
-
-
-
-
-
-
- ${LOG_PATH}/missiles_total.log
-
-
-
-
-
- ${LOG_PATH}/total/log-total-%d{yyyy-MM-dd}.%i.log
-
-
-
- 10MB
-
-
-
-
- true
-
-
-
- ${FILE_LOG_PATTERN}
- utf-8
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file