forked from kidgrow-microservices-platform

zhaoxiaohao
2020-08-14 5d3b07a294a1bd3d6e01f3f2f9e0ec8b80f7cc0f
Merge remote-tracking branch 'origin/dev' into dev
6 files modified
99 ■■■■ changed files
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/resources/application.yml 12 ●●●● patch | view | raw | blame | history
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/resources/application.yml 22 ●●●●● patch | view | raw | blame | history
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/resources/application.yml 2 ●●● patch | view | raw | blame | history
kidgrow-commons/kidgrow-rabbitmq-spring-boot-starter/src/main/java/com/kidgrow/rabbitmq/config/RabbitConfig.java 42 ●●●●● patch | view | raw | blame | history
kidgrow-config/src/main/resources/application-dev.properties 19 ●●●●● patch | view | raw | blame | history
kidgrow-uaa/kidgrow-uaa-server/src/main/resources/application.yml 2 ●●● patch | view | raw | blame | history
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/resources/application.yml
@@ -10,7 +10,7 @@
  application:
    name: filecenter-server
  datasource:
    url: jdbc:mysql://${kidgrow.datasource.ip}:3306/file_center?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    url: jdbc:mysql://${kidgrow.datasource.ip}:3306/file_center_${spring.profiles.active}?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    username: ${kidgrow.datasource.username}
    password: ${kidgrow.datasource.password}
    #    driver-class-name: com.mysql.jdbc.Driver
@@ -63,14 +63,14 @@
#      domain: http://123.kidgrow.cloud/
##      domain: https://kidgrow.oss-accelerate.aliyuncs.com/
#      folder: kidgrow/
      access-key: LTAI4FennfcwZupz3B6hkK3N
      accessKeySecret: NzBBGe8SS41qJlp0nA3tlJ3t74lBZM
      access-key: ${kidgrow.oss.access-key}
      accessKeySecret: ${kidgrow.oss.accessKeySecret}
        #      endpoint: kidgrow.oss-cn-beijing-internal.aliyuncs.com
      endpoint: 123.kidgrow.cloud
      endpoint: ${kidgrow.oss.endpoint}
        #      endpoint: oss-accelerate.aliyuncs.com
      bucketName: kidgrow
      bucketName: ${kidgrow.oss.bucketName}
        #注意加上/
      domain: http://123.kidgrow.cloud/
      domain: ${kidgrow.oss.domain}
        #      domain: https://kidgrow.oss-accelerate.aliyuncs.com/
      folder: kidgrow/
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/resources/application.yml
@@ -10,7 +10,7 @@
  application:
    name: oprationcenter-server
  datasource:
    url: jdbc:mysql://${kidgrow.datasource.ip}:3306/opration_center?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    url: jdbc:mysql://${kidgrow.datasource.ip}:3306/opration_center_${spring.profiles.active}?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    username: ${kidgrow.datasource.username}
    password: ${kidgrow.datasource.password}
    #    driver-class-name: com.mysql.jdbc.Driver
@@ -19,17 +19,21 @@
      aop-patterns: com.kidgrow.oprationcenter.controller.*,com.kidgrow.oprationcenter.mapper.*
  # rabbitMQ
  rabbitmq:
    host: 182.92.99.224
    port: 5672
    username: liuke
    password: kidgrow2020
    host: ${kidgrow.rabbitmq.host}
    port: ${kidgrow.rabbitmq.port}
    username: ${kidgrow.rabbitmq.username}
    password: ${kidgrow.rabbitmq.password}
    #交换机名称
    exchangeName: BoneAgeEvaluation
    exchangeName: ${kidgrow.rabbitmq.exchangeName}
    #队列名称
    queueName: test_queue #AdvancedEvaluation # AIEvaluation #,AdvancedEvaluationResult
    queueName: ${kidgrow.rabbitmq.queueName} #AdvancedEvaluation # AIEvaluation #,AdvancedEvaluationResult
    #routingKeyName
    routingKeyName: Kidgrow2020
    virtual-host: kidgrow
    routingKeyName: ${kidgrow.rabbitmq.routingKeyName}
    virtual-host: ${kidgrow.rabbitmq.virtual-host}
    AIEvaluationResults: AIEvaluationResults_${spring.profiles.active}
    BoneAgeEvaluationData: BoneAgeEvaluationData_${spring.profiles.active}
    ChildRecordData: ChildRecordData_${spring.profiles.active}
    ReportData: ReportData_${spring.profiles.active}
    #开启重试机制
    listener:
      simple:
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/resources/application.yml
@@ -10,7 +10,7 @@
  application:
    name: usercenter-server
  datasource:
    url: jdbc:mysql://${kidgrow.datasource.ip}:3306/user_center?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    url: jdbc:mysql://${kidgrow.datasource.ip}:3306/user_center_${spring.profiles.active}?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    username: ${kidgrow.datasource.username}
    password: ${kidgrow.datasource.password}
#    driver-class-name: com.mysql.jdbc.Driver
kidgrow-commons/kidgrow-rabbitmq-spring-boot-starter/src/main/java/com/kidgrow/rabbitmq/config/RabbitConfig.java
@@ -60,6 +60,26 @@
     */
    private String routingKeyName;
    /**
     * AI返回结果队列
     */
    private String AIEvaluationResults;
    /**
     * 骨龄评价统计
     */
    private String BoneAgeEvaluationData;
    /**
     * 档案统计
     */
    private String ChildRecordData;
    /**
     * 报告统计
     */
    private String ReportData;
    @Bean
    public ConnectionFactory connectionFactory() {
        CachingConnectionFactory connectionFactory = new CachingConnectionFactory(host,port);
@@ -137,6 +157,28 @@
    }
    @Bean
    public Queue AIEvaluationResults() {
        return new Queue(AIEvaluationResults);
    }
    @Bean
    public Queue BoneAgeEvaluationData() {
        return new Queue(BoneAgeEvaluationData);
    }
    @Bean
    public Queue ChildRecordData() {
        return new Queue(ChildRecordData);
    }
    @Bean
    public Queue ReportData() {
        return new Queue(ReportData);
    }
    @Bean
    Binding bindingExchangeAIEvaluation(TopicExchange exchange) {
        return BindingBuilder.bind(AIEvaluation()).to(exchange).with(routingKeyName);
    }
kidgrow-config/src/main/resources/application-dev.properties
@@ -14,6 +14,16 @@
spring.redis.password=kidgrow
spring.redis.timeout=5000
#rabbitmq\u914D\u7F6E
kidgrow.rabbitmq.host=182.92.99.224
kidgrow.rabbitmq.port=5672
kidgrow.rabbitmq.username=liuke
kidgrow.rabbitmq.password=kidgrow2020
kidgrow.rabbitmq.exchangeName=BoneAgeEvaluation
kidgrow.rabbitmq.queueName=test_queue
kidgrow.rabbitmq.routingKeyName=Kidgrow2020
kidgrow.rabbitmq.virtual-host=kidgrow
#\u963F\u91CCDruid\u914D\u7F6E
kidgrow.druid.loginname=admin
kidgrow.druid.loginpwd=123456
@@ -37,6 +47,13 @@
kidgrow.fdfs.web-url=127.0.0.1
kidgrow.fdfs.trackerList=${kidgrow.fdfs.web-url}:22122
####\u963F\u91CCOSS\u914D\u7F6E
kidgrow.oss.access-key=LTAI4FennfcwZupz3B6hkK3N
kidgrow.oss.accessKeySecret=NzBBGe8SS41qJlp0nA3tlJ3t74lBZM
kidgrow.oss.endpoint=123.kidgrow.cloud
kidgrow.oss.bucketName=kidgrow
kidgrow.oss.domain=http://123.kidgrow.cloud/
##### \u65E5\u5FD7\u94FE\u8DEF\u8FFD\u8E2A
kidgrow.trace.enable=true
@@ -50,7 +67,7 @@
kidgrow.audit-log.enabled=true
kidgrow.audit-log.log-type=db
kidgrow.audit-log.datasource.driver-class-name=com.mysql.jdbc.Driver
kidgrow.audit-log.datasource.jdbc-url=jdbc:mysql://${kidgrow.datasource.ip}:3306/logger_center?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull&serverTimezone=Asia/Shanghai
kidgrow.audit-log.datasource.jdbc-url=jdbc:mysql://${kidgrow.datasource.ip}:3306/logger_center_${spring.profiles.active}?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull&serverTimezone=Asia/Shanghai
kidgrow.audit-log.datasource.username=${kidgrow.datasource.username}
kidgrow.audit-log.datasource.password=${kidgrow.datasource.password}
kidgrow-uaa/kidgrow-uaa-server/src/main/resources/application.yml
@@ -14,7 +14,7 @@
  application:
    name: uaa-server
  datasource:
    url: jdbc:mysql://${kidgrow.datasource.ip}:3306/oauth_center?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    url: jdbc:mysql://${kidgrow.datasource.ip}:3306/oauth_center_${spring.profiles.active}?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
    username: ${kidgrow.datasource.username}
    password: ${kidgrow.datasource.password}
#    driver-class-name: com.mysql.jdbc.Driver