diff --git a/epmet-module/gov-grid/gov-grid-server/pom.xml b/epmet-module/gov-grid/gov-grid-server/pom.xml
index 02e8b83550..bad91380e3 100644
--- a/epmet-module/gov-grid/gov-grid-server/pom.xml
+++ b/epmet-module/gov-grid/gov-grid-server/pom.xml
@@ -18,16 +18,6 @@
gov-grid-client
2.0.0
-
- com.epmet
- epmet-commons-mybatis
- 2.0.0
-
-
- com.epmet
- epmet-commons-dynamic-datasource
- 2.0.0
-
org.springframework.boot
spring-boot-starter-web
@@ -104,12 +94,6 @@
8097
dev
-
-
-
-
- epmet
- elink@833066
0
127.0.0.1
@@ -134,12 +118,6 @@
8097
dev
-
-
-
-
- epmet
- elink@833066
0
r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com
@@ -164,12 +142,6 @@
8097
test
-
-
-
-
- epmet
- elink@833066
0
10.10.10.248
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/resources/bootstrap.yml b/epmet-module/gov-grid/gov-grid-server/src/main/resources/bootstrap.yml
index 711bab33d1..1df1097460 100644
--- a/epmet-module/gov-grid/gov-grid-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/resources/bootstrap.yml
@@ -23,34 +23,6 @@ spring:
port: @spring.redis.port@
password: @spring.redis.password@
timeout: 30s
- datasource:
- druid:
- #MySQL
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: @spring.datasource.druid.url@
- username: @spring.datasource.druid.username@
- password: @spring.datasource.druid.password@
- initial-size: 10
- max-active: 100
- min-idle: 10
- max-wait: 60000
- pool-prepared-statements: true
- max-pool-prepared-statement-per-connection-size: 20
- time-between-eviction-runs-millis: 60000
- min-evictable-idle-time-millis: 300000
- #Oracle需要打开注释
- #validation-query: SELECT 1 FROM DUAL
- test-while-idle: true
- test-on-borrow: false
- test-on-return: false
- filter:
- stat:
- log-slow-sql: true
- slow-sql-millis: 1000
- merge-sql: false
- wall:
- config:
- multi-statement-allow: true
cloud:
nacos:
discovery:
@@ -75,26 +47,6 @@ management:
health:
show-details: ALWAYS
-mybatis-plus:
- mapper-locations: classpath:/mapper/**/*.xml
- #实体扫描,多个package用逗号或者分号分隔
- typeAliasesPackage: com.epmet.entity
- global-config:
- #数据库相关配置
- db-config:
- #主键类型 AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
- id-type: ID_WORKER
- #字段策略 IGNORED:"忽略判断",NOT_NULL:"非 NULL 判断"),NOT_EMPTY:"非空判断"
- field-strategy: NOT_NULL
- #驼峰下划线转换
- column-underline: true
- banner: false
- #原生配置
- configuration:
- map-underscore-to-camel-case: true
- cache-enabled: false
- call-setters-on-nulls: true
- jdbc-type-for-null: 'null'
feign:
hystrix: