记得上下班打卡 | git大法好,push需谨慎

Commit e345a236 authored by 张国柄's avatar 张国柄

opt:zuul auth filter;

parent 868e95cf
package com.liquidnet.commons.lang.util;
import org.apache.commons.lang3.StringUtils;
import org.springframework.util.CollectionUtils;
import java.util.HashMap;
import java.util.Map;
public class CurrentUtil {
public static final String uID = "uid";
public static final String uTag = "u-tag";
public static final String uToken = "u-token";
public static final String CLI_SOURCE = "source";
......@@ -33,9 +33,9 @@ public class CurrentUtil {
}
public static String getCurrentUid() {
Map tokenClaims = getTokenClaims();
String uid = ServletUtils.getRequest().getHeader(uID);
// TODO: 2021/5/14 dev联调API未启用token默认使用1
return CollectionUtils.isEmpty(tokenClaims) ? "1" : (String) tokenClaims.get("uid");
return StringUtils.isEmpty(uid) ? "1" : uid;
}
public static String getCliSource() {
......
......@@ -7,72 +7,28 @@ import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* 会员价格
*/
@ApiModel(value = "AdamMemberPriceVo", description = "会员价格")
@Data
public class AdamMemberPriceVo implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 会员价格ID
*/
@ApiModelProperty(position = 1, value = "会员价格id")
private static final long serialVersionUID = -8106910166417645208L;
@ApiModelProperty(position = 1, value = "会员价格ID")
private String memberPriceId;
/**
* 会员类型ID
*/
@ApiModelProperty(position = 2, value = "会员类型id")
@ApiModelProperty(position = 2, value = "会员类型ID")
private String memberId;
/**
* 状态 0 不可用 1上线中 2已下线
*/
@ApiModelProperty(position = 3, value = "价格状态")
@ApiModelProperty(position = 3, value = "价格状态[0-不可用,1-上线中,2-已下线]")
private Integer status;
/**
* 价格包名称
*/
@ApiModelProperty(position = 4, value = "价格包名称")
private String name;
/**
* 原价
*/
@ApiModelProperty(position = 5, value = "原价")
private BigDecimal price;
/**
* 折扣价
*/
@ApiModelProperty(position = 6, value = "折扣价")
private BigDecimal priceFixed;
/**
* 会员包有效天数
*/
@ApiModelProperty(position = 7, value = "有效天数")
private Integer days;
/**
* 会员包须知
*/
@ApiModelProperty(position = 8, value = "须知")
@ApiModelProperty(position = 8, value = "会员包须知")
private String detail;
/**
* 创建时间
*/
@ApiModelProperty(position = 9, value = "创建时间")
private String createdAt;
/**
* 更新时间
*/
@ApiModelProperty(position = 10, value = "更新时间")
private String updatedAt;
}
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