From 807e2c7a2ca8283ba6d6f764c83320ad5e023349 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期四, 19 三月 2020 09:01:04 +0800
Subject: [PATCH] fix 放开红点的权限
---
src/main/java/com/highdatas/mdm/util/MaskClient.java | 76 +++++++++++++++++++++++++
src/main/java/com/highdatas/mdm/util/HttpTraceLogFilter.java | 6 +
src/main/java/com/highdatas/mdm/util/VisitClient.java | 79 ++++++++++++++++++++++++++
src/main/java/com/highdatas/mdm/controller/MaintainController.java | 9 +-
src/main/resources/application.yml | 2
src/main/java/com/highdatas/mdm/controller/SysMenuController.java | 4
6 files changed, 167 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/controller/MaintainController.java b/src/main/java/com/highdatas/mdm/controller/MaintainController.java
index 2d3068d..28648f7 100644
--- a/src/main/java/com/highdatas/mdm/controller/MaintainController.java
+++ b/src/main/java/com/highdatas/mdm/controller/MaintainController.java
@@ -112,10 +112,11 @@
continue;
}
if (flows.getStatus().equals(ActivitiStatus.working) || flows.getStatus().equals(ActivitiStatus.refuse)) {
- boolean nextAudit = flowsService.isNextAudit(flows, userId);
- if (nextAudit) {
- count++;
- }
+// boolean nextAudit = flowsService.isNextAudit(flows, userId);
+// if (nextAudit) {
+// count++;
+// }
+ count++;
continue;
}else if(flows.getStatus().equals(ActivitiStatus.open)){
maintain.setMaintainType(1);
diff --git a/src/main/java/com/highdatas/mdm/controller/SysMenuController.java b/src/main/java/com/highdatas/mdm/controller/SysMenuController.java
index ed3fa78..e3e24df 100644
--- a/src/main/java/com/highdatas/mdm/controller/SysMenuController.java
+++ b/src/main/java/com/highdatas/mdm/controller/SysMenuController.java
@@ -60,7 +60,7 @@
TUser user = (TUser) session.getAttribute("user");
String userId = user.getUserId();
List<Flows> flows = flowsService.selectList(new EntityWrapper<Flows>().ne("business_type", ActivitiBusinessType.exists).ne("status", ActivitiStatus.open).ne("status", ActivitiStatus.close));
- flows = flows.stream().filter(flow -> flowsService.isNextAudit(flow, userId)).collect(Collectors.toList());
+// flows = flows.stream().filter(flow -> flowsService.isNextAudit(flow, userId)).collect(Collectors.toList());
HashSet<String> tableNameSet = new HashSet<>();
List<String> maintainIds = flows.stream().map(Flows::getBusinessId).collect(Collectors.toList());
@@ -100,7 +100,7 @@
}
String tableName = menuMapping.getTableName();
List<SysField> fieldByTable = fieldService.getFieldByTable(tableName);
- if (fieldByTable == null) {
+ if (fieldByTable == null || fieldByTable.size() == 0) {
continue;
}
parentIdSet.add(sysMenu.getId());
diff --git a/src/main/java/com/highdatas/mdm/util/HttpTraceLogFilter.java b/src/main/java/com/highdatas/mdm/util/HttpTraceLogFilter.java
index dd79ca5..a8c3a41 100644
--- a/src/main/java/com/highdatas/mdm/util/HttpTraceLogFilter.java
+++ b/src/main/java/com/highdatas/mdm/util/HttpTraceLogFilter.java
@@ -18,7 +18,6 @@
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
-import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import java.time.LocalDateTime;
import java.util.Objects;
@@ -126,7 +125,7 @@
@Data
- private static class HttpTraceLog {
+ public static class HttpTraceLog {
private String path;
private String parameterMap;
private String method;
@@ -134,6 +133,9 @@
private String time;
private Integer status;
private String requestBody;
+ private String userId;
+ private String userIp;
+ private String urlId;
private String responseBody;
}
}
diff --git a/src/main/java/com/highdatas/mdm/util/MaskClient.java b/src/main/java/com/highdatas/mdm/util/MaskClient.java
new file mode 100644
index 0000000..bb79cf2
--- /dev/null
+++ b/src/main/java/com/highdatas/mdm/util/MaskClient.java
@@ -0,0 +1,76 @@
+package com.highdatas.mdm.util;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.http.HttpMethod;
+import org.springframework.stereotype.Component;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.util.StringUtils;
+
+@ConfigurationProperties(prefix = "mask")
+@Component
+public class MaskClient {
+
+ @Value("${mask.url}")
+ String maskUrl;
+
+ String prefix ;
+
+ private MaskClient() {
+ this.prefix = "/api/datacvg/redis/";
+ }
+ public boolean putRedisVal(String key, String value) {
+ String url = maskUrl + prefix + "put";
+ MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
+ params.set("key",key);
+ params.set("value",value);
+ params.set("type",Constant.MainData);
+ String s = HttpUtils.HttpRestClient(url, HttpMethod.POST, params);
+ JSONObject result = (JSONObject) JSON.parse(s);
+ String sucess = result.getString(Constant.Success);
+ if (StringUtils.isEmpty(sucess) || !Boolean.valueOf(sucess)) {
+ return false;
+ }else {
+ return true;
+ }
+ }
+
+ public String getRedisVal(String key) {
+ try {
+ String url = maskUrl + prefix + "get";
+ MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
+ params.set("key",key);
+ params.set("type",Constant.MainData);
+ String s = HttpUtils.HttpRestClient(url, HttpMethod.POST, params);
+ JSONObject result = (JSONObject) JSON.parse(s);
+ String sucess = result.getString(Constant.Success);
+ if (StringUtils.isEmpty(sucess) || !Boolean.valueOf(sucess)) {
+ return null;
+ }else {
+ return result.getString(Constant.Data);
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ return null;
+ }
+
+ }
+
+ public boolean deleteRedisVal(String key) {
+ String url = maskUrl + prefix + "delete";
+ MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
+ params.set("key",key);
+ params.set("type",Constant.MainData);
+ String s = HttpUtils.HttpRestClient(url, HttpMethod.POST, params);
+ JSONObject result = (JSONObject) JSON.parse(s);
+ String sucess = result.getString(Constant.Success);
+ if (StringUtils.isEmpty(sucess) || !Boolean.valueOf(sucess)) {
+ return false;
+ }else {
+ return true;
+ }
+ }
+}
diff --git a/src/main/java/com/highdatas/mdm/util/VisitClient.java b/src/main/java/com/highdatas/mdm/util/VisitClient.java
new file mode 100644
index 0000000..40f6f64
--- /dev/null
+++ b/src/main/java/com/highdatas/mdm/util/VisitClient.java
@@ -0,0 +1,79 @@
+package com.highdatas.mdm.util;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.http.HttpMethod;
+import org.springframework.stereotype.Component;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.util.StringUtils;
+
+@ConfigurationProperties(prefix = "visit")
+@Component
+public class VisitClient {
+
+ @Value("${visit.url}")
+ String maskUrl;
+
+ String prefix ;
+
+ private VisitClient() {
+ this.prefix = "/api/datacvg/log/";
+ }
+
+ public boolean putRedisVal(HttpTraceLogFilter.HttpTraceLog traceLog) {
+ String url = maskUrl + prefix + "recordVisitLog";
+ MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
+ params.set("userId",traceLog.getUserId());
+ params.set("userIp",traceLog.getUserIp());
+ params.set("urlId",traceLog.getUrlId());
+ params.set("requestParam",traceLog.getRequestBody());
+ params.set("requestResult",traceLog.getResponseBody());
+ String s = HttpUtils.HttpRestClient(url, HttpMethod.POST, params);
+ JSONObject result = (JSONObject) JSON.parse(s);
+ String sucess = result.getString(Constant.Success);
+ if (StringUtils.isEmpty(sucess) || !Boolean.valueOf(sucess)) {
+ return false;
+ }else {
+ return true;
+ }
+ }
+
+ public String getRedisVal(String key) {
+ try {
+ String url = maskUrl + prefix + "get";
+ MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
+ params.set("key",key);
+ params.set("type",Constant.MainData);
+ String s = HttpUtils.HttpRestClient(url, HttpMethod.POST, params);
+ JSONObject result = (JSONObject) JSON.parse(s);
+ String sucess = result.getString(Constant.Success);
+ if (StringUtils.isEmpty(sucess) || !Boolean.valueOf(sucess)) {
+ return null;
+ }else {
+ return result.getString(Constant.Data);
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ return null;
+ }
+
+ }
+
+ public boolean deleteRedisVal(String key) {
+ String url = maskUrl + prefix + "delete";
+ MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
+ params.set("key",key);
+ params.set("type",Constant.MainData);
+ String s = HttpUtils.HttpRestClient(url, HttpMethod.POST, params);
+ JSONObject result = (JSONObject) JSON.parse(s);
+ String sucess = result.getString(Constant.Success);
+ if (StringUtils.isEmpty(sucess) || !Boolean.valueOf(sucess)) {
+ return false;
+ }else {
+ return true;
+ }
+ }
+}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 824d19f..7a1458c 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,7 +1,7 @@
spring:
profiles:
active:
- dev
+ prod
main:
allow-bean-definition-overriding: true
\ No newline at end of file
--
Gitblit v1.8.0