diff --git a/.gitignore b/.gitignore index 3df42cc..362dbd7 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ *.iml *.class *Test.java -**/test/ \ No newline at end of file +**/test/ +*dev.properties \ No newline at end of file diff --git a/sky-server/src/main/java/com/sky/config/WebMvcConfiguration.java b/sky-server/src/main/java/com/sky/config/WebMvcConfiguration.java index 7786255..3bd0830 100644 --- a/sky-server/src/main/java/com/sky/config/WebMvcConfiguration.java +++ b/sky-server/src/main/java/com/sky/config/WebMvcConfiguration.java @@ -47,8 +47,8 @@ public class WebMvcConfiguration extends WebMvcConfigurationSupport { * @return */ @Bean - public Docket docket() { - log.info("准备生成接口文档..."); + public Docket docketAdmin() { + log.info("准备生成Admin接口文档..."); ApiInfo apiInfo = new ApiInfoBuilder() .title("苍穹外卖项目接口文档") .version("2.0") @@ -56,16 +56,36 @@ public class WebMvcConfiguration extends WebMvcConfigurationSupport { .build(); //指定版本 Docket docket = new Docket(DocumentationType.SWAGGER_2) + .groupName("管理端接口") //上文设置的信息 .apiInfo(apiInfo) .select() //指定生成接口需要扫描的包 - .apis(RequestHandlerSelectors.basePackage("com.sky.controller")) + .apis(RequestHandlerSelectors.basePackage("com.sky.controller.admin")) + .paths(PathSelectors.any()) + .build(); + return docket; + } + @Bean + public Docket docketUser() { + log.info("准备生成User接口文档..."); + ApiInfo apiInfo = new ApiInfoBuilder() + .title("苍穹外卖项目接口文档") + .version("2.0") + .description("苍穹外卖项目接口文档") + .build(); + //指定版本 + Docket docket = new Docket(DocumentationType.SWAGGER_2) + .groupName("用户端接口") + //上文设置的信息 + .apiInfo(apiInfo) + .select() + //指定生成接口需要扫描的包 + .apis(RequestHandlerSelectors.basePackage("com.sky.controller.user")) .paths(PathSelectors.any()) .build(); return docket; } - /** * 设置静态资源映射 * @param registry diff --git a/sky-server/src/main/java/com/sky/service/impl/DishServiceImpl.java b/sky-server/src/main/java/com/sky/service/impl/DishServiceImpl.java index 99cae96..d1ee093 100644 --- a/sky-server/src/main/java/com/sky/service/impl/DishServiceImpl.java +++ b/sky-server/src/main/java/com/sky/service/impl/DishServiceImpl.java @@ -175,7 +175,6 @@ public class DishServiceImpl implements DishService { */ @Override @Transactional - //TODO 菜品关联套餐状态 public void startOrStop(Integer status, Long id) { //更新菜品状态 Dish dish = Dish.builder() diff --git a/sky-server/src/main/resources/application-dev.properties b/sky-server/src/main/resources/application-dev.properties index 79c8c72..fa92a78 100644 --- a/sky-server/src/main/resources/application-dev.properties +++ b/sky-server/src/main/resources/application-dev.properties @@ -4,6 +4,10 @@ sky.datasource.port=3306 sky.datasource.database=sky_take_out sky.datasource.username=root sky.datasource.password=Slhaf20041205 +spring.redis.host=localhost +spring.redis.port=6379 +#spring.redis.password=Slhaf20041205 +spring.redis.database=0 sky.alioss.access-key-id=LTAI5tKXHfExEucGsrbQvTqo sky.alioss.access-key-secret=FkSXUC0mctKx6Gkyygin3Pyj35xYej sky.alioss.bucket-name=sky-take-out-slhaf diff --git a/sky-server/src/main/resources/application.properties b/sky-server/src/main/resources/application.properties index 893e721..a3bd591 100644 --- a/sky-server/src/main/resources/application.properties +++ b/sky-server/src/main/resources/application.properties @@ -5,6 +5,10 @@ spring.datasource.druid.driver-class-name=${sky.datasource.driver-class-name} spring.datasource.druid.url=jdbc:mysql://${sky.datasource.host}:${sky.datasource.port}/${sky.datasource.database}?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true spring.datasource.druid.username=${sky.datasource.username} spring.datasource.druid.password=${sky.datasource.password} +spring.redis.host=${spring.redis.host} +spring.redis.port=${spring.redis.port} +#spring.redis.password=${spring.redis.password} +spring.redis.database=${spring.redis.database} mybatis.mapper-locations=classpath:mapper/*.xml mybatis.type-aliases-package=com.sky.entity mybatis.configuration.map-underscore-to-camel-case=true