diff --git a/src/main/java/osm/surveyor/task/city/CityController.java b/src/main/java/osm/surveyor/task/city/CityController.java index 21f68c4..874d527 100644 --- a/src/main/java/osm/surveyor/task/city/CityController.java +++ b/src/main/java/osm/surveyor/task/city/CityController.java @@ -17,36 +17,36 @@ public class CityController { private final CityRepository repository; - @GetMapping("/city") + @GetMapping("/task-bldg/city") public String showList(Model model) { model.addAttribute("cities", repository.findAll()); return "cities"; } - @GetMapping("/city/add") + @GetMapping("/task-bldg/city/add") public String addCity(@ModelAttribute City city) { return "form"; } - @PostMapping("/city/process") + @PostMapping("/task-bldg/city/process") public String process(@Validated @ModelAttribute City city, BindingResult result) { if (result.hasErrors()) { return "form"; } repository.save(city); - return "redirect:/city"; + return "redirect:/task-bldg/city"; } - @GetMapping("/city/edit/{citycode}") + @GetMapping("/task-bldg/city/edit/{citycode}") public String editCity(@PathVariable String citycode, Model model) { model.addAttribute("city", repository.findByCitycode(citycode)); return "form"; } - @GetMapping("/city/delete/{citycode}") + @GetMapping("/task-bldg/city/delete/{citycode}") public String deleteCity(@PathVariable String citycode) { repository.deleteByCitycode(citycode); - return "redirect:/city"; + return "redirect:/task-bldg/city"; } } diff --git a/src/main/java/osm/surveyor/task/city/CitymeshController.java b/src/main/java/osm/surveyor/task/city/CitymeshController.java index 8e7f036..0ba8f2d 100644 --- a/src/main/java/osm/surveyor/task/city/CitymeshController.java +++ b/src/main/java/osm/surveyor/task/city/CitymeshController.java @@ -17,7 +17,7 @@ private final CitymeshRepository meshRepository; private final CityRepository cityRepository; - @GetMapping("/mesh/{citycode}") + @GetMapping("/task-bldg/mesh/{citycode}") public String showList(@PathVariable String citycode, Model model) { City city = cityRepository.findByCitycode(citycode); List tasks = meshRepository.findByCitycode(citycode); diff --git a/src/main/java/osm/surveyor/task/city/TaskController.java b/src/main/java/osm/surveyor/task/city/TaskController.java index 7ce017b..593e3c6 100644 --- a/src/main/java/osm/surveyor/task/city/TaskController.java +++ b/src/main/java/osm/surveyor/task/city/TaskController.java @@ -40,7 +40,7 @@ * @param model * @return */ - @GetMapping("/tasks") + @GetMapping("/task-bldg/tasks") public String showList(@AuthenticationPrincipal UserDetails user, Model model, @RequestParam(name="citycode") String citycode, @RequestParam(name="meshcode") String meshcode) @@ -75,7 +75,7 @@ * @param task * @return */ - @GetMapping("/task/add") + @GetMapping("/task-bldg/task/add") public String addTask(@AuthenticationPrincipal UserDetails user, Model model, @RequestParam(name="op") String op, @@ -161,7 +161,7 @@ } } - @PostMapping("/task/process") + @PostMapping("/task-bldg/task/process") public String process(@AuthenticationPrincipal UserDetails user, @Validated @ModelAttribute Task task, BindingResult result) @@ -172,7 +172,7 @@ } service.add(task, user); - return "redirect:/tasks?citycode="+ task.getCitycode() +"&meshcode="+ task.getMeshcode(); + return "redirect:/task-bldg/tasks?citycode="+ task.getCitycode() +"&meshcode="+ task.getMeshcode(); } /** diff --git a/src/main/java/osm/surveyor/task/user/config/SecurityConfig.java b/src/main/java/osm/surveyor/task/user/config/SecurityConfig.java index 52b1c19..820091d 100644 --- a/src/main/java/osm/surveyor/task/user/config/SecurityConfig.java +++ b/src/main/java/osm/surveyor/task/user/config/SecurityConfig.java @@ -31,14 +31,14 @@ // セキュリティ設定を、無視（ignoring）するパスを指定します // 通常、cssやjs、imgなどの静的リソースを指定します web.ignoring().antMatchers( - "/favicon.ico", - "/custom/**", - "/pref/**", - "/js/**", - "/css/**", - "/img/**", - "/data/**", - "/webjars/**", + "/task-bldg/favicon.ico", + "/task-bldg/custom/**", + "/task-bldg/pref/**", + "/task-bldg/js/**", + "/task-bldg/css/**", + "/task-bldg/img/**", + "/task-bldg/data/**", + "/task-bldg/webjars/**", "/h2-console/**" ); } @@ -47,20 +47,20 @@ protected void configure(HttpSecurity http) throws Exception { http.authorizeRequests() // 「/login」と「/error」をアクセス可能にします - .antMatchers("/login", "/error", "/register").permitAll() - .antMatchers("/admin/**").hasRole(Role.ADMIN.name()) + .antMatchers("/task-bldg/login", "/task-bldg/error", "/task-bldg/register").permitAll() + .antMatchers("/task-bldg/admin/**").hasRole(Role.ADMIN.name()) .anyRequest().authenticated() .and() .formLogin() // ログイン時のURLを指定 - .loginPage("/login") + .loginPage("/task-bldg/login") // 認証後にリダイレクトする場所を指定 - .defaultSuccessUrl("/city") + .defaultSuccessUrl("/task-bldg/city") .and() // ログアウトの設定 .logout() // ログアウト時のURLを指定 - .logoutRequestMatcher(new AntPathRequestMatcher("/logout")) + .logoutRequestMatcher(new AntPathRequestMatcher("/task-bldg/logout")) .and() // Remember-Meの認証を許可します // これを設定すると、ブラウザを閉じて、 diff --git a/src/main/java/osm/surveyor/task/user/controller/SecurityController.java b/src/main/java/osm/surveyor/task/user/controller/SecurityController.java index f6ac827..50100a5 100644 --- a/src/main/java/osm/surveyor/task/user/controller/SecurityController.java +++ b/src/main/java/osm/surveyor/task/user/controller/SecurityController.java @@ -22,12 +22,12 @@ private final SiteUserRepository userRepository; private final PasswordEncoder passwordEncoder; - @GetMapping("/login") + @GetMapping("/task-bldg/login") public String success() { return "login"; } - @GetMapping("/") + @GetMapping("/task-bldg/") public String showList(Authentication loginUser, Model model) { if (loginUser == null) { model.addAttribute("username", ""); @@ -37,25 +37,23 @@ model.addAttribute("username", loginUser.getName()); model.addAttribute("role", loginUser.getAuthorities()); } - return "user"; + return "redirect:/task-bldg/city"; } - @GetMapping("/admin/list") + @GetMapping("/task-bldg/admin/list") public String showAdminList(Model model) { model.addAttribute("users", userRepository.findAll()); return "list"; } - @GetMapping("/register") + @GetMapping("/task-bldg/register") public String register(@ModelAttribute("user") SiteUser user) { return "register"; } - @PostMapping("/register") - public String process(@Validated @ModelAttribute("user") SiteUser user, - BindingResult result) { - - if (result.hasErrors()) { + @PostMapping("/task-bldg/register") + public String process(@Validated @ModelAttribute("user") SiteUser user, BindingResult result) { + if (result.hasErrors()) { return "register"; } @@ -67,6 +65,6 @@ } userRepository.save(user); - return "redirect:/login?register"; + return "redirect:/task-bldg/login?register"; } } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 08d7896..601a652 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,3 +1,5 @@ +server.servlet.context-path=/task-bldg + # i18n spring.messages.fallback-to-system-locale=false spring.messages.basename=i18n/messages diff --git a/src/main/resources/static/custom/cities.js b/src/main/resources/static/custom/cities.js index 9d0b816..e1d3f79 100644 --- a/src/main/resources/static/custom/cities.js +++ b/src/main/resources/static/custom/cities.js @@ -22,7 +22,7 @@ // マーカーの見た目の作成 var style = new ol.style.Style({ image: new ol.style.Icon({ - src: '/img/osm_200x200.png', + src: '/task-bldg/img/osm_200x200.png', anchor: [0.5, 0.5], scale: 0.2 }) @@ -41,12 +41,12 @@ }); $.when( - $.getJSON("/city/index.json") + $.getJSON("/task-bldg/city/index.json") ).done(function(data) { site = data.site; style = new ol.style.Style({ image: new ol.style.Icon({ - src: '/img/osm_200x200.png', + src: '/task-bldg/img/osm_200x200.png', anchor: [0.5, 0.5], scale: 0.2 }), @@ -79,7 +79,7 @@ var descriptionHTML = "
" + info.code + "
" + "
" + info.name + "
" + - "
" + info.path + "
"; + "
" + info.path + "
"; element.innerHTML = descriptionHTML; __overlay.setPosition(coordinates); __map.addOverlay(__overlay); diff --git a/src/main/resources/static/custom/meshes.js b/src/main/resources/static/custom/meshes.js index bb61e02..509fadc 100644 --- a/src/main/resources/static/custom/meshes.js +++ b/src/main/resources/static/custom/meshes.js @@ -21,12 +21,12 @@ function loadMap() { $.when( // マップ表示のための中心位置を読み取る - $.getJSON("/city/index.json") + $.getJSON("/task-bldg/city/index.json") ).done(function(data1) { site = data1.site; style = new ol.style.Style({ image: new ol.style.Icon({ - src: '/img/osm_200x200.png', + src: '/task-bldg/img/osm_200x200.png', anchor: [0.5, 0.5], scale: 0.2 }), @@ -71,7 +71,7 @@ }); $.when( - $.getJSON("/city/"+ dir + geojson) + $.getJSON("/task-bldg/city/"+ dir + geojson) ).done(function(data2) { features = data2.features; $(features).each(function() { @@ -105,7 +105,7 @@ var descriptionHTML = "
code: " + info.properties.id + "
" + "
version: " + info.properties.version + "
" + - "
タスク
"; + "
タスク
"; element.innerHTML = descriptionHTML; __overlay.setPosition(coordinates); __map.addOverlay(__overlay); diff --git a/src/main/resources/static/custom/tasks.js b/src/main/resources/static/custom/tasks.js index 95ad478..20c603a 100644 --- a/src/main/resources/static/custom/tasks.js +++ b/src/main/resources/static/custom/tasks.js @@ -33,7 +33,7 @@ // 'citycode'に対応するデータを読む var lonlat = [139.7637,35.6808]; $.when( - $.getJSON("/city/index.json") + $.getJSON("/task-bldg/city/index.json") ).done(function(data1) { site = data1.site; $(data1.list).each(function() { @@ -88,7 +88,7 @@ var descriptionHTML = "
code: " + info.properties.id + "
" + "
version: " + info.properties.version + "
" + - "
" + info.properties.path + "
"; + "
" + info.properties.path + "
"; element.innerHTML = descriptionHTML; __overlay.setPosition(coordinates); __map.addOverlay(__overlay); @@ -104,7 +104,7 @@ // マップ表示のための中心位置を読み取る function loadMesh(dir) { $.when( - $.getJSON("/city/"+ dir + geojson) + $.getJSON("/task-bldg/city/"+ dir + geojson) ).done(function(data2) { features = data2.features; $(features).each(function() { @@ -121,7 +121,7 @@ featurePoint.information = this; featurePoint.setStyle(new ol.style.Style({ image: new ol.style.Icon({ - src: '/img/osm_200x200.png', + src: '/task-bldg/img/osm_200x200.png', anchor: [0.5, 0.5], scale: 0.2 }), diff --git a/src/main/resources/templates/fragments/sidebar.html b/src/main/resources/templates/fragments/sidebar.html index 1681625..2b4db84 100644 --- a/src/main/resources/templates/fragments/sidebar.html +++ b/src/main/resources/templates/fragments/sidebar.html @@ -17,7 +17,7 @@

- + @@ -31,54 +31,42 @@
diff --git a/src/main/resources/templates/task.html b/src/main/resources/templates/task.html index 31cdd2f..575ef1f 100644 --- a/src/main/resources/templates/task.html +++ b/src/main/resources/templates/task.html @@ -115,7 +115,7 @@

- +