From d27a06d53516458df6a30905f74f775d6d6d754c Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 09 Aug 2023 14:55:19 +0800
Subject: [PATCH] 密钥问题
---
skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/sync/controller/UserPushController.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 46 insertions(+), 7 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/sync/controller/UserPushController.java b/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/sync/controller/UserPushController.java
index 63235f3..5331b6b 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/sync/controller/UserPushController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/sync/controller/UserPushController.java
@@ -5,19 +5,24 @@
import cn.gistack.system.user.sync.dto.AccountBean;
import cn.gistack.system.user.sync.dto.ApiPushDTO;
import cn.gistack.system.user.sync.util.GenerateUtil;
+import cn.gistack.system.user.sync.util.MD5Util;
import cn.gistack.system.user.sync.util.SecurityUtil;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.alibaba.nacos.shaded.com.google.gson.JsonObject;
import lombok.AllArgsConstructor;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.tenant.annotation.NonDS;
-import org.springblade.core.tool.api.IResultCode;
import org.springblade.core.tool.api.R;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* @PROJECT_NAME: skjcmanager
@@ -33,12 +38,15 @@
private final IUserService userService;
- @PostMapping("/userpush")
- public R userPush(ApiPushDTO apiPushDTO) {
- String syncData = SecurityUtil.decryptAES(apiPushDTO.getSyncData(),apiPushDTO.getSign());
- List<AccountBean> accountBeanList = JSONArray.parseArray(syncData, AccountBean.class);
+ private final static String appId = "46a23e7c5fe54f46a37848dc740dc001";
+ private final static String appSecret = "AxVGmJcsfxEx36zptmr8J+sv7MAhL1mUuwrk4woGUrM=";
-// List<AccountBean> accountBeanList = JSONArray.parseArray(GenerateUtil.generateSyncData(), AccountBean.class);
+ private final static String method = "post";
+
+ @PostMapping("/userpush")
+ public R userPush(@RequestBody ApiPushDTO apiPushDTO) {
+ String syncData = SecurityUtil.decryptAES(apiPushDTO.getSyncData(), MD5Util.getMD5String(appSecret));
+ List<AccountBean> accountBeanList = JSONArray.parseArray(syncData, AccountBean.class);
//循环list
accountBeanList.forEach(accountBean -> {
@@ -53,7 +61,7 @@
User saveUser = new User();
//设置id为手机号
- saveUser.setId(Long.parseLong(accountBean.getPrincipalId()));
+// saveUser.setId(Long.parseLong(accountBean.getPrincipalId()));
//账号为手机号
saveUser.setAccount(accountBean.getPrincipalId());
saveUser.setPhone(accountBean.getPrincipalId());
@@ -71,10 +79,41 @@
//在，看status状态，若为1则删除用户。0更新？
if (accountBean.getStatus().equals("1")){
userService.removeUser(accountBean.getPrincipalId());
+ } else { //更新
+ //设置姓名
+ one.setRealName(accountBean.getAttributes().get("realName"));
+ userService.updateUser(one);
}
}
});
return R.data(apiPushDTO.getTimestamp());
}
+// public static void main(String[] args) {
+// Map<String,String> attributes = new HashMap<>();
+// // "staffCode": "15563378977",
+// // "realName": "zhliu",
+// // "email": null,
+// // "phone": "15563378977",
+// // "employeeNum": "zhliu",
+// // "idCard": null,
+// // "employeeStatus": "1",
+// // "userType": "0",
+// // "sort": "1"
+// attributes.put("staffCode","15563378977");
+// attributes.put("realName","zhliu");
+// attributes.put("email",null);
+// attributes.put("phone","15563378977");
+// attributes.put("employeeNum","zhliu");
+// attributes.put("idCard", null);
+// attributes.put("employeeStatus","1");
+// attributes.put("userType","0");
+// attributes.put("sort","1");
+// String syncData = SecurityUtil.encryptAES(JSON.toJSONString(attributes), MD5Util.getMD5String(appSecret));
+// System.out.println("加密后：" + syncData);
+// String jiemi = SecurityUtil.decryptAES(syncData, MD5Util.getMD5String(appSecret));
+// System.out.printf("解密后：" + jiemi);
+//
+// }
+
}
--
Gitblit v1.9.3