From 3ff5019ab726884fbc363fcd871e274e45405227 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 17 Apr 2018 03:31:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/biz/service/SyncDataService.java | 6 +---- .../operate/web/service/SyncDataTaskService.java | 27 ++++++++++------------ .../operate/web/utils/SendMysqlSyncDatUtil.java | 6 +---- 3 files changed, 14 insertions(+), 25 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SyncDataService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SyncDataService.java index 5304d70..2398437 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SyncDataService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SyncDataService.java @@ -64,13 +64,9 @@ public class SyncDataService { } public boolean savePostMysql(String sql ,String sqlId) { - SyncMysqlDataModel syncMysqlDataModel = new SyncMysqlDataModel(); - syncMysqlDataModel.setSql(sql); - syncMysqlDataModel.setSqlId(sqlId); - SyncDataModel model = new SyncDataModel(); model.setStatus(1); - model.setJsonData(Base64.encodeBase64String(SerializUtils.objToByte((Serializable) syncMysqlDataModel))); + model.setJsonData(Base64.encodeBase64String(sql.getBytes())); model.setAction("POSTMYSQL"); model.setCreated(new Date()); model.setClassName("syncmysql"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java index 0ef2198..11fbc82 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java @@ -194,10 +194,10 @@ public class SyncDataTaskService { { try { String data = LymsEncodeUtil.aesDecrypt(json,"Lymsh@2016"); - SyncMysqlDataModel mysqlDataModel = (SyncMysqlDataModel)SerializUtils.byteToObj(org.apache.commons.codec.binary.Base64.decodeBase64(data)); - if (mysqlDataModel != null && org.apache.commons.lang.StringUtils.isNotEmpty(mysqlDataModel.getSql())) + String sql = new String(org.apache.commons.codec.binary.Base64.decodeBase64(data),"gbk"); + if (sql != null) { - organizationService.execSql(mysqlDataModel.getSql()); + organizationService.execSql(sql); } } catch (Exception e) { ExceptionUtils.catchException(e,"exce sql error. JSONDATA="+json); @@ -209,20 +209,17 @@ public class SyncDataTaskService { public static void main(String[] args) { try { -// SyncMysqlDataModel syncMysqlDataModel = new SyncMysqlDataModel(); -// syncMysqlDataModel.setSql(Base64.encodeBase64String("select * from asdfasdf".getBytes())); -// syncMysqlDataModel.setSqlId("sqlId"); -// -// String json = JsonUtil.obj2JsonString(syncMysqlDataModel); - SyncMysqlDataModel mysqlDataModel = JsonUtil.str2Obj("{\"sql\":\"aW5zZXJ0IGludG8gYmFieV9leWVfY2hlY2soIGlkLGNyZWF0ZWQseW4sb3BlcmF0ZXJJZCxob3NwaXRhbElkLGJhYnlJZCxwaWQsY2hlY2tNb250aElkLGNoZWNrSG9zcGl0YWwsY2hlY2tUaW1lLHJpc2tGYWN0b3IsZXh0UmlnaHRFeWVsb29rLGV4dFJpZ2h0RXllbG9va090aGVyLGJsaW5rUmlnaHRSZWZsZXgscHVwaWxsYXJ5UmlnaHRSZWZsZXgscmVkUmlnaHRSZWZsZXgsZXh0TGVmdEV5ZWxvb2ssZXh0TGVmdEV5ZWxvb2tPdGhlcixibGlua0xlZnR0UmVmbGV4LHB1cGlsbGFyeUxlZnRSZWZsZXgscmVkTGVmdFJlZmxleCxmdW5kdXNSZXN1bHQsaGFuZGxlT3BpbmlvbnNJZCxndWlkYW5jZU9waW5pb25zLGRvY3RvcixuZXh0Q2hlY2tNb250aElkLG5leHRDaGVja1RpbWUsZXh0RXllbG9vayxleHRFeWVsb29rT3RoZXIscmVkUmVmbGV4LHJlZFJlZmxleE90aGVyLHIxLHIyLGwxLGwyLG9wdG9tZXRyeSxjb25qdW5jdGl2YSxjb25qdW5jdGl2YU90aGVyLGNvcm5lYWwsY29ybmVhbE90aGVyLGxhY3JpbWFsQXBwYXJhdHVzLGxhY3JpbWFsQXBwYXJhdHVzT3RoZXIsZXllTW92ZW1lbnRzSWQsZXllUG9zaXRpb25JZCxleWVQb3NpdGlvbk90aGVyLGJpbm9jdWxhclZpc2lvbixvdGhlcixsVmlzaW9uLHJWaXNpb24scmVmcmFjdGlvbkwxLHJlZnJhY3Rpb25MMixyZWZyYWN0aW9uUjEscmVmcmFjdGlvblIyLG55c3RhZ211cyxmaXhhdGlvbkNhcmQgKSB2YWx1ZXMoJzVhZDRjMjlhYTg1MjFhOTExZWU1OTJlYycsJzIwMTgtNC0xNiAyMzozNDo1MCcsJzEnLCcyMTAwMDAyOTkwJywnMjEwMDAwMTcwNScsJzVhZDRhNWMxYTg1MjcwODc2MDE0ZmI4ZScsJzVhZDRhNWMxYTg1MjcwODc2MDE0ZmI4NCcsJzMnLCfH2LvKtbrR3cq+0r3UuicsJzIwMTgtNC0xNiAyMzozNDo1MCcsbnVsbCxudWxsLG51bGwsbnVsbCxudWxsLG51bGwsbnVsbCxudWxsLG51bGwsbnVsbCxudWxsLG51bGwsJzQnLCfR276musO1w7rcJywnMjEwMDAwMjk5MCcsbnVsbCxudWxsLCd5YW5nJyxudWxsLCd5YW5nJyxudWxsLCcyMycsJzQ1JyxudWxsLG51bGwsbnVsbCwneWFuZycsbnVsbCwneWFuZycsbnVsbCwneWFuZycsbnVsbCwneHonLG51bGwsbnVsbCxudWxsLG51bGwsbnVsbCxudWxsLG51bGwsbnVsbCxudWxsLG51bGwsJ3lhbmcnLG51bGwp\\\",\\\"sqlId\\\":\\\"com.lyms.platform.permission.dao.master.BabyEyeCheckMapper.save\"}", SyncMysqlDataModel.class); - //String str = org.apache.commons.codec.binary.Base64.encodeBase64String(mysqlDataModel.getSql().getBytes()); - //String sql = new String(org.apache.commons.codec.binary.Base64.decodeBase64("YVc1elpYSjBJR2x1ZEc4Z1ltRmllVjlsZVdWZlkyaGxZMnNvSUdsa0xHTnlaV0YwWldRc2VXNHNiM0JsY21GMFpYSkpaQ3hvYjNOd2FYUmhiRWxrTEdKaFlubEpaQ3h3YVdRc1kyaGxZMnROYjI1MGFFbGtMR05vWldOclNHOXpjR2wwWVd3c1kyaGxZMnRVYVcxbExISnBjMnRHWVdOMGIzSXNaWGgwVW1sbmFIUkZlV1ZzYjI5ckxHVjRkRkpwWjJoMFJYbGxiRzl2YTA5MGFHVnlMR0pzYVc1clVtbG5hSFJTWldac1pYZ3NjSFZ3YVd4c1lYSjVVbWxuYUhSU1pXWnNaWGdzY21Wa1VtbG5hSFJTWldac1pYZ3NaWGgwVEdWbWRFVjVaV3h2YjJzc1pYaDBUR1ZtZEVWNVpXeHZiMnRQZEdobGNpeGliR2x1YTB4bFpuUjBVbVZtYkdWNExIQjFjR2xzYkdGeWVVeGxablJTWldac1pYZ3NjbVZrVEdWbWRGSmxabXhsZUN4bWRXNWtkWE5TWlhOMWJIUXNhR0Z1Wkd4bFQzQnBibWx2Ym5OSlpDeG5kV2xrWVc1alpVOXdhVzVwYjI1ekxHUnZZM1J2Y2l4dVpYaDBRMmhsWTJ0TmIyNTBhRWxrTEc1bGVIUkRhR1ZqYTFScGJXVXNaWGgwUlhsbGJHOXZheXhsZUhSRmVXVnNiMjlyVDNSb1pYSXNjbVZrVW1WbWJHVjRMSEpsWkZKbFpteGxlRTkwYUdWeUxISXhMSEl5TEd3eExHd3lMRzl3ZEc5dFpYUnllU3hqYjI1cWRXNWpkR2wyWVN4amIyNXFkVzVqZEdsMllVOTBhR1Z5TEdOdmNtNWxZV3dzWTI5eWJtVmhiRTkwYUdWeUxHeGhZM0pwYldGc1FYQndZWEpoZEhWekxHeGhZM0pwYldGc1FYQndZWEpoZEhWelQzUm9aWElzWlhsbFRXOTJaVzFsYm5SelNXUXNaWGxsVUc5emFYUnBiMjVKWkN4bGVXVlFiM05wZEdsdmJrOTBhR1Z5TEdKcGJtOWpkV3hoY2xacGMybHZiaXh2ZEdobGNpeHNWbWx6YVc5dUxISldhWE5wYjI0c2NtVm1jbUZqZEdsdmJrd3hMSEpsWm5KaFkzUnBiMjVNTWl4eVpXWnlZV04wYVc5dVVqRXNjbVZtY21GamRHbHZibEl5TEc1NWMzUmhaMjExY3l4bWFYaGhkR2x2YmtOaGNtUWdLU0IyWVd4MVpYTW9KelZoWkRSaFpUWTNZVGcxTWpNNVltRXdNemhpTkdZMU55Y3NKekl3TVRndE5DMHhOaUF5TWpvd09Eb3pPU2NzSnpFbkxDY3lNVEF3TURBeU9Ua3dKeXduTWpFd01EQXdNVGN3TlNjc0p6VmhaRFJoWlRReFlUZzFNak01WW1Fd016aGlOR1kwWkNjc0p6VmhaRFJoWlRReFlUZzFNak01WW1Fd016aGlOR1kwTlNjc0p6TW5MQ2ZIMkx2S3RiclIzY3ErMHIzVXVpY3NKekl3TVRndE5DMHhOaUF5TWpvd09Eb3pPU2NzYm5Wc2JDeHVkV3hzTEc1MWJHd3NiblZzYkN4dWRXeHNMRzUxYkd3c2JuVnNiQ3h1ZFd4c0xHNTFiR3dzYm5Wc2JDeHVkV3hzTEc1MWJHd3NiblZzYkN4dWRXeHNMQ2N5TVRBd01EQXlPVGt3Snl4dWRXeHNMRzUxYkd3c2JuVnNiQ3h1ZFd4c0xDZDVhVzRuTEc1MWJHd3NKekV5Snl3bk16UW5MQ2MxTmljc0p6YzRKeXh1ZFd4c0xDZDVZVzVuSnl4dWRXeHNMRzUxYkd3c2JuVnNiQ3duZVdsdUp5eHVkV3hzTENkNGRDY3NiblZzYkN4dWRXeHNMRzUxYkd3c2JuVnNiQ3h1ZFd4c0xHNTFiR3dzYm5Wc2JDeHVkV3hzTEc1MWJHd3NiblZzYkN4dWRXeHNMRzUxYkd3cA=="), "utf-8"); - String sql = new String(org.apache.commons.codec.binary.Base64.decodeBase64(mysqlDataModel.getSql())); -// String sql1 = new String(org.apache.commons.codec.binary.Base64.decodeBase64(sql), "utf-8"); - System.out.println(sql); + String json = "aW5zZXJ0IGludG8gYmFieV9wYXRpZW50X2V4dGVuZF9lYXJfc2NyZWVuIChpZCxiYWJ5X2lkLHNjcmVlbl90eXBlLGNoZWNrX2hvc3BpdGFsX2lkLHNjcmVlbl9kYXRlLGhpZ2hfcmlza19jYXVzZSxvYWVfbGVmdCxvYWVfcmlnaHQsYWFicl9sZWZ0LGFhYnJfcmlnaHQsYWJyX2xlZnQsYWJyX3JpZ2h0LGdqYjJfZGVsXzM1LGdqYjJfZGVsXzE3NixnamIyX2RlbF8yMzUsZ2piMl9kZWxfMjk5LGdqYjNfc2xjMjZhNF81MzgsZ2piM19zbGMyNmE0XzIxNjgsZ2piM19zbGMyNmE0X2l2czcscnJuYV8xNDk0LHJybmFfMTU1NSxwcm9jZXNzX29wdGlvbl90eXBlLHByb2Nlc3Nfb3B0aW9uX2Rlc2MsZ3VpZF9vcGluaW9uLGNoZWNrX2RvY3Rvcl9pZCxyZWZlcnJhbF9kYXRlLGNyZWF0ZV9kYXRlLGNyZWF0ZV91c2VyX2lkLGNyZWF0ZV9ob3NwaXRhbF9pZCxuZXh0X2NoZWNrX3RpbWUsbGFzdF91cGRhdGVfZGF0ZSxsYXN0X3VwZGF0ZV91c2VyX2lkLGxhc3RfdXBkYXRlX2hvc3BpdGFsX2lkLHN0YXR1cyxzY3JfaXNwYXNzLHBpZCkgdmFsdWVzICgnZmRlMzc5OWY5NTZjNDg1Y2E4OTE0ZjczZjQ4YWVkZjMnLCc1YWE2ODNjMWE4NTI0MjhjOTI3ZTE3NjQnLDIsJzIxMDAwMDE3MDUnLCcyMDE4LTQtMTcgMjoyMjoyNycsbnVsbCxudWxsLG51bGwsbnVsbCxudWxsLG51bGwsbnVsbCxudWxsLG51bGwsMixudWxsLG51bGwsbnVsbCxudWxsLG51bGwsbnVsbCwyLCfH69PaM7j21MLE2r340NC9+NK7sr287LLp1e+2zycsJ7e0t7S4tLi0t7S3tLi0uLS3tLe0uLS4tLe0t7S4tLi0t7S3tLi0uLS3tLe0uLS4tLfvt8m3yScsJzIxMDAwMDI5OTAnLG51bGwsJzIwMTgtNC0xNyAyOjIyOjI3JywnMjEwMDAwMjk5MCcsJzIxMDAwMDE3MDUnLG51bGwsJzIwMTgtNC0xNyAyOjIyOjI3JywnMjEwMDAwMjk5MCcsJzIxMDAwMDE3MDUnLDAsMiwnNWFhNjgzYzFhODUyNDI4YzkyN2UxNzYyJyk="; +// json = org.apache.commons.codec.binary.Base64.encodeBase64String(json.getBytes()); +// json = LymsEncodeUtil.aesEncrypt(json, "Lymsh@2016"); + +// String data = LymsEncodeUtil.aesDecrypt(json,"Lymsh@2016"); + String sql = new String(org.apache.commons.codec.binary.Base64.decodeBase64(json),"utf-8"); + System.out.println(sql); + }catch (Exception e) { - + e.printStackTrace(); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/SendMysqlSyncDatUtil.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/SendMysqlSyncDatUtil.java index 58732a8..f49c643 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/SendMysqlSyncDatUtil.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/SendMysqlSyncDatUtil.java @@ -65,7 +65,7 @@ public class SendMysqlSyncDatUtil implements InitializingBean { public static void addSqlToQueue1(String sql ,String sqlId) { SqlRequest request = new SqlRequest(); - request.setSql(Base64.encodeBase64String(sql.getBytes())); + request.setSql(sql); request.setSqlId(sqlId); syncSqlQueue1.add(request); System.out.println("syncSqlQueue1 size = " + syncSqlQueue.size()); @@ -120,7 +120,6 @@ public class SendMysqlSyncDatUtil implements InitializingBean { } } } catch (Exception e) { - syncSqlQueue.add(request); ExceptionUtils.catchException(e, "HandleThread syncSqlQueue thread error." + request); } } @@ -140,11 +139,8 @@ public class SendMysqlSyncDatUtil implements InitializingBean { try { Thread.sleep(3000); request = syncSqlQueue1.take(); - System.out.println(request); syncDataService.savePostMysql(request.getSql(),request.getSqlId()); - } catch (Exception e) { - syncSqlQueue1.add(request); ExceptionUtils.catchException(e, "HandleThread syncSqlQueue1 thread error." + request); } } -- 1.8.3.1