فهرست منبع

Merge remote-tracking branch 'origin/master'

qin 1 سال پیش
والد
کامیت
addba4ced2
3فایلهای تغییر یافته به همراه111 افزوده شده و 0 حذف شده
  1. 6 0
      pom.xml
  2. 1 0
      src/main/resources/mapper/statistics/OrderMapper.xml
  3. 104 0
      src/main/resources/pre/application.yml

+ 6 - 0
pom.xml

@@ -271,6 +271,12 @@
                 <package.environment>kyy</package.environment>
             </properties>
         </profile>
+        <profile>
+            <id>pre</id>
+            <properties>
+                <package.environment>pre</package.environment>
+            </properties>
+        </profile>
     </profiles>
 
     <build>

+ 1 - 0
src/main/resources/mapper/statistics/OrderMapper.xml

@@ -70,6 +70,7 @@
         and (region_area_code like '37%' or
         region_area_code like '32%' or
         region_area_code like '11%' or
+        region_area_code like '13%' or
         region_area_code like '21%' or
         region_area_code like '51%')
     </select>

+ 104 - 0
src/main/resources/pre/application.yml

@@ -0,0 +1,104 @@
+# server basic config
+server:
+  port: 12011
+  servlet:
+    context-path: /
+# eureka server connect config
+eureka:
+  client:
+    service-url:
+      defaultZone: http://172.17.243.67:12006/eureka/
+  instance:
+    appname: cgp-statistics
+    prefer-ip-address: true
+spring:
+  # 安全配置,请以实际方式代替
+  security:
+    user:
+      name: admin
+      password: admin
+  application:
+    # 请保持和POM GAV一致
+    name: cgp-statistics
+  #database operation config
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    druid:
+      url: jdbc:mysql://172.17.243.63:3306/rz_face?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
+      username: zky
+      password: V&h5IN!&
+      filter: stat
+      max-active: 100
+      initial-size: 5
+      max-wait: 60000
+      min-idle: 1
+      validation-query: SELECT 1
+      test-while-idle: true
+      driver-class-name: com.mysql.cj.jdbc.Driver
+  data:
+    elasticsearch:
+      cluster-name: my-application
+      cluster-nodes: 172.17.243.67:12019
+      repositories:
+        enabled: true
+      local: false
+  elasticsearch:
+    rest:
+      uris: ["http://172.17.243.67:12018"]
+  redis:
+    ################### redis 单机版  ##########################
+    host: ${REDIS_IP:172.17.243.63}
+    port: ${REDIS_PORT:16379}
+    database: ${REDIS_DB:3}
+    password: ${REDIS_PASSWORD:trJQ#4gN}
+    # 使用jedis连接池
+    jedis:
+      pool:
+        max-active: 8
+        max-wait: -1
+        max-idle: 8
+        min-idle: 0
+    timeout: 5000
+#mybatis plus配置
+mybatis-plus:
+  config-location: classpath:mybatis-config.xml
+  mapper-locations: classpath:/mapper/statistics/*.xml
+
+logging:
+  level:
+    com.poteviohealth.cgp.statistics.mapper: DEBUG
+  config: classpath:logback-spring.xml
+
+
+  ### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
+xxl:
+  job:
+    #      admin:
+    addresses: http://172.17.243.67:12010/xxl-job-admin
+    #      executor:
+    appname: xxl-job-statistics
+    ip:
+    port: 9996
+    accessToken:
+    logretentiondays: -1
+    logpath: ./logs/xxl-job
+
+common:
+  minio:
+    apiUri: http://172.17.243.63:9000/
+    uri: https://sq.poteviohealth.com/
+    bucket: cgpimage
+    accessKey: admin
+    secretKey: df73bUx1
+
+jpush:
+  app_key: c61567cde175728a73a4f9d2
+  master_secret: 1c8973c67c6ca7100259830c
+  apnsProduction: true
+
+ribbon:
+ ReadTimeout: 5000
+ ConnectTimeout: 5000
+
+sync:
+  dbName: rz