github/mall
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

品牌接口修改

Browse Source
This commit is contained in:
zhh 2018-05-16 09:13:07 +08:00
parent 2f52c6b858
commit c295f5a839
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mall-admin/src/main/java/com/macro/mall/config/SecurityConfig.java
View File

@ -65,8 +65,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
.permitAll() .permitAll()
.antMatchers(HttpMethod.OPTIONS)//跨域请求会先进行一次options请求 .antMatchers(HttpMethod.OPTIONS)//跨域请求会先进行一次options请求
.permitAll() .permitAll()
// .antMatchers("/**")//测试时全部运行访问 .antMatchers("/**")//测试时全部运行访问
// .permitAll() .permitAll()
.anyRequest()// 除上面外的所有请求全部需要鉴权认证 .anyRequest()// 除上面外的所有请求全部需要鉴权认证
.authenticated(); .authenticated();
// 禁用缓存 // 禁用缓存

4
mall-admin/src/main/java/com/macro/mall/dto/CommonResult.java
View File

@ -44,10 +44,10 @@ public class CommonResult {
*/ */
public CommonResult pageSuccess(List data) { public CommonResult pageSuccess(List data) {
PageInfo pageInfo = new PageInfo(data); PageInfo pageInfo = new PageInfo(data);
long totalPage = pageInfo.getTotal() / pageInfo.getPageSize();
Map<String, Object> result = new HashMap<>(); Map<String, Object> result = new HashMap<>();
result.put("pageSize", pageInfo.getPageSize()); result.put("pageSize", pageInfo.getPageSize());
result.put("totalPage", totalPage+1); result.put("totalPage", pageInfo.getPages());
result.put("total", pageInfo.getTotal());
result.put("pageNum", pageInfo.getPageNum()); result.put("pageNum", pageInfo.getPageNum());
result.put("list", pageInfo.getList()); result.put("list", pageInfo.getList());
this.code = SUCCESS; this.code = SUCCESS;

1
mall-admin/src/main/java/com/macro/mall/service/impl/PmsBrandServiceImpl.java
View File

@ -79,7 +79,6 @@ public class PmsBrandServiceImpl implements PmsBrandService {
PmsBrandExample pmsBrandExample = new PmsBrandExample(); PmsBrandExample pmsBrandExample = new PmsBrandExample();
pmsBrandExample.setOrderByClause("sort desc"); pmsBrandExample.setOrderByClause("sort desc");
PmsBrandExample.Criteria criteria = pmsBrandExample.createCriteria(); PmsBrandExample.Criteria criteria = pmsBrandExample.createCriteria();
criteria.andShowStatusEqualTo(1);
if (!StringUtils.isEmpty(keyword)) { if (!StringUtils.isEmpty(keyword)) {
criteria.andNameLike("%" + keyword + "%"); criteria.andNameLike("%" + keyword + "%");
} }