Procházet zdrojové kódy

修改骄阳任务配置文件

syh před 4 roky
rodič
revize
30991a0a00

+ 0 - 6
module-job-kuaishou/pom.xml

@@ -204,12 +204,6 @@
             </activation>
         </profile>
         <profile>
-            <id>jiaoyang</id>
-            <properties>
-                <activatedProperties>jiaoyang</activatedProperties>
-            </properties>
-        </profile>
-        <profile>
             <id>test</id>
             <properties>
                 <activatedProperties>test</activatedProperties>

+ 0 - 185
module-job-kuaishou/src/main/resources/application-jiaoyang.yml

@@ -1,185 +0,0 @@
-management:
-  endpoints:
-    web:
-      exposure:
-        include: metrics,httptrace
-spring:
-  rabbitmq:
-    host: 39.106.184.70
-    port: 5672
-    username: guest
-    password: guest
-  servlet:
-    multipart:
-      max-file-size: -1
-      max-request-size: -1
-  mail:
-    host: smtp.163.com
-    username: jeecgos@163.com
-    password: ??
-    properties:
-      mail:
-        smtp:
-          auth: true
-          starttls:
-            enable: true
-            required: true
-  #json 时间戳统一转换
-  jackson:
-    date-format:   yyyy-MM-dd HH:mm:ss
-    time-zone:   GMT+8
-  aop:
-    proxy-target-class: true
-  #配置freemarker
-  freemarker:
-    # 设置模板后缀名
-    suffix: .ftl
-    # 设置文档类型
-    content-type: text/html
-    # 设置页面编码格式
-    charset: UTF-8
-    # 设置页面缓存
-    cache: false
-    prefer-file-system-access: false
-    # 设置ftl文件路径
-    template-loader-path:
-      - classpath:/templates
-  # 设置静态文件路径,js,css等
-  mvc:
-    static-path-pattern: /**
-  resource:
-    static-locations: classpath:/static/,classpath:/public/
-  autoconfigure:
-    exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
-  datasource:
-    url: jdbc:mysql://172.30.0.4:4000/jiaoyang?characterEncoding=UTF-8&useUnicode=true&useSSL=false
-    username: hcst
-    password: hcst@2020
-    driver-class-name: com.mysql.jdbc.Driver
-    druid:
-      stat-view-servlet:
-        loginUsername: admin
-        loginPassword: hcst2016
-        enabled: true
-      web-stat-filter:
-        enabled: true
-    #      remove-abandoned: false
-    dynamic:
-      druid: # 全局druid参数,绝大部分值和默认保持一致。(现已支持的参数如下,不清楚含义不要乱设置)
-        # 连接池的配置信息
-        # 初始化大小,最小,最大
-        connection-init-sql: set names utf8mb4
-        initial-size: 5
-        min-idle: 5
-        maxActive: 20
-        # 配置获取连接等待超时的时间
-        maxWait: 60000
-        # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
-        timeBetweenEvictionRunsMillis: 60000
-        # 配置一个连接在池中最小生存的时间,单位是毫秒
-        minEvictableIdleTimeMillis: 300000
-        validationQuery: SELECT 1 FROM DUAL
-        testWhileIdle: true
-        testOnBorrow: false
-        testOnReturn: false
-        # 打开PSCache,并且指定每个连接上PSCache的大小
-        poolPreparedStatements: true
-        maxPoolPreparedStatementPerConnectionSize: 20
-        # 配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙
-        filters: stat,slf4j
-        # 通过connectProperties属性来打开mergeSql功能;慢SQL记录
-        connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
-      datasource:
-        master:
-          url: jdbc:mysql://172.30.0.4:4000/jiaoyang?characterEncoding=UTF-8&useUnicode=true&useSSL=false
-          username: hcst
-          password: hcst@2020
-          driver-class-name: com.mysql.jdbc.Driver
-  #redis 配置
-  redis:
-    database: 0
-    host: 172.30.0.17
-#    host: 127.0.0.1
-    lettuce:
-      pool:
-        max-active: 8   #最大连接数据库连接数,设 0 为没有限制
-        max-idle: 8     #最大等待连接中的数量,设 0 为没有限制
-        max-wait: -1ms  #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
-        min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
-      shutdown-timeout: 100ms
-    password: foobared
-    port: 6379
-#mybatis plus 设置
-mybatis-plus:
-  mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml,classpath*:cn/com/ctop/**/xml/*Mapper.xml
-  global-config:
-    # 关闭MP3.0自带的banner
-    banner: false
-    db-config:
-      #主键类型  0:"数据库ID自增",1:"该类型为未设置主键类型", 2:"用户输入ID",3:"全局唯一ID (数字类型唯一ID)", 4:"全局唯一ID UUID",5:"字符串全局唯一ID (idWorker 的字符串表示)";
-      id-type: 4
-      # 默认数据库表下划线命名
-      table-underline: true
-#jeecg专用配置
-jeecg:
-  elasticsearch:
-    cluster-nodes:
-    check-enabled: false
-  uploadType:
-  oss:
-    endpoint:
-    accessKey:
-    secretKey:
-    bucketName:
-    staticDomain:
-  sms:
-    accessKeyId:
-    accessKeySecret:
-  minio:
-    minio_url:
-    minio_name:
-    minio_pass:
-    bucketName:
-  ffmpeg:
-    bin: ffmpeg
-  path:
-    #文件上传根目录 设置
-    upload: /data/upload
-    #webapp文件路径
-    webapp: /data/webapp
-    video-upload: /data/upload/video/
-    image-upload: /data/upload/image/
-    chrome-driver: /usr/bin/chromedriver
-    csv-upload: /data/upload/csv/
-    bak-database-file: /data/data/bak/
-    report-history: /data/upload/report/history/
-    report-daily: /data/upload/report/daily/
-    kuaishou-agent-image: /data/upload/image/temp.png
-    kuaishou-account-captcha-image: /data/upload/image/captcha.png
-kuaishou:
-  group-control:
-    path: http://39.106.184.70
-    port: 4723
-logging:
-  level:
-    root: info
-  config: classpath:logback-prod.xml
-chrome:
-  script:
-    clean: sh /data/webapp/cleanProcess.sh
-oss:
-  replace:
-    replace-value: oss-cn-beijing-internal
-    replace-old-value: oss-cn-beijing
-    download: /data/file/video/
-xxl:
-  job:
-    accessToken:
-    executor:
-      appname: module-job-kuaishou
-      port: 9998
-      ip:
-      logpath: /data/applogs/xxl-job/jobhandler
-      logretentiondays: 30
-    admin:
-      addresses: http://129.28.150.229:8090/xxl-job-admin

+ 6 - 6
module-job-kuaishou/src/main/resources/application-prod.yml

@@ -52,7 +52,7 @@ spring:
   autoconfigure:
     exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
-    url: jdbc:mysql://172.30.0.4:4000/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+    url: jdbc:mysql://172.30.0.4:4000/jiaoyang?characterEncoding=UTF-8&useUnicode=true&useSSL=false
     username: hcst
     password: hcst@2020
     driver-class-name: com.mysql.jdbc.Driver
@@ -91,15 +91,15 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://172.30.0.4:4000/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+          url: jdbc:mysql://172.30.0.4:4000/jiaoyang?characterEncoding=UTF-8&useUnicode=true&useSSL=false
           username: hcst
           password: hcst@2020
           driver-class-name: com.mysql.jdbc.Driver
   #redis 配置
   redis:
     database: 0
-#    host: 172.30.0.17
-    host: 127.0.0.1
+    host: 172.30.0.17
+#    host: 127.0.0.1
     lettuce:
       pool:
         max-active: 8   #最大连接数据库连接数,设 0 为没有限制
@@ -108,7 +108,7 @@ spring:
         min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
       shutdown-timeout: 100ms
     password: foobared
-#    port: 6379
+    port: 6379
 #mybatis plus 设置
 mybatis-plus:
   mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml,classpath*:cn/com/ctop/**/xml/*Mapper.xml
@@ -182,4 +182,4 @@ xxl:
       logpath: /data/applogs/xxl-job/jobhandler
       logretentiondays: 30
     admin:
-      addresses: http://139.186.29.76:8090/xxl-job-admin
+      addresses: http://129.28.150.229:8090/xxl-job-admin

+ 1 - 1
module-job-kuaishou/src/main/resources/application.yml

@@ -2,7 +2,7 @@ server:
   port: 8092
 spring:
   profiles:
-    active: jiaoyang
+    active: @activatedProperties@
   application:
     name: system-web
 swagger: