合并冲突

dsk-srm-server/src/api/login.js

 import network from "@/utils/network";
 
+//密码登录
+export const login = (data) => network({
+  url: "/login",
+  method: "post",
+  data
+});
+//短信登录
+export const smsLogin = (data) => network({
+  url: "/smsLogin",
+  method: "post",
+  data
+});
+//校验短信验证码
+export const validateSmsCode = (data) => network({
+  url: "/sms/validateSmsCode?phone="+data.phone +"&code="+data.code,
+  method: "get",
+  data
+});
+//校验图形验证码
+export const validateCaptcha = (data) => network({
+  url: "/validateCaptcha?uuid="+data.uuid +"&code="+data.code,
+  method: "get",
+});
+//忘记密码提交
+export const forgotPassword = (data) => network({
+  url: "/forgotPassword",
+  method: "post",
+  data
+});
+//图形验证码
+export const captchaImage = () => network({
+  url: "/captchaImage",
+  method: "get",
+});
+//验证账号并发送短信
+export const checkUser = (data) => network({
+  url: "/checkUser",
+  method: "post",
+  data
+});
 
 export const loginApi = (data) => network({
   url: "",
@@ -13,36 +53,36 @@ export const loginOutApi = () => network({
 });
 
 export const getUserInfoApi = () => network({
-    url: "",
-    method: "post"
+  url: "",
+  method: "post"
 });
 
-//短信登陆/忘记密码-验证账户(通过直接发短信)
+//短信登陆/忘记密码-验证账户(通过直接发短信)
 export const checkUser = (data) => network({
     url: "/checkUser",
     method: "post",
     data
 });
-//供应商类型
+//供应商类型
 export const getCategoryList = (data) => network({
     url: "/category/list/tree",
     method: "post",
     data
 });
-//校验手机短信码
+//校验手机短信码
 export const validateSmsCode = (data) => network({
     url: "/sms/validateSmsCode?" + data,
     method: "get",
     data
 });
 
-//上传文件
+//上传文件
 export const uploadFile = (data) => network({
     url: "/file/uploadFile",
     method: "post",
     data
 });
-//注册
+//注册
 export const register = (data) => network({
     url: "/register",
     method: "post",

dsk-srm-server/src/login.vue

@@ -20,10 +20,10 @@
         <!--密码登录 -->
         <div class="logoncont" v-if="type=='mima'">
           <div class="inputs">
-            <el-input placeholder="请输入账号" v-model="mimaparam.username"></el-input>
+            <el-input placeholder="请输入账号" v-model="mimaparam.userName"></el-input>
           </div>
           <div class="inputs">
-            <el-input placeholder="请输入登录密码" v-model="mimaparam.password"></el-input>
+            <el-input placeholder="请输入登录密码" show-password v-model="mimaparam.password"></el-input>
           </div>
           <div class="inputs">
             <el-input width="191px" class="small" placeholder="请输入验证码" v-model="mimaparam.code" ></el-input>
@@ -59,7 +59,7 @@
           </div>
           <div class="inputs">
             <el-input placeholder="短信验证码" v-model="resetparam.smsCode" class="hqyzm">
-              <template slot="append"><span @click="getSmsCode(1)">{{ timer }}</span></template>
+              <template slot="append"><span @click="getSmsCode(2)">{{ timer }}</span></template>
             </el-input>
           </div>
           <div class="inputs">
@@ -76,10 +76,10 @@
         <!--        提交重置的密码-->
         <div class="logoncont" v-if="type=='tjmm'">
           <div class="inputs">
-            <el-input v-model="resetparam.passWord" placeholder="请输入密码"></el-input>
+            <el-input v-model="resetparam.passWord" placeholder="请输入密码"  show-password ></el-input>
           </div>
           <div class="inputs">
-            <el-input v-model="resetparam.passWord1" placeholder="请再次输入密码"></el-input>
+            <el-input v-model="resetparam.passWord1" placeholder="请再次输入密码"  show-password ></el-input>
           </div>
           <div class="loginin" @click="resetpwd">提交</div>
           <div class="loginzc" style="justify-content: center">
@@ -331,7 +331,7 @@
 
 <script>
 import footers from '@/components/foots'
-
+import {login,smsLogin,validateSmsCode,validateCaptcha,forgotPassword,captchaImage,checkUser} from "./api/login"
 export default {
   components: {footers},
   data() {
@@ -387,13 +387,13 @@ export default {
           { required: true, message: '请输入企业简介', trigger: 'change' }
         ],
       },
-      type:"tjmm",//登录方式 密码：mima 验证码：yzm 忘记密码：wjmm 提交密码：tjmm
+      type:"mima",//登录方式 密码：mima 验证码：yzm 忘记密码：wjmm 提交密码：tjmm
       yzmparam:{
         phone:'',
         smsCode:''
       } ,
       mimaparam:{
-        username:'',
+        userName:'',
         password:'',
         code:'',
         uuid:''
@@ -423,22 +423,26 @@ export default {
     cleardata(){
 
     },
-    //登录    /login
+    //登录
     login(){
       this.mimaparam.uuid = this.uuid
       if(!(this.mimaparam.username || this.mimaparam.code || this.mimaparam.code)){
         this.$message.error('账号、密码、验证码不能为空！');
         return false;
       }
+      // this.$store.dispatch("/login",this.mimaparam).then((res) => {
+      // // })
       login(this.mimaparam).then(res=>{
         if(res.code == 200){
+          let token = res.token
+          this.$store.commit("user/SET_TOKEN",token)
           this.toList()
         }else{
           this.$message.error(res.msg);
         }
       })
     },
-    //验证码登录  /smsLogin
+    //验证码登录
     yzmlogin(){
       if(!(this.yzmparam.phone || this.yzmparam.smsCode)){
         this.$message.error('账号、验证码不能为空！');
@@ -446,6 +450,8 @@ export default {
       }
       smsLogin(this.yzmparam).then(res=>{
         if(res.code == 200){
+          let token = res.token
+          this.$store.commit("user/SET_TOKEN",token)
           this.toList()
         }else{
           this.$message.error(res.msg);
@@ -454,18 +460,22 @@ export default {
     },
     //验证短信验证码、图形验证码
     yzSmscode(){
+      if(!(this.resetparam.phone || this.resetparam.smsCode || this.resetparam.code)){
+        this.$message.error('账号、验证码不能为空！');
+        return false;
+      }
       let param = {
         phone:this.resetparam.phone,
         code:this.resetparam.smsCode
       }
-      //校验短信验证码  /sms/validateSmsCode
+      //校验短信验证码
       validateSmsCode(param).then(res=>{
         if (res.code == 200){
           let params = {
             uuid:this.uuid,
             code:this.resetparam.code
           }
-          //校验图形验证码   /validateCaptcha
+          校验图形验证码
           validateCaptcha(params).then(res=>{
             if(res.code == 200){
               this.type='tjmm'
@@ -485,12 +495,16 @@ export default {
       if(pwd!=pwd1){
         this.$message.error('两次输入密码不一致');
       }else{
-        //重置 /forgotPassword
+        //重置
         let param = {phone:this.resetparam.phone,passWord:this.resetparam.passWord}
         forgotPassword(param).then(res=>{
           if(res.code == 200){
             this.type = 'mima'
             this.getCode()
+            this.$message({
+              message: res.msg,
+              type: 'success'
+            });
           }else{
             this.$message.error(res.msg);
           }
@@ -499,9 +513,9 @@ export default {
     },
     //获取验图形证码
     getCode(){
-      this.getYZMimage().then(res=>{
-        this.codeUrl = res.data.imag
-        this.uuid = res.data.uuid
+      captchaImage().then(res=>{
+        this.codeUrl = 'data:image/gif;base64,'+res.img
+        this.uuid = res.uuid
       })
     },
     //获取手机验证码
@@ -515,14 +529,23 @@ export default {
             type: 'warning'
           });
       }
+      if(type == 2){//忘记密码
+        if(this.resetparam.phone)
+          this.yzPohne(this.resetparam.phone)
+        else
+          this.$message({
+            message: '请输入手机号！',
+            type: 'warning'
+          });
+      }
     },
-    // 验证手机号发送验证码   /sms/sendRegisterCode
+    // 验证手机号发送验证码
     yzPohne(phone){
       var param = {
         phone:phone,
         type:1 //0:注册,1:短信登录/忘记密码
       }
-      //验证账户发送短信 /checkUser
+      //验证账户发送短信
       checkUser(param).then(res=>{
         if(res.code == 200){
           this.getTimer()
@@ -750,6 +773,10 @@ export default {
         background: #FFFFFF;
         border-radius: 8px;
         border: 1px solid #F1F1F1;
+        >img{
+          width: 100%;
+          height: 100%;
+        }
       }
     }
 

dsk-srm-server/src/store/modules/user-module.js

@@ -27,8 +27,8 @@ const actions = {
       // 登录api调用
       loginApi(payload).then(res => {
         // 获取token
-        commit("SET_TOKEN", res.data);
-        setToken(res.data);
+        commit("SET_TOKEN", res.token);
+        setToken(res.token);
         resolve(res);
       }).catch(err => {
         console.log(err);

src/main/java/com/supServer/framework/config/SecurityConfig.java

@@ -101,7 +101,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 过滤请求
                 .authorizeRequests()
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
-                .antMatchers("/login", "/register", "/captchaImage","/resetPwd","/findAccount","/smsLogin","/forgotPassword","/checkUser").anonymous()
+                .antMatchers("/login", "/register", "/captchaImage","/resetPwd","/findAccount","/smsLogin","/forgotPassword","/checkUser","/category/list/tree","/validateCaptcha","/file/uploadFile").anonymous()
                 .antMatchers(
                         HttpMethod.GET,
                         "/",

src/main/java/com/supServer/project/controller/UserController.java

@@ -3,6 +3,7 @@ package com.supServer.project.controller;
 import com.supServer.common.constant.Constants;
 import com.supServer.common.constant.UserConstants;
 import com.supServer.framework.security.mode.LoginBody;
+import com.supServer.framework.security.mode.LoginUser;
 import com.supServer.framework.security.mode.RegisterBody;
 import com.supServer.framework.security.mode.SmsLoginBody;
 import com.supServer.framework.security.service.TokenService;
@@ -178,4 +179,14 @@ public class UserController {
     }
 
 
+
+    /*** 获取用户信息
+     *@Param:
+     *@return:
+     */
+    @GetMapping("/getInfo")
+    public AjaxResult getInfo(HttpServletRequest request){
+        LoginUser user = tokenService.getLoginUser(request);
+        return AjaxResult.success("操作成功",user);
+    }
 }