优化 加入梓豪配置文件

java110

2021-12-22 c29e5eba528fd4e811c4e27bee99e5032c6fd54d

优化 加入梓豪配置文件

 java110-bean/src/main/java/com/java110/dto/onlinePay/OnlinePayDto.java

@@ -1,6 +1,7 @@
package com.java110.dto.onlinePay;

import com.java110.dto.PageDto;

import java.io.Serializable;
import java.util.Date;

@@ -15,16 +16,16 @@
public class OnlinePayDto extends PageDto implements Serializable {

    private String refundFee;
private String mchId;
private String orderId;
private String totalFee;
private String openId;
private String appId;
private String payId;
private String state;
private String message;
private String payName;
private String transactionId;
    private String mchId;
    private String orderId;
    private String totalFee;
    private String openId;
    private String appId;
    private String payId;
    private String state;
    private String message;
    private String payName;
    private String transactionId;


    private Date createTime;
@@ -35,67 +36,88 @@
    public String getRefundFee() {
        return refundFee;
    }
public void setRefundFee(String refundFee) {

    public void setRefundFee(String refundFee) {
        this.refundFee = refundFee;
    }
public String getMchId() {

    public String getMchId() {
        return mchId;
    }
public void setMchId(String mchId) {

    public void setMchId(String mchId) {
        this.mchId = mchId;
    }
public String getOrderId() {

    public String getOrderId() {
        return orderId;
    }
public void setOrderId(String orderId) {

    public void setOrderId(String orderId) {
        this.orderId = orderId;
    }
public String getTotalFee() {

    public String getTotalFee() {
        return totalFee;
    }
public void setTotalFee(String totalFee) {

    public void setTotalFee(String totalFee) {
        this.totalFee = totalFee;
    }
public String getOpenId() {

    public String getOpenId() {
        return openId;
    }
public void setOpenId(String openId) {

    public void setOpenId(String openId) {
        this.openId = openId;
    }
public String getAppId() {

    public String getAppId() {
        return appId;
    }
public void setAppId(String appId) {

    public void setAppId(String appId) {
        this.appId = appId;
    }
public String getPayId() {

    public String getPayId() {
        return payId;
    }
public void setPayId(String payId) {

    public void setPayId(String payId) {
        this.payId = payId;
    }
public String getState() {

    public String getState() {
        return state;
    }
public void setState(String state) {

    public void setState(String state) {
        this.state = state;
    }
public String getMessage() {

    public String getMessage() {
        return message;
    }
public void setMessage(String message) {

    public void setMessage(String message) {
        this.message = message;
    }
public String getPayName() {

    public String getPayName() {
        return payName;
    }
public void setPayName(String payName) {

    public void setPayName(String payName) {
        this.payName = payName;
    }
public String getTransactionId() {

    public String getTransactionId() {
        return transactionId;
    }
public void setTransactionId(String transactionId) {

    public void setTransactionId(String transactionId) {
        this.transactionId = transactionId;
    }


 java110-db/src/main/java/com/java110/db/DataSourceConfig.java

@@ -1,19 +1,16 @@
package com.java110.db;

import org.apache.shardingsphere.shardingjdbc.api.yaml.YamlShardingDataSourceFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;

import javax.servlet.Filter;
import javax.sql.DataSource;
import java.io.ByteArrayOutputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
import java.io.UnsupportedEncodingException;
import java.io.*;
import java.sql.SQLException;

/**
@@ -25,6 +22,8 @@
    //@Autowired
    private Filter statFilter;

    @Autowired
    private Environment env;
    private static final String SHARDING_YML_PATH = "dataSource.yml";

    /**
@@ -39,16 +38,17 @@
     */
    @Bean
    public DataSource dataSource() throws SQLException, IOException {
//        YamlShardingConfiguration config = parse();
//        YamlShardingRuleConfiguration rule = config.getShardingRule();
//        for (String key : config.getDataSources().keySet()) {
//            DruidDataSource d = (DruidDataSource) config.getDataSources().get(key);
//            d.setProxyFilters(Lists.newArrayList(statFilter));
//        }
//        return ShardingDataSourceFactory.createDataSource(config.getDataSources(),
//                rule.getShardingRuleConfiguration(), config.getConfigMap(), config.getProps());
        String path = SHARDING_YML_PATH;

        return YamlShardingDataSourceFactory.createDataSource(getYmlFile());
        String[] actives = env.getActiveProfiles();
        if (actives != null && actives.length > 0) {
            path = "dataSource-" + actives[0] + ".yml";
        }

        String configString = new String(getYmlFile(path), "UTF-8");
        configString = configString.replaceAll("\\$\\{mysqlpwd\\}", env.getProperty("mysqlpwd"));

        return YamlShardingDataSourceFactory.createDataSource(configString.getBytes("UTF-8"));
    }

    /**
@@ -59,12 +59,12 @@
     * @throws FileNotFoundException        文件未发现异常
     * @throws UnsupportedEncodingException 不支持编码异常
     */
    private byte[] getYmlFile() throws IOException {
    private byte[] getYmlFile(String path) throws IOException {
        Reader reader = null;
        InputStream inputStream = null;
        ByteArrayOutputStream swapStream = null;
        try {
            Resource resource = new ClassPathResource(SHARDING_YML_PATH);
            Resource resource = new ClassPathResource(path);

            inputStream = resource.getInputStream();
            swapStream = new ByteArrayOutputStream();

 service-acct/src/main/resources/application-zihao.yml

old mode 100755
new mode 100644
copy from service-order/src/main/resources/application-test.yml
copy to service-acct/src/main/resources/application-zihao.yml
File was copied from service-order/src/main/resources/application-test.yml
@@ -4,10 +4,10 @@
      maxTotal: 100
      maxIdle: 20
      maxWaitMillis: 20000
    host: test.redis.java110.com
    host: dev.redis.java110.com
    port: 6379
    timeout: 3000
    password: hc
    password: ${redispwd}

eureka:
  instance:
@@ -17,12 +17,24 @@
    instanceId: ${spring.cloud.client.ip-address}:${server.port}
  client:
    serviceUrl:
      defaultZone: http://test.java110.com:8761/eureka/
      defaultZone: http://dev.java110.com:8761/eureka/
      #defaultZone: http://localhost:8761/eureka/
server:
  port: 8001
  port: 8003
  tomcat:
    uri-encoding: UTF-8

java110:
  community-service: community-service
  acct-service: acct-service
  user-service: user-service
  store-service: store-service
  common-service: common-service
  job-service: job-service
  fee-service: fee-service
  report-service: report-service
  dev-service: dev-service
  oa-service: oa-service

spring:
  http:
@@ -31,12 +43,12 @@
      enabled: true
      force: true
  application:
    name: order-service
    name: acct-service
  redis:
    database: 0
    host: hc.java110.com
    host: dev.redis.java110.com
    port: 6379
    password: hc
    password: ${redispwd}
    pool:
      max-active: 300
      max-wait: 10000
@@ -52,7 +64,7 @@
    filters: stat,wall,log4j
    poolPreparedStatements: true
    type: com.alibaba.druid.pool.DruidDataSource
    url: jdbc:mysql://test.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8
    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8
    maxPoolPreparedStatementPerConnectionSize: 20
    password: TT@12345678
    testOnBorrow: false
@@ -68,8 +80,8 @@
kafka:
  consumer:
    zookeeper:
      connect: test.zk.java110.com:2181
    servers: test.kafka.java110.com:9092
      connect: dev.zk.java110.com:2181
    servers: dev.kafka.java110.com:9092
    enable:
      auto:
        commit: true
@@ -87,8 +99,8 @@

  producer:
    zookeeper:
      connect: test.zk.java110.com:2181
    servers: test.kafka.java110.com:9092
      connect: dev.zk.java110.com:2181
    servers: dev.kafka.java110.com:9092
    retries: 0
    batch:
      size: 4096

 service-acct/src/main/resources/dataSource-zihao.yml

New file
@@ -0,0 +1,75 @@
dataSources:
  ds0: !!com.alibaba.druid.pool.DruidDataSource
    driverClassName: com.mysql.cj.jdbc.Driver
    url: jdbc:mysql://dev.db.java110.com:3306/hc_community?useUnicode=true&characterEncoding=utf-8&serverTimezone=UTC
    username: hc_community
    password: ${mysqlpwd}
    minIdle: 5
    validationQuery: SELECT 1 FROM DUAL
    initialSize: 5
    maxWait: 60000
    filters: stat,wall,log4j
    poolPreparedStatements: true
#  ds0_slave0: !!com.alibaba.druid.pool.DruidDataSource
#    driverClassName: com.mysql.jdbc.Driver
#    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8
#    username: TT
#    password: TT@12345678
#    connectionTimeoutMilliseconds: 30000
#    idleTimeoutMilliseconds: 60000
#    maxPoolSize: 50
#    minPoolSize: 1
#    maintenanceIntervalMilliseconds: 30000
  ds1: !!com.alibaba.druid.pool.DruidDataSource
    driverClassName: com.mysql.cj.jdbc.Driver
    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8&serverTimezone=UTC
    username: TT
    password: ${mysqlpwd}
    minIdle: 5
    validationQuery: SELECT 1 FROM DUAL
    initialSize: 5
    maxWait: 60000
    filters: stat,wall,log4j
    poolPreparedStatements: true
#  ds1_slave0: !!com.alibaba.druid.pool.DruidDataSource
#    driverClassName: com.mysql.jdbc.Driver
#    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8
#    username: TT
#    password: TT@12345678
#    connectionTimeoutMilliseconds: 30000
#    idleTimeoutMilliseconds: 60000
#    maxPoolSize: 50
#    minPoolSize: 1
#    maintenanceIntervalMilliseconds: 30000

shardingRule:
  tables:
    business_xxx:
      actualDataNodes: ds${0..1}.business_community
      databaseStrategy:
        inline:
          shardingColumn: community_id
          algorithmExpression: ds${Long.parseLong(community_id) % 2}

  bindingTables:
    - business_xxx

  defaultDataSourceName: ds1
  defaultDatabaseStrategy:
    none:
  defaultTableStrategy:
    none:

#  masterSlaveRules:
#    ms_ds0:
#     masterDataSourceName: ds0
#     slaveDataSourceNames:
#       - ds0_slave0
#     loadBalanceAlgorithmType: ROUND_ROBIN
#   ms_ds1:
#     masterDataSourceName: ds1
#     slaveDataSourceNames:
#       - ds1_slave0
#     loadBalanceAlgorithmType: ROUND_ROBIN
props:
  sql.show: true

 service-api/src/main/resources/application-prod.yml

File was deleted

 service-api/src/main/resources/application-test.yml

File was deleted

 service-api/src/main/resources/application-zihao.yml

New file
@@ -0,0 +1,105 @@
jedis:
  pool:
    config:
      maxTotal: 100
      maxIdle: 20
      maxWaitMillis: 20000
    host: dev.redis.java110.com
    port: 6379
    timeout: 3000
    password: ${redispwd}

eureka:
  instance:
    leaseRenewalIntervalInSeconds: 10
    leaseExpirationDurationInSeconds: 30
    preferIpAddress: true
    instanceId: ${spring.cloud.client.ip-address}:${server.port}
  client:
    serviceUrl:
      defaultZone: http://dev.java110.com:8761/eureka/
      #defaultZone: http://localhost:8761/eureka/
server:
  port: 8008
  tomcat:
    uri-encoding: UTF-8

spring:
  servlet:
    multipart:
      maxFileSize: 50MB
      maxRequestSize: 50MB
  http:
    encoding:
      charset: UTF-8
      enabled: true
      force: true
  application:
    name: api-service
  redis:
    database: 0
    host: dev.redis.java110.com
    port: 6379
    password: ${redispwd}
    pool:
      max-active: 300
      max-wait: 10000
      max-idle: 100
      min-idle: 0
      timeout: 0

java110:
  community-service: community-service
  acct-service: acct-service
  user-service: user-service
  store-service: store-service
  common-service: common-service
  job-service: job-service
  fee-service: fee-service
  report-service: report-service
  dev-service: dev-service
  oa-service: oa-service

feign:
  client:
    config:
      default:
        connect-timeout: 10000
        read-timeout: 20000


#============== kafka ===================
kafka:
  consumer:
    zookeeper:
      connect: dev.zk.java110.com:2181
    servers: dev.kafka.java110.com:9092
    enable:
      auto:
        commit: true
    session:
      timeout: 6000
    auto:
      commit:
        interval: 100
      offset:
        reset: latest
    topic: test
    group:
      id: -1  # -1 表示自己生成 走广播模式
    concurrency: 10

  producer:
    zookeeper:
      connect: dev.zk.java110.com:2181
    servers: dev.kafka.java110.com:9092
    retries: 0
    batch:
      size: 4096
    linger: 1
    buffer:
      memory: 40960

logging:
  level:
    com.java110.core.smo: debug

 service-common/src/main/resources/application-prod.yml

File was deleted

 service-common/src/main/resources/application-test.yml

File was deleted

 service-common/src/main/resources/application-zihao.yml

New file
@@ -0,0 +1,100 @@
jedis:
  pool:
    config:
      maxTotal: 100
      maxIdle: 20
      maxWaitMillis: 20000
    host: dev.redis.java110.com
    port: 6379
    timeout: 3000
    password: ${redispwd}

eureka:
  instance:
    leaseRenewalIntervalInSeconds: 10
    leaseExpirationDurationInSeconds: 30
    preferIpAddress: true
    instanceId: ${spring.cloud.client.ip-address}:${server.port}
  client:
    serviceUrl:
      defaultZone: http://dev.java110.com:8761/eureka/
      #defaultZone: http://localhost:8761/eureka/
server:
  port: 8005
  tomcat:
    uri-encoding: UTF-8

java110:
  community-service: community-service
  acct-service: acct-service
  user-service: user-service
  store-service: store-service
  common-service: common-service
  job-service: job-service
  fee-service: fee-service
  report-service: report-service
  dev-service: dev-service
  oa-service: oa-service

spring:
  profiles:
    active: share
  http:
    encoding:
      charset: UTF-8
      enabled: true
      force: true
  application:
    name: common-service
  redis:
    database: 0
    host: dev.redis.java110.com
    port: 6379
    password: ${redispwd}
    pool:
      max-active: 300
      max-wait: 10000
      max-idle: 100
      min-idle: 0
      timeout: 0
  activiti:
    database-schema-update: false

feign:
  client:
    config:
      default:
        connect-timeout: 10000
        read-timeout: 10000

#============== kafka ===================
kafka:
  consumer:
    zookeeper:
      connect: dev.zk.java110.com:2181
    servers: dev.kafka.java110.com:9092
    enable:
      auto:
        commit: true
    session:
      timeout: 6000
    auto:
      commit:
        interval: 100
      offset:
        reset: latest
    topic: test
    group:
      id: commonBusinessStatus
    concurrency: 10

  producer:
    zookeeper:
      connect: dev.zk.java110.com:2181
    servers: dev.kafka.java110.com:9092
    retries: 0
    batch:
      size: 4096
    linger: 1
    buffer:
      memory: 1048576

 service-common/src/main/resources/dataSource-zihao.yml

New file
@@ -0,0 +1,75 @@
dataSources:
  ds0: !!com.alibaba.druid.pool.DruidDataSource
    driverClassName: com.mysql.cj.jdbc.Driver
    url: jdbc:mysql://dev.db.java110.com:3306/hc_community?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
    username: hc_community
    password: ${mysqlpwd}
    minIdle: 5
    validationQuery: SELECT 1 FROM DUAL
    initialSize: 5
    maxWait: 60000
    filters: stat,wall,log4j
    poolPreparedStatements: true
#  ds0_slave0: !!com.alibaba.druid.pool.DruidDataSource
#    driverClassName: com.mysql.jdbc.Driver
#    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8
#    username: TT
#    password: TT@12345678
#    connectionTimeoutMilliseconds: 30000
#    idleTimeoutMilliseconds: 60000
#    maxPoolSize: 50
#    minPoolSize: 1
#    maintenanceIntervalMilliseconds: 30000
  ds1: !!com.alibaba.druid.pool.DruidDataSource
    driverClassName: com.mysql.cj.jdbc.Driver
    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
    username: TT
    password: ${mysqlpwd}
    minIdle: 5
    validationQuery: SELECT 1 FROM DUAL
    initialSize: 5
    maxWait: 60000
    filters: stat,wall,log4j
    poolPreparedStatements: true
#  ds1_slave0: !!com.alibaba.druid.pool.DruidDataSource
#    driverClassName: com.mysql.jdbc.Driver
#    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8
#    username: TT
#    password: TT@12345678
#    connectionTimeoutMilliseconds: 30000
#    idleTimeoutMilliseconds: 60000
#    maxPoolSize: 50
#    minPoolSize: 1
#    maintenanceIntervalMilliseconds: 30000

shardingRule:
  tables:
    business_xxx:
      actualDataNodes: ds${0..1}.business_community
      databaseStrategy:
        inline:
          shardingColumn: community_id
          algorithmExpression: ds${Long.parseLong(community_id) % 2}

  bindingTables:
    - business_xxx

  defaultDataSourceName: ds1
  defaultDatabaseStrategy:
    none:
  defaultTableStrategy:
    none:

#  masterSlaveRules:
#    ms_ds0:
#     masterDataSourceName: ds0
#     slaveDataSourceNames:
#       - ds0_slave0
#     loadBalanceAlgorithmType: ROUND_ROBIN
#   ms_ds1:
#     masterDataSourceName: ds1
#     slaveDataSourceNames:
#       - ds1_slave0
#     loadBalanceAlgorithmType: ROUND_ROBIN
props:
  sql.show: true

 service-community/src/main/resources/application-prod.yml

File was deleted

 service-community/src/main/resources/application-share.yml

File was deleted

 service-community/src/main/resources/application-test.yml

File was deleted

 service-community/src/main/resources/application-zihao.yml

New file
@@ -0,0 +1,98 @@
jedis:
  pool:
    config:
      maxTotal: 100
      maxIdle: 20
      maxWaitMillis: 20000
    host: dev.redis.java110.com
    port: 6379
    timeout: 3000
    password: ${redispwd}

eureka:
  instance:
    leaseRenewalIntervalInSeconds: 10
    leaseExpirationDurationInSeconds: 30
    preferIpAddress: true
    instanceId: ${spring.cloud.client.ip-address}:${server.port}
  client:
    serviceUrl:
      defaultZone: http://dev.java110.com:8761/eureka/
      #defaultZone: http://localhost:8761/eureka/
server:
  port: 8009
  tomcat:
    uri-encoding: UTF-8

java110:
  community-service: community-service
  acct-service: acct-service
  user-service: user-service
  store-service: store-service
  common-service: common-service
  job-service: job-service
  fee-service: fee-service
  report-service: report-service
  dev-service: dev-service
  oa-service: oa-service

spring:
  profiles:
    active: share
  http:
    encoding:
      charset: UTF-8
      enabled: true
      force: true
  application:
    name: community-service
  redis:
    database: 0
    host: dev.redis.java110.com
    port: 6379
    password: ${redispwd}
    pool:
      max-active: 300
      max-wait: 10000
      max-idle: 100
      min-idle: 0
      timeout: 0

feign:
  client:
    config:
      default:
        connect-timeout: 10000
        read-timeout: 20000

#============== kafka ===================
kafka:
  consumer:
    zookeeper:
      connect: dev.zk.java110.com:2181
    servers: dev.kafka.java110.com:9092
    enable:
      auto:
        commit: true
    session:
      timeout: 6000
    auto:
      commit:
        interval: 100
      offset:
        reset: latest
    topic: test
    group:
      id: communityBusinessStatus
    concurrency: 10

  producer:
    zookeeper:
      connect: dev.zk.java110.com:2181
    servers: dev.kafka.java110.com:9092
    retries: 0
    batch:
      size: 4096
    linger: 1
    buffer:
      memory: 40960

 service-community/src/main/resources/dataSource-zihao.yml

New file
@@ -0,0 +1,125 @@
dataSources:
  ds0: !!com.alibaba.druid.pool.DruidDataSource
    driverClassName: com.mysql.cj.jdbc.Driver
    url: jdbc:mysql://dev.db.java110.com:3306/hc_community?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
    username: hc_community
    password: ${mysqlpwd}
    minIdle: 5
    validationQuery: SELECT 1 FROM DUAL
    initialSize: 5
    maxWait: 60000
    filters: stat,wall,log4j
    poolPreparedStatements: true
#  ds0_slave0: !!com.alibaba.druid.pool.DruidDataSource
#    driverClassName: com.mysql.jdbc.Driver
#    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8
#    username: TT
#    password: TT@12345678
#    connectionTimeoutMilliseconds: 30000
#    idleTimeoutMilliseconds: 60000
#    maxPoolSize: 50
#    minPoolSize: 1
#    maintenanceIntervalMilliseconds: 30000
  ds1: !!com.alibaba.druid.pool.DruidDataSource
    driverClassName: com.mysql.cj.jdbc.Driver
    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
    username: TT
    password: ${mysqlpwd}
    minIdle: 5
    validationQuery: SELECT 1 FROM DUAL
    initialSize: 5
    maxWait: 60000
    filters: stat,wall,log4j
    poolPreparedStatements: true
#  ds1_slave0: !!com.alibaba.druid.pool.DruidDataSource
#    driverClassName: com.mysql.jdbc.Driver
#    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8
#    username: TT
#    password: TT@12345678
#    connectionTimeoutMilliseconds: 30000
#    idleTimeoutMilliseconds: 60000
#    maxPoolSize: 50
#    minPoolSize: 1
#    maintenanceIntervalMilliseconds: 30000

shardingRule:
  tables:
    business_community:
      actualDataNodes: ds${0..1}.business_community
      databaseStrategy:
        inline:
          shardingColumn: community_id
          algorithmExpression: ds${Long.parseLong(community_id) % 2}
    s_community:
      actualDataNodes: ds${0..1}.s_community
      databaseStrategy:
        inline:
          shardingColumn: community_id
          algorithmExpression: ds${Long.parseLong(community_id) % 2}
    business_community_attr:
      actualDataNodes: ds${0..1}.business_community_attr
      databaseStrategy:
        inline:
          shardingColumn: community_id
          algorithmExpression: ds${Long.parseLong(community_id) % 2}
    s_community_attr:
      actualDataNodes: ds${0..1}.s_community_attr
      databaseStrategy:
        inline:
          shardingColumn: community_id
          algorithmExpression: ds${Long.parseLong(community_id) % 2}
    business_community_member:
      actualDataNodes: ds${0..1}.business_community_member
      databaseStrategy:
        inline:
          shardingColumn: community_id
          algorithmExpression: ds${Long.parseLong(community_id) % 2}
    business_community_photo:
      actualDataNodes: ds${0..1}.business_community_photo
      databaseStrategy:
        inline:
          shardingColumn: community_id
          algorithmExpression: ds${Long.parseLong(community_id) % 2}
    s_community_member:
      actualDataNodes: ds${0..1}.s_community_member
      databaseStrategy:
        inline:
          shardingColumn: community_id
          algorithmExpression: ds${Long.parseLong(community_id) % 2}
    s_community_photo:
      actualDataNodes: ds${0..1}.s_community_photo
      databaseStrategy:
        inline:
          shardingColumn: community_id
          algorithmExpression: ds${Long.parseLong(community_id) % 2}
  bindingTables:
    - business_community
    - s_community
    - business_community_member
    - business_community_photo
    - s_community_member
    - s_community_photo
    - business_community_attr
    - s_community_attr

  defaultDataSourceName: ds1
  defaultDatabaseStrategy:
    inline:
      shardingColumn: community_id
      algorithmExpression: ds${Long.parseLong(community_id) % 2}
  defaultTableStrategy:
    none:

#  masterSlaveRules:
#    ms_ds0:
#     masterDataSourceName: ds0
#     slaveDataSourceNames:
#       - ds0_slave0
#     loadBalanceAlgorithmType: ROUND_ROBIN
#   ms_ds1:
#     masterDataSourceName: ds1
#     slaveDataSourceNames:
#       - ds1_slave0
#     loadBalanceAlgorithmType: ROUND_ROBIN
props:
  sql.show: true

 service-dev/src/main/resources/application-zihao.yml

New file
@@ -0,0 +1,92 @@
jedis:
  pool:
    config:
      maxTotal: 100
      maxIdle: 20
      maxWaitMillis: 20000
    host: dev.redis.java110.com
    port: 6379
    timeout: 3000
    password: ${redispwd}

eureka:
  instance:
    leaseRenewalIntervalInSeconds: 10
    leaseExpirationDurationInSeconds: 30
    preferIpAddress: true
    instanceId: ${spring.cloud.client.ip-address}:${server.port}
  client:
    serviceUrl:
      defaultZone: http://dev.java110.com:8761/eureka/
      #defaultZone: http://localhost:8761/eureka/
server:
  port: 8012
  tomcat:
    uri-encoding: UTF-8

java110:
  community-service: community-service
  acct-service: acct-service
  user-service: user-service
  store-service: store-service
  common-service: common-service
  job-service: job-service
  fee-service: fee-service
  report-service: report-service
  dev-service: dev-service
  oa-service: oa-service

spring:
  profiles:
    active: share
  http:
    encoding:
      charset: UTF-8
      enabled: true
      force: true
  application:
    name: dev-service
  redis:
    database: 0
    host: dev.redis.java110.com
    port: 6379
    password: ${redispwd}
    pool:
      max-active: 300
      max-wait: 10000
      max-idle: 100
      min-idle: 0
      timeout: 0


#============== kafka ===================
kafka:
  consumer:
    zookeeper:
      connect: dev.zk.java110.com:2181
    servers: dev.kafka.java110.com:9092
    enable:
      auto:
        commit: true
    session:
      timeout: 6000
    auto:
      commit:
        interval: 100
      offset:
        reset: latest
    topic: test
    group:
      id: reportBusinessStatus
    concurrency: 10

  producer:
    zookeeper:
      connect: dev.zk.java110.com:2181
    servers: dev.kafka.java110.com:9092
    retries: 0
    batch:
      size: 4096
    linger: 1
    buffer:
      memory: 40960

 service-dev/src/main/resources/dataSource-zihao.yml

New file
@@ -0,0 +1,33 @@
dataSources:
  ds0: !!com.alibaba.druid.pool.DruidDataSource
    driverClassName: com.mysql.cj.jdbc.Driver
    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
    username: TT
    password: ${mysqlpwd}
    minIdle: 5
    validationQuery: SELECT 1 FROM DUAL
    initialSize: 5
    maxWait: 60000
    filters: stat,wall,log4j
    poolPreparedStatements: true

shardingRule:
  tables:
    business_xxx:
      actualDataNodes: ds0.business_community
      databaseStrategy:
        inline:
          shardingColumn: community_id
          algorithmExpression: ds${Long.parseLong(community_id) % 2}

  bindingTables:
    - business_xxx

  defaultDataSourceName: ds0
  defaultDatabaseStrategy:
    none:
  defaultTableStrategy:
    none:

props:
  sql.show: true

 service-fee/src/main/resources/application-prod.yml

File was deleted

 service-fee/src/main/resources/application-share.yml

File was deleted

 service-fee/src/main/resources/application-test.yml

File was deleted

 service-fee/src/main/resources/application-zihao.yml

New file
@@ -0,0 +1,97 @@
jedis:
  pool:
    config:
      maxTotal: 100
      maxIdle: 20
      maxWaitMillis: 20000
    host: dev.redis.java110.com
    port: 6379
    timeout: 3000
    password: ${redispwd}

eureka:
  instance:
    leaseRenewalIntervalInSeconds: 10
    leaseExpirationDurationInSeconds: 30
    preferIpAddress: true
    instanceId: ${spring.cloud.client.ip-address}:${server.port}
  client:
    serviceUrl:
      defaultZone: http://dev.java110.com:8761/eureka/
      #defaultZone: http://localhost:8761/eureka/
server:
  port: 8010
  tomcat:
    uri-encoding: UTF-8

java110:
  community-service: community-service
  acct-service: acct-service
  user-service: user-service
  store-service: store-service
  common-service: common-service
  job-service: job-service
  fee-service: fee-service
  report-service: report-service
  dev-service: dev-service
  oa-service: oa-service

spring:
  profiles:
    active: share
  http:
    encoding:
      charset: UTF-8
      enabled: true
      force: true
  application:
    name: fee-service
  redis:
    database: 0
    host: dev.redis.java110.com
    port: 6379
    password: ${redispwd}
    pool:
      max-active: 300
      max-wait: 10000
      max-idle: 100
      min-idle: 0
      timeout: 0

feign:
  client:
    config:
      default:
        connect-timeout: 10000
        read-timeout: 20000
#============== kafka ===================
kafka:
  consumer:
    zookeeper:
      connect: dev.zk.java110.com:2181
    servers: dev.kafka.java110.com:9092
    enable:
      auto:
        commit: true
    session:
      timeout: 6000
    auto:
      commit:
        interval: 100
      offset:
        reset: latest
    topic: test
    group:
      id: communityBusinessStatus
    concurrency: 10

  producer:
    zookeeper:
      connect: dev.zk.java110.com:2181
    servers: dev.kafka.java110.com:9092
    retries: 0
    batch:
      size: 4096
    linger: 1
    buffer:
      memory: 40960

 service-fee/src/main/resources/dataSource-zihao.yml

New file
@@ -0,0 +1,75 @@
dataSources:
  ds0: !!com.alibaba.druid.pool.DruidDataSource
    driverClassName: com.mysql.cj.jdbc.Driver
    url: jdbc:mysql://dev.db.java110.com:3306/hc_community?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
    username: hc_community
    password: ${mysqlpwd}
    minIdle: 5
    validationQuery: SELECT 1 FROM DUAL
    initialSize: 5
    maxWait: 60000
    filters: stat,wall,log4j
    poolPreparedStatements: true
  #  ds0_slave0: !!com.alibaba.druid.pool.DruidDataSource
  #    driverClassName: com.mysql.jdbc.Driver
  #    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8
  #    username: TT
  #    password: TT@12345678
  #    connectionTimeoutMilliseconds: 30000
  #    idleTimeoutMilliseconds: 60000
  #    maxPoolSize: 50
  #    minPoolSize: 1
  #    maintenanceIntervalMilliseconds: 30000
  ds1: !!com.alibaba.druid.pool.DruidDataSource
    driverClassName: com.mysql.cj.jdbc.Driver
    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
    username: TT
    password: ${mysqlpwd}
    minIdle: 5
    validationQuery: SELECT 1 FROM DUAL
    initialSize: 5
    maxWait: 60000
    filters: stat,wall,log4j
    poolPreparedStatements: true
#  ds1_slave0: !!com.alibaba.druid.pool.DruidDataSource
#    driverClassName: com.mysql.jdbc.Driver
#    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8
#    username: TT
#    password: TT@12345678
#    connectionTimeoutMilliseconds: 30000
#    idleTimeoutMilliseconds: 60000
#    maxPoolSize: 50
#    minPoolSize: 1
#    maintenanceIntervalMilliseconds: 30000

shardingRule:
  tables:
    business_xxx:
      actualDataNodes: ds${0..1}.business_community
      databaseStrategy:
        inline:
          shardingColumn: community_id
          algorithmExpression: ds${Long.parseLong(community_id) % 2}

  bindingTables:
    - business_xxx

  defaultDataSourceName: ds1
  defaultDatabaseStrategy:
    none:
  defaultTableStrategy:
    none:

#  masterSlaveRules:
#    ms_ds0:
#     masterDataSourceName: ds0
#     slaveDataSourceNames:
#       - ds0_slave0
#     loadBalanceAlgorithmType: ROUND_ROBIN
#   ms_ds1:
#     masterDataSourceName: ds1
#     slaveDataSourceNames:
#       - ds1_slave0
#     loadBalanceAlgorithmType: ROUND_ROBIN
props:
  sql.show: true

 service-job/src/main/resources/application-zihao.yml

New file
@@ -0,0 +1,142 @@
jedis:
  pool:
    config:
      maxTotal: 100
      maxIdle: 20
      maxWaitMillis: 20000
    host: dev.redis.java110.com
    port: 6379
    timeout: 3000
    password: ${redispwd}

eureka:
  instance:
    leaseRenewalIntervalInSeconds: 10
    leaseExpirationDurationInSeconds: 30
    preferIpAddress: true
    instanceId: ${spring.cloud.client.ip-address}:${server.port}
  client:
    serviceUrl:
      defaultZone: http://dev.java110.com:8761/eureka/
      #defaultZone: http://localhost:8761/eureka/
server:
  port: 8013
  tomcat:
    uri-encoding: UTF-8

java110:
  community-service: community-service
  acct-service: acct-service
  user-service: user-service
  store-service: store-service
  common-service: common-service
  job-service: job-service
  fee-service: fee-service
  report-service: report-service
  dev-service: dev-service
  oa-service: oa-service

spring:
  http:
    encoding:
      charset: UTF-8
      enabled: true
      force: true
  application:
    name: job-service
  redis:
    database: 0
    host: dev.redis.java110.com
    port: 6379
    password: ${redispwd}
    pool:
      max-active: 300
      max-wait: 10000
      max-idle: 100
      min-idle: 0
      timeout: 0
  datasource:
    connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
    minIdle: 5
    validationQuery: SELECT 1 FROM DUAL
    initialSize: 5
    maxWait: 60000
    filters: stat,wall,log4j
    poolPreparedStatements: true
    type: com.alibaba.druid.pool.DruidDataSource
    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8
    maxPoolPreparedStatementPerConnectionSize: 20
    password: TT@12345678
    testOnBorrow: false
    testWhileIdle: true
    minEvictableIdleTimeMillis: 300000
    timeBetweenEvictionRunsMillis: 60000
    testOnReturn: false
    driverClassName: com.mysql.cj.jdbc.Driver
    maxActive: 20
    username: TT
  thymeleaf:
    mode: LEGACYHTML5
    cache: false
    prefix: classpath:/templates/
    encoding: UTF-8
    suffix: .html
    content-type: text/html
#  mvc:
#    view:
#      prefix: classpath:/templates/
#      suffix: .html

#============== kafka ===================
kafka:
  consumer:
    zookeeper:
      connect: dev.zk.java110.com:2181
    servers: dev.kafka.java110.com:9092
    enable:
      auto:
        commit: true
    session:
      timeout: 6000
    auto:
      commit:
        interval: 100
      offset:
        reset: latest
    topic: test
    group:
      id: notifyBusinessStatus
    concurrency: 10
  hcGovTopic: csxq

  producer:
    zookeeper:
      connect: dev.zk.java110.com:2181
    servers: dev.kafka.java110.com:9092
    retries: 0
    batch:
      size: 4096
    linger: 1
    buffer:
      memory: 40960

quartz:
  properties:
    org:
      quartz:
        scheduler:
          instanceName: clusteredScheduler
          instanceId: AUTO
        jobStore:
          class: org.quartz.impl.jdbcjobstore.JobStoreTX
          driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
          tablePrefix: qrtz_
          isClustered: false
          clusterCheckinInterval: 10000
          useProperties: false
        threadPool:
          class: org.quartz.simpl.SimpleThreadPool
          threadCount: 10
          threadPriority: 5
          threadsInheritContextClassLoaderOfInitializingThread: true
  job-store-type: jdbc

 service-job/src/main/resources/dataSource-zihao.yml

New file
@@ -0,0 +1,75 @@
dataSources:
  ds0: !!com.alibaba.druid.pool.DruidDataSource
    driverClassName: com.mysql.cj.jdbc.Driver
    url: jdbc:mysql://dev.db.java110.com:3306/hc_community?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
    username: hc_community
    password: ${mysqlpwd}
    minIdle: 5
    validationQuery: SELECT 1 FROM DUAL
    initialSize: 5
    maxWait: 60000
    filters: stat,wall,log4j
    poolPreparedStatements: true
#  ds0_slave0: !!com.alibaba.druid.pool.DruidDataSource
#    driverClassName: com.mysql.jdbc.Driver
#    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8
#    username: TT
#    password: TT@12345678
#    connectionTimeoutMilliseconds: 30000
#    idleTimeoutMilliseconds: 60000
#    maxPoolSize: 50
#    minPoolSize: 1
#    maintenanceIntervalMilliseconds: 30000
  ds1: !!com.alibaba.druid.pool.DruidDataSource
    driverClassName: com.mysql.cj.jdbc.Driver
    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
    username: TT
    password: ${mysqlpwd}
    minIdle: 5
    validationQuery: SELECT 1 FROM DUAL
    initialSize: 5
    maxWait: 60000
    filters: stat,wall,log4j
    poolPreparedStatements: true
#  ds1_slave0: !!com.alibaba.druid.pool.DruidDataSource
#    driverClassName: com.mysql.jdbc.Driver
#    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8
#    username: TT
#    password: TT@12345678
#    connectionTimeoutMilliseconds: 30000
#    idleTimeoutMilliseconds: 60000
#    maxPoolSize: 50
#    minPoolSize: 1
#    maintenanceIntervalMilliseconds: 30000

shardingRule:
  tables:
    business_xxx:
      actualDataNodes: ds${0..1}.business_community
      databaseStrategy:
        inline:
          shardingColumn: community_id
          algorithmExpression: ds${Long.parseLong(community_id) % 2}

  bindingTables:
    - business_xxx

  defaultDataSourceName: ds1
  defaultDatabaseStrategy:
    none:
  defaultTableStrategy:
    none:

#  masterSlaveRules:
#    ms_ds0:
#     masterDataSourceName: ds0
#     slaveDataSourceNames:
#       - ds0_slave0
#     loadBalanceAlgorithmType: ROUND_ROBIN
#   ms_ds1:
#     masterDataSourceName: ds1
#     slaveDataSourceNames:
#       - ds1_slave0
#     loadBalanceAlgorithmType: ROUND_ROBIN
props:
  sql.show: true

 service-oa/src/main/resources/application-zihao.yml

New file
@@ -0,0 +1,98 @@
jedis:
  pool:
    config:
      maxTotal: 100
      maxIdle: 20
      maxWaitMillis: 20000
    host: dev.redis.java110.com
    port: 6379
    timeout: 3000
    password: ${redispwd}

eureka:
  instance:
    leaseRenewalIntervalInSeconds: 10
    leaseExpirationDurationInSeconds: 30
    preferIpAddress: true
    instanceId: ${spring.cloud.client.ip-address}:${server.port}
  client:
    serviceUrl:
      defaultZone: http://dev.java110.com:8761/eureka/
      #defaultZone: http://localhost:8761/eureka/
server:
  port: 8011
  tomcat:
    uri-encoding: UTF-8

java110:
  community-service: community-service
  acct-service: acct-service
  user-service: user-service
  store-service: store-service
  common-service: common-service
  job-service: job-service
  fee-service: fee-service
  report-service: report-service
  dev-service: dev-service
  oa-service: oa-service

spring:
  profiles:
    active: share
  http:
    encoding:
      charset: UTF-8
      enabled: true
      force: true
  application:
    name: oa-service
  redis:
    database: 0
    host: dev.redis.java110.com
    port: 6379
    password: ${redispwd}
    pool:
      max-active: 300
      max-wait: 10000
      max-idle: 100
      min-idle: 0
      timeout: 0

feign:
  client:
    config:
      default:
        connect-timeout: 10000
        read-timeout: 10000

#============== kafka ===================
kafka:
  consumer:
    zookeeper:
      connect: dev.zk.java110.com:2181
    servers: dev.kafka.java110.com:9092
    enable:
      auto:
        commit: true
    session:
      timeout: 6000
    auto:
      commit:
        interval: 100
      offset:
        reset: latest
    topic: test
    group:
      id: oaBusinessStatus
    concurrency: 10

  producer:
    zookeeper:
      connect: dev.zk.java110.com:2181
    servers: dev.kafka.java110.com:9092
    retries: 0
    batch:
      size: 4096
    linger: 1
    buffer:
      memory: 40960

 service-oa/src/main/resources/dataSource-zihao.yml

New file
@@ -0,0 +1,44 @@
dataSources:
  ds0: !!com.alibaba.druid.pool.DruidDataSource
    driverClassName: com.mysql.cj.jdbc.Driver
    url: jdbc:mysql://dev.db.java110.com:3306/hc_community?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
    username: hc_community
    password: ${mysqlpwd}
    minIdle: 5
    validationQuery: SELECT 1 FROM DUAL
    initialSize: 5
    maxWait: 60000
    filters: stat,wall,log4j
    poolPreparedStatements: true
  ds1: !!com.alibaba.druid.pool.DruidDataSource
    driverClassName: com.mysql.cj.jdbc.Driver
    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
    username: TT
    password: ${mysqlpwd}
    minIdle: 5
    validationQuery: SELECT 1 FROM DUAL
    initialSize: 5
    maxWait: 60000
    filters: stat,wall,log4j
    poolPreparedStatements: true

shardingRule:
  tables:
    business_xxx:
      actualDataNodes: ds${0..1}.business_community
      databaseStrategy:
        inline:
          shardingColumn: community_id
          algorithmExpression: ds${Long.parseLong(community_id) % 2}

  bindingTables:
    - business_xxx

  defaultDataSourceName: ds1
  defaultDatabaseStrategy:
    none:
  defaultTableStrategy:
    none:

props:
  sql.show: true

 service-order/src/main/resources/application-prod.yml

File was deleted

 service-order/src/main/resources/application-zihao.yml

old mode 100755
new mode 100644
File was renamed from service-order/src/main/resources/application-test.yml
@@ -4,10 +4,10 @@
      maxTotal: 100
      maxIdle: 20
      maxWaitMillis: 20000
    host: test.redis.java110.com
    host: dev.redis.java110.com
    port: 6379
    timeout: 3000
    password: hc
    password: ${redispwd}

eureka:
  instance:
@@ -17,12 +17,24 @@
    instanceId: ${spring.cloud.client.ip-address}:${server.port}
  client:
    serviceUrl:
      defaultZone: http://test.java110.com:8761/eureka/
      defaultZone: http://dev.java110.com:8761/eureka/
      #defaultZone: http://localhost:8761/eureka/
server:
  port: 8001
  tomcat:
    uri-encoding: UTF-8

java110:
  community-service: community-service
  acct-service: acct-service
  user-service: user-service
  store-service: store-service
  common-service: common-service
  job-service: job-service
  fee-service: fee-service
  report-service: report-service
  dev-service: dev-service
  oa-service: oa-service

spring:
  http:
@@ -34,9 +46,9 @@
    name: order-service
  redis:
    database: 0
    host: hc.java110.com
    host: dev.redis.java110.com
    port: 6379
    password: hc
    password: ${redispwd}
    pool:
      max-active: 300
      max-wait: 10000
@@ -52,7 +64,7 @@
    filters: stat,wall,log4j
    poolPreparedStatements: true
    type: com.alibaba.druid.pool.DruidDataSource
    url: jdbc:mysql://test.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8
    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8
    maxPoolPreparedStatementPerConnectionSize: 20
    password: TT@12345678
    testOnBorrow: false
@@ -68,8 +80,8 @@
kafka:
  consumer:
    zookeeper:
      connect: test.zk.java110.com:2181
    servers: test.kafka.java110.com:9092
      connect: dev.zk.java110.com:2181
    servers: dev.kafka.java110.com:9092
    enable:
      auto:
        commit: true
@@ -87,8 +99,8 @@

  producer:
    zookeeper:
      connect: test.zk.java110.com:2181
    servers: test.kafka.java110.com:9092
      connect: dev.zk.java110.com:2181
    servers: dev.kafka.java110.com:9092
    retries: 0
    batch:
      size: 4096

 service-order/src/main/resources/dataSource-zihao.yml

New file
@@ -0,0 +1,75 @@
dataSources:
  ds0: !!com.alibaba.druid.pool.DruidDataSource
    driverClassName: com.mysql.cj.jdbc.Driver
    url: jdbc:mysql://dev.db.java110.com:3306/hc_community?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
    username: hc_community
    password: ${mysqlpwd}
    minIdle: 5
    validationQuery: SELECT 1 FROM DUAL
    initialSize: 5
    maxWait: 60000
    filters: stat,wall,log4j
    poolPreparedStatements: true
#  ds0_slave0: !!com.alibaba.druid.pool.DruidDataSource
#    driverClassName: com.mysql.jdbc.Driver
#    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8
#    username: TT
#    password: TT@12345678
#    connectionTimeoutMilliseconds: 30000
#    idleTimeoutMilliseconds: 60000
#    maxPoolSize: 50
#    minPoolSize: 1
#    maintenanceIntervalMilliseconds: 30000
  ds1: !!com.alibaba.druid.pool.DruidDataSource
    driverClassName: com.mysql.cj.jdbc.Driver
    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
    username: TT
    password: ${mysqlpwd}
    minIdle: 5
    validationQuery: SELECT 1 FROM DUAL
    initialSize: 5
    maxWait: 60000
    filters: stat,wall,log4j
    poolPreparedStatements: true
#  ds1_slave0: !!com.alibaba.druid.pool.DruidDataSource
#    driverClassName: com.mysql.jdbc.Driver
#    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8
#    username: TT
#    password: TT@12345678
#    connectionTimeoutMilliseconds: 30000
#    idleTimeoutMilliseconds: 60000
#    maxPoolSize: 50
#    minPoolSize: 1
#    maintenanceIntervalMilliseconds: 30000

shardingRule:
  tables:
    business_xxx:
      actualDataNodes: ds${0..1}.business_community
      databaseStrategy:
        inline:
          shardingColumn: community_id
          algorithmExpression: ds${Long.parseLong(community_id) % 2}

  bindingTables:
    - business_xxx

  defaultDataSourceName: ds1
  defaultDatabaseStrategy:
    none:
  defaultTableStrategy:
    none:

#  masterSlaveRules:
#    ms_ds0:
#     masterDataSourceName: ds0
#     slaveDataSourceNames:
#       - ds0_slave0
#     loadBalanceAlgorithmType: ROUND_ROBIN
#   ms_ds1:
#     masterDataSourceName: ds1
#     slaveDataSourceNames:
#       - ds1_slave0
#     loadBalanceAlgorithmType: ROUND_ROBIN
props:
  sql.show: true

 service-report/src/main/resources/application-prod.yml

File was deleted

 service-report/src/main/resources/application-test.yml

File was deleted

 service-report/src/main/resources/application-zihao.yml

New file
@@ -0,0 +1,92 @@
jedis:
  pool:
    config:
      maxTotal: 100
      maxIdle: 20
      maxWaitMillis: 20000
    host: dev.redis.java110.com
    port: 6379
    timeout: 3000
    password: ${redispwd}

eureka:
  instance:
    leaseRenewalIntervalInSeconds: 10
    leaseExpirationDurationInSeconds: 30
    preferIpAddress: true
    instanceId: ${spring.cloud.client.ip-address}:${server.port}
  client:
    serviceUrl:
      defaultZone: http://dev.java110.com:8761/eureka/
      #defaultZone: http://localhost:8761/eureka/
server:
  port: 8007
  tomcat:
    uri-encoding: UTF-8

java110:
  community-service: community-service
  acct-service: acct-service
  user-service: user-service
  store-service: store-service
  common-service: common-service
  job-service: job-service
  fee-service: fee-service
  report-service: report-service
  dev-service: dev-service
  oa-service: oa-service

spring:
  profiles:
    active: share
  http:
    encoding:
      charset: UTF-8
      enabled: true
      force: true
  application:
    name: report-service
  redis:
    database: 0
    host: dev.redis.java110.com
    port: 6379
    password: ${redispwd}
    pool:
      max-active: 300
      max-wait: 10000
      max-idle: 100
      min-idle: 0
      timeout: 0


#============== kafka ===================
kafka:
  consumer:
    zookeeper:
      connect: dev.zk.java110.com:2181
    servers: dev.kafka.java110.com:9092
    enable:
      auto:
        commit: true
    session:
      timeout: 6000
    auto:
      commit:
        interval: 100
      offset:
        reset: latest
    topic: test
    group:
      id: reportBusinessStatus
    concurrency: 10

  producer:
    zookeeper:
      connect: dev.zk.java110.com:2181
    servers: dev.kafka.java110.com:9092
    retries: 0
    batch:
      size: 4096
    linger: 1
    buffer:
      memory: 40960

 service-report/src/main/resources/dataSource-zihao.yml

New file
@@ -0,0 +1,44 @@
dataSources:
  ds0: !!com.alibaba.druid.pool.DruidDataSource
    driverClassName: com.mysql.cj.jdbc.Driver
    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
    username: TT
    password: ${mysqlpwd}
    minIdle: 5
    validationQuery: SELECT 1 FROM DUAL
    initialSize: 5
    maxWait: 60000
    filters: stat,wall,log4j
    poolPreparedStatements: true

shardingRule:
  tables:
    business_xxx:
      actualDataNodes: ds0.business_community
      databaseStrategy:
        inline:
          shardingColumn: community_id
          algorithmExpression: ds${Long.parseLong(community_id) % 2}

  bindingTables:
    - business_xxx

  defaultDataSourceName: ds0
  defaultDatabaseStrategy:
    none:
  defaultTableStrategy:
    none:

#  masterSlaveRules:
#    ms_ds0:
#     masterDataSourceName: ds0
#     slaveDataSourceNames:
#       - ds0_slave0
#     loadBalanceAlgorithmType: ROUND_ROBIN
#   ms_ds1:
#     masterDataSourceName: ds1
#     slaveDataSourceNames:
#       - ds1_slave0
#     loadBalanceAlgorithmType: ROUND_ROBIN
props:
  sql.show: true

 service-store/src/main/resources/application-prod.yml

File was deleted

 service-store/src/main/resources/application-zihao.yml

old mode 100755
new mode 100644
File was renamed from service-store/src/main/resources/application-test.yml
@@ -4,10 +4,10 @@
      maxTotal: 100
      maxIdle: 20
      maxWaitMillis: 20000
    host: test.redis.java110.com
    host: dev.redis.java110.com
    port: 6379
    timeout: 3000
    password:
    password: ${redispwd}

eureka:
  instance:
@@ -17,12 +17,24 @@
    instanceId: ${spring.cloud.client.ip-address}:${server.port}
  client:
    serviceUrl:
      defaultZone: http://test.java110.com:8761/eureka/
      defaultZone: http://dev.java110.com:8761/eureka/
      #defaultZone: http://localhost:8761/eureka/
server:
  port: 8006
  tomcat:
    uri-encoding: UTF-8

java110:
  community-service: community-service
  acct-service: acct-service
  user-service: user-service
  store-service: store-service
  common-service: common-service
  job-service: job-service
  fee-service: fee-service
  report-service: report-service
  dev-service: dev-service
  oa-service: oa-service

spring:
  http:
@@ -34,8 +46,9 @@
    name: store-service
  redis:
    database: 0
    host: test.redis.java110.com
    host: dev.redis.java110.com
    port: 6379
    password: ${redispwd}
    pool:
      max-active: 300
      max-wait: 10000
@@ -51,7 +64,7 @@
    filters: stat,wall,log4j
    poolPreparedStatements: true
    type: com.alibaba.druid.pool.DruidDataSource
    url: jdbc:mysql://test.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8
    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8
    maxPoolPreparedStatementPerConnectionSize: 20
    password: TT@12345678
    testOnBorrow: false
@@ -63,12 +76,19 @@
    maxActive: 20
    username: TT

feign:
  client:
    config:
      default:
        connect-timeout: 10000
        read-timeout: 20000

#============== kafka ===================
kafka:
  consumer:
    zookeeper:
      connect: test.zk.java110.com:2181
    servers: test.kafka.java110.com:9092
      connect: dev.zk.java110.com:2181
    servers: dev.kafka.java110.com:9092
    enable:
      auto:
        commit: true
@@ -86,8 +106,8 @@

  producer:
    zookeeper:
      connect: test.zk.java110.com:2181
    servers: test.kafka.java110.com:9092
      connect: dev.zk.java110.com:2181
    servers: dev.kafka.java110.com:9092
    retries: 0
    batch:
      size: 4096

 service-store/src/main/resources/dataSource-zihao.yml

New file
@@ -0,0 +1,75 @@
dataSources:
  ds0: !!com.alibaba.druid.pool.DruidDataSource
    driverClassName: com.mysql.cj.jdbc.Driver
    url: jdbc:mysql://dev.db.java110.com:3306/hc_community?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
    username: hc_community
    password: ${mysqlpwd}
    minIdle: 5
    validationQuery: SELECT 1 FROM DUAL
    initialSize: 5
    maxWait: 60000
    filters: stat,wall,log4j
    poolPreparedStatements: true
#  ds0_slave0: !!com.alibaba.druid.pool.DruidDataSource
#    driverClassName: com.mysql.jdbc.Driver
#    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8
#    username: TT
#    password: TT@12345678
#    connectionTimeoutMilliseconds: 30000
#    idleTimeoutMilliseconds: 60000
#    maxPoolSize: 50
#    minPoolSize: 1
#    maintenanceIntervalMilliseconds: 30000
  ds1: !!com.alibaba.druid.pool.DruidDataSource
    driverClassName: com.mysql.cj.jdbc.Driver
    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
    username: TT
    password: ${mysqlpwd}
    minIdle: 5
    validationQuery: SELECT 1 FROM DUAL
    initialSize: 5
    maxWait: 60000
    filters: stat,wall,log4j
    poolPreparedStatements: true
#  ds1_slave0: !!com.alibaba.druid.pool.DruidDataSource
#    driverClassName: com.mysql.jdbc.Driver
#    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8
#    username: TT
#    password: TT@12345678
#    connectionTimeoutMilliseconds: 30000
#    idleTimeoutMilliseconds: 60000
#    maxPoolSize: 50
#    minPoolSize: 1
#    maintenanceIntervalMilliseconds: 30000

shardingRule:
  tables:
    business_xxx:
      actualDataNodes: ds${0..1}.business_community
      databaseStrategy:
        inline:
          shardingColumn: community_id
          algorithmExpression: ds${Long.parseLong(community_id) % 2}

  bindingTables:
    - business_xxx

  defaultDataSourceName: ds1
  defaultDatabaseStrategy:
    none:
  defaultTableStrategy:
    none:

#  masterSlaveRules:
#    ms_ds0:
#     masterDataSourceName: ds0
#     slaveDataSourceNames:
#       - ds0_slave0
#     loadBalanceAlgorithmType: ROUND_ROBIN
#   ms_ds1:
#     masterDataSourceName: ds1
#     slaveDataSourceNames:
#       - ds1_slave0
#     loadBalanceAlgorithmType: ROUND_ROBIN
props:
  sql.show: true

 service-user/src/main/resources/application-prod.yml

File was deleted

 service-user/src/main/resources/application-zihao.yml

old mode 100755
new mode 100644
File was renamed from service-user/src/main/resources/application-test.yml
@@ -4,10 +4,10 @@
      maxTotal: 100
      maxIdle: 20
      maxWaitMillis: 20000
    host: test.redis.java110.com
    host: dev.redis.java110.com
    port: 6379
    timeout: 3000
    password:
    password: ${redispwd}

eureka:
  instance:
@@ -17,12 +17,24 @@
    instanceId: ${spring.cloud.client.ip-address}:${server.port}
  client:
    serviceUrl:
      defaultZone: http://test.java110.com:8761/eureka/
      defaultZone: http://dev.java110.com:8761/eureka/
      #defaultZone: http://localhost:8761/eureka/
server:
  port: 8002
  tomcat:
    uri-encoding: UTF-8

java110:
  community-service: community-service
  acct-service: acct-service
  user-service: user-service
  store-service: store-service
  common-service: common-service
  job-service: job-service
  fee-service: fee-service
  report-service: report-service
  dev-service: dev-service
  oa-service: oa-service

spring:
  http:
@@ -34,8 +46,9 @@
    name: user-service
  redis:
    database: 0
    host: test.redis.java110.com
    host: dev.redis.java110.com
    port: 6379
    password: ${redispwd}
    pool:
      max-active: 300
      max-wait: 10000
@@ -51,7 +64,7 @@
    filters: stat,wall,log4j
    poolPreparedStatements: true
    type: com.alibaba.druid.pool.DruidDataSource
    url: jdbc:mysql://test.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8
    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8
    maxPoolPreparedStatementPerConnectionSize: 20
    password: TT@12345678
    testOnBorrow: false
@@ -67,8 +80,8 @@
kafka:
  consumer:
    zookeeper:
      connect: test.zk.java110.com:2181
    servers: test.kafka.java110.com:9092
      connect: dev.zk.java110.com:2181
    servers: dev.kafka.java110.com:9092
    enable:
      auto:
        commit: true
@@ -86,8 +99,8 @@

  producer:
    zookeeper:
      connect: test.zk.java110.com:2181
    servers: test.kafka.java110.com:9092
      connect: dev.zk.java110.com:2181
    servers: dev.kafka.java110.com:9092
    retries: 0
    batch:
      size: 4096

 service-user/src/main/resources/dataSource-zihao.yml

New file
@@ -0,0 +1,75 @@
dataSources:
  ds0: !!com.alibaba.druid.pool.DruidDataSource
    driverClassName: com.mysql.cj.jdbc.Driver
    url: jdbc:mysql://dev.db.java110.com:3306/hc_community?useUnicode=true&characterEncoding=utf-8&serverTimezone=UTC
    username: hc_community
    password: ${mysqlpwd}
    minIdle: 5
    validationQuery: SELECT 1 FROM DUAL
    initialSize: 5
    maxWait: 60000
    filters: stat,wall,log4j
    poolPreparedStatements: true
#  ds0_slave0: !!com.alibaba.druid.pool.DruidDataSource
#    driverClassName: com.mysql.jdbc.Driver
#    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8
#    username: TT
#    password: TT@12345678
#    connectionTimeoutMilliseconds: 30000
#    idleTimeoutMilliseconds: 60000
#    maxPoolSize: 50
#    minPoolSize: 1
#    maintenanceIntervalMilliseconds: 30000
  ds1: !!com.alibaba.druid.pool.DruidDataSource
    driverClassName: com.mysql.cj.jdbc.Driver
    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8&serverTimezone=UTC
    username: TT
    password: ${mysqlpwd}
    minIdle: 5
    validationQuery: SELECT 1 FROM DUAL
    initialSize: 5
    maxWait: 60000
    filters: stat,wall,log4j
    poolPreparedStatements: true
#  ds1_slave0: !!com.alibaba.druid.pool.DruidDataSource
#    driverClassName: com.mysql.jdbc.Driver
#    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8
#    username: TT
#    password: TT@12345678
#    connectionTimeoutMilliseconds: 30000
#    idleTimeoutMilliseconds: 60000
#    maxPoolSize: 50
#    minPoolSize: 1
#    maintenanceIntervalMilliseconds: 30000

shardingRule:
  tables:
    business_xxx:
      actualDataNodes: ds${0..1}.business_community
      databaseStrategy:
        inline:
          shardingColumn: community_id
          algorithmExpression: ds${Long.parseLong(community_id) % 2}

  bindingTables:
    - business_xxx

  defaultDataSourceName: ds1
  defaultDatabaseStrategy:
    none:
  defaultTableStrategy:
    none:

#  masterSlaveRules:
#    ms_ds0:
#     masterDataSourceName: ds0
#     slaveDataSourceNames:
#       - ds0_slave0
#     loadBalanceAlgorithmType: ROUND_ROBIN
#   ms_ds1:
#     masterDataSourceName: ds1
#     slaveDataSourceNames:
#       - ds1_slave0
#     loadBalanceAlgorithmType: ROUND_ROBIN
props:
  sql.show: true