浏览代码

修改jod配置文件

ssk 1 周之前
父节点
当前提交
e80c5f40c2

+ 2 - 17
alien-job/pom.xml

@@ -36,23 +36,8 @@
         </dependency>
 
         <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-models</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.github.xiaoymin</groupId>
-            <artifactId>swagger-bootstrap-ui</artifactId>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
         </dependency>
 
         <dependency>

+ 0 - 42
alien-job/src/main/resources/application-dev.yml

@@ -1,42 +0,0 @@
-spring:
-  # redis 配置
-  redis:
-    # 地址
-    host: 127.0.0.1
-    # 端口,默认为6379
-    port: 6379
-    # 数据库索引
-    database: 10
-    # 密码
-    #password: ljs123
-    # 连接超时时间
-    timeout: 10s
-    lettuce:
-      pool:
-        # 连接池中的最小空闲连接
-        min-idle: 0
-        # 连接池中的最大空闲连接
-        max-idle: 8
-        # 连接池的最大数据库连接数
-        max-active: 8
-        # #连接池最大阻塞等待时间(使用负值表示没有限制)
-        max-wait: -1ms
-
-  datasource:
-    url: jdbc:mysql://xiaokuihua.fun:3006/sunflower_assistant_test?serverTimezone=Asia/Shanghai&characterEncoding=utf8&autoReconnect=true&failOverReadOnly=false
-    username: root
-    password: .,ZyL021405
-    driver-class-name: com.mysql.cj.jdbc.Driver
-
-logging:
-  config: classpath:logback-spring.xml
-  level:
-    cc:
-      xiaokuihua:
-        xiaokuihuaentity:
-          analysis:
-            mapper: debug
-
-    com:
-      baomidou:
-        mybatisplus: debug

+ 0 - 224
alien-job/src/main/resources/application-prod.yml

@@ -1,224 +0,0 @@
-spring:
-
-  servlet:
-    multipart:
-      max-file-size: 100MB
-      max-request-size: 100MB
-
-  http:
-    multipart:
-      max-file-size: 100MB
-      max-request-size: 100MB
-
-  jackson:
-    default-property-inclusion: non_null
-    date-format: yyyy-MM-dd HH:mm:ss
-    time-zone: GMT+8
-
-  redis:
-    host: 8.152.195.41
-    port: 6379
-    database: 10
-    # 密码
-    password: wady@1213
-    timeout: 10s
-    lettuce:
-      pool:
-        min-idle: 0
-        max-idle: 8
-        max-active: 8
-        max-wait: -1ms
-
-  datasource:
-    druid:
-      driver-class-name: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://8.152.195.41:3306/alien?serverTimezone=Asia/Shanghai&characterEncoding=utf8&autoReconnect=true&failOverReadOnly=false
-      username: root
-      password: wady@1213
-      #url: jdbc:mysql://39.103.60.142:3306/locallife?serverTimezone=Asia/Shanghai&characterEncoding=utf8&autoReconnect=true&failOverReadOnly=false
-      #password: n*XMiDIcQ&8$HOPf
-
-      #连接初始化数量
-      initial-size: 1
-      #连接池中的最小空闲连接数
-      min-idle: 1
-      #配置连接池同时能维持的最大连接数
-      max-active: 20
-      #获取连接等待超时时间,单位是毫秒
-      #      max-wait: 60000
-      #间隔多久进行一次检测,检测需要关闭的空闲连接
-      time-between-eviction-runs-millis: 60000
-      #一个连接在池中最小生存的时间,单位是毫秒
-      min-evictable-idle-time-millis: 300000
-      #一个连接在池中最大生存的时间,单位是毫秒
-      max-evictable-idle-time-millis: 900000
-      #Druid用来测试连接是否可用的SQL语句
-      validation-query: SELECT 'x' FROM DUAL
-      #申请连接的时候检测
-      test-while-idle: true
-      #申请连接时执行validationQuery检测连接是否有效
-      test-on-borrow: true
-      #归还连接时执行validationQuery检测连接是否有效
-      test-on-return: false
-      #是否缓存preparedStatement
-      pool-prepared-statements: false
-      #最大缓存
-      max-pool-prepared-statement-per-connection-size: 20
-      #监控统计用的filter:stat
-      filters: stat
-      #通过connectProperties属性来打开mergeSql功能;慢SQL记录
-      connection-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=10000
-      stat-view-servlet:
-        #是否开启druid管理界面
-        enabled: true
-      #是否启用StatFilter默认值false,用于采集 web-jdbc 关联监控的数据。
-      web-stat-filter:
-        enabled: true
-        #排除一些静态资源,以提高效率
-        exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
-        #需要监控的 url
-        url-pattern: "/*"
-
-  web:
-    resources:
-      # 上传静态资源目录
-      #static-locations: /usr/local/alien/file
-      # 上传app目录
-      app-locations: /usr/local/alien/file/app
-      static-locations: E:/usr/local/alien/file
-      url: http://devfile.ailien.shop/
-      # excel表格
-      excel-path: /usr/local/alien/file/excel/
-      # 回执单模板名称
-      excel-clearing-receipt: clearing_receipt.xlsx
-      #生成的文件地址
-      excel-generate-path: /generate/
-
-  elasticsearch:
-    rest:
-      uris: http://localhost:9200
-
-mybatis-plus:
-  #实体扫描,多个package用逗号或者分号分隔
-  typeAliasesPackage: shop.alien.store.entity
-  global-config:
-    #数据库相关配置
-    db-config:
-      #主键类型  AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
-      id-type: auto #主键自增
-      auto-fill: true #自动填充
-      logic-delete-value: 1 #逻辑删除值
-      logic-not-delete-value: 0 #逻辑未删除值
-  #    banner: false
-  #原生配置
-  configuration:
-    #数据库字段驼峰下划线转换
-    map-underscore-to-camel-case: true
-    cache-enabled: false
-    call-setters-on-nulls: true
-    jdbc-type-for-null: 'null'
-    # 打印sql
-    # sql只打印到控制台
-    #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-    # sql 打印到日志和控制台
-    log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl
-
-# 分页
-pagehelper:
-  helperDialect: mysql
-  reasonable: true
-  supportMethodsArguments: true
-  params: count=countSql
-
-logging:
-  config: classpath:logback-spring.xml
-  level:
-    shop:
-      alien:
-        mapper: debug
-
-    com:
-      baomidou:
-        mybatisplus: debug
-
-#阿里云短信
-ali:
-  aes:
-    #对称加密算法密钥
-    encryptKey: '4lSSA6Fi+4BG1qhakxdncw=='
-
-  #短信
-  sms:
-    endPoint: 'dysmsapi.aliyuncs.com'
-    accessKeyId: 'LTAI5tNeG9kUFWTYukrtVQxU'
-    accessKeySecret: 'vIWYJQWzCRcfH3rgnH5cuq05KEOwgw'
-    signName: '爱丽恩严大连商务科技'
-    templateCode: 'SMS_483575093'
-
-  yundun:
-    accessKeyID:
-      LTAI5tReZWshffH78oQJPzZG
-    secret:
-      Gi30OLYAWunaDbwsv5qqdZ3PzbDyGP
-    regionId:
-      cn-beijing
-    textEndpoint:
-      green-cip.cn-beijing.aliyuncs.com
-    imgEndpoint:
-      green-cip.cn-beijing.aliyuncs.com
-
-  oss:
-    endPoint: oss-cn-beijing.aliyuncs.com
-    bucketName: alien-volume
-    accessKeyId: LTAI5tG6wSYrSgN3Cwek17Du
-    accessKeySecret: PQDPdTtDy0v848p0Bl9vT5yHmpt79H
-
-#支付宝app
-app:
-  #商家端
-  business:
-    appId: 2021004191696239
-    #app公钥
-    appPublicKey: 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqIxlCU8fx+mDYF6XEqtl7u/8ylH8TLLUcPx0wn00m/V/LT1vbd70QU4oyaPRslCmfj6mscadR2DeDK5Flpp67DDvPERU3UxMCxMNbKuv6MPsxedh5PnZkLGQ5NGlImv/xtJ6A9kFbSu62y51TL96/R7gwzwdxr5nph+qNfUr40THvHhvcqVV695YSktgcHOrg6pfpeOIAuTpdUs5gPEt7RuGhSz2x3+bOC2c1hdwc4azqcJ5Tz45DxTXG5PWxcSybqDg3Rh5rISzhLgipQYdoGoAHTWgJUmoqBlRMVhiRHxUKYs8Gng/4Ksvyq+EXREcswe34tmUHvBTmbGM6aDtvQIDAQAB'
-    #app私钥
-    appPrivateKey: 'MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCojGUJTx/H6YNgXpcSq2Xu7/zKUfxMstRw/HTCfTSb9X8tPW9t3vRBTijJo9GyUKZ+Pqaxxp1HYN4MrkWWmnrsMO88RFTdTEwLEw1sq6/ow+zF52Hk+dmQsZDk0aUia//G0noD2QVtK7rbLnVMv3r9HuDDPB3GvmemH6o19SvjRMe8eG9ypVXr3lhKS2Bwc6uDql+l44gC5Ol1SzmA8S3tG4aFLPbHf5s4LZzWF3BzhrOpwnlPPjkPFNcbk9bFxLJuoODdGHmshLOEuCKlBh2gagAdNaAlSaioGVExWGJEfFQpizwaeD/gqy/Kr4RdERyzB7fi2ZQe8FOZsYzpoO29AgMBAAECggEAarRHGree9R7eb1oy5jzgUX5ZWXTB94SXfdg1yxMdBUdMdkWYj8RAej+TDuTJUsxAO1hKi+2jkJbAvOJvZ8Lw4yqvqkXQPDGbSr+LFiszOHchJMExdpa+qB3iDxqyIrKgwSxq1pjEGLNAnpYw6J+oqyqrPK6IY1QTplYRmgtW949+Wa+0nkH8rKczbX4VZhT1u3OAXSj+0IoJLm+6AM73Q3U+Zu95WSKiX9rKN7IBFjHZJm+1NLDQMroilcLvgbJ1Q7Tez+0r0yOdeFEnq3ZIuEs95bRLCyew36QOVK8qSMPAPtkoRRWH+iCgWJ6nTZK+HphL+6WN0Llm8eVWFcNnuQKBgQD44L0o9da2lBp98UcmZRp7+dAIiLySwzThKcMfcIlLahFddFpwVzZHIWl4nN3YT12aPmT/aN31tQ9IO2t+L2iZglPgbzZIcZOJhp9Xott7onp3yMrB0Jxs/rEAlRuR3CHY0ONnrkPMIMAFCdRRpffuHcqqhJavBBs9ThLFw3e33wKBgQCtXysAtAa9j3IC6x3aImKzhAVJJyOzR8DBWP1FPVS4R9o0752Fjwa7FAgi4B04FTw+QOWUbdw9pzupjlgetRM1oCkAcvF1dT2+i7kOjjq/hM2lE63PY9nLNWDGbl8mt15J62w4GA61efH9AAUrA3KaEj5Or5Y+q04sITeWmG994wKBgH++o3ltzlsC5CI3AUVE6fYuwMhQnzJZvj/AtuXhVqd99xHYEj/NlA+op8GACyLnge0VD7RFuIBRAloaHc+0N+VrjvAJRXyjx430qr9J2Yy5VlE7oE8ha9lKVcItxuv0aO8oMUFbonMZcFZluDR8kykG46royYtl+TFbbKlT7pRTAoGABCfq3Ppzyul8XyuJrKf0W79HbSh+B5cpvLjIYXeF52D5jxlLWl9CVwu04jkjGiwQJKHjnvo/NE8k8/yQijPnAPsU4Ijg1uL3lvC8f+fS6rJhR5rAKN+I4gEmj7snlsMAhJ8bGgEhoSIKNflhJlXP0nerfLFi1Z+/oPku3vJKgecCgYEAy5UkL8X1OGMIanrm53Bx4N0kSv1D2RlR52LGwCfkglaSH1sVrlXiDIyr55bieiyUQ4J5uknta/hGXnJM9w8w8+HM1gmbO5vXyTUQLEt4k9gBJECY82ZrxxtTKXDprryxKciM9Zs46cDsuEQWbpr8Ps4NIeI9F6LfClbDJiQBdCY='
-
-    win:
-      #应用公钥证书文件路径
-      appCertPath: 'E:/Cache/business/appCertPublicKey_2021004191696239.crt'
-      #支付宝公钥证书文件路径
-      alipayPublicCertPath: 'E:/Cache/business/alipayCertPublicKey_RSA2.crt'
-      #支付宝根证书文件路径
-      alipayRootCertPath: 'E:/Cache/business/alipayRootCert.crt'
-
-    linux:
-      #应用公钥证书文件路径
-      appCertPath: '/usr/local/alien/aliPayCert/appCertPublicKey_2021004191696239.crt'
-      #支付宝公钥证书文件路径
-      alipayPublicCertPath: '/usr/local/alien/aliPayCert/alipayCertPublicKey_RSA2.crt'
-      #支付宝根证书文件路径
-      alipayRootCertPath: '/usr/local/alien/aliPayCert/alipayRootCert.crt'
-
-  #用户端
-  user:
-    appId: 2021004192631044
-    #app公钥
-    appPublicKey: 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAgSlnroP58xYTdsFxY9BuMJVJHEkp2K+DzV9EOk5hCq91E33rHLxizYRTkIGQ+Fw4+Qkrjcj330+eVI7ZABkdqF2YQah0hPbWSnyJtdJuECTgb8ZSoYTInA1aoKOkifBNy6/yeOARW+Sus3uLDt+svtQJuJ04sFO8YLQOQRomLfztdRsUsdnBUoEufb7hTeAnpJD/4lj2zsRGhKzi/bqSq4iRDg2sr6FJurFaROqXND9R8/DLQNuJQfj0bCaf2u2bNAVtodFzS/HWeXWeGH03JU9NQByBUB5KHZd3qUQaYmkpSNAEOJyt8e6weNFk2mEYhVlLC8nx7gj0NvAoEh7s7QIDAQAB'
-    #app私钥
-    appPrivateKey: 'MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCBKWeug/nzFhN2wXFj0G4wlUkcSSnYr4PNX0Q6TmEKr3UTfescvGLNhFOQgZD4XDj5CSuNyPffT55UjtkAGR2oXZhBqHSE9tZKfIm10m4QJOBvxlKhhMicDVqgo6SJ8E3Lr/J44BFb5K6ze4sO36y+1Am4nTiwU7xgtA5BGiYt/O11GxSx2cFSgS59vuFN4CekkP/iWPbOxEaErOL9upKriJEODayvoUm6sVpE6pc0P1Hz8MtA24lB+PRsJp/a7Zs0BW2h0XNL8dZ5dZ4YfTclT01AHIFQHkodl3epRBpiaSlI0AQ4nK3x7rB40WTaYRiFWUsLyfHuCPQ28CgSHuztAgMBAAECggEABHzQymJxe72nnXepHeOvAGcfbCkqmAm5FZiawT/Z5UolUjEMyynMcQGI+btWsxpZLGXiKoHyAsM8aAmyhmtY+XGPCbD1o20EEwBytGuEQXFWjuugEVaQtcNNA8nLvLMpsMsDLKn0UHIIk9nWAgVJdjPdxplHz/CI2f9Hg4GKFAzpXwV1c574+rSDIkpa2NDFI2lqwtbew7/1ETaCiBXSbqw4X/tk+2wgUdT8u4uA/Ts5bVZvvHm54U9ZdTLs2rHzIk2O9VbKB3waHT1WkQzrPF8+JrPvcYjsK7ROxi07N1e5kv4TuxLfK3rXvmoUI8TvidSLhmq57VXhU9iNZBEHwQKBgQD4GR58WhOotPHcNI5oKRkJSektNSz/pXFLjh3oF/y98kOuFfeH903Z+JQ/5fgjzQjKra3HqjsVDlTjhCSZtNc/QpYafMf6TGzX+41QNnjlxxeZgYa2CCPOAlOw8d1a6YV0v8mjjnWoh2+vaYaqBKZmm2uid9zyklbg8I0DZiYaUQKBgQCFRogto52N6i5QSMwPGrPJOabKqkpA2EtbEgnkrpybN5DFQ+OqwWujQVkwWNlufHAhWdb2OCJ+bb2dCwrmX8kHB/SF+VSlYGsRdDAONF9aVGHqnaJB1yvfwp4ArNUb0vORJun22jRCpmtN0dA7lS/PnwqgCZw8LNWkAFuVewSl3QKBgF+PdVGadHYH9BzIVY3DPrR4NotGLyXs+J2MiPJrwtr65Jy6M1S4qdDqUVfnYVOQ1vESQpxkckti8MmNjXdy03G3WQ+svm4nX8k1SDH8OUbwD6P94wBcVEY2WTwPfR5WUiQs9yK7bZBTUm5zK/5yuhFNjgDPQFhii3oqzXXgs45xAoGADjZ4XU2ehrzblYo94Lp7Q9FXHTPN2V53os2oqm+ImfDyCmd0Bwi7ftyAM2y2O1cf6h6XkwhnfU4cs3uy/OBoIszRYdw2D7DZmjHm0gz5wjtPeeK3pAfbUPCDQxUrYN09RlR9DOs2OYlf1huy9jexspWGX4zG0ZACdIvpOGa3Fy0CgYEA8waJ9ciOG50VjX/f/vYRKQUQTFQKhvZ0xcFnA8iT30FNfBs7XOhiBaXF25mul34hHhAxVuUIlEmOqyEkLO/ZWioOtWy//gRZIFL8qHoCaM8lS8xwT/xOz8nfDiu2hpISEXAquU2PNdP4yGiLg4qyafrvdctRw4TtpHEOrtYYyt8='
-    #支付宝公钥
-    aliPayPublicKey: 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqEK+9FHCA4GX/veehln6mFaYdpfAA8knkF8rRMX1RGunTZcIGs65yPvmGuyEhNZH3hajbGIMt4AKrdi9NO+1kSCSNc14IKYhpQFq6NIHxQHYP2+0aRCPy3JPpCBSowjWuzounh2uaEOImatykCSRiuicFymlwb8cv75vlOp6Pq6Gu+Ep/NIeHbhqbE9YtScmaRBvwpn0tz9M1yN9AVDuZD6VxSfjObtgMDQqHSUJJmmRuo4/DYGX0rkvtzhQcJbU9LTA1QkBWKgriww/4ZyAMg7q02FQ0dh81h9DxC0ugPhSo55FouMx7wrgN/GPYrdcEyOojpzgSYZC3uRnWuqZpQIDAQAB'
-
-gaode:
-  key: e1042879da68199b4b3545ebc146c8fc
-  distanceUrl: 'https://restapi.amap.com/v3/distance?key=%s&origins=%s,%s&destination=%s,%s'
-  geoUrl: 'https://restapi.amap.com/v3/geocode/geo?address=%s&key=%s'
-  geoListUrl: 'https://restapi.amap.com/v3/assistant/inputtips?keywords=%s&key=%s&city=%s'
-  getDistrict: 'https://restapi.amap.com/v3/config/district?key=%s&keywords=%s'
-  nearUrl: 'https://restapi.amap.com/v3/place/around?location=%s,%s&key=%s&radius=%s&offset=%s&page=%s'
-  subwayUrl: 'https://restapi.amap.com/v3/place/around?key=%s&location=%s,%s&keywords=%s&radius=%s&types=%s&sortrule=distance'
-  addressUrl: 'https://restapi.amap.com/v3/geocode/regeo?location=%s,%s&key=%s&radius=%s&extensions=%s'
-
-jwt:
-  #token过期时间, 单位:d:天、h:小时、m:分钟、s:秒
-  expiration-time: 30d

+ 0 - 115
alien-job/src/main/resources/application.yml

@@ -1,115 +0,0 @@
-server:
-  port: 8081
-
-spring:
-  profiles:
-#    active: dev
-    active: prod
-
-  # JSON配置
-  jackson:
-    default-property-inclusion: non_null
-    date-format: yyyy-MM-dd HH:mm:ss
-    time-zone: GMT+8
-
-  datasource:
-    druid:
-      #连接初始化数量
-      initial-size: 1
-      #连接池中的最小空闲连接数
-      min-idle: 1
-      #配置连接池同时能维持的最大连接数
-      max-active: 20
-      #获取连接等待超时时间,单位是毫秒
-#      max-wait: 60000
-      #间隔多久进行一次检测,检测需要关闭的空闲连接
-      time-between-eviction-runs-millis: 60000
-      #一个连接在池中最小生存的时间,单位是毫秒
-      min-evictable-idle-time-millis: 300000
-      #一个连接在池中最大生存的时间,单位是毫秒
-      max-evictable-idle-time-millis: 900000
-      #Druid用来测试连接是否可用的SQL语句
-      validation-query: SELECT 'x' FROM DUAL
-      #申请连接的时候检测
-      test-while-idle: true
-      #申请连接时执行validationQuery检测连接是否有效
-      test-on-borrow: true
-      #归还连接时执行validationQuery检测连接是否有效
-      test-on-return: false
-      #是否缓存preparedStatement
-      pool-prepared-statements: false
-      #最大缓存
-      max-pool-prepared-statement-per-connection-size: 20
-      #监控统计用的filter:stat
-      filters: stat
-      #通过connectProperties属性来打开mergeSql功能;慢SQL记录
-      connection-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=10000
-      stat-view-servlet:
-        #是否关闭druid管理界面
-        enabled: true
-        login-username: root
-        login-password: 123
-      #是否启用StatFilter默认值false,用于采集 web-jdbc 关联监控的数据。
-      web-stat-filter:
-        enabled: true
-        #排除一些静态资源,以提高效率
-        exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
-        #需要监控的 url
-        url-pattern: "/*"
-
-mybatis-plus:
-  # xml文件路径
-  #  mapper-locations: classpath:/mapper/**/*.xml,/mapper/*.xml
-  mapper-locations: mapper/*.xml
-  #实体扫描,多个package用逗号或者分号分隔
-  typeAliasesPackage: cc.xiaokuihua.xiaokuihuaentity.analysis.entity
-  global-config:
-    #数据库相关配置
-    db-config:
-      #主键类型  AUTO:"数据库ID自增", INPUT:"用户输入ID", ID_WORKER:"全局唯一ID (数字类型唯一ID)", UUID:"全局唯一ID UUID";
-      id-type: AUTO
-      logic-delete-field: isDel
-      logic-delete-value: 1
-      logic-not-delete-value: 0
-    banner: false
-  #原生配置
-  configuration:
-    #数据库字段驼峰下划线转换
-    map-underscore-to-camel-case: true
-    cache-enabled: false
-    call-setters-on-nulls: true
-    jdbc-type-for-null: 'null'
-    # 打印sql
-    # sql只打印到控制台
-    #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-    # sql 打印到日志和控制台
-    log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl
-
-# 分页
-pagehelper:
-  helperDialect: mysql
-  reasonable: true
-  supportMethodsArguments: true
-  params: count=countSql
-
-logging:
-  config: classpath:logback-spring.xml
-
-xxl:
-  job:
-    accessToken: default_token
-    admin:
-      addresses: http://127.0.0.1:8800/xxl-job-admin
-
-    executor:
-      appname: alien-xxl-job-executor
-      address:
-      ip:
-      port: 8899
-      logpath: /data/applogs/xxl-job/jobhandler
-      logretentiondays: 30
-
-#api key
-api:
-  juhe:
-    calendar: 195b18c40cf7cd0de6713ff5e4e0cf34

+ 7 - 3
alien-job/src/main/resources/bootstrap.yml

@@ -6,15 +6,19 @@ spring:
     nacos:
       #注册中心
       discovery:
-        server-addr: 120.26.223.32:8848
+        server-addr: 192.168.2.252:8848
         username: nacos
         password: ngfriend198092
 
       #配置中心
       config:
         enabled: true
-        server-addr: 120.26.223.32:8848
+        server-addr: 192.168.2.252:8848
         username: nacos
         password: ngfriend198092
         group: DEFAULT_GROUP
-        file-extension: yml
+        file-extension: yml
+        #测试
+#        namespace: 0e1e2d77-56e8-422c-8317-6f71d7285e59
+        #生产
+#        namespace: 3cbb802a-b56e-47f7-b658-b5012ecafb1f

+ 2 - 2
alien-job/src/main/resources/logback-spring.xml

@@ -12,9 +12,9 @@
     <!-- 定义全局参数常量 -->
     <property name="log.level" value="debug"/>
     <property name="log.maxHistory" value="30"/><!-- 30表示30个 -->
-    <property name="logging.path" value="/javaLog/accountBookLog"/>
+    <property name="logging.path" value="/javaLog/alienJobLog"/>
     <!--输出文件前缀-->
-    <property name="FILENAME" value="xiaokuihua_accountbook"/>
+    <property name="FILENAME" value="alien"/>
 
     <!--0. 日志格式和颜色渲染 -->
     <!-- 彩色日志依赖的渲染类 -->