diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index 56028f7..1f95e28 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -115,11 +115,6 @@
casic-server
${pro.version}
-
- com.casic
- casic-ptz
- ${pro.version}
-
org.springframework.boot
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index 56028f7..1f95e28 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -115,11 +115,6 @@
casic-server
${pro.version}
-
- com.casic
- casic-ptz
- ${pro.version}
-
org.springframework.boot
diff --git a/casic-web/src/main/resources/config/application-test.yml b/casic-web/src/main/resources/config/application-test.yml
index a5c5ed9..6248121 100644
--- a/casic-web/src/main/resources/config/application-test.yml
+++ b/casic-web/src/main/resources/config/application-test.yml
@@ -4,18 +4,25 @@
spring:
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://192.168.1.41:3000/casic_robot_inspection?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true
+ url: jdbc:mysql://localhost:3306/casic-production-safety?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true
username: root
- password: root
+ password: 123456
druid:
max-active: 50
min-idle: 20
jms:
pub-sub-domain: true
+# session:
+# store-type: redis
+# redis:
+# host: 111.198.10.15
+# port: 11412
+# password: ew5T4K3#203lwh
+# serializer: org.springframework.data.redis.serializer.StringRedisSerializer
+# redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
casic:
#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,/websocket/*,/webjars/**,/v2/api-docs,/v2/api-docs-ext,/doc.html,/v2/api-docs/swagger-ui.html,/swagger-resources
- #flowable数据源和多数据源配置
db:
init:
enable: false
@@ -26,4 +33,4 @@
level.com.casic.missiles.modular.neutron: error
level.org.springframework.web: info
file:
- path: D:\\logs
\ No newline at end of file
+ path: D:\workspace\server\keti\casic-production-safety\casic-web\\logs
\ No newline at end of file
diff --git a/casic-web/pom.xml b/casic-web/pom.xml
index 56028f7..1f95e28 100644
--- a/casic-web/pom.xml
+++ b/casic-web/pom.xml
@@ -115,11 +115,6 @@
casic-server
${pro.version}
-
- com.casic
- casic-ptz
- ${pro.version}
-
org.springframework.boot
diff --git a/casic-web/src/main/resources/config/application-test.yml b/casic-web/src/main/resources/config/application-test.yml
index a5c5ed9..6248121 100644
--- a/casic-web/src/main/resources/config/application-test.yml
+++ b/casic-web/src/main/resources/config/application-test.yml
@@ -4,18 +4,25 @@
spring:
datasource:
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://192.168.1.41:3000/casic_robot_inspection?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true
+ url: jdbc:mysql://localhost:3306/casic-production-safety?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true
username: root
- password: root
+ password: 123456
druid:
max-active: 50
min-idle: 20
jms:
pub-sub-domain: true
+# session:
+# store-type: redis
+# redis:
+# host: 111.198.10.15
+# port: 11412
+# password: ew5T4K3#203lwh
+# serializer: org.springframework.data.redis.serializer.StringRedisSerializer
+# redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
casic:
#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,/websocket/*,/webjars/**,/v2/api-docs,/v2/api-docs-ext,/doc.html,/v2/api-docs/swagger-ui.html,/swagger-resources
- #flowable数据源和多数据源配置
db:
init:
enable: false
@@ -26,4 +33,4 @@
level.com.casic.missiles.modular.neutron: error
level.org.springframework.web: info
file:
- path: D:\\logs
\ No newline at end of file
+ path: D:\workspace\server\keti\casic-production-safety\casic-web\\logs
\ No newline at end of file
diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml
index 2050d60..e7bb42c 100644
--- a/casic-web/src/main/resources/config/application.yml
+++ b/casic-web/src/main/resources/config/application.yml
@@ -3,7 +3,7 @@
##########################################################
spring:
profiles:
- active: dev
+ active: test
servlet:
multipart:
max-file-size: 50MB