From dd163c5dd27a9b18e119e137926b349eec2e3f5e Mon Sep 17 00:00:00 2001 From: arvin xiao Date: Tue, 4 Apr 2023 00:51:30 +0800 Subject: [PATCH] =?UTF-8?q?DockerCompose=E9=83=A8=E7=BD=B2=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/build.sh | 6 + docker/clean.sh | 45 +++ docker/copy.sh | 6 +- docker/docker-compose.yml | 53 ++- docker/mysql/{dockerfile => Dockerfile} | 0 docker/mysql/db/docker-compose-config.sql | 326 ++++++++++++++++++ docker/nacos/{dockerfile => Dockerfile} | 0 docker/nacos/conf/application.properties | 2 +- docker/nginx/{dockerfile => Dockerfile} | 0 docker/nginx/conf/nginx.conf | 2 +- docker/nginx/html/dist/readme.txt | 1 - docker/nginx/html/readme.txt | 1 + docker/redis/{dockerfile => Dockerfile} | 0 docker/ruoyi/auth/{dockerfile => Dockerfile} | 0 .../ruoyi/gateway/{dockerfile => Dockerfile} | 0 .../modules/file/{dockerfile => Dockerfile} | 0 .../modules/gen/{dockerfile => Dockerfile} | 0 .../modules/job/{dockerfile => Dockerfile} | 0 .../modules/system/{dockerfile => Dockerfile} | 0 .../visual/monitor/{dockerfile => Dockerfile} | 0 pom.xml | 45 +++ ruoyi-auth/src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 6 +- .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/bootstrap.yml | 4 +- 28 files changed, 484 insertions(+), 33 deletions(-) create mode 100644 docker/build.sh create mode 100644 docker/clean.sh rename docker/mysql/{dockerfile => Dockerfile} (100%) create mode 100644 docker/mysql/db/docker-compose-config.sql rename docker/nacos/{dockerfile => Dockerfile} (100%) rename docker/nginx/{dockerfile => Dockerfile} (100%) delete mode 100644 docker/nginx/html/dist/readme.txt create mode 100644 docker/nginx/html/readme.txt rename docker/redis/{dockerfile => Dockerfile} (100%) rename docker/ruoyi/auth/{dockerfile => Dockerfile} (100%) rename docker/ruoyi/gateway/{dockerfile => Dockerfile} (100%) rename docker/ruoyi/modules/file/{dockerfile => Dockerfile} (100%) rename docker/ruoyi/modules/gen/{dockerfile => Dockerfile} (100%) rename docker/ruoyi/modules/job/{dockerfile => Dockerfile} (100%) rename docker/ruoyi/modules/system/{dockerfile => Dockerfile} (100%) rename docker/ruoyi/visual/monitor/{dockerfile => Dockerfile} (100%) diff --git a/docker/build.sh b/docker/build.sh new file mode 100644 index 00000000..38e3c784 --- /dev/null +++ b/docker/build.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +# 项目打包 +cd .. && mvn clean package -Dmaven.test.skip=true -P DockerCompose + +cd ./ruoyi-ui && npm install && npm run build:prod \ No newline at end of file diff --git a/docker/clean.sh b/docker/clean.sh new file mode 100644 index 00000000..a8ab15ce --- /dev/null +++ b/docker/clean.sh @@ -0,0 +1,45 @@ +#!/bin/sh + +# 清除文件 +usage() { + echo "Usage: sh clean.sh" + exit 1 +} + + +# clean sql +echo "begin clean sql " +# docker-compose-config.sql 容器中网络配置与本地有区别 +rm -rf ./mysql/db/ry_20230223.sql +rm -rf ./mysql/db/ry_seata_20210128.sql + +rm -rf ./mysql/data/* + +rm -rf ./nacos/logs/* + +# clean html +echo "begin clean html " +rm -rf ./nginx/html/dist/* +rm -rf ./nginx/logs/* + +# clean jar +echo "begin clean ruoyi-gateway " +rm -rf ./ruoyi/gateway/jar/*.jar + +echo "begin clean ruoyi-auth " +rm -rf ./ruoyi/auth/jar/*.jar + +echo "begin clean ruoyi-visual " +rm -rf ./ruoyi/visual/monitor/jar/*.jar + +echo "begin clean ruoyi-modules-system " +rm -rf ./ruoyi/modules/system/jar/*.jar + +echo "begin clean ruoyi-modules-file " +rm -rf ./ruoyi/modules/file/jar/*.jar + +echo "begin clean ruoyi-modules-job " +rm -rf ./ruoyi/modules/job/jar/*.jar + +echo "begin clean ruoyi-modules-gen " +rm -rf ./ruoyi/modules/gen/jar/*.jar diff --git a/docker/copy.sh b/docker/copy.sh index ec2915b8..49df1663 100644 --- a/docker/copy.sh +++ b/docker/copy.sh @@ -9,12 +9,12 @@ usage() { # copy sql echo "begin copy sql " -cp ../sql/ry_20220814.sql ./mysql/db -cp ../sql/ry_config_20220510.sql ./mysql/db +cp ../sql/ry_20230223.sql ./mysql/db +cp ../sql/ry_seata_20210128.sql ./mysql/db # copy html echo "begin copy html " -cp -r ../ruoyi-ui/dist/** ./nginx/html/dist +cp -R ../ruoyi-ui/dist/ ./nginx/html/dist/ # copy jar diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 5fb8da1c..c9b04a0d 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -2,7 +2,7 @@ version : '3.8' services: ruoyi-nacos: container_name: ruoyi-nacos - image: nacos/nacos-server + image: ruoyi-nacos build: context: ./nacos environment: @@ -18,7 +18,7 @@ services: - ruoyi-mysql ruoyi-mysql: container_name: ruoyi-mysql - image: mysql:5.7 + image: ruoyi-mysql build: context: ./mysql ports: @@ -37,10 +37,10 @@ services: ] environment: MYSQL_DATABASE: 'ry-cloud' - MYSQL_ROOT_PASSWORD: password + MYSQL_ROOT_PASSWORD: root ruoyi-redis: container_name: ruoyi-redis - image: redis + image: ruoyi-redis build: context: ./redis ports: @@ -51,7 +51,7 @@ services: command: redis-server /home/ruoyi/redis/redis.conf ruoyi-nginx: container_name: ruoyi-nginx - image: nginx + image: ruoyi-nginx build: context: ./nginx ports: @@ -67,74 +67,103 @@ services: - ruoyi-gateway ruoyi-gateway: container_name: ruoyi-gateway + image: ruoyi-gateway build: context: ./ruoyi/gateway - dockerfile: dockerfile + dockerfile: Dockerfile ports: - "8080:8080" depends_on: - ruoyi-redis + - ruoyi-nacos links: - ruoyi-redis + - ruoyi-nacos ruoyi-auth: container_name: ruoyi-auth + image: ruoyi-auth build: context: ./ruoyi/auth - dockerfile: dockerfile + dockerfile: Dockerfile ports: - "9200:9200" depends_on: - ruoyi-redis + - ruoyi-nacos links: - ruoyi-redis + - ruoyi-nacos ruoyi-modules-system: container_name: ruoyi-modules-system + image: ruoyi-modules-system build: context: ./ruoyi/modules/system - dockerfile: dockerfile + dockerfile: Dockerfile ports: - "9201:9201" depends_on: - ruoyi-redis - ruoyi-mysql + - ruoyi-nacos links: - ruoyi-redis - ruoyi-mysql + - ruoyi-nacos ruoyi-modules-gen: container_name: ruoyi-modules-gen + image: ruoyi-modules-gen build: context: ./ruoyi/modules/gen - dockerfile: dockerfile + dockerfile: Dockerfile ports: - "9202:9202" depends_on: - ruoyi-mysql + - ruoyi-nacos links: - ruoyi-mysql + - ruoyi-nacos ruoyi-modules-job: container_name: ruoyi-modules-job + image: ruoyi-modules-job build: context: ./ruoyi/modules/job - dockerfile: dockerfile + dockerfile: Dockerfile ports: - "9203:9203" depends_on: - ruoyi-mysql + - ruoyi-nacos links: - ruoyi-mysql + - ruoyi-nacos ruoyi-modules-file: container_name: ruoyi-modules-file + image: ruoyi-modules-file build: context: ./ruoyi/modules/file - dockerfile: dockerfile + dockerfile: Dockerfile ports: - "9300:9300" + depends_on: + - ruoyi-mysql + - ruoyi-nacos + links: + - ruoyi-mysql + - ruoyi-nacos volumes: - ./ruoyi/uploadPath:/home/ruoyi/uploadPath ruoyi-visual-monitor: container_name: ruoyi-visual-monitor + image: ruoyi-visual-monitor build: context: ./ruoyi/visual/monitor - dockerfile: dockerfile + dockerfile: Dockerfile ports: - "9100:9100" + depends_on: + - ruoyi-mysql + - ruoyi-nacos + links: + - ruoyi-mysql + - ruoyi-nacos diff --git a/docker/mysql/dockerfile b/docker/mysql/Dockerfile similarity index 100% rename from docker/mysql/dockerfile rename to docker/mysql/Dockerfile diff --git a/docker/mysql/db/docker-compose-config.sql b/docker/mysql/db/docker-compose-config.sql new file mode 100644 index 00000000..bad5b22f --- /dev/null +++ b/docker/mysql/db/docker-compose-config.sql @@ -0,0 +1,326 @@ +DROP DATABASE IF EXISTS `ry-config`; + +CREATE DATABASE `ry-config` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; + +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; + +USE `ry-config`; + + +-- ---------------------------- +-- Table structure for config_info +-- ---------------------------- +DROP TABLE IF EXISTS `config_info`; +CREATE TABLE `config_info` +( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `data_id` varchar(255) COLLATE utf8_bin NOT NULL COMMENT 'data_id', + `group_id` varchar(255) COLLATE utf8_bin DEFAULT NULL, + `content` longtext COLLATE utf8_bin NOT NULL COMMENT 'content', + `md5` varchar(32) COLLATE utf8_bin DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `src_user` text COLLATE utf8_bin COMMENT 'source user', + `src_ip` varchar(50) COLLATE utf8_bin DEFAULT NULL COMMENT 'source ip', + `app_name` varchar(128) COLLATE utf8_bin DEFAULT NULL, + `tenant_id` varchar(128) COLLATE utf8_bin DEFAULT '' COMMENT '租户字段', + `c_desc` varchar(256) COLLATE utf8_bin DEFAULT NULL, + `c_use` varchar(64) COLLATE utf8_bin DEFAULT NULL, + `effect` varchar(64) COLLATE utf8_bin DEFAULT NULL, + `type` varchar(64) COLLATE utf8_bin DEFAULT NULL, + `c_schema` text COLLATE utf8_bin, + `encrypted_data_key` text COLLATE utf8_bin COMMENT '秘钥', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_configinfo_datagrouptenant` (`data_id`, `group_id`, `tenant_id`) +) ENGINE = InnoDB + AUTO_INCREMENT = 15 + DEFAULT CHARSET = utf8 + COLLATE = utf8_bin COMMENT ='config_info'; + +-- ---------------------------- +-- Records of config_info +-- ---------------------------- +INSERT INTO `config_info` VALUES (1, 'application-dev.yml', 'DEFAULT_GROUP', 'spring:\n autoconfigure:\n exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure\n mvc:\n pathmatch:\n matching-strategy: ant_path_matcher\n\n# feign 配置\nfeign:\n sentinel:\n enabled: true\n okhttp:\n enabled: true\n httpclient:\n enabled: false\n client:\n config:\n default:\n connectTimeout: 10000\n readTimeout: 10000\n compression:\n request:\n enabled: true\n response:\n enabled: true\n\n# 暴露监控端点\nmanagement:\n endpoints:\n web:\n exposure:\n include: \'*\'\n', 'aaa73b809cfd4d0058893aa13da57806', '2020-05-20 12:00:00', '2022-04-24 10:26:34', 'nacos', '0:0:0:0:0:0:0:1', '', '', '通用配置', 'null', 'null', 'yaml', NULL, ''); +INSERT INTO `config_info` VALUES (2, 'ruoyi-gateway-dev.yml', 'DEFAULT_GROUP', 'spring:\n redis:\n host: ruoyi-redis\n port: 6379\n password:\n cloud:\n gateway:\n discovery:\n locator:\n lowerCaseServiceId: true\n enabled: true\n routes:\n # 认证中心\n - id: ruoyi-auth\n uri: lb://ruoyi-auth\n predicates:\n - Path=/auth/**\n filters:\n # 验证码处理\n - CacheRequestFilter\n - ValidateCodeFilter\n - StripPrefix=1\n # 代码生成\n - id: ruoyi-gen\n uri: lb://ruoyi-gen\n predicates:\n - Path=/code/**\n filters:\n - StripPrefix=1\n # 定时任务\n - id: ruoyi-job\n uri: lb://ruoyi-job\n predicates:\n - Path=/schedule/**\n filters:\n - StripPrefix=1\n # 系统模块\n - id: ruoyi-system\n uri: lb://ruoyi-system\n predicates:\n - Path=/system/**\n filters:\n - StripPrefix=1\n # 文件服务\n - id: ruoyi-file\n uri: lb://ruoyi-file\n predicates:\n - Path=/file/**\n filters:\n - StripPrefix=1\n\n# 安全配置\nsecurity:\n # 验证码\n captcha:\n enabled: true\n type: math\n # 防止XSS攻击\n xss:\n enabled: true\n excludeUrls:\n - /system/notice\n # 不校验白名单\n ignore:\n whites:\n - /auth/logout\n - /auth/login\n - /auth/register\n - /*/v2/api-docs\n - /csrf\n', '6676a38825b30b5795aa4b7b00cee89c', '2020-05-14 14:17:55', '2023-04-03 14:11:05', 'nacos', '172.21.0.1', '', '', '网关模块', 'null', 'null', 'yaml', '', ''); +INSERT INTO `config_info` VALUES (3, 'ruoyi-auth-dev.yml', 'DEFAULT_GROUP', 'spring:\n redis:\n host: ruoyi-redis\n port: 6379\n password:\n', '0cc0b3288cbe840b7202c78cc821a363', '2020-11-20 00:00:00', '2023-04-03 14:11:16', 'nacos', '172.21.0.1', '', '', '认证中心', 'null', 'null', 'yaml', '', ''); +INSERT INTO `config_info` VALUES (4, 'ruoyi-monitor-dev.yml', 'DEFAULT_GROUP', '# spring\nspring:\n security:\n user:\n name: ruoyi\n password: 123456\n boot:\n admin:\n ui:\n title: 若依服务状态监控\n', '6f122fd2bfb8d45f858e7d6529a9cd44', '2020-11-20 00:00:00', '2022-09-29 02:48:54', 'nacos', '0:0:0:0:0:0:0:1', '', '', '监控中心', 'null', 'null', 'yaml', '', ''); +INSERT INTO `config_info` VALUES (5, 'ruoyi-system-dev.yml', 'DEFAULT_GROUP', '# spring配置\nspring:\n redis:\n host: ruoyi-redis\n port: 6379\n password:\n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n # 主库数据源\n master:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://ruoyi-mysql:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: root\n # 从库数据源\n # slave:\n # username: \n # password: \n # url: \n # driver-class-name: \n\n# mybatis配置\nmybatis:\n # 搜索指定包别名\n typeAliasesPackage: com.ruoyi.system\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\n mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n title: 系统模块接口文档\n license: Powered By ruoyi\n licenseUrl: https://ruoyi.vip', '04eafa99f42518c7b1fe09ae9e750c5f', '2020-11-20 00:00:00', '2023-04-03 14:11:46', 'nacos', '172.21.0.1', '', '', '系统模块', 'null', 'null', 'yaml', '', ''); +INSERT INTO `config_info` VALUES (6, 'ruoyi-gen-dev.yml', 'DEFAULT_GROUP', '# spring配置\nspring:\n redis:\n host: ruoyi-redis\n port: 6379\n password:\n datasource:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://ruoyi-mysql:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: root\n\n# mybatis配置\nmybatis:\n # 搜索指定包别名\n typeAliasesPackage: com.ruoyi.gen.domain\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\n mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n title: 代码生成接口文档\n license: Powered By ruoyi\n licenseUrl: https://ruoyi.vip\n\n# 代码生成\ngen:\n # 作者\n author: ruoyi\n # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool\n packageName: com.ruoyi.system\n # 自动去除表前缀，默认是false\n autoRemovePre: false\n # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）\n tablePrefix: sys_\n', '64436750b8799f8eb7b191f7abae438b', '2020-11-20 00:00:00', '2023-04-03 14:12:07', 'nacos', '172.21.0.1', '', '', '代码生成', 'null', 'null', 'yaml', '', ''); +INSERT INTO `config_info` VALUES (7, 'ruoyi-job-dev.yml', 'DEFAULT_GROUP', '# spring配置\nspring:\n redis:\n host: ruoyi-redis\n port: 6379\n password: \n datasource:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://ruoyi-mysql:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: root\n\n# mybatis配置\nmybatis:\n # 搜索指定包别名\n typeAliasesPackage: com.ruoyi.job.domain\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\n mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n title: 定时任务接口文档\n license: Powered By ruoyi\n licenseUrl: https://ruoyi.vip\n', '95f9dfefa25ee9f3dd824d606b5fbca7', '2020-11-20 00:00:00', '2023-04-03 14:12:28', 'nacos', '172.21.0.1', '', '', '定时任务', 'null', 'null', 'yaml', '', ''); +INSERT INTO `config_info` VALUES (8, 'ruoyi-file-dev.yml', 'DEFAULT_GROUP', '# 本地文件上传 \r\nfile:\r\n domain: http://127.0.0.1:9300\r\n path: D:/ruoyi/uploadPath\r\n prefix: /statics\r\n\r\n# FastDFS配置\r\nfdfs:\r\n domain: http://8.129.231.12\r\n soTimeout: 3000\r\n connectTimeout: 2000\r\n trackerList: 8.129.231.12:22122\r\n\r\n# Minio配置\r\nminio:\r\n url: http://8.129.231.12:9000\r\n accessKey: minioadmin\r\n secretKey: minioadmin\r\n bucketName: test', '5382b93f3d8059d6068c0501fdd41195', '2020-11-20 00:00:00', '2020-12-21 21:01:59', NULL, '0:0:0:0:0:0:0:1', '', '', '文件服务', 'null', 'null', 'yaml', NULL, ''); +INSERT INTO `config_info` VALUES (9, 'sentinel-ruoyi-gateway', 'DEFAULT_GROUP', '[\r\n {\r\n \"resource\": \"ruoyi-auth\",\r\n \"count\": 500,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n },\r\n {\r\n \"resource\": \"ruoyi-system\",\r\n \"count\": 1000,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n },\r\n {\r\n \"resource\": \"ruoyi-gen\",\r\n \"count\": 200,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n },\r\n {\r\n \"resource\": \"ruoyi-job\",\r\n \"count\": 300,\r\n \"grade\": 1,\r\n \"limitApp\": \"default\",\r\n \"strategy\": 0,\r\n \"controlBehavior\": 0\r\n }\r\n]', '9f3a3069261598f74220bc47958ec252', '2020-11-20 00:00:00', '2020-11-20 00:00:00', NULL, '0:0:0:0:0:0:0:1', '', '', '限流策略', 'null', 'null', 'json', NULL, ''); + +-- ---------------------------- +-- Table structure for config_info_aggr +-- ---------------------------- +DROP TABLE IF EXISTS `config_info_aggr`; +CREATE TABLE `config_info_aggr` +( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `data_id` varchar(255) COLLATE utf8_bin NOT NULL COMMENT 'data_id', + `group_id` varchar(255) COLLATE utf8_bin NOT NULL COMMENT 'group_id', + `datum_id` varchar(255) COLLATE utf8_bin NOT NULL COMMENT 'datum_id', + `content` longtext COLLATE utf8_bin NOT NULL COMMENT '内容', + `gmt_modified` datetime NOT NULL COMMENT '修改时间', + `app_name` varchar(128) COLLATE utf8_bin DEFAULT NULL, + `tenant_id` varchar(128) COLLATE utf8_bin DEFAULT '' COMMENT '租户字段', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_configinfoaggr_datagrouptenantdatum` (`data_id`, `group_id`, `tenant_id`, `datum_id`) +) ENGINE = InnoDB + DEFAULT CHARSET = utf8 + COLLATE = utf8_bin COMMENT ='增加租户字段'; + +-- ---------------------------- +-- Records of config_info_aggr +-- ---------------------------- + +-- ---------------------------- +-- Table structure for config_info_beta +-- ---------------------------- +DROP TABLE IF EXISTS `config_info_beta`; +CREATE TABLE `config_info_beta` +( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `data_id` varchar(255) COLLATE utf8_bin NOT NULL COMMENT 'data_id', + `group_id` varchar(128) COLLATE utf8_bin NOT NULL COMMENT 'group_id', + `app_name` varchar(128) COLLATE utf8_bin DEFAULT NULL COMMENT 'app_name', + `content` longtext COLLATE utf8_bin NOT NULL COMMENT 'content', + `beta_ips` varchar(1024) COLLATE utf8_bin DEFAULT NULL COMMENT 'betaIps', + `md5` varchar(32) COLLATE utf8_bin DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `src_user` text COLLATE utf8_bin COMMENT 'source user', + `src_ip` varchar(50) COLLATE utf8_bin DEFAULT NULL COMMENT 'source ip', + `tenant_id` varchar(128) COLLATE utf8_bin DEFAULT '' COMMENT '租户字段', + `encrypted_data_key` text COLLATE utf8_bin COMMENT '秘钥', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_configinfobeta_datagrouptenant` (`data_id`, `group_id`, `tenant_id`) +) ENGINE = InnoDB + DEFAULT CHARSET = utf8 + COLLATE = utf8_bin COMMENT ='config_info_beta'; + +-- ---------------------------- +-- Records of config_info_beta +-- ---------------------------- + +-- ---------------------------- +-- Table structure for config_info_tag +-- ---------------------------- +DROP TABLE IF EXISTS `config_info_tag`; +CREATE TABLE `config_info_tag` +( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `data_id` varchar(255) COLLATE utf8_bin NOT NULL COMMENT 'data_id', + `group_id` varchar(128) COLLATE utf8_bin NOT NULL COMMENT 'group_id', + `tenant_id` varchar(128) COLLATE utf8_bin DEFAULT '' COMMENT 'tenant_id', + `tag_id` varchar(128) COLLATE utf8_bin NOT NULL COMMENT 'tag_id', + `app_name` varchar(128) COLLATE utf8_bin DEFAULT NULL COMMENT 'app_name', + `content` longtext COLLATE utf8_bin NOT NULL COMMENT 'content', + `md5` varchar(32) COLLATE utf8_bin DEFAULT NULL COMMENT 'md5', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `src_user` text COLLATE utf8_bin COMMENT 'source user', + `src_ip` varchar(50) COLLATE utf8_bin DEFAULT NULL COMMENT 'source ip', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_configinfotag_datagrouptenanttag` (`data_id`, `group_id`, `tenant_id`, `tag_id`) +) ENGINE = InnoDB + DEFAULT CHARSET = utf8 + COLLATE = utf8_bin COMMENT ='config_info_tag'; + +-- ---------------------------- +-- Records of config_info_tag +-- ---------------------------- + +-- ---------------------------- +-- Table structure for config_tags_relation +-- ---------------------------- +DROP TABLE IF EXISTS `config_tags_relation`; +CREATE TABLE `config_tags_relation` +( + `id` bigint(20) NOT NULL COMMENT 'id', + `tag_name` varchar(128) COLLATE utf8_bin NOT NULL COMMENT 'tag_name', + `tag_type` varchar(64) COLLATE utf8_bin DEFAULT NULL COMMENT 'tag_type', + `data_id` varchar(255) COLLATE utf8_bin NOT NULL COMMENT 'data_id', + `group_id` varchar(128) COLLATE utf8_bin NOT NULL COMMENT 'group_id', + `tenant_id` varchar(128) COLLATE utf8_bin DEFAULT '' COMMENT 'tenant_id', + `nid` bigint(20) NOT NULL AUTO_INCREMENT, + PRIMARY KEY (`nid`), + UNIQUE KEY `uk_configtagrelation_configidtag` (`id`, `tag_name`, `tag_type`), + KEY `idx_tenant_id` (`tenant_id`) +) ENGINE = InnoDB + DEFAULT CHARSET = utf8 + COLLATE = utf8_bin COMMENT ='config_tag_relation'; + +-- ---------------------------- +-- Records of config_tags_relation +-- ---------------------------- + +-- ---------------------------- +-- Table structure for group_capacity +-- ---------------------------- +DROP TABLE IF EXISTS `group_capacity`; +CREATE TABLE `group_capacity` +( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `group_id` varchar(128) COLLATE utf8_bin NOT NULL DEFAULT '' COMMENT 'Group ID，空字符表示整个集群', + `quota` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '配额，0表示使用默认值', + `usage` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '使用量', + `max_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个配置大小上限，单位为字节，0表示使用默认值', + `max_aggr_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '聚合子配置最大个数，，0表示使用默认值', + `max_aggr_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个聚合数据的子配置大小上限，单位为字节，0表示使用默认值', + `max_history_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '最大变更历史数量', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_group_id` (`group_id`) +) ENGINE = InnoDB + DEFAULT CHARSET = utf8 + COLLATE = utf8_bin COMMENT ='集群、各Group容量信息表'; + +-- ---------------------------- +-- Records of group_capacity +-- ---------------------------- + +-- ---------------------------- +-- Table structure for his_config_info +-- ---------------------------- +DROP TABLE IF EXISTS `his_config_info`; +CREATE TABLE `his_config_info` +( + `id` bigint(64) unsigned NOT NULL, + `nid` bigint(20) unsigned NOT NULL AUTO_INCREMENT, + `data_id` varchar(255) COLLATE utf8_bin NOT NULL, + `group_id` varchar(128) COLLATE utf8_bin NOT NULL, + `app_name` varchar(128) COLLATE utf8_bin DEFAULT NULL COMMENT 'app_name', + `content` longtext COLLATE utf8_bin NOT NULL, + `md5` varchar(32) COLLATE utf8_bin DEFAULT NULL, + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, + `src_user` text COLLATE utf8_bin, + `src_ip` varchar(50) COLLATE utf8_bin DEFAULT NULL, + `op_type` char(10) COLLATE utf8_bin DEFAULT NULL, + `tenant_id` varchar(128) COLLATE utf8_bin DEFAULT '' COMMENT '租户字段', + `encrypted_data_key` text COLLATE utf8_bin COMMENT '秘钥', + PRIMARY KEY (`nid`), + KEY `idx_gmt_create` (`gmt_create`), + KEY `idx_gmt_modified` (`gmt_modified`), + KEY `idx_did` (`data_id`) +) ENGINE = InnoDB + AUTO_INCREMENT = 6 + DEFAULT CHARSET = utf8 + COLLATE = utf8_bin COMMENT ='多租户改造'; + +-- ---------------------------- +-- Records of his_config_info +-- ---------------------------- +INSERT INTO `his_config_info` VALUES (2, 1, 'ruoyi-gateway-dev.yml', 'DEFAULT_GROUP', '', 'spring:\n redis:\n host: localhost\n port: 6379\n password:\n cloud:\n gateway:\n discovery:\n locator:\n lowerCaseServiceId: true\n enabled: true\n routes:\n # 认证中心\n - id: ruoyi-auth\n uri: lb://ruoyi-auth\n predicates:\n - Path=/auth/**\n filters:\n # 验证码处理\n - CacheRequestFilter\n - ValidateCodeFilter\n - StripPrefix=1\n # 代码生成\n - id: ruoyi-gen\n uri: lb://ruoyi-gen\n predicates:\n - Path=/code/**\n filters:\n - StripPrefix=1\n # 定时任务\n - id: ruoyi-job\n uri: lb://ruoyi-job\n predicates:\n - Path=/schedule/**\n filters:\n - StripPrefix=1\n # 系统模块\n - id: ruoyi-system\n uri: lb://ruoyi-system\n predicates:\n - Path=/system/**\n filters:\n - StripPrefix=1\n # 文件服务\n - id: ruoyi-file\n uri: lb://ruoyi-file\n predicates:\n - Path=/file/**\n filters:\n - StripPrefix=1\n\n# 安全配置\nsecurity:\n # 验证码\n captcha:\n enabled: true\n type: math\n # 防止XSS攻击\n xss:\n enabled: true\n excludeUrls:\n - /system/notice\n # 不校验白名单\n ignore:\n whites:\n - /auth/logout\n - /auth/login\n - /auth/register\n - /*/v2/api-docs\n - /csrf\n', '57cec5abd0e0a6b77d853750344a9dc0', '2023-04-03 22:11:05', '2023-04-03 14:11:05', 'nacos', '172.21.0.1', 'U', '', NULL); +INSERT INTO `his_config_info` VALUES (3, 2, 'ruoyi-auth-dev.yml', 'DEFAULT_GROUP', '', 'spring:\n redis:\n host: localhost\n port: 6379\n password:\n', '8bd9dada9a94822feeab40de55efced6', '2023-04-03 22:11:15', '2023-04-03 14:11:16', 'nacos', '172.21.0.1', 'U', '', NULL); +INSERT INTO `his_config_info` VALUES (5, 3, 'ruoyi-system-dev.yml', 'DEFAULT_GROUP', '', '# spring配置\nspring:\n redis:\n host: localhost\n port: 6379\n password:\n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: admin\n loginPassword: 123456\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n # 主库数据源\n master:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: password\n # 从库数据源\n # slave:\n # username: \n # password: \n # url: \n # driver-class-name: \n\n# mybatis配置\nmybatis:\n # 搜索指定包别名\n typeAliasesPackage: com.ruoyi.system\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\n mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n title: 系统模块接口文档\n license: Powered By ruoyi\n licenseUrl: https://ruoyi.vip', '48e0ed4a040c402bdc2444213a82c910', '2023-04-03 22:11:45', '2023-04-03 14:11:46', 'nacos', '172.21.0.1', 'U', '', NULL); +INSERT INTO `his_config_info` VALUES (6, 4, 'ruoyi-gen-dev.yml', 'DEFAULT_GROUP', '', '# spring配置\nspring:\n redis:\n host: localhost\n port: 6379\n password:\n datasource:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: password\n\n# mybatis配置\nmybatis:\n # 搜索指定包别名\n typeAliasesPackage: com.ruoyi.gen.domain\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\n mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n title: 代码生成接口文档\n license: Powered By ruoyi\n licenseUrl: https://ruoyi.vip\n\n# 代码生成\ngen:\n # 作者\n author: ruoyi\n # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool\n packageName: com.ruoyi.system\n # 自动去除表前缀，默认是false\n autoRemovePre: false\n # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）\n tablePrefix: sys_\n', 'eb592420b3fceae1402881887b8a6a0d', '2023-04-03 22:12:06', '2023-04-03 14:12:07', 'nacos', '172.21.0.1', 'U', '', NULL); +INSERT INTO `his_config_info` VALUES (7, 5, 'ruoyi-job-dev.yml', 'DEFAULT_GROUP', '', '# spring配置\nspring:\n redis:\n host: localhost\n port: 6379\n password: \n datasource:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: password\n\n# mybatis配置\nmybatis:\n # 搜索指定包别名\n typeAliasesPackage: com.ruoyi.job.domain\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\n mapperLocations: classpath:mapper/**/*.xml\n\n# swagger配置\nswagger:\n title: 定时任务接口文档\n license: Powered By ruoyi\n licenseUrl: https://ruoyi.vip\n', 'edcf0e3fe13fea07b4ec08b1088f30b3', '2023-04-03 22:12:28', '2023-04-03 14:12:28', 'nacos', '172.21.0.1', 'U', '', NULL); + +-- ---------------------------- +-- Table structure for permissions +-- ---------------------------- +DROP TABLE IF EXISTS `permissions`; +CREATE TABLE `permissions` +( + `role` varchar(50) NOT NULL, + `resource` varchar(255) NOT NULL, + `action` varchar(8) NOT NULL, + UNIQUE KEY `uk_role_permission` (`role`, `resource`, `action`) USING BTREE +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4; + +-- ---------------------------- +-- Records of permissions +-- ---------------------------- + +-- ---------------------------- +-- Table structure for roles +-- ---------------------------- +DROP TABLE IF EXISTS `roles`; +CREATE TABLE `roles` +( + `username` varchar(50) NOT NULL, + `role` varchar(50) NOT NULL, + UNIQUE KEY `idx_user_role` (`username`, `role`) USING BTREE +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4; + +-- ---------------------------- +-- Records of roles +-- ---------------------------- +INSERT INTO `roles` +VALUES ('nacos', 'ROLE_ADMIN'); + +-- ---------------------------- +-- Table structure for tenant_capacity +-- ---------------------------- +DROP TABLE IF EXISTS `tenant_capacity`; +CREATE TABLE `tenant_capacity` +( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `tenant_id` varchar(128) COLLATE utf8_bin NOT NULL DEFAULT '' COMMENT 'Tenant ID', + `quota` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '配额，0表示使用默认值', + `usage` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '使用量', + `max_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个配置大小上限，单位为字节，0表示使用默认值', + `max_aggr_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '聚合子配置最大个数', + `max_aggr_size` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '单个聚合数据的子配置大小上限，单位为字节，0表示使用默认值', + `max_history_count` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '最大变更历史数量', + `gmt_create` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `gmt_modified` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_tenant_id` (`tenant_id`) +) ENGINE = InnoDB + DEFAULT CHARSET = utf8 + COLLATE = utf8_bin COMMENT ='租户容量信息表'; + +-- ---------------------------- +-- Records of tenant_capacity +-- ---------------------------- + +-- ---------------------------- +-- Table structure for tenant_info +-- ---------------------------- +DROP TABLE IF EXISTS `tenant_info`; +CREATE TABLE `tenant_info` +( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT 'id', + `kp` varchar(128) COLLATE utf8_bin NOT NULL COMMENT 'kp', + `tenant_id` varchar(128) COLLATE utf8_bin DEFAULT '' COMMENT 'tenant_id', + `tenant_name` varchar(128) COLLATE utf8_bin DEFAULT '' COMMENT 'tenant_name', + `tenant_desc` varchar(256) COLLATE utf8_bin DEFAULT NULL COMMENT 'tenant_desc', + `create_source` varchar(32) COLLATE utf8_bin DEFAULT NULL COMMENT 'create_source', + `gmt_create` bigint(20) NOT NULL COMMENT '创建时间', + `gmt_modified` bigint(20) NOT NULL COMMENT '修改时间', + PRIMARY KEY (`id`), + UNIQUE KEY `uk_tenant_info_kptenantid` (`kp`, `tenant_id`), + KEY `idx_tenant_id` (`tenant_id`) +) ENGINE = InnoDB + DEFAULT CHARSET = utf8 + COLLATE = utf8_bin COMMENT ='tenant_info'; + +-- ---------------------------- +-- Records of tenant_info +-- ---------------------------- + +-- ---------------------------- +-- Table structure for users +-- ---------------------------- +DROP TABLE IF EXISTS `users`; +CREATE TABLE `users` +( + `username` varchar(50) NOT NULL, + `password` varchar(500) NOT NULL, + `enabled` tinyint(1) NOT NULL, + PRIMARY KEY (`username`) +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4; + +-- ---------------------------- +-- Records of users +-- ---------------------------- +INSERT INTO `users` +VALUES ('nacos', '$2a$10$EuWPZHzz32dJN7jexM34MOeYirDdFAZm2kuWj7VEOJhhZkDrxfvUu', 1); diff --git a/docker/nacos/dockerfile b/docker/nacos/Dockerfile similarity index 100% rename from docker/nacos/dockerfile rename to docker/nacos/Dockerfile diff --git a/docker/nacos/conf/application.properties b/docker/nacos/conf/application.properties index 7f2a61f2..9db3d0cd 100644 --- a/docker/nacos/conf/application.properties +++ b/docker/nacos/conf/application.properties @@ -2,7 +2,7 @@ spring.datasource.platform=mysql db.num=1 db.url.0=jdbc:mysql://ruoyi-mysql:3306/ry-config?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC db.user=root -db.password=password +db.password=root nacos.naming.empty-service.auto-clean=true nacos.naming.empty-service.clean.initial-delay-ms=50000 diff --git a/docker/nginx/dockerfile b/docker/nginx/Dockerfile similarity index 100% rename from docker/nginx/dockerfile rename to docker/nginx/Dockerfile diff --git a/docker/nginx/conf/nginx.conf b/docker/nginx/conf/nginx.conf index 56bf0ca2..9ec952ba 100644 --- a/docker/nginx/conf/nginx.conf +++ b/docker/nginx/conf/nginx.conf @@ -33,4 +33,4 @@ http { root html; } } -}# requirepass 123456 \ No newline at end of file +} \ No newline at end of file diff --git a/docker/nginx/html/dist/readme.txt b/docker/nginx/html/dist/readme.txt deleted file mode 100644 index eea3a328..00000000 --- a/docker/nginx/html/dist/readme.txt +++ /dev/null @@ -1 +0,0 @@ -ǰruoyi-uiõľ̬ļnginxʡ \ No newline at end of file diff --git a/docker/nginx/html/readme.txt b/docker/nginx/html/readme.txt new file mode 100644 index 00000000..195570eb --- /dev/null +++ b/docker/nginx/html/readme.txt @@ -0,0 +1 @@ +distĿ¼´ǰruoyi-uiõľ̬ļnginxʡ \ No newline at end of file diff --git a/docker/redis/dockerfile b/docker/redis/Dockerfile similarity index 100% rename from docker/redis/dockerfile rename to docker/redis/Dockerfile diff --git a/docker/ruoyi/auth/dockerfile b/docker/ruoyi/auth/Dockerfile similarity index 100% rename from docker/ruoyi/auth/dockerfile rename to docker/ruoyi/auth/Dockerfile diff --git a/docker/ruoyi/gateway/dockerfile b/docker/ruoyi/gateway/Dockerfile similarity index 100% rename from docker/ruoyi/gateway/dockerfile rename to docker/ruoyi/gateway/Dockerfile diff --git a/docker/ruoyi/modules/file/dockerfile b/docker/ruoyi/modules/file/Dockerfile similarity index 100% rename from docker/ruoyi/modules/file/dockerfile rename to docker/ruoyi/modules/file/Dockerfile diff --git a/docker/ruoyi/modules/gen/dockerfile b/docker/ruoyi/modules/gen/Dockerfile similarity index 100% rename from docker/ruoyi/modules/gen/dockerfile rename to docker/ruoyi/modules/gen/Dockerfile diff --git a/docker/ruoyi/modules/job/dockerfile b/docker/ruoyi/modules/job/Dockerfile similarity index 100% rename from docker/ruoyi/modules/job/dockerfile rename to docker/ruoyi/modules/job/Dockerfile diff --git a/docker/ruoyi/modules/system/dockerfile b/docker/ruoyi/modules/system/Dockerfile similarity index 100% rename from docker/ruoyi/modules/system/dockerfile rename to docker/ruoyi/modules/system/Dockerfile diff --git a/docker/ruoyi/visual/monitor/dockerfile b/docker/ruoyi/visual/monitor/Dockerfile similarity index 100% rename from docker/ruoyi/visual/monitor/dockerfile rename to docker/ruoyi/visual/monitor/Dockerfile diff --git a/pom.xml b/pom.xml index b613ba96..3fe855e0 100644 --- a/pom.xml +++ b/pom.xml @@ -227,6 +227,24 @@ + + + Dev + + 127.0.0.1:8848 + + + + DockerCompose + + true + + + http://ruoyi-nacos:8848 + + + + @@ -238,7 +256,34 @@ ${project.build.sourceEncoding} + + + org.apache.maven.plugins + maven-resources-plugin + 3.1.0 + + UTF-8 + + @ + + false + + + + + + src/main/resources + true + + + src/main/java + + **/*.xml + + + + diff --git a/ruoyi-auth/src/main/resources/bootstrap.yml b/ruoyi-auth/src/main/resources/bootstrap.yml index f456b03c..8b85c2e3 100644 --- a/ruoyi-auth/src/main/resources/bootstrap.yml +++ b/ruoyi-auth/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: @nacos.address@ config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: @nacos.address@ # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-gateway/src/main/resources/bootstrap.yml b/ruoyi-gateway/src/main/resources/bootstrap.yml index b6dc98ae..a58adc2d 100644 --- a/ruoyi-gateway/src/main/resources/bootstrap.yml +++ b/ruoyi-gateway/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: @nacos.address@ config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: @nacos.address@ # 配置文件格式 file-extension: yml # 共享配置 @@ -33,7 +33,7 @@ spring: datasource: ds1: nacos: - server-addr: 127.0.0.1:8848 + server-addr: @nacos.address@ dataId: sentinel-ruoyi-gateway groupId: DEFAULT_GROUP data-type: json diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml index 55ff4112..a1315c87 100644 --- a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: @nacos.address@ config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: @nacos.address@ # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml index 0ef5a457..102dfb36 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: @nacos.address@ config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: @nacos.address@ # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml index b86f8c9e..869cda84 100644 --- a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: @nacos.address@ config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: @nacos.address@ # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml index 40ab7816..36b1e1b5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: @nacos.address@ config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: @nacos.address@ # 配置文件格式 file-extension: yml # 共享配置 diff --git a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml index 13d90cd7..1a79bd6e 100644 --- a/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml +++ b/ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml @@ -14,10 +14,10 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: @nacos.address@ config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: @nacos.address@ # 配置文件格式 file-extension: yml # 共享配置