From 0e254be6e22e5ee387606b5f77c7069e195b1a03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Thu, 30 Dec 2021 18:38:54 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=8A=BD=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/README.md | 1 + {sql/contentYml => config}/application-dev.yml | 1 - config/ruoyi-auth-dev.yml | 0 {sql/contentYml => config}/ruoyi-file-dev.yml | 1 - .../ruoyi-gateway-dev.yml | 1 - {sql/contentYml => config}/ruoyi-gen-dev.yml | 1 - {sql/contentYml => config}/ruoyi-job-dev.yml | 1 - .../ruoyi-monitor-dev.yml | 1 - .../contentYml => config}/ruoyi-system-dev.yml | 1 - .../sentinel-ruoyi-gateway.json | 0 sql/contentYml/ruoyi-auth-dev.yml | 1 - sql/ry_config_20211118.sql | 18 +++++++++--------- 12 files changed, 10 insertions(+), 17 deletions(-) create mode 100644 config/README.md rename {sql/contentYml => config}/application-dev.yml (98%) create mode 100644 config/ruoyi-auth-dev.yml rename {sql/contentYml => config}/ruoyi-file-dev.yml (83%) rename {sql/contentYml => config}/ruoyi-gateway-dev.yml (96%) rename {sql/contentYml => config}/ruoyi-gen-dev.yml (94%) rename {sql/contentYml => config}/ruoyi-job-dev.yml (92%) rename {sql/contentYml => config}/ruoyi-monitor-dev.yml (52%) rename {sql/contentYml => config}/ruoyi-system-dev.yml (96%) rename {sql/contentYml => config}/sentinel-ruoyi-gateway.json (100%) delete mode 100644 sql/contentYml/ruoyi-auth-dev.yml diff --git a/config/README.md b/config/README.md new file mode 100644 index 00000000..8b7b94d4 --- /dev/null +++ b/config/README.md @@ -0,0 +1 @@ +# 将此文件夹下所有配置文件内容复制到 `nacos` 对应的配置中 \ No newline at end of file diff --git a/sql/contentYml/application-dev.yml b/config/application-dev.yml similarity index 98% rename from sql/contentYml/application-dev.yml rename to config/application-dev.yml index aec815c2..055055ab 100644 --- a/sql/contentYml/application-dev.yml +++ b/config/application-dev.yml @@ -1,4 +1,3 @@ -# 将此内容填入nacos对应的配置内容中 spring: main: allow-bean-definition-overriding: true diff --git a/config/ruoyi-auth-dev.yml b/config/ruoyi-auth-dev.yml new file mode 100644 index 00000000..e69de29b diff --git a/sql/contentYml/ruoyi-file-dev.yml b/config/ruoyi-file-dev.yml similarity index 83% rename from sql/contentYml/ruoyi-file-dev.yml rename to config/ruoyi-file-dev.yml index 8c6ff981..9d8847d0 100644 --- a/sql/contentYml/ruoyi-file-dev.yml +++ b/config/ruoyi-file-dev.yml @@ -1,4 +1,3 @@ -# 将此内容填入nacos对应的配置内容中 # 本地文件上传 file: domain: http://127.0.0.1:9300 diff --git a/sql/contentYml/ruoyi-gateway-dev.yml b/config/ruoyi-gateway-dev.yml similarity index 96% rename from sql/contentYml/ruoyi-gateway-dev.yml rename to config/ruoyi-gateway-dev.yml index f067eb90..e39a893f 100644 --- a/sql/contentYml/ruoyi-gateway-dev.yml +++ b/config/ruoyi-gateway-dev.yml @@ -1,4 +1,3 @@ -# 将此内容填入nacos对应的配置内容中 spring: cloud: gateway: diff --git a/sql/contentYml/ruoyi-gen-dev.yml b/config/ruoyi-gen-dev.yml similarity index 94% rename from sql/contentYml/ruoyi-gen-dev.yml rename to config/ruoyi-gen-dev.yml index 5c29ef45..981b1605 100644 --- a/sql/contentYml/ruoyi-gen-dev.yml +++ b/config/ruoyi-gen-dev.yml @@ -1,4 +1,3 @@ -# 将此内容填入nacos对应的配置内容中 spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver diff --git a/sql/contentYml/ruoyi-job-dev.yml b/config/ruoyi-job-dev.yml similarity index 92% rename from sql/contentYml/ruoyi-job-dev.yml rename to config/ruoyi-job-dev.yml index 84b51b4b..ed23262b 100644 --- a/sql/contentYml/ruoyi-job-dev.yml +++ b/config/ruoyi-job-dev.yml @@ -1,4 +1,3 @@ -# 将此内容填入nacos对应的配置内容中 spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver diff --git a/sql/contentYml/ruoyi-monitor-dev.yml b/config/ruoyi-monitor-dev.yml similarity index 52% rename from sql/contentYml/ruoyi-monitor-dev.yml rename to config/ruoyi-monitor-dev.yml index a7e590b6..4fcf2bbc 100644 --- a/sql/contentYml/ruoyi-monitor-dev.yml +++ b/config/ruoyi-monitor-dev.yml @@ -1,4 +1,3 @@ -# 将此内容填入nacos对应的配置内容中 spring: security: user: diff --git a/sql/contentYml/ruoyi-system-dev.yml b/config/ruoyi-system-dev.yml similarity index 96% rename from sql/contentYml/ruoyi-system-dev.yml rename to config/ruoyi-system-dev.yml index b1023b71..d16f901b 100644 --- a/sql/contentYml/ruoyi-system-dev.yml +++ b/config/ruoyi-system-dev.yml @@ -1,4 +1,3 @@ -# 将此内容填入nacos对应的配置内容中 spring: datasource: druid: diff --git a/sql/contentYml/sentinel-ruoyi-gateway.json b/config/sentinel-ruoyi-gateway.json similarity index 100% rename from sql/contentYml/sentinel-ruoyi-gateway.json rename to config/sentinel-ruoyi-gateway.json diff --git a/sql/contentYml/ruoyi-auth-dev.yml b/sql/contentYml/ruoyi-auth-dev.yml deleted file mode 100644 index bcaff680..00000000 --- a/sql/contentYml/ruoyi-auth-dev.yml +++ /dev/null @@ -1 +0,0 @@ -# 将此内容填入nacos对应的配置内容中 diff --git a/sql/ry_config_20211118.sql b/sql/ry_config_20211118.sql index 342a2673..920477fd 100644 --- a/sql/ry_config_20211118.sql +++ b/sql/ry_config_20211118.sql @@ -32,15 +32,15 @@ CREATE TABLE `config_info` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='config_info'; insert into config_info(id, data_id, group_id, content, md5, gmt_create, gmt_modified, src_user, src_ip, app_name, tenant_id, c_desc, c_use, effect, type, c_schema) values -(1,'application-dev.yml','DEFAULT_GROUP','# 将项目路径：sql/contentYml/下对应文件中内容复制到此处\n','760986157e62a0c1e0dadf9d2a6acf40','2019-11-29 16:31:20','2021-11-16 12:03:58','','0:0:0:0:0:0:0:1','','','通用配置','null','null','yaml','null'), -(2,'ruoyi-gateway-dev.yml','DEFAULT_GROUP','# 将项目路径：sql/contentYml/下对应文件中内容复制到此处\n','2f5a6b5a4ccf20b5801c5cf842456ec6','2020-05-14 14:17:55','2021-07-30 09:07:14',NULL,'0:0:0:0:0:0:0:1','','','网关模块','null','null','yaml','null'), -(3,'ruoyi-auth-dev.yml','DEFAULT_GROUP','# 将项目路径：sql/contentYml/下对应文件中内容复制到此处\n','b7354e1eb62c2d846d44a796d9ec6930','2020-11-20 00:00:00','2021-02-28 21:06:58',NULL,'0:0:0:0:0:0:0:1','','','认证中心','null','null','yaml','null'), -(4,'ruoyi-monitor-dev.yml','DEFAULT_GROUP','# 将项目路径：sql/contentYml/下对应文件中内容复制到此处\n','d8997d0707a2fd5d9fc4e8409da38129','2020-11-20 00:00:00','2020-12-21 16:28:07',NULL,'0:0:0:0:0:0:0:1','','','监控中心','null','null','yaml','null'), -(5,'ruoyi-system-dev.yml','DEFAULT_GROUP','# 将项目路径：sql/contentYml/下对应文件中内容复制到此处\n','ac8913dee679e65bb7d482df5f267d4e','2020-11-20 00:00:00','2021-01-27 10:42:25',NULL,'0:0:0:0:0:0:0:1','','','系统模块','null','null','yaml','null'), -(6,'ruoyi-gen-dev.yml','DEFAULT_GROUP','# 将项目路径：sql/contentYml/下对应文件中内容复制到此处\n','8c79f64a4cca9b821a03dc8b27a2d8eb','2020-11-20 00:00:00','2021-01-26 10:36:45',NULL,'0:0:0:0:0:0:0:1','','','代码生成','null','null','yaml','null'), -(7,'ruoyi-job-dev.yml','DEFAULT_GROUP','# 将项目路径：sql/contentYml/下对应文件中内容复制到此处\n','d6dfade9a2c93c463ae857cd503cb172','2020-11-20 00:00:00','2021-01-26 10:36:04',NULL,'0:0:0:0:0:0:0:1','','','定时任务','null','null','yaml','null'), -(8,'ruoyi-file-dev.yml','DEFAULT_GROUP','# 将项目路径：sql/contentYml/下对应文件中内容复制到此处\n','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'), -(9,'sentinel-ruoyi-gateway','DEFAULT_GROUP','# 将项目路径：sql/contentYml/下对应文件中内容复制到此处\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'); +(1,'application-dev.yml','DEFAULT_GROUP','# 将项目路径：config/下对应文件中内容复制到此处\n','760986157e62a0c1e0dadf9d2a6acf40','2019-11-29 16:31:20','2021-11-16 12:03:58','','0:0:0:0:0:0:0:1','','','通用配置','null','null','yaml','null'), +(2,'ruoyi-gateway-dev.yml','DEFAULT_GROUP','# 将项目路径：config/下对应文件中内容复制到此处\n','2f5a6b5a4ccf20b5801c5cf842456ec6','2020-05-14 14:17:55','2021-07-30 09:07:14',NULL,'0:0:0:0:0:0:0:1','','','网关模块','null','null','yaml','null'), +(3,'ruoyi-auth-dev.yml','DEFAULT_GROUP','# 将项目路径：config/下对应文件中内容复制到此处\n','b7354e1eb62c2d846d44a796d9ec6930','2020-11-20 00:00:00','2021-02-28 21:06:58',NULL,'0:0:0:0:0:0:0:1','','','认证中心','null','null','yaml','null'), +(4,'ruoyi-monitor-dev.yml','DEFAULT_GROUP','# 将项目路径：config/下对应文件中内容复制到此处\n','d8997d0707a2fd5d9fc4e8409da38129','2020-11-20 00:00:00','2020-12-21 16:28:07',NULL,'0:0:0:0:0:0:0:1','','','监控中心','null','null','yaml','null'), +(5,'ruoyi-system-dev.yml','DEFAULT_GROUP','# 将项目路径：config/下对应文件中内容复制到此处\n','ac8913dee679e65bb7d482df5f267d4e','2020-11-20 00:00:00','2021-01-27 10:42:25',NULL,'0:0:0:0:0:0:0:1','','','系统模块','null','null','yaml','null'), +(6,'ruoyi-gen-dev.yml','DEFAULT_GROUP','# 将项目路径：config/下对应文件中内容复制到此处\n','8c79f64a4cca9b821a03dc8b27a2d8eb','2020-11-20 00:00:00','2021-01-26 10:36:45',NULL,'0:0:0:0:0:0:0:1','','','代码生成','null','null','yaml','null'), +(7,'ruoyi-job-dev.yml','DEFAULT_GROUP','# 将项目路径：config/下对应文件中内容复制到此处\n','d6dfade9a2c93c463ae857cd503cb172','2020-11-20 00:00:00','2021-01-26 10:36:04',NULL,'0:0:0:0:0:0:0:1','','','定时任务','null','null','yaml','null'), +(8,'ruoyi-file-dev.yml','DEFAULT_GROUP','# 将项目路径：config/下对应文件中内容复制到此处\n','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'), +(9,'sentinel-ruoyi-gateway','DEFAULT_GROUP','# 将项目路径：config/下对应文件中内容复制到此处\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'); /******************************************/