From e78cf4b0e371980a0b97a73a60811574e03b54a4 Mon Sep 17 00:00:00 2001
From: doufenghu <doufenghu@iie.ac.cn>
Date: Thu, 21 Feb 2019 16:29:39 +0600
Subject: [PATCH] =?UTF-8?q?fix:=20Syncredis=E6=96=B9=E6=B3=95=E5=90=8D?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=92=8C=E6=9D=A5=E9=85=8D=E7=BD=AE=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1sql=E5=A2=9E=E5=8A=A0=E5=AE=A1=E6=A0=B8=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/init/galaxy_stru_ui_mysql.sql              |  5 +--
 .../com/nis/web/task/SyncRedisToCluster.java  | 33 +++++--------------
 2 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/db/init/galaxy_stru_ui_mysql.sql b/db/init/galaxy_stru_ui_mysql.sql
index c7cb711..fcdbd39 100644
--- a/db/init/galaxy_stru_ui_mysql.sql
+++ b/db/init/galaxy_stru_ui_mysql.sql
@@ -2,7 +2,7 @@
 drop table if exists ui_asn_ip_cfg;
 drop table if exists ui_sys_dict_info;
 drop table if exists ui_code_app_dic;
-drop table if exists ui_cfg_num_statistics;
+
 drop table if exists ui_request_num_statistics;
 drop table if exists ui_sys_data_dictionary_item;
 drop table if exists ui_code_behavior_type_dic;
@@ -95,7 +95,7 @@ CREATE TABLE `ui_sys_dict_info` (
   ) ENGINE=FEDERATED AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 CONNECTION='mysql://root:111111@10.0.4.6:3306/ntc_db/code_app_dic';
 
 
-
+drop table if exists ui_cfg_num_statistics;
 CREATE TABLE `ui_cfg_num_statistics` (
    `id` int(11) NOT NULL AUTO_INCREMENT,
    `function_id` int(11) NOT NULL,
@@ -104,6 +104,7 @@ CREATE TABLE `ui_cfg_num_statistics` (
    `cfg_state` int(11) NOT NULL COMMENT '0未审核，1已审核，2审核未通过，3审核取消，-1删除',
    `compile_id` int(11) DEFAULT 0,
    `statistic_time` datetime DEFAULT NULL COMMENT '统计时间',
+   `audit_time` datetime DEFAULT null COMMENT '审核时间',
    PRIMARY KEY (`id`)
  )  ENGINE=FEDERATED AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 CONNECTION='mysql://root:111111@10.0.4.6:3306/ntc_db/cfg_num_statistics';
 
diff --git a/src/main/java/com/nis/web/task/SyncRedisToCluster.java b/src/main/java/com/nis/web/task/SyncRedisToCluster.java
index da0146d..0e3f963 100644
--- a/src/main/java/com/nis/web/task/SyncRedisToCluster.java
+++ b/src/main/java/com/nis/web/task/SyncRedisToCluster.java
@@ -1,20 +1,5 @@
 package com.nis.web.task;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.UUID;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
 import com.nis.restful.RestBusinessCode;
 import com.nis.restful.ServiceRuntimeException;
 import com.nis.util.Configurations;
@@ -23,16 +8,16 @@ import com.nis.util.ExceptionUtil;
 import com.nis.util.JedisUtils;
 import com.nis.web.service.SpringContextHolder;
 import com.nis.web.service.restful.ConfigJedisServiceimpl;
-
-import redis.clients.jedis.Jedis;
-import redis.clients.jedis.JedisCluster;
-import redis.clients.jedis.JedisPool;
-import redis.clients.jedis.ScanParams;
-import redis.clients.jedis.ScanResult;
-import redis.clients.jedis.Tuple;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.stereotype.Component;
+import redis.clients.jedis.*;
 import redis.clients.jedis.exceptions.JedisException;
 import redis.clients.util.JedisClusterCRC16;
 
+import java.util.*;
+
 @Component
 @PropertySource(value = { "classpath:nis.properties", "classpath:jdbc.properties" })
 public class SyncRedisToCluster {
@@ -72,8 +57,8 @@ public class SyncRedisToCluster {
 		}
 	}
 	
-//	@Scheduled(cron = "${syncRedisToClusterCron}")
-	public void syncRedisToCluster1() {
+	//@Scheduled(cron = "${syncRedisToClusterCron}")
+	public void syncRedisToCluster() {
 		JedisCluster jedisCluster = getResource();
 		String requestId = UUID.randomUUID().toString();
 		try {