gfwleak/galaxy-tsg-olap-storm-radius-account-knowledge
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复EAL4版本

Browse Source
This commit is contained in:
qidaijie
2021-03-16 15:25:21 +08:00
parent e6e2e41333
commit dd8f04b114
11 changed files with 54 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pom.xml
View File

@@ -50,7 +50,7 @@
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>cn.ac.iie.topology.RadiusLogClearTopology</mainClass>
<mainClass>com.zdjizhi.topology.RadiusLogClearTopology</mainClass>
</transformer>
<transformer
implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
@@ -170,5 +170,11 @@
</exclusions>
</dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-all</artifactId>
<version>5.5.2</version>
</dependency>
</dependencies>
</project>

3
src/main/java/cn/ac/iie/bean/Knowledge.java → src/main/java/com/zdjizhi/bean/Knowledge.java
View File

@@ -1,9 +1,10 @@
package cn.ac.iie.bean;
package com.zdjizhi.bean;
/**
* @author qidaijie
*/
public class Knowledge {
private String framed_ip;
private String account;
private String acct_session_id;

15
src/main/java/cn/ac/iie/bolt/RadiusCleanBolt.java → src/main/java/com/zdjizhi/bolt/RadiusCleanBolt.java
View File

@@ -1,12 +1,13 @@
package cn.ac.iie.bolt;
package com.zdjizhi.bolt;
import cn.ac.iie.bean.Knowledge;
import cn.ac.iie.common.KnowledgeConfig;
import cn.ac.iie.utils.LogToKafka;
import cn.ac.iie.utils.TupleUtils;
import com.zdjizhi.bean.Knowledge;
import com.zdjizhi.common.KnowledgeConfig;
import com.zdjizhi.utils.kafka.LogToKafka;
import com.zdjizhi.utils.system.TupleUtils;
import cn.hutool.log.Log;
import cn.hutool.log.LogFactory;
import com.alibaba.fastjson.JSONObject;
import com.zdjizhi.utils.StringUtil;
import org.apache.log4j.Logger;
import org.apache.storm.task.TopologyContext;
import org.apache.storm.topology.BasicOutputCollector;
import org.apache.storm.topology.OutputFieldsDeclarer;
@@ -25,7 +26,7 @@ public class RadiusCleanBolt extends BaseBasicBolt {
private static final long serialVersionUID = -7099293750085572832L;
private List<String> list;
private LogToKafka logToKafka;
private static Logger logger = Logger.getLogger(RadiusCleanBolt.class);
private static final Log logger = LogFactory.get();
@Override
public void prepare(Map stormConf, TopologyContext context) {

6
src/main/java/cn/ac/iie/common/KnowledgeConfig.java → src/main/java/com/zdjizhi/common/KnowledgeConfig.java
View File

@@ -1,6 +1,6 @@
package cn.ac.iie.common;
package com.zdjizhi.common;
import cn.ac.iie.utils.KnowledgeConfigurations;
import com.zdjizhi.utils.system.KnowledgeConfigurations;
import java.io.Serializable;
@@ -10,6 +10,8 @@ import java.io.Serializable;
public class KnowledgeConfig implements Serializable {
private static final long serialVersionUID = -8326385159484059324L;
public static final String MODEL = "remote";
public static final String SEGMENTATION = ",";
/**
* 4- Accounting-Request(账户授权)

9
src/main/java/cn/ac/iie/spout/CustomizedKafkaSpout.java → src/main/java/com/zdjizhi/spout/CustomizedKafkaSpout.java
View File

@@ -1,10 +1,11 @@
package cn.ac.iie.spout;
package com.zdjizhi.spout;
import cn.ac.iie.common.KnowledgeConfig;
import com.zdjizhi.common.KnowledgeConfig;
import cn.hutool.log.Log;
import cn.hutool.log.LogFactory;
import org.apache.kafka.clients.consumer.ConsumerRecord;
import org.apache.kafka.clients.consumer.ConsumerRecords;
import org.apache.kafka.clients.consumer.KafkaConsumer;
import org.apache.log4j.Logger;
import org.apache.storm.spout.SpoutOutputCollector;
import org.apache.storm.task.TopologyContext;
import org.apache.storm.topology.OutputFieldsDeclarer;
@@ -24,7 +25,7 @@ public class CustomizedKafkaSpout extends BaseRichSpout {
private KafkaConsumer<String, String> consumer;
private SpoutOutputCollector collector = null;
private TopologyContext context = null;
private final static Logger logger = Logger.getLogger(CustomizedKafkaSpout.class);
private static final Log logger = LogFactory.get();
private static Properties createConsumerConfig() {

28
src/main/java/cn/ac/iie/topology/RadiusLogClearTopology.java → src/main/java/com/zdjizhi/topology/RadiusLogClearTopology.java
View File

@@ -1,21 +1,21 @@
package cn.ac.iie.topology;
package com.zdjizhi.topology;
import cn.ac.iie.bolt.RadiusCleanBolt;
import cn.ac.iie.common.KnowledgeConfig;
import cn.ac.iie.spout.CustomizedKafkaSpout;
import com.zdjizhi.bolt.RadiusCleanBolt;
import com.zdjizhi.common.KnowledgeConfig;
import com.zdjizhi.spout.CustomizedKafkaSpout;
import cn.hutool.log.Log;
import cn.hutool.log.LogFactory;
import org.apache.storm.Config;
import org.apache.storm.generated.AlreadyAliveException;
import org.apache.storm.generated.AuthorizationException;
import org.apache.storm.generated.InvalidTopologyException;
import org.apache.storm.topology.TopologyBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* @author qidaijie
*/
public class RadiusLogClearTopology {
private static final Logger logger = LoggerFactory.getLogger(RadiusLogClearTopology.class);
private static final Log logger = LogFactory.get();
private final String topologyName;
private final Config topologyConfig;
private TopologyBuilder builder;
@@ -60,22 +60,22 @@ public class RadiusLogClearTopology {
}
public static void main(String[] args) throws Exception {
RadiusLogClearTopology csst = null;
RadiusLogClearTopology radiusLogClearTopology;
boolean runLocally = true;
if (args.length >= 2 && "remote".equalsIgnoreCase(args[1])) {
if (args.length >= 2 && KnowledgeConfig.MODEL.equalsIgnoreCase(args[1])) {
runLocally = false;
csst = new RadiusLogClearTopology(args[0]);
radiusLogClearTopology = new RadiusLogClearTopology(args[0]);
} else {
csst = new RadiusLogClearTopology();
radiusLogClearTopology = new RadiusLogClearTopology();
}
csst.buildTopology();
radiusLogClearTopology.buildTopology();
if (runLocally) {
logger.info("执行本地模式...");
csst.runLocally();
radiusLogClearTopology.runLocally();
} else {
logger.info("执行远程部署模式...");
csst.runRemotely();
radiusLogClearTopology.runRemotely();
}
}
}

2
src/main/java/cn/ac/iie/topology/StormRunner.java → src/main/java/com/zdjizhi/topology/StormRunner.java
View File

@@ -1,4 +1,4 @@
package cn.ac.iie.topology;
package com.zdjizhi.topology;
import org.apache.storm.Config;

9
src/main/java/cn/ac/iie/utils/LogToKafka.java → src/main/java/com/zdjizhi/utils/kafka/LogToKafka.java
View File

@@ -1,8 +1,9 @@
package cn.ac.iie.utils;
package com.zdjizhi.utils.kafka;
import cn.ac.iie.common.KnowledgeConfig;
import com.zdjizhi.common.KnowledgeConfig;
import cn.hutool.log.Log;
import cn.hutool.log.LogFactory;
import org.apache.kafka.clients.producer.*;
import org.apache.log4j.Logger;
import java.util.List;
import java.util.Properties;
@@ -15,7 +16,7 @@ import java.util.Properties;
*/
public class LogToKafka {
private static Logger logger = Logger.getLogger(LogToKafka.class);
private static final Log logger = LogFactory.get();
/**
* kafka生产者，用于向kafka中发送消息

9
src/main/java/cn/ac/iie/utils/KnowledgeConfigurations.java → src/main/java/com/zdjizhi/utils/system/KnowledgeConfigurations.java
View File

@@ -1,4 +1,7 @@
package cn.ac.iie.utils;
package com.zdjizhi.utils.system;
import cn.hutool.log.Log;
import cn.hutool.log.LogFactory;
import java.util.Properties;
@@ -6,7 +9,7 @@ import java.util.Properties;
* @author qidaijie
*/
public final class KnowledgeConfigurations {
private static final Log logger = LogFactory.get();
private static Properties propCommon = new Properties();
public static String getStringProperty(Integer type, String key) {
@@ -47,7 +50,7 @@ public final class KnowledgeConfigurations {
propCommon.load(KnowledgeConfigurations.class.getClassLoader().getResourceAsStream("knowledge_config.properties"));
} catch (Exception e) {
propCommon = null;
System.err.println("配置加载失败");
logger.error("配置加载失败" + e);
}
}
}

2
src/main/java/cn/ac/iie/utils/TupleUtils.java → src/main/java/com/zdjizhi/utils/system/TupleUtils.java
View File

@@ -1,4 +1,4 @@
package cn.ac.iie.utils;
package com.zdjizhi.utils.system;
import org.apache.storm.Constants;
import org.apache.storm.tuple.Tuple;

2
src/test/java/cn/ac/iie/test/JsonTest.java → src/test/java/com/zdjizhi/test/JsonTest.java
View File

@@ -1,4 +1,4 @@
package cn.ac.iie.test;
package com.zdjizhi.test;
import org.junit.Test;