From 3f9abd56c087858e9f4fc6e99dc66165b8e237f2 Mon Sep 17 00:00:00 2001 From: zhuqingze <785531296@qq.com> Date: Mon, 8 Jun 2020 13:36:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 141 ------------------ .../src/main/resources/bootstrap.yml | 6 +- 2 files changed, 4 insertions(+), 143 deletions(-) diff --git a/neuray-pm-base-server/base-dfsfile-client/src/main/resources/application.yml b/neuray-pm-base-server/base-dfsfile-client/src/main/resources/application.yml index afbaff7..e69de29 100644 --- a/neuray-pm-base-server/base-dfsfile-client/src/main/resources/application.yml +++ b/neuray-pm-base-server/base-dfsfile-client/src/main/resources/application.yml @@ -1,141 +0,0 @@ -spring: - application: - name: base-dfsfile - datasource: - url: jdbc:oracle:thin:@${ORACLE_HOST:172.17.1.207}:${ORACLE_PORT:2020}:ehrdb - username: NeurayPM_File - password: NeurayPM_File - # 使用druid数据源 - type: com.alibaba.druid.pool.DruidDataSource - 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 - servlet: - multipart: - enabled: true - max-file-size: 600MB - max-request-size: 600MB - #html具有缓存的特点,这里不用,每次刷新都请求服务器 - thymeleaf: - cache: false - encoding: UTF-8 - mode: HTML5 - prefix: classpath:/templates/ - suffix: .html -server: - port: 8771 - profiles: - active: dev -##eruka注册中心 -#eureka: -# ###docker部署开启 -# instance: -# prefer-ip-address: true -# client: -# service-url: -# defaultZone: http://${EUREKA_HOST:192.168.1.205}:${EUREKA_PORT:8070}/eureka/ -# ###向注册中心上注册自己 -# register-with-eureka: true -# ###是否需要从eureka上获取注册信息 -# fetch-registry: true - - -###fastdfs配置 -fdfs: - ###上传文件使用分组，后期对fastdfs扩容，改变这个参数即可，改为你想使用的卷进行上传 - groupName: group1 - soTimeout: 1500 #socket连接超时时长 - connectTimeout: 6000 #连接tracker服务器超时时长 - ###nginx反向监听storage服务配置，ip（nginx配置放在前台，后台只提供相对路径，防止后期迁移服务器后，所有的头像数据全部不显示了） - ##nginxHost: 10.12.97.34 - ###nginx端口 - ##nginxPort: 80 - thumbImage: #缩略图生成参数，可选 - width: 150 - height: 150 - trackerList: #TrackerList参数,支持多个，我这里只有一个，如果有多个在下方加- x.x.x.x:port - - 172.17.1.208:22122 -upload: - picture: - mast: jpg,png - sensitiveFile: - original: .lark -mybatis: - mapper-locations: classpath:mapper/*.xml -logging: - level: - com.github.hollykunge.dao: debug - -##durid数据监控页面配置 -druid: - enabled: true - whiteip: 127.0.0.1 - blackip: 192.168.1.1 - loginUsername: admin - loginPassword: 123456 -#redis-cache 相关 -redis: - pool: - maxActive: 300 - maxIdle: 100 - maxWait: 10000 - #需要修改地址 - host: 172.17.1.208 - port: 6379 - password: 123456 - timeout: 20000 - # 服务或应用名 - sysName: neuray-pm-fastdfs - enable: true - database: 4 -prop: - upload-folder: ./files - - -##hystrix禁止服务超时时间 -hystrix: - threadpool: - default: - coreSize: 10000 ##并发执行的最大线程数，默认10 - maxQueueSize: 10000 ##BlockingQueue的最大队列数 - queueSizeRejectionThreshold: 5000 ##即使maxQueueSize没有达到，达到queueSizeRejectionThreshold该值后，请求也会被拒绝 - command: - default: - execution: - isolation: - thread: - timeoutInMilliseconds: 60000 - -ribbon: - eureka: - enabled: true - ReadTimeout: 30000 - ConnectTimeout: 30000 - MaxAutoRetries: 0 - MaxAutoRetriesNextServer: 1 - OkToRetryOnAllOperations: false - httpclient: - enabled: false - okhttp: - enabled: true - -auth: - serviceId: neuray-pm-auth - user: - token-header: Authorization - client: - token-header: client-token - id: neuray-pm-dfsfile #不填则默认读取spring.application.name - secret: 123456 diff --git a/neuray-pm-base-server/base-dfsfile-client/src/main/resources/bootstrap.yml b/neuray-pm-base-server/base-dfsfile-client/src/main/resources/bootstrap.yml index c0db397..ff79162 100644 --- a/neuray-pm-base-server/base-dfsfile-client/src/main/resources/bootstrap.yml +++ b/neuray-pm-base-server/base-dfsfile-client/src/main/resources/bootstrap.yml @@ -7,5 +7,7 @@ spring: nacos: discovery: server-addr: 127.0.0.1:8848 - - + config: + server-addr: 192.168.1.205:8848 + group: NEURAY-PM-DEV + fileExtension: yaml -- Gitee From a28d174aa11aa02de07b88550ef6501f8dfc1d6e Mon Sep 17 00:00:00 2001 From: leewand <1005070037@qq.com> Date: Mon, 8 Jun 2020 15:11:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0nacos=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- neuray-pm-base-server/base-dfsfile-client/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/neuray-pm-base-server/base-dfsfile-client/pom.xml b/neuray-pm-base-server/base-dfsfile-client/pom.xml index d585c1d..815dffa 100644 --- a/neuray-pm-base-server/base-dfsfile-client/pom.xml +++ b/neuray-pm-base-server/base-dfsfile-client/pom.xml @@ -36,6 +36,12 @@ spring-cloud-starter-alibaba-nacos-discovery ${alibaba.nacos.version} + + + org.springframework.cloud + spring-cloud-starter-alibaba-nacos-config + ${alibaba.nacos.version} + com.gitee.neuray.security neuray-pm-common -- Gitee