From 0283af866b6c348d7710c53784edd43aa3dd8ac0 Mon Sep 17 00:00:00 2001 From: yfqian Date: Sat, 30 Dec 2023 10:51:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 + pom.xml | 1 + .../src/main/resources/application-dev.yml | 10 ++-- .../src/main/resources/application-prod.yml | 4 +- .../src/main/resources/application-test.yml | 4 +- .../resources/sharding/sharding-jdbc-dev.yaml | 6 +- .../persistent/UserOrderTest.java | 2 +- .../dev-ops/environment/docker-compose.yml | 56 +++++++++---------- .../rocketmq/data/rocketmq/conf/broker.conf | 2 +- .../docs/dev-ops/environment/sql/nacos.sql | 2 +- .../environment/sql/xfg_dev_tech_db_00.sql | 4 +- .../environment/sql/xfg_dev_tech_db_01.sql | 2 +- 12 files changed, 49 insertions(+), 46 deletions(-) diff --git a/.gitignore b/.gitignore index 591abd7..90e62b4 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,5 @@ build/ /docs/dev-ops/environment/rocketmq/data/rocketmq/store/lock /docs/dev-ops/environment/rocketmq/data/rocketmq/store/timerwheel /data/ + +/.idea/** diff --git a/pom.xml b/pom.xml index 706cf0e..8fe11d9 100644 --- a/pom.xml +++ b/pom.xml @@ -14,6 +14,7 @@ xfg-frame-archetype-std-infrastructure xfg-frame-archetype-std-types xfg-frame-archetype-std-api + scaffold-std diff --git a/scaffold-std/src/main/resources/archetype-resources/__rootArtifactId__-app/src/main/resources/application-dev.yml b/scaffold-std/src/main/resources/archetype-resources/__rootArtifactId__-app/src/main/resources/application-dev.yml index f258824..2a02849 100644 --- a/scaffold-std/src/main/resources/archetype-resources/__rootArtifactId__-app/src/main/resources/application-dev.yml +++ b/scaffold-std/src/main/resources/archetype-resources/__rootArtifactId__-app/src/main/resources/application-dev.yml @@ -26,7 +26,7 @@ mybatis: redis: sdk: config: - host: 127.0.0.1 + host: 192.168.64.130 port: 6379 password: 123456 pool-size: 10 @@ -45,7 +45,7 @@ dubbo: version: 1.0.0 registry: id: nacos-registry - address: nacos://127.0.0.1:8848 + address: nacos://192.168.64.130:8848 protocol: name: dubbo port: -1 @@ -54,7 +54,7 @@ dubbo: # RocketMQ 配置，在docs/dev-ops下，有创建 xfg-group 脚本，也有场景mq消息的脚本 rocketmq: - name-server: 127.0.0.1:9876 + name-server: 192.168.64.130:9876 consumer: group: xfg-group # 一次拉取消息最大值，注意是拉取消息的最大值而非消费最大值 @@ -82,7 +82,7 @@ xxl: accessToken: default_token # 注册地址 admin: - addresses: http://localhost:9090/xxl-job-admin + addresses: http://192.168.64.130:9090/xxl-job-admin # 注册执行器 executor: # 执行器注册 [选填]：优先使用该配置作为注册地址，为空时使用内嵌服务 ”IP:PORT“ 作为注册地址。从而更灵活的支持容器类型执行器动态IP和动态映射端口问题。 @@ -101,4 +101,4 @@ xxl: logging: level: root: info - config: classpath:logback-spring.xml \ No newline at end of file + config: classpath:logback-spring.xml diff --git a/scaffold-std/src/main/resources/archetype-resources/__rootArtifactId__-app/src/main/resources/application-prod.yml b/scaffold-std/src/main/resources/archetype-resources/__rootArtifactId__-app/src/main/resources/application-prod.yml index f369619..20e944a 100644 --- a/scaffold-std/src/main/resources/archetype-resources/__rootArtifactId__-app/src/main/resources/application-prod.yml +++ b/scaffold-std/src/main/resources/archetype-resources/__rootArtifactId__-app/src/main/resources/application-prod.yml @@ -17,7 +17,7 @@ thread: # datasource: # username: root # 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 # hikari: # pool-name: Retail_HikariCP @@ -38,4 +38,4 @@ thread: logging: level: root: info - config: classpath:logback-spring.xml \ No newline at end of file + config: classpath:logback-spring.xml diff --git a/scaffold-std/src/main/resources/archetype-resources/__rootArtifactId__-app/src/main/resources/application-test.yml b/scaffold-std/src/main/resources/archetype-resources/__rootArtifactId__-app/src/main/resources/application-test.yml index f369619..20e944a 100644 --- a/scaffold-std/src/main/resources/archetype-resources/__rootArtifactId__-app/src/main/resources/application-test.yml +++ b/scaffold-std/src/main/resources/archetype-resources/__rootArtifactId__-app/src/main/resources/application-test.yml @@ -17,7 +17,7 @@ thread: # datasource: # username: root # 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 # hikari: # pool-name: Retail_HikariCP @@ -38,4 +38,4 @@ thread: logging: level: root: info - config: classpath:logback-spring.xml \ No newline at end of file + config: classpath:logback-spring.xml diff --git a/scaffold-std/src/main/resources/archetype-resources/__rootArtifactId__-app/src/main/resources/sharding/sharding-jdbc-dev.yaml b/scaffold-std/src/main/resources/archetype-resources/__rootArtifactId__-app/src/main/resources/sharding/sharding-jdbc-dev.yaml index 859a90e..104b50c 100644 --- a/scaffold-std/src/main/resources/archetype-resources/__rootArtifactId__-app/src/main/resources/sharding/sharding-jdbc-dev.yaml +++ b/scaffold-std/src/main/resources/archetype-resources/__rootArtifactId__-app/src/main/resources/sharding/sharding-jdbc-dev.yaml @@ -7,7 +7,7 @@ dataSources: ds_0: dataSourceClassName: com.zaxxer.hikari.HikariDataSource 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 password: 123456 connectionTimeoutMilliseconds: 30000 @@ -19,7 +19,7 @@ dataSources: ds_1: dataSourceClassName: com.zaxxer.hikari.HikariDataSource 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 password: 123456 connectionTimeoutMilliseconds: 30000 @@ -71,4 +71,4 @@ props: # 在程序启动和更新时，是否检查分片元数据的结构一致性。 check-table-metadata-enabled: false # 在程序启动和更新时，是否检查重复表。false - check-duplicate-table-enabled: false \ No newline at end of file + check-duplicate-table-enabled: false diff --git a/scaffold-std/src/main/resources/archetype-resources/__rootArtifactId__-app/src/test/java/test/infrastructure/persistent/UserOrderTest.java b/scaffold-std/src/main/resources/archetype-resources/__rootArtifactId__-app/src/test/java/test/infrastructure/persistent/UserOrderTest.java index bfcbfe3..8d69174 100644 --- a/scaffold-std/src/main/resources/archetype-resources/__rootArtifactId__-app/src/test/java/test/infrastructure/persistent/UserOrderTest.java +++ b/scaffold-std/src/main/resources/archetype-resources/__rootArtifactId__-app/src/test/java/test/infrastructure/persistent/UserOrderTest.java @@ -56,7 +56,7 @@ public class UserOrderTest { .orderStatus(0) .isDelete(0) .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()) .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(); diff --git a/scaffold-std/src/main/resources/archetype-resources/docs/dev-ops/environment/docker-compose.yml b/scaffold-std/src/main/resources/archetype-resources/docs/dev-ops/environment/docker-compose.yml index d9abb40..580f5da 100644 --- a/scaffold-std/src/main/resources/archetype-resources/docs/dev-ops/environment/docker-compose.yml +++ b/scaffold-std/src/main/resources/archetype-resources/docs/dev-ops/environment/docker-compose.yml @@ -1,18 +1,18 @@ # 命令执行 docker-compose up -d 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】 -# 任务调度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 # 缓存redis services: # 注册中心 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: image: nacos/nacos-server:v2.2.3-slim - container_name: nacos - restart: always + container_name: xfg-nacos + restart: unless-stopped ports: - "8848:8848" - "9848:9848" @@ -30,17 +30,17 @@ services: - NACOS_AUTH_IDENTITY_VALUE=2xxx - NACOS_AUTH_TOKEN=SecretKey012345678901234567890123456789012345678901234567890123456789 networks: - - my-network + - xfg-network depends_on: mysql: 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 xxl-job-admin: image: xuxueli/xxl-job-admin:2.4.0 - container_name: xxl-job-admin - restart: always + container_name: xfg-xxl-job-admin + restart: unless-stopped depends_on: mysql: condition: service_healthy @@ -57,22 +57,22 @@ services: - SPRING_DATASOURCE_PASSWORD=123456 - SERVER_PORT=9090 networks: - - my-network + - xfg-network # MySQL 增加健康检测，避免 mysql: - image: mysql:8.0.32 - container_name: mysql + image: mysql:8.0 + container_name: xfg-mysql hostname: mysql command: --default-authentication-plugin=mysql_native_password - restart: always + restart: unless-stopped environment: TZ: Asia/Shanghai MYSQL_ROOT_PASSWORD: 123456 MYSQL_USER: xfg MYSQL_PASSWORD: 123456 networks: - - my-network + - xfg-network depends_on: - mysql-job-dbdata ports: @@ -96,14 +96,14 @@ services: # 自动加载数据 mysql-job-dbdata: image: alpine:3.18.2 - container_name: mysql-job-dbdata + container_name: xfg-mysql-job-dbdata volumes: - /var/lib/mysql # phpmyadmin https://hub.docker.com/_/phpmyadmin phpmyadmin: image: phpmyadmin:5.2.1 - container_name: phpmyadmin + container_name: xfg-phpmyadmin hostname: phpmyadmin ports: - 8899:80 @@ -113,29 +113,29 @@ services: - PMA_PORT=3306 - MYSQL_ROOT_PASSWORD=123456 networks: - - my-network + - xfg-network # RedisAdmin https://github.com/joeferner/redis-commander redis-admin: image: spryker/redis-commander:0.8.0 - container_name: redis-admin + container_name: xfg-redis-admin hostname: redis-commander - restart: always + restart: unless-stopped ports: - 8081:8081 environment: - REDIS_HOSTS=local:redis:6379 networks: - - my-network + - xfg-network depends_on: redis: condition: service_healthy # Redis redis: - image: redis:7.2.0 - container_name: redis - restart: always + image: redis:6.2 + container_name: xfg-redis + restart: unless-stopped hostname: redis ports: - 6379:6379 @@ -143,7 +143,7 @@ services: - ./redis/redis.conf:/usr/local/etc/redis/redis.conf command: redis-server /usr/local/etc/redis/redis.conf networks: - - my-network + - xfg-network healthcheck: test: [ "CMD", "redis-cli", "ping" ] interval: 10s @@ -152,11 +152,11 @@ services: # 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端口被占用，可以修改或者添加映射端口 rocketmq: image: livinphp/rocketmq:5.1.0 - container_name: rocketmq + container_name: xfg-rocketmq ports: - 8080:8080 - 9876:9876 @@ -170,5 +170,5 @@ services: NAMESRV_ADDR: "rocketmq:9876" networks: - my-network: - driver: bridge \ No newline at end of file + xfg-network: + driver: bridge diff --git a/scaffold-std/src/main/resources/archetype-resources/docs/dev-ops/environment/rocketmq/data/rocketmq/conf/broker.conf b/scaffold-std/src/main/resources/archetype-resources/docs/dev-ops/environment/rocketmq/data/rocketmq/conf/broker.conf index 9e6bbea..8c0e51c 100644 --- a/scaffold-std/src/main/resources/archetype-resources/docs/dev-ops/environment/rocketmq/data/rocketmq/conf/broker.conf +++ b/scaffold-std/src/main/resources/archetype-resources/docs/dev-ops/environment/rocketmq/data/rocketmq/conf/broker.conf @@ -30,4 +30,4 @@ flushDiskType = ASYNC_FLUSH # 存储路径 storePathRootDir = /home/app/data/rocketmq/store # IP地址 -brokerIP1 = 127.0.0.1 \ No newline at end of file +brokerIP1 = 192.168.64.130 diff --git a/scaffold-std/src/main/resources/archetype-resources/docs/dev-ops/environment/sql/nacos.sql b/scaffold-std/src/main/resources/archetype-resources/docs/dev-ops/environment/sql/nacos.sql index b2d0725..0fb2756 100644 --- a/scaffold-std/src/main/resources/archetype-resources/docs/dev-ops/environment/sql/nacos.sql +++ b/scaffold-std/src/main/resources/archetype-resources/docs/dev-ops/environment/sql/nacos.sql @@ -5,7 +5,7 @@ # https://sequel-ace.com/ # 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 # 生成时间: 2023-11-03 06:44:40 +0000 # ************************************************************ diff --git a/scaffold-std/src/main/resources/archetype-resources/docs/dev-ops/environment/sql/xfg_dev_tech_db_00.sql b/scaffold-std/src/main/resources/archetype-resources/docs/dev-ops/environment/sql/xfg_dev_tech_db_00.sql index 98a8a15..5b57d8a 100644 --- a/scaffold-std/src/main/resources/archetype-resources/docs/dev-ops/environment/sql/xfg_dev_tech_db_00.sql +++ b/scaffold-std/src/main/resources/archetype-resources/docs/dev-ops/environment/sql/xfg_dev_tech_db_00.sql @@ -5,7 +5,7 @@ # https://sequel-ace.com/ # 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 # 生成时间: 2023-11-02 07:41:33 +0000 # ************************************************************ @@ -212,4 +212,4 @@ UNLOCK TABLES; /*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; /*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; /*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; \ No newline at end of file +/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; diff --git a/scaffold-std/src/main/resources/archetype-resources/docs/dev-ops/environment/sql/xfg_dev_tech_db_01.sql b/scaffold-std/src/main/resources/archetype-resources/docs/dev-ops/environment/sql/xfg_dev_tech_db_01.sql index acc526a..a5beb10 100644 --- a/scaffold-std/src/main/resources/archetype-resources/docs/dev-ops/environment/sql/xfg_dev_tech_db_01.sql +++ b/scaffold-std/src/main/resources/archetype-resources/docs/dev-ops/environment/sql/xfg_dev_tech_db_01.sql @@ -5,7 +5,7 @@ # https://sequel-ace.com/ # 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 # 生成时间: 2023-11-02 07:42:32 +0000 # ************************************************************ -- GitLab