提交 0283af86 编写于 作者: Y yfqian

修改配置

上级 0b6f3acc
...@@ -51,3 +51,5 @@ build/ ...@@ -51,3 +51,5 @@ build/
/docs/dev-ops/environment/rocketmq/data/rocketmq/store/lock /docs/dev-ops/environment/rocketmq/data/rocketmq/store/lock
/docs/dev-ops/environment/rocketmq/data/rocketmq/store/timerwheel /docs/dev-ops/environment/rocketmq/data/rocketmq/store/timerwheel
/data/ /data/
/.idea/**
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
<module>xfg-frame-archetype-std-infrastructure</module> <module>xfg-frame-archetype-std-infrastructure</module>
<module>xfg-frame-archetype-std-types</module> <module>xfg-frame-archetype-std-types</module>
<module>xfg-frame-archetype-std-api</module> <module>xfg-frame-archetype-std-api</module>
<module>scaffold-std</module>
</modules> </modules>
<properties> <properties>
......
...@@ -26,7 +26,7 @@ mybatis: ...@@ -26,7 +26,7 @@ mybatis:
redis: redis:
sdk: sdk:
config: config:
host: 127.0.0.1 host: 192.168.64.130
port: 6379 port: 6379
password: 123456 password: 123456
pool-size: 10 pool-size: 10
...@@ -45,7 +45,7 @@ dubbo: ...@@ -45,7 +45,7 @@ dubbo:
version: 1.0.0 version: 1.0.0
registry: registry:
id: nacos-registry id: nacos-registry
address: nacos://127.0.0.1:8848 address: nacos://192.168.64.130:8848
protocol: protocol:
name: dubbo name: dubbo
port: -1 port: -1
...@@ -54,7 +54,7 @@ dubbo: ...@@ -54,7 +54,7 @@ dubbo:
# RocketMQ 配置,在docs/dev-ops下,有创建 xfg-group 脚本,也有场景mq消息的脚本 # RocketMQ 配置,在docs/dev-ops下,有创建 xfg-group 脚本,也有场景mq消息的脚本
rocketmq: rocketmq:
name-server: 127.0.0.1:9876 name-server: 192.168.64.130:9876
consumer: consumer:
group: xfg-group group: xfg-group
# 一次拉取消息最大值,注意是拉取消息的最大值而非消费最大值 # 一次拉取消息最大值,注意是拉取消息的最大值而非消费最大值
...@@ -82,7 +82,7 @@ xxl: ...@@ -82,7 +82,7 @@ xxl:
accessToken: default_token accessToken: default_token
# 注册地址 # 注册地址
admin: admin:
addresses: http://localhost:9090/xxl-job-admin addresses: http://192.168.64.130:9090/xxl-job-admin
# 注册执行器 # 注册执行器
executor: executor:
# 执行器注册 [选填]:优先使用该配置作为注册地址,为空时使用内嵌服务 ”IP:PORT“ 作为注册地址。从而更灵活的支持容器类型执行器动态IP和动态映射端口问题。 # 执行器注册 [选填]:优先使用该配置作为注册地址,为空时使用内嵌服务 ”IP:PORT“ 作为注册地址。从而更灵活的支持容器类型执行器动态IP和动态映射端口问题。
...@@ -101,4 +101,4 @@ xxl: ...@@ -101,4 +101,4 @@ xxl:
logging: logging:
level: level:
root: info root: info
config: classpath:logback-spring.xml config: classpath:logback-spring.xml
\ No newline at end of file
...@@ -17,7 +17,7 @@ thread: ...@@ -17,7 +17,7 @@ thread:
# datasource: # datasource:
# username: root # username: root
# password: 123456 # password: 123456
# url: jdbc:mysql://127.0.0.1:3306/xfg_frame_archetype?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&serverTimezone=UTC&useSSL=true # url: jdbc:mysql://192.168.64.130:3306/xfg_frame_archetype?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&serverTimezone=UTC&useSSL=true
# driver-class-name: com.mysql.cj.jdbc.Driver # driver-class-name: com.mysql.cj.jdbc.Driver
# hikari: # hikari:
# pool-name: Retail_HikariCP # pool-name: Retail_HikariCP
...@@ -38,4 +38,4 @@ thread: ...@@ -38,4 +38,4 @@ thread:
logging: logging:
level: level:
root: info root: info
config: classpath:logback-spring.xml config: classpath:logback-spring.xml
\ No newline at end of file
...@@ -17,7 +17,7 @@ thread: ...@@ -17,7 +17,7 @@ thread:
# datasource: # datasource:
# username: root # username: root
# password: 123456 # password: 123456
# url: jdbc:mysql://127.0.0.1:3306/xfg_frame_archetype?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&serverTimezone=UTC&useSSL=true # url: jdbc:mysql://192.168.64.130:3306/xfg_frame_archetype?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&serverTimezone=UTC&useSSL=true
# driver-class-name: com.mysql.cj.jdbc.Driver # driver-class-name: com.mysql.cj.jdbc.Driver
# hikari: # hikari:
# pool-name: Retail_HikariCP # pool-name: Retail_HikariCP
...@@ -38,4 +38,4 @@ thread: ...@@ -38,4 +38,4 @@ thread:
logging: logging:
level: level:
root: info root: info
config: classpath:logback-spring.xml config: classpath:logback-spring.xml
\ No newline at end of file
...@@ -7,7 +7,7 @@ dataSources: ...@@ -7,7 +7,7 @@ dataSources:
ds_0: ds_0:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.mysql.cj.jdbc.Driver driverClassName: com.mysql.cj.jdbc.Driver
jdbcUrl: jdbc:mysql://127.0.0.1:13306/xfg_dev_tech_db_00?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&serverTimezone=UTC&useSSL=true jdbcUrl: jdbc:mysql://192.168.64.130:13306/xfg_dev_tech_db_00?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&serverTimezone=UTC&useSSL=true
username: root username: root
password: 123456 password: 123456
connectionTimeoutMilliseconds: 30000 connectionTimeoutMilliseconds: 30000
...@@ -19,7 +19,7 @@ dataSources: ...@@ -19,7 +19,7 @@ dataSources:
ds_1: ds_1:
dataSourceClassName: com.zaxxer.hikari.HikariDataSource dataSourceClassName: com.zaxxer.hikari.HikariDataSource
driverClassName: com.mysql.cj.jdbc.Driver driverClassName: com.mysql.cj.jdbc.Driver
jdbcUrl: jdbc:mysql://127.0.0.1:13306/xfg_dev_tech_db_01?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&serverTimezone=UTC&useSSL=true jdbcUrl: jdbc:mysql://192.168.64.130:13306/xfg_dev_tech_db_01?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&serverTimezone=UTC&useSSL=true
username: root username: root
password: 123456 password: 123456
connectionTimeoutMilliseconds: 30000 connectionTimeoutMilliseconds: 30000
...@@ -71,4 +71,4 @@ props: ...@@ -71,4 +71,4 @@ props:
# 在程序启动和更新时,是否检查分片元数据的结构一致性。 # 在程序启动和更新时,是否检查分片元数据的结构一致性。
check-table-metadata-enabled: false check-table-metadata-enabled: false
# 在程序启动和更新时,是否检查重复表。false # 在程序启动和更新时,是否检查重复表。false
check-duplicate-table-enabled: false check-duplicate-table-enabled: false
\ No newline at end of file
...@@ -56,7 +56,7 @@ public class UserOrderTest { ...@@ -56,7 +56,7 @@ public class UserOrderTest {
.orderStatus(0) .orderStatus(0)
.isDelete(0) .isDelete(0)
.uuid(UUID.randomUUID().toString().replace("-", "")) .uuid(UUID.randomUUID().toString().replace("-", ""))
.ipv4("127.0.0.1") .ipv4("192.168.64.130")
.ipv6("2001:0db8:85a3:0000:0000:8a2e:0370:7334".getBytes()) .ipv6("2001:0db8:85a3:0000:0000:8a2e:0370:7334".getBytes())
.extData("{${symbol_escape}"device${symbol_escape}": {${symbol_escape}"machine${symbol_escape}": ${symbol_escape}"IPhone 14 Pro${symbol_escape}", ${symbol_escape}"location${symbol_escape}": ${symbol_escape}"shanghai${symbol_escape}"}}") .extData("{${symbol_escape}"device${symbol_escape}": {${symbol_escape}"machine${symbol_escape}": ${symbol_escape}"IPhone 14 Pro${symbol_escape}", ${symbol_escape}"location${symbol_escape}": ${symbol_escape}"shanghai${symbol_escape}"}}")
.build(); .build();
......
# 命令执行 docker-compose up -d # 命令执行 docker-compose up -d
version: '3.9' version: '3.9'
# 安装开发环境 # 安装开发环境
# 配置中心nacos:http://127.0.0.1:8848/nacos - 【账号:nacos 密码:nacos】 # 配置中心nacos:http://192.168.64.130:8848/nacos - 【账号:nacos 密码:nacos】
# 消息rocketmq:http://localhost:8080/#/ - 【账号:admin 密码:admin】 # 消息rocketmq:http://localhost:8080/#/ - 【账号:admin 密码:admin】
# 任务调度xxl-job-admin:http://127.0.0.1:9090/xxl-job-admin/ - 【账号:admin 密码:123456】 # 任务调度xxl-job-admin:http://192.168.64.130:9090/xxl-job-admin/ - 【账号:admin 密码:123456】
# 数据库mysql # 数据库mysql
# 缓存redis # 缓存redis
services: services:
# 注册中心 https://github.com/nacos-group/nacos-docker - 其他配置可参考(集群) # 注册中心 https://github.com/nacos-group/nacos-docker - 其他配置可参考(集群)
# http://127.0.0.1:8848/nacos 【账号:nacos 密码:nacos】 # http://192.168.64.130:8848/nacos 【账号:nacos 密码:nacos】
nacos: nacos:
image: nacos/nacos-server:v2.2.3-slim image: nacos/nacos-server:v2.2.3-slim
container_name: nacos container_name: xfg-nacos
restart: always restart: unless-stopped
ports: ports:
- "8848:8848" - "8848:8848"
- "9848:9848" - "9848:9848"
...@@ -30,17 +30,17 @@ services: ...@@ -30,17 +30,17 @@ services:
- NACOS_AUTH_IDENTITY_VALUE=2xxx - NACOS_AUTH_IDENTITY_VALUE=2xxx
- NACOS_AUTH_TOKEN=SecretKey012345678901234567890123456789012345678901234567890123456789 - NACOS_AUTH_TOKEN=SecretKey012345678901234567890123456789012345678901234567890123456789
networks: networks:
- my-network - xfg-network
depends_on: depends_on:
mysql: mysql:
condition: service_healthy condition: service_healthy
# http://127.0.0.1:9090/xxl-job-admin admin/123456 - 安装后稍等会访问即可 # http://192.168.64.130:9090/xxl-job-admin admin/123456 - 安装后稍等会访问即可
# 官网镜像为 xuxueli/xxl-job-admin:2.4.0 但不支持ARM架构【需要自己打包】,所以找了一个 kuschzzp/xxl-job-aarch64:2.4.0 镜像支持 AMD/ARM # 官网镜像为 xuxueli/xxl-job-admin:2.4.0 但不支持ARM架构【需要自己打包】,所以找了一个 kuschzzp/xxl-job-aarch64:2.4.0 镜像支持 AMD/ARM
xxl-job-admin: xxl-job-admin:
image: xuxueli/xxl-job-admin:2.4.0 image: xuxueli/xxl-job-admin:2.4.0
container_name: xxl-job-admin container_name: xfg-xxl-job-admin
restart: always restart: unless-stopped
depends_on: depends_on:
mysql: mysql:
condition: service_healthy condition: service_healthy
...@@ -57,22 +57,22 @@ services: ...@@ -57,22 +57,22 @@ services:
- SPRING_DATASOURCE_PASSWORD=123456 - SPRING_DATASOURCE_PASSWORD=123456
- SERVER_PORT=9090 - SERVER_PORT=9090
networks: networks:
- my-network - xfg-network
# MySQL 增加健康检测,避免 # MySQL 增加健康检测,避免
mysql: mysql:
image: mysql:8.0.32 image: mysql:8.0
container_name: mysql container_name: xfg-mysql
hostname: mysql hostname: mysql
command: --default-authentication-plugin=mysql_native_password command: --default-authentication-plugin=mysql_native_password
restart: always restart: unless-stopped
environment: environment:
TZ: Asia/Shanghai TZ: Asia/Shanghai
MYSQL_ROOT_PASSWORD: 123456 MYSQL_ROOT_PASSWORD: 123456
MYSQL_USER: xfg MYSQL_USER: xfg
MYSQL_PASSWORD: 123456 MYSQL_PASSWORD: 123456
networks: networks:
- my-network - xfg-network
depends_on: depends_on:
- mysql-job-dbdata - mysql-job-dbdata
ports: ports:
...@@ -96,14 +96,14 @@ services: ...@@ -96,14 +96,14 @@ services:
# 自动加载数据 # 自动加载数据
mysql-job-dbdata: mysql-job-dbdata:
image: alpine:3.18.2 image: alpine:3.18.2
container_name: mysql-job-dbdata container_name: xfg-mysql-job-dbdata
volumes: volumes:
- /var/lib/mysql - /var/lib/mysql
# phpmyadmin https://hub.docker.com/_/phpmyadmin # phpmyadmin https://hub.docker.com/_/phpmyadmin
phpmyadmin: phpmyadmin:
image: phpmyadmin:5.2.1 image: phpmyadmin:5.2.1
container_name: phpmyadmin container_name: xfg-phpmyadmin
hostname: phpmyadmin hostname: phpmyadmin
ports: ports:
- 8899:80 - 8899:80
...@@ -113,29 +113,29 @@ services: ...@@ -113,29 +113,29 @@ services:
- PMA_PORT=3306 - PMA_PORT=3306
- MYSQL_ROOT_PASSWORD=123456 - MYSQL_ROOT_PASSWORD=123456
networks: networks:
- my-network - xfg-network
# RedisAdmin https://github.com/joeferner/redis-commander # RedisAdmin https://github.com/joeferner/redis-commander
redis-admin: redis-admin:
image: spryker/redis-commander:0.8.0 image: spryker/redis-commander:0.8.0
container_name: redis-admin container_name: xfg-redis-admin
hostname: redis-commander hostname: redis-commander
restart: always restart: unless-stopped
ports: ports:
- 8081:8081 - 8081:8081
environment: environment:
- REDIS_HOSTS=local:redis:6379 - REDIS_HOSTS=local:redis:6379
networks: networks:
- my-network - xfg-network
depends_on: depends_on:
redis: redis:
condition: service_healthy condition: service_healthy
# Redis # Redis
redis: redis:
image: redis:7.2.0 image: redis:6.2
container_name: redis container_name: xfg-redis
restart: always restart: unless-stopped
hostname: redis hostname: redis
ports: ports:
- 6379:6379 - 6379:6379
...@@ -143,7 +143,7 @@ services: ...@@ -143,7 +143,7 @@ services:
- ./redis/redis.conf:/usr/local/etc/redis/redis.conf - ./redis/redis.conf:/usr/local/etc/redis/redis.conf
command: redis-server /usr/local/etc/redis/redis.conf command: redis-server /usr/local/etc/redis/redis.conf
networks: networks:
- my-network - xfg-network
healthcheck: healthcheck:
test: [ "CMD", "redis-cli", "ping" ] test: [ "CMD", "redis-cli", "ping" ]
interval: 10s interval: 10s
...@@ -152,11 +152,11 @@ services: ...@@ -152,11 +152,11 @@ services:
# https://hub.docker.com/r/xuchengen/rocketmq # https://hub.docker.com/r/xuchengen/rocketmq
# 注意修改项; # 注意修改项;
# 01:data/rocketmq/conf/broker.conf 添加 brokerIP1=127.0.0.1 # 01:data/rocketmq/conf/broker.conf 添加 brokerIP1=192.168.64.130
# 02:data/console/config/application.properties server.port=9009 - 如果8080端口被占用,可以修改或者添加映射端口 # 02:data/console/config/application.properties server.port=9009 - 如果8080端口被占用,可以修改或者添加映射端口
rocketmq: rocketmq:
image: livinphp/rocketmq:5.1.0 image: livinphp/rocketmq:5.1.0
container_name: rocketmq container_name: xfg-rocketmq
ports: ports:
- 8080:8080 - 8080:8080
- 9876:9876 - 9876:9876
...@@ -170,5 +170,5 @@ services: ...@@ -170,5 +170,5 @@ services:
NAMESRV_ADDR: "rocketmq:9876" NAMESRV_ADDR: "rocketmq:9876"
networks: networks:
my-network: xfg-network:
driver: bridge driver: bridge
\ No newline at end of file
...@@ -30,4 +30,4 @@ flushDiskType = ASYNC_FLUSH ...@@ -30,4 +30,4 @@ flushDiskType = ASYNC_FLUSH
# 存储路径 # 存储路径
storePathRootDir = /home/app/data/rocketmq/store storePathRootDir = /home/app/data/rocketmq/store
# IP地址 # IP地址
brokerIP1 = 127.0.0.1 brokerIP1 = 192.168.64.130
\ No newline at end of file
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
# https://sequel-ace.com/ # https://sequel-ace.com/
# https://github.com/Sequel-Ace/Sequel-Ace # https://github.com/Sequel-Ace/Sequel-Ace
# #
# 主机: 127.0.0.1 (MySQL 8.0.32) # 主机: 192.168.64.130 (MySQL 8.0.32)
# 数据库: nacos_config # 数据库: nacos_config
# 生成时间: 2023-11-03 06:44:40 +0000 # 生成时间: 2023-11-03 06:44:40 +0000
# ************************************************************ # ************************************************************
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
# https://sequel-ace.com/ # https://sequel-ace.com/
# https://github.com/Sequel-Ace/Sequel-Ace # https://github.com/Sequel-Ace/Sequel-Ace
# #
# 主机: 127.0.0.1 (MySQL 8.0.32) # 主机: 192.168.64.130 (MySQL 8.0.32)
# 数据库: xfg_dev_tech_db_00 # 数据库: xfg_dev_tech_db_00
# 生成时间: 2023-11-02 07:41:33 +0000 # 生成时间: 2023-11-02 07:41:33 +0000
# ************************************************************ # ************************************************************
...@@ -212,4 +212,4 @@ UNLOCK TABLES; ...@@ -212,4 +212,4 @@ UNLOCK TABLES;
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; /*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
\ No newline at end of file
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
# https://sequel-ace.com/ # https://sequel-ace.com/
# https://github.com/Sequel-Ace/Sequel-Ace # https://github.com/Sequel-Ace/Sequel-Ace
# #
# 主机: 127.0.0.1 (MySQL 8.0.32) # 主机: 192.168.64.130 (MySQL 8.0.32)
# 数据库: xfg_dev_tech_db_01 # 数据库: xfg_dev_tech_db_01
# 生成时间: 2023-11-02 07:42:32 +0000 # 生成时间: 2023-11-02 07:42:32 +0000
# ************************************************************ # ************************************************************
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册