Commit 3fa701c2 authored by shiyu's avatar shiyu

权限

parent 776c2a3a
...@@ -42,8 +42,8 @@ public class ShiroConfig { ...@@ -42,8 +42,8 @@ public class ShiroConfig {
filterChainDefinitionMap.put("/actuator/health", "anon"); filterChainDefinitionMap.put("/actuator/health", "anon");
filterChainDefinitionMap.put("/admin/**", "anon"); // filterChainDefinitionMap.put("/admin/**", "anon");
// filterChainDefinitionMap.put("/admin/**", "authc"); filterChainDefinitionMap.put("/admin/**", "authc");
shiroFilterFactoryBean.setLoginUrl("/admin/auth/401"); shiroFilterFactoryBean.setLoginUrl("/admin/auth/401");
shiroFilterFactoryBean.setSuccessUrl("/admin/auth/index"); shiroFilterFactoryBean.setSuccessUrl("/admin/auth/index");
shiroFilterFactoryBean.setUnauthorizedUrl("/admin/auth/403"); shiroFilterFactoryBean.setUnauthorizedUrl("/admin/auth/403");
......
...@@ -58,8 +58,7 @@ public class AdminGoodsController { ...@@ -58,8 +58,7 @@ public class AdminGoodsController {
* @param order * @param order
* @return * @return
*/ */
@RequiresPermissions("admin:" + @RequiresPermissions("admin:goods:list")
":list")
@RequiresPermissionsDesc(menu = { "商品管理", "商品管理" }, button = "查询") @RequiresPermissionsDesc(menu = { "商品管理", "商品管理" }, button = "查询")
@GetMapping("/list") @GetMapping("/list")
public Object list(String name, @RequestParam(defaultValue = "1") Integer page, public Object list(String name, @RequestParam(defaultValue = "1") Integer page,
......
...@@ -2,10 +2,12 @@ package com.wwdz.ch.admin.entity.vo; ...@@ -2,10 +2,12 @@ package com.wwdz.ch.admin.entity.vo;
import com.wwdz.ch.db.domain.BidRecord; import com.wwdz.ch.db.domain.BidRecord;
import com.xxdxxs.entity.Entity; import com.xxdxxs.entity.Entity;
import com.xxdxxs.utils.DateUtils;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.util.Arrays; import java.util.Arrays;
import java.util.Date;
import java.util.List; import java.util.List;
@Data @Data
...@@ -37,6 +39,16 @@ public class BidRecordVo implements Entity { ...@@ -37,6 +39,16 @@ public class BidRecordVo implements Entity {
@ApiModelProperty(value = "成交链接", name = "link") @ApiModelProperty(value = "成交链接", name = "link")
private String link; private String link;
/**
* 创建时间
*/
private Date createTime;
/**
* 更新时间
*/
private Date updateTime;
public BidRecordVo(BidRecord record) { public BidRecordVo(BidRecord record) {
this.id = record.getId(); this.id = record.getId();
this.cid = record.getCid(); this.cid = record.getCid();
...@@ -45,5 +57,9 @@ public class BidRecordVo implements Entity { ...@@ -45,5 +57,9 @@ public class BidRecordVo implements Entity {
this.price = record.getPrice(); this.price = record.getPrice();
this.buyer = record.getBuyer(); this.buyer = record.getBuyer();
this.platform = record.getPlatform(); this.platform = record.getPlatform();
this.extra = record.getExtra();
this.link = record.getLink();
this.createTime = record.getCreateTime();
this.updateTime = record.getUpdateTime();
} }
} }
...@@ -37,7 +37,7 @@ public class BidRecordServiceImpl implements BidRecordService { ...@@ -37,7 +37,7 @@ public class BidRecordServiceImpl implements BidRecordService {
@Override @Override
public List<BidRecord> query(BidRecordRequestDto dto) { public List<BidRecord> query(BidRecordRequestDto dto) {
return null; return bidRecordManager.query(dto);
} }
@Override @Override
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment