diff --git a/neuray-pm-provider/neuray-pm-provider-admin/src/main/resources/application.yml b/neuray-pm-provider/neuray-pm-provider-admin/src/main/resources/application.yml
index b880af1634f5265c0ea35a1f7e4239db2d7fd061..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/neuray-pm-provider/neuray-pm-provider-admin/src/main/resources/application.yml
+++ b/neuray-pm-provider/neuray-pm-provider-admin/src/main/resources/application.yml
@@ -1,124 +0,0 @@
-logging:
- level:
-# tk.mybatis: DEBUG
- com.gitee.neuray.security.admin: DEBUG
-spring:
- jackson:
- date-format: yyyy-MM-dd HH:mm:ss
- time-zone: GMT+8
- default-property-inclusion: non_null
- datasource:
- url: jdbc:oracle:thin:@${ORACLE_HOST:192.168.1.205}:${ORACLE_PORT:5566}:arltr
- username: NeurayPM_Admin
- password: NeurayPM_Admin
- # 使用druid数据源
- type: com.alibaba.druid.pool.DruidDataSource
-# driver-class-name: com.mysql.jdbc.Driver
- driver-class-name: oracle.jdbc.OracleDriver
- ###优化数据库连接池配置,该配置支持2000并发
- druid:
- max-active: 18
- initial-size: 3
- min-idle: 3
- max-wait: 250000
- time-between-eviction-runs-millis: 250000
- min-evictable-idle-time-millis: 120000
- validation-query: select 'x' from dual
- test-while-idle: true
- test-on-borrow: false
- test-on-return: false
- max-open-prepared-statements: 20
- filter: stat,wall,log4j
- sleuth:
- sampler:
- percentage: 1
-
-sample:
- zipkin:
- # When enabled=false, traces log to the console. Comment to send to zipkin
- enabled: false
-
-mybatis:
- basepackage: com.gitee.neuray.security.admin.mapper
- xmlLocation: classpath:mapper/**/*.xml
- mapper-locations: "classpath*:mapper/*.xml"
-# 必须配置
-feign:
- httpclient:
- enabled: false
- okhttp:
- enabled: true
-
-ribbon:
- eureka:
- enabled: true
- ReadTimeout: 20000
- ConnectTimeout: 20000
- MaxAutoRetries: 0
- MaxAutoRetriesNextServer: 1
- OkToRetryOnAllOperations: false
-
-hystrix:
- threadpool:
- default:
- coreSize: 10000 ##并发执行的最大线程数,默认10
- maxQueueSize: 10000 ##BlockingQueue的最大队列数
- queueSizeRejectionThreshold: 5000 ##即使maxQueueSize没有达到,达到queueSizeRejectionThreshold该值后,请求也会被拒绝
- command:
- default:
- execution:
- isolation:
- thread:
- timeoutInMilliseconds: 60000
-
-
-# 配置swagger
-swagger:
- enabled: true
- base-package: com.gitee.neuray.security.admin
- title: neuray-pm-admin
- version: 1.0.0.SNAPSHOT
- description: 管理后端服务
- contact:
- name: admin
-
-auth:
- serviceId: neuray-pm-auth
- user:
- token-header: Authorization
- client:
- id: neuray-pm-admin
- secret: 123456
- token-header: client-token
-
-#redis-cache 相关
-redis:
- pool:
- maxActive: 300
- maxIdle: 100
- maxWait: 10000
- #需要修改地址
- host: ${REDIS_HOST:192.168.1.205}
- port: ${REDIS_PORT:6379}
- password: 123456
- timeout: 20000
- # 服务或应用名
- sysName: neuray-pm-admin
- enable: true
- database: 0
-####新增用户时的默认密码
-admin:
- create-user:
- defaultPassword: 123456
-druid:
- enabled: true
- whiteip: 127.0.0.1
- blackip: 192.168.1.1
- loginUsername: admin
- loginPassword: 123456
-##三员角色使用code标识
-role:
- code:
- system: system
- log: log
- security: security
diff --git a/neuray-pm-provider/neuray-pm-provider-admin/src/main/resources/bootstrap.yml b/neuray-pm-provider/neuray-pm-provider-admin/src/main/resources/bootstrap.yml
index 9b6f813857012a23c35467d910178c1949a79472..5baec0c564f87c5f87b3e715a71b8a4fa038b550 100644
--- a/neuray-pm-provider/neuray-pm-provider-admin/src/main/resources/bootstrap.yml
+++ b/neuray-pm-provider/neuray-pm-provider-admin/src/main/resources/bootstrap.yml
@@ -7,4 +7,7 @@ spring:
nacos:
discovery:
server-addr: 192.168.1.205:8848
-
+ config:
+ server-addr: 192.168.1.205:8848
+ group: NEURAY-PM-ADMIN
+ fileExtension: yaml
diff --git a/neuray-pm-provider/pom.xml b/neuray-pm-provider/pom.xml
index adf795bc22497726d53f722c2d310617e66fd18b..cd500d2e2399b1a807ef269d404fd2a926cb9983 100644
--- a/neuray-pm-provider/pom.xml
+++ b/neuray-pm-provider/pom.xml
@@ -28,10 +28,17 @@
spring-cloud-starter-netflix-hystrix
+
- org.springframework.cloud
+ com.alibaba.cloud
spring-cloud-starter-alibaba-nacos-discovery
- 0.9.0.RELEASE
+ 2.0.0.RELEASE
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-config
+ 2.0.0.RELEASE