Change run.halo.app.web.controller to run.halo.app.controller

src/main/java/run/halo/app/config/SwaggerConfiguration.java

@@ -64,7 +64,7 @@ public class SwaggerConfiguration {
         log.debug("Doc disabled: [{}]", haloProperties.isDocDisabled());
         // TODO Build with different security configuration
         return buildApiDocket("run.halo.app.content.api",
-                "run.halo.app.web.controller.content.api",
+                "run.halo.app.controller.content.api",
                 "/api/**")
                 .enable(!haloProperties.isDocDisabled());
     }
@@ -74,7 +74,7 @@ public class SwaggerConfiguration {
         log.debug("Doc disabled: [{}]", haloProperties.isDocDisabled());
         // TODO Build with different security configuration
         return buildApiDocket("run.halo.app.admin",
-                "run.halo.app.web.controller.admin",
+                "run.halo.app.controller.admin",
                 "/api/admin/**")
                 .enable(!haloProperties.isDocDisabled());
     }

src/main/java/run/halo/app/config/WebMvcAutoConfiguration.java

@@ -23,7 +23,7 @@ import run.halo.app.config.properties.HaloProperties;
 import run.halo.app.factory.StringToEnumConverterFactory;
 import run.halo.app.model.support.HaloConst;
 import run.halo.app.security.resolver.AuthenticationArgumentResolver;
-import run.halo.app.web.controller.support.PageJacksonSerializer;
+import run.halo.app.controller.support.PageJacksonSerializer;
 
 import java.util.List;
 
@@ -36,7 +36,7 @@ import java.util.List;
 @Slf4j
 @Configuration
 @EnableWebMvc
-@ComponentScan(basePackages = "run.halo.app.web.controller")
+@ComponentScan(basePackages = "run.halo.app.controller")
 @PropertySource(value = "classpath:application.yaml", ignoreResourceNotFound = true, encoding = "UTF-8")
 public class WebMvcAutoConfiguration implements WebMvcConfigurer {
 

src/main/java/run/halo/app/web/controller/admin/MainController.java → src/main/java/run/halo/app/controller/admin/MainController.java

-package run.halo.app.web.controller.admin;
+package run.halo.app.controller.admin;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;

src/main/java/run/halo/app/web/controller/admin/api/AdminController.java → src/main/java/run/halo/app/controller/admin/api/AdminController.java

-package run.halo.app.web.controller.admin.api;
+package run.halo.app.controller.admin.api;
 
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

src/main/java/run/halo/app/web/controller/admin/api/AttachmentController.java → src/main/java/run/halo/app/controller/admin/api/AttachmentController.java

-package run.halo.app.web.controller.admin.api;
+package run.halo.app.controller.admin.api;
 
 import io.swagger.annotations.ApiOperation;
 import org.springframework.data.domain.Page;

src/main/java/run/halo/app/web/controller/admin/api/CategoryController.java → src/main/java/run/halo/app/controller/admin/api/CategoryController.java

-package run.halo.app.web.controller.admin.api;
+package run.halo.app.controller.admin.api;
 
 import io.swagger.annotations.ApiOperation;
 import org.springframework.data.domain.Sort;

src/main/java/run/halo/app/web/controller/admin/api/CommentController.java → src/main/java/run/halo/app/controller/admin/api/CommentController.java

-package run.halo.app.web.controller.admin.api;
+package run.halo.app.controller.admin.api;
 
 import io.swagger.annotations.ApiOperation;
 import org.springframework.data.domain.Page;

src/main/java/run/halo/app/web/controller/admin/api/GalleryController.java → src/main/java/run/halo/app/controller/admin/api/GalleryController.java

-package run.halo.app.web.controller.admin.api;
+package run.halo.app.controller.admin.api;
 
 import run.halo.app.model.dto.GalleryDTO;
 import run.halo.app.service.GalleryService;

src/main/java/run/halo/app/web/controller/admin/api/LinkController.java → src/main/java/run/halo/app/controller/admin/api/LinkController.java

-package run.halo.app.web.controller.admin.api;
+package run.halo.app.controller.admin.api;
 
 import io.swagger.annotations.ApiOperation;
 import org.springframework.data.domain.Sort;

src/main/java/run/halo/app/web/controller/admin/api/LogController.java → src/main/java/run/halo/app/controller/admin/api/LogController.java

-package run.halo.app.web.controller.admin.api;
+package run.halo.app.controller.admin.api;
 
 import run.halo.app.model.dto.LogDTO;
 import run.halo.app.service.LogService;

src/main/java/run/halo/app/web/controller/admin/api/MenuController.java → src/main/java/run/halo/app/controller/admin/api/MenuController.java

-package run.halo.app.web.controller.admin.api;
+package run.halo.app.controller.admin.api;
 
 import io.swagger.annotations.ApiOperation;
 import org.springframework.data.domain.Sort;

src/main/java/run/halo/app/web/controller/admin/api/OptionController.java → src/main/java/run/halo/app/controller/admin/api/OptionController.java

-package run.halo.app.web.controller.admin.api;
+package run.halo.app.controller.admin.api;
 
 import run.halo.app.model.dto.OptionDTO;
 import run.halo.app.model.params.OptionParam;

src/main/java/run/halo/app/web/controller/admin/api/PostController.java → src/main/java/run/halo/app/controller/admin/api/PostController.java

-package run.halo.app.web.controller.admin.api;
+package run.halo.app.controller.admin.api;
 
 import io.swagger.annotations.ApiOperation;
 import org.springframework.data.domain.Page;

src/main/java/run/halo/app/web/controller/admin/api/TagController.java → src/main/java/run/halo/app/controller/admin/api/TagController.java

-package run.halo.app.web.controller.admin.api;
+package run.halo.app.controller.admin.api;
 
 import run.halo.app.model.dto.TagDTO;
 import run.halo.app.model.entity.Tag;

src/main/java/run/halo/app/web/controller/admin/api/ThemeController.java → src/main/java/run/halo/app/controller/admin/api/ThemeController.java

-package run.halo.app.web.controller.admin.api;
+package run.halo.app.controller.admin.api;
 
 import io.swagger.annotations.ApiOperation;
 import org.springframework.http.HttpStatus;

src/main/java/run/halo/app/web/controller/admin/api/UserController.java → src/main/java/run/halo/app/controller/admin/api/UserController.java

-package run.halo.app.web.controller.admin.api;
+package run.halo.app.controller.admin.api;
 
 import run.halo.app.model.dto.UserDTO;
 import run.halo.app.model.entity.User;

src/main/java/run/halo/app/web/controller/base/CommonResultControllerAdvice.java → src/main/java/run/halo/app/controller/base/CommonResultControllerAdvice.java

-package run.halo.app.web.controller.base;
+package run.halo.app.controller.base;
 
 import run.halo.app.model.support.BaseResponse;
 import org.springframework.core.MethodParameter;
@@ -20,7 +20,7 @@ import run.halo.app.model.support.BaseResponse;
  *
  * @author johnniang
  */
-@ControllerAdvice("run.halo.app.web.controller")
+@ControllerAdvice("run.halo.app.controller")
 public class CommonResultControllerAdvice implements ResponseBodyAdvice<Object> {
 
     @Override

src/main/java/run/halo/app/web/controller/base/ControllerExceptionHandler.java → src/main/java/run/halo/app/controller/base/ControllerExceptionHandler.java

-package run.halo.app.web.controller.base;
+package run.halo.app.controller.base;
 
 import org.springframework.web.HttpMediaTypeNotAcceptableException;
 import run.halo.app.exception.HaloException;

src/main/java/run/halo/app/web/controller/content/ContentArchiveController.java → src/main/java/run/halo/app/controller/content/ContentArchiveController.java

-package run.halo.app.web.controller.content;
+package run.halo.app.controller.content;
 
 import cn.hutool.core.util.PageUtil;
 import lombok.extern.slf4j.Slf4j;

src/main/java/run/halo/app/web/controller/content/ContentCategoryController.java → src/main/java/run/halo/app/controller/content/ContentCategoryController.java

-package run.halo.app.web.controller.content;
+package run.halo.app.controller.content;
 
 import cn.hutool.core.util.PageUtil;
 import org.springframework.data.domain.Page;

src/main/java/run/halo/app/web/controller/content/ContentFeedController.java → src/main/java/run/halo/app/controller/content/ContentFeedController.java

-package run.halo.app.web.controller.content;
+package run.halo.app.controller.content;
 
 import freemarker.template.Template;
 import freemarker.template.TemplateException;

src/main/java/run/halo/app/web/controller/content/ContentIndexController.java → src/main/java/run/halo/app/controller/content/ContentIndexController.java

-package run.halo.app.web.controller.content;
+package run.halo.app.controller.content;
 
 import cn.hutool.core.util.PageUtil;
 import lombok.extern.slf4j.Slf4j;

src/main/java/run/halo/app/web/controller/content/ContentSearchController.java → src/main/java/run/halo/app/controller/content/ContentSearchController.java

-package run.halo.app.web.controller.content;
+package run.halo.app.controller.content;
 
 import cn.hutool.core.util.PageUtil;
 import org.springframework.data.domain.Page;

src/main/java/run/halo/app/web/controller/content/ContentSheetController.java → src/main/java/run/halo/app/controller/content/ContentSheetController.java

-package run.halo.app.web.controller.content;
+package run.halo.app.controller.content;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;

src/main/java/run/halo/app/web/controller/content/ContentTagController.java → src/main/java/run/halo/app/controller/content/ContentTagController.java

-package run.halo.app.web.controller.content;
+package run.halo.app.controller.content;
 
 import cn.hutool.core.util.PageUtil;
 import org.springframework.data.domain.Page;

src/main/java/run/halo/app/web/controller/content/api/ArchiveController.java → src/main/java/run/halo/app/controller/content/api/ArchiveController.java

-package run.halo.app.web.controller.content.api;
+package run.halo.app.controller.content.api;
 
 import run.halo.app.model.vo.ArchiveMonthVO;
 import run.halo.app.model.vo.ArchiveYearVO;

src/main/java/run/halo/app/web/controller/content/api/CommentController.java → src/main/java/run/halo/app/controller/content/api/CommentController.java

-package run.halo.app.web.controller.content.api;
+package run.halo.app.controller.content.api;
 
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.PostMapping;

src/main/java/run/halo/app/web/controller/content/api/LinkController.java → src/main/java/run/halo/app/controller/content/api/LinkController.java

-package run.halo.app.web.controller.content.api;
+package run.halo.app.controller.content.api;
 
 import run.halo.app.model.vo.LinkTeamVO;
 import run.halo.app.service.LinkService;

src/main/java/run/halo/app/web/controller/content/api/MenuController.java → src/main/java/run/halo/app/controller/content/api/MenuController.java

-package run.halo.app.web.controller.content.api;
+package run.halo.app.controller.content.api;
 
 import run.halo.app.model.dto.MenuDTO;
 import run.halo.app.service.MenuService;

src/main/java/run/halo/app/web/controller/content/api/OptionController.java → src/main/java/run/halo/app/controller/content/api/OptionController.java

-package run.halo.app.web.controller.content.api;
+package run.halo.app.controller.content.api;
 
 import run.halo.app.model.dto.OptionDTO;
 import run.halo.app.model.support.BaseResponse;

src/main/java/run/halo/app/web/controller/content/api/PostController.java → src/main/java/run/halo/app/controller/content/api/PostController.java

-package run.halo.app.web.controller.content.api;
+package run.halo.app.controller.content.api;
 
 import run.halo.app.model.dto.post.PostDetailOutputDTO;
 import run.halo.app.model.dto.post.PostSimpleOutputDTO;

src/main/java/run/halo/app/web/controller/content/api/TagController.java → src/main/java/run/halo/app/controller/content/api/TagController.java

-package run.halo.app.web.controller.content.api;
+package run.halo.app.controller.content.api;
 
 import run.halo.app.model.dto.TagDTO;
 import run.halo.app.model.dto.post.PostSimpleOutputDTO;

src/main/java/run/halo/app/web/controller/content/api/UserController.java → src/main/java/run/halo/app/controller/content/api/UserController.java

-package run.halo.app.web.controller.content.api;
+package run.halo.app.controller.content.api;
 
 import run.halo.app.model.dto.UserDTO;
 import run.halo.app.service.UserService;

src/main/java/run/halo/app/web/controller/core/CommonController.java → src/main/java/run/halo/app/controller/core/CommonController.java

-package run.halo.app.web.controller.core;
+package run.halo.app.controller.core;
 
 import cn.hutool.core.text.StrBuilder;
 import lombok.extern.slf4j.Slf4j;

src/main/java/run/halo/app/web/controller/core/InstallController.java → src/main/java/run/halo/app/controller/core/InstallController.java

-package run.halo.app.web.controller.core;
+package run.halo.app.controller.core;
 
 import cn.hutool.core.util.StrUtil;
 import freemarker.template.Configuration;

src/main/java/run/halo/app/web/controller/support/PageJacksonSerializer.java → src/main/java/run/halo/app/controller/support/PageJacksonSerializer.java

-package run.halo.app.web.controller.support;
+package run.halo.app.controller.support;
 
 import run.halo.app.model.support.CommentPage;
 import com.fasterxml.jackson.core.JsonGenerator;