diff --git a/config/nacos/application-common.yml b/config/nacos/application-common.yml index ee793c7..a1ac9ef 100644 --- a/config/nacos/application-common.yml +++ b/config/nacos/application-common.yml @@ -74,8 +74,8 @@ spring: discovery: metadata: # admin 监控账号密码 - username: ruoyi - userpassword: 123456 + username: nacos + userpassword: nacos # sentinel 配置 sentinel: # sentinel 开关 @@ -83,7 +83,7 @@ spring: transport: # dashboard控制台服务名 用于服务发现 # 如无此配置将默认使用下方 dashboard 配置直接注册 - server-name: ruoyi-sentinel-dashboard + server-name: sentinel-dashboard # 客户端指定注册的ip 用于多网卡ip不稳点使用 # client-ip: # 控制台地址 从1.3.0开始使用 server-name 注册 @@ -105,8 +105,8 @@ spring: host: localhost port: 6379 # redis 密码必须配置 - password: ruoyi123 - database: 0 + password: + database: 8 # 需要使用数字 timeout: 10000 ssl.enabled: false diff --git a/dk-api/api-resource/pom.xml b/dk-api/api-resource/pom.xml index 3c266a9..ce52724 100644 --- a/dk-api/api-resource/pom.xml +++ b/dk-api/api-resource/pom.xml @@ -9,10 +9,10 @@ 4.0.0 - ruoyi-api-resource + api-resource - ruoyi-api-resource 资源服务接口模块 + api-resource 资源服务接口模块 diff --git a/dk-api/api-system/pom.xml b/dk-api/api-system/pom.xml index 68210c7..9cd4875 100644 --- a/dk-api/api-system/pom.xml +++ b/dk-api/api-system/pom.xml @@ -9,10 +9,9 @@ 4.0.0 - ruoyi-api-system + api-system - - ruoyi-api-system系统接口模块 + api-system系统接口模块 diff --git a/dki-auth/Dockerfile b/dk-auth/Dockerfile similarity index 100% rename from dki-auth/Dockerfile rename to dk-auth/Dockerfile diff --git a/dki-auth/pom.xml b/dk-auth/pom.xml similarity index 99% rename from dki-auth/pom.xml rename to dk-auth/pom.xml index ce2c57d..0e62e3b 100644 --- a/dki-auth/pom.xml +++ b/dk-auth/pom.xml @@ -8,7 +8,7 @@ 4.0.0 - dki-auth + dk-auth ruoyi-auth 认证授权中心 diff --git a/dki-auth/src/main/java/org/dromara/auth/DKAuthApplication.java b/dk-auth/src/main/java/org/dromara/auth/DKAuthApplication.java similarity index 100% rename from dki-auth/src/main/java/org/dromara/auth/DKAuthApplication.java rename to dk-auth/src/main/java/org/dromara/auth/DKAuthApplication.java diff --git a/dki-auth/src/main/java/org/dromara/auth/captcha/UnsignedMathGenerator.java b/dk-auth/src/main/java/org/dromara/auth/captcha/UnsignedMathGenerator.java similarity index 100% rename from dki-auth/src/main/java/org/dromara/auth/captcha/UnsignedMathGenerator.java rename to dk-auth/src/main/java/org/dromara/auth/captcha/UnsignedMathGenerator.java diff --git a/dki-auth/src/main/java/org/dromara/auth/config/CaptchaConfig.java b/dk-auth/src/main/java/org/dromara/auth/config/CaptchaConfig.java similarity index 100% rename from dki-auth/src/main/java/org/dromara/auth/config/CaptchaConfig.java rename to dk-auth/src/main/java/org/dromara/auth/config/CaptchaConfig.java diff --git a/dki-auth/src/main/java/org/dromara/auth/controller/CaptchaController.java b/dk-auth/src/main/java/org/dromara/auth/controller/CaptchaController.java similarity index 100% rename from dki-auth/src/main/java/org/dromara/auth/controller/CaptchaController.java rename to dk-auth/src/main/java/org/dromara/auth/controller/CaptchaController.java diff --git a/dki-auth/src/main/java/org/dromara/auth/controller/TokenController.java b/dk-auth/src/main/java/org/dromara/auth/controller/TokenController.java similarity index 100% rename from dki-auth/src/main/java/org/dromara/auth/controller/TokenController.java rename to dk-auth/src/main/java/org/dromara/auth/controller/TokenController.java diff --git a/dki-auth/src/main/java/org/dromara/auth/domain/convert/TenantVoConvert.java b/dk-auth/src/main/java/org/dromara/auth/domain/convert/TenantVoConvert.java similarity index 100% rename from dki-auth/src/main/java/org/dromara/auth/domain/convert/TenantVoConvert.java rename to dk-auth/src/main/java/org/dromara/auth/domain/convert/TenantVoConvert.java diff --git a/dki-auth/src/main/java/org/dromara/auth/domain/vo/CaptchaVo.java b/dk-auth/src/main/java/org/dromara/auth/domain/vo/CaptchaVo.java similarity index 100% rename from dki-auth/src/main/java/org/dromara/auth/domain/vo/CaptchaVo.java rename to dk-auth/src/main/java/org/dromara/auth/domain/vo/CaptchaVo.java diff --git a/dki-auth/src/main/java/org/dromara/auth/domain/vo/LoginTenantVo.java b/dk-auth/src/main/java/org/dromara/auth/domain/vo/LoginTenantVo.java similarity index 100% rename from dki-auth/src/main/java/org/dromara/auth/domain/vo/LoginTenantVo.java rename to dk-auth/src/main/java/org/dromara/auth/domain/vo/LoginTenantVo.java diff --git a/dki-auth/src/main/java/org/dromara/auth/domain/vo/LoginVo.java b/dk-auth/src/main/java/org/dromara/auth/domain/vo/LoginVo.java similarity index 100% rename from dki-auth/src/main/java/org/dromara/auth/domain/vo/LoginVo.java rename to dk-auth/src/main/java/org/dromara/auth/domain/vo/LoginVo.java diff --git a/dki-auth/src/main/java/org/dromara/auth/domain/vo/TenantListVo.java b/dk-auth/src/main/java/org/dromara/auth/domain/vo/TenantListVo.java similarity index 100% rename from dki-auth/src/main/java/org/dromara/auth/domain/vo/TenantListVo.java rename to dk-auth/src/main/java/org/dromara/auth/domain/vo/TenantListVo.java diff --git a/dki-auth/src/main/java/org/dromara/auth/enums/CaptchaCategory.java b/dk-auth/src/main/java/org/dromara/auth/enums/CaptchaCategory.java similarity index 100% rename from dki-auth/src/main/java/org/dromara/auth/enums/CaptchaCategory.java rename to dk-auth/src/main/java/org/dromara/auth/enums/CaptchaCategory.java diff --git a/dki-auth/src/main/java/org/dromara/auth/enums/CaptchaType.java b/dk-auth/src/main/java/org/dromara/auth/enums/CaptchaType.java similarity index 100% rename from dki-auth/src/main/java/org/dromara/auth/enums/CaptchaType.java rename to dk-auth/src/main/java/org/dromara/auth/enums/CaptchaType.java diff --git a/dki-auth/src/main/java/org/dromara/auth/form/EmailLoginBody.java b/dk-auth/src/main/java/org/dromara/auth/form/EmailLoginBody.java similarity index 100% rename from dki-auth/src/main/java/org/dromara/auth/form/EmailLoginBody.java rename to dk-auth/src/main/java/org/dromara/auth/form/EmailLoginBody.java diff --git a/dki-auth/src/main/java/org/dromara/auth/form/PasswordLoginBody.java b/dk-auth/src/main/java/org/dromara/auth/form/PasswordLoginBody.java similarity index 100% rename from dki-auth/src/main/java/org/dromara/auth/form/PasswordLoginBody.java rename to dk-auth/src/main/java/org/dromara/auth/form/PasswordLoginBody.java diff --git a/dki-auth/src/main/java/org/dromara/auth/form/RegisterBody.java b/dk-auth/src/main/java/org/dromara/auth/form/RegisterBody.java similarity index 100% rename from dki-auth/src/main/java/org/dromara/auth/form/RegisterBody.java rename to dk-auth/src/main/java/org/dromara/auth/form/RegisterBody.java diff --git a/dki-auth/src/main/java/org/dromara/auth/form/SmsLoginBody.java b/dk-auth/src/main/java/org/dromara/auth/form/SmsLoginBody.java similarity index 100% rename from dki-auth/src/main/java/org/dromara/auth/form/SmsLoginBody.java rename to dk-auth/src/main/java/org/dromara/auth/form/SmsLoginBody.java diff --git a/dki-auth/src/main/java/org/dromara/auth/form/SocialLoginBody.java b/dk-auth/src/main/java/org/dromara/auth/form/SocialLoginBody.java similarity index 100% rename from dki-auth/src/main/java/org/dromara/auth/form/SocialLoginBody.java rename to dk-auth/src/main/java/org/dromara/auth/form/SocialLoginBody.java diff --git a/dki-auth/src/main/java/org/dromara/auth/form/XcxLoginBody.java b/dk-auth/src/main/java/org/dromara/auth/form/XcxLoginBody.java similarity index 100% rename from dki-auth/src/main/java/org/dromara/auth/form/XcxLoginBody.java rename to dk-auth/src/main/java/org/dromara/auth/form/XcxLoginBody.java diff --git a/dki-auth/src/main/java/org/dromara/auth/listener/UserActionListener.java b/dk-auth/src/main/java/org/dromara/auth/listener/UserActionListener.java similarity index 100% rename from dki-auth/src/main/java/org/dromara/auth/listener/UserActionListener.java rename to dk-auth/src/main/java/org/dromara/auth/listener/UserActionListener.java diff --git a/dki-auth/src/main/java/org/dromara/auth/properties/CaptchaProperties.java b/dk-auth/src/main/java/org/dromara/auth/properties/CaptchaProperties.java similarity index 100% rename from dki-auth/src/main/java/org/dromara/auth/properties/CaptchaProperties.java rename to dk-auth/src/main/java/org/dromara/auth/properties/CaptchaProperties.java diff --git a/dki-auth/src/main/java/org/dromara/auth/properties/UserPasswordProperties.java b/dk-auth/src/main/java/org/dromara/auth/properties/UserPasswordProperties.java similarity index 100% rename from dki-auth/src/main/java/org/dromara/auth/properties/UserPasswordProperties.java rename to dk-auth/src/main/java/org/dromara/auth/properties/UserPasswordProperties.java diff --git a/dki-auth/src/main/java/org/dromara/auth/service/IAuthStrategy.java b/dk-auth/src/main/java/org/dromara/auth/service/IAuthStrategy.java similarity index 100% rename from dki-auth/src/main/java/org/dromara/auth/service/IAuthStrategy.java rename to dk-auth/src/main/java/org/dromara/auth/service/IAuthStrategy.java diff --git a/dki-auth/src/main/java/org/dromara/auth/service/SysLoginService.java b/dk-auth/src/main/java/org/dromara/auth/service/SysLoginService.java similarity index 100% rename from dki-auth/src/main/java/org/dromara/auth/service/SysLoginService.java rename to dk-auth/src/main/java/org/dromara/auth/service/SysLoginService.java diff --git a/dki-auth/src/main/java/org/dromara/auth/service/impl/EmailAuthStrategy.java b/dk-auth/src/main/java/org/dromara/auth/service/impl/EmailAuthStrategy.java similarity index 100% rename from dki-auth/src/main/java/org/dromara/auth/service/impl/EmailAuthStrategy.java rename to dk-auth/src/main/java/org/dromara/auth/service/impl/EmailAuthStrategy.java diff --git a/dki-auth/src/main/java/org/dromara/auth/service/impl/PasswordAuthStrategy.java b/dk-auth/src/main/java/org/dromara/auth/service/impl/PasswordAuthStrategy.java similarity index 100% rename from dki-auth/src/main/java/org/dromara/auth/service/impl/PasswordAuthStrategy.java rename to dk-auth/src/main/java/org/dromara/auth/service/impl/PasswordAuthStrategy.java diff --git a/dki-auth/src/main/java/org/dromara/auth/service/impl/SmsAuthStrategy.java b/dk-auth/src/main/java/org/dromara/auth/service/impl/SmsAuthStrategy.java similarity index 100% rename from dki-auth/src/main/java/org/dromara/auth/service/impl/SmsAuthStrategy.java rename to dk-auth/src/main/java/org/dromara/auth/service/impl/SmsAuthStrategy.java diff --git a/dki-auth/src/main/java/org/dromara/auth/service/impl/SocialAuthStrategy.java b/dk-auth/src/main/java/org/dromara/auth/service/impl/SocialAuthStrategy.java similarity index 100% rename from dki-auth/src/main/java/org/dromara/auth/service/impl/SocialAuthStrategy.java rename to dk-auth/src/main/java/org/dromara/auth/service/impl/SocialAuthStrategy.java diff --git a/dki-auth/src/main/java/org/dromara/auth/service/impl/XcxAuthStrategy.java b/dk-auth/src/main/java/org/dromara/auth/service/impl/XcxAuthStrategy.java similarity index 100% rename from dki-auth/src/main/java/org/dromara/auth/service/impl/XcxAuthStrategy.java rename to dk-auth/src/main/java/org/dromara/auth/service/impl/XcxAuthStrategy.java diff --git a/dki-auth/src/main/resources/application.yml b/dk-auth/src/main/resources/application.yml similarity index 97% rename from dki-auth/src/main/resources/application.yml rename to dk-auth/src/main/resources/application.yml index 8a8aed8..d1886f8 100644 --- a/dki-auth/src/main/resources/application.yml +++ b/dk-auth/src/main/resources/application.yml @@ -6,7 +6,7 @@ server: spring: application: # 应用名称 - name: auth + name: dk-auth profiles: # 环境配置 active: @profiles.active@ diff --git a/dki-auth/src/main/resources/banner.txt b/dk-auth/src/main/resources/banner.txt similarity index 100% rename from dki-auth/src/main/resources/banner.txt rename to dk-auth/src/main/resources/banner.txt diff --git a/dki-auth/src/main/resources/logback-plus.xml b/dk-auth/src/main/resources/logback-plus.xml similarity index 100% rename from dki-auth/src/main/resources/logback-plus.xml rename to dk-auth/src/main/resources/logback-plus.xml diff --git a/dk-common/common-nacos/pom.xml b/dk-common/common-nacos/pom.xml index 213ae74..81b53a6 100644 --- a/dk-common/common-nacos/pom.xml +++ b/dk-common/common-nacos/pom.xml @@ -11,7 +11,7 @@ common-nacos - ruoyi-common-nacos 配置中心 + common-nacos 配置中心 diff --git a/dk-example/demo/pom.xml b/dk-example/demo/pom.xml index d75da86..0ec1690 100644 --- a/dk-example/demo/pom.xml +++ b/dk-example/demo/pom.xml @@ -12,7 +12,7 @@ demo - ruoyi-demo 演示模块 + demo 演示模块 diff --git a/dk-example/demo/src/main/resources/application.yml b/dk-example/demo/src/main/resources/application.yml index 711df67..3d5c70d 100644 --- a/dk-example/demo/src/main/resources/application.yml +++ b/dk-example/demo/src/main/resources/application.yml @@ -6,7 +6,7 @@ server: spring: application: # 应用名称 - name: ruoyi-demo + name: demo profiles: # 环境配置 active: @profiles.active@ diff --git a/dk-gateway/src/main/java/org/dromara/gateway/RuoYiGatewayApplication.java b/dk-gateway/src/main/java/org/dromara/gateway/DKGatewayApplication.java similarity index 85% rename from dk-gateway/src/main/java/org/dromara/gateway/RuoYiGatewayApplication.java rename to dk-gateway/src/main/java/org/dromara/gateway/DKGatewayApplication.java index 4f64453..44df386 100644 --- a/dk-gateway/src/main/java/org/dromara/gateway/RuoYiGatewayApplication.java +++ b/dk-gateway/src/main/java/org/dromara/gateway/DKGatewayApplication.java @@ -11,11 +11,11 @@ import org.springframework.boot.context.metrics.buffering.BufferingApplicationSt * @author ruoyi */ @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) -public class RuoYiGatewayApplication { +public class DKGatewayApplication { public static void main(String[] args) { // 标记 sentinel 类型为 网关 System.setProperty("csp.sentinel.app.type", "1"); - SpringApplication application = new SpringApplication(RuoYiGatewayApplication.class); + SpringApplication application = new SpringApplication(DKGatewayApplication.class); application.setApplicationStartup(new BufferingApplicationStartup(2048)); application.run(args); System.out.println("(♥◠‿◠)ﾉﾞ 网关启动成功 ლ(´ڡ`ლ)ﾞ "); diff --git a/dk-modules/system/src/main/resources/application.yml b/dk-modules/system/src/main/resources/application.yml index 866b643..e070438 100644 --- a/dk-modules/system/src/main/resources/application.yml +++ b/dk-modules/system/src/main/resources/application.yml @@ -6,7 +6,7 @@ server: spring: application: # 应用名称 - name: system + name: dk-system profiles: # 环境配置 active: @profiles.active@ diff --git a/pom.xml b/pom.xml index ff62fbc..195cfda 100644 --- a/pom.xml +++ b/pom.xml @@ -73,12 +73,12 @@ dev - 127.0.0.1:8848 + 114.235.183.147:8848 DEFAULT_GROUP DEFAULT_GROUP nacos nacos - 127.0.0.1:4560 + 114.235.183.147:4560 @@ -89,12 +89,12 @@ prod prod - 127.0.0.1:8848 + 114.235.183.147:8848 DEFAULT_GROUP DEFAULT_GROUP nacos nacos - 127.0.0.1:4560 + 114.235.183.147:4560 @@ -375,7 +375,7 @@ - dki-auth + dk-auth dk-gateway dk-visual dk-modules diff --git a/sql/dk-config.sql b/sql/dk-config.sql index 0b5623f..1219120 100644 --- a/sql/dk-config.sql +++ b/sql/dk-config.sql @@ -1,6 +1,4 @@ -DROP DATABASE IF EXISTS `dk-config`; -CREATE DATABASE `dk-config` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; SET NAMES utf8mb4; SET FOREIGN_KEY_CHECKS = 0; diff --git a/sql/dk-seata.sql b/sql/dk-seata.sql index b95613c..d64c6f7 100644 --- a/sql/dk-seata.sql +++ b/sql/dk-seata.sql @@ -1,11 +1,11 @@ -DROP DATABASE IF EXISTS `ry-seata`; +DROP DATABASE IF EXISTS `dk_seata`; -CREATE DATABASE `ry-seata` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; +CREATE DATABASE `dk_seata` DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci; SET NAMES utf8mb4; SET FOREIGN_KEY_CHECKS = 0; -USE `ry-seata`; +USE `dk_seata`; -- -------------------------------- The script used when storeMode is 'db' -------------------------------- -- the table to store GlobalSession data