Merge branch 'release/1.0.1'

conifercone · Jun 28, 2024 · d270f28 · d270f28
2 parents 764c252 + 4fddd87
commit d270f28
Show file tree

Hide file tree

Showing 214 changed files with 6,927 additions and 555 deletions.
diff --git a/.run/CentaurAuthenticationApplication-dev.run.xml b/.run/CentaurAuthenticationApplication-dev.run.xml
@@ -1,15 +1,12 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="CentaurAuthenticationApplication-dev"
-    type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-    <option name="ACTIVE_PROFILES" value="dev"/>
-    <module name="centaur.centaur-authentication.main"/>
-    <option name="SHORTEN_COMMAND_LINE" value="ARGS_FILE"/>
-    <option name="SPRING_BOOT_MAIN_CLASS"
-      value="com.sky.centaur.authentication.CentaurAuthenticationApplication"/>
-    <option name="VM_PARAMETERS"
-      value="-Dcom.sun.management.jmxremote.port=31101 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"/>
+  <configuration default="false" name="CentaurAuthenticationApplication-dev" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <option name="ACTIVE_PROFILES" value="dev" />
+    <module name="centaur.centaur-authentication.main" />
+    <option name="SHORTEN_COMMAND_LINE" value="ARGS_FILE" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="com.sky.centaur.authentication.CentaurAuthenticationApplication" />
+    <option name="VM_PARAMETERS" value="-Dcom.sun.management.jmxremote.port=31101 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dlog4j2.disableJmx=true" />
     <method v="2">
-      <option name="Make" enabled="true"/>
+      <option name="Make" enabled="true" />
     </method>
   </configuration>
-</component>
+</component>
diff --git a/.run/CentaurFileApplication-dev.run.xml b/.run/CentaurFileApplication-dev.run.xml
@@ -0,0 +1,12 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="CentaurFileApplication-dev" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <option name="ACTIVE_PROFILES" value="dev" />
+    <module name="centaur.centaur-file.main" />
+    <option name="SHORTEN_COMMAND_LINE" value="ARGS_FILE" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="com.sky.centaur.file.CentaurFileApplication" />
+    <option name="VM_PARAMETERS" value="-Dcom.sun.management.jmxremote.port=31501 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dlog4j2.disableJmx=true" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
diff --git a/.run/CentaurLogApplication-dev.run.xml b/.run/CentaurLogApplication-dev.run.xml
@@ -1,20 +1,18 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="CentaurLogApplication-dev"
-    type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-    <option name="ACTIVE_PROFILES" value="dev"/>
-    <module name="centaur.centaur-log.main"/>
-    <option name="SHORTEN_COMMAND_LINE" value="ARGS_FILE"/>
-    <option name="SPRING_BOOT_MAIN_CLASS" value="com.sky.centaur.log.CentaurLogApplication"/>
-    <option name="VM_PARAMETERS"
-      value="-Dcom.sun.management.jmxremote.port=31201 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"/>
+  <configuration default="false" name="CentaurLogApplication-dev" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <option name="ACTIVE_PROFILES" value="dev" />
+    <module name="centaur.centaur-log.main" />
+    <option name="SHORTEN_COMMAND_LINE" value="ARGS_FILE" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="com.sky.centaur.log.CentaurLogApplication" />
+    <option name="VM_PARAMETERS" value="-Dcom.sun.management.jmxremote.port=31201 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dlog4j2.disableJmx=true" />
     <extension name="coverage">
       <pattern>
-        <option name="PATTERN" value="com.sky.centaur.log.*"/>
-        <option name="ENABLED" value="true"/>
+        <option name="PATTERN" value="com.sky.centaur.log.*" />
+        <option name="ENABLED" value="true" />
       </pattern>
     </extension>
     <method v="2">
-      <option name="Make" enabled="true"/>
+      <option name="Make" enabled="true" />
     </method>
   </configuration>
-</component>
+</component>
diff --git a/.run/CentaurMailApplication-dev.run.xml b/.run/CentaurMailApplication-dev.run.xml
@@ -0,0 +1,12 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="CentaurMailApplication-dev" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <option name="ACTIVE_PROFILES" value="dev" />
+    <module name="centaur.centaur-mail.main" />
+    <option name="SHORTEN_COMMAND_LINE" value="ARGS_FILE" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="com.sky.centaur.mail.CentaurMailApplication" />
+    <option name="VM_PARAMETERS" value="-Dcom.sun.management.jmxremote.port=31401 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dlog4j2.disableJmx=true" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
diff --git a/.run/CentaurSmsApplication-dev.run.xml b/.run/CentaurSmsApplication-dev.run.xml
@@ -0,0 +1,18 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="CentaurSmsApplication-dev" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <option name="ACTIVE_PROFILES" value="dev" />
+    <module name="centaur.centaur-sms.main" />
+    <option name="SHORTEN_COMMAND_LINE" value="ARGS_FILE" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="com.sky.centaur.sms.CentaurSmsApplication" />
+    <option name="VM_PARAMETERS" value="-Dcom.sun.management.jmxremote.port=31601 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dlog4j2.disableJmx=true" />
+    <extension name="coverage">
+      <pattern>
+        <option name="PATTERN" value="com.sky.centaur.sms.*" />
+        <option name="ENABLED" value="true" />
+      </pattern>
+    </extension>
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
diff --git a/.run/CentaurUniqueApplication-dev.run.xml b/.run/CentaurUniqueApplication-dev.run.xml
@@ -1,13 +1,12 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="CentaurUniqueApplication-dev"
-    type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
-    <option name="ACTIVE_PROFILES" value="dev"/>
-    <module name="centaur.centaur-unique.main"/>
-    <option name="SPRING_BOOT_MAIN_CLASS" value="com.sky.centaur.unique.CentaurUniqueApplication"/>
-    <option name="VM_PARAMETERS"
-      value="-Dcom.sun.management.jmxremote.port=31301 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"/>
+  <configuration default="false" name="CentaurUniqueApplication-dev" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+    <option name="ACTIVE_PROFILES" value="dev" />
+    <module name="centaur.centaur-unique.main" />
+    <option name="SHORTEN_COMMAND_LINE" value="ARGS_FILE" />
+    <option name="SPRING_BOOT_MAIN_CLASS" value="com.sky.centaur.unique.CentaurUniqueApplication" />
+    <option name="VM_PARAMETERS" value="-Dcom.sun.management.jmxremote.port=31301 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Dlog4j2.disableJmx=true" />
     <method v="2">
-      <option name="Make" enabled="true"/>
+      <option name="Make" enabled="true" />
     </method>
   </configuration>
-</component>
+</component>
diff --git a/.run/start_all_services.run.xml b/.run/start_all_services.run.xml
@@ -0,0 +1,11 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="start_all_services" type="CompoundRunConfigurationType">
+    <toRun name="CentaurAuthenticationApplication-dev" type="SpringBootApplicationConfigurationType" />
+    <toRun name="CentaurFileApplication-dev" type="SpringBootApplicationConfigurationType" />
+    <toRun name="CentaurLogApplication-dev" type="SpringBootApplicationConfigurationType" />
+    <toRun name="CentaurMailApplication-dev" type="SpringBootApplicationConfigurationType" />
+    <toRun name="CentaurSmsApplication-dev" type="SpringBootApplicationConfigurationType" />
+    <toRun name="CentaurUniqueApplication-dev" type="SpringBootApplicationConfigurationType" />
+    <method v="2" />
+  </configuration>
+</component>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,15 +9,58 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- v1.0.1 Unique data generation service adds code generation function.
-- v1.0.1 Account registration adds email verification.
-- v1.0.1 Add email notification for account deletion.
-- v1.0.1 Improve log burying points.
+- v1.0.2 SMS integrates Alibaba Cloud and Huawei Cloud SMS platform.
+- v1.0.2 SMS implements SMS verification code sending function.
+- v1.0.2 SMS adds a new option to switch SMS platforms based on configuration files.
 
 ### Changed
 
+- v1.0.2 Added SMS verification code for account registration.
+- v1.0.2 Internationalization exceptions prompt switching of abnormal content according to account
+  language preference.
+
+### Removed
+
+## [1.0.1] - 2024-06-28
+
+### Added
+
+- Unique data generation service adds code generation, verify function.
+- Add mail service.
+- Add template email notification in mail service.
+- Add file service.
+- The file service adds streaming file upload, download, deletion, and obtaining file content in
+  text format.
+- Added language preference and time zone attributes to the account.
+- A new interface for obtaining the list of available time zones has been added to the unique data
+  generation service.
+- Added sms module.
+
+### Fixed
+
+- Fix transaction does not take effect.
+- Fix internationalization exception prompt error.
+
+### Changed
+
+- Account registration function adds time zone validity check.
+- Account registration function adds verification code check.
+- Modify the database columns of the user table, permission table, and role table to NOT_NULL, and
+  add corresponding default values.
+- The account registration grpc interface parameter attribute is modified to a wrapper class.
+- Modify grpc channel closing logic.
+- Integrate mapstruct to replace the original bull for object conversion.
+- Delete current account function and add verification code verification.
+- Token claims adds account language preference attribute.
+- springboot upgraded to 3.3.1.
+- redis-om-spring upgraded to 0.9.3.
+- hypersistence-utils-hibernate-63 upgraded to 3.7.7.
+
 ### Removed
 
+- Remove flyway gradle plugin.
+- sql file remove license.
+
 ## [1.0.0] - 2024-06-13
 
 ### Added
@@ -29,6 +72,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Distributed unique primary key generation.
 - Distributed lock based on zookeeper.
 
-[unreleased]: https://github.com/conifercone/centaur/compare/v1.0.0...develop
-
+[//]: # (@formatter:off)
+[unreleased]: https://github.com/conifercone/centaur/compare/v1.0.1...develop
+[1.0.1]: https://github.com/conifercone/centaur/compare/v1.0.0...v1.0.1
 [1.0.0]: https://github.com/conifercone/centaur/releases/tag/v1.0.0
+[//]: # (@formatter:on)
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 ![GitHub Created At](https://img.shields.io/github/created-at/conifercone/centaur)
 ![GitHub repo size](https://img.shields.io/github/repo-size/conifercone/centaur)
 ![GitHub top language](https://img.shields.io/github/languages/top/conifercone/centaur)
-[![JDK version](https://img.shields.io/badge/JDK-21+-green.svg)](https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html)
+[![JDK version](https://img.shields.io/badge/JDK-21+-green.svg)](https://www.oracle.com/java/technologies/javase/jdk21-archive-downloads.html)
 ![GitHub Release](https://img.shields.io/github/v/release/conifercone/centaur)
 [![GitHub License](https://img.shields.io/github/license/conifercone/centaur)](https://github.com/conifercone/centaur)
 [![GitHub issues](https://img.shields.io/github/issues/conifercone/centaur)](https://github.com/conifercone/centaur)
@@ -37,12 +37,30 @@ centaur
 │  │  │- 📂 authentication-infrastructure -- authentication service infrastructure layer
 │  │─ 📂 centaur-basis -- basic module
 │  │─ 📂 centaur-extension -- expansion module
+│  │─ 📂 centaur-file -- file service
+│  │  │- 📂 file-adapter -- file service adaptation layer
+│  │  │- 📂 file-application -- file service application layer
+│  │  │- 📂 file-client -- file service client
+│  │  │- 📂 file-domain -- file service domain layer
+│  │  │- 📂 file-infrastructure -- file service infrastructure layer
 │  │─ 📂 centaur-log -- log service
 │  │  │- 📂 log-adapter -- log service adaptation layer
 │  │  │- 📂 log-application -- log service application layer
 │  │  │- 📂 log-client -- log service client
 │  │  │- 📂 log-domain -- log service domain layer
 │  │  │- 📂 log-infrastructure -- log service infrastructure layer
+│  │─ 📂 centaur-mail -- mail service
+│  │  │- 📂 mail-adapter -- mail service adaptation layer
+│  │  │- 📂 mail-application -- mail service application layer
+│  │  │- 📂 mail-client -- mail service client
+│  │  │- 📂 mail-domain -- mail service domain layer
+│  │  │- 📂 mail-infrastructure -- mail service infrastructure layer
+│  │─ 📂 centaur-sms -- sms service
+│  │  │- 📂 sms-adapter -- sms service adaptation layer
+│  │  │- 📂 sms-application -- sms service application layer
+│  │  │- 📂 sms-client -- sms service client
+│  │  │- 📂 sms-domain -- sms service domain layer
+│  │  │- 📂 sms-infrastructure -- sms service infrastructure layer
 │  │─ 📂 centaur-unique -- unique data generation service
 │  │  │- 📂 unique-adapter -- unique data generation service adaptation layer
 │  │  │- 📂 unique-application -- unique data generation service application layer
@@ -55,16 +73,17 @@ centaur
 
 ### infrastructure
 
-| name          | releases |
-|---------------|----------|
-| apisix        | 3.8.0    |
-| elasticsearch | 8.12.0   |
-| kafka         | 3.4      |
-| postgresql    | 15.1     |
-| redis         | latest   |
-| zookeeper     | 3.8      |
-| consul        | 1.15.4   |
-| zipkin        | 3.19.0   |
+| name          | releases                     |
+|---------------|------------------------------|
+| apisix        | 3.8.0                        |
+| elasticsearch | 8.12.0                       |
+| kafka         | 3.4                          |
+| postgresql    | 15.1                         |
+| redis         | latest                       |
+| zookeeper     | 3.8                          |
+| consul        | 1.15.4                       |
+| minio         | RELEASE.2024-06-13T22-53-53Z |
+| zipkin        | 3.19.0                       |
 
 ## Dependency Statement
 

diff --git a/build.gradle b/build.gradle
@@ -16,7 +16,6 @@ plugins {
     alias(libs.plugins.kotlinJvm) apply(false)
     alias(libs.plugins.kotlinPluginSpring) apply(false)
     alias(libs.plugins.kotlinPluginJpa) apply(false)
-    alias(libs.plugins.flyway) apply(false)
 }
 
 allprojects { project ->
@@ -26,6 +25,7 @@ allprojects { project ->
     // 定义maven仓库地址
     repositories {
         mavenCentral()
+        maven { url "https://repo.spring.io/milestone" }
     }
 
     configurations.configureEach {
@@ -74,6 +74,10 @@ subprojects { project ->
 
     compileJava.dependsOn(processResources)
 
+    compileJava {
+        options.compilerArgs << "-Amapstruct.unmappedTargetPolicy=IGNORE"
+    }
+
     tasks.withType(KotlinCompile).configureEach {
         compilerOptions.freeCompilerArgs.add("-Xjsr305=strict")
     }
@@ -120,11 +124,10 @@ subprojects { project ->
         encoding = StandardCharsets.UTF_8.name()
         ignoreFailures = true
         header = rootProject.file("SOURCE_CODE_HEAD.txt")
-        includes(["**/*.java", "**/*.kt", "**/*.sql", "**/*.xml", "**/*.yml"])
+        includes(["**/*.java", "**/*.kt", "**/*.xml", "**/*.yml"])
         excludes(["**/client/api/grpc/*.java", "**/*_.java", "**/*run.xml"])
         mapping "java", "SLASHSTAR_STYLE"
         mapping "kt", "SLASHSTAR_STYLE"
-        mapping "sql", "SLASHSTAR_STYLE"
         mapping "xml", "XML_STYLE"
         mapping "yml", "SCRIPT_STYLE"
         ext.year = Calendar.getInstance().get(Calendar.YEAR)
@@ -135,7 +138,6 @@ subprojects { project ->
         imports {
             mavenBom(libs.springBootDependencies.get().toString())
             mavenBom(libs.springCloudDependencies.get().toString())
-            mavenBom(libs.bullBom.get().toString())
             mavenBom(libs.grpcBom.get().toString())
             mavenBom(libs.protobufBom.get().toString())
             mavenBom(libs.guavaBom.get().toString())
@@ -152,12 +154,14 @@ subprojects { project ->
         implementation libs.apiguardian
         implementation libs.guava
         implementation libs.commonsLang3
-        implementation libs.bullMapTransformer
-        implementation libs.bullBeanTransformer
+        implementation libs.commonsIo
         implementation libs.jacksonModuleKotlin
         implementation libs.kotlinReflect
         testImplementation libs.junitJupiter
         annotationProcessor libs.springBootConfigurationProcessor
+        implementation libs.mapstruct
+        annotationProcessor libs.mapstructProcessor
+        testAnnotationProcessor libs.mapstructProcessor
     }
 
     test {

diff --git a/...n-adapter/src/main/java/com/sky/centaur/authentication/adapter/web/AccountController.java b/...n-adapter/src/main/java/com/sky/centaur/authentication/adapter/web/AccountController.java
@@ -17,6 +17,7 @@
 
 import com.sky.centaur.authentication.client.api.AccountService;
 import com.sky.centaur.authentication.client.dto.AccountChangePasswordCmd;
+import com.sky.centaur.authentication.client.dto.AccountDeleteCurrentCmd;
 import com.sky.centaur.authentication.client.dto.AccountDisableCmd;
 import com.sky.centaur.authentication.client.dto.AccountPasswordVerifyCmd;
 import com.sky.centaur.authentication.client.dto.AccountRegisterCmd;
@@ -120,8 +121,8 @@ public void resetPassword(
   @DeleteMapping("/deleteCurrent")
   @ResponseBody
   @API(status = Status.STABLE, since = "1.0.0")
-  public void deleteCurrent() {
-    accountService.deleteCurrentAccount();
+  public void deleteCurrent(@RequestBody AccountDeleteCurrentCmd accountDeleteCurrentCmd) {
+    accountService.deleteCurrentAccount(accountDeleteCurrentCmd);
   }
 
   @Operation(summary = "校验账户密码")

diff --git a/centaur-authentication/authentication-application/build.gradle b/centaur-authentication/authentication-application/build.gradle
@@ -3,6 +3,7 @@
 //file:noinspection GrUnresolvedAccess
 dependencies {
     implementation project(":centaur-authentication:authentication-client")
+    implementation project(":centaur-unique:unique-client")
     implementation project(":centaur-authentication:authentication-infrastructure")
     implementation project(":centaur-authentication:authentication-domain")
     implementation project(":centaur-extension")