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

Skip to content

L
liquidnet-bus-v1
Commit b375b160 authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 364c2084 faa826a3
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 44 deletions
liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/base/UserPathDto.java
View file @ b375b160
......@@ -15,32 +15,33 @@ public class UserPathDto implements Serializable {
private static UserPathDto instance = new UserPathDto();
private static final long serialVersionUID = -4153353929914805750L;
private String tag;
private String uid;
// private String tag;
// private String uid;
// private String ip;
private String token;
private String time;//yyyyMMddHHmmssSSS
private String interfaceName;
private String params;
private String result;
private String ip;
private String userAgent;
private UserPathDto() {}
private UserPathDto() {
}
private static UserPathDto getInstance() {
return instance;
}
public static String setData(String interfaceName, Object params, Object result) {
instance.tag = "MDSKY.NOW.ELK";
instance.uid = CurrentUtil.getCurrentUid() == null ? "UID" : CurrentUtil.getCurrentUid();
// instance.tag = "MDSKY.NOW.ELK";
// instance.ip = CurrentUtil.getCliIpAddr();
String uid = CurrentUtil.getCurrentUid() == null ? "UID" : CurrentUtil.getCurrentUid();
instance.token = CurrentUtil.getToken() == null ? "TOKEN" : CurrentUtil.getToken();
instance.time = DateUtil.Formatter.yyyyMMddHHmmssSSSUnTrim.format(LocalDateTime.now());
instance.interfaceName = interfaceName;
instance.params = params.toString().equals("") ? "NanParams" : params.toString();
instance.result = result.toString().equals("") ? "NanResults" : result.toString();;
instance.ip = CurrentUtil.getCliIpAddr();
instance.result = result.toString().equals("") ? "NanResults" : result.toString();
instance.userAgent = ServletUtils.getRequest().getHeader("User-Agent");
return JsonUtils.toJson(instance);
return "MDSKY.NOW.ELK." + uid == "UID" ? CurrentUtil.getCliIpAddr() : uid + " = " + JsonUtils.toJson(instance);
}
}
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/docu/db_ln_adam_initialdata.sql
View file @ b375b160
......@@ -8,7 +8,7 @@ create table adam_third_party
uid varchar(64) default '',
open_id varchar(64) comment '第三方ID',
avatar varchar(255) comment '第三方头像',
nickname varchar(64) comment '第三方昵称',
nickname varchar(100) comment '第三方昵称',
platform varchar(20) comment '平台名称',
state tinyint comment '0-INIT,1-NORMAL,2-INVALID',
created_at datetime not null,
......@@ -62,8 +62,8 @@ create table adam_user_info
(
mid bigint unsigned auto_increment primary key,
uid varchar(64) not null,
nickname varchar(32) comment '昵称',
sex varchar(50) comment '性别',
nickname varchar(100) comment '昵称',
sex varchar(60) comment '性别',
birthday date comment '生日YYYY-MM-DD',
area varchar(100) comment '常住地/区域',
signature varchar(255) comment '个性签名',
......@@ -86,8 +86,8 @@ create table adam_real_name
real_name_id varchar(64) not null,
uid varchar(64) not null,
type enum ('1','2','3','4','5') not null default '1' comment '1-大陆身份证,2-港澳通行证,3-台胞证,4-护照,5-军官证',
name varchar(30) not null comment '真实姓名',
id_card varchar(50) not null comment '证件号码',
name varchar(60) not null comment '真实姓名',
id_card varchar(30) not null comment '证件号码',
state tinyint not null comment '0-INIT,1-NORMAL,2-INVALID',
created_at datetime(3) not null,
updated_at datetime(3),
......@@ -107,9 +107,9 @@ create table adam_enters
enters_id varchar(64) not null,
uid varchar(64) not null comment '用户id',
type tinyint not null default '1' comment '1-大陆身份证,2-港澳通行证,3-台胞证,4-护照,5-军官证',
name varchar(50) not null default '' comment '入场人名称',
name varchar(60) not null default '' comment '入场人名称',
mobile varchar(20) not null default '' comment '入场人手机号',
id_card varchar(20) not null default '' comment '入场人身份号码，或护照号码',
id_card varchar(30) not null default '' comment '入场人身份号码，或护照号码',
is_default boolean not null default false comment '是否为默认:0-否,1-是，第一个入默认1',
state tinyint not null comment '状态:0-INIT,1-NORMAL,2-INVALID',
created_at datetime(3) not null,
......@@ -130,10 +130,10 @@ create table adam_addresses
uid varchar(64) not null,
name varchar(120) not null comment '姓名',
phone varchar(30) not null comment '手机号',
province varchar(30) not null comment '省份',
city varchar(50) not null comment '城市',
province varchar(60) not null comment '省份',
city varchar(60) not null comment '城市',
county varchar(60) not null comment '区县',
address varchar(750) not null comment '详细地址',
address tinytext not null comment '详细地址',
is_default boolean not null default false comment '是否为默认:0-否,1-是,第一个默认1',
state tinyint not null comment '状态:0-INIT,1-NORMAL,2-INVALID',
created_at datetime(3) not null,
......@@ -207,7 +207,7 @@ create table adam_member
(
mid bigint unsigned auto_increment primary key,
member_id varchar(255) comment '会员id',
name varchar(64),
name varchar(80),
title varchar(100),
sub_title varchar(255) NOT NULL DEFAULT '' COMMENT '副标题',
icon varchar(255),
......@@ -227,7 +227,7 @@ create table adam_member
state int NOT NULL COMMENT '状态:1-NORMAL,2-INVALID',
limitation int default 0 comment '限购数量，0不限购',
comment text
);
) engine = InnoDB comment '会员卡信息';
create unique index uidx_amember_id on adam_member (member_id);
# MDB.idx:member_id,state
......@@ -237,17 +237,17 @@ create table adam_member_price
(
mid bigint unsigned auto_increment primary key,
member_price_id varchar(64) comment '会员价格id',
member_id varchar(64) NOT NULL comment '会员种类ID',
state tinyint NOT NULL DEFAULT '0' COMMENT '0不可用、1上线中、2已下线',
name varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '会员包名称',
price decimal(8, 2) NOT NULL DEFAULT '0.00' COMMENT '会员包价格',
member_id varchar(64) NOT NULL comment '会员种类ID',
state tinyint NOT NULL DEFAULT '0' COMMENT '0不可用、1上线中、2已下线',
name varchar(80) NOT NULL DEFAULT '' COMMENT '会员包名称',
price decimal(8, 2) NOT NULL DEFAULT '0.00' COMMENT '会员包价格',
price_fixed decimal(8, 2) comment '折扣价',
days int NOT NULL DEFAULT '0' COMMENT '会员包天数',
detail text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '会员包须知',
days int NOT NULL DEFAULT '0' COMMENT '会员包天数',
detail text NOT NULL COMMENT '会员包须知',
created_at datetime(3),
updated_at datetime(3),
comment text
);
) engine = InnoDB comment '会员卡价格';
create unique index uidx_amember_price_id on adam_member_price (member_price_id);
create index idx_amember_price_member_id on adam_member_price (member_id);
......@@ -262,7 +262,7 @@ create table adam_member_order
mode tinyint comment '购买方式:0-购买会员,1-购买会员码',
price decimal(8, 2) comment '原价',
price_paid decimal(8, 2) comment '实际支付',
member_name varchar(64),
member_name varchar(80),
member_id varchar(255) comment '会员id',
member_price_id varchar(255) comment '会员价格id',
days int default 0 comment '购买天数',
......@@ -276,10 +276,10 @@ create table adam_member_order
created_at datetime(3),
updated_at datetime(3),
client_ip varchar(50),
source varchar(20),
version varchar(20),
source varchar(30),
version varchar(30),
comment text
);
) engine = InnoDB comment '用户会员订单';
create unique index uidx_amember_order_id on adam_member_order (order_no);
# MDB.idx:order_no
......@@ -296,7 +296,7 @@ create table adam_user_member
created_at datetime(3),
updated_at datetime(3),
comment text
);
) engine = InnoDB comment '用户会员信息';
create index idx_auser_member_uid on adam_user_member (uid);
create index idx_auser_member_no on adam_user_member (member_no);
......@@ -321,7 +321,7 @@ create table adam_member_code
use_uid varchar(64) default null comment '消费用户ID',
use_at datetime(3) default null,
comment text
);
) engine = InnoDB comment '会员兑换码';
create unique index uidx_amember_code_id on adam_member_code (code);
# MDB.idx:code
......
liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/admin/AdamDMAdminController.java
View file @ b375b160
......@@ -42,7 +42,7 @@ public class AdamDMAdminController extends AdamBaseController {
@Autowired
DMCollectionProcessor dmCollectionProcessor;
@ApiOperationSupport(order = 1)
@ApiOperationSupport(order = 10)
@ApiOperation(value = "user")
@GetMapping(value = {"user"})
public ResponseDto<Object> dataMigrationForUser() {
......@@ -50,7 +50,7 @@ public class AdamDMAdminController extends AdamBaseController {
return ResponseDto.success();
}
@ApiOperationSupport(order = 2)
@ApiOperationSupport(order = 20)
@ApiOperation(value = "tpa")
@GetMapping(value = {"tpa"})
public ResponseDto<Object> dataMigrationForTpa() {
......@@ -58,7 +58,7 @@ public class AdamDMAdminController extends AdamBaseController {
return ResponseDto.success();
}
@ApiOperationSupport(order = 3)
@ApiOperationSupport(order = 30)
@ApiOperation(value = "real")
@GetMapping(value = {"real"})
public ResponseDto<Object> dataMigrationForReal() {
......@@ -66,7 +66,7 @@ public class AdamDMAdminController extends AdamBaseController {
return ResponseDto.success();
}
@ApiOperationSupport(order = 4)
@ApiOperationSupport(order = 40)
@ApiOperation(value = "vip")
@GetMapping(value = {"vip"})
public ResponseDto<Object> dataMigrationForVip() {
......@@ -74,7 +74,7 @@ public class AdamDMAdminController extends AdamBaseController {
return ResponseDto.success();
}
@ApiOperationSupport(order = 5)
@ApiOperationSupport(order = 50)
@ApiOperation(value = "traces")
@GetMapping(value = {"traces"})
public ResponseDto<Object> dataMigrationForTraces() {
......@@ -82,7 +82,7 @@ public class AdamDMAdminController extends AdamBaseController {
return ResponseDto.success();
}
@ApiOperationSupport(order = 6)
@ApiOperationSupport(order = 60)
@ApiOperation(value = "enters")
@GetMapping(value = {"enters"})
public ResponseDto<Object> dataMigrationForEnters() {
......@@ -90,7 +90,7 @@ public class AdamDMAdminController extends AdamBaseController {
return ResponseDto.success();
}
@ApiOperationSupport(order = 7)
@ApiOperationSupport(order = 70)
@ApiOperation(value = "addr")
@GetMapping(value = {"addr"})
public ResponseDto<Object> dataMigrationForAddr() {
......@@ -98,7 +98,7 @@ public class AdamDMAdminController extends AdamBaseController {
return ResponseDto.success();
}
@ApiOperationSupport(order = 8)
@ApiOperationSupport(order = 80)
@ApiOperation(value = "morder")
@GetMapping(value = {"morder"})
public ResponseDto<Object> dataMigrationForMOrder() {
......@@ -106,7 +106,7 @@ public class AdamDMAdminController extends AdamBaseController {
return ResponseDto.success();
}
@ApiOperationSupport(order = 9)
@ApiOperationSupport(order = 90)
@ApiOperation(value = "mcode")
@GetMapping(value = {"mcode"})
public ResponseDto<Object> dataMigrationForMCode() {
......@@ -114,7 +114,7 @@ public class AdamDMAdminController extends AdamBaseController {
return ResponseDto.success();
}
@ApiOperationSupport(order = 10)
@ApiOperationSupport(order = 100)
@ApiOperation(value = "collect")
@GetMapping(value = {"collect"})
public ResponseDto<Object> dataMigrationForCollect() {
......
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