修改微信登录代码

src/main/java/com/ydtech/modules/admin/service/impl/WechatServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ydtech.modules.admin.service.impl;
 
+import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.exception.SystemException;
@@ -8,11 +9,11 @@ import com.ydtech.modules.admin.dao.SysUserMapper;
 import com.ydtech.modules.admin.dao.SysUserRoleMapper;
 import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.model.SysUserRole;
-import com.ydtech.modules.admin.service.SysUserService;
-import com.ydtech.modules.admin.service.WechatService;
 import com.ydtech.modules.admin.model.vo.WechatBindPhoneVo;
 import com.ydtech.modules.admin.model.vo.WechatBindVo;
 import com.ydtech.modules.admin.model.vo.WechatLoginVo;
+import com.ydtech.modules.admin.service.SysUserService;
+import com.ydtech.modules.admin.service.WechatService;
 import com.ydtech.modules.esm.model.SysUserCheck;
 import com.ydtech.modules.esm.service.SysUserCheckService;
 import com.ydtech.utils.idgen.IdGenerate;
@@ -20,7 +21,6 @@ import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.bean.oauth2.WxOAuth2AccessToken;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.mp.api.WxMpService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
@@ -28,10 +28,9 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-
 import java.util.Date;
 
-import static com.ydtech.constants.RedisConstant.*;
+import static com.ydtech.constants.RedisConstant.PHONE_VERIFICATION_CODE_KEY;
 
 @Slf4j
 @Service
@@ -54,7 +53,8 @@ public class WechatServiceImpl implements WechatService {
 
     private final SysUserCheckService sysUserCheckService;
 
-    public WechatServiceImpl(SysUserMapper sysUserMapper, WxMpService wxMpService,  SysUserRoleMapper sysUserRoleMapper, StringRedisTemplate stringRedisTemplate, SysUserCheckService sysUserCheckService) {
+    public WechatServiceImpl(SysUserMapper sysUserMapper, WxMpService wxMpService, SysUserRoleMapper sysUserRoleMapper,
+                             StringRedisTemplate stringRedisTemplate, SysUserCheckService sysUserCheckService) {
         this.sysUserMapper = sysUserMapper;
         this.wxMpService = wxMpService;
 //        this.authenticationManager = authenticationManager;
@@ -63,7 +63,9 @@ public class WechatServiceImpl implements WechatService {
 //        this.esmUserInternalService = esmUserInternalService;
         this.sysUserCheckService = sysUserCheckService;
     }
-//    public WechatServiceImpl(SysUserMapper sysUserMapper, WxMpService wxMpService, AuthenticationManager authenticationManager, SysUserRoleMapper sysUserRoleMapper, StringRedisTemplate stringRedisTemplate, EsmUserInternalService esmUserInternalService, SysUserCheckService sysUserCheckService) {
+//    public WechatServiceImpl(SysUserMapper sysUserMapper, WxMpService wxMpService, AuthenticationManager authenticationManager,
+//    SysUserRoleMapper sysUserRoleMapper, StringRedisTemplate stringRedisTemplate, EsmUserInternalService esmUserInternalService,
+//    SysUserCheckService sysUserCheckService) {
 //        this.sysUserMapper = sysUserMapper;
 //        this.wxMpService = wxMpService;
 ////        this.authenticationManager = authenticationManager;
@@ -88,7 +90,6 @@ public class WechatServiceImpl implements WechatService {
             SysUser sysUser1 = new SysUser();
 
             String maxId = sysUserService.findMaxId(pyramid);
-//            String maxId = esmUserInternalService.findMaxId(pyramid);
             if (maxId == null) {
                 throw new SystemException("没有上级人员信息");
             }
@@ -98,14 +99,11 @@ public class WechatServiceImpl implements WechatService {
             SysUserRole sysUserRole = new SysUserRole();
             sysUserRole.setUserId(nextPK);
             sysUserRole.setRoleId(2L);
-//            sysUserRole.setLastUpdateTime(new Date());
+            sysUserRole.setLastUpdateTime(new Date());
             sysUserRoleMapper.insert(sysUserRole);
-
             sysUser1.setStatus(2); //1：正常   0：离司 2：新注册 审核后为1
             sysUser1.setName("游客");
-//            sysUser1.setUsertype("A");
-//            sysUser1.setCreateTime(new Date());
-//            sysUser1.setLastUpdateTime(new Date());
+            sysUser1.setCreateTime(new Date());
             sysUser1.setDeptId(pyramid);
             sysUser1.setId(nextPK);
             sysUser1.setOpenid(openId);
@@ -120,8 +118,8 @@ public class WechatServiceImpl implements WechatService {
         } else {
             number = sysUser.getId();
         }
-//        JwtAuthenticatioToken token = SecurityUtils.login(request, number, "", authenticationManager);
-        String token = "";
+
+        String token = StpUtil.createLoginSession(number);
         return HttpResult.ok(token);
     }
 

src/main/java/com/ydtech/modules/order/controller/QrCodeController.java

@@ -1,35 +1,31 @@
 package com.ydtech.modules.order.controller;
 
-import com.alibaba.fastjson.JSONObject;
-import com.ydtech.core.page.HttpResult;
 import com.ydtech.modules.order.entity.InsAreaCompany;
 import com.ydtech.modules.order.entity.InsOrderQrCode;
 import com.ydtech.modules.order.entity.InsOrders;
-import com.ydtech.modules.order.entity.vo.OrderVo;
 import com.ydtech.modules.order.entity.vo.QrCodeVo;
 import com.ydtech.modules.order.service.InsAreaCompanyService;
 import com.ydtech.modules.order.service.InsOrderQrCodeService;
 import com.ydtech.modules.order.service.InsOrdersService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.view.json.MappingJackson2JsonView;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.Objects;
 
 @Api(tags = "订单二维码管理")
 @Controller
 @RequestMapping(value = "/order/qrCode")
 public class QrCodeController {
+
     @Resource
     private InsOrderQrCodeService insOrderQrCodeService;
 
@@ -43,20 +39,17 @@ public class QrCodeController {
     @Value("${qrcode.genAddress}")
     private String qrCodeGenAddress;
 
-    /**
-     * 获取二维码
-     * @return
-     */
+
     @GetMapping(value = "/getQrCode")
-    public ModelAndView getQrCode(String areaCompanyId){
+    @ApiOperation(value = "获取二维码")
+    public ModelAndView getQrCode(String areaCompanyId) {
         InsOrderQrCode insOrderQrCode = insOrderQrCodeService.getOneOrSave(areaCompanyId);
         InsAreaCompany insAreaCompany = insAreaCompanyService.getById(areaCompanyId);
 
         ModelAndView modelAndView = new ModelAndView(new MappingJackson2JsonView());
-        if(!Objects.isNull(insOrderQrCode)){
+        if (!Objects.isNull(insOrderQrCode)) {
             InsOrders insOrders = insOrdersService.getById(insOrderQrCode.getOrderno());
 
-            JSONObject result = new JSONObject();
             QrCodeVo qrCodeVo = new QrCodeVo();
             String qrCodeUrl = qrCodeGenAddress + "?areaCompanyId=" + areaCompanyId;
             qrCodeVo.setQrCodeUrl(qrCodeUrl);
@@ -75,45 +68,37 @@ public class QrCodeController {
 
             modelAndView.addObject("code", 200);
             modelAndView.addObject("data", qrCodeVo);
-            modelAndView.addObject("msg","");
-        }else{
+            modelAndView.addObject("msg", "");
+        } else {
             modelAndView.addObject("code", 500);
-            modelAndView.addObject("data","");
-            modelAndView.addObject("msg","二维码不存在");
+            modelAndView.addObject("data", "");
+            modelAndView.addObject("msg", "二维码不存在");
 
         }
         return modelAndView;
     }
 
-    /**
-     * 销毁二维码
-     * @param areaCompanyId
-     * @return
-     */
+
     @PostMapping(value = "/destructionQrCode")
-    public ModelAndView destructionQrCode(String areaCompanyId){
-        boolean b = insOrderQrCodeService.updateQrCode(areaCompanyId,0);
+    @ApiOperation(value = "销毁二维码")
+    public ModelAndView destructionQrCode(String areaCompanyId) {
+        boolean b = insOrderQrCodeService.updateQrCode(areaCompanyId, 0);
         ModelAndView modelAndView = new ModelAndView(new MappingJackson2JsonView());
-        if(b){
+        if (b) {
             modelAndView.addObject("code", 200);
             modelAndView.addObject("data", "");
-            modelAndView.addObject("msg","二维码销毁成功");
-        }else{
+            modelAndView.addObject("msg", "二维码销毁成功");
+        } else {
             modelAndView.addObject("code", 500);
             modelAndView.addObject("data", "");
-            modelAndView.addObject("msg","二维码销毁失败");
+            modelAndView.addObject("msg", "二维码销毁失败");
         }
         return modelAndView;
     }
 
-    /**
-     * 扫描二维码地址
-     * @param areaCompanyId
-     * @return
-     * @throws IOException
-     */
-    @RequestMapping(value = "/index")
-    public String index(String areaCompanyId) throws IOException {
+    @GetMapping(value = "/index")
+    @ApiOperation(value = "扫描二维码地址")
+    public String index(String areaCompanyId) {
         InsOrderQrCode insOrderQrCode = insOrderQrCodeService.getOne(areaCompanyId);
         if (insOrderQrCode != null) {
             //更新二维码扫描时间
@@ -126,12 +111,10 @@ public class QrCodeController {
         return "redirect:/order/qrCode/error";
     }
 
-    /**
-     * 错误页面显示
-     * @return
-     */
-    @RequestMapping(value = "/error")
-    public String error(){
+
+    @GetMapping(value = "/error")
+    @ApiOperation(value = "错误页面显示")
+    public String error() {
         return "qrcode_error";
     }
 }