gitee
/
snowy
mirror of https://gitee.com/xiaonuobase/snowy
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【更新】优化一些细节

pull/120/head
xuyuxiang 2023-05-10 16:39:26 +08:00
parent c4dae1ea1a
commit 3c31705d76
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
snowy-common/src/main/java/vip/xiaonuo/common/util/CommonTimeFormatUtil.java
View File

@ -127,11 +127,11 @@ public class CommonTimeFormatUtil {
long seconds = secondsParam % ONE_MINUTE_SECONDS; long seconds = secondsParam % ONE_MINUTE_SECONDS;
if(days > 0) { if(days > 0) {
result = days + "天" + hours + "小时" + minutes + "分钟" + seconds + "秒"; result = days + "天" + hours + "小时" + minutes + "分钟" + seconds + "秒";
}else if(hours > 0) { } else if(hours > 0) {
result = hours + "小时" + minutes + "分钟" + seconds + "秒"; result = hours + "小时" + minutes + "分钟" + seconds + "秒";
}else if(minutes > 0) { } else if(minutes > 0) {
result = minutes + "分钟" + seconds + "秒"; result = minutes + "分钟" + seconds + "秒";
}else{ } else {
result = seconds + "秒"; result = seconds + "秒";
} }
return result; return result;

2
snowy-plugin/snowy-plugin-gen/src/main/java/vip/xiaonuo/gen/modular/basic/service/impl/GenBasicServiceImpl.java
View File

@ -308,7 +308,7 @@ public class GenBasicServiceImpl extends ServiceImpl<GenBasicMapper, GenBasic> i
DatabaseMetaData metaData = conn.getMetaData(); DatabaseMetaData metaData = conn.getMetaData();
String url = metaData.getURL(); String url = metaData.getURL();
String schema = null; String schema = null;
if (url.toLowerCase().contains("oracle")) { if (url.toLowerCase().contains("jdbc:oracle")) {
schema = metaData.getUserName(); schema = metaData.getUserName();
} }
List<GenBasicTableColumnResult> columns = new ArrayList<>(); List<GenBasicTableColumnResult> columns = new ArrayList<>();

2
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java
View File

@ -1025,7 +1025,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
JSONObject jsonObject = this.doImport(allUserList, sysUserImportParamList.get(i), i); JSONObject jsonObject = this.doImport(allUserList, sysUserImportParamList.get(i), i);
if(jsonObject.getBool("success")) { if(jsonObject.getBool("success")) {
successCount += 1; successCount += 1;
} else{ } else {
errorCount += 1; errorCount += 1;
errorDetail.add(jsonObject); errorDetail.add(jsonObject);
} }

2
snowy-web-app/src/main/java/vip/xiaonuo/core/config/GlobalConfigure.java
View File

@ -570,7 +570,7 @@ public class GlobalConfigure implements WebMvcConfigurer {
//为空则设置createTime //为空则设置createTime
Object createTime = metaObject.getValue(CREATE_TIME); Object createTime = metaObject.getValue(CREATE_TIME);
if (ObjectUtil.isNull(createTime)) { if (ObjectUtil.isNull(createTime)) {
setFieldValByName(CREATE_TIME, new Date(), metaObject); setFieldValByName(CREATE_TIME, DateTime.now(), metaObject);
} }
} catch (ReflectionException ignored) { } } catch (ReflectionException ignored) { }
} }

1
snowy-web-app/src/main/resources/application.properties
View File

@ -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.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
mybatis-plus.configuration.jdbc-type-for-null=null mybatis-plus.configuration.jdbc-type-for-null=null
mybatis-plus.global-config.banner=false 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.id-type=ASSIGN_ID
mybatis-plus.global-config.db-config.logic-delete-field=DELETE_FLAG mybatis-plus.global-config.db-config.logic-delete-field=DELETE_FLAG
mybatis-plus.global-config.db-config.logic-delete-value=DELETED mybatis-plus.global-config.db-config.logic-delete-value=DELETED