Merge branch 'uat' into dev

# Conflicts: # src/main/java/com/chinaunicom/mall/ebtp/extend/BizServiceEbtpExtendApplication.java # src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/ZjcnExportServiceImpl.java # src/main/resources/application.yml
2021-05-25 16:05:16 +08:00
parent ce4e9319e4 b09f0e2f35
commit 8c479079ef
21 changed files with 559 additions and 171 deletions
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/BizServiceEbtpExtendApplication.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/BizServiceEbtpExtendApplication.java
@ -4,6 +4,7 @@ import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.util.IdUtil;
 import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure;
 import io.micrometer.core.instrument.MeterRegistry;
+import com.ctrip.framework.apollo.spring.annotation.EnableApolloConfig;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
@ -21,6 +22,7 @@ import org.springframework.context.annotation.ComponentScan;
@EnableEurekaClient
@MapperScan({"com.chinaunicom.mall.ebtp.extend.**.dao"})
@ComponentScan("com.chinaunicom.mall.ebtp.*")
+@EnableApolloConfig
 public class BizServiceEbtpExtendApplication {

    public static void main(String[] args) {
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
--- a/src/main/resources/application-localpro.yml
+++ b/src/main/resources/application-localpro.yml
@ -0,0 +1,153 @@
+server:
+  port: 18003
+  servlet:
+    context-path: /
+
+seata:
+  service:
+    vgroup-mapping:
+      biz-service-ebtp-extend-local-service-group: seata-server-jl
+  registry:
+    type: eureka
+    eureka:
+      serviceUrl: http://10.238.25.112:5001/eureka,http://10.238.25.112:5002/eureka,http://10.238.25.112:5003/eureka
+
+# 对应 apollo 配置中心的应用名
+app:
+  id: biz-service-ebtp-extend
+
+# Apollo 配置信息
+apollo:
+  meta: http://10.238.25.112:6001/
+  bootstrap:
+    namespace: application
+    enabled: true
+    eagerLoad:
+      enabled: true
+
+spring:
+  aop:
+    auto: true #开启spring的aop配置
+    proxy-target-class: true
+  application:
+    name: biz-service-ebtp-extend-local
+
+  shardingsphere:
+    datasource:
+      names: ds0
+      ds0:
+        type: com.alibaba.druid.pool.DruidDataSource
+        driver-class-name: com.mysql.cj.jdbc.Driver
+        username: auction
+        password: ProdMall3_0118auction
+        jdbc-url: jdbc:mysql://10.238.25.112:3001/ebtp_mall_extend?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+        url: jdbc:mysql://10.238.25.112:3001/ebtp_mall_extend?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+        filters: stat,wall,log4j
+        maxActive: 20
+        initialSize: 1
+        maxWait: 60000
+        minIdle: 1
+        timeBetweenEvictionRunsMillis: 60000
+        minEvictableIdleTimeMillis: 300000
+        validationQuery: select 'x'
+        testWhileIdle: true
+        testOnBorrow: false
+        testOnReturn: false
+        poolPreparedStatements: true
+        maxOpenPreparedStatements: 20
+        connection-properties: druid.stat.merggSql=ture;druid.stat.slowSqlMillis=5000
+        props:
+          sql:
+            show: true
+
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
+    serialization:
+      write-dates-as-timestamps: false
+
+  # 生产区 redis 配置
+  redis:
+    sentinel:
+      master: eshop-redis2
+      nodes: 10.172.48.83:32521,10.172.48.100:32521,10.172.48.94:32561
+    password: Unicom#135
+
+# 天宫Eureka配置
+eureka:
+  client:
+    service-url:
+      defaultZone: http://10.238.25.112:5001/eureka,http://10.238.25.112:5002/eureka,http://10.238.25.112:5003/eureka
+  instance:
+    prefer-ip-address: true
+    instance-ip: ${spring.cloud.client.ip-address}:${server.port}
+
+mybatis-plus:
+  configuration:
+    # 是否开启自动驼峰命名规则映射:从数据库列名到Java属性驼峰命名的类似映射
+    map-underscore-to-camel-case: true
+    auto-mapping-behavior: full
+    # 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+  mapper-locations: classpath*:com/chinaunicom/mall/ebtp/**/mapper/*Mapper.xml
+  global-config:
+    # 逻辑删除配置
+    db-config:
+      logic-not-delete-value: normal # 逻辑删除标记：正常数据
+      logic-delete-value: deleted    # 逻辑删除标记：已删除的数据
+      
+feign:
+  httpclient:
+    enabled: false
+  okhttp:
+    enabled: true
+  client:
+    config:
+      default:
+        connect-timeout: 20000
+        read-timeout: 20000
+hystrix:
+  command:
+    default:
+      execution:
+        timeout:
+          enabled: true
+        isolation:
+          strategy:  SEMAPHORE
+          thread:
+            timeoutInMilliseconds: 200000  #熔断超时时间
+      circuitBreaker:
+        sleepWindowInMilliseconds: 20000
+        forceClosed: true
+        
+ribbon:
+  ReadTimeout: 20000  #请求处理的超时时间
+  ConnectTimeout: 20000 #请求连接超时时间
+  MaxAutoRetries: 0 #对当前实例的重试次数
+  MaxAutoRetriesNextServer: 1 #切换实例的重试次数 1
+  
+mconfig:
+  workerId: 1
+  datacenterId: 1
+  # 服务名
+  feign:
+    name:
+      open: biz-service-ebtp-opening #开标大厅服务
+      process: biz-service-ebtp-process #评审流程服务
+      project: biz-service-ebtp-project #项目服务
+      resps: biz-service-ebtp-resps #应答结构化服务
+      rsms: biz-service-ebtp-rsms #评审结构化服务
+      tender: biz-service-ebtp-tender #投标服务
+      documentcenter: core-service-document-center #文档中心
+document:
+  clientHttpUrl: http://10.238.25.112:8100/auth/oauth/token?grant_type=client_credentials&client_id=bVS46ElU&client_secret=58ea04ba02475c8da2321cc99849d2a10f15b749
+
+# 用户暴露给 prometheus 的健康数据  
+management:
+  endpoints:
+    web:
+      exposure:
+        include: "*"
+      cors:
+        allowed-origins: "*"
+        allowed-methods: "*"
--- a/src/main/resources/application-mster.yml
+++ b/src/main/resources/application-mster.yml
--- a/src/main/resources/application-uat.yml
+++ b/src/main/resources/application-uat.yml
@ -6,12 +6,11 @@ server:
 seata:
  service:
    vgroup-mapping:
-      biz-service-ebtp-extend-service-group: default
-      
-  #registry:
-  #  type: eureka
-  # eureka:
-  #    serviceUrl: http://10.242.31.158:5001/eureka,http://10.242.31.158:5002/eureka,http://10.242.31.158:5003/eureka
+      biz-service-ebtp-extend-service-group: seata-server-jl
+  registry:
+    type: eureka
+    eureka:
+      serviceUrl: http://eureka-1:8080/eureka,http://eureka-2:8080/eureka,http://eureka-3:8080/eureka
      
 # 对应 apollo 配置中心的应用名
 app:
@ -19,7 +18,7 @@ app:
  
 # Apollo 配置信息
 apollo:
-  meta: http://10.242.31.158:6001/
+  meta: http://apollo-configservice:8080
  bootstrap:
    namespace: application
    enabled: true
@ -102,12 +101,10 @@ spring:
 eureka:
  client:
    service-url:
-      defaultZone: http://10.242.31.158:5001/eureka,http://10.242.31.158:5002/eureka,http://10.242.31.158:5003/eureka
+      defaultZone: http://eureka-1:8080/eureka,http://eureka-2:8080/eureka,http://eureka-3:8080/eureka
  instance:
    prefer-ip-address: true
-    instance-id: http://10.242.31.158:${server.port}
-    # 这是客户端的注册地址， eureka 会通过这个地址建立管道
-    ip-address: 10.242.31.158
+    instance-ip: ${spring.cloud.client.ip-address}:${server.port}

 mybatis-plus:
  configuration:
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@ -1,3 +1,9 @@
-spring:
-  profiles:
-    active: uat
+# 对应 apollo 配置中心的应用名
+app:
+  id: biz-service-ebtp-extend
+
+# Apollo 配置信息
+apollo:
+  bootstrap:
+    enabled: true
+    namespace: application
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@ -2,7 +2,7 @@
 <configuration scan="true" scanPeriod="60 seconds" debug="true">

    <property name="logback.logdir" value="/log" />
-    <property name="logback.appname" value="biz_service_ebtp_extend" />
+    <property name="logback.appname" value="${APP_NAME}" />

    <contextName>${logback.appname}</contextName>

@ -11,31 +11,21 @@
        <!--展示格式 layout-->
        <layout class="ch.qos.logback.classic.PatternLayout">
            <pattern>
-                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{50} - %msg%n</pattern>
+                <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} ${MY_POD_IP} %contextName [%thread] %-5level %logger{50}  - [ppTraceId: %X{PtxId}, ppSpanId: %X{PspanId}] - %msg%n</pattern>
            </pattern>
        </layout>
    </appender>

    <appender name="fileInfoLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!--如果只是想要 Info 级别的日志，只是过滤 info 还是会输出 Error 日志，因为 Error 的级别高，
-        所以我们使用下面的策略，可以避免输出 Error 的日志-->
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!--过滤 Error-->
-            <level>ERROR</level>
-            <!--匹配到就禁止-->
-            <onMatch>DENY</onMatch>
-            <!--没有匹配到就允许-->
-            <onMismatch>ACCEPT</onMismatch>
-        </filter>
        <!--日志名称，如果没有File 属性，那么只会使用FileNamePattern的文件路径规则
            如果同时有<File>和<FileNamePattern>，那么当天日志是<File>，明天会自动把今天
            的日志改名为今天的日期。即，<File> 的日志都是当天的。
        -->
-        <File>${logback.logdir}/info.${logback.appname}.log</File>
+        <File>${logback.logdir}/${logback.appname}-${MY_POD_IP}.log</File>
        <!--滚动策略，按照时间滚动 TimeBasedRollingPolicy-->
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <!--文件路径,定义了日志的切分方式——把每一天的日志归档到一个文件中,以防止日志填满整个磁盘空间-->
-            <FileNamePattern>${logback.logdir}/info.${logback.appname}.%d{yyyy-MM-dd}.log</FileNamePattern>
+            <FileNamePattern>${logback.logdir}/${logback.appname}-${MY_POD_IP}.%d{yyyy-MM-dd}.log</FileNamePattern>
            <!--只保留最近3天的日志-->
            <maxHistory>3</maxHistory>
            <!--应用启动时删除超过时间范围的日志文件-->
@ -46,35 +36,7 @@
        <!--日志输出编码格式化-->
        <encoder>
            <charset>UTF-8</charset>
-            <pattern>%d [%thread] %-5level %logger{64} %line - %msg%n</pattern>
-        </encoder>
-    </appender>
-
-    <appender name="fileErrorLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <!--如果只是想要 Error 级别的日志，那么需要过滤一下，默认是 info 级别的，ThresholdFilter-->
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>Error</level>
-        </filter>
-        <!--日志名称，如果没有File 属性，那么只会使用FileNamePattern的文件路径规则
-            如果同时有<File>和<FileNamePattern>，那么当天日志是<File>，明天会自动把今天
-            的日志改名为今天的日期。即，<File> 的日志都是当天的。
-        -->
-        <File>${logback.logdir}/error.${logback.appname}.log</File>
-        <!--滚动策略，按照时间滚动 TimeBasedRollingPolicy-->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!--文件路径,定义了日志的切分方式——把每一天的日志归档到一个文件中,以防止日志填满整个磁盘空间-->
-            <FileNamePattern>${logback.logdir}/error.${logback.appname}.%d{yyyy-MM-dd}.log</FileNamePattern>
-            <!--只保留最近3天的日志-->
-            <maxHistory>3</maxHistory>
-            <!--应用启动时删除超过时间范围的日志文件-->
-            <cleanHistoryOnStart>true</cleanHistoryOnStart>
-            <!--用来指定日志文件的上限大小，那么到了这个值，就会删除旧的日志-->
-            <!--<totalSizeCap>1GB</totalSizeCap>-->
-        </rollingPolicy>
-        <!--日志输出编码格式化-->
-        <encoder>
-            <charset>UTF-8</charset>
-            <pattern>%d [%thread] %-5level %logger{128} %line - %msg%n</pattern>
+            <pattern>%d ${MY_POD_IP} [%thread] %-5level %logger{64} %line  - [ppTraceId: %X{PtxId}, ppSpanId: %X{PspanId}] - %msg%n</pattern>
        </encoder>
    </appender>