diff --git a/.gitignore b/.gitignore index 6ef18ea..ea93baf 100644 --- a/.gitignore +++ b/.gitignore @@ -3,10 +3,9 @@ # Package Files # *.jar *.war -*.ear -/target/ +*.ear +/target/ target -com *.project *.classpath /.settings diff --git a/src/main/java/osc/git/eh3/test/TestCode.java b/src/main/java/osc/git/eh3/test/TestCode.java index 767fc6d..98f9e5a 100644 --- a/src/main/java/osc/git/eh3/test/TestCode.java +++ b/src/main/java/osc/git/eh3/test/TestCode.java @@ -21,23 +21,23 @@ import osc.git.eh3.utils.Base64; public class TestCode { - public static void main(String[] args) throws Exception { - // TODO Auto-generated method stub - // String pathName = "/dsp/archer/dddfd/jkjl"; - // - // String projectName = pathName.substring(0, - // pathName.indexOf("archer")); - // - // System.out.println(projectName); + public static void main(String[] args) throws Exception { + // TODO Auto-generated method stub + // String pathName = "/dsp/archer/dddfd/jkjl"; + // + // String projectName = pathName.substring(0, + // pathName.indexOf("archer")); + // + // System.out.println(projectName); - // SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); - // ParsePosition pos = new ParsePosition(0); - // System.out.println(formatter.parse("dsd", pos)); + // SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + // ParsePosition pos = new ParsePosition(0); + // System.out.println(formatter.parse("dsd", pos)); - // System.out.println(parseDate("") - 2232); + // System.out.println(parseDate("") - 2232); - // Map resultMap = new HashMap(); - // System.out.println((String)resultMap.get("dd")); + // Map resultMap = new HashMap(); + // System.out.println((String)resultMap.get("dd")); // try { // String str = null; @@ -48,83 +48,83 @@ public class TestCode { // } // System.out.println("fffff"); - // String[] s = {"111","eee"}; - // System.out.println(Arrays.toString(s)); + // String[] s = {"111","eee"}; + // System.out.println(Arrays.toString(s)); - // List list = new ArrayList(); - // list.add("2"); - // list.add("3"); - // list.add("7"); - // list.add("1"); - // - // System.out.println(list.toString()); + // List list = new ArrayList(); + // list.add("2"); + // list.add("3"); + // list.add("7"); + // list.add("1"); + // + // System.out.println(list.toString()); - // JSONArray areaTarget = new JSONArray(); - // areaTarget.add("3"); - // areaTarget.add("5"); - // areaTarget.add("4"); - // areaTarget.add("7"); - // System.out.println(JSONArray.toList(areaTarget)); + // JSONArray areaTarget = new JSONArray(); + // areaTarget.add("3"); + // areaTarget.add("5"); + // areaTarget.add("4"); + // areaTarget.add("7"); + // System.out.println(JSONArray.toList(areaTarget)); - // String whiteStr = "2,4,5,8,3"; - // System.out.println(JSONArray.fromObject(whiteStr.split(","))); + // String whiteStr = "2,4,5,8,3"; + // System.out.println(JSONArray.fromObject(whiteStr.split(","))); - // for (int i = 0;i<2;i++) { - // - // if ("1".equals("1")) { - // if ("1".equals("1")) { - // System.out.println("111111111111111"); - // continue; - // } - // System.out.println("2222222222222222"); - // } - // System.out.println("3333333333333333333333"); - // } + // for (int i = 0;i<2;i++) { + // + // if ("1".equals("1")) { + // if ("1".equals("1")) { + // System.out.println("111111111111111"); + // continue; + // } + // System.out.println("2222222222222222"); + // } + // System.out.println("3333333333333333333333"); + // } - // String str = "http://www.test.com"; - // System.out.println(str.replace("http://www.", "").replace("www.", - // "")); + // String str = "http://www.test.com"; + // System.out.println(str.replace("http://www.", "").replace("www.", + // "")); - // SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss"); - // SimpleDateFormat sdf = new SimpleDateFormat("HH"); - // String str = "23:59:59"; - // System.out.println(sdf.format(formatter.parse(str))); + // SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss"); + // SimpleDateFormat sdf = new SimpleDateFormat("HH"); + // String str = "23:59:59"; + // System.out.println(sdf.format(formatter.parse(str))); - // Spring Hessian代理Servelet - // String url = "http://localhost:8080/sync-logs/remote/readlogs"; - // HessianProxyFactory factory = new HessianProxyFactory(); - // - // IReadLogs readLogs = (IReadLogs) factory.create(IReadLogs.class, - // url); - // JSONArray result = JSONArray.fromObject(readLogs.readFile("2016-02-22 - // 15:00:00", "00000000000000")); - // System.out.println(result); + // Spring Hessian代理Servelet + // String url = "http://localhost:8080/sync-logs/remote/readlogs"; + // HessianProxyFactory factory = new HessianProxyFactory(); + // + // IReadLogs readLogs = (IReadLogs) factory.create(IReadLogs.class, + // url); + // JSONArray result = JSONArray.fromObject(readLogs.readFile("2016-02-22 + // 15:00:00", "00000000000000")); + // System.out.println(result); - // JSONArray jonsArr = new JSONArray(); - // JSONArray arr = new JSONArray(); - // jonsArr = JSONArray.fromObject("[ { 'category': 2, 'clks': 4, 'cost': - // 13, 'createtime': null, 'creativeid': - // 'cf0714f4-8b92-41f2-a843-19c94fe3af74', 'downloads': 0, 'flag': 0, - // 'imprs': 5, 'regists': 0, 'time': null } ]"); - // arr.addAll(JSONArray.toCollection(jonsArr)); - // System.out.println(arr); + // JSONArray jonsArr = new JSONArray(); + // JSONArray arr = new JSONArray(); + // jonsArr = JSONArray.fromObject("[ { 'category': 2, 'clks': 4, 'cost': + // 13, 'createtime': null, 'creativeid': + // 'cf0714f4-8b92-41f2-a843-19c94fe3af74', 'downloads': 0, 'flag': 0, + // 'imprs': 5, 'regists': 0, 'time': null } ]"); + // arr.addAll(JSONArray.toCollection(jonsArr)); + // System.out.println(arr); - // String str = - // "20160222,18:59:50.523,DBG,ip:36.100.240.103,adx:3,bid:08a2d93b-0153-1000-fd75-3f89c5394190,mapid:62367312-d881-426d-81b4-fe635d1db989,deviceid:726e14bf3ba615e5387c256059e9f24a94721f76,deviceidtype:97,mtype:m"; - // for(String dd : str.split(",")){ - // - // System.out.println(dd); - // } + // String str = + // "20160222,18:59:50.523,DBG,ip:36.100.240.103,adx:3,bid:08a2d93b-0153-1000-fd75-3f89c5394190,mapid:62367312-d881-426d-81b4-fe635d1db989,deviceid:726e14bf3ba615e5387c256059e9f24a94721f76,deviceidtype:97,mtype:m"; + // for(String dd : str.split(",")){ + // + // System.out.println(dd); + // } + + // BigDecimal dd = new BigDecimal("1111.10"); + // JSONObject jj = new JSONObject(); + // jj.put("test", dd); + // System.out.println(jj.optDouble("test")); + + // JSONObject jj = new JSONObject(); + // System.out.println(jj.optString("pring")); - // BigDecimal dd = new BigDecimal("1111.10"); - // JSONObject jj = new JSONObject(); - // jj.put("test", dd); - // System.out.println(jj.optDouble("test")); - // JSONObject jj = new JSONObject(); - // System.out.println(jj.optString("pring")); - - // // 根据网卡取本机配置的IP // InetAddress inet = null; // try { @@ -135,25 +135,24 @@ public class TestCode { // String ipAddress = inet.getHostAddress(); // // System.out.println(ipAddress); - - + + // TestCode test = new TestCode(); // System.out.println(test.dd("ddd")); - // Package pkg = Package.getPackage("osc.git.eh3.test"); // Annotation[] annotations = pkg.getAnnotations(); // for (Annotation annotation : annotations) { // System.out.println(annotation); // } - + // String[] arrs = new String[]{"111","111","2222"}; // for (String string : Array2Set(arrs)) { // // System.out.println(string); // } - + // Class clazz = StatisByHourModel.class; // Method[] methods = clazz.getMethods(); // for (Method method : methods) { @@ -165,43 +164,43 @@ public class TestCode { // // SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); // System.out.println(sdf.format(dd)); - + // JSONObject groupAdxs = JSONObject.fromObject("{\"4ebdb328-5d4b-42e6-80c3-a6aaaecdcea1\":[\"1e03319c-425d-4a17-a6bf-eeec2f48db29\",\"1fed4171-9925-4834-aa7b-9b4d3a58841b\",\"ce579246-e707-4cb9-b982-88cad7944b92\"],\"9262cbe8-a9dc-4f4e-888b-cf3ffe65defd\":\"ce579246-e707-4cb9-b982-88cad7944b92\"}"); // Set keySet = groupAdxs.keySet(); // for (Object object : keySet) { // System.out.println(groupAdxs.get(object).getClass().isArray()); // } - + // System.out.println(UUID.randomUUID().toString()); - + // System.out.println(new Integer(0x11)); // System.out.println(Integer.toBinaryString(30000)); // System.out.println(Integer.valueOf("11", 16)); // System.out.println(Integer.valueOf("11", 2)); - - + + // System.out.println(AESTool.encrypt("lixiangrong")); // System.out.println(AESTool.decrypt(AESEncrypter.encrypt("lixiangrong"))); - + // System.out.println(AESTool.encrypt("liixangrong","adjdjfjfjfjdkdkd")); // System.out.println(AESTool.decrypt("bfb0c038342ffead45511879853279bf","adjdjfjfjfjdkdkd")); // System.out.println(Base64.encodeToString(AESTool.encrypt("fa4d7d90618dcba5fa1d969cffc04def","002020202").getBytes(), false)); - + // byte[] bytes = "lixiangrong".getBytes(); // for (int i = 0; i < bytes.length; i++) { // System.out.println(bytes[i]); // } - + // System.out.println(Base64.encodeToString("lixiangrong".getBytes(), false)); - + // double lon1 = 109.0145193759; // double lat1 = 34.236080797698; // System.out.println(GeoHash.encode(lat1, lon1)); // System.out.println(GeoHash.decode("wmtdgn5esrb1")[0]+" "+GeoHash.decode("wmtdgn5esrb1")[1]); - + // String url = "http://api.map.baidu.com/place/v2/search?query=银行&location=39.915,116.404&radius=2000&output=json&ak=LCG4dyrXyadeD8hFhi8SGCv6"; // System.out.println(HttpClientUtil.sendGet(url)); - + // JSONArray array = new JSONArray(); // array.add("1"); // array.add("2"); @@ -210,11 +209,11 @@ public class TestCode { // array.add("5"); // List list = JSONArray.toList(array, new String(), new JsonConfig()); // System.out.println(list); - + // System.out.println(System.nanoTime()); // System.out.println(System.nanoTime()); - - + + // Map postParam = new HashMap(); // postParam.put("groupid", "100003"); // postParam.put("count", "1"); @@ -233,16 +232,16 @@ public class TestCode { // } // } // } - + // String str = "0,"; // System.out.println(str.split(",").length); - + // System.out.println(JedisUtil.getStr("0000")); // Map result = new HashMap(); // System.out.println(result.get("jj")); // double budgets = 10000; // System.out.println((budgets/100)); - + // String str = null; // BigDecimal budget = new BigDecimal(str); // budget = budget.subtract(new BigDecimal(10)); @@ -252,10 +251,10 @@ public class TestCode { // System.out.println("2"); // } // System.out.println(budget.doubleValue()); - + // String REG_FLOAT = "^[1-9]\\d*.?\\d+$"; // 浮点正数 // System.out.println(Pattern.compile(REG_FLOAT).matcher("1.21").matches()); - + // String str ="浮点数sss"; // String s1 = new String(str.getBytes("utf-8"),"gbk"); // System.out.println(s1); @@ -265,14 +264,14 @@ public class TestCode { // String s2 = URLEncoder.encode(str, "utf-8"); // System.out.println(s2); // System.out.println(URLDecoder.decode(s2,"utf-8")); - - + + // Object object = null; // JSONObject creativeGroupObj = JSONObject.fromObject(object); // System.out.println(creativeGroupObj.isEmpty()); // // System.out.println(UUID.randomUUID().toString()); - + // JSONArray putTime = JSONArray.fromObject("[{\"monday\":[\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"1\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\"]},{\"tuesday\":[\"0\",\"0\",\"0\",\"0\",\"1\",\"1\",\"1\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\"]},{\"wednesday\":[\"0\",\"0\",\"0\",\"0\",\"1\",\"1\",\"1\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\"]},{\"thursday\":[\"0\",\"0\",\"0\",\"0\",\"1\",\"1\",\"1\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\"]},{\"friday\":[\"0\",\"0\",\"0\",\"0\",\"1\",\"1\",\"1\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\"]},{\"saturday\":[\"0\",\"0\",\"0\",\"0\",\"1\",\"1\",\"1\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\"]},{\"sunday\":[\"0\",\"0\",\"0\",\"0\",\"1\",\"1\",\"1\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\",\"0\"]}]"); // JSONArray periods = new JSONArray(); // for (Object object : putTime) { @@ -305,57 +304,86 @@ public class TestCode { // } // } // System.out.println(periods.toString()); - + // JSONObject period = new JSONObject(); // period.put("test", 100.32); // System.out.println(period.optString("test")); - + // BigDecimal clicks = new BigDecimal(100.23); // System.out.println(clicks.intValue()); - + // System.out.println(Long.parseLong("8000.01")); - + // JSONObject jsonParam = new JSONObject(); // JSONArray jsonArray = new JSONArray(); // jsonArray.add("000000"); // jsonParam.put("app", jsonArray); // System.out.println(jsonParam); - - - String head = "00,"; - head = head.substring(0, head.lastIndexOf(",")); - System.out.println(head); - - } - public static Long parseDate(String s) { - Long time = null; - if (s == null || "" == s) { - time = null; - } else { - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); - try { - Date date = format.parse(s); - time = date.getTime(); - } catch (ParseException e) { - e.printStackTrace(); - } - } - return time; - } - - public B dd(B t){ - return t; - } - - public static Set Array2Set(T[] tArray) { - Set tSet = new HashSet(Arrays.asList(tArray)); - return tSet; - } - - public static void printArrs(T[] arrs){ - for (T t : arrs) { - System.out.println(t); - } - } + +// String head = "00,"; +// head = head.substring(0, head.lastIndexOf(",")); +// System.out.println(head); +// +// String ip = "127, 0, 0,1"; +// // String [] s = ip.split("."); +// String[] s = ip.split("\\,"); +// for (String string : s) { +// System.out.println(string); +// } +// +// Object str = null; +//// String dd = (String)str; +// String dd = String.valueOf(str); +// System.out.println(String.valueOf(str) == String.valueOf("null")); + + + String sr = "2016-05-25 00:39:33,285 zanadu INFO \"39.159.247.16\" \"Mozilla/5.0 (iPhone; CPU iPhone OS 8_4_1 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Version/8.0 Mobile/12H321 Safari/600.1.4\" \"http://site.pxene.com/Audi2016Q2Wap/?bid=7ef9ab83e32c4f9c80312b92fba261b1&mapid=0055cb29-dee1-4e77-81bb-0991d2d644c8\" \"load success:Audi load success:bid=7ef9ab83e32c4f9c80312b92fba261b1&mapid=0055cb29-dee1-4e77-81bb-0991d2d644c8\""; + String[] split = sr.split("\""); + for (String s1 : split) { + System.out.println(s1); + } + + + String date = "Mon May 30 14:42:42 GMT+08:00 2016"; + System.out.println(date); + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat sdf1 = new SimpleDateFormat("EEE MMM dd HH:mm:ss z yyyy", java.util.Locale.US); + + System.out.println(sdf.format(sdf1.parse(date))); + + System.out.println("可吉可吉"); + } + + public static Long parseDate(String s) { + Long time = null; + if (s == null || "" == s) { + time = null; + } else { + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); + try { + Date date = format.parse(s); + time = date.getTime(); + } catch (ParseException e) { + e.printStackTrace(); + } + } + return time; + } + + public B dd(B t) { + return t; + } + + public static Set Array2Set(T[] tArray) { + Set tSet = new HashSet(Arrays.asList(tArray)); + return tSet; + } + + public static void printArrs(T[] arrs) { + for (T t : arrs) { + System.out.println(t); + } + } } \ No newline at end of file diff --git a/src/main/java/osc/git/eh3/testopen/TestOpenPuton.java b/src/main/java/osc/git/eh3/testopen/TestOpenPuton.java index 2ebc57c..70ef35e 100644 --- a/src/main/java/osc/git/eh3/testopen/TestOpenPuton.java +++ b/src/main/java/osc/git/eh3/testopen/TestOpenPuton.java @@ -10,7 +10,7 @@ import osc.git.eh3.utils.Base64; import osc.git.eh3.utils.HttpClientUtil; public class TestOpenPuton { - public static String URL = "http://127.0.0.1:8080/dsp-open/pxene/dsp.do"; + private static String URL = "http://127.0.0.1:8080/dsp-open/pxene/dsp.do"; private static String key = "adjdjfjfjfjdkdkd";// private static String appid = "t123456";// 用户 private static String token = "cst123456";// 令牌 @@ -25,7 +25,7 @@ public class TestOpenPuton { JSONObject json = new JSONObject(); json.put("param", "中午"); String str = "{\"order_info\":{\"put_time\":[],\"cost_type\":1,\"order_budget\":{\"budget_all\":100.0},\"cost_single\":100.0,\"type\":1,\"order_id\":14575,\"landing_page\":\"www.baidu.com\",\"order_name\":\"tony-test-31\",\"brand_en\":null,\"plat\":1,\"end_time\":\"2016-05-03\",\"creative_group\":[{\"group_name\":\"test_五一\",\"plat\":1,\"ratio\":\"-\",\"group_id\":405,\"click_code\":null,\"impression_code\":null,\"landing_page\":\"www.baidu.com\"}],\"buy_type\":1,\"order_freq\":{\"imp_day_req\":5,\"click_total_freq\":5,\"imp_total_req\":10,\"click_day_freq\":1},\"ad_owner\":{\"owner_qualification\":[],\"owner_name\":\"ABI\",\"organization_code\":null,\"owner_id\":107,\"owner_category\":\"食品饮料>健康饮料，运动饮料，功能性饮料\",\"website_url\":\"http://sedrin.reloadbuzz.com/food2/xueJin/index.php/home/user/index\"},\"start_time\":\"2016-05-03\",\"order_goal\":{\"order_total_show\":1},\"brand_zh\":\"Sedrin\",\"industry\":\"食品饮料>健康饮料，运动饮料，功能性饮料\",\"note\":\"媒体类型定向：\\nnull\\n\\n关键词定向：\\n123\\n\\n广告素材轮播：\\n平均\\n\\n备注：\\n备注1(资源设置)：\\n321\\n\\n\\n\"}}"; - + System.out.println(HttpClientUtil.sendPostJSONData(URL, str)); } diff --git a/src/main/resources/generatorConfig.xml b/src/main/resources/generatorConfig.xml index 3395e98..84131a2 100644 --- a/src/main/resources/generatorConfig.xml +++ b/src/main/resources/generatorConfig.xml @@ -23,7 +23,7 @@ - +