Skip to content

D
device-back
提交 9795fd52 authored 作者: 133's avatar 133
浏览文件
操作

【zjm】 bug提交

上级 766e3a97
隐藏空白字符变更
内嵌 并排
正在显示 包含 6 行增加 和 3 行删除
dev-file/src/main/java/com/tykj/dev/device/file/util/JavaToPdfHtmlFreeMarker.java
浏览文件 @ 9795fd52
...@@ -325,7 +325,7 @@ public class JavaToPdfHtmlFreeMarker { ...@@ -325,7 +325,7 @@ public class JavaToPdfHtmlFreeMarker {
} }
Long endTime = System.currentTimeMillis(); Long endTime = System.currentTimeMillis();
System.out.print("Itext parse Html to Confirm Pdf End -> " + (endTime - startTime)); System.out.print("Itext parse Html to Confirm Pdf End -> " + (endTime - startTime));
return new FileRet("", pdfPath, preview +"documents/"+ name); return new FileRet("", pdfPath, preview +"confirm/"+ name);
} catch (IOException | DocumentException e) { } catch (IOException | DocumentException e) {
e.printStackTrace(); e.printStackTrace();
} finally { } finally {
...@@ -427,7 +427,7 @@ public class JavaToPdfHtmlFreeMarker { ...@@ -427,7 +427,7 @@ public class JavaToPdfHtmlFreeMarker {
} }
Long endTime = System.currentTimeMillis(); Long endTime = System.currentTimeMillis();
System.out.print("Itext parse Html to Destruction Pdf End -> " + (endTime - startTime)); System.out.print("Itext parse Html to Destruction Pdf End -> " + (endTime - startTime));
return new FileRet("", pdfPath, preview +"documents/"+ name); return new FileRet("", pdfPath, preview +"destruction/"+ name);
} catch (IOException | DocumentException e) { } catch (IOException | DocumentException e) {
e.printStackTrace(); e.printStackTrace();
} finally { } finally {
......
dev-union/src/main/resources/bill.html
浏览文件 @ 9795fd52
...@@ -277,6 +277,9 @@ ...@@ -277,6 +277,9 @@
.evenrowcolor{ .evenrowcolor{
background-color:#fafafa; background-color:#fafafa;
} }
tr:nth-child(odd) {
background: #fafafa;
}
</style> </style>
</head> </head>
<body> <body>
......
dev-user/src/main/java/com/tykj/dev/device/user/config/SecurityConfig.java
浏览文件 @ 9795fd52
...@@ -146,7 +146,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { ...@@ -146,7 +146,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
@Override @Override
public void configure(WebSecurity web) { public void configure(WebSecurity web) {
//swagger静态资源访问 //swagger静态资源访问
web.ignoring().antMatchers("/v2/api-docs", "/v2/api-docs-ext", "/configuration/ui", "/swagger-resources/**", "/configuration/security", "/swagger-ui/", "/swagger-ui/**", "/swagger-ui.html", "/doc.html", "/webjars/**", "/swagger-resources/configuration/ui", "**/swagge‌​r-ui.html", "/static/**", "/**/index.html", "**/index.html", "/index.html", "/js/**", "/css/**", "/fonds/**", "/img/**","/access/send","/user/s","/equip/file/llq/"); web.ignoring().antMatchers("/v2/api-docs", "/v2/api-docs-ext", "/configuration/ui", "/swagger-resources/**", "/configuration/security", "/swagger-ui/", "/swagger-ui/**", "/swagger-ui.html", "/doc.html", "/webjars/**", "/swagger-resources/configuration/ui", "**/swagge‌​r-ui.html", "/static/**", "/**/index.html", "**/index.html", "/index.html", "/js/**", "/css/**", "/fonds/**", "/img/**","/access/send","/user/s","/equip/file/llq/**");
} }
@Bean @Bean
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论