diff --git a/build.gradle b/build.gradle index 37bde79..791ff3d 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { } jar { - archivesBaseName='seminar' + archivesBaseName = 'seminar' } repositories { @@ -15,8 +15,8 @@ repositories { } } -sourceCompatibility = 17 -targetCompatibility = 17 +sourceCompatibility = 11 +targetCompatibility = 11 dependencies { ext { diff --git a/data/db.mv.db b/data/db.mv.db index 8a678ee..d0caecb 100644 Binary files a/data/db.mv.db and b/data/db.mv.db differ diff --git a/src/main/java/ru/ulstu/configuration/MvcConfiguration.java b/src/main/java/ru/ulstu/configuration/MvcConfiguration.java index 9154347..292b005 100644 --- a/src/main/java/ru/ulstu/configuration/MvcConfiguration.java +++ b/src/main/java/ru/ulstu/configuration/MvcConfiguration.java @@ -24,6 +24,7 @@ public class MvcConfiguration implements WebMvcConfigurer { registry.addViewController("/loginError"); registry.addViewController("/index"); registry.addViewController("/admin"); + registry.addViewController("/docs"); registry.addViewController("/editNews"); } diff --git a/src/main/java/ru/ulstu/configuration/SecurityConfiguration.java b/src/main/java/ru/ulstu/configuration/SecurityConfiguration.java index 33b2cd9..2674025 100644 --- a/src/main/java/ru/ulstu/configuration/SecurityConfiguration.java +++ b/src/main/java/ru/ulstu/configuration/SecurityConfiguration.java @@ -45,7 +45,7 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter { log.debug("Security enabled"); http.authorizeRequests() .antMatchers("/").permitAll() - .antMatchers("/login", "/index", "/news/**", "/meetings/**", "/files/**", "/h2-console/*", "/h2-console").permitAll() + .antMatchers("/login", "/index", "/news/**", "/meetings/**", "/files/**", "/docs/**", "/h2-console/*", "/h2-console").permitAll() .antMatchers("/swagger-ui.html").hasAuthority(UserRoleConstants.ADMIN) .anyRequest().authenticated() .and() diff --git a/src/main/resources/public/docs/polozh.docx b/src/main/resources/public/docs/polozh.docx new file mode 100644 index 0000000..58d8c75 Binary files /dev/null and b/src/main/resources/public/docs/polozh.docx differ diff --git a/src/main/resources/templates/default.html b/src/main/resources/templates/default.html index 505c93c..dbba1e2 100644 --- a/src/main/resources/templates/default.html +++ b/src/main/resources/templates/default.html @@ -38,6 +38,9 @@ + diff --git a/src/main/resources/templates/docs.html b/src/main/resources/templates/docs.html new file mode 100644 index 0000000..7a7d63b --- /dev/null +++ b/src/main/resources/templates/docs.html @@ -0,0 +1,14 @@ + + + + +
+ + Положение + +
+