From 3c31705d7638e0e7b1224b863489e6e894cb5bb7 Mon Sep 17 00:00:00 2001 From: xuyuxiang Date: Wed, 10 May 2023 16:39:26 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E4=B8=80=E4=BA=9B=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/vip/xiaonuo/common/util/CommonTimeFormatUtil.java | 6 +++--- .../gen/modular/basic/service/impl/GenBasicServiceImpl.java | 2 +- .../sys/modular/user/service/impl/SysUserServiceImpl.java | 2 +- .../main/java/vip/xiaonuo/core/config/GlobalConfigure.java | 2 +- snowy-web-app/src/main/resources/application.properties | 1 + 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/snowy-common/src/main/java/vip/xiaonuo/common/util/CommonTimeFormatUtil.java b/snowy-common/src/main/java/vip/xiaonuo/common/util/CommonTimeFormatUtil.java index de1ec4a0..c3f0f294 100644 --- a/snowy-common/src/main/java/vip/xiaonuo/common/util/CommonTimeFormatUtil.java +++ b/snowy-common/src/main/java/vip/xiaonuo/common/util/CommonTimeFormatUtil.java @@ -127,11 +127,11 @@ public class CommonTimeFormatUtil { long seconds = secondsParam % ONE_MINUTE_SECONDS; if(days > 0) { result = days + "天" + hours + "小时" + minutes + "分钟" + seconds + "秒"; - }else if(hours > 0) { + } else if(hours > 0) { result = hours + "小时" + minutes + "分钟" + seconds + "秒"; - }else if(minutes > 0) { + } else if(minutes > 0) { result = minutes + "分钟" + seconds + "秒"; - }else{ + } else { result = seconds + "秒"; } return result; diff --git a/snowy-plugin/snowy-plugin-gen/src/main/java/vip/xiaonuo/gen/modular/basic/service/impl/GenBasicServiceImpl.java b/snowy-plugin/snowy-plugin-gen/src/main/java/vip/xiaonuo/gen/modular/basic/service/impl/GenBasicServiceImpl.java index fb306374..3eb7bddc 100644 --- a/snowy-plugin/snowy-plugin-gen/src/main/java/vip/xiaonuo/gen/modular/basic/service/impl/GenBasicServiceImpl.java +++ b/snowy-plugin/snowy-plugin-gen/src/main/java/vip/xiaonuo/gen/modular/basic/service/impl/GenBasicServiceImpl.java @@ -308,7 +308,7 @@ public class GenBasicServiceImpl extends ServiceImpl i DatabaseMetaData metaData = conn.getMetaData(); String url = metaData.getURL(); String schema = null; - if (url.toLowerCase().contains("oracle")) { + if (url.toLowerCase().contains("jdbc:oracle")) { schema = metaData.getUserName(); } List columns = new ArrayList<>(); diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java index dbc86179..5a52143e 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java @@ -1025,7 +1025,7 @@ public class SysUserServiceImpl extends ServiceImpl impl JSONObject jsonObject = this.doImport(allUserList, sysUserImportParamList.get(i), i); if(jsonObject.getBool("success")) { successCount += 1; - } else{ + } else { errorCount += 1; errorDetail.add(jsonObject); } diff --git a/snowy-web-app/src/main/java/vip/xiaonuo/core/config/GlobalConfigure.java b/snowy-web-app/src/main/java/vip/xiaonuo/core/config/GlobalConfigure.java index 050ae8c4..65ff62ee 100644 --- a/snowy-web-app/src/main/java/vip/xiaonuo/core/config/GlobalConfigure.java +++ b/snowy-web-app/src/main/java/vip/xiaonuo/core/config/GlobalConfigure.java @@ -570,7 +570,7 @@ public class GlobalConfigure implements WebMvcConfigurer { //为空则设置createTime Object createTime = metaObject.getValue(CREATE_TIME); if (ObjectUtil.isNull(createTime)) { - setFieldValByName(CREATE_TIME, new Date(), metaObject); + setFieldValByName(CREATE_TIME, DateTime.now(), metaObject); } } catch (ReflectionException ignored) { } } diff --git a/snowy-web-app/src/main/resources/application.properties b/snowy-web-app/src/main/resources/application.properties index 022bbb64..33e8f287 100644 --- a/snowy-web-app/src/main/resources/application.properties +++ b/snowy-web-app/src/main/resources/application.properties @@ -111,6 +111,7 @@ spring.redis.lettuce.pool.min-idle=0 mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl mybatis-plus.configuration.jdbc-type-for-null=null mybatis-plus.global-config.banner=false +mybatis-plus.global-config.enable-sql-runner=true mybatis-plus.global-config.db-config.id-type=ASSIGN_ID mybatis-plus.global-config.db-config.logic-delete-field=DELETE_FLAG mybatis-plus.global-config.db-config.logic-delete-value=DELETED