From 4ca1fd21468bca91c1139da38528d4ead65b2263 Mon Sep 17 00:00:00 2001 From: shijie <648688341@qq.com> Date: Wed, 7 Apr 2021 10:38:26 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hrauth/service/impl/UserLoginServiceImpl.java | 11 ++++++++--- .../daqing/financial/hrauth/util/WXBizDataCrypt.java | 6 ++++++ .../com/daqing/framework/domain/hrms/UserEntity.java | 5 +++++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.java b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.java index 0a03a32c..66ec398b 100644 --- a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.java +++ b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserLoginServiceImpl.java @@ -353,7 +353,9 @@ public class UserLoginServiceImpl extends ServiceImpl // 用户的唯一标识（openid） String openid = (String) json.get("openid"); - System.out.println("session_key======"+session_key+"openid===="+openid); + String unionid = json.get("unionid").toString(); + + System.out.println("session_key======"+session_key+"openid===="+openid+"unionid===="+unionid); Map map = new HashMap(); @@ -376,9 +378,11 @@ public class UserLoginServiceImpl extends ServiceImpl userInfo.put("province", userInfoJSON.get("province")); userInfo.put("country", userInfoJSON.get("country")); userInfo.put("avatarUrl", userInfoJSON.get("avatarUrl")); - userInfo.put("unionId", userInfoJSON.get("unionId")); + //userInfo.put("unionId", userInfoJSON.get("unionId")); + userInfo.put("unionId", unionid); - System.out.println("unionId============"+userInfoJSON.get("unionId")); + System.out.println("unionId1============"+userInfoJSON.get("unionId")); + System.out.println("unionId2============"+userInfoJSON.get("unionId")); map.put("userInfo", userInfo); } else { map.put("status", 0); @@ -422,6 +426,7 @@ public class UserLoginServiceImpl extends ServiceImpl userEntity.setWechatId(md5UnionId);//加密后unionId userEntity.setHeadPortaritUrl(userMap.get("avatarUrl").toString());//头像路径 userEntity.setCreateTime(new Date());//创建时间 + userEntity.setType(loginRequest.getType());//登录类型(1:手机号 2:微信扫码登录 3:客户小程序登录 4：企业小程序登录) userLoginDao.insert(userEntity); loginRequest.setPhone(userMap.get("nickName").toString());//账号默认为微信名称 } diff --git a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/util/WXBizDataCrypt.java b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/util/WXBizDataCrypt.java index 8b19781a..8a9a7c09 100644 --- a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/util/WXBizDataCrypt.java +++ b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/util/WXBizDataCrypt.java @@ -123,9 +123,15 @@ public class WXBizDataCrypt { public static void main(String[] args) throws Exception { + String iv="o/0EyFuVSUnsBjYHSExRnQ=="; + String sessionKey="7DU6CyigMSSVgR9JHXuMFA=="; + String encryptedData="Wwt3s0dUvUgtyZ9qwA0Rv4shePwN/6krOTb8WhJre/4lF+rO9tp+clUsjUqilngXZuTUYGcQt0WM6zNyCSNjK2q8/B9LLOc4Pu2KuIHLgfR+3NcF+q/sEs/vjrPMbjGQam5xQ6sl5iQVXa431S3i9hSj/2Hrp2lWdZ3NyytaGzakSsL8Wun1M05bvZ9bRqxnfyA726ILNb2O+OBehKKql2LwGW2g0J6R4Jwmfp5D5MzVDQZtB4UWhTJjHkq9FQZnI7I5oh4LpE74GClIUMoVCAEAB6g2M450n32sxSusM8lNemEG1ZCMvgRde9oYecMvBUNtXvtXzB/QZbQznt/Oh+EzmVArqhH/e7n+Ij23PNmiPbeD+zPNdmzn5Qhd5DPQaUrLxo6CqekmhdPtf1+AiU4AmQtHJNsD+aO4VP0va4s="; + +/* String iv="dvIIKwlnHIneQrj1ZGhhWQ=="; String sessionKey="xUkcqKQdaK0vpVUXj8ityA=="; String encryptedData="nK44nXrhAtBbmwBNgZ+du5mJbGoEr9pyPJG3upfQq6GXK3IKDHGkec6HDxGyBGe1qCs2kwLIOzm24da4o7cb6eEeNbewj18SMsWErGE3KWfy1b2BEg1ttu8oKp9Eatsmofavn/TnZeZSXVe5hDsmJSUPPRidjVp6AWCmOiQLCjY2RiNjpVx2fdgVvrzARK6IOlYyoL0soMUQXt0jnTdza5XVUbY/iTLbVc5Hrbw52+/n2tphoBc1iFXlkkKsJiHL6482LAZ43U5ev/AWoEV/lGfs4APktlppWjdIQkXFlpnb4z5TV0S5QT4D4fxigvjIi6MgTO9CYViCVS7K3/WK0JeuMS61dKJLAriajZN1LiBJhz29jG1PctEnGS56C+o59PrUKfULvRD6U0cGLpgsVuyFM6EFVgz7NIEmBC4gOVGnOSAenkc++xVvVUf164SBMIQItVXaYSv+13Dat43CyHmN+bZowJz0ghJ730gPv3f01RqCMmjrWwQuBzZi8RuXNPIBzpBhymfvnM8QF+FjXA=="; +*/ /* Map userInfo = getUserInfo(encryptedData, sessionKey, iv); System.out.println(userInfo); diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/UserEntity.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/UserEntity.java index 3137e3f2..1108a086 100644 --- a/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/UserEntity.java +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/hrms/UserEntity.java @@ -100,4 +100,9 @@ public class UserEntity implements Serializable { */ private String headPortaritUrl; + /** + * 登录类型(1:手机号 2:微信扫码登录 3:客户小程序登录 4：企业小程序登录) + */ + private Integer type; + } From c4b0fc85fbf4eaaf6386f785cc1361cf3d869881 Mon Sep 17 00:00:00 2001 From: river <1376754470@qq.com> Date: Wed, 7 Apr 2021 11:20:13 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A4=9A=E7=BA=A7=E9=A9=B3=E5=9B=9E?= =?UTF-8?q?=E8=87=B3=E8=B4=B7=E5=AE=A1=E4=BC=9A=E6=97=B6=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../guarantee/mapper/DgLoanCommitteeConsiderMapper.java | 2 ++ .../guarantee/service/impl/DgEfficiencyServiceImpl.java | 5 +---- .../service/impl/DgLoanCommitteeConsiderServiceImpl.java | 4 ++++ .../mapper/guarantee/DgLoanCommitteeConsiderMapper.xml | 5 +++++ 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanCommitteeConsiderMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanCommitteeConsiderMapper.java index c7dfd2a9..e1102b53 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanCommitteeConsiderMapper.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/DgLoanCommitteeConsiderMapper.java @@ -54,6 +54,8 @@ public interface DgLoanCommitteeConsiderMapper extends BaseMapper + + + UPDATE dg_guarantee_letter_assign_user SET status = #{auditStatus} WHERE business_id = #{businessId} + + UPDATE dg_loan_committee_consider SET consider_id = #{userId} WHERE id = #{id} From c901ab683ae09146e139bbe95c1ba60cc08fee41 Mon Sep 17 00:00:00 2001 From: shijie <648688341@qq.com> Date: Wed, 7 Apr 2021 12:01:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/hrauth/UserLoginMapper.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dq-financial-hrms-auth/src/main/resources/mapper/hrauth/UserLoginMapper.xml b/dq-financial-hrms-auth/src/main/resources/mapper/hrauth/UserLoginMapper.xml index b0a81cb1..34986418 100644 --- a/dq-financial-hrms-auth/src/main/resources/mapper/hrauth/UserLoginMapper.xml +++ b/dq-financial-hrms-auth/src/main/resources/mapper/hrauth/UserLoginMapper.xml @@ -48,7 +48,9 @@ and hu.wechat_id = #{wechatId} - + + and hu.type = #{type} +