提交 a6a427de authored 作者: taojinlong's avatar taojinlong

Merge branch 'main' of github.com:dataease/dataease into main

上级 84833b07
...@@ -107,7 +107,7 @@ public class AuthServer implements AuthApi { ...@@ -107,7 +107,7 @@ public class AuthServer implements AuthApi {
public String test() { public String test() {
SysUserEntity userById = authUserService.getUserById(4L); SysUserEntity userById = authUserService.getUserById(4L);
String nickName = userById.getNickName(); String nickName = userById.getNickName();
System.out.println(nickName); // System.out.println(nickName);
/* Map<String, DePluginXpackService> beansOfType = SpringContextUtil.getApplicationContext().getBeansOfType(DePluginXpackService.class); /* Map<String, DePluginXpackService> beansOfType = SpringContextUtil.getApplicationContext().getBeansOfType(DePluginXpackService.class);
for (Map.Entry entry : beansOfType.entrySet()) { for (Map.Entry entry : beansOfType.entrySet()) {
Object key = entry.getKey(); Object key = entry.getKey();
......
...@@ -97,10 +97,10 @@ public class JWTUtils { ...@@ -97,10 +97,10 @@ public class JWTUtils {
isExpire = now - lastOperateTime > Login_Interval; isExpire = now - lastOperateTime > Login_Interval;
} }
if (isExpire) { if (isExpire) {
System.out.println("-----------------------"); // System.out.println("-----------------------");
System.out.println("-----上次操作时间是["+lastOperateTime+"]-----"); // System.out.println("-----上次操作时间是["+lastOperateTime+"]-----");
System.out.println("-----当前操作时间是["+now+"]-----"); // System.out.println("-----当前操作时间是["+now+"]-----");
System.out.println("-----------------------"); // System.out.println("-----------------------");
} }
return isExpire; return isExpire;
} }
......
...@@ -96,19 +96,19 @@ public class DateUtils { ...@@ -96,19 +96,19 @@ public class DateUtils {
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
System.out.println("start:"); // System.out.println("start:");
Date paramTime = getTime(getTimeString(new Long("1607672440731"))); Date paramTime = getTime(getTimeString(new Long("1607672440731")));
Map<String, Date> weekDate = getWeedFirstTimeAndLastTime(paramTime); Map<String, Date> weekDate = getWeedFirstTimeAndLastTime(paramTime);
for (Map.Entry<String, Date> entry : for (Map.Entry<String, Date> entry :
weekDate.entrySet()) { weekDate.entrySet()) {
System.out.println(entry.getKey() + ":" + getTimeString(entry.getValue())+":"+entry.getValue().getTime()); // System.out.println(entry.getKey() + ":" + getTimeString(entry.getValue())+":"+entry.getValue().getTime());
} }
long countTimeLong = new Long("1607672440731"); long countTimeLong = new Long("1607672440731");
System.out.println(getTimeString(--countTimeLong)); // System.out.println(getTimeString(--countTimeLong));
} }
......
...@@ -48,7 +48,7 @@ public class DeFileUtils { ...@@ -48,7 +48,7 @@ public class DeFileUtils {
// 检测是否存在目录 // 检测是否存在目录
if (!dest.getParentFile().exists()) { if (!dest.getParentFile().exists()) {
if (!dest.getParentFile().mkdirs()) { if (!dest.getParentFile().mkdirs()) {
System.out.println("was not successful."); // System.out.println("was not successful.");
} }
} }
// 文件写入 // 文件写入
......
...@@ -30,15 +30,12 @@ public class ZipUtils { ...@@ -30,15 +30,12 @@ public class ZipUtils {
while (ze != null) { while (ze != null) {
String fileName = ze.getName(); String fileName = ze.getName();
File newFile = new File(outputFolder + File.separator + fileName); File newFile = new File(outputFolder + File.separator + fileName);
System.out.println("file unzip : " + newFile.getAbsoluteFile());
//大部分网络上的源码,这里没有判断子目录 //大部分网络上的源码,这里没有判断子目录
if (ze.isDirectory()) { if (ze.isDirectory()) {
if (!newFile.mkdirs()) { if (!newFile.mkdirs()) {
System.out.println("was not successful.");
} }
} else { } else {
if (!new File(newFile.getParent()).mkdirs()) { if (!new File(newFile.getParent()).mkdirs()) {
System.out.println("was not successful.");
} }
FileOutputStream fos = new FileOutputStream(newFile); FileOutputStream fos = new FileOutputStream(newFile);
int len; int len;
...@@ -51,7 +48,6 @@ public class ZipUtils { ...@@ -51,7 +48,6 @@ public class ZipUtils {
} }
zis.closeEntry(); zis.closeEntry();
zis.close(); zis.close();
System.out.println("Done");
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
...@@ -68,14 +64,12 @@ public class ZipUtils { ...@@ -68,14 +64,12 @@ public class ZipUtils {
if (entry.isDirectory()) { if (entry.isDirectory()) {
if (!file.mkdirs()) { if (!file.mkdirs()) {
System.out.println("was not successful.");
} }
} else { } else {
File parent = file.getParentFile(); File parent = file.getParentFile();
if (!parent.exists()) { if (!parent.exists()) {
if (!parent.mkdirs()) { if (!parent.mkdirs()) {
System.out.println("was not successful.");
} }
} }
...@@ -107,7 +101,6 @@ public class ZipUtils { ...@@ -107,7 +101,6 @@ public class ZipUtils {
File desDir = new File(folderPath); File desDir = new File(folderPath);
if (!desDir.exists()) { if (!desDir.exists()) {
if (!desDir.mkdirs()) { if (!desDir.mkdirs()) {
System.out.println("was not successful.");
} }
} }
ZipFile zf = new ZipFile(zipFile); ZipFile zf = new ZipFile(zipFile);
...@@ -120,7 +113,6 @@ public class ZipUtils { ...@@ -120,7 +113,6 @@ public class ZipUtils {
File fileParentDir = desFile.getParentFile(); File fileParentDir = desFile.getParentFile();
if (!fileParentDir.exists()) { if (!fileParentDir.exists()) {
if (!fileParentDir.mkdirs()) { if (!fileParentDir.mkdirs()) {
System.out.println("was not successful.");
} }
} }
} }
......
...@@ -139,7 +139,7 @@ public class ModuleClassLoader extends URLClassLoader { ...@@ -139,7 +139,7 @@ public class ModuleClassLoader extends URLClassLoader {
SpringContextUtil.getBeanFactory().registerBeanDefinition(beanName,beanDefinition); SpringContextUtil.getBeanFactory().registerBeanDefinition(beanName,beanDefinition);
registeredBean.add(beanName); registeredBean.add(beanName);
System.out.println("注册bean:"+beanName); // System.out.println("注册bean:"+beanName);
} }
} }
......
...@@ -265,6 +265,6 @@ public class SystemParameterService { ...@@ -265,6 +265,6 @@ public class SystemParameterService {
public static void main(String[] args) { public static void main(String[] args) {
String info="[{\"paramKey\":\"base.url\",\"paramValue\":null,\"type\":\"text\",\"sort\":1,\"file\":null,\"fileName\":null},{\"paramKey\":\"base.title\",\"paramValue\":\"DataEase Title\",\"type\":\"text\",\"sort\":3,\"file\":null,\"fileName\":null},{\"paramKey\":\"base.logo\",\"paramValue\":\"DataEase\",\"type\":\"text\",\"sort\":4,\"file\":null,\"fileName\":\"favicon.icon.png\"}]"; String info="[{\"paramKey\":\"base.url\",\"paramValue\":null,\"type\":\"text\",\"sort\":1,\"file\":null,\"fileName\":null},{\"paramKey\":\"base.title\",\"paramValue\":\"DataEase Title\",\"type\":\"text\",\"sort\":3,\"file\":null,\"fileName\":null},{\"paramKey\":\"base.logo\",\"paramValue\":\"DataEase\",\"type\":\"text\",\"sort\":4,\"file\":null,\"fileName\":\"favicon.icon.png\"}]";
List<SystemParameterDTO> temp = JSON.parseArray(info,SystemParameterDTO.class); List<SystemParameterDTO> temp = JSON.parseArray(info,SystemParameterDTO.class);
System.out.println("===>"); // System.out.println("===>");
} }
} }
...@@ -56,9 +56,9 @@ rsa.public_key=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANL378k3RiZHWx5AfJqdH9xRNBmD9wGD2 ...@@ -56,9 +56,9 @@ rsa.public_key=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANL378k3RiZHWx5AfJqdH9xRNBmD9wGD2
spring.cache.type=ehcache spring.cache.type=ehcache
spring.cache.ehcache.config=classpath:/ehcache/ehcache.xml spring.cache.ehcache.config=classpath:/ehcache/ehcache.xml
#打印URL路径 #打印URL路径
logging.level.org.springframework.web=trace #logging.level.org.springframework.web=trace
logging.level.org.springframework.boot.web=trace #logging.level.org.springframework.boot.web=trace
spring.mvc.log-request-details=true #spring.mvc.log-request-details=true
pagehelper.PageRowBounds=true pagehelper.PageRowBounds=true
#excel等用户上传文件路径 #excel等用户上传文件路径
upload.file.path=/opt/dataease/data/kettle/ upload.file.path=/opt/dataease/data/kettle/
......
...@@ -74,7 +74,7 @@ export default { ...@@ -74,7 +74,7 @@ export default {
}, },
save() { save() {
if (!this.templateInfo.pid) { if (!this.templateInfo.pid) {
this.$warning(this.$t(panel.pls_select_belong_to_category)) this.$warning(this.$t('panel.pls_select_belong_to_category'))
return false return false
} }
if (!this.templateInfo.name) { if (!this.templateInfo.name) {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论