Browse Source

提交

pull/1/head
袁强 5 months ago
parent
commit
b7f23dc59e
  1. 10
      config/nacos/application-common.yml
  2. 4
      dk-api/api-resource/pom.xml
  3. 5
      dk-api/api-system/pom.xml
  4. 0
      dk-auth/Dockerfile
  5. 2
      dk-auth/pom.xml
  6. 0
      dk-auth/src/main/java/org/dromara/auth/DKAuthApplication.java
  7. 0
      dk-auth/src/main/java/org/dromara/auth/captcha/UnsignedMathGenerator.java
  8. 0
      dk-auth/src/main/java/org/dromara/auth/config/CaptchaConfig.java
  9. 0
      dk-auth/src/main/java/org/dromara/auth/controller/CaptchaController.java
  10. 0
      dk-auth/src/main/java/org/dromara/auth/controller/TokenController.java
  11. 0
      dk-auth/src/main/java/org/dromara/auth/domain/convert/TenantVoConvert.java
  12. 0
      dk-auth/src/main/java/org/dromara/auth/domain/vo/CaptchaVo.java
  13. 0
      dk-auth/src/main/java/org/dromara/auth/domain/vo/LoginTenantVo.java
  14. 0
      dk-auth/src/main/java/org/dromara/auth/domain/vo/LoginVo.java
  15. 0
      dk-auth/src/main/java/org/dromara/auth/domain/vo/TenantListVo.java
  16. 0
      dk-auth/src/main/java/org/dromara/auth/enums/CaptchaCategory.java
  17. 0
      dk-auth/src/main/java/org/dromara/auth/enums/CaptchaType.java
  18. 0
      dk-auth/src/main/java/org/dromara/auth/form/EmailLoginBody.java
  19. 0
      dk-auth/src/main/java/org/dromara/auth/form/PasswordLoginBody.java
  20. 0
      dk-auth/src/main/java/org/dromara/auth/form/RegisterBody.java
  21. 0
      dk-auth/src/main/java/org/dromara/auth/form/SmsLoginBody.java
  22. 0
      dk-auth/src/main/java/org/dromara/auth/form/SocialLoginBody.java
  23. 0
      dk-auth/src/main/java/org/dromara/auth/form/XcxLoginBody.java
  24. 0
      dk-auth/src/main/java/org/dromara/auth/listener/UserActionListener.java
  25. 0
      dk-auth/src/main/java/org/dromara/auth/properties/CaptchaProperties.java
  26. 0
      dk-auth/src/main/java/org/dromara/auth/properties/UserPasswordProperties.java
  27. 0
      dk-auth/src/main/java/org/dromara/auth/service/IAuthStrategy.java
  28. 0
      dk-auth/src/main/java/org/dromara/auth/service/SysLoginService.java
  29. 0
      dk-auth/src/main/java/org/dromara/auth/service/impl/EmailAuthStrategy.java
  30. 0
      dk-auth/src/main/java/org/dromara/auth/service/impl/PasswordAuthStrategy.java
  31. 0
      dk-auth/src/main/java/org/dromara/auth/service/impl/SmsAuthStrategy.java
  32. 0
      dk-auth/src/main/java/org/dromara/auth/service/impl/SocialAuthStrategy.java
  33. 0
      dk-auth/src/main/java/org/dromara/auth/service/impl/XcxAuthStrategy.java
  34. 2
      dk-auth/src/main/resources/application.yml
  35. 0
      dk-auth/src/main/resources/banner.txt
  36. 0
      dk-auth/src/main/resources/logback-plus.xml
  37. 2
      dk-common/common-nacos/pom.xml
  38. 2
      dk-example/demo/pom.xml
  39. 2
      dk-example/demo/src/main/resources/application.yml
  40. 4
      dk-gateway/src/main/java/org/dromara/gateway/DKGatewayApplication.java
  41. 2
      dk-modules/system/src/main/resources/application.yml
  42. 10
      pom.xml
  43. 2
      sql/dk-config.sql
  44. 6
      sql/dk-seata.sql

10
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

4
dk-api/api-resource/pom.xml

@ -9,10 +9,10 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ruoyi-api-resource</artifactId>
<artifactId>api-resource</artifactId>
<description>
ruoyi-api-resource 资源服务接口模块
api-resource 资源服务接口模块
</description>
<dependencies>

5
dk-api/api-system/pom.xml

@ -9,10 +9,9 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ruoyi-api-system</artifactId>
<artifactId>api-system</artifactId>
<description>
ruoyi-api-system系统接口模块
<description>api-system系统接口模块
</description>
<dependencies>

0
dki-auth/Dockerfile → dk-auth/Dockerfile

2
dki-auth/pom.xml → dk-auth/pom.xml

@ -8,7 +8,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>dki-auth</artifactId>
<artifactId>dk-auth</artifactId>
<description>
ruoyi-auth 认证授权中心

0
dki-auth/src/main/java/org/dromara/auth/DKAuthApplication.java → dk-auth/src/main/java/org/dromara/auth/DKAuthApplication.java

0
dki-auth/src/main/java/org/dromara/auth/captcha/UnsignedMathGenerator.java → dk-auth/src/main/java/org/dromara/auth/captcha/UnsignedMathGenerator.java

0
dki-auth/src/main/java/org/dromara/auth/config/CaptchaConfig.java → dk-auth/src/main/java/org/dromara/auth/config/CaptchaConfig.java

0
dki-auth/src/main/java/org/dromara/auth/controller/CaptchaController.java → dk-auth/src/main/java/org/dromara/auth/controller/CaptchaController.java

0
dki-auth/src/main/java/org/dromara/auth/controller/TokenController.java → dk-auth/src/main/java/org/dromara/auth/controller/TokenController.java

0
dki-auth/src/main/java/org/dromara/auth/domain/convert/TenantVoConvert.java → dk-auth/src/main/java/org/dromara/auth/domain/convert/TenantVoConvert.java

0
dki-auth/src/main/java/org/dromara/auth/domain/vo/CaptchaVo.java → dk-auth/src/main/java/org/dromara/auth/domain/vo/CaptchaVo.java

0
dki-auth/src/main/java/org/dromara/auth/domain/vo/LoginTenantVo.java → dk-auth/src/main/java/org/dromara/auth/domain/vo/LoginTenantVo.java

0
dki-auth/src/main/java/org/dromara/auth/domain/vo/LoginVo.java → dk-auth/src/main/java/org/dromara/auth/domain/vo/LoginVo.java

0
dki-auth/src/main/java/org/dromara/auth/domain/vo/TenantListVo.java → dk-auth/src/main/java/org/dromara/auth/domain/vo/TenantListVo.java

0
dki-auth/src/main/java/org/dromara/auth/enums/CaptchaCategory.java → dk-auth/src/main/java/org/dromara/auth/enums/CaptchaCategory.java

0
dki-auth/src/main/java/org/dromara/auth/enums/CaptchaType.java → dk-auth/src/main/java/org/dromara/auth/enums/CaptchaType.java

0
dki-auth/src/main/java/org/dromara/auth/form/EmailLoginBody.java → dk-auth/src/main/java/org/dromara/auth/form/EmailLoginBody.java

0
dki-auth/src/main/java/org/dromara/auth/form/PasswordLoginBody.java → dk-auth/src/main/java/org/dromara/auth/form/PasswordLoginBody.java

0
dki-auth/src/main/java/org/dromara/auth/form/RegisterBody.java → dk-auth/src/main/java/org/dromara/auth/form/RegisterBody.java

0
dki-auth/src/main/java/org/dromara/auth/form/SmsLoginBody.java → dk-auth/src/main/java/org/dromara/auth/form/SmsLoginBody.java

0
dki-auth/src/main/java/org/dromara/auth/form/SocialLoginBody.java → dk-auth/src/main/java/org/dromara/auth/form/SocialLoginBody.java

0
dki-auth/src/main/java/org/dromara/auth/form/XcxLoginBody.java → dk-auth/src/main/java/org/dromara/auth/form/XcxLoginBody.java

0
dki-auth/src/main/java/org/dromara/auth/listener/UserActionListener.java → dk-auth/src/main/java/org/dromara/auth/listener/UserActionListener.java

0
dki-auth/src/main/java/org/dromara/auth/properties/CaptchaProperties.java → dk-auth/src/main/java/org/dromara/auth/properties/CaptchaProperties.java

0
dki-auth/src/main/java/org/dromara/auth/properties/UserPasswordProperties.java → dk-auth/src/main/java/org/dromara/auth/properties/UserPasswordProperties.java

0
dki-auth/src/main/java/org/dromara/auth/service/IAuthStrategy.java → dk-auth/src/main/java/org/dromara/auth/service/IAuthStrategy.java

0
dki-auth/src/main/java/org/dromara/auth/service/SysLoginService.java → dk-auth/src/main/java/org/dromara/auth/service/SysLoginService.java

0
dki-auth/src/main/java/org/dromara/auth/service/impl/EmailAuthStrategy.java → dk-auth/src/main/java/org/dromara/auth/service/impl/EmailAuthStrategy.java

0
dki-auth/src/main/java/org/dromara/auth/service/impl/PasswordAuthStrategy.java → dk-auth/src/main/java/org/dromara/auth/service/impl/PasswordAuthStrategy.java

0
dki-auth/src/main/java/org/dromara/auth/service/impl/SmsAuthStrategy.java → dk-auth/src/main/java/org/dromara/auth/service/impl/SmsAuthStrategy.java

0
dki-auth/src/main/java/org/dromara/auth/service/impl/SocialAuthStrategy.java → dk-auth/src/main/java/org/dromara/auth/service/impl/SocialAuthStrategy.java

0
dki-auth/src/main/java/org/dromara/auth/service/impl/XcxAuthStrategy.java → dk-auth/src/main/java/org/dromara/auth/service/impl/XcxAuthStrategy.java

2
dki-auth/src/main/resources/application.yml → dk-auth/src/main/resources/application.yml

@ -6,7 +6,7 @@ server:
spring:
application:
# 应用名称
name: auth
name: dk-auth
profiles:
# 环境配置
active: @profiles.active@

0
dki-auth/src/main/resources/banner.txt → dk-auth/src/main/resources/banner.txt

0
dki-auth/src/main/resources/logback-plus.xml → dk-auth/src/main/resources/logback-plus.xml

2
dk-common/common-nacos/pom.xml

@ -11,7 +11,7 @@
<artifactId>common-nacos</artifactId>
<description>
ruoyi-common-nacos 配置中心
common-nacos 配置中心
</description>
<dependencies>

2
dk-example/demo/pom.xml

@ -12,7 +12,7 @@
<artifactId>demo</artifactId>
<description>
ruoyi-demo 演示模块
demo 演示模块
</description>
<dependencies>

2
dk-example/demo/src/main/resources/application.yml

@ -6,7 +6,7 @@ server:
spring:
application:
# 应用名称
name: ruoyi-demo
name: demo
profiles:
# 环境配置
active: @profiles.active@

4
dk-gateway/src/main/java/org/dromara/gateway/RuoYiGatewayApplication.java → 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("(♥◠‿◠)ノ゙ 网关启动成功 ლ(´ڡ`ლ)゙ ");

2
dk-modules/system/src/main/resources/application.yml

@ -6,7 +6,7 @@ server:
spring:
application:
# 应用名称
name: system
name: dk-system
profiles:
# 环境配置
active: @profiles.active@

10
pom.xml

@ -73,12 +73,12 @@
<properties>
<!-- 环境标识,需要与配置文件的名称相对应 -->
<profiles.active>dev</profiles.active>
<nacos.server>127.0.0.1:8848</nacos.server>
<nacos.server>114.235.183.147:8848</nacos.server>
<nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
<nacos.config.group>DEFAULT_GROUP</nacos.config.group>
<nacos.username>nacos</nacos.username>
<nacos.password>nacos</nacos.password>
<logstash.address>127.0.0.1:4560</logstash.address>
<logstash.address>114.235.183.147:4560</logstash.address>
</properties>
<activation>
<!-- 默认环境 -->
@ -89,12 +89,12 @@
<id>prod</id>
<properties>
<profiles.active>prod</profiles.active>
<nacos.server>127.0.0.1:8848</nacos.server>
<nacos.server>114.235.183.147:8848</nacos.server>
<nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
<nacos.config.group>DEFAULT_GROUP</nacos.config.group>
<nacos.username>nacos</nacos.username>
<nacos.password>nacos</nacos.password>
<logstash.address>127.0.0.1:4560</logstash.address>
<logstash.address>114.235.183.147:4560</logstash.address>
</properties>
</profile>
</profiles>
@ -375,7 +375,7 @@
</dependencyManagement>
<modules>
<module>dki-auth</module>
<module>dk-auth</module>
<module>dk-gateway</module>
<module>dk-visual</module>
<module>dk-modules</module>

2
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;

6
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

Loading…
Cancel
Save