登录账号字段由username修改为loginName,避免引起误解

xqs
1 parent d866c778
Showing 6 changed files with 35 additions and 34 deletions
src/main/java/com/huaheng/api/general/controller/TokenApi.java
src/main/java/com/huaheng/pc/system/user/controller/LoginController.java
src/main/java/com/huaheng/pc/system/user/service/IUserService.java
src/main/java/com/huaheng/pc/system/user/service/UserServiceImpl.java
src/main/resources/static/huaheng/login.js
src/main/resources/templates/login.html
@@ -31,16 +31,16 @@ public class TokenApi extends BaseController {
  
     @PostMapping("/getToken")
     @ResponseBody
-    public Result getToken(String username, String password, String warehouseCode) {
-        if (StringUtils.isEmpty(username) || StringUtils.isEmpty(password)) {
+    public Result getToken(String loginName, String password, String warehouseCode) {
+        if (StringUtils.isEmpty(loginName) || StringUtils.isEmpty(password)) {
             return Result.error("用户名和密码不能为空");
         }
         if (StringUtils.isEmpty(warehouseCode)) {
             return Result.error("请选择仓库");
         }
-        User user = userService.selectUserByLoginName(username);
+        User user = userService.selectUserByLoginName(loginName);
  
-        if (!userService.checkWarehouseCodeAndUserName(warehouseCode, username)) {
+        if (!userService.checkWarehouseCodeAndUserName(warehouseCode, loginName)) {
             return Result.error("用户没有该仓库操作权限");
         }
         if (user.getPassword().equals(passwordService.encryptPassword(user.getLoginName(), password, user.getSalt()))) {
@@ -58,13 +58,15 @@ public class TokenApi extends BaseController {
     @PostMapping("/getTokenForMobile")
     @ResponseBody
     public AjaxResult getTokenForMobile(@RequestBody @ApiParam(value="code和password的Map集合") Map<String, String> param) {
-        String userName = param.get("userName");
+        String loginName = param.get("userName");
         String password = param.get("password");
-        if (StringUtils.isEmpty(userName) || StringUtils.isEmpty(password)) {
+        if (StringUtils.isEmpty(loginName) || StringUtils.isEmpty(password)) {
             return AjaxResult.error("用户名和密码不能为空");
         }
-        User user = userService.selectUserByLoginName(userName);
+        //需要传入仓库code
  
+
+        User user = userService.selectUserByLoginName(loginName);
         if (user.getPassword().equals(passwordService.encryptPassword(user.getLoginName(), password, user.getSalt()))) {
             String token = tokenService.createTokenForMobile(user);
             return AjaxResult.success("获取token成功").setData(token);
@@ -59,13 +59,13 @@ public class LoginController extends BaseController
      * */
     @PostMapping(value = "/login")
     @ResponseBody
-    public AjaxResult ajaxLogin(String username, String password, String warehouse, String warehouseCode, Boolean rememberMe) {
+    public AjaxResult ajaxLogin(String loginName, String password, String warehouse, String warehouseCode, Boolean rememberMe) {
         if (StringUtils.isNotEmpty(warehouse))
         {
             String[] warehouseArray = warehouse.split(",");
             warehouseCode = warehouseArray[1];
         }
-        AjaxResult ajaxResult = userService.login(username, password, warehouseCode, rememberMe);
+        AjaxResult ajaxResult = userService.login(loginName, password, warehouseCode, rememberMe);
         return ajaxResult;
     }
  
@@ -81,11 +81,11 @@ public class LoginController extends BaseController
      */
     @PostMapping("/getWarehouseByUserCode")
     @ResponseBody
-    public AjaxResult getWarehouseByUserCode(String username)
+    public AjaxResult getWarehouseByUserCode(String loginName)
     {
-        if (StringUtils.isNotEmpty(username))
+        if (StringUtils.isNotEmpty(loginName))
         {
-            List<Map<String, Object>> list = userService.getWarehouseByUserCode(username);
+            List<Map<String, Object>> list = userService.getWarehouseByUserCode(loginName);
             return  AjaxResult.success(list);
         }
         else
@@ -20,12 +20,12 @@ public interface IUserService
 {
     /**
      *  登陆验证
-     * @param username  用户名
+     * @param loginName  账号
      * @param password  密  码
      * @param warehouseCode  仓库编码
      * @return
      */
-    AjaxResult login(String username, String password, String warehouseCode, Boolean rememberMe);
+    AjaxResult login(String loginName, String password, String warehouseCode, Boolean rememberMe);
  
  
     /**
@@ -72,16 +72,16 @@ public class UserServiceImpl implements IUserService
  
     /**
      *  登陆验证
-     * @param username  用户名
+     * @param loginName  账号
      * @param password  密  码
 //     * @param warehouseId  仓库id
      * @param warehouseCode  仓库编码
      * @return
      */
     @Override
-    public AjaxResult login(String username, String password, String warehouseCode, Boolean rememberMe)
+    public AjaxResult login(String loginName, String password, String warehouseCode, Boolean rememberMe)
     {
-        if (StringUtils.isEmpty(username) || StringUtils.isEmpty(password))
+        if (StringUtils.isEmpty(loginName) || StringUtils.isEmpty(password))
         {
             return AjaxResult.error("用户名和密码不能为空");
         }
@@ -89,7 +89,7 @@ public class UserServiceImpl implements IUserService
         {
             return AjaxResult.error("请选择仓库");
         }
-        UsernamePasswordToken token = new UsernamePasswordToken(username, password, rememberMe);
+        UsernamePasswordToken token = new UsernamePasswordToken(loginName, password, rememberMe);
         Subject subject = SecurityUtils.getSubject();
         try
         {
@@ -106,7 +106,6 @@ public class UserServiceImpl implements IUserService
         }
         User user = ShiroUtils.getUser();
         user.setWarehouseCode(warehouseCode);
-        ShiroUtils.setUser(user);
         List<Company> Companys = companyService.selectCompanyByCurrentUserId();
         user.setCompanyIdList(Companys.stream().map(X -> X.getId()).collect(Collectors.toList()));
         user.setCompanyCodeList(Companys.stream().map(X -> X.getCode()).collect(Collectors.toList()));
@@ -16,7 +16,7 @@ $.validator.setDefaults({
  
 function login() {
 	$.modal.loading($("#btnSubmit").data("loading"));
-	var username = $.common.trim($("input[name='username']").val());
+	var loginName = $.common.trim($("input[name='loginName']").val());
     var password = $.common.trim($("input[name='password']").val());
     var warehouseId = $("#warehouse option:selected").val();
     var warehouseCode = $("#warehouse option:selected").attr("code");
@@ -26,7 +26,7 @@ function login() {
         type: "post",
         url: ctx + "login",
         data: {
-            "username": username,
+            "loginName": loginName,
             "password": password,
             "warehouseId": warehouseId,
             "warehouseCode": warehouseCode,
@@ -49,7 +49,7 @@ function validateRule() {
     var icon = "<i class='fa fa-times-circle'></i> ";
     $("#signupForm").validate({
         rules: {
-            username: {
+            loginName: {
                 required: true
             },
             password: {
@@ -60,8 +60,8 @@ function validateRule() {
             }
         },
         messages: {
-            username: {
-                required: icon + "请输入您的用户名",
+            loginName: {
+                required: icon + "请输入您的账号用户名",
             },
             password: {
                 required: icon + "请输入您的密码",
@@ -56,10 +56,10 @@
                 <p class="m-t-md">请输入用户名和密码，然后点击登陆</p>
  
                 <div class="row" style="padding:0 10px;">
-                    <label  class="control-label col-lg-3"  style="padding-top:7%;padding-right:0;text-align:right;">用户名：</label>
+                    <label  class="control-label col-lg-3"  style="padding-top:7%;padding-right:0;text-align:right;">账号：</label>
                     <div class="col-lg-9" style="padding:0 5px;">
-                        <!--<input type="text" name="username" id="username" class="form-control uname" placeholder="用户名"  value="admin">-->
-                        <input type="text" name="username" id="username" class="form-control uname" placeholder="用户名" autofocus>
+                        <!--<input type="text" name="loginName" id="loginName" class="form-control uname" placeholder="用户名"  value="admin">-->
+                        <input type="text" name="loginName" id="loginName" class="form-control uname" placeholder="账号" autofocus>
                     </div>
                 </div>
                 <div class="row" style="padding:0 10px;">
@@ -100,13 +100,13 @@
 <script src="../static/js/jquery.min.js" th:src="@{/js/jquery.min.js}"></script>
 <script>
     $(function () {
-        var post_select = function (username) {
+        var post_select = function (loginName) {
             $.ajax({
                 url: "getWarehouseByUserCode",
                 type: 'post',
                 dataType: "json",
                 data: {
-                    username:  username
+                    loginName:  loginName
                 },
                 success: function (value) {
                     // console.log(value.data);
@@ -119,19 +119,19 @@
             })
         };
  
-        $("#username").blur(function () {
-            if($("#username").val()=="" && $("#warehouse option:selected").text() == ""){
+        $("#loginName").blur(function () {
+            if($("#loginName").val()=="" && $("#warehouse option:selected").text() == ""){
                 return 0;
             }
-            else if ($("#username").val()=="" && $("#warehouse option:selected").text() != "") {
+            else if ($("#loginName").val()=="" && $("#warehouse option:selected").text() != "") {
                 $("#warehouse option").contents().remove();
             }
             else {
-                post_select($("#username").val());
+                post_select($("#loginName").val());
             }
         });
  
-        $("#username").change(function () {
+        $("#loginName").change(function () {
             $("#password").val("");
         });