jdk 1.8 -> 17, @Component("...") 추가

master
mjkhan21 1 year ago
parent d0f1af19a9
commit d488fbb9d3

@ -12,7 +12,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
<java.version>17</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
@ -120,8 +120,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
<source>${java.version}</source>
<target>${java.version}</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>

@ -211,6 +211,8 @@ public class Menu extends AbstractEntity {
* @return DataObject
*/
public DataObject toDataObject(List<String> urls) {
if (action == null)
action = "";
boolean include = urls.contains(action) || urls.equals(UserInfo.ALL_ACTIONS);
if (!include && Assert.isEmpty(children)) return null;

@ -62,6 +62,8 @@ public class MenuInjector extends RequestInterceptor {
private static final String[] STOP = {"login", "error", "downloadView"};
private String getRespType(HttpServletRequest hreq, ModelAndView mav) {
if (mav == null)
return NONE;
String viewName = mav.getViewName();
for (String stop: STOP) {
if (viewName.contains(stop))

Loading…
Cancel
Save