Dev

doc/db/kcloud_platform_generator.sql

@@ -222,22 +222,3 @@ COMMENT ON COLUMN "public"."boot_generator_template"."api" IS 'API';
 COMMENT ON COLUMN "public"."boot_generator_template"."view" IS '页面';
 COMMENT ON COLUMN "public"."boot_generator_template"."form_view" IS '表单页面';
 COMMENT ON TABLE "public"."boot_generator_template" IS '代码生成器模板';
-
--- ----------------------------
--- Records of boot_generator_template
--- ----------------------------
-
--- ----------------------------
--- Auto increment value for boot_generator_column
--- ----------------------------
-SELECT setval('"public"."boot_generator_column_id_seq2"', 1, false);
-
--- ----------------------------
--- Auto increment value for boot_generator_info
--- ----------------------------
-SELECT setval('"public"."boot_generator_info_id_seq2"', 1, false);
-
--- ----------------------------
--- Auto increment value for boot_generator_template
--- ----------------------------
-SELECT setval('"public"."boot_generator_template_id_seq2"', 1, false);

laokou-cloud/laokou-gateway/src/main/java/org/laokou/gateway/repository/NacosRouteDefinitionRepository.java

@@ -20,7 +20,7 @@
 import com.alibaba.nacos.api.config.ConfigService;
 import io.micrometer.common.lang.NonNullApi;
 import lombok.extern.slf4j.Slf4j;
-import org.laokou.common.core.utils.JacksonUtil;
+import org.laokou.common.i18n.utils.JacksonUtil;
 import org.laokou.common.i18n.common.exception.SystemException;
 import org.laokou.common.i18n.utils.StringUtil;
 import org.laokou.common.nacos.utils.ConfigUtil;

laokou-cloud/laokou-nacos/src/main/java/com/alibaba/nacos/console/controller/v2/NamespaceControllerV2.java

@@ -57,22 +57,22 @@
 @ExtractorManager.Extractor(httpExtractor = ConsoleDefaultHttpParamExtractor.class)
 public class NamespaceControllerV2 {
 
+	private static final int NAMESPACE_ID_MAX_LENGTH = 128;
+
 	private final NamespaceOperationService namespaceOperationService;
 
-	private NamespacePersistService namespacePersistService;
+	private final NamespacePersistService namespacePersistService;
+
+	private final Pattern namespaceIdCheckPattern = Pattern.compile("^[\\w-]+");
+
+	private final Pattern namespaceNameCheckPattern = Pattern.compile("^[^@#$%^&*]+$");
 
 	public NamespaceControllerV2(NamespaceOperationService namespaceOperationService,
 			NamespacePersistService namespacePersistService) {
 		this.namespaceOperationService = namespaceOperationService;
 		this.namespacePersistService = namespacePersistService;
 	}
 
-	private final Pattern namespaceIdCheckPattern = Pattern.compile("^[\\w-]+");
-
-	private final Pattern namespaceNameCheckPattern = Pattern.compile("^[^@#$%^&*]+$");
-
-	private static final int NAMESPACE_ID_MAX_LENGTH = 128;
-
 	/**
 	 * Get namespace list.
 	 * @return namespace list

laokou-common/laokou-common-core/pom.xml

@@ -43,10 +43,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.datatype</groupId>
-      <artifactId>jackson-datatype-jsr310</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-freemarker</artifactId>
@@ -65,10 +61,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-core</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
@@ -77,10 +69,6 @@
       <groupId>org.lionsoul</groupId>
       <artifactId>ip2region</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-web</artifactId>

laokou-common/laokou-common-core/src/main/java/org/laokou/common/core/utils/MapUtil.java

@@ -20,6 +20,7 @@
 import com.google.common.base.Joiner;
 import com.google.common.base.Splitter;
 import jakarta.servlet.http.HttpServletRequest;
+import org.laokou.common.i18n.utils.JacksonUtil;
 import org.laokou.common.i18n.utils.ObjectUtil;
 import org.laokou.common.i18n.utils.StringUtil;
 import org.springframework.util.LinkedMultiValueMap;

laokou-common/laokou-common-core/src/main/java/org/laokou/common/core/utils/ResponseUtil.java

@@ -19,6 +19,7 @@
 
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.SneakyThrows;
+import org.laokou.common.i18n.utils.JacksonUtil;
 import org.springframework.http.HttpStatus;
 import org.springframework.util.Assert;
 import org.springframework.web.context.request.RequestAttributes;

laokou-common/laokou-common-domain/src/main/java/org/laokou/common/domain/constant/MqConstant.java → laokou-common/laokou-common-data-cache/src/main/java/org/laokou/common/data/cache/constant/MqConstant.java

@@ -15,7 +15,7 @@
  *
  */
 
-package org.laokou.common.domain.constant;
+package org.laokou.common.data.cache.constant;
 
 /**
  * @author laokou

laokou-common/laokou-common-domain/src/main/java/org/laokou/common/domain/handler/event/RemovedCacheEvent.java → laokou-common/laokou-common-data-cache/src/main/java/org/laokou/common/data/cache/domainevent/RemovedCacheEvent.java

@@ -15,7 +15,7 @@
  *
  */
 
-package org.laokou.common.domain.handler.event;
+package org.laokou.common.data.cache.domainevent;
 
 import lombok.Getter;
 

laokou-common/laokou-common-domain/src/main/java/org/laokou/common/domain/handler/RemoveCacheEventHandler.java → laokou-common/laokou-common-data-cache/src/main/java/org/laokou/common/data/cache/handler/RemoveCacheEventHandler.java

@@ -15,7 +15,7 @@
  *
  */
 
-package org.laokou.common.domain.handler;
+package org.laokou.common.data.cache.handler;
 
 /**
  * @author laokou

laokou-common/laokou-common-domain/src/main/java/org/laokou/common/domain/config/DomainAutoConfig.java

@@ -17,14 +17,12 @@
 
 package org.laokou.common.domain.config;
 
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 
 /**
  * @author laokou
  */
 @AutoConfiguration
-@MapperScan("org.laokou.common.domain.mapper")
 public class DomainAutoConfig {
 
 }

laokou-common/laokou-common-domain/src/main/java/org/laokou/common/domain/handler/AbstractDomainEventHandler.java

@@ -23,9 +23,12 @@
 import org.apache.rocketmq.spring.core.RocketMQListener;
 import org.laokou.common.core.utils.MDCUtil;
 import org.laokou.common.domain.support.DomainEventPublisher;
+import org.laokou.common.i18n.dto.DomainEvent;
+import org.laokou.common.i18n.utils.JacksonUtil;
 import org.laokou.common.i18n.utils.StringUtil;
 
-import java.nio.charset.StandardCharsets;
+import static org.laokou.common.i18n.common.constant.TraceConstant.SPAN_ID;
+import static org.laokou.common.i18n.common.constant.TraceConstant.TRACE_ID;
 
 /**
  * @author laokou
@@ -39,9 +42,8 @@ public abstract class AbstractDomainEventHandler implements RocketMQListener<Mes
 	@Override
 	public void onMessage(MessageExt messageExt) {
 		try {
-			// putTrace(messageExt);
-			String msg = new String(messageExt.getBody(), StandardCharsets.UTF_8);
-			// handleDomainEvent(convert(msg));
+			putTrace(messageExt);
+			handleDomainEvent(JacksonUtil.toBean(messageExt.getBody(), DomainEvent.class));
 		}
 		catch (Exception e) {
 			log.error("消费失败，主题Topic：{}，偏移量Offset：{}，错误信息：{}", messageExt.getTopic(), messageExt.getCommitLogOffset(),
@@ -53,15 +55,13 @@ public void onMessage(MessageExt messageExt) {
 		}
 	}
 
-	// protected abstract void handleDomainEvent(DefaultDomainEvent domainEvent);
-	//
-	// protected abstract DefaultDomainEvent convert(String msg);
-	//
-	// private void putTrace(MessageExt messageExt) {
-	// String traceId = messageExt.getProperty(TRACE_ID);
-	// String spanId = messageExt.getProperty(SPAN_ID);
-	// MDCUtil.put(traceId, spanId);
-	// }
+	protected abstract void handleDomainEvent(DomainEvent domainEvent);
+
+	private void putTrace(MessageExt messageExt) {
+		String traceId = messageExt.getProperty(TRACE_ID);
+		String spanId = messageExt.getProperty(SPAN_ID);
+		MDCUtil.put(traceId, spanId);
+	}
 
 	private void clearTrace() {
 		MDCUtil.clear();

laokou-common/laokou-common-elasticsearch/src/main/java/org/laokou/common/elasticsearch/template/ElasticsearchTemplate.java

@@ -35,7 +35,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import org.laokou.common.core.utils.JacksonUtil;
+import org.laokou.common.i18n.utils.JacksonUtil;
 import org.laokou.common.elasticsearch.annotation.*;
 import org.laokou.common.elasticsearch.entity.Search;
 import org.laokou.common.i18n.dto.Page;

laokou-common/laokou-common-i18n/pom.xml

@@ -53,6 +53,14 @@
       <groupId>org.laokou</groupId>
       <artifactId>laokou-common-banner</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.laokou</groupId>
       <artifactId>laokou-common-test</artifactId>
@@ -63,6 +71,10 @@
       <artifactId>laokou-common-log4j2</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.datatype</groupId>
+      <artifactId>jackson-datatype-jsr310</artifactId>
+    </dependency>
   </dependencies>
 
 </project>

laokou-common/laokou-common-i18n/src/main/java/org/laokou/common/i18n/common/constant/EventType.java

@@ -24,6 +24,6 @@
  */
 public enum EventType {
 
-	SEND_CAPTCHA, SEND_NOTICE
+	SEND_CAPTCHA, SEND_NOTICE, LOGIN
 
 }

laokou-common/laokou-common-i18n/src/main/java/org/laokou/common/i18n/dto/DomainEvent.java

@@ -18,16 +18,22 @@
 package org.laokou.common.i18n.dto;
 
 import lombok.Getter;
+import lombok.Setter;
+import org.laokou.common.i18n.common.constant.EventType;
 import org.laokou.common.i18n.utils.DateUtil;
+import org.laokou.common.i18n.utils.StringUtil;
 
 import java.io.Serial;
 import java.time.Instant;
 
+import static org.laokou.common.i18n.common.constant.StringConstant.EMPTY;
+
 /**
  * 领域事件.
  *
  * @author laokou
  */
+@Setter
 @Getter
 public class DomainEvent extends Identifier {
 
@@ -84,10 +90,22 @@ public class DomainEvent extends Identifier {
 	 */
 	private final String sourcePrefix;
 
+	public DomainEvent() {
+		this.payload = EMPTY;
+		this.type = EMPTY;
+		this.sourcePrefix = EMPTY;
+		this.tenantId = 0L;
+		this.userId = 0L;
+		this.aggregateId = 0L;
+		this.topic = EMPTY;
+		this.tag = EMPTY;
+		this.version = 0;
+	}
+
 	public DomainEvent(Long eventId, Long tenantId, Long userId, Long aggregateId, String topic, String tag,
-			int version, String payload, String type, String sourcePrefix) {
+			int version, String payload, EventType type, String sourcePrefix) {
 		this.payload = payload;
-		this.type = type;
+		this.type = StringUtil.convertUnder(type.name().toLowerCase());
 		this.sourcePrefix = sourcePrefix;
 		this.id = eventId;
 		this.tenantId = tenantId;

laokou-common/laokou-common-core/src/main/java/org/laokou/common/core/utils/JacksonUtil.java → laokou-common/laokou-common-i18n/src/main/java/org/laokou/common/i18n/utils/JacksonUtil.java

@@ -15,7 +15,7 @@
  *
  */
 
-package org.laokou.common.core.utils;
+package org.laokou.common.i18n.utils;
 
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParser;
@@ -27,8 +27,6 @@
 import com.fasterxml.jackson.databind.type.MapType;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-
 import java.io.File;
 import java.io.InputStream;
 import java.util.Collection;
@@ -41,7 +39,6 @@
  * @author livk
  * @author laokou
  */
-@Slf4j
 public final class JacksonUtil {
 
 	/**

laokou-common/laokou-common-log/src/main/java/org/laokou/common/log/model/LogE.java

@@ -23,14 +23,15 @@
 import org.laokou.common.core.context.UserContextHolder;
 import org.laokou.common.core.utils.*;
 import org.laokou.common.i18n.utils.DateUtil;
+import org.laokou.common.i18n.utils.JacksonUtil;
 import org.laokou.common.i18n.utils.ObjectUtil;
 import org.springframework.util.StopWatch;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.time.Instant;
 import java.util.*;
 
-import static org.laokou.common.core.utils.JacksonUtil.EMPTY_JSON;
+import static org.laokou.common.i18n.utils.JacksonUtil.EMPTY_JSON;
 import static org.laokou.common.i18n.common.constant.StringConstant.*;
 import static org.springframework.http.HttpHeaders.USER_AGENT;
 

laokou-common/laokou-common-mybatis-plus/src/main/java/org/laokou/common/mybatisplus/config/MybatisPlusAutoConfig.java

@@ -144,14 +144,15 @@ private AsyncPaginationInnerInterceptor asyncPaginationInnerInterceptor(DataSour
 		// 使用postgresql，如果使用其他数据库，需要修改DbType
 		// 使用postgresql，如果使用其他数据库，需要修改DbType
 		// 使用postgresql，如果使用其他数据库，需要修改DbType
-		ExecutorService executor = ThreadUtil.newVirtualTaskExecutor();
-		AsyncPaginationInnerInterceptor asyncPaginationInnerInterceptor = new AsyncPaginationInnerInterceptor(
-				DbType.POSTGRE_SQL, dataSource, executor);
-		// -1表示不受限制
-		asyncPaginationInnerInterceptor.setMaxLimit(-1L);
-		// 溢出总页数后是进行处理，查看源码就知道是干啥的
-		asyncPaginationInnerInterceptor.setOverflow(true);
-		return asyncPaginationInnerInterceptor;
+		try (ExecutorService executor = ThreadUtil.newVirtualTaskExecutor()) {
+			AsyncPaginationInnerInterceptor asyncPaginationInnerInterceptor = new AsyncPaginationInnerInterceptor(
+					DbType.POSTGRE_SQL, dataSource, executor);
+			// -1表示不受限制
+			asyncPaginationInnerInterceptor.setMaxLimit(-1L);
+			// 溢出总页数后是进行处理，查看源码就知道是干啥的
+			asyncPaginationInnerInterceptor.setOverflow(true);
+			return asyncPaginationInnerInterceptor;
+		}
 	}
 
 }

laokou-common/laokou-common-mybatis-plus/src/main/java/org/mybatis/spring/MyBatisExceptionTranslator.java

@@ -98,10 +98,9 @@ public DataAccessException translateExceptionIfPossible(RuntimeException e) {
 			// Batch exceptions come inside another PersistenceException
 			// recursion has a risk of infinite loop so better make another if
 			var msg = e.getMessage();
-			if (e.getCause() instanceof PersistenceException) {
-				e = (PersistenceException) e.getCause();
+			if (e.getCause() instanceof PersistenceException pe) {
 				if (msg == null) {
-					msg = e.getMessage();
+					msg = pe.getMessage();
 				}
 			}
 			if (e.getCause() instanceof SQLException se) {
@@ -110,8 +109,8 @@ public DataAccessException translateExceptionIfPossible(RuntimeException e) {
 				var dae = this.exceptionTranslator.translate(task, null, se);
 				return dae != null ? dae : new UncategorizedSQLException(task, null, se);
 			}
-			if (e.getCause() instanceof TransactionException) {
-				throw (TransactionException) e.getCause();
+			if (e.getCause() instanceof TransactionException te) {
+				throw te;
 			}
 			return new MyBatisSystemException(msg, e);
 		}

laokou-common/laokou-common-nacos/src/main/java/org/laokou/common/nacos/utils/ReactiveResponseUtil.java

@@ -17,7 +17,7 @@
 
 package org.laokou.common.nacos.utils;
 
-import org.laokou.common.core.utils.JacksonUtil;
+import org.laokou.common.i18n.utils.JacksonUtil;
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;