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 2398437..0089b55 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 @@ -4,6 +4,7 @@ import com.lyms.platform.biz.dal.ISyncDataDao; import com.lyms.platform.common.dao.operator.MongoQuery; import com.lyms.platform.common.pojo.SyncDataModel; import com.lyms.platform.common.pojo.SyncMysqlDataModel; +import com.lyms.platform.common.utils.ExceptionUtils; import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.common.utils.SerializUtils; import com.lyms.platform.query.SyncDataQuery; @@ -14,6 +15,7 @@ import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; import java.io.Serializable; +import java.io.UnsupportedEncodingException; import java.util.Date; import java.util.List; @@ -64,14 +66,18 @@ public class SyncDataService { } public boolean savePostMysql(String sql ,String sqlId) { - SyncDataModel model = new SyncDataModel(); - model.setStatus(1); - model.setJsonData(Base64.encodeBase64String(sql.getBytes())); - model.setAction("POSTMYSQL"); - model.setCreated(new Date()); - model.setClassName("syncmysql"); - model.setModified(model.getCreated()); - iSyncDataDao.addSyncData(model); + try { + SyncDataModel model = new SyncDataModel(); + model.setStatus(1); + model.setJsonData(Base64.encodeBase64String(sql.getBytes("utf-8"))); + model.setAction("POSTMYSQL"); + model.setCreated(new Date()); + model.setClassName("syncmysql"); + model.setModified(model.getCreated()); + iSyncDataDao.addSyncData(model); + } catch (UnsupportedEncodingException e) { + ExceptionUtils.catchException(e,"savePostMysql UnsupportedEncodingException"); + } return true; } } 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 56c2b02..b236bca 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,7 +194,8 @@ public class SyncDataTaskService { { try { String data = LymsEncodeUtil.aesDecrypt(json,"Lymsh@2016"); - String sql = new String(org.apache.commons.codec.binary.Base64.decodeBase64(data),"gbk"); + data = new String(data.getBytes("utf-8")); + String sql = new String(org.apache.commons.codec.binary.Base64.decodeBase64(data),"utf-8"); if (sql != null) { organizationService.execSql(sql); @@ -209,14 +210,12 @@ public class SyncDataTaskService { public static void main(String[] args) { try { - String json = "aW5zZXJ0IGludG8gYmFieV9wYXRpZW50X2V4dGVuZF9lYXJfYmFieSAoaWQsbmFtZSxzZXgsY2FyZE5vLGJpcnRoLG1uYW1lLG1jZXJ0X3R5cGVfaWQsbWNlcnRfbm8sbXBob25lLHZjX2NhcmRfbm8sYnVpbGRfZG9jdG9yLGhvc3BpdGFsX2lkLGJ1aWxkX3R5cGUsZW5hYmxlLHluLGJ1aWxkX2RhdGUsYmFieV9wYXRpZW50X2lkLGJhYnlfZWFyX2lkLHBlcnNvbl9pZCkgdmFsdWVzICgnOTM2OTMwMTU0MjJlNDliNDg4Y2Y0ZTViMTcyNWI4NzQnLCfI+Mu5tcQnLDAsbnVsbCwnMjAxOC00LTE3IDM6NDY6MTInLCfL1bTyJywnNTdlMWRjZDNmMGYwMmU3Y2E1MTlkNmM2JywnMTY1NDg4Nzc3NzcnLCcxNjU0ODg3Nzc3NycsJzI0MzUyMzQ1MjM0NScsJzIxMDAwMDI5OTAnLCcyMTAwMDAxNzA1JywxLG51bGwsMSwnMjAxOC00LTE3IDM6NDY6MTInLCc1YWQ0ZmQzNGE4NTI5OGQyOTFhMDhjMGYnLCc0YTk3YWVhOGVkYjQ0MDg3OThhOTc0YWY0OThkMWM2ZicsJzVhZDRmZDMzYTg1Mjk4ZDI5MWEwOGMwNScp"; -// 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); - + String json = "aW5zZXJ0IGludG8gYmFieV9wYXRpZW50X2V4dGVuZF9lYXIgKGlkLHBlcnNvbl9pZCxjcmVhdGVfZGF0ZSxjcmVhdGVfdXNlcl9pZCxjcmVhdGVfaG9zcGl0YWxfaWQsbGFzdF91cGRhdGVfZGF0ZSxsYXN0X3VwZGF0ZV91c2VyX2lkLGxhc3RfdXBkYXRlX2hvc3BpdGFsX2lkLGhpZ2hfcmlza19jYXVzZSxzdGF0dXMsYmFieV9wYXRpZW50X2lkLGFkbWlzc19ubyxkaXNjaGFyZ2VfZGlhZ25vc2lzLGJhcl9jb2RlLG5hdGlvbixtaGlnaF9yaXNrX2ZhY3Rvcl9pZCkgdmFsdWVzICgnOGFiZmU4YWJkZDFmNGUxYTlhYTQ0MzlmODI4NTMzYWUnLCc1YWQ1ZDlhZGU0YjBlMzU1OTY0NjJlOGMnLCcyMDE4LTQtMTcgMTk6Mjg6MDcnLCdhOWU1NTA3Zi1lN2RhLTRlYzYtYjhkYi05YTFlNGQxYjdjMjknLCcyMTAwMDAxNjk5JywnMjAxOC00LTE3IDE5OjI4OjA3JywnMjEwMDAwMjk3NycsJzIxMDAwMDE2OTknLCcsMCwnLDEsJzVhZDVkOWFkZTRiMGUzNTU5NjQ2MmU4ZScsbnVsbCxudWxsLG51bGwsJ2Q4NjVkNGY0LTQyNzktNDQ3NS04MjMxLWJjNzJiYTQ0ZjY3MScsJyxkNDJlZWMwMy1hYTg2LTQ1YjgtYTRlMC03OGEwZmYzNjVmYjYsJyk"; + String data = LymsEncodeUtil.aesEncrypt(json, "Lymsh@2016"); + data = LymsEncodeUtil.aesDecrypt(data,"Lymsh@2016"); + data = new String(data.getBytes("utf-8")); + String sql = new String(org.apache.commons.codec.binary.Base64.decodeBase64(data),"utf-8"); + System.out.println(sql); }catch (Exception e) { e.printStackTrace();