From 5d15287b2a06f978485ac6af71e33e1a82b43a65 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期三, 15 四月 2020 16:29:55 +0800
Subject: [PATCH] fix 上传后生成版本连接池用完不释放问题
---
src/main/java/com/highdatas/mdm/util/UserRoleClient.java | 66 ++++++++++++++++----------------
1 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/util/UserRoleClient.java b/src/main/java/com/highdatas/mdm/util/UserRoleClient.java
index 883cf5b..50afa8f 100644
--- a/src/main/java/com/highdatas/mdm/util/UserRoleClient.java
+++ b/src/main/java/com/highdatas/mdm/util/UserRoleClient.java
@@ -11,12 +11,12 @@
import org.springframework.http.HttpMethod;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Component;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
import org.springframework.util.StringUtils;
import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.List;
+import java.util.Map;
@ConfigurationProperties(prefix = "user")
@Component
@@ -27,14 +27,14 @@
String prefix ;
- private UserRoleClient() {
+ public UserRoleClient() {
this.prefix = "/api/datacvg/";
}
public TUser getTUserById(String userId) {
String url = this.url + prefix + "user/selectUser";
- MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
- params.set("userId",userId);
+ Map<String, String> params = new LinkedHashMap<>();
+ params.put("userId",userId);
String s = HttpUtils.HttpRestClient(url, HttpMethod.POST, params, MediaType.APPLICATION_JSON);
JSONObject result = (JSONObject) JSON.parse(s);
String sucess = result.getString(Constant.Success);
@@ -53,8 +53,8 @@
public TRole getRoleByRoleId(String roleId) {
try {
String url = this.url + prefix + "role/selectRole";
- MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
- params.set("roleId", roleId);
+ Map<String, String> params = new LinkedHashMap<>();
+ params.put("roleId", roleId);
String s = HttpUtils.HttpRestClient(url, HttpMethod.POST, params, MediaType.APPLICATION_JSON);
JSONObject result = (JSONObject) JSON.parse(s);
String sucess = result.getString(Constant.Success);
@@ -77,9 +77,10 @@
public List<TUserGroup> getUserGroupByUserId(String userId) {
String url = this.url + prefix + "group/userGroupInfo";
- MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
- params.set("userId",userId);
- String s = HttpUtils.HttpRestClient(url, HttpMethod.POST, params, MediaType.APPLICATION_JSON);
+ Map<String, Object> params = new LinkedHashMap<>();
+ params.put("userId",userId);
+ String urlParamsByMap = HttpUtils.getUrlParamsByMap(params);
+ String s = HttpUtils.HttpRestClient(url, HttpMethod.POST, null,urlParamsByMap, MediaType.APPLICATION_JSON);
JSONObject result = (JSONObject) JSON.parse(s);
String sucess = result.getString(Constant.Success);
if (StringUtils.isEmpty(sucess) || !Boolean.valueOf(sucess)) {
@@ -95,17 +96,16 @@
}
public List<TRole> getTRoleListByUserId(String userId) {
- String url = this.url + prefix + "userRole/selectUserRole";
- MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
- params.set("userId",userId);
+ String url = this.url + prefix + "userRole/selectUserRoleList";
+ Map<String, String> params = new LinkedHashMap<>();
+ params.put("userId",userId);
String s = HttpUtils.HttpRestClient(url, HttpMethod.POST, params, MediaType.APPLICATION_JSON);
JSONObject result = (JSONObject) JSON.parse(s);
String sucess = result.getString(Constant.Success);
if (StringUtils.isEmpty(sucess) || !Boolean.valueOf(sucess)) {
return null;
}else {
- JSONObject data = result.getJSONObject(Constant.Data);
- JSONArray groupArray = data.getJSONArray("Unauthorized");
+ JSONArray groupArray = result.getJSONArray(Constant.Data);
List<TRole> tRoles = JSONArray.parseArray(groupArray.toJSONString(), TRole.class);
if (tRoles == null || tRoles.isEmpty()) {
return null;
@@ -117,9 +117,10 @@
public List<TRole> getRoleListByGroupId(String groupId) {
try {
String url = this.url + prefix + "group/groupRoleInfo";
- MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
- params.set("groupId", groupId);
- String s = HttpUtils.HttpRestClient(url, HttpMethod.POST, params, MediaType.APPLICATION_JSON);
+ Map<String, Object> params = new LinkedHashMap<>();
+ params.put("groupId", groupId);
+ String urlParamsByMap = HttpUtils.getUrlParamsByMap(params);
+ String s = HttpUtils.HttpRestClient(url, HttpMethod.POST, null,urlParamsByMap, MediaType.APPLICATION_JSON);
JSONObject result = (JSONObject) JSON.parse(s);
String sucess = result.getString(Constant.Success);
if (StringUtils.isEmpty(sucess) || !Boolean.valueOf(sucess)) {
@@ -142,10 +143,10 @@
public boolean addRoleByUser(String userId, List<String> roleIds, String userName) {
try {
String url = this.url + prefix + "userRole/addRoleUser";
- MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
- params.set("userId", userId);
- params.set("listRoleId", roleIds);
- params.set("createUser", userId);
+ Map<String, Object> params = new LinkedHashMap<>();
+ params.put("userId", userId);
+ params.put("listRoleId", roleIds);
+ params.put("createUser", userId);
String s = HttpUtils.HttpRestClientByObjectParams(url, HttpMethod.POST, params, null, null,MediaType.APPLICATION_JSON);
JSONObject result = (JSONObject) JSON.parse(s);
String sucess = result.getString(Constant.Success);
@@ -161,13 +162,12 @@
}
}
- public boolean deleteRoleByUser(String userId, List<String> roleIds, String userName) {
+ public boolean deleteRoleByUser(String userId, List<String> roleIds) {
try {
String url = this.url + prefix + "userRole/deleteRoleUsers";
- MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
- params.set("userId", userId);
- params.set("listRoleId", roleIds);
- params.set("createUser", userId);
+ Map<String, Object> params = new LinkedHashMap<>();
+ params.put("userId", userId);
+ params.put("listRoleId", roleIds);
String s = HttpUtils.HttpRestClientByObjectParams(url, HttpMethod.POST, params, null, null,MediaType.APPLICATION_JSON);
JSONObject result = (JSONObject) JSON.parse(s);
String sucess = result.getString(Constant.Success);
@@ -190,9 +190,9 @@
HashMap<String, String> headerMap = new HashMap<>();
headerMap.put("userId", userId);
- MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
- params.set("groupId", groupId);
- params.set("roleIdList", roleIds);
+ Map<String, Object> params = new LinkedHashMap<>();
+ params.put("groupId", groupId);
+ params.put("roleIdList", roleIds);
String s = HttpUtils.HttpRestClientByObjectParams(url, HttpMethod.POST, params, null,headerMap,MediaType.APPLICATION_JSON);
JSONObject result = (JSONObject) JSON.parse(s);
String sucess = result.getString(Constant.Success);
@@ -210,9 +210,9 @@
public boolean deleteRoleByGroupId(List<String> roleIds, String groupId) {
try {
String url = this.url + prefix + "group/delGroupRole";
- MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
- params.set("groupId", groupId);
- params.set("roleIdList", roleIds);
+ Map<String, Object> params = new LinkedHashMap<>();
+ params.put("groupId", groupId);
+ params.put("roleIdList", roleIds);
String s = HttpUtils.HttpRestClientByObjectParams(url, HttpMethod.POST, params, null,null,MediaType.APPLICATION_JSON);
JSONObject result = (JSONObject) JSON.parse(s);
String sucess = result.getString(Constant.Success);
--
Gitblit v1.8.0