Skip to content

J
jiedao-api-boot-master
Commit 3ee0a97e authored by wux's avatar wux
Browse files
Options

分支修改配置文件

parent 4ac76a59
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 28 deletions
docker-compose-test.yml
View file @ 3ee0a97e
......@@ -4,14 +4,14 @@ services:
image: harbor.com/api-jd-test:latest
container_name: api-jd-test
ports:
- "9001:9001"
- "9091:9001"
environment:
env: test
volumes:
- '/etc/localtime:/etc/localtime'
- '/data/apps/jd/test/api/logs/operator:/logs'
- '/data/apps/jd/test/static:/app/static'
- '/data/apps/jd/test/fonts/zh:/usr/share/fonts/zh'
- '/jiedao/docker/test/apps/jiedao/api/logs/operator:/logs'
- '/jiedao/docker/test/apps/jiedao/static:/app/static'
- '/jiedao/docker/test/apps/jiedao/fonts/zh:/usr/share/fonts/zh'
restart: always
ulimits:
nproc: 65535
......@@ -21,11 +21,11 @@ services:
deploy:
resources:
limits:
cpus: '4'
memory: 4G
cpus: '2'
memory: 3G
networks:
net:
ipv4_address: 10.10.0.20
ipv4_address: 10.10.0.120
networks:
net:
......
yudao-server/src/main/resources/application-test.yaml
View file @ 3ee0a97e
server:
port: 9001
servlet:
context-path: /
--- #################### 数据库相关配置 ####################
spring:
# 数据源配置项
autoconfigure:
......@@ -42,32 +45,34 @@ spring:
primary: master
datasource:
master:
name: jd
url: jdbc:mysql://172.16.0.3:3306/${spring.datasource.dynamic.datasource.master.name}?useUnicode=true&useSSL=true&characterEncoding=utf8&characterSetResults=utf8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&autoReconnect=true&rewriteBatchedStatements=TRUE
name: jiedao
# name: ruoyi-vue-pro-flowable
url: jdbc:mysql://10.10.0.21:3306/${spring.datasource.dynamic.datasource.master.name}?useUnicode=true&useSSL=true&characterEncoding=utf8&characterSetResults=utf8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&autoReconnect=true&rewriteBatchedStatements=TRUE
driver-class-name: com.mysql.cj.jdbc.Driver
username: jd
password: Jd2024
slave: # 模拟从库，可根据自己需要修改 # 模拟从库，可根据自己需要修改
name: jd
url: jdbc:mysql://172.16.0.3:3306/${spring.datasource.dynamic.datasource.slave.name}?useUnicode=true&useSSL=true&characterEncoding=utf8&characterSetResults=utf8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&autoReconnect=true&rewriteBatchedStatements=TRUE
username: root
password: pcn49&&1nh@086tr
slave: # 模拟从库，可根据自己需要修改
name: jiedao
# name: ruoyi-vue-pro-flowable
url: jdbc:mysql://10.10.0.21:3306/${spring.datasource.dynamic.datasource.slave.name}?useUnicode=true&useSSL=true&characterEncoding=utf8&characterSetResults=utf8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&autoReconnect=true&rewriteBatchedStatements=TRUE
driver-class-name: com.mysql.cj.jdbc.Driver
username: jd
password: Jd2024
username: root
password: pcn49&&1nh@086tr
# Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
redis:
host: 172.16.0.3 # 地址
host: 10.10.0.32 # 地址
port: 6379 # 端口
database: 1 # 数据库索引
password: Redis2024
password: c32sW2c86
database: 0 # 数据库索引
timeout: 60s
connect-timeout: 60s
redis-limiter:
redis-host: 172.16.0.3 # redis server IP 默认值：127.0.0.1
redis-host: 10.10.0.32 # redis server IP 默认值：127.0.0.1
redis-port: 6379 # redis service 端口 默认值：6379
redis-db: 5 # redis service 数据库 默认值：6379
redis-password: Redis2024 # redis 访问密码 默认值：null
redis-db: 4 # redis service 数据库 默认值：6379
redis-password: c32sW2c86 # redis 访问密码 默认值：null
redis-connection-timeout: 2000 # redis 连接超时时间 默认值：2000
redis-pool-max-idle: 50 # redis 连接池最大空闲连接数 默认值：50
redis-pool-min-idle: 10 # redis 连接池最小空闲连接数 默认值： 10
......@@ -84,7 +89,7 @@ spring:
# Quartz 配置项，对应 QuartzProperties 配置类
spring:
quartz:
auto-startup: true # 测试环境，需要开启 Job
auto-startup: true # 本地开发环境，尽量不要开启 Job
scheduler-name: schedulerName # Scheduler 名字。默认为 schedulerName
job-store-type: jdbc # Job 存储器类型。默认为 memory 表示内存，可选 jdbc 使用数据库。
wait-for-jobs-to-complete-on-shutdown: true # 应用关闭时，是否等待定时任务执行完成。默认为 false ，建议设置为 true
......@@ -167,6 +172,7 @@ spring:
logging:
level:
root: INFO
cn.iocoder.yudao: DEBUG
--- #################### 微信公众号相关配置 ####################
wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-starters/wx-java-mp-spring-boot-starter/README.md 文档
......@@ -187,6 +193,8 @@ web:
# 捷道配置项，设置当前项目所有自定义的配置
yudao:
captcha:
enable: false # 本地环境，暂时关闭图片验证码，方便登录等接口的测试
security:
token-header: Authorization
token-timeout: 30d
......@@ -202,7 +210,7 @@ yudao:
pay-notify-url: http://niubi.natapp1.cc/api/pay/order/notify
pay-return-url: http://niubi.natapp1.cc/api/pay/order/return
refund-notify-url: http://niubi.natapp1.cc/api/pay/refund/notify
demo: false # 开启演示模式
demo: false # 关闭演示模式
business: # 业务运行配置
debug: true # 开启debug模式
sms-code: # 短信验证码相关的配置项
......@@ -218,8 +226,8 @@ yudao:
begin-code: 9999 # 验证码最小值
end-code: 9999 # 验证码最大值。
member: # 会员相关配置
register-url: https://apptest.groupage.cn/#/pages/register/shareRegister?code=
share-url: https://apptest.groupage.cn/#
register-url: https://applocal.groupage.cn/#/pages/register/shareRegister?code=
share-url: https://applocal.groupage.cn/#
justauth:
enabled: true
......@@ -241,7 +249,6 @@ justauth:
type: REDIS
prefix: 'social_auth_state:' # 缓存前缀，目前只对 Redis 缓存生效，默认 JUSTAUTH::STATE::
timeout: 24h # 超时时长，目前只对 Redis 缓存生效，默认 3 分钟
ue:
root-path: /app/static/uploads #文件存储根目录(可选配置),默认为[classpath:/static]
server-url: /ueditor/jsp/controller #服务器统一请求接口路径(可选配置),默认为[/ueditor/jsp/controller] upload: cn.jasonone.ueditor.upload.LocationFileStorage #文件持久化处理类(可选配置),默认为[cn.jasonone.ueditor.upload.LocationFileStorage]
......
yudao-server/src/main/resources/application.yaml
View file @ 3ee0a97e
......@@ -2,7 +2,7 @@ spring:
application:
name: yudao-admin-server
profiles:
active: local
active: test
mvc:
static-path-pattern: /**
web:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment