From 27b3d6ffab3d57a8246415295f401074f5a64098 Mon Sep 17 00:00:00 2001 From: zhongnanhuang <zhongnanhuang@canrd.com> Date: Wed, 7 Aug 2024 16:01:53 +0800 Subject: [PATCH] feat: update 新增预发布环境配置文件 --- src/main/java/com/order/erp/domain/vo/order/OrderOpinionLogVO.java | 2 +- src/main/resources/application-pre-prod.yml | 186 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/main/resources/application.yml | 2 +- 3 files changed, 188 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/application-pre-prod.yml diff --git a/src/main/java/com/order/erp/domain/vo/order/OrderOpinionLogVO.java b/src/main/java/com/order/erp/domain/vo/order/OrderOpinionLogVO.java index 2f903fb..9ee23af 100644 --- a/src/main/java/com/order/erp/domain/vo/order/OrderOpinionLogVO.java +++ b/src/main/java/com/order/erp/domain/vo/order/OrderOpinionLogVO.java @@ -1,4 +1,4 @@ -package com.order.erp.domain.vo.order; +package com.order.erp.domain.vo.order; import lombok.*; import lombok.experimental.SuperBuilder; diff --git a/src/main/resources/application-pre-prod.yml b/src/main/resources/application-pre-prod.yml new file mode 100644 index 0000000..347a3f4 --- /dev/null +++ b/src/main/resources/application-pre-prod.yml @@ -0,0 +1,186 @@ +mybatis-plus: + configuration: + cache-enabled: false + call-setters-on-nulls: true + jdbc-type-for-null: 'null' + map-underscore-to-camel-case: true + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + global-config: + db-config: + capital-mode: false + field-strategy: NOT_NULL + id-type: AUTO + logic-delete-field: enable_flag + logic-delete-value: 20 + logic-not-delete-value: 10 + mapper-locations: classpath:/mapper/**.xml + type-aliases-package: com.order.erp.**.dto +#spring: +# datasource: +# dynamic: +# primary: overtime #设置默认的数据源或者数据源组,默认值即为master +# strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候会抛出异常,不启动则使用默认数据源. +# datasource: +# wms_warehouse: +# url: jdbc:mysql://127.0.0.1:3306/overtime?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&useSSL=false&autoReconnect=true&failOverReadOnly=false&maxReconnects=10&allowMultiQueries=true&useAffectedRows=true&autoReconnectForPools=true&rewriteBatchedStatements=true +# username: root +# password: root +# driver-class-name: com.mysql.cj.jdbc.Driver # 3.2.0开始支持SPI可省略此配置 +# druid: +# initial-size: 5 +# max-active: 20 +# max-evictable-idle-time-millis: 300000 +# max-wait: 60000 +# min-evictable-idle-time-millis: 300000 +# min-idle: 5 +# time-between-eviction-runs-millis: 60000 +# type: com.alibaba.druid.pool.DruidDataSource +spring: + servlet: + multipart: + enabled: true + max-file-size: 100MB + max-request-size: 20MB + file-size-threshold: 20MB + datasource: + db-type: com.alibaba.druid.pool.DruidDataSource + driverClassName: com.mysql.cj.jdbc.Driver + initial-size: 5 + max-active: 30 + max-wait: 30000 + min-idle: 5 + #配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒 + timeBetweenEvictionRunsMillis: 30000 + #配置一个连接在池中最小生存的时间,单位是毫秒,30000=30s + minEvictableIdleTimeMillis: 30000 + validationQuery: SELECT 'x' + testWhileIdle: true + testOnBorrow: true + testOnReturn: true + password: Erp@test123456 + time-between-eviction-runs-millis: 1000 + url: jdbc:mysql://47.104.8.35:3307/order-erp-pre-prod?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai&useSSL=false&autoReconnect=true&failOverReadOnly=false&maxReconnects=10&allowMultiQueries=true&useAffectedRows=true&autoReconnectForPools=true + username: root + redis: + database: 10 + host: 47.104.8.35 + lettuce: + pool: + max-active: 2000 + max-idle: 10 + max-wait: -1 + min-idle: 3 + time-between-eviction-runs: 100 + password: '' + port: 6380 + timeout: 2000 + mail: + # 配置 SMTP 服务器地址 + host: xxx + # 发送者邮箱,已开通POP3/SMTP服务的邮箱,也就是你自己的 + username: xxxx + # 配置密码,注意不是真正的密码,而是刚刚申请到的授权码 + password: xxx + # 邮件接收者 + mailRecipient: #邮件接收者邮箱 + # 端口号465或587(QQ邮箱发送邮件仅支持587端口协议) + port: 587 + # 默认的邮件编码为UTF-8 + default-encoding: UTF-8 + # 配置SSL 加密工厂 + properties: + mail: + smtp: + socketFactoryClass: javax.net.ssl.SSLSocketFactory + #表示开启 DEBUG 模式,这样,邮件发送过程的日志会在控制台打印出来,方便排查错误 + debug: true + + freemarker: + template-loader-path: classpath:/template/ + suffix: .flt + enabled: true + cache: false + charset: UTF-8 + content-type: text/html + allow-request-override: false + check-template-location: true + expose-request-attributes: false + expose-session-attributes: false + expose-spring-macro-helpers: false + + +logging: + config: classpath:log4j2-prod.xml + +#登录图形验证码有效时间/分钟 +loginCode: + expiration: 2 + +#密码加密传输,前端公钥加密,后端私钥解密 +rsa: + private_key: MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEA0vfvyTdGJkdbHkB8mp0f3FE0GYP3AYPaJF7jUd1M0XxFSE2ceK3k2kw20YvQ09NJKk+OMjWQl9WitG9pB6tSCQIDAQABAkA2SimBrWC2/wvauBuYqjCFwLvYiRYqZKThUS3MZlebXJiLB+Ue/gUifAAKIg1avttUZsHBHrop4qfJCwAI0+YRAiEA+W3NK/RaXtnRqmoUUkb59zsZUBLpvZgQPfj1MhyHDz0CIQDYhsAhPJ3mgS64NbUZmGWuuNKp5coY2GIj/zYDMJp6vQIgUueLFXv/eZ1ekgz2Oi67MNCk5jeTF2BurZqNLR3MSmUCIFT3Q6uHMtsB9Eha4u7hS31tj1UWE+D+ADzp59MGnoftAiBeHT7gDMuqeJHPL4b+kC+gzV4FGTfhR9q3tTbklZkD2A== + + +#jwt +jwt: + header: Authorization + # 令牌前缀 + token-start-with: Bearer + # 必须使用最少88位的Base64对该令牌进行编码 + base64-secret: ZmQ0ZGI5NjQ0MDQwY2I4MjMxY2Y3ZmI3MjdhN2ZmMjNhODViOTg1ZGE0NTBjMGM4NDA5NzYxMjdjOWMwYWRmZTBlZjlhNGY3ZTg4Y2U3YTE1ODVkZDU5Y2Y3OGYwZWE1NzUzNWQ2YjFjZDc0NGMxZWU2MmQ3MjY1NzJmNTE0MzI= + # 令牌过期时间 此处单位/毫秒 ,默认2小时,可在此网站生成 https://www.convertworld.com/zh-hans/time/milliseconds.html + token-validity-in-seconds: 720000000 + # 在线用户key + online-key: online-token + # 验证码 + code-key: code-key + +outsys: + sms: + regionId: cn-hangzhou + accessKeyId: LTAIZCPI7OaWud0m + secret: nvtGeScBwRztGeoj8WSp5OWalalgpK + domain: dysmsapi.aliyuncs.com + version: 2017-05-25 + action: SendSms + signName: canrd + templateCode: SMS_173005236 + email: + host: xxxx + passwordRecoverKey: xxxxx + + + +system: + isLoginFailureLock: true + loginFailureLockTime: 5 + loginFailureLockCount: 3 + +openai: + token: Bearer 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 + +# 文件存储路径 +file: + path: /home/canrd/order-erp/files/ + host: http://47.104.8.35 + avatar: /home/order-erp/avatar/ + # 文件大小 /M + maxSize: 100 + avatarMaxSize: 5 + +# 阿里pss图片服务 +oss: + endpoint: https://oss-cn-qingdao.aliyuncs.com + accessKeyId: LTAI5t7u1gXR2vm82sd6CkVz + accessKeySecret: m4NzHZZsZiauKmRO8y7DihmcGNdQk4 + bucket: alterego + + +db: + mysql: + ip: 172.17.0.1 + port: 3306 + user: root + password: 123456 + databaseName: order-erp + savePath: /home/canrd/order-erp/files/backup/ diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 9bba976..456d1ee 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -3,4 +3,4 @@ server: spring: profiles: - active: test \ No newline at end of file + active: pre-prod \ No newline at end of file -- libgit2 0.23.3