记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
董敬伟
liquidnet-bus-v1
Commits
e345a236
Commit
e345a236
authored
May 27, 2021
by
张国柄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
opt:zuul auth filter;
parent
868e95cf
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
52 deletions
+8
-52
CurrentUtil.java
...ain/java/com/liquidnet/commons/lang/util/CurrentUtil.java
+3
-3
AdamMemberPriceVo.java
.../com/liquidnet/service/adam/dto/vo/AdamMemberPriceVo.java
+5
-49
No files found.
liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/CurrentUtil.java
View file @
e345a236
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
()
{
...
...
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamMemberPriceVo.java
View file @
e345a236
...
...
@@ -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
;
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment