From 96286178ee1c257c130cb2ad964a781f36c4eee5 Mon Sep 17 00:00:00 2001
From: yn147 <2270338776@qq.com>
Date: 星期三, 10 五月 2023 16:23:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/qxueyou/scc/sys/action/LoginController.java | 45 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/sys/action/LoginController.java b/src/main/java/com/qxueyou/scc/sys/action/LoginController.java
index 859e5e5..e12d6ee 100644
--- a/src/main/java/com/qxueyou/scc/sys/action/LoginController.java
+++ b/src/main/java/com/qxueyou/scc/sys/action/LoginController.java
@@ -116,6 +116,18 @@
@Value("${wx.secret}")
private String secret;
+ /**
+ * 鍏紬鍙穉ppID
+ */
+ @Value("${wx.app.appId}")
+ private String wxappId;
+
+
+ /**
+ * 鍏紬鍙穝ecret
+ */
+ @Value("${wx.app.secret}")
+ private String wxsecret;
public static String UUNUMBER="QXYUUNUMBER";
@@ -129,8 +141,19 @@
* @throws IOException
*/
+ @PostMapping("/wxAccountsLogin")
+ @ApiOperation("寰俊鍏紬鍙风櫥褰�")
+ @ResponseBody
+ public Result wxAccountsLogin(String code) {
+ JSONObject gettoken = wechatService.gettoken(wxappId, wxsecret);
+ JSONObject OpenId = wechatService.getSessionKeyOrOpenId(code);
+ JSONObject user = wechatService.getUser(gettoken.get("access_token").toString(), OpenId.get("openid").toString());
+ return new Result(true,"鎴愬姛",user);
+ }
+
+
@PostMapping("/wxlogin")
- @ApiOperation("寰俊鐧诲綍")
+ @ApiOperation("寰俊灏忕▼搴忕櫥褰�")
@ResponseBody
public Result wechatLogin(String code,String number) {
JSONObject sessionKeyOrOpenId = wechatService.getSessionKeyOrOpenId(code);
@@ -164,10 +187,20 @@
String studentSql = "from StuStudent where deleteFlag is false and userId = ? ";
List<Object> stuParams = CollectionUtils.newList(user.getUserId());
StuStudent stuStudent = commonDAO.findUnique(studentSql, stuParams, StuStudent.class);
+ CacheParamters param = new CacheParamters();
+ param.setUserId(user.getUserId());
+ param.setCustomRoleValue(user.getEmail());
+ param.setCustomOrgId(user.getImei());
+ param.setCacheIpFlag(true);
+ // 缂撳瓨鍒拌姹傜嚎绋�
+ UserInfoWrapper wrapper = cacheUserInfo(param, null);
+ // 瀛樺埌redis
+ redisTemplate.opsForValue().set(UserInfoWrapper.SESSION_USER_INFO_KEY, wrapper);
return new Result(true,"鎺堟潈鎴愬姛",CollectionUtils.newObjectMap("user",user,"ClassId",stuStudent.getClassId()));
}
return phone;
-}
+ }
+
@ApiOperation(value = "鐧诲叆鎺ュ彛", notes = "")
@ApiImplicitParams({
@@ -390,8 +423,8 @@
if(StringUtils.isEmpty(password)) {
return new Result(false, "鐢ㄦ埛瀵嗙爜涓嶈兘涓虹┖");
}
- hql = "from User where deleteFlag is false and account = ? and password = ?";
- params = CollectionUtils.newList(account,password);
+ hql = "from User where deleteFlag is false and account = ?";
+ params = CollectionUtils.newList(account);
}
if(StringUtils.isNotEmpty(organizationId)){
@@ -421,7 +454,7 @@
String salt = user.getSalt();
String newPassword= DigestUtils.md5DigestAsHex((salt+password).getBytes());
//姣旇緝鐢ㄦ埛杈撳叆鐨勫瘑鐮佸姞瀵嗗悗鐨勫瓧绗︿覆鏄惁璺熸敞鍐屾椂濉啓鐨勫姞瀵嗗瘑鐮佺浉鍚�
- if("study".equals(logType) || "portal".equals(logType)){
+ if("study".equals(logType) || "portal".equals(logType) || "adminis".equals(logType)){
if (!newPassword.equals(user.getPassword())) {
return new Result(false, "鐢ㄦ埛璐︽埛銆佸瘑鐮侀敊璇垨缂哄皯鍑瘉");
}
@@ -615,7 +648,7 @@
@ApiOperation(value = "淇敼瀵嗙爜", notes = "")
@ApiImplicitParams({
@ApiImplicitParam(name = "usedPass", value = "鑰佸瘑鐮�", required = false, paramType="query", dataType = "String"),
- @ApiImplicitParam(name = "pass", value = "鏂板瘑鐮�", required = false, paramType="query", dataType = "String"),
+ @ApiImplicitParam(name = "pass", value = "鏂板瘑鐮�", required = false, paramType=" query", dataType = "String"),
})
@RequestMapping(value = "updatePassword", method = RequestMethod.POST)
@ResponseBody
--
Gitblit v1.8.0