fix: 优化代码

KouShenhai · Jul 20, 2024 · f5d9fe2 · f5d9fe2
1 parent 43e1262
commit f5d9fe2
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 82 deletions.
diff --git a/laokou-common/laokou-common-i18n/src/main/java/org/laokou/common/i18n/utils/DateUtil.java b/laokou-common/laokou-common-i18n/src/main/java/org/laokou/common/i18n/utils/DateUtil.java
@@ -402,47 +402,51 @@ public static String getDayOfWeekText(LocalDate localDate) {
 		return localDate.getDayOfWeek().getDisplayName(TextStyle.FULL, Locale.getDefault());
 	}
 
-	public interface Constant {
+	public static final class Constant {
 
 		/**
 		 * yyyy-MM-dd HH:mm:ss.
 		 */
-		String YYYY_ROD_MM_ROD_DD_SPACE_HH_RISK_HH_RISK_SS = "yyyy-MM-dd HH:mm:ss";
+		public static final String YYYY_ROD_MM_ROD_DD_SPACE_HH_RISK_HH_RISK_SS = "yyyy-MM-dd HH:mm:ss";
 
 		/**
 		 * yyyyMMddHHmmss.
 		 */
-		String YYYYMMDDHHMMSS = "yyyyMMddHHmmss";
+		public static final String YYYYMMDDHHMMSS = "yyyyMMddHHmmss";
 
 		/**
 		 * yyyyMM.
 		 */
-		String YYYYMM = "yyyyMM";
+		public static final String YYYYMM = "yyyyMM";
 
 		/**
 		 * yyyy-MM-dd.
 		 */
-		String YYYY_ROD_MM_ROD_DD = "yyyy-MM-dd";
+		public static final String YYYY_ROD_MM_ROD_DD = "yyyy-MM-dd";
 
 		/**
 		 * yyyy年MM月dd日.
 		 */
-		String YYYY_TEXT_MM_TEXT_DD_TEXT = "yyyy年MM月dd日";
+		public static final String YYYY_TEXT_MM_TEXT_DD_TEXT = "yyyy年MM月dd日";
 
 		/**
 		 * yyyy.MM.dd.
 		 */
-		String YYYY_DOT_MM_DOT_DD = "yyyy.MM.dd";
+		public static final String YYYY_DOT_MM_DOT_DD = "yyyy.MM.dd";
 
 		/**
 		 * yyyyMMdd.
 		 */
-		String YYYYMMDD = "yyyyMMdd";
+		public static final String YYYYMMDD = "yyyyMMdd";
 
 		/**
 		 * GMT+8.
 		 */
-		String DEFAULT_TIMEZONE = "GMT+8";
+		public static final String DEFAULT_TIMEZONE = "GMT+8";
+
+		private Constant() {
+
+		}
 
 	}
 

diff --git a/...mmon/laokou-common-nacos/src/main/java/org/laokou/common/nacos/filter/ShutdownFilter.java b/...mmon/laokou-common-nacos/src/main/java/org/laokou/common/nacos/filter/ShutdownFilter.java
@@ -52,9 +52,8 @@
 @WebFilter(filterName = "shutdownFilter", urlPatterns = "/graceful-shutdown")
 public class ShutdownFilter implements Filter, org.springframework.web.server.WebFilter {
 
-	private final SpringContextUtil springContextUtil;
-
 	private static final ScheduledExecutorService NEWED_SCHEDULED_THREAD_POOL = Executors.newScheduledThreadPool(1);
+	private final SpringContextUtil springContextUtil;
 
 	@Override
 	public void init(FilterConfig filterConfig) throws ServletException {
@@ -95,13 +94,12 @@ private boolean open() {
 				int second = 60 * 1000;
 				long start = IdGenerator.SystemClock.now();
 				NEWED_SCHEDULED_THREAD_POOL.scheduleWithFixedDelay(() -> {
-					long end = IdGenerator.SystemClock.now();
 					// 一分钟内没完成 或 计数器为0 -> 结束
-					if (end - start >= second || ShutdownHolder.get() == 0) {
+					if (IdGenerator.SystemClock.now() - start >= second || ShutdownHolder.get() == 0) {
 						ThreadUtil.shutdown(NEWED_SCHEDULED_THREAD_POOL, 10);
 						// 关闭应用
 						int exitCode = SpringApplication.exit(springContextUtil.getApplicationContext(),
-								new ExitCodeGeneratorImpl());
+							new ExitCodeGeneratorImpl());
 						System.exit(exitCode);
 					}
 				}, 0, 1, TimeUnit.SECONDS);

diff --git a/...aokou-admin-infrastructure/src/main/java/org/laokou/admin/gatewayimpl/LogGatewayImpl.java b/...aokou-admin-infrastructure/src/main/java/org/laokou/admin/gatewayimpl/LogGatewayImpl.java
@@ -19,12 +19,6 @@
 
 import lombok.RequiredArgsConstructor;
 import org.laokou.admin.domain.gateway.LogGateway;
-import org.laokou.admin.dto.domainevent.FileUploadEvent;
-import org.laokou.admin.gatewayimpl.database.OperateLogMapper;
-import org.laokou.admin.gatewayimpl.database.OssLogMapper;
-import org.laokou.admin.gatewayimpl.database.dataobject.OssLogDO;
-import org.laokou.common.core.utils.IdGenerator;
-import org.laokou.common.i18n.dto.DefaultDomainEvent;
 import org.springframework.stereotype.Component;
 
 /**
@@ -36,63 +30,4 @@
 @RequiredArgsConstructor
 public class LogGatewayImpl implements LogGateway {
 
-	private final OperateLogMapper operateLogMapper;
-
-	private final OssLogMapper ossLogMapper;
-
-	// @Override
-	// public void create(OperateEvent event, DefaultDomainEvent evt) {
-	// operateLogMapper.insert(null);
-	// }
-	//
-	// @Override
-	// public void create(FileUploadEvent event, DefaultDomainEvent evt) {
-	// ossLogMapper.insert(convert(event, evt));
-	// }
-
-	private OssLogDO convert(FileUploadEvent fileUploadEvent, DefaultDomainEvent evt) {
-		OssLogDO logDO = new OssLogDO();
-		logDO.setMd5(fileUploadEvent.getMd5());
-		logDO.setUrl(fileUploadEvent.getUrl());
-		logDO.setName(fileUploadEvent.getName());
-		logDO.setSize(fileUploadEvent.getSize());
-		logDO.setStatus(fileUploadEvent.getStatus());
-		logDO.setErrorMessage(fileUploadEvent.getErrorMessage());
-		logDO.setId(IdGenerator.defaultSnowflakeId());
-		logDO.setEditor(evt.getEditor());
-		logDO.setCreator(evt.getCreator());
-		logDO.setCreateDate(evt.getCreateDate());
-		logDO.setUpdateDate(evt.getUpdateDate());
-		logDO.setDeptId(evt.getDeptId());
-		logDO.setDeptPath(evt.getDeptPath());
-		logDO.setTenantId(evt.getTenantId());
-		return logDO;
-	}
-
-	// private OperateLogDO convert(OperateEvent operateEvent, DecorateDomainEvent evt) {
-	// OperateLogDO logDO = new OperateLogDO();
-	// logDO.setName(operateEvent.getName());
-	// logDO.setModuleName(operateEvent.getModuleName());
-	// logDO.setUri(operateEvent.getUri());
-	// logDO.setMethodName(operateEvent.getMethodName());
-	// logDO.setRequestType(operateEvent.getRequestType());
-	// logDO.setRequestParams(operateEvent.getRequestParams());
-	// logDO.setUserAgent(operateEvent.getUserAgent());
-	// logDO.setIp(operateEvent.getIp());
-	// logDO.setStatus(operateEvent.getStatus());
-	// logDO.setOperator(operateEvent.getOperator());
-	// logDO.setErrorMessage(operateEvent.getErrorMessage());
-	// logDO.setTakeTime(operateEvent.getTakeTime());
-	// logDO.setAddress(operateEvent.getAddress());
-	// logDO.setId(IdGenerator.defaultSnowflakeId());
-	// logDO.setEditor(evt.getEditor());
-	// logDO.setCreator(evt.getCreator());
-	// logDO.setCreateDate(evt.getCreateDate());
-	// logDO.setUpdateDate(evt.getUpdateDate());
-	// logDO.setDeptId(evt.getDeptId());
-	// logDO.setDeptPath(evt.getDeptPath());
-	// logDO.setTenantId(evt.getTenantId());
-	// return logDO;
-	// }
-
 }
diff --git a/...auth-app/src/main/java/org/laokou/auth/event/handler/AbstractSendCaptchaEventHandler.java b/...auth-app/src/main/java/org/laokou/auth/event/handler/AbstractSendCaptchaEventHandler.java
@@ -45,7 +45,7 @@ protected void handleDomainEvent(DefaultDomainEvent domainEvent) {
 		ApiLog apiLog = getApiLog(event);
 		CallApiEvent callApiEvent = new CallApiEvent(apiLog);
 		callApiEvent.create(LAOKOU_LOG_TOPIC, API_TAG, API, CREATED, event.getAppName(), event.getSourceName(),
-			apiLog.getTimestamp(), event.getAggregateId());
+				apiLog.getTimestamp(), event.getAggregateId());
 		domainEventPublisher.publishToCreate(callApiEvent);
 	}
 

diff --git a/laokou-service/laokou-auth/laokou-auth-domain/src/main/java/org/laokou/auth/model/AuthA.java b/laokou-service/laokou-auth/laokou-auth-domain/src/main/java/org/laokou/auth/model/AuthA.java
@@ -149,7 +149,7 @@ public AuthA() {
 	}
 
 	public AuthA(String username, String password, String tenantId, String grantType, String uuid, String captcha,
-				 HttpServletRequest request) {
+			HttpServletRequest request) {
 		this.id = IdGenerator.defaultSnowflakeId();
 		this.username = username;
 		this.password = password;
@@ -191,7 +191,8 @@ public void updateUser(UserE user) {
 			this.editor = user.getId();
 			this.deptId = user.getDeptId();
 			this.deptPath = user.getDeptPath();
-		} else {
+		}
+		else {
 			switch (this.grantType) {
 				case PASSWORD:
 				case AUTHORIZATION_CODE: