From 4720c650ed3c32a833eafd88bb60fdcf42949a40 Mon Sep 17 00:00:00 2001 From: cym1102 Date: Fri, 21 Jun 2024 15:06:47 +0800 Subject: [PATCH] 4.1.8 --- README.md | 8 ++++---- README_EN.md | 8 ++++---- pom.xml | 2 +- src/main/java/com/cym/config/InitConfig.java | 7 ++++++- src/main/java/com/cym/sqlhelper/bean/Sort.java | 2 +- src/main/java/com/cym/sqlhelper/utils/SqlHelper.java | 12 ++++++------ 6 files changed, 22 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 462db2d2..b2cf91a5 100644 --- a/README.md +++ b/README.md @@ -84,9 +84,9 @@ Path : JDK安装目录\bin ``` Linux: mkdir /home/nginxWebUI/ - wget -O /home/nginxWebUI/nginxWebUI.jar https://gitee.com/cym1102/nginxWebUI/releases/download/4.1.6/nginxWebUI-4.1.6.jar + wget -O /home/nginxWebUI/nginxWebUI.jar https://gitee.com/cym1102/nginxWebUI/releases/download/4.1.8/nginxWebUI-4.1.8.jar -Windows: 直接使用浏览器下载 https://gitee.com/cym1102/nginxWebUI/releases/download/4.1.6/nginxWebUI-4.1.6.jar 到 D:/home/nginxWebUI/nginxWebUI.jar +Windows: 直接使用浏览器下载 https://gitee.com/cym1102/nginxWebUI/releases/download/4.1.8/nginxWebUI-4.1.8.jar 到 D:/home/nginxWebUI/nginxWebUI.jar ``` 有新版本只需要修改路径中的版本即可 @@ -188,8 +188,8 @@ services: target: "/home/nginxWebUI" environment: BOOT_OPTIONS: "--server.port=8080" - privileged: true network_mode: "host" + restart: always 或者 @@ -203,8 +203,8 @@ services: target: "/home/nginxWebUI" environment: BOOT_OPTIONS: "--server.port=8080" - privileged: true network_mode: "host" + restart: always ``` diff --git a/README_EN.md b/README_EN.md index a38fed0d..4c6a3ac2 100644 --- a/README_EN.md +++ b/README_EN.md @@ -80,9 +80,9 @@ reboot ``` Linux: mkdir /home/nginxWebUI/ - wget -O /home/nginxWebUI/nginxWebUI.jar https://gitee.com/cym1102/nginxWebUI/releases/download/4.1.6/nginxWebUI-4.1.6.jar + wget -O /home/nginxWebUI/nginxWebUI.jar https://gitee.com/cym1102/nginxWebUI/releases/download/4.1.8/nginxWebUI-4.1.8.jar -Windows: Download directly from your browser https://gitee.com/cym1102/nginxWebUI/releases/download/4.1.6/nginxWebUI-4.1.6.jar into D:/home/nginxWebUI/ +Windows: Download directly from your browser https://gitee.com/cym1102/nginxWebUI/releases/download/4.1.8/nginxWebUI-4.1.8.jar into D:/home/nginxWebUI/ ``` With a new version, you just need to change the version in the path @@ -184,8 +184,8 @@ services: target: "/home/nginxWebUI" environment: BOOT_OPTIONS: "--server.port=8080" - privileged: true network_mode: "host" + restart: always or @@ -199,8 +199,8 @@ services: target: "/home/nginxWebUI" environment: BOOT_OPTIONS: "--server.port=8080" - privileged: true network_mode: "host" + restart: always ``` diff --git a/pom.xml b/pom.xml index 45a38ad2..0237e965 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 com.cym nginxWebUI - 4.1.6 + 4.1.8 UTF-8 diff --git a/src/main/java/com/cym/config/InitConfig.java b/src/main/java/com/cym/config/InitConfig.java index 63a3ea7b..15801b06 100644 --- a/src/main/java/com/cym/config/InitConfig.java +++ b/src/main/java/com/cym/config/InitConfig.java @@ -26,6 +26,7 @@ import com.cym.sqlhelper.config.DataSourceEmbed; import com.cym.sqlhelper.config.Table; import com.cym.sqlhelper.utils.ConditionAndWrapper; +import com.cym.sqlhelper.utils.JdbcTemplate; import com.cym.sqlhelper.utils.SqlHelper; import com.cym.utils.EncodePassUtils; import com.cym.utils.MessageUtils; @@ -61,6 +62,8 @@ public class InitConfig { @Inject SqlHelper sqlHelper; @Inject + JdbcTemplate jdbcTemplate; + @Inject ConfService confService; @Inject DataSourceEmbed dataSourceEmbed; @@ -237,7 +240,9 @@ private Map> readAll() { Table table = clazz.getAnnotation(Table.class); if (table != null) { try { - map.put(clazz.getName(), sqlHelper.findAll(clazz)); + List> list = jdbcTemplate.queryForList("SELECT * FROM `" + StrUtil.toUnderlineCase(clazz.getSimpleName()) + "`"); + + map.put(clazz.getName(), sqlHelper.buildObjects(list, clazz)); } catch (Exception e) { logger.info(e.getMessage(), e); } diff --git a/src/main/java/com/cym/sqlhelper/bean/Sort.java b/src/main/java/com/cym/sqlhelper/bean/Sort.java index d2b09a10..97c7029f 100644 --- a/src/main/java/com/cym/sqlhelper/bean/Sort.java +++ b/src/main/java/com/cym/sqlhelper/bean/Sort.java @@ -65,7 +65,7 @@ public String toString() { String sql = StrUtil.toUnderlineCase(order.getColumn()); if (order.getColumn().equalsIgnoreCase("seq") || order.getColumn().equalsIgnoreCase("id")) { - sql = "CAST(" + StrUtil.toUnderlineCase(order.getColumn()) + " as UNSIGNED)"; + sql = "CAST(" + StrUtil.toUnderlineCase(order.getColumn()) + " as SIGNED)"; } if (order.getDirection() == Direction.ASC) { diff --git a/src/main/java/com/cym/sqlhelper/utils/SqlHelper.java b/src/main/java/com/cym/sqlhelper/utils/SqlHelper.java index 32fe1864..4068dc6e 100644 --- a/src/main/java/com/cym/sqlhelper/utils/SqlHelper.java +++ b/src/main/java/com/cym/sqlhelper/utils/SqlHelper.java @@ -423,7 +423,7 @@ public Page findPage(ConditionWrapper conditionWrapper, Sort sort, Page page, Cl if (sort != null) { sql += " " + sort.toString(); } else { - sql += " ORDER BY CAST(id AS UNSIGNED) DESC"; + sql += " ORDER BY CAST(id AS SIGNED) DESC"; } sql += " LIMIT " + (page.getCurr() - 1) * page.getLimit() + "," + page.getLimit(); @@ -502,9 +502,9 @@ public T findOneByQuery(ConditionWrapper conditionWrapper, Sort sort, Class< sql += " WHERE " + conditionWrapper.build(values); } if (sort != null) { - sql += " " + sort; + sql += " " + sort.toString(); } else { - sql += " ORDER BY CAST(id AS UNSIGNED) DESC"; + sql += " ORDER BY CAST(id AS SIGNED) DESC"; } sql += " limit 1"; @@ -553,9 +553,9 @@ public List findListByQuery(ConditionWrapper conditionWrapper, Sort sort, sql += " WHERE " + conditionWrapper.build(values); } if (sort != null) { - sql += " " + sort; + sql += " " + sort.toString(); } else { - sql += " ORDER BY CAST(id AS UNSIGNED) DESC"; + sql += " ORDER BY CAST(id AS SIGNED) DESC"; } logQuery(formatSql(sql), values.toArray()); @@ -853,7 +853,7 @@ private List extractProperty(List list, String property, Class claz * @param clazz * @return */ - private List buildObjects(List> queryForList, Class clazz) { + public List buildObjects(List> queryForList, Class clazz) { List list = new ArrayList(); try {