#13 -- add model, repository and service for members

README.md

@@ -1,9 +1,2 @@
 # seminar
 
-JDK: https://download.oracle.com/java/17/archive/jdk-17.0.6_windows-x64_bin.exe
-
-IDE: IntelliJIDEA community version https://www.jetbrains.com/ru-ru/idea/download/#section=windows
-
-To run: run project and open http://localhost:8080/
-
-Demo: http://seminar.athene.tech

build.gradle

@@ -1,42 +1,45 @@
 plugins {
     id 'java'
-    id 'org.springframework.boot' version '3.4.2'
-    id 'io.spring.dependency-management' version '1.1.7'
+    id 'io.spring.dependency-management' version '1.0.11.RELEASE'
+    id 'org.springframework.boot' version '2.6.4'
 }
 
-group = 'ru.ulstu'
-version = '0.0.1-SNAPSHOT'
-
-java {
-    toolchain {
-        languageVersion = JavaLanguageVersion.of(21)
-    }
+jar {
+    archivesBaseName = 'seminar'
 }
 
 repositories {
     maven {
-        url = uri("http://repo.athene.tech/repository/maven-central/")
+        url "http://repo.athene.tech/repository/maven-central/"
         allowInsecureProtocol(true)
     }
 }
+
+sourceCompatibility = 11
+targetCompatibility = 11
+
 dependencies {
-    implementation 'org.springframework.boot:spring-boot-starter'
-    implementation 'org.springframework.boot:spring-boot-starter-web'
+    ext {
+        versionSLF4J = '1.7.24'
+        versionJetty = '9.3.16.v20170120'
+        versionJackson = '2.9.4'
+        versionSwagger = '2.5.0'
+    }
+
+    implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web'
     implementation group: 'org.springframework.boot', name: 'spring-boot-starter-jetty'
     implementation group: 'org.springframework.boot', name: 'spring-boot-starter-thymeleaf'
     implementation group: 'org.springframework.boot', name: 'spring-boot-starter-validation'
     implementation group: 'org.springframework.boot', name:'spring-boot-starter-data-jpa'
     implementation group: 'org.springframework.boot', name: 'spring-boot-starter-security'
-    implementation group: 'org.slf4j', name: 'slf4j-api'
-    implementation group: 'nz.net.ultraq.thymeleaf', name: 'thymeleaf-layout-dialect'
-    implementation group: 'org.thymeleaf.extras', name: 'thymeleaf-extras-springsecurity6'
+    implementation group: 'org.slf4j', name: 'slf4j-api', version: versionSLF4J
+    implementation group: 'nz.net.ultraq.thymeleaf', name: 'thymeleaf-layout-dialect', version: '3.1.0'
+    implementation group: 'org.thymeleaf.extras', name: 'thymeleaf-extras-springsecurity5'
     implementation group: 'com.h2database', name:'h2'
-    implementation group: 'jakarta.xml.bind', name: 'jakarta.xml.bind-api', version: '4.0.2'
-    implementation group: 'org.javassist', name: 'javassist', version: '3.30.2-GA'
-    implementation group: 'com.fasterxml.jackson.module', name: 'jackson-module-blackbird'
-    implementation group: 'com.fasterxml.jackson.core', name: 'jackson-core', version: '2.13.2'
+    implementation group: 'javax.xml.bind', name: 'jaxb-api'
+    implementation group: 'org.javassist', name: 'javassist'
 
-    implementation group: 'org.eclipse.jetty', name: 'jetty-servlets', version: '11.0.24'
+    implementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: versionJetty
 
     implementation group: 'org.webjars', name: 'jquery', version: '3.6.0'
     implementation group: 'org.webjars', name: 'bootstrap', version: '4.3.0'
@@ -46,12 +49,7 @@ dependencies {
     implementation group: 'org.webjars', name: 'momentjs', version: '2.24.0'
     implementation group: 'org.webjars', name: 'bootstrap-glyphicons', version: 'bdd2cbfba0'
 
-    testImplementation 'org.springframework.boot:spring-boot-starter-test'
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
-}
-
-tasks.named('test') {
-    useJUnitPlatform()
+    testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test'
 }
 
     

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,6 @@
+#Mon Dec 28 10:00:20 PST 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
-networkTimeout=10000
-validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip

src/main/java/ru/ulstu/configuration/SecurityConfiguration.java

@@ -2,52 +2,85 @@ package ru.ulstu.configuration;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.context.annotation.Bean;
+import org.springframework.beans.factory.BeanInitializationException;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.builders.WebSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
-import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer;
-import org.springframework.security.web.SecurityFilterChain;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
+import org.springframework.security.web.authentication.logout.LogoutSuccessHandler;
 import ru.ulstu.model.UserRoleConstants;
+import ru.ulstu.user.UserService;
 
 @Configuration
 @EnableWebSecurity
 @EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true)
-public class SecurityConfiguration {
+public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
     private final Logger log = LoggerFactory.getLogger(SecurityConfiguration.class);
-    private final String[] permittedUrls = new String[]{
-            "/login", "/index", "/news/**",
-            "/meetings/**", "/files/**", "/docs/**",
-            "/public/**", "/organizers", "/webjars/**",
-            "/h2-console/*", "/h2-console",
-            "/css/**", "/js/**", "/img/**",
-            "/templates/**", "/webjars/**"};
 
-    @Bean
-    public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
-        log.debug("Security enabled");
+    private final UserService userService;
+    private final BCryptPasswordEncoder bCryptPasswordEncoder;
+    private final AuthenticationSuccessHandler authenticationSuccessHandler;
+    private final LogoutSuccessHandler logoutSuccessHandler;
 
-        http
-                .headers(headers -> headers.frameOptions(HeadersConfigurer.FrameOptionsConfig::disable))
-                .csrf(AbstractHttpConfigurer::disable)
-                .authorizeHttpRequests(auth ->
-                        auth.requestMatchers("/").permitAll()
-                                .requestMatchers(permittedUrls).permitAll()
-                                .requestMatchers("/swagger-ui.html").hasAuthority(UserRoleConstants.ADMIN)
-                                .anyRequest().authenticated())
-                .formLogin(form ->
-                        form.loginPage("/login")
-                                .failureUrl("/loginError")
-                                .permitAll())
-                .logout(logout ->
-                        logout
-                                .logoutSuccessUrl(Constants.LOGOUT_URL)
-                                .invalidateHttpSession(false)
-                                .clearAuthentication(true)
-                                .deleteCookies(Constants.COOKIES_NAME)
-                                .permitAll());
-        return http.build();
+    public SecurityConfiguration(UserService userService,
+                                 BCryptPasswordEncoder bCryptPasswordEncoder,
+                                 AuthenticationSuccessHandler authenticationSuccessHandler,
+                                 LogoutSuccessHandler logoutSuccessHandler) {
+        this.userService = userService;
+        this.bCryptPasswordEncoder = bCryptPasswordEncoder;
+        this.authenticationSuccessHandler = authenticationSuccessHandler;
+        this.logoutSuccessHandler = logoutSuccessHandler;
     }
-}
+
+    @Override
+    protected void configure(HttpSecurity http) throws Exception {
+        http.csrf().disable();
+        http.headers().frameOptions().disable();
+        log.debug("Security enabled");
+        http.authorizeRequests()
+                .antMatchers("/").permitAll()
+                .antMatchers("/login", "/index", "/news/**", "/meetings/**", "/files/**", "/docs/**",
+                        "/public/**", "/organizers", "/webjars/**", "/h2-console/*", "/h2-console").permitAll()
+                .antMatchers("/swagger-ui.html").hasAuthority(UserRoleConstants.ADMIN)
+                .anyRequest().authenticated()
+                .and()
+                .formLogin()
+                .loginPage("/login")
+                .failureUrl("/loginError")
+                .successHandler(authenticationSuccessHandler)
+                .permitAll()
+                .and()
+                .logout()
+                .logoutSuccessHandler(logoutSuccessHandler)
+                .logoutSuccessUrl(Constants.LOGOUT_URL)
+                .invalidateHttpSession(false)
+                .clearAuthentication(true)
+                .deleteCookies(Constants.COOKIES_NAME)
+                .permitAll();
+    }
+
+    @Override
+    public void configure(WebSecurity web) {
+        web.ignoring()
+                .antMatchers("/css/**")
+                .antMatchers("/js/**")
+                .antMatchers("/img/**")
+                .antMatchers("/templates/**")
+                .antMatchers("/webjars/**");
+    }
+
+    @Autowired
+    public void configureGlobal(AuthenticationManagerBuilder auth) {
+        try {
+            auth.userDetailsService(userService).passwordEncoder(bCryptPasswordEncoder);
+        } catch (Exception e) {
+            throw new BeanInitializationException("Security configuration failed", e);
+        }
+    }
+}

src/main/java/ru/ulstu/configuration/TemplateConfiguration.java

@@ -9,8 +9,8 @@ package ru.ulstu.configuration;
 import nz.net.ultraq.thymeleaf.layoutdialect.LayoutDialect;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.thymeleaf.extras.springsecurity6.dialect.SpringSecurityDialect;
-import org.thymeleaf.spring6.SpringTemplateEngine;
+import org.thymeleaf.extras.springsecurity5.dialect.SpringSecurityDialect;
+import org.thymeleaf.spring5.SpringTemplateEngine;
 import org.thymeleaf.templateresolver.ITemplateResolver;
 
 @Configuration

src/main/java/ru/ulstu/meeting/Meeting.java

@@ -1,16 +1,16 @@
 package ru.ulstu.meeting;
 
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.Lob;
-import jakarta.persistence.OneToOne;
-import jakarta.persistence.Transient;
-import jakarta.validation.constraints.NotEmpty;
 import org.springframework.format.annotation.DateTimeFormat;
 import ru.ulstu.model.BaseEntity;
 import ru.ulstu.news.News;
 
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
+import javax.persistence.OneToOne;
+import javax.persistence.Transient;
+import javax.validation.constraints.NotEmpty;
 import java.util.Date;
 
 @Entity

src/main/java/ru/ulstu/meeting/MeetingController.java

@@ -6,7 +6,6 @@
 
 package ru.ulstu.meeting;
 
-import jakarta.validation.Valid;
 import org.springframework.data.domain.Page;
 import org.springframework.security.access.annotation.Secured;
 import org.springframework.stereotype.Controller;
@@ -21,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import ru.ulstu.model.OffsetablePageRequest;
 import ru.ulstu.model.UserRoleConstants;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -70,7 +70,8 @@ public class MeetingController {
 
     @PostMapping("saveMeeting")
     @Secured({UserRoleConstants.ADMIN})
-    public String saveNews(@Valid @ModelAttribute Meeting meeting, BindingResult result) {
+    public String saveNews(@Valid @ModelAttribute Meeting meeting,
+                           BindingResult result) {
         if (result.hasErrors()) {
             return "editMeeting";
         }

src/main/java/ru/ulstu/meeting/MeetingService.java

@@ -1,13 +1,14 @@
 package ru.ulstu.meeting;
 
-import jakarta.transaction.Transactional;
-import jakarta.validation.constraints.NotNull;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import ru.ulstu.news.News;
 import ru.ulstu.news.NewsService;
 
+import javax.transaction.Transactional;
+import javax.validation.constraints.NotNull;
+
 @Service
 public class MeetingService {
     private final MeetingRepository meetingRepository;

src/main/java/ru/ulstu/members/Member.java

@@ -0,0 +1,40 @@
+package ru.ulstu.members;
+
+import org.springframework.web.multipart.MultipartFile;
+import ru.ulstu.model.BaseEntity;
+
+import javax.persistence.Entity;
+import javax.persistence.Transient;
+
+@Entity
+public class Member extends BaseEntity {
+    private String name;
+    private String imageFileName;
+    @Transient
+    private MultipartFile imageFile;
+
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getImageFileName() {
+        return imageFileName;
+    }
+
+    public void setImageFileName(String imageFileName) {
+        this.imageFileName = imageFileName;
+    }
+
+    public MultipartFile getImageFile() {
+        return imageFile;
+    }
+
+    public void setImageFile(MultipartFile imageFile) {
+        this.imageFile = imageFile;
+    }
+}

src/main/java/ru/ulstu/members/MembersRepository.java

@@ -0,0 +1,6 @@
+package ru.ulstu.members;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface MembersRepository extends JpaRepository<Member, Integer> {
+}

src/main/java/ru/ulstu/members/MembersService.java

@@ -0,0 +1,37 @@
+package ru.ulstu.members;
+
+import org.springframework.stereotype.Service;
+import ru.ulstu.files.FileSystemStorageService;
+import ru.ulstu.files.FileUtil;
+
+import java.io.IOException;
+
+@Service
+public class MembersService {
+
+    private final MembersRepository membersRepository;
+
+    public MembersService(MembersRepository membersRepository) {
+        this.membersRepository = membersRepository;
+    }
+
+    public Member save(Member member) throws IOException {
+        String fileName = System.currentTimeMillis() + "";
+        if (!member.getImageFile().isEmpty()) {
+            member.setImageFileName(fileName);
+            FileUtil.saveFile(FileSystemStorageService.UPLOAD_DIR, fileName, member.getImageFile());
+        } else {
+            member.setImageFileName(member.getImageFileName().isEmpty() ? "user.png" : member.getImageFileName());
+        }
+
+        if (member.getId() != null && (member.getId() != 0)) {
+            return membersRepository.save(member);
+        } else {
+            return create(member);
+        }
+    }
+
+    public Member create(Member member) {
+        return membersRepository.save(member);
+    }
+}

src/main/java/ru/ulstu/model/BaseEntity.java

@@ -1,12 +1,11 @@
 package ru.ulstu.model;
 
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.MappedSuperclass;
-import jakarta.persistence.Version;
-import jakarta.validation.constraints.NotNull;
-
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+import javax.persistence.Version;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 @MappedSuperclass

src/main/java/ru/ulstu/model/User.java

@@ -1,16 +1,16 @@
 package ru.ulstu.model;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.JoinTable;
-import jakarta.persistence.ManyToMany;
-import jakarta.persistence.Table;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Pattern;
-import jakarta.validation.constraints.Size;
 import ru.ulstu.configuration.Constants;
 
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
+import javax.persistence.Table;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
 import java.util.HashSet;
 import java.util.Set;
 

src/main/java/ru/ulstu/model/UserRole.java

@@ -1,11 +1,11 @@
 package ru.ulstu.model;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
 
 @Entity
 @Table(name = "is_user_roles")

src/main/java/ru/ulstu/model/UserSession.java

@@ -1,14 +1,13 @@
 package ru.ulstu.model;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
-import jakarta.persistence.Table;
-import jakarta.persistence.Temporal;
-import jakarta.persistence.TemporalType;
-import jakarta.validation.constraints.NotNull;
-
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 @Entity

src/main/java/ru/ulstu/news/News.java

@@ -1,13 +1,15 @@
 package ru.ulstu.news;
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.Lob;
-import jakarta.persistence.OneToOne;
-import jakarta.validation.constraints.NotEmpty;
 import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.multipart.MultipartFile;
 import ru.ulstu.meeting.Meeting;
 import ru.ulstu.model.BaseEntity;
 
+import javax.persistence.Entity;
+import javax.persistence.Lob;
+import javax.persistence.OneToOne;
+import javax.persistence.Transient;
+import javax.validation.constraints.NotEmpty;
 import java.util.Date;
 
 @Entity
@@ -24,6 +26,11 @@ public class News extends BaseEntity {
     @NotEmpty(message = "Текст новости не может быть пустым")
     private String text;
 
+    private String imageFileName;
+
+    @Transient
+    private MultipartFile imageFile;
+
     @OneToOne(mappedBy = "news")
     private Meeting meeting;
 
@@ -60,6 +67,22 @@ public class News extends BaseEntity {
         return text;
     }
 
+    public String getImageFileName() {
+        return imageFileName;
+    }
+
+    public void setImageFileName(String imageFileName) {
+        this.imageFileName = imageFileName;
+    }
+
+    public MultipartFile getImageFile() {
+        return imageFile;
+    }
+
+    public void setImageFile(MultipartFile imageFile) {
+        this.imageFile = imageFile;
+    }
+
     public Meeting getMeeting() {
         return meeting;
     }
@@ -67,4 +90,10 @@ public class News extends BaseEntity {
     public void setMeeting(Meeting meeting) {
         this.meeting = meeting;
     }
+
+    public String getPreview() {
+        return text != null && text.length() > MAX_NEWS_TEXT_PREVIEW_LENGTH
+                ? text.substring(0, MAX_NEWS_TEXT_PREVIEW_LENGTH) + "..."
+                : text;
+    }
 }

src/main/java/ru/ulstu/news/NewsController.java

@@ -6,7 +6,6 @@
 
 package ru.ulstu.news;
 
-import jakarta.validation.Valid;
 import org.springframework.data.domain.Page;
 import org.springframework.security.access.annotation.Secured;
 import org.springframework.stereotype.Controller;
@@ -21,6 +20,8 @@ import org.springframework.web.bind.annotation.RequestParam;
 import ru.ulstu.model.OffsetablePageRequest;
 import ru.ulstu.model.UserRoleConstants;
 
+import javax.validation.Valid;
+import java.io.IOException;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -70,7 +71,8 @@ public class NewsController {
 
     @PostMapping("saveNews")
     @Secured({UserRoleConstants.ADMIN})
-    public String saveNews(@Valid @ModelAttribute News news, BindingResult result) {
+    public String saveNews(@Valid @ModelAttribute News news,
+                           BindingResult result) throws IOException {
         if (result.hasErrors()) {
             return "editNews";
         }

src/main/java/ru/ulstu/news/NewsService.java

@@ -1,12 +1,15 @@
 package ru.ulstu.news;
 
-import jakarta.transaction.Transactional;
-import jakarta.validation.constraints.NotNull;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
+import ru.ulstu.files.FileSystemStorageService;
+import ru.ulstu.files.FileUtil;
 import ru.ulstu.meeting.Meeting;
 
+import javax.transaction.Transactional;
+import javax.validation.constraints.NotNull;
+import java.io.IOException;
 import java.util.Date;
 import java.util.List;
 
@@ -34,7 +37,15 @@ public class NewsService {
         return newsRepository.save(news);
     }
 
-    public void save(News news) {
+    public void save(News news) throws IOException {
+        String fileName = System.currentTimeMillis() + "";
+        if (!news.getImageFile().isEmpty()) {
+            news.setImageFileName(fileName);
+            FileUtil.saveFile(FileSystemStorageService.UPLOAD_DIR, fileName, news.getImageFile());
+        } else {
+            news.setImageFileName(news.getImageFileName().isEmpty() ? "logo.png" : news.getImageFileName());
+        }
+
         if (news.getId() != null && (news.getId() != 0)) {
             newsRepository.save(news);
         } else {

src/main/java/ru/ulstu/user/IpAddressResolver.java

@@ -1,8 +1,9 @@
 package ru.ulstu.user;
 
-import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.util.StringUtils;
 
+import javax.servlet.http.HttpServletRequest;
+
 public final class IpAddressResolver {
     private static final String CLIENT_IP_HEADER = "Client-IP";
     private static final String FORWARDED_FOR_HEADER = "X-Forwarded-For";

src/main/java/ru/ulstu/user/UserSessionLoginHandler.java

@@ -1,9 +1,5 @@
 package ru.ulstu.user;
 
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.servlet.http.HttpSession;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.security.core.Authentication;
@@ -12,6 +8,10 @@ import org.springframework.security.web.authentication.SavedRequestAwareAuthenti
 import org.springframework.stereotype.Component;
 import ru.ulstu.configuration.Constants;
 
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 import java.io.IOException;
 
 @Component

src/main/java/ru/ulstu/user/UserSessionLogoutHandler.java

@@ -1,9 +1,5 @@
 package ru.ulstu.user;
 
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.servlet.http.HttpSession;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.security.core.Authentication;
@@ -12,6 +8,10 @@ import org.springframework.security.web.authentication.logout.SimpleUrlLogoutSuc
 import org.springframework.stereotype.Component;
 import ru.ulstu.configuration.Constants;
 
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 import java.io.IOException;
 
 @Component

src/main/resources/application.properties

@@ -3,11 +3,8 @@ spring.main.banner-mode=off
 logging.level.tech.athene=DEBUG
 server.port=8080
 spring.jackson.serialization.WRITE_DATES_AS_TIMESTAMPS=false
-spring.servlet.multipart.max-file-size=2048MB
-spring.servlet.multipart.max-request-size=2048MB
-server.tomcat.max-http-form-post-size=2048MB
-#server.tomcat.max-swallow-size=2048MB
-#server.max-http-header-size=2048MB
+spring.servlet.multipart.max-file-size=100000000
+spring.servlet.multipart.max-request-size=100000000
 # go to  http://localhost:8080/h2-console
 spring.datasource.url=jdbc:h2:file:./data/db
 spring.datasource.driverClassName=org.h2.Driver
@@ -16,3 +13,4 @@ spring.datasource.password=password
 spring.jpa.database-platform=org.hibernate.dialect.H2Dialect
 spring.h2.console.enabled=true
 spring.jpa.hibernate.ddl-auto=update
+spring.jpa.open-in-view=false

src/main/resources/templates/default.html

@@ -6,11 +6,6 @@
     <meta charset="UTF-8"/>
     <title th:text="#{messages.app-name}">app-name</title>
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <script type="text/javascript" src="/webjars/jquery/3.6.0/jquery.min.js"></script>
-    <script type="text/javascript" src="/webjars/bootstrap/4.3.0/js/bootstrap.bundle.min.js"></script>
-    <link rel="stylesheet" href="/webjars/bootstrap/4.3.0/css/bootstrap.min.css"/>
-    <link rel="stylesheet" href="/webjars/font-awesome/4.7.0/css/font-awesome.min.css"/>
-    <link rel="stylesheet" href="/css/main.css"/>
 </head>
 <body>
 <div class="body-container">
@@ -88,7 +83,9 @@
         <div><img src="https://mc.yandex.ru/watch/88139282" style="position:absolute; left:-9999px;" alt=""/></div>
     </noscript>
     <!-- /Yandex.Metrika counter -->
-
+    <script type="text/javascript" src="/webjars/jquery/3.6.0/jquery.min.js"></script>
+    <link rel="stylesheet" href="/webjars/bootstrap/4.3.0/css/bootstrap.min.css"/>
+    <link rel="stylesheet" href="/css/main.css"/>
 </div>
 <footer>
     2022

src/main/resources/templates/editMeeting.html

@@ -32,15 +32,14 @@
     </form>
     <script type="text/javascript" src="/webjars/momentjs/2.24.0/moment.js"></script>
     <script type="text/javascript" src="/webjars/momentjs/2.24.0/locale/ru.js"></script>
+    <script type="text/javascript" src="/webjars/bootstrap/4.3.0/js/bootstrap.bundle.min.js"></script>
     <script type="text/javascript" src="/webjars/bootstrap-select/1.13.8/js/bootstrap-select.min.js"></script>
     <script type="text/javascript"
             src="/webjars/bootstrap-datetimepicker/2.4.4/js/bootstrap-datetimepicker.js"></script>
-    <script type="text/javascript" src="/webjars/summernote/0.8.10/summernote-bs4.js"></script>
     <link rel="stylesheet" href="/webjars/bootstrap-select/1.13.8/css/bootstrap-select.min.css"/>
     <link rel="stylesheet" href="/webjars/font-awesome/4.7.0/css/font-awesome.min.css"/>
     <link rel="stylesheet" href="/webjars/bootstrap-glyphicons/bdd2cbfba0/css/bootstrap-glyphicons.css"/>
     <link rel="stylesheet" href="/webjars/bootstrap-datetimepicker/2.4.4/css/bootstrap-datetimepicker.css"/>
-    <link rel="stylesheet" href="/webjars/summernote/0.8.10/summernote-bs4.css"/>
     <script>
         $(function () {
             $("#date").datetimepicker({
@@ -48,9 +47,7 @@
                 locale: 'ru'
             });
         });
-        $('#text').summernote({
-            height: 300
-        });
+
     </script>
 </div>
 </html>

src/main/resources/templates/editNews.html

@@ -8,6 +8,7 @@
         <input type="hidden" th:field="*{id}">
         <input type="hidden" th:field="*{date}">
         <input type="hidden" th:field="*{version}">
+        <input type="hidden" th:field="*{imageFileName}">
         <div class="form-group">
             <label for="title">Заголовок</label>
             <input type="text" class="form-control" id="title" th:field="*{title}" placeholder="Заголовок новости">
@@ -21,26 +22,26 @@
             <p th:if="${#fields.hasErrors('text')}" th:class="${#fields.hasErrors('text')}? error">
                 Не может быть пустым</p>
         </div>
+        <div class="form-group">
+            <label for="image">Изображение</label>
+            <input type="file" name="imageFile" class="form-control" th:field="*{imageFile}" id="image"
+                   placeholder="Фото новости"/>
 
+            <p th:if="${#fields.hasErrors('imageFile')}" th:class="${#fields.hasErrors('imageFile')} ? error">
+                Ошибка</p>
+        </div>
         <button type="submit" class="btn btn-outline-dark">Сохранить</button>
         <a href="javascript:history.back()" class="btn btn-outline-dark">Отмена</a>
     </form>
     <script type="text/javascript" src="/webjars/momentjs/2.24.0/moment.js"></script>
     <script type="text/javascript" src="/webjars/momentjs/2.24.0/locale/ru.js"></script>
+    <script type="text/javascript" src="/webjars/bootstrap/4.3.0/js/bootstrap.bundle.min.js"></script>
     <script type="text/javascript" src="/webjars/bootstrap-select/1.13.8/js/bootstrap-select.min.js"></script>
     <script type="text/javascript"
             src="/webjars/bootstrap-datetimepicker/2.4.4/js/bootstrap-datetimepicker.js"></script>
-    <script type="text/javascript" src="/webjars/summernote/0.8.10/summernote-bs4.js"></script>
     <link rel="stylesheet" href="/webjars/bootstrap-select/1.13.8/css/bootstrap-select.min.css"/>
     <link rel="stylesheet" href="/webjars/font-awesome/4.7.0/css/font-awesome.min.css"/>
     <link rel="stylesheet" href="/webjars/bootstrap-glyphicons/bdd2cbfba0/css/bootstrap-glyphicons.css"/>
     <link rel="stylesheet" href="/webjars/bootstrap-datetimepicker/2.4.4/css/bootstrap-datetimepicker.css"/>
-    <link rel="stylesheet" href="/webjars/summernote/0.8.10/summernote-bs4.css"/>
-    <script>
-        $('#text').summernote({
-            height: 300
-        });
-
-    </script>
 </div>
 </html>

src/main/resources/templates/index.html

@@ -4,7 +4,10 @@
 <div class="container" layout:fragment="content">
     <div th:each="n : ${news}" class="news">
         <div class="row">
-            <div class="col-md-12">
+            <div class="col-md-4">
+                <img class="news-image" th:src="@{'/files/' + ${n.imageFileName}}"/>
+            </div>
+            <div class="col-md-8">
                 <div class="row">
                     <div class="col-md-10">
                         <a th:if="${n.meeting == null}" th:href="@{'/news/news/' + ${n.id}}" class="link-dark"><h5
@@ -13,13 +16,13 @@
                            class="link-dark"><h5 th:text="${n.title}"/></a>
                     </div>
                 </div>
-                <div th:if="${n.meeting == null}" th:utext="${n.text}" class="news-item"></div>
+                <div th:if="${n.meeting == null}" th:text="${n.preview}" class="news-item"></div>
                 <div th:if="${n.meeting != null}" th:text="${'Тема заседания: ' + n.meeting.title}"
                      class="news-item"></div>
                 <div th:if="${n.meeting != null}"
                      th:text="${'Дата: ' +  #calendars.format(n.meeting.date, 'dd.MM.yyyy HH:mm')}"
                      class="news-item"></div>
-                <div th:if="${n.meeting != null}" th:utext="${n.meeting.text}" class="news-item"></div>
+                <div th:if="${n.meeting != null}" th:text="${n.meeting.text}" class="news-item"></div>
             </div>
         </div>
         <div th:text="${'Опубликовано: ' + #calendars.format(n.date, 'dd.MM.yyyy HH:mm')}"

src/main/resources/templates/meetings.html

@@ -7,7 +7,6 @@
         <div class="row">
             <div class="col-md-10">
                 <a th:href="@{'/meetings/meetings/' + ${m.id}}" class="link-dark"><h5 th:text="${m.title}"/></a>
-                <div th:text="${'Дата заседания: ' + #calendars.format(m.date, 'dd.MM.yyyy HH:mm')}"></div>
             </div>
             <div sec:authorize="hasRole('ROLE_ADMIN')" class="col-md-2" style="text-align: right">
                 <a th:href="@{'/meetings/editMeeting/' + ${m.id}}" class="link-dark">
@@ -30,5 +29,6 @@
            th:text=${pageNumber}
            th:class="${pageNumber == meetings.number+1} ? active"></a>
     </div>
+
 </div>
 </html>

src/main/resources/templates/news.html

@@ -5,7 +5,10 @@
 <div class="container" layout:fragment="content">
     <div th:each="n : ${news}" class="news">
         <div class="row">
-            <div class="col-md-12">
+            <div class="col-md-4">
+                <img class="news-image" th:src="@{'/files/' + ${n.imageFileName}}"/>
+            </div>
+            <div class="col-md-8">
                 <div class="row">
                     <div class="col-md-10">
                         <a th:if="${n.meeting == null}" th:href="@{'/news/news/' + ${n.id}}" class="link-dark"><h5
@@ -23,13 +26,13 @@
                         </a>
                     </div>
                 </div>
-                <div th:if="${n.meeting == null}" th:utext="${n.text}" class="news-item"></div>
+                <div th:if="${n.meeting == null}" th:text="${n.preview}" class="news-item"></div>
                 <div th:if="${n.meeting != null}" th:text="${'Тема заседания: ' + n.meeting.title}"
                      class="news-item"></div>
                 <div th:if="${n.meeting != null}"
                      th:text="${'Дата: ' +  #calendars.format(n.meeting.date, 'dd.MM.yyyy HH:mm')}"
                      class="news-item"></div>
-                <div th:if="${n.meeting != null}" th:utext="${n.meeting.text}" class="news-item"></div>
+                <div th:if="${n.meeting != null}" th:text="${n.meeting.text}" class="news-item"></div>
             </div>
         </div>
         <div th:text="${'Опубликовано: ' + #calendars.format(n.date, 'dd.MM.yyyy HH:mm')}"

src/main/resources/templates/viewMeeting.html

@@ -4,9 +4,12 @@
         layout:decorate="~{default}">
 <div class="container" layout:fragment="content">
     <div class="row">
-        <div class="col-md-12">
+        <div class="col-md-4">
+            <img class="news-image" src="/img/logo.svg"/>
+        </div>
+        <div class="col-md-8">
             <h5 th:text="${meeting.title}"/>
-            <div th:utext="${meeting.text}" class="news-item"></div>
+            <div th:text="${meeting.text}" class="news-item"></div>
         </div>
     </div>
     <a href="javascript:history.back()" class="btn btn-outline-dark" style="text-align: right">Назад</a>

src/main/resources/templates/viewNews.html

@@ -4,9 +4,12 @@
         layout:decorate="~{default}">
 <div class="container" layout:fragment="content">
     <div class="row">
-        <div class="col-md-12">
+        <div class="col-md-4">
+            <img class="news-image" th:src="@{'/files/' + ${news.imageFileName}}"/>
+        </div>
+        <div class="col-md-8">
             <h5 th:text="${news.title}"/>
-            <div th:utext="${news.text}" class="news-item"></div>
+            <div th:text="${news.text}" class="news-item"></div>
         </div>
     </div>
     <div th:text="${'Опубликовано: ' + #calendars.format(news.date, 'dd.MM.yyyy HH:mm')}"