Преглед на файлове

正式线配置-出去euraka注册

huangzhiyong преди 6 години
родител
ревизия
f9d95383dc

+ 3 - 0
svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/controller/user/UserController.java

@ -313,6 +313,9 @@ public class UserController extends EnvelopRestEndpoint {
            @RequestParam(value = "userId") String userId) {
        try {
            if (userId==null){
                return failed("未登录用户");
            }
            userService.setUserActivated(userId, 40);//客户端30s发送一次心跳,
            return success("心跳正常");
        } catch (Exception e) {

+ 7 - 7
svr/svr-healthy-house/src/main/resources/application.yml

@ -108,15 +108,15 @@ img:
  path: /data/upload/img
---
spring:
  profiles: jwprod
  profiles: prod
  datasource:
    url: jdbc:mysql://172.19.103.77:3306/healthy_house?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
    username: root
    password: 123456
    url: jdbc:mysql://172.16.30.18:3310/healthy_house?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
    username: healthroom
    password: GP8Qz4qU
  redis:
    host: 172.19.103.47
    port: 6379
    password: redis!@456
    host: 172.16.30.18
    port: 6390
    password: q4YaQemf
fastDFS:
  fastdfs_file_url: http://172.19.103.54:80/
jw:

+ 22 - 19
svr/svr-healthy-house/src/main/resources/bootstrap.yml

@ -2,25 +2,28 @@ spring:
  application:
    name:  svr-healthy-house
  #从发现服务里面取配置服务的信息
  cloud:
    config:
      failFast: true #启动快速失败 即链接不到配置服务就启动失败
      username: jw
      password: jkzl
      discovery:
        enabled: true #使用发现服务
        service-id: svr-configurations #配置服务的名字
#  cloud:
#    config:
#      failFast: true #启动快速失败 即链接不到配置服务就启动失败
#      username: jw
#      password: jkzl
#      discovery:
#        enabled: true #使用发现服务
#        service-id: svr-configurations #配置服务的名字
eureka:
  client:
    register-with-eureka: false
---
spring:
  profiles: jwdev
##发现服务的地址
eureka:
  client:
    serviceUrl:
      #http://账号:密码@127.0.0.1:8761/eureka/
      defaultZone: http://jw:jkzl@172.19.103.33:8761/eureka/
#eureka:
#  client:
#    serviceUrl:
#      #http://账号:密码@127.0.0.1:8761/eureka/
#      defaultZone: http://jw:jkzl@172.19.103.33:8761/eureka/
---
spring:
@ -36,11 +39,11 @@ eureka:
---
spring:
  profiles: jwprod
  profiles: prod
eureka:
  client:
    serviceUrl:
      #http://账号:密码@127.0.0.1:8761/eureka/
      defaultZone: http://jw:jkzl@127.0.0.1:8761/eureka/
#eureka:
#  client:
#    serviceUrl:
#      #http://账号:密码@127.0.0.1:8761/eureka/
#      defaultZone: http://jw:jkzl@127.0.0.1:8761/eureka/