From 50dcb6898cba3b7942f597e05122cb31690a90c7 Mon Sep 17 00:00:00 2001
From: wangh <9483>
Date: Fri, 26 Jan 2024 16:57:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fuintAdmin_zt/src/views/login.vue             |  4 +-
 .../configure/dev/application.properties      | 15 +++++--
 .../configure/dev/application2.properties     |  0
 .../member/service/ILJStaffService.java       |  1 +
 .../service/impl/LJStaffServiceImpl.java      | 11 +++++
 .../service/impl/AccountServiceImpl.java      |  3 ++
 .../java/com/fuint/common/util/SMSUtils.java  | 26 ++++++++---
 .../controller/BackendLoginController.java    | 43 +++++++++++++++----
 .../com/fuint/repository/model/TAccount.java  |  2 +-
 fuintCashierWeb/src/api/login.js              |  9 ++++
 fuintCashierWeb/src/store/user.js             | 16 +++++++
 fuintCashierWeb/src/views/login/index.vue     |  9 ++--
 12 files changed, 116 insertions(+), 23 deletions(-)
 create mode 100644 fuintBackend/configure/dev/application2.properties

diff --git a/fuintAdmin_zt/src/views/login.vue b/fuintAdmin_zt/src/views/login.vue
index 7c9980954..8a830a9b4 100644
--- a/fuintAdmin_zt/src/views/login.vue
+++ b/fuintAdmin_zt/src/views/login.vue
@@ -136,7 +136,7 @@
 </template>
 
 <script>
-import {getCodeImg, gettelcode, gettellogin,} from "@/api/login";
+import  {getCodeImg, gettelcode, gettellogin,} from "@/api/login";
 import Cookies from "js-cookie";
 import { encrypt, decrypt } from '@/utils/jsencrypt'
 import BalanceRecharge from "@/views/member/balanceRecharge.vue";
@@ -152,7 +152,7 @@ export default {
       timer: null,
       dlyzm:[
         {text:'登录',type:'0'},
-        {text: "验证码",type:'1'}
+        // {text: "验证码",type:'1'}
       ],
       actindex:0,
       codeUrl: "",
diff --git a/fuintBackend/configure/dev/application.properties b/fuintBackend/configure/dev/application.properties
index 27aa3ab0a..61e5a4abf 100644
--- a/fuintBackend/configure/dev/application.properties
+++ b/fuintBackend/configure/dev/application.properties
@@ -63,11 +63,20 @@ orderCancel.job.time = 0 0/1 * * * ?
 
 ################## \u963F\u91CC\u4E91\u77ED\u4FE1\u914D\u7F6E #######################
 # \u77ED\u4FE1\u63A5\u53E3\u6A21\u5F0F[0-\u5173\u95ED 1-\u6253\u5F00]
+#aliyun.sms.mode = 0
+#aliyun.sms.accessKeyId=LTAI4GJMjV123oXsrQJLnPZt
+#aliyun.sms.accessKeySecret=eGVBL30u5Ypj234d7XODlwYKWTaGT
+## \u963F\u91CC\u4E91\u77ED\u4FE1\u7B7E\u540D
+#aliyun.sms.signName=\u5EF6\u79BE\u6280\u672F
+
 aliyun.sms.mode = 0
-aliyun.sms.accessKeyId=LTAI4GJMjV123oXsrQJLnPZt
-aliyun.sms.accessKeySecret=eGVBL30u5Ypj234d7XODlwYKWTaGT
+aliyun.sms.accessKeyId=LTAI5tDaR1thArLkQ4gmRUMS
+aliyun.sms.accessKeySecret=whimt0bhMMJ0amVZPsvJ2euz8nCiOp
+aliyun.sms.regionId=cn-hangzhou
+aliyun.sms.templateCode=SMS_154950909
 # \u963F\u91CC\u4E91\u77ED\u4FE1\u7B7E\u540D
-aliyun.sms.signName=\u5EF6\u79BE\u6280\u672F
+aliyun.sms.signName=阿里云短信测试
+
 
 ################## \u963F\u91CC\u4E91OSS\u5B58\u50A8\u914D\u7F6E######################
 # \u6A21\u5F0F[0-\u5173\u95ED 1-\u6253\u5F00]
diff --git a/fuintBackend/configure/dev/application2.properties b/fuintBackend/configure/dev/application2.properties
new file mode 100644
index 000000000..e69de29bb
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/ILJStaffService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/ILJStaffService.java
index 8da3e2345..f70d0527e 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/ILJStaffService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/ILJStaffService.java
@@ -41,6 +41,7 @@ public interface ILJStaffService extends IService<LJStaff> {
      * @return
      */
     public LJStaff selectStaffByMobile(String mobile);
+    public LJStaff selectStaffByMobile2(String mobile);
 
     /**
      * 批量删除员工信息
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java
index 2e3698fa5..4dd5c9599 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java
@@ -102,6 +102,17 @@ public class LJStaffServiceImpl extends ServiceImpl<LJStaffMapper, LJStaff> impl
         return staff;
     }
 
+
+    @Override
+    public LJStaff selectStaffByMobile2(String mobile) {
+        QueryWrapper queryWrapper = new QueryWrapper();
+        queryWrapper.eq("mobile",mobile);
+        queryWrapper.eq("status","qy");
+        queryWrapper.eq("if_delete","0");
+        LJStaff staff = baseMapper.selectOne(queryWrapper);
+        return staff;
+    }
+
     /**
      * 根据id批量删除员工信息
      * @param ids
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/AccountServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/AccountServiceImpl.java
index 2e4347634..e60d532c5 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/AccountServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/AccountServiceImpl.java
@@ -219,6 +219,7 @@ public class AccountServiceImpl extends ServiceImpl<TAccountMapper, TAccount> im
         String accountStatus = param.get("accountStatus").toString();
         String realName = param.get("realName").toString();
         String password = param.get("password").toString();
+        String mobile = param.get("mobile").toString();
 
 //        String roleIds = param.get("roleIds").toString();
         String storeId = param.get("storeId") == null ? "0" : param.get("storeId").toString();
@@ -275,6 +276,7 @@ public class AccountServiceImpl extends ServiceImpl<TAccountMapper, TAccount> im
         tAccount.setStaffId(Integer.parseInt(staffId));
         tAccount.setDeptId(Long.parseLong(deptId));
         tAccount.setRoleIds(roleId);
+        tAccount.setMobile(mobile);
 
         TAccount resAccountInfo = createAccountInfo(tAccount, duties);
 
@@ -448,6 +450,7 @@ public class AccountServiceImpl extends ServiceImpl<TAccountMapper, TAccount> im
         account.setDeptId(tAccount.getDeptId());
         account.setPassword(tAccount.getPassword());
         account.setStaffId(tAccount.getStaffId());
+        account.setMobile(tAccount.getMobile());
         this.entryptPassword(account);
         int id = tAccountMapper.insert(account);
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/common/util/SMSUtils.java b/fuintBackend/fuint-application/src/main/java/com/fuint/common/util/SMSUtils.java
index 204e0abb8..6f75bbb10 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/common/util/SMSUtils.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/common/util/SMSUtils.java
@@ -7,22 +7,38 @@ import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse;
 import com.aliyuncs.exceptions.ClientException;
 import com.aliyuncs.profile.DefaultProfile;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.env.Environment;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
 
 /**
  * 短信发送工具类
  */
 
 @Slf4j
+@Component
 public class SMSUtils {
+
+    @Resource
+    private Environment env;
     /**
      * 发送短信
-     * @param signName 签名
-     * @param templateCode 模板
      * @param phoneNumbers 手机号
      * @param param 参数
      */
-    public static void sendMessage(String signName, String templateCode,String phoneNumbers,String param){
-        DefaultProfile profile = DefaultProfile.getProfile("cn-hangzhou", "LTAI5t7GEqGL46cwjYs6aanu", "d9MpwlyXbHOTrQaA5n8URVz40x5AX3");
+
+    public void sendMessage(String phoneNumbers,String param){
+
+        String signName = env.getProperty("aliyun.sms.signName");
+        String templateCode = env.getProperty("aliyun.sms.templateCode");
+        String regionId = env.getProperty("aliyun.sms.regionId");
+        String accessKeyId = env.getProperty("aliyun.sms.accessKeyId");
+        String accessKeySecret = env.getProperty("aliyun.sms.accessKeySecret");
+        signName = "阿里云短信测试";
+        DefaultProfile profile = DefaultProfile.getProfile(regionId, accessKeyId, accessKeySecret);
         IAcsClient client = new DefaultAcsClient(profile);
 
         SendSmsRequest request = new SendSmsRequest();
@@ -33,7 +49,7 @@ public class SMSUtils {
         request.setTemplateParam("{\"code\":\""+param+"\"}");
         try {
             SendSmsResponse response = client.getAcsResponse(request);
-            System.out.println("短信发送成功"+response);
+            log.info("--短信发送成功{}--",response.getMessage());
         }catch (ClientException e) {
             e.printStackTrace();
         }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendLoginController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendLoginController.java
index 0f515ca75..ab3c0ee4c 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendLoginController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendLoginController.java
@@ -3,6 +3,8 @@ package com.fuint.module.backendApi.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.api.R;
+import com.fuint.business.member.entity.LJStaff;
+import com.fuint.business.member.service.ILJStaffService;
 import com.fuint.business.userManager.entity.LJUser;
 import com.fuint.business.userManager.service.LJUserService;
 import com.fuint.common.dto.AccountInfo;
@@ -34,6 +36,7 @@ import org.springframework.web.bind.annotation.*;
 import com.fuint.common.domain.TreeNode;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
 import javax.servlet.http.HttpSession;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
@@ -123,6 +126,8 @@ public class BackendLoginController extends BaseController {
         }
     }
 
+    @Resource
+    SMSUtils smsUtils;
     /**
      * 发送手机验证码
      * */
@@ -140,10 +145,9 @@ public class BackendLoginController extends BaseController {
             }
             //生成随机的四位验证码
             String code = ValidateCodeUtils.verificationCode(4);
-            //String code = "1234";
+            code = "1234";
             //调用阿里云提供的短信服务API完成发送短信
-            SMSUtils.sendMessage("阿里云短信测试","SMS_154950909",phone,code);
-            //SMSUtils.sendMessage("蓝鲸智慧油站", "SMS_291345282",phone,code);
+            smsUtils.sendMessage(phone,code);
             //需要将生成的验证码保存到redis,过期时间300s
             redisTemplate.opsForValue().set(phone,code,300, TimeUnit.SECONDS);
             return getSuccessResult("手机验证码发送成功");
@@ -151,6 +155,9 @@ public class BackendLoginController extends BaseController {
         return getFailureResult("短信发送失败");
     }
 
+    @Resource
+    ILJStaffService iljStaffService;
+
     /**
      *手机验证码登录
      * @param map
@@ -158,20 +165,40 @@ public class BackendLoginController extends BaseController {
      * @return
      */
     @PostMapping("/loginByPhone")
-    public ResponseObject loginByPhone(@RequestBody Map map) {
+    public ResponseObject loginByPhone(HttpServletRequest request, @RequestBody Map map) {
+        String userAgent = request.getHeader("user-agent");
+
         //获取手机号
         String phone = map.get("mobile").toString();
         //获取用户信息
-        LJUser ljUser = userService.selectUserByMobile(phone);
+//        LJUser ljUser = userService.selectUserByMobile(phone);
+        // 获取员工信息
+        LJStaff ljStaff = iljStaffService.selectStaffByMobile2(phone);
+        TAccount tAccount = accountService.selectAccountByStaffId(ljStaff.getId());
+        AccountInfo accountInfo = accountService.getAccountByName(tAccount.getAccountName());
+
         //获取验证码
         String code = map.get("code").toString();
         //从redis中获取保存的验证码
         Object codeInRedis = redisTemplate.opsForValue().get(phone);
         //进行验证码的比对
-        if (codeInRedis != null && codeInRedis.equals(code) && ObjectUtils.isNotEmpty(ljUser)) {
+        if (codeInRedis != null && codeInRedis.equals(code) && ObjectUtils.isNotEmpty(ljStaff)) {
+
             //如果能够比对成功，说明登录成功
-            return getSuccessResult("登录成功!",ljUser);
-        }else if (codeInRedis != null && codeInRedis.equals(code) && ObjectUtils.isEmpty(ljUser)){
+            Subject subject = SecurityUtils.getSubject();
+            UsernamePasswordToken info = new UsernamePasswordToken(accountInfo.getAccountName(), tAccount.getPassword());
+            subject.login(info);
+            String token = TokenUtil.generateToken(userAgent, accountInfo.getId());
+            accountInfo.setToken(token);
+            TokenUtil.saveAccountToken(accountInfo);
+            LoginResponse response = new LoginResponse();
+            response.setLogin(true);
+            response.setToken(token);
+            response.setTokenCreatedTime(new Date());
+            return getSuccessResult(response);
+
+//            return getSuccessResult("登录成功!",ljUser);
+        }else if (codeInRedis != null && codeInRedis.equals(code) && ObjectUtils.isEmpty(accountInfo)){
             return getSuccessResult("用户不存在，请先注册账号！");
         }else {
             return getFailureResult("登录失败，请输入正确的验证码");
diff --git a/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/TAccount.java b/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/TAccount.java
index 4ed51de4a..bd5023943 100644
--- a/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/TAccount.java
+++ b/fuintBackend/fuint-repository/src/main/java/com/fuint/repository/model/TAccount.java
@@ -73,6 +73,6 @@ public class TAccount extends BaseEntity implements Serializable {
     private Long deptId;
     @TableField(exist = false)
     private String deptName;
-    @TableField(exist = false)
+//    @TableField(exist = false)
     private String mobile;
 }
diff --git a/fuintCashierWeb/src/api/login.js b/fuintCashierWeb/src/api/login.js
index fca43c04c..7616ba2c0 100644
--- a/fuintCashierWeb/src/api/login.js
+++ b/fuintCashierWeb/src/api/login.js
@@ -18,6 +18,15 @@ export function login(username, password, captchaCode, uuid) {
   })
 }
 
+// 获取手机验证码
+export function gettelcode(data) {
+  return request({
+    url: 'backendApi/login/sendMsg',
+    method: 'post',
+    data:data
+  })
+}
+
 // 获取用户详细信息
 export function getInfo() {
   return request({
diff --git a/fuintCashierWeb/src/store/user.js b/fuintCashierWeb/src/store/user.js
index bb4757937..047f94dfd 100644
--- a/fuintCashierWeb/src/store/user.js
+++ b/fuintCashierWeb/src/store/user.js
@@ -94,6 +94,22 @@ const user = {
       })
     },
 
+    // 验证码登录
+    codeLogin({ commit }, userInfo) {
+      const mobile = userInfo.mobile
+      const code = userInfo.code
+
+      return new Promise((resolve, reject) => {
+        gettellogin(mobile, code).then(res => {
+          setToken(res.data.token)
+          commit('SET_TOKEN', res.data.token)
+          resolve()
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+
     // 前端登出
     FedLogOut({ commit }) {
       return new Promise(resolve => {
diff --git a/fuintCashierWeb/src/views/login/index.vue b/fuintCashierWeb/src/views/login/index.vue
index a4cbc830f..fa2896ebd 100644
--- a/fuintCashierWeb/src/views/login/index.vue
+++ b/fuintCashierWeb/src/views/login/index.vue
@@ -72,7 +72,7 @@
               style="width:100%;line-height: 24px;font-size: 16px;"
               @click.native.prevent="handleLogin"
             >
-              <span v-if="!loading">立即登录</span>
+              <span v-if="!loading" >立即登录</span>
               <span v-else>登 录 中...</span>
             </el-button>
           </el-form-item>
@@ -136,7 +136,7 @@
   </div>
 </template>
 <script>
-import { getCodeImg } from "@/api/login";
+import { getCodeImg ,gettelcode} from "@/api/login";
 import Cookies from "js-cookie";
 import { encrypt, decrypt } from '@/utils/jsencrypt'
 
@@ -149,7 +149,7 @@ export default {
       timer: null,
       dlyzm:[
         {text:'登录',type:'0'},
-        {text: "验证码",type:'1'}
+        // {text: "验证码",type:'1'}
       ],
       actindex:0,
       codeUrl: "",
@@ -232,7 +232,8 @@ export default {
         code:this.loginForm.telcode
       }
       this.$store.dispatch("codeLogin", data).then(() => {
-        this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
+        // this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
+        this.$router.push({ path:"/homeindex" || "/" }).catch(()=>{});
       }).catch(() => {
         this.loading = false;