Merge branch 'future/strokeList' into 'master'

商家登陆

See merge request hewei/Jumeirah!28

api-merchant/src/main/java/com/jumeirah/api/merchant/controller/MerchantSmsController.java

@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
 @Slf4j
 @RestController
 //@Module("api-app")
-@Api(value = "短信验证码", tags = {"APP短信验证码相关"})
+@Api(value = "短信验证码", tags = {"APP短信验证码相关"},hidden = true)
 @RequestMapping("/merchant/sms/")
 public class MerchantSmsController extends BaseController {
 

api-merchant/src/main/java/com/jumeirah/api/merchant/controller/MerchantUserController.java

 package com.jumeirah.api.merchant.controller;
 
 import com.jumeirah.common.entity.MerchantUser;
-import com.jumeirah.common.param.LoginParam;
-import com.jumeirah.common.param.MerchantRegisterParam;
+import com.jumeirah.common.param.MerchantLoginParam;
 import com.jumeirah.common.param.MerchantUserPageParam;
 import com.jumeirah.common.service.MerchantService;
 import com.jumeirah.common.service.MerchantUserService;
@@ -26,7 +25,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -108,15 +106,15 @@ public class MerchantUserController extends BaseController {
     @PostMapping("/login")
     @OperationLogIgnore
     @ApiOperation(value = "登录", notes = "商家用户登录")
-    public ApiResult<LoginMerUserTokenVo> login(@Validated @RequestBody LoginParam loginParam, HttpServletResponse response, @RequestHeader(required = false) String language) throws Exception {
-        return merchantUserService.login(loginParam, response, language);
+    public ApiResult<LoginMerUserTokenVo> login(@Validated @RequestBody MerchantLoginParam merchantLoginParam, HttpServletResponse response) throws Exception {
+        return merchantUserService.login(merchantLoginParam);
     }
 
-    @PostMapping("/register")
-    @OperationLogIgnore
-    @ApiOperation(value = "注册", notes = "商家注册")
-    public ApiResult<Boolean> register(@Validated @RequestBody MerchantRegisterParam merchantRegisterParam, HttpServletResponse response) throws Exception {
-        return merchantUserService.register(merchantRegisterParam);
-    }
+//    @PostMapping("/register")
+//    @OperationLogIgnore
+//    @ApiOperation(value = "注册", notes = "商家注册")
+//    public ApiResult<Boolean> register(@Validated @RequestBody MerchantRegisterParam merchantRegisterParam, HttpServletResponse response) throws Exception {
+//        return merchantUserService.register(merchantRegisterParam);
+//    }
 }
 

common/src/main/java/com/jumeirah/common/entity/MerchantUser.java

@@ -24,7 +24,7 @@ import java.util.Date;
  */
 @Data
 @Accessors(chain = true)
-    @EqualsAndHashCode(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
 @ApiModel(value = "MerchantUser对象")
 public class MerchantUser extends BaseEntity {
     private static final long serialVersionUID = 1L;
@@ -34,6 +34,13 @@ public class MerchantUser extends BaseEntity {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
+    @NotNull(message = "商家id不能为空")
+    @ApiModelProperty("商家id")
+    private Long mcId;
+
+    @ApiModelProperty("是否为管理员，0：普通，1：超级管理员")
+    private Integer isAdmin;
+
     @ApiModelProperty("用户名")
     private String username;
 

common/src/main/java/com/jumeirah/common/param/MerLoginParam.java → common/src/main/java/com/jumeirah/common/param/MerchantLoginParam.java

@@ -31,18 +31,16 @@ import javax.validation.constraints.NotBlank;
  **/
 @Data
 @ApiModel("登录参数")
-public class MerLoginParam implements LoginUsername {
+public class MerchantLoginParam implements LoginUsername {
     private static final long serialVersionUID = 2854217576695117356L;
 
     @NotBlank(message = "请输入账号")
-    @ApiModelProperty(value = "账号", example = "admin")
+    @ApiModelProperty(value = "账号", example = "zhuomeiya")
     private String username;
 
     @NotBlank(message = "请输入密码")
     @ApiModelProperty(value = "密码", example = "123456")
     private String password;
 
-//    @ApiModelProperty("验证码")
-//    private String code;
 
 }

common/src/main/java/com/jumeirah/common/service/MerchantUserService.java

 package com.jumeirah.common.service;
 
 import com.jumeirah.common.entity.MerchantUser;
-import com.jumeirah.common.param.LoginParam;
+import com.jumeirah.common.param.MerchantLoginParam;
 import com.jumeirah.common.param.MerchantRegisterParam;
 import com.jumeirah.common.param.MerchantUserPageParam;
 import com.jumeirah.common.vo.LoginMerUserTokenVo;
@@ -10,8 +10,6 @@ import io.geekidea.springbootplus.framework.common.api.ApiResult;
 import io.geekidea.springbootplus.framework.common.service.BaseService;
 import io.geekidea.springbootplus.framework.core.pagination.Paging;
 
-import javax.servlet.http.HttpServletResponse;
-
 /**
  * 商家 服务类
  *
@@ -33,11 +31,10 @@ public interface MerchantUserService extends BaseService<MerchantUser> {
         /**
          * 登录
          *
-         * @param loginParam
          * @return
          * @throws Exception
          */
-        ApiResult<LoginMerUserTokenVo> login(LoginParam loginParam, HttpServletResponse response, String language) throws Exception;
+        ApiResult<LoginMerUserTokenVo> login(MerchantLoginParam merchantLoginParam) throws Exception;
 
 
         ApiResult<Boolean> register(MerchantRegisterParam merchantRegisterParam) throws Exception;

common/src/main/java/com/jumeirah/common/service/impl/MerchantRoleServiceImpl.java

 package com.jumeirah.common.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jumeirah.common.entity.MerchantRole;
 import com.jumeirah.common.mapper.MerchantRoleMapper;
+import com.jumeirah.common.param.MerchantRolePageParam;
 import com.jumeirah.common.service.MerchantRoleService;
-    import com.jumeirah.common.param.MerchantRolePageParam;
-    import com.jumeirah.common.vo.MerchantRoleQueryVo;
+import com.jumeirah.common.vo.MerchantRoleQueryVo;
 import io.geekidea.springbootplus.framework.common.service.impl.BaseServiceImpl;
-    import io.geekidea.springbootplus.framework.core.pagination.Paging;
-    import io.geekidea.springbootplus.framework.core.pagination.PageInfo;
-    import com.baomidou.mybatisplus.core.metadata.IPage;
-    import com.baomidou.mybatisplus.core.metadata.OrderItem;
-    import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-    import org.springframework.transaction.annotation.Transactional;
+import io.geekidea.springbootplus.framework.core.pagination.PageInfo;
+import io.geekidea.springbootplus.framework.core.pagination.Paging;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 商家角色 服务实现类

common/src/main/java/com/jumeirah/common/service/impl/MerchantUserServiceImpl.java

@@ -10,7 +10,7 @@ import com.jumeirah.common.entity.MerchantRole;
 import com.jumeirah.common.entity.MerchantUser;
 import com.jumeirah.common.enums.StateEnum;
 import com.jumeirah.common.mapper.MerchantUserMapper;
-import com.jumeirah.common.param.LoginParam;
+import com.jumeirah.common.param.MerchantLoginParam;
 import com.jumeirah.common.param.MerchantRegisterParam;
 import com.jumeirah.common.param.MerchantUserPageParam;
 import com.jumeirah.common.service.MerchantRolePermissionService;
@@ -29,7 +29,6 @@ import io.geekidea.springbootplus.framework.core.pagination.Paging;
 import io.geekidea.springbootplus.framework.shiro.cache.MerchantLoginRedisService;
 import io.geekidea.springbootplus.framework.shiro.jwt.JwtToken;
 import io.geekidea.springbootplus.framework.shiro.jwt.realm.LoginClientTypeEnum;
-import io.geekidea.springbootplus.framework.shiro.util.JwtTokenUtil;
 import io.geekidea.springbootplus.framework.shiro.util.JwtUtil;
 import io.geekidea.springbootplus.framework.shiro.util.SaltUtil;
 import io.geekidea.springbootplus.framework.shiro.vo.LoginUserVo;
@@ -45,7 +44,6 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.servlet.http.HttpServletResponse;
 import java.time.Duration;
 import java.util.Set;
 
@@ -89,7 +87,7 @@ public class MerchantUserServiceImpl extends BaseServiceImpl<MerchantUserMapper,
     @Autowired
     private MerchantRolePermissionService merchantRolePermissionService;
 
-    public MerchantUser getSysUserByUsername(String username) throws Exception {
+    public MerchantUser getMerUserByUsername(String username) throws Exception {
         MerchantUser sysUser = new MerchantUser().setUsername(username);
         return merchantUserMapper.selectOne(new QueryWrapper<MerchantUser>(sysUser));
     }
@@ -97,31 +95,29 @@ public class MerchantUserServiceImpl extends BaseServiceImpl<MerchantUserMapper,
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public ApiResult<LoginMerUserTokenVo> login(LoginParam loginParam, HttpServletResponse response, String language) throws Exception {
+    public ApiResult<LoginMerUserTokenVo> login(MerchantLoginParam merchantLoginParam) throws Exception {
 
 //        // 校验验证码
-//        checkVerifyCode(loginParam.getVerifyToken(), loginParam.getCode());
+//        checkVerifyCode(merchantLoginParam.getVerifyToken(), merchantLoginParam.getCode());
 
-        String username = loginParam.getUsername();
+        String username = merchantLoginParam.getUsername();
         // 从数据库中获取登录用户信息
-        MerchantUser merchantUser = getSysUserByUsername(username);
+        MerchantUser merchantUser = getMerUserByUsername(username);
         if (merchantUser == null) {
-
-            log.error("登录失败,loginParam:{}", loginParam);
-//            throw new AuthenticationException("用户名或密码错误");
-            return ApiResult.fail(ApiCode.PWD_OR_USERNAME_ERROR, language);
+            log.error("登录失败,用户名或密码错误merchantLoginParam:{}", merchantLoginParam);
+            return ApiResult.result(ApiCode.PWD_OR_USERNAME_ERROR, null);
         }
         if (StateEnum.DISABLE.getCode().equals(merchantUser.getState())) {
-            throw new AuthenticationException("账号已禁用");
+            return ApiResult.result(ApiCode.PWD_OR_USERNAME_ERROR, null);
         }
 
         // 实际项目中，前端传过来的密码应先加密
         // 原始密码明文：123456
         // 原始密码前端加密：sha256(123456)
         // 后台加密规则：sha256(sha256(123456) + salt)
-        String encryptPassword = PasswordUtil.encrypt(loginParam.getPassword(), merchantUser.getSalt());
+        String encryptPassword = PasswordUtil.encrypt(merchantLoginParam.getPassword(), merchantUser.getSalt());
         if (!encryptPassword.equals(merchantUser.getPassword())) {
-            return ApiResult.fail(ApiCode.PWD_OR_USERNAME_ERROR, language);
+            return ApiResult.result(ApiCode.PWD_OR_USERNAME_ERROR, null);
         }
 
         // 将系统用户对象转换成登录用户对象
@@ -193,7 +189,7 @@ public class MerchantUserServiceImpl extends BaseServiceImpl<MerchantUserMapper,
         loginSysUserTokenVo.setLoginSysUserVo(loginSysUserVo);
 
         // 设置token响应头
-        response.setHeader(JwtTokenUtil.getTokenName(), loginSysUserTokenVo.getToken());
+//        response.setHeader(JwtTokenUtil.getTokenName(), loginSysUserTokenVo.getToken());
 
         return ApiResult.ok(loginSysUserTokenVo);
     }

common/src/main/resources/mapper/merchant/MerchantUserMapper.xml

@@ -4,7 +4,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, username, nickname, password, salt, phone, phone_area, gender, head, remark, state, department_id, role_id, deleted, version, create_time, update_time
+        id,mc_id,is_admin, username, nickname, password, salt, phone, phone_area, gender, head, remark, state, department_id, role_id, deleted, version, create_time, update_time
     </sql>
 
     <select id="getMerchantUserById" resultType="com.jumeirah.common.vo.MerchantUserQueryVo">

config/src/main/resources/config/application.yml

@@ -282,9 +282,9 @@ spring:
     elideSetAutoCommits: true
     maintainTimeStats: false
     hikari:
-      minimum-idle: 2
+      minimum-idle: 5
       maximum-pool-size: 20
-      idle-timeout: 1000
+      idle-timeout: 10000
       max-lifetime: 1800000
       connection-timeout: 30000
 ############################### HikariCP 数据源配置 end ################################