Commit 1e1e49ad by 罗承锋

更新上传大小和合伙人解锁账户

parent bda2096a
...@@ -20,7 +20,7 @@ server: ...@@ -20,7 +20,7 @@ server:
max-threads: 200 max-threads: 200
max-connections: 2000 max-connections: 2000
jetty: jetty:
max-http-post-size: 1000000 max-http-post-size: 100000000
winsun: winsun:
app: app:
version: @project.version@ version: @project.version@
......
...@@ -18,7 +18,7 @@ server: ...@@ -18,7 +18,7 @@ server:
max-threads: 200 max-threads: 200
max-connections: 2000 max-connections: 2000
jetty: jetty:
max-http-post-size: 1000000 max-http-post-size: 100000000
winsun: winsun:
app: app:
version: @project.version@ version: @project.version@
......
...@@ -142,4 +142,39 @@ public class UserDeployController extends BaseController { ...@@ -142,4 +142,39 @@ public class UserDeployController extends BaseController {
List<School> list = schoolMapper.selectList(schoolWrapper); List<School> list = schoolMapper.selectList(schoolWrapper);
return ResponseData.success(list); return ResponseData.success(list);
} }
/**
* 解锁账户
* @param userId
* @return
*/
@Permission(menuname = "解锁用户", value = "unlockUser", method = RequestMethod.POST)
public ResponseData<String> unlockUser(String userId) {
SysUser sysUser = new SysUser();
sysUser.setId(userId);
sysUser.setStatus("1");
Integer integer = sysUserMapper.updateById(sysUser);
if (integer > 0) {
return ResponseData.success("解锁成功");
}
return ResponseData.error("解锁失败");
}
/**
* 锁定账户
* @param userId
* @return
*/
@Permission(menuname = "锁定用户", value = "lockUser", method = RequestMethod.POST)
public ResponseData<String> lockUser(String userId) {
SysUser sysUser = new SysUser();
sysUser.setId(userId);
sysUser.setStatus("2");
Integer integer = sysUserMapper.updateById(sysUser);
if (integer > 0) {
return ResponseData.success("锁定成功");
}
return ResponseData.error("锁定失败");
}
} }
...@@ -136,7 +136,7 @@ public class AccessStatisticServiceImpl implements AccessStatisticService { ...@@ -136,7 +136,7 @@ public class AccessStatisticServiceImpl implements AccessStatisticService {
if (userIds != null && userIds.size() > 0) { if (userIds != null && userIds.size() > 0) {
userIdsDql.append("("); userIdsDql.append("(");
for(int i = 0; i < userIds.size(); ++i) { for(int i = 0; i < userIds.size(); ++i) {
userIdsDql.append("http_referer:*").append(userIds.get(i)).append("* "); userIdsDql.append("request_body:*").append(userIds.get(i)).append("* ");
if (userIds.size() != (i+1)) { if (userIds.size() != (i+1)) {
userIdsDql.append("OR "); userIdsDql.append("OR ");
} }
...@@ -145,7 +145,7 @@ public class AccessStatisticServiceImpl implements AccessStatisticService { ...@@ -145,7 +145,7 @@ public class AccessStatisticServiceImpl implements AccessStatisticService {
} }
log.info("统计用户:" + userIdsDql.toString()); log.info("统计用户:" + userIdsDql.toString());
String dql = "{\"size\":0,\"query\":{\"bool\":{\"filter\":[{\"range\":{\"@timestamp\":{\"gte\":" + startDate.getTime() + ",\"lte\":" + endDate.getTime() +",\"format\":\"epoch_millis\"}}},{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"request:*.do* " + userIdsDql.toString() + "\"}}]}},\"aggs\":{\"groupBy\": {\"date_histogram\": {\"field\": \"@timestamp\",\"interval\": \"" + type + "\"},\"aggs\":{\"userCount\":{\"cardinality\":{\"field\":\"remote_addr\"}}}}}}"; String dql = "{\"size\":0,\"query\":{\"bool\":{\"filter\":[{\"range\":{\"@timestamp\":{\"gte\":" + startDate.getTime() + ",\"lte\":" + endDate.getTime() +",\"format\":\"epoch_millis\"}}},{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"request_uri:*checkHhr* " + userIdsDql.toString() + "\"}}]}},\"aggs\":{\"groupBy\": {\"date_histogram\": {\"field\": \"@timestamp\",\"interval\": \"" + type + "\"},\"aggs\":{\"userCount\":{\"cardinality\":{\"field\":\"remote_addr\"}}}}}}";
log.info("dql:" + dql); log.info("dql:" + dql);
try { try {
String esSearch = AccessStatisticDataSearchUtils.esSearch(dql); String esSearch = AccessStatisticDataSearchUtils.esSearch(dql);
......
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