From 2155998f13ebc009f9978e36e5b35692cc2d07ab Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@zdjizhi.com>
Date: Fri, 28 Jun 2019 16:01:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=8F=82=E6=95=B0=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6json=E8=B6=85=E8=BF=87=E4=B8=80=E5=AE=9A=E9=95=BF?=
 =?UTF-8?q?=E5=BA=A6=E4=B8=8D=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/util/Constants.java            |  4 ++++
 src/main/java/com/nis/util/SchedulerTaskUtil.java    |  6 +++++-
 src/main/java/com/nis/web/service/BaseService.java   | 12 ++++++------
 .../service/configuration/ObjectGroupService.java    | 12 ++++++++++--
 src/main/resources/nis.properties                    |  2 ++
 5 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java
index 969aa86e7..f76ecfc55 100644
--- a/src/main/java/com/nis/util/Constants.java
+++ b/src/main/java/com/nis/util/Constants.java
@@ -8,6 +8,10 @@ import java.util.regex.Pattern;
 import com.google.gson.GsonBuilder;
 
 public final class Constants {
+	/**
+	 * json打印长度
+	 */
+	public static Integer JSON_PRINT_LENTH=Configurations.getIntProperty("json_print_length", 100000);
 	/**
 	 * obj group list group type
 	 */
diff --git a/src/main/java/com/nis/util/SchedulerTaskUtil.java b/src/main/java/com/nis/util/SchedulerTaskUtil.java
index dfea96a50..95d812449 100644
--- a/src/main/java/com/nis/util/SchedulerTaskUtil.java
+++ b/src/main/java/com/nis/util/SchedulerTaskUtil.java
@@ -438,7 +438,11 @@ public class SchedulerTaskUtil {
 							maatBean.setVersion(Constants.MAAT_VERSION);
 							maatBean.setOpAction(Constants.INSERT_ACTION);
 							String json=BaseService.gsonToJson(maatBean);
-							logger.info("定时任务修改NTC/PROXY策略的MAAT配置内容："+json);
+							if(json.length()<Constants.JSON_PRINT_LENTH){
+								logger.info("定时任务修改NTC/PROXY策略的MAAT配置内容："+json);
+							}else{
+								logger.info("定时任务修改NTC/PROXY策略的MAAT配置内容超过"+Constants.JSON_PRINT_LENTH+",不打印");
+							}
 							//调用服务接口修改配置内容与状态
 							ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
 							if(result!=null){
diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java
index 8ef57688c..21629a9a3 100644
--- a/src/main/java/com/nis/web/service/BaseService.java
+++ b/src/main/java/com/nis/web/service/BaseService.java
@@ -1924,7 +1924,7 @@ public abstract class BaseService {
 						maatBean.setOpAction(Constants.INSERT_ACTION);
 						// 调用服务接口下发配置数据
 						String json = BaseService.gsonToJson(maatBean);
-						if(configCompileList.size()>10) {
+						if(json.length()>Constants.JSON_PRINT_LENTH) {
 							logger.info("APP主题网站配置下发配置参数：" + configCompileList.size());
 						}else {
 							logger.info("APP主题网站配置下发配置参数：" + json);
@@ -1988,7 +1988,7 @@ public abstract class BaseService {
 						maatBean.setOpAction(Constants.INSERT_ACTION);
 						// 调用服务接口下发配置数据
 						String json = BaseService.gsonToJson(maatBean);
-						if(configCompileList.size()>10) {
+						if(json.length()>Constants.JSON_PRINT_LENTH) {
 							logger.info("APP Feature增强字符串配置下发配置条数：" + configCompileList.size());
 						}else {
 							logger.info("APP Feature增强字符串配置下发配置参数：" + json);
@@ -2401,7 +2401,7 @@ public abstract class BaseService {
 						maatBean.setOpAction(Constants.INSERT_ACTION);
 						// 调用服务接口下发配置数据
 						String json = BaseService.gsonToJson(maatBean);
-						if(configCompileList.size()>10) {
+						if(json.length()>Constants.JSON_PRINT_LENTH) {
 							logger.info("APP策略 配置下发配置条数：" + configCompileList.size());
 						}else {
 							logger.info("APP策略 配置下发配置参数：" + json);
@@ -2609,7 +2609,7 @@ public abstract class BaseService {
 							start=System.currentTimeMillis();
 							// 调用服务接口下发配置数据
 							String json = BaseService.gsonToJson(maatBean);
-							if(configCompileList.size()>10) {
+							if(json.length()>Constants.JSON_PRINT_LENTH) {
 								logger.info("IP 配置下发配置条数：" + configCompileList.size());
 							}else {
 								logger.info("IP 配置下发配置参数：" + json);
@@ -2756,7 +2756,7 @@ public abstract class BaseService {
 						start=System.currentTimeMillis();
 						// 调用服务接口下发配置数据
 						String json = BaseService.gsonToJson(maatBean);
-						if(configCompileList.size()>10) {
+						if(json.length()>Constants.JSON_PRINT_LENTH) {
 							logger.info("字符串配置下发配置条数：" + configCompileList.size());
 						}else {
 							logger.info("字符串配置下发配置参数：" + json);
@@ -2886,7 +2886,7 @@ public abstract class BaseService {
 						maatBean.setOpAction(Constants.INSERT_ACTION);
 						// 调用服务接口下发配置数据
 						String json = BaseService.gsonToJson(maatBean);
-						if(configCompileList.size()>10) {
+						if(json.length()>Constants.JSON_PRINT_LENTH) {
 							logger.info("增强字符串配置下发配置条数：" + configCompileList.size());
 						}else {
 							logger.info("增强字符串配置下发配置参数：" + json);
diff --git a/src/main/java/com/nis/web/service/configuration/ObjectGroupService.java b/src/main/java/com/nis/web/service/configuration/ObjectGroupService.java
index e1d887ac4..3f39405f1 100644
--- a/src/main/java/com/nis/web/service/configuration/ObjectGroupService.java
+++ b/src/main/java/com/nis/web/service/configuration/ObjectGroupService.java
@@ -455,7 +455,11 @@ public class ObjectGroupService extends BaseService {
             maatBean.setOpAction(opAction);
             //调用服务接口下发配置数据
             String json=gsonToJson(maatBean);
-            logger.info("策略对象组下发配置参数："+json);
+            if(json.length()<Constants.JSON_PRINT_LENTH){
+                logger.info("策略对象组下发配置参数："+json);
+            }else{
+                logger.info("策略对象组下发配置内容超过"+Constants.JSON_PRINT_LENTH+",不打印");
+            }
             //调用服务接口下发配置
             ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
             logger.info("策略对象组下发响应信息："+result.getMsg());
@@ -472,7 +476,11 @@ public class ObjectGroupService extends BaseService {
             maatBean.setOpAction(Constants.UPDATE_ACTION);
             //调用服务接口取消配置
             String json=gsonToJson(maatBean);
-            logger.info("策略对象组下发配置参数："+json);
+            if(json.length()<Constants.JSON_PRINT_LENTH){
+                logger.info("策略对象组下发配置参数："+json);
+            }else{
+                logger.info("策略对象组下发配置内容超过"+Constants.JSON_PRINT_LENTH+",不打印");
+            }
             //调用服务接口下发配置
             ToMaatResult result = ConfigServiceUtil.put(json,1);
             logger.info("策略对象组取消配置响应信息："+result.getMsg());
diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties
index c17c21559..be3f214d3 100644
--- a/src/main/resources/nis.properties
+++ b/src/main/resources/nis.properties
@@ -546,3 +546,5 @@ ip_obj_group_type=5
 url_obj_group_type=7
 subid_obj_group_type=9
 domain_obj_group_type=8
+#not print json if it is larger than this param
+json_print_length=10000000
\ No newline at end of file