Merge branch 'master' into master_test
commit
608bb0592f
|
@ -11,7 +11,6 @@ import com.ljsd.jieling.logic.dao.Item;
|
||||||
import com.ljsd.jieling.logic.dao.root.GuildInfo;
|
import com.ljsd.jieling.logic.dao.root.GuildInfo;
|
||||||
import com.ljsd.jieling.logic.dao.root.User;
|
import com.ljsd.jieling.logic.dao.root.User;
|
||||||
import com.ljsd.jieling.protocols.PlayerInfoProto;
|
import com.ljsd.jieling.protocols.PlayerInfoProto;
|
||||||
import com.ljsd.jieling.util.SysUtil;
|
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
@ -27,9 +26,9 @@ public class ReportUtil {
|
||||||
|
|
||||||
private static Map<Integer,ReportBaseBean> baseBeanMap = new HashMap<>();
|
private static Map<Integer,ReportBaseBean> baseBeanMap = new HashMap<>();
|
||||||
|
|
||||||
private static ThinkingDataAnalytics ta = new ThinkingDataAnalytics(new ThinkingDataAnalytics.LoggerConsumer(SysUtil.getPath(LOG_PATH)));
|
private static ThinkingDataAnalytics ta = new ThinkingDataAnalytics(new ThinkingDataAnalytics.LoggerConsumer(LOG_PATH));
|
||||||
|
|
||||||
private static ThinkingDataAnalytics serverTa = new ThinkingDataAnalytics(new ThinkingDataAnalytics.LoggerConsumer(SysUtil.getPath(LOG_PATH)));
|
private static ThinkingDataAnalytics serverTa = new ThinkingDataAnalytics(new ThinkingDataAnalytics.LoggerConsumer(LOG_PATH));
|
||||||
|
|
||||||
public static BlockingQueue<ReportUserEvent> queue = new BlockingUniqueQueue<>();
|
public static BlockingQueue<ReportUserEvent> queue = new BlockingUniqueQueue<>();
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue