diff --git a/doc/nacos/blade-dev.yaml b/doc/nacos/blade-dev.yaml index ab587129b..cd476a98e 100644 --- a/doc/nacos/blade-dev.yaml +++ b/doc/nacos/blade-dev.yaml @@ -17,10 +17,11 @@ spring: #driver-class-name: oracle.jdbc.OracleDriver #driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver #driver-class-name: dm.jdbc.driver.DmDriver + #driver-class-name: com.yashandb.jdbc.Driver druid: # MySql、PostgreSQL、SqlServer、DaMeng校验 validation-query: select 1 - # Oracle校验 + # Oracle、YashanDB校验 #validation-query: select 1 from dual #项目模块集中配置 @@ -30,14 +31,13 @@ blade: enabled: false address: redis://127.0.0.1:6379 #多团队协作服务配置 - ribbon: - rule: - #开启配置 - enabled: true - #负载均衡优先调用的ip段 - prior-ip-pattern: - - 192.168.0.* - - 127.0.0.1 + loadbalancer: + #开启配置 + enabled: true + #负载均衡优先调用的ip段 + prior-ip-pattern: + - 192.168.0.* + - 127.0.0.1 #通用开发生产环境数据库地址(特殊情况可在对应的子工程里配置覆盖) datasource: dev: @@ -61,3 +61,7 @@ blade: #url: jdbc:dm://127.0.0.1:5236/BLADEX?zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8 #username: BLADEX #password: BLADEX + # YashanDB + #url: jdbc:yasdb://127.0.0.1:1688/BLADEX + #username: BLADEX + #password: BLADEX diff --git a/doc/nacos/blade-prod.yaml b/doc/nacos/blade-prod.yaml index 07e52fba3..27585df7e 100644 --- a/doc/nacos/blade-prod.yaml +++ b/doc/nacos/blade-prod.yaml @@ -15,13 +15,15 @@ spring: # commandTimeout: 5000 datasource: driver-class-name: com.mysql.cj.jdbc.Driver - #driver-class-name: org.postgresql.Driver - #driver-class-name: oracle.jdbc.OracleDriver - #driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver + #driver-class-name: org.postgresql.Driver + #driver-class-name: oracle.jdbc.OracleDriver + #driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver + #driver-class-name: dm.jdbc.driver.DmDriver + #driver-class-name: com.yashandb.jdbc.Driver druid: - # MySql、PostgreSQL、SqlServer校验 + # MySql、PostgreSQL、SqlServer、DaMeng校验 validation-query: select 1 - # Oracle校验 + # Oracle、YashanDB校验 #validation-query: select 1 from dual #项目模块集中配置 diff --git a/doc/nacos/blade-test.yaml b/doc/nacos/blade-test.yaml index 269d7c674..cb0ed5a34 100644 --- a/doc/nacos/blade-test.yaml +++ b/doc/nacos/blade-test.yaml @@ -14,13 +14,15 @@ spring: # commandTimeout: 5000 datasource: driver-class-name: com.mysql.cj.jdbc.Driver - #driver-class-name: org.postgresql.Driver - #driver-class-name: oracle.jdbc.OracleDriver - #driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver + #driver-class-name: org.postgresql.Driver + #driver-class-name: oracle.jdbc.OracleDriver + #driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver + #driver-class-name: dm.jdbc.driver.DmDriver + #driver-class-name: com.yashandb.jdbc.Driver druid: - # MySql、PostgreSQL、SqlServer校验 + # MySql、PostgreSQL、SqlServer、DaMeng校验 validation-query: select 1 - # Oracle校验 + # Oracle、YashanDB校验 #validation-query: select 1 from dual #项目模块集中配置 diff --git a/pom.xml b/pom.xml index 903f16cca..c87932ac7 100644 --- a/pom.xml +++ b/pom.xml @@ -56,6 +56,32 @@ + + + + + + + + + + + org.projectlombok lombok