From daedd43e43848b0f6f6b09682d2013881e22c541 Mon Sep 17 00:00:00 2001 From: hupeng Date: Sun, 2 Feb 2020 17:11:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=87=E7=AB=A0=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=88=B3=E7=AD=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yshop-api/pom.xml | 2 +- .../src/main/resources/config/application-prod.yml | 2 +- .../src/main/resources/config/application.yml | 14 +++++++------- .../yixiang/mp/controller/YxArticleController.java | 14 ++++++++------ .../mp/service/impl/YxArticleServiceImpl.java | 2 +- .../src/main/resources/config/application-prod.yml | 4 ++-- 6 files changed, 20 insertions(+), 18 deletions(-) diff --git a/yshop-api/pom.xml b/yshop-api/pom.xml index 252edf62..084b0967 100644 --- a/yshop-api/pom.xml +++ b/yshop-api/pom.xml @@ -10,7 +10,7 @@ 4.0.0 yshop-api - API模块 + 移动端模块 0.10.6 diff --git a/yshop-api/src/main/resources/config/application-prod.yml b/yshop-api/src/main/resources/config/application-prod.yml index b17f873e..513d25a2 100644 --- a/yshop-api/src/main/resources/config/application-prod.yml +++ b/yshop-api/src/main/resources/config/application-prod.yml @@ -6,7 +6,7 @@ spring: driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy url: jdbc:log4jdbc:mysql://localhost:3306/yshop?serverTimezone=Asia/Shanghai&useSSL=false username: yshop - password: + password: # 初始化配置 initial-size: 3 diff --git a/yshop-api/src/main/resources/config/application.yml b/yshop-api/src/main/resources/config/application.yml index 29286625..58ed5c2d 100644 --- a/yshop-api/src/main/resources/config/application.yml +++ b/yshop-api/src/main/resources/config/application.yml @@ -22,13 +22,6 @@ spring: redis: repositories: enabled: false -#配置rocketmq -rocketmq: - nameServer: localhost:9876 - producer: - group: yshop-group - sendMessageTimeout: 300000 - #配置 Jpa jpa: properties: @@ -36,6 +29,13 @@ rocketmq: dialect: org.hibernate.dialect.MySQL5InnoDBDialect open-in-view: true +#配置rocketmq +rocketmq: + nameServer: localhost:9876 + producer: + group: yshop-group + sendMessageTimeout: 300000 + #七牛云 diff --git a/yshop-mp/src/main/java/co/yixiang/mp/controller/YxArticleController.java b/yshop-mp/src/main/java/co/yixiang/mp/controller/YxArticleController.java index 1df0c9c3..e7e1bcab 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/controller/YxArticleController.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/controller/YxArticleController.java @@ -17,11 +17,13 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.Date; + /** * @author hupeng * @date 2019-10-07 */ -@Api(tags = "YxArticle管理") +@Api(tags = "图文管理") @RestController @RequestMapping("api") public class YxArticleController { @@ -30,7 +32,7 @@ public class YxArticleController { private YxArticleService yxArticleService; - @ApiOperation(value = "查询YxArticle") + @ApiOperation(value = "查询") @GetMapping(value = "/yxArticle") @PreAuthorize("@el.check('admin','YXARTICLE_ALL','YXARTICLE_SELECT')") public ResponseEntity getYxArticles(YxArticleQueryCriteria criteria, Pageable pageable){ @@ -38,16 +40,16 @@ public class YxArticleController { } - @ApiOperation(value = "新增YxArticle") + @ApiOperation(value = "新增") @PostMapping(value = "/yxArticle") @PreAuthorize("@el.check('admin','YXARTICLE_ALL','YXARTICLE_CREATE')") public ResponseEntity create(@Validated @RequestBody YxArticle resources){ - resources.setAddTime(DateUtil.now()); + resources.setAddTime(DateUtil.format(new Date(),"yyyy-MM-dd HH:mm")); return new ResponseEntity(yxArticleService.create(resources),HttpStatus.CREATED); } - @ApiOperation(value = "修改YxArticle") + @ApiOperation(value = "修改") @PutMapping(value = "/yxArticle") @PreAuthorize("@el.check('admin','YXARTICLE_ALL','YXARTICLE_EDIT')") public ResponseEntity update(@Validated @RequestBody YxArticle resources){ @@ -56,7 +58,7 @@ public class YxArticleController { } - @ApiOperation(value = "删除YxArticle") + @ApiOperation(value = "删除") @DeleteMapping(value = "/yxArticle/{id}") @PreAuthorize("@el.check('admin','YXARTICLE_ALL','YXARTICLE_DELETE')") public ResponseEntity delete(@PathVariable Integer id){ diff --git a/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxArticleServiceImpl.java b/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxArticleServiceImpl.java index 579d19e5..bea7fd95 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxArticleServiceImpl.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxArticleServiceImpl.java @@ -81,7 +81,7 @@ public class YxArticleServiceImpl implements YxArticleService { @Override @Transactional(rollbackFor = Exception.class) public YxArticleDTO create(YxArticle resources) { - resources.setAddTime(String.valueOf(OrderUtil.getSecondTimestampTwo())); + //resources.setAddTime(String.valueOf(OrderUtil.getSecondTimestampTwo())); return yxArticleMapper.toDto(yxArticleRepository.save(resources)); } diff --git a/yshop-system/src/main/resources/config/application-prod.yml b/yshop-system/src/main/resources/config/application-prod.yml index 4002c286..cebb8137 100644 --- a/yshop-system/src/main/resources/config/application-prod.yml +++ b/yshop-system/src/main/resources/config/application-prod.yml @@ -47,7 +47,7 @@ spring: database: 0 host: 127.0.0.1 port: 6379 - password: + password: #连接超时时间 timeout: 5000 @@ -81,7 +81,7 @@ swagger: enabled: true title: yshop商城管理后台API serverUrl: http://localhost:8000 - version: 1.8 + version: 1.9 # 文件存储路径 file: