Commit bf4747ccd2b7966664a94696d08d17e6116d94fb
1 parent
aa577283a9
Exists in
master
and in
6 other branches
同步
Showing 2 changed files with 22 additions and 17 deletions
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SyncDataService.java
View file @
bf4747c
| ... | ... | @@ -4,6 +4,7 @@ |
| 4 | 4 | import com.lyms.platform.common.dao.operator.MongoQuery; |
| 5 | 5 | import com.lyms.platform.common.pojo.SyncDataModel; |
| 6 | 6 | import com.lyms.platform.common.pojo.SyncMysqlDataModel; |
| 7 | +import com.lyms.platform.common.utils.ExceptionUtils; | |
| 7 | 8 | import com.lyms.platform.common.utils.JsonUtil; |
| 8 | 9 | import com.lyms.platform.common.utils.SerializUtils; |
| 9 | 10 | import com.lyms.platform.query.SyncDataQuery; |
| ... | ... | @@ -14,6 +15,7 @@ |
| 14 | 15 | import org.springframework.stereotype.Service; |
| 15 | 16 | |
| 16 | 17 | import java.io.Serializable; |
| 18 | +import java.io.UnsupportedEncodingException; | |
| 17 | 19 | import java.util.Date; |
| 18 | 20 | import java.util.List; |
| 19 | 21 | |
| ... | ... | @@ -64,14 +66,18 @@ |
| 64 | 66 | } |
| 65 | 67 | |
| 66 | 68 | public boolean savePostMysql(String sql ,String sqlId) { |
| 67 | - SyncDataModel model = new SyncDataModel(); | |
| 68 | - model.setStatus(1); | |
| 69 | - model.setJsonData(Base64.encodeBase64String(sql.getBytes())); | |
| 70 | - model.setAction("POSTMYSQL"); | |
| 71 | - model.setCreated(new Date()); | |
| 72 | - model.setClassName("syncmysql"); | |
| 73 | - model.setModified(model.getCreated()); | |
| 74 | - iSyncDataDao.addSyncData(model); | |
| 69 | + try { | |
| 70 | + SyncDataModel model = new SyncDataModel(); | |
| 71 | + model.setStatus(1); | |
| 72 | + model.setJsonData(Base64.encodeBase64String(sql.getBytes("utf-8"))); | |
| 73 | + model.setAction("POSTMYSQL"); | |
| 74 | + model.setCreated(new Date()); | |
| 75 | + model.setClassName("syncmysql"); | |
| 76 | + model.setModified(model.getCreated()); | |
| 77 | + iSyncDataDao.addSyncData(model); | |
| 78 | + } catch (UnsupportedEncodingException e) { | |
| 79 | + ExceptionUtils.catchException(e,"savePostMysql UnsupportedEncodingException"); | |
| 80 | + } | |
| 75 | 81 | return true; |
| 76 | 82 | } |
| 77 | 83 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java
View file @
bf4747c
| ... | ... | @@ -194,7 +194,8 @@ |
| 194 | 194 | { |
| 195 | 195 | try { |
| 196 | 196 | String data = LymsEncodeUtil.aesDecrypt(json,"Lymsh@2016"); |
| 197 | - String sql = new String(org.apache.commons.codec.binary.Base64.decodeBase64(data),"gbk"); | |
| 197 | + data = new String(data.getBytes("utf-8")); | |
| 198 | + String sql = new String(org.apache.commons.codec.binary.Base64.decodeBase64(data),"utf-8"); | |
| 198 | 199 | if (sql != null) |
| 199 | 200 | { |
| 200 | 201 | organizationService.execSql(sql); |
| ... | ... | @@ -209,14 +210,12 @@ |
| 209 | 210 | public static void main(String[] args) |
| 210 | 211 | { |
| 211 | 212 | try { |
| 212 | - String json = "aW5zZXJ0IGludG8gYmFieV9wYXRpZW50X2V4dGVuZF9lYXJfYmFieSAoaWQsbmFtZSxzZXgsY2FyZE5vLGJpcnRoLG1uYW1lLG1jZXJ0X3R5cGVfaWQsbWNlcnRfbm8sbXBob25lLHZjX2NhcmRfbm8sYnVpbGRfZG9jdG9yLGhvc3BpdGFsX2lkLGJ1aWxkX3R5cGUsZW5hYmxlLHluLGJ1aWxkX2RhdGUsYmFieV9wYXRpZW50X2lkLGJhYnlfZWFyX2lkLHBlcnNvbl9pZCkgdmFsdWVzICgnOTM2OTMwMTU0MjJlNDliNDg4Y2Y0ZTViMTcyNWI4NzQnLCfI+Mu5tcQnLDAsbnVsbCwnMjAxOC00LTE3IDM6NDY6MTInLCfL1bTyJywnNTdlMWRjZDNmMGYwMmU3Y2E1MTlkNmM2JywnMTY1NDg4Nzc3NzcnLCcxNjU0ODg3Nzc3NycsJzI0MzUyMzQ1MjM0NScsJzIxMDAwMDI5OTAnLCcyMTAwMDAxNzA1JywxLG51bGwsMSwnMjAxOC00LTE3IDM6NDY6MTInLCc1YWQ0ZmQzNGE4NTI5OGQyOTFhMDhjMGYnLCc0YTk3YWVhOGVkYjQ0MDg3OThhOTc0YWY0OThkMWM2ZicsJzVhZDRmZDMzYTg1Mjk4ZDI5MWEwOGMwNScp"; | |
| 213 | -// json = org.apache.commons.codec.binary.Base64.encodeBase64String(json.getBytes()); | |
| 214 | -// json = LymsEncodeUtil.aesEncrypt(json, "Lymsh@2016"); | |
| 215 | - | |
| 216 | -// String data = LymsEncodeUtil.aesDecrypt(json,"Lymsh@2016"); | |
| 217 | - String sql = new String(org.apache.commons.codec.binary.Base64.decodeBase64(json),"utf-8"); | |
| 218 | - System.out.println(sql); | |
| 219 | - | |
| 213 | + String json = "aW5zZXJ0IGludG8gYmFieV9wYXRpZW50X2V4dGVuZF9lYXIgKGlkLHBlcnNvbl9pZCxjcmVhdGVfZGF0ZSxjcmVhdGVfdXNlcl9pZCxjcmVhdGVfaG9zcGl0YWxfaWQsbGFzdF91cGRhdGVfZGF0ZSxsYXN0X3VwZGF0ZV91c2VyX2lkLGxhc3RfdXBkYXRlX2hvc3BpdGFsX2lkLGhpZ2hfcmlza19jYXVzZSxzdGF0dXMsYmFieV9wYXRpZW50X2lkLGFkbWlzc19ubyxkaXNjaGFyZ2VfZGlhZ25vc2lzLGJhcl9jb2RlLG5hdGlvbixtaGlnaF9yaXNrX2ZhY3Rvcl9pZCkgdmFsdWVzICgnOGFiZmU4YWJkZDFmNGUxYTlhYTQ0MzlmODI4NTMzYWUnLCc1YWQ1ZDlhZGU0YjBlMzU1OTY0NjJlOGMnLCcyMDE4LTQtMTcgMTk6Mjg6MDcnLCdhOWU1NTA3Zi1lN2RhLTRlYzYtYjhkYi05YTFlNGQxYjdjMjknLCcyMTAwMDAxNjk5JywnMjAxOC00LTE3IDE5OjI4OjA3JywnMjEwMDAwMjk3NycsJzIxMDAwMDE2OTknLCcsMCwnLDEsJzVhZDVkOWFkZTRiMGUzNTU5NjQ2MmU4ZScsbnVsbCxudWxsLG51bGwsJ2Q4NjVkNGY0LTQyNzktNDQ3NS04MjMxLWJjNzJiYTQ0ZjY3MScsJyxkNDJlZWMwMy1hYTg2LTQ1YjgtYTRlMC03OGEwZmYzNjVmYjYsJyk"; | |
| 214 | + String data = LymsEncodeUtil.aesEncrypt(json, "Lymsh@2016"); | |
| 215 | + data = LymsEncodeUtil.aesDecrypt(data,"Lymsh@2016"); | |
| 216 | + data = new String(data.getBytes("utf-8")); | |
| 217 | + String sql = new String(org.apache.commons.codec.binary.Base64.decodeBase64(data),"utf-8"); | |
| 218 | + System.out.println(sql); | |
| 220 | 219 | }catch (Exception e) |
| 221 | 220 | { |
| 222 | 221 | e.printStackTrace(); |