Merge remote-tracking branch 'origin/master'

src/main/resources/conf.properties

 kafka.bootstrap.servers=39.100.49.76:9092
 kafka.bootstrap.servers=39.100.49.76:9092
 #kafka.bootstrap.servers=10.197.236.154:9092
 #kafka.bootstrap.servers=10.197.236.154:9092
 
 
-kafka.zookerper.servers=10.197.236.154:2181
+kafka.zookerper.servers=10.197.236.211:2181
 #,10.197.236.169:2181,10.197.236.184:2181/kafka
 #,10.197.236.169:2181,10.197.236.184:2181/kafka
 #kafka.zookerper.servers=172.26.111.183:2181,172.26.111.178:2181,172.26.111.186:2181/tbd_kafka
 #kafka.zookerper.servers=172.26.111.183:2181,172.26.111.178:2181,172.26.111.186:2181/tbd_kafka
 #kafka.zookerper.servers=10.197.236.211:2181
 #kafka.zookerper.servers=10.197.236.211:2181

src/main/scala/com/hikcreate/data/common/Sparking.scala

@@ -18,8 +18,8 @@ trait Sparking {
     .set("spark.extraListeners",classOf[LifecycleListener].getName)
     .set("spark.extraListeners",classOf[LifecycleListener].getName)
     .set("hive.exec.dynamici.partition","true")
     .set("hive.exec.dynamici.partition","true")
     .set("hive.exec.dynamic.partition.mode","nonstrict")
     .set("hive.exec.dynamic.partition.mode","nonstrict")
-    //.setAppName("test")
-    //.setMaster("local[*]")
+    .setAppName("test")
+    .setMaster("local[*]")
 
 
   def getKafkaParams(servers:String,groupId: String):Map[String,Object] = {
   def getKafkaParams(servers:String,groupId: String):Map[String,Object] = {
     Map[String,Object](
     Map[String,Object](

src/main/scala/com/hikcreate/data/constant/ApolloConst.scala

@@ -8,7 +8,7 @@ object ApolloConst {
 
 
 
 
   val config: Config = ConfigService.getConfig("application")
   val config: Config = ConfigService.getConfig("application")
-
+  val queueSize:Int=config.getIntProperty("queue.size",20)
   var hdfsUrl: String = config.getProperty("hdfs.url",null)
   var hdfsUrl: String = config.getProperty("hdfs.url",null)
   var windowTime:Long = config.getLongProperty("window.time",1L)
   var windowTime:Long = config.getLongProperty("window.time",1L)
   var compactTopic:Seq[String] =  config.getProperty("compact.kafka.topic",null).split(",")
   var compactTopic:Seq[String] =  config.getProperty("compact.kafka.topic",null).split(",")

src/test/scala/Test1.scala

 import com.hikcreate.data.util.Tools
 import com.hikcreate.data.util.Tools
 
 
+import scala.collection.mutable
+
+
+
 object Test1 {
 object Test1 {
 
 
 
 
   def main(args: Array[String]): Unit = {
   def main(args: Array[String]): Unit = {
 
 
-    val a = Tools.getAddressAndLocationCode(120.485443,30.183996)
-    println(a._1+"----"+a._2)
+//    val a = Tools.getAddressAndLocationCode(120.485443,30.183996)
+//    println(a._1+"----"+a._2)
+//    var eventtype="0x2"
+//    eventtype = eventtype.replace("x","x0")
+//    println(eventtype)
+    val list = (1 to(20)).toList
+    val queue=mutable.Queue[Int]()
+    (1 to(20)).foreach(i=>queue.enqueue(i))
+
+    val i = queue.dequeue()
+    println(i)
+    println(queue)
+    queue.enqueue(i)
+    println(queue)
+//    val dequeue = queue
+//    println(dequeue._1)
+//    println(queue)
+    //val queue1 = queue.enqueue(dequeue._1)
+    //println(queue1)
 
 
   }
   }