Skip to content

fix: Fix bugs and improve code quality across the codebase #233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Copilot wants to merge 3 commits into from
Closed

fix: Fix bugs and improve code quality across the codebase #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e44078
Initial plan
Copilot Feb 28, 2026
5e3f52b
Fix bugs and improve code quality across the codebase
Copilot Feb 28, 2026
4ea4a47
Address code review feedback: use TimeUnit for cache constants, fix n…
Copilot Feb 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions src/main/java/com/tlcsdm/gen/aspect/LogAspect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
import org.aspectj.lang.annotation.Pointcut;
import org.springframework.stereotype.Component;

import java.util.Map;

/**
* 日志处理
*
Expand All @@ -38,21 +36,20 @@ public void logPointCut() {
*/
@AfterThrowing(value = "logPointCut()", throwing = "e")
public void doAfterThrowing(Exception e) {
log.error(e.getMessage());
e.printStackTrace();
log.error("日志切面拦截到异常", e);
}

/**
* 环绕处理
* @param pjd ProceedingJoinPoint
* @return Map<String, Object>
* @return 方法执行结果
* @throws Throwable
*/
@Around("logPointCut()")
public Map<String, Object> doAround(ProceedingJoinPoint pjd) throws Throwable {
Map<String, Object> result;
public Object doAround(ProceedingJoinPoint pjd) throws Throwable {
Object result;
try {
result = (Map<String, Object>) pjd.proceed();
result = pjd.proceed();
}
catch (Exception e) {
return BaseUtils.failed(e.getMessage());
Expand Down
22 changes: 12 additions & 10 deletions src/main/java/com/tlcsdm/gen/base/BaseUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
import java.util.*;
import java.util.stream.Collectors;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
* 常用方法封装
*
Expand All @@ -24,6 +27,8 @@
*/
public class BaseUtils {

private static final Logger log = LoggerFactory.getLogger(BaseUtils.class);

/**
* 类不能实例化
*/
Expand Down Expand Up @@ -231,7 +236,7 @@ public static String getHostName() {
return InetAddress.getLocalHost().getHostName();
}
catch (UnknownHostException e) {
e.printStackTrace();
log.error("获取主机名失败", e);
}
return "未知";
}
Expand Down Expand Up @@ -291,7 +296,7 @@ public static String toLowerCase4Index(String string) {
}

char[] chars = string.toCharArray();
chars[0] += 32;
chars[0] = Character.toLowerCase(chars[0]);
return String.valueOf(chars);
}

Expand All @@ -300,18 +305,15 @@ public static String toLowerCase4Index(String string) {
*/
public static String toUpperCase4Index(String string) {
char[] chars = string.toCharArray();
chars[0] = toUpperCase(chars[0]);
chars[0] = Character.toUpperCase(chars[0]);
return String.valueOf(chars);
}

/**
* 字符转成大写
*/
public static char toUpperCase(char chars) {
if (97 <= chars && chars <= 122) {
chars ^= 32;
}
return chars;
return Character.toUpperCase(chars);
}

/**
Expand Down Expand Up @@ -347,10 +349,10 @@ public static Object deepClone(Object object) {
}

/**
* 深度克隆
* 错误页面回调
*/
public static void callbackNotFound(HttpServletResponse response, Exception e) {
e.printStackTrace();
log.error("请求处理失败", e);
response.setContentType("text/html;charset=utf-8");
@Cleanup
PrintWriter out = null;
Expand All @@ -365,7 +367,7 @@ public static void callbackNotFound(HttpServletResponse response, Exception e) {
out.flush();
}
catch (IOException ex) {
ex.printStackTrace();
log.error("写入错误页面失败", ex);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/tlcsdm/gen/base/CacheManage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public class CacheManage {
public static Cache<String, List<Map<String, Object>>> TABLES_CACHE = new Cache<>();

// 所有缓存存储
public static Map<String, Cache> CACHE_MAP = new ConcurrentHashMap() {
public static Map<String, Cache<String, List<Map<String, Object>>>> CACHE_MAP = new ConcurrentHashMap<>() {
{
put("procedures", PROCEDURES_CACHE);
put("tables", TABLES_CACHE);
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/com/tlcsdm/gen/controller/CacheManageController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@ public ModelAndView manageCache() {
@Log(title = "缓存管理", operateType = "查询项目缓存")
public Map<String, Object> selectCaches() {
List<Map<String, Object>> list = new ArrayList<>();
for (Cache cache : CACHE_MAP.values()) {
Map<String, Object> map = cache.getMap();
for (Cache<String, List<Map<String, Object>>> cache : CACHE_MAP.values()) {
Map<String, List<Map<String, Object>>> map = cache.getMap();
Map<String, Object> result = new HashMap<>(4);
for (Map.Entry entry : map.entrySet()) {
String mapKey = (String) entry.getKey();
for (Map.Entry<String, List<Map<String, Object>>> entry : map.entrySet()) {
String mapKey = entry.getKey();
Object mapValue = entry.getValue();
result.put("key", mapKey);
result.put("value", mapValue);
Expand Down Expand Up @@ -81,12 +81,12 @@ public Map<String, Object> getCaches(@PathVariable(required = false) String name
List<Object> list = new ArrayList<>();

if (StringUtils.isEmpty(name)) {
for (Cache cache : CACHE_MAP.values()) {
for (Cache<String, List<Map<String, Object>>> cache : CACHE_MAP.values()) {
list.addAll(cache.keys());
}
}
else {
for (Cache cache : CACHE_MAP.values()) {
for (Cache<String, List<Map<String, Object>>> cache : CACHE_MAP.values()) {
Object o = cache.get(name);
if (null != o) {
list.add(o);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/tlcsdm/gen/controller/DataBaseDocumentController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public void genDataBaseDocument(String url, String driver, String userName, Stri
@Cleanup
InputStream inputStream = new ByteArrayInputStream(file.getBytes(StandardCharsets.UTF_8));
// 将文件写入zip内，即将文件进行打包
zos.putNextEntry(new ZipEntry(fileName));
zos.putNextEntry(new ZipEntry(fileName + EngineFileType.valueOf(engineFileType).getFileSuffix()));
inputStream.transferTo(zos);
// 关闭输入输出流
zos.closeEntry();
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/com/tlcsdm/gen/controller/DataBaseInfoController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import com.tlcsdm.gen.service.DataBaseInfoService;
import lombok.Cleanup;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RestController;
Expand All @@ -25,6 +26,7 @@
*/
@RestController
@RequiredArgsConstructor
@Slf4j
public class DataBaseInfoController {

private final DataBaseInfoService dataBaseInfoService;
Expand Down Expand Up @@ -116,7 +118,7 @@ public Map<String, Object> testConnect(String URL, String DRIVER, String USERNAM
con = DriverManager.getConnection(URL, USERNAME, PASSWORD);
}
catch (SQLException e) {
e.printStackTrace();
log.error("数据源连接测试失败", e);
}
if (con != null) {
return BaseUtils.success();
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/com/tlcsdm/gen/factory/DataSourceUtilFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
import com.tlcsdm.gen.util.dataSource.DruidDataSourceUtil;
import com.tlcsdm.gen.util.dataSource.HikariDataSourceUtil;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.util.List;
import java.util.Map;
Expand All @@ -21,6 +23,8 @@
*/
public class DataSourceUtilFactory {

private static final Logger log = LoggerFactory.getLogger(DataSourceUtilFactory.class);

private static Map<String, DataSourceUtil> strategyMap = new ConcurrentHashMap<>();

/**
Expand Down Expand Up @@ -72,7 +76,7 @@ private static DataSourceUtil createDataSourceUtil(String url, String driver, St
register(url + userName, dataSourceUtil);
}
catch (Exception e) {
e.printStackTrace();
log.error("创建数据源失败", e);
remove(url + userName);
}
return dataSourceUtil;
Expand Down
25 changes: 15 additions & 10 deletions src/main/java/com/tlcsdm/gen/util/cache/Cache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.DelayQueue;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
* 具有过期时间的缓存 向缓存添加内容时，给每一个key设定过期时间，系统自动将超过过期时间的key清除。
* <p>
Expand All @@ -18,20 +21,22 @@
*/
public class Cache<K, V> {

private static final Logger log = LoggerFactory.getLogger(Cache.class);

// 存储缓存
public ConcurrentHashMap<K, V> map = new ConcurrentHashMap<>();

// 延迟队列
public DelayQueue<DelayedItem<K>> queue = new DelayQueue<>();

// 缓存30秒
public static final long CACHE_HOLD_30SECOND = 30 * 1000 * 1000 * 1000L;
// 缓存30秒(纳秒)
public static final long CACHE_HOLD_30SECOND = java.util.concurrent.TimeUnit.SECONDS.toNanos(30);

// 缓存30分钟
public static final long CACHE_HOLD_30MINUTE = 30 * 60 * 1000 * 1000 * 1000L;
// 缓存30分钟(纳秒)
public static final long CACHE_HOLD_30MINUTE = java.util.concurrent.TimeUnit.MINUTES.toNanos(30);

// 缓存1天
public static final long CACHE_HOLD_1DAY = 24 * 60 * 60 * 1000 * 1000 * 1000L;
// 缓存1天(纳秒)
public static final long CACHE_HOLD_1DAY = java.util.concurrent.TimeUnit.DAYS.toNanos(1);

// 永久保存
public static final long CACHE_HOLD_FOREVER = Long.MAX_VALUE;
Expand Down Expand Up @@ -63,10 +68,10 @@ public void clear() {

/**
* 取出一个缓存对象
* @param cacheName 缓存名称
* @param key 缓存键
*/
public V get(String cacheName) {
return map.get(cacheName);
public V get(K key) {
return map.get(key);
}

/**
Expand Down Expand Up @@ -104,7 +109,7 @@ public void checkOverdueKey() {
Thread.sleep(300);
}
catch (Exception e) {
e.printStackTrace();
log.error("缓存过期检查异常", e);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/tlcsdm/gen/util/cache/DelayedItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public int compareTo(Delayed o) {

@Override
public long getDelay(TimeUnit unit) {
return unit.convert(removeTime - System.nanoTime(), unit);
return unit.convert(removeTime - System.nanoTime(), TimeUnit.NANOSECONDS);
}

public T getT() {
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/com/tlcsdm/gen/util/cache/SimpleCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
*/
public class SimpleCache {

public static String DATABASETYPE = "dataBaseType";
public static final String DATABASETYPE = "dataBaseType";

public static String GENPROCEDUREMODELTYPE = "genProcedureModelType";
public static final String GENPROCEDUREMODELTYPE = "genProcedureModelType";

public static String NAMECONVENTTYPE = "nameConventType";
public static final String NAMECONVENTTYPE = "nameConventType";

public static String ENGINEFILETYPE = "engineFileType";
public static final String ENGINEFILETYPE = "engineFileType";

public static String GENCODEMODELTYPE = "genCodeModelType";
public static final String GENCODEMODELTYPE = "genCodeModelType";

public static String JAVACLASS = "javaClass";
public static final String JAVACLASS = "javaClass";

private static Map<String, List<Map<String, Object>>> map = new ConcurrentHashMap<>();

Expand Down
19 changes: 12 additions & 7 deletions src/main/java/com/tlcsdm/gen/util/dataSource/DataSourceUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
import java.util.List;
import java.util.Map;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
* 数据源工具抽象类
*
Expand All @@ -18,6 +21,8 @@
*/
public abstract class DataSourceUtil {

private static final Logger log = LoggerFactory.getLogger(DataSourceUtil.class);

protected DataSource dataSource;

/**
Expand Down Expand Up @@ -73,7 +78,7 @@ public int executeUpdate(String sql, Object... obj) throws SQLException {
x = ps.executeUpdate();
}
catch (SQLException e) {
e.printStackTrace();
log.error("执行SQL更新失败", e);
}
finally {
release(conn, ps);
Expand All @@ -100,7 +105,7 @@ public int getCount(String sql, Object... obj) throws SQLException {
}
}
catch (SQLException e) {
e.printStackTrace();
log.error("获取数据个数失败", e);
}
finally {
release(conn, ps, rs);
Expand Down Expand Up @@ -139,7 +144,7 @@ public List<Map<String, Object>> executeQuery(String sql, Object... obj) {
}
}
catch (SQLException e) {
e.printStackTrace();
log.error("执行SQL查询失败", e);
}
finally {
release(conn, ps, rs);
Expand All @@ -156,31 +161,31 @@ public void release(Connection conn, PreparedStatement ps, ResultSet rs, Callabl
cs.close();
}
catch (SQLException e) {
e.printStackTrace();
log.error("关闭CallableStatement失败", e);
}
}
if (rs != null) {
try {
rs.close();
}
catch (SQLException e) {
e.printStackTrace();
log.error("关闭ResultSet失败", e);
}
}
if (ps != null) {
try {
ps.close();
}
catch (SQLException e) {
e.printStackTrace();
log.error("关闭PreparedStatement失败", e);
}
}
if (conn != null) {
try {
conn.close();
}
catch (SQLException e) {
e.printStackTrace();
log.error("关闭Connection失败", e);
}
}
}
Expand Down
Loading
Loading