Merge branch 'future/strokeList' into 'master'

Future/stroke list

See merge request hewei/Jumeirah!47

api-app/src/main/java/com/jumeirah/api/app/controller/AppUserController.java

 package com.jumeirah.api.app.controller;
 
-import com.jumeirah.api.app.entity.param.DeviceTokenParam;
 import com.jumeirah.api.app.service.AppUserApiService;
-import com.jumeirah.common.entity.AppUser;
 import com.jumeirah.common.param.app.AppSmsRegisterParam;
 import com.jumeirah.common.param.app.AppUserInfoParam;
 import com.jumeirah.common.param.app.AppUserPhoneUpdateParam;
+import com.jumeirah.common.param.app.DeviceTokenParam;
 import com.jumeirah.common.service.AppUserService;
 import com.jumeirah.common.vo.app.LoginAppUserTokenVo;
 import io.geekidea.springbootplus.framework.common.api.ApiResult;
@@ -13,11 +12,9 @@ import io.geekidea.springbootplus.framework.common.controller.BaseController;
 import io.geekidea.springbootplus.framework.log.annotation.Module;
 import io.geekidea.springbootplus.framework.log.annotation.OperationLog;
 import io.geekidea.springbootplus.framework.log.enums.OperationLogType;
-import io.geekidea.springbootplus.framework.shiro.jwt.JwtToken;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -51,17 +48,9 @@ public class AppUserController extends BaseController {
     @PostMapping("/iosDeviceToken")
     @OperationLog(name = "ios-添加或修改推送token", type = OperationLogType.ADD)
     @ApiOperation(value = "ios-添加或修改推送token", notes = "添加和修改都调用此接口", response = ApiResult.class)
-    public ApiResult<Boolean> addIosAppDeviceToken(@RequestBody DeviceTokenParam deviceToken) throws Exception {
+    public ApiResult<Boolean> addIosAppDeviceToken(@RequestBody DeviceTokenParam deviceTokenParam) throws Exception {
 
-        AppUser appUser = new AppUser();
-        appUser.setDeviceToken(deviceToken.getDeviceToken());
-        appUser.setDeviceType(2);
-
-        JwtToken jwtToken = (JwtToken) SecurityUtils.getSubject().getPrincipal();
-
-        appUser.setId(jwtToken.getUserId());
-
-        boolean flag = appUserService.updateAppUser(appUser);
+        boolean flag = appUserService.updateDeviceToken(deviceTokenParam, 2);
         return ApiResult.result(flag);
     }
 
@@ -71,20 +60,13 @@ public class AppUserController extends BaseController {
     @PostMapping("/androidDeviceToken")
     @OperationLog(name = "android-添加或修改推送token", type = OperationLogType.ADD)
     @ApiOperation(value = "android-添加或修改推送token", notes = "添加和修改都调用此接口", response = ApiResult.class)
-    public ApiResult<Boolean> addAppDeviceToken(@RequestBody DeviceTokenParam deviceToken) throws Exception {
-
-        AppUser appUser = new AppUser();
-        appUser.setDeviceToken(deviceToken.getDeviceToken());
-        appUser.setDeviceType(1);
+    public ApiResult<Boolean> addAppDeviceToken(@RequestBody DeviceTokenParam deviceTokenParam) throws Exception {
 
-        JwtToken jwtToken = (JwtToken) SecurityUtils.getSubject().getPrincipal();
-
-        appUser.setId(jwtToken.getUserId());
-
-        boolean flag = appUserService.updateAppUser(appUser);
+        boolean flag = appUserService.updateDeviceToken(deviceTokenParam, 1);
         return ApiResult.result(flag);
     }
 
+
     /**
      * 补充或修改APP用户信息
      */

api-app/src/main/java/com/jumeirah/api/app/controller/FeedbackController.java

 package com.jumeirah.api.app.controller;
 
+import com.jumeirah.api.app.entity.param.FeedbackAddParam;
 import com.jumeirah.common.entity.Feedback;
 import com.jumeirah.common.service.FeedbackService;
 import io.geekidea.springbootplus.framework.common.api.ApiResult;
@@ -40,10 +41,13 @@ public class FeedbackController extends BaseController {
     @PostMapping("/add")
     @OperationLog(name = "添加意见反馈", type = OperationLogType.ADD)
     @ApiOperation(value = "添加意见反馈")
-    public ApiResult<Boolean> addFeedback(@Validated(Add.class) @RequestBody Feedback feedback) throws Exception {
+    public ApiResult<Boolean> addFeedback(@Validated(Add.class) @RequestBody FeedbackAddParam feedbackAddParam) throws Exception {
 
         JwtToken jwtToken = (JwtToken) SecurityUtils.getSubject().getPrincipal();
+        Feedback feedback = new Feedback();
         feedback.setUserId(jwtToken.getUserId());
+        feedback.setContent(feedbackAddParam.getContent());
+
         boolean flag = feedbackService.saveFeedback(feedback);
         return ApiResult.result(flag);
     }

api-app/src/main/java/com/jumeirah/api/app/entity/param/FeedbackAddParam.java

+package com.jumeirah.api.app.entity.param;
+
+import io.geekidea.springbootplus.framework.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * 意见反馈
+ *
+ * @author giao
+ * @since 2020-10-26
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "FeedbackAddParam")
+public class FeedbackAddParam extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    private String content;
+
+}

api-app/src/main/java/com/jumeirah/api/app/entity/param/DeviceTokenParam.java → common/src/main/java/com/jumeirah/common/param/app/DeviceTokenParam.java

-package com.jumeirah.api.app.entity.param;
+package com.jumeirah.common.param.app;
 
 import lombok.Data;
 

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

@@ -3,6 +3,7 @@ package com.jumeirah.common.service;
 import com.jumeirah.common.entity.AppUser;
 import com.jumeirah.common.param.AppUserPageParam;
 import com.jumeirah.common.param.app.AppSmsRegisterParam;
+import com.jumeirah.common.param.app.DeviceTokenParam;
 import com.jumeirah.common.vo.AppUserQueryVo;
 import com.jumeirah.common.vo.app.LoginAppUserTokenVo;
 import io.geekidea.springbootplus.framework.common.api.ApiResult;
@@ -63,6 +64,16 @@ public interface AppUserService extends BaseService<AppUser> {
     boolean updateAppUser(AppUser appUser) throws Exception;
 
     /**
+     * 添加或修改推送token
+     *
+     * @param deviceTokenParam
+     * @param deviceType
+     * @return
+     * @throws Exception
+     */
+    boolean updateDeviceToken(DeviceTokenParam deviceTokenParam, int deviceType) throws Exception;
+
+    /**
      * 删除
      *
      * @param id

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

@@ -9,6 +9,7 @@ import com.jumeirah.common.enums.StateEnum;
 import com.jumeirah.common.mapper.AppUserMapper;
 import com.jumeirah.common.param.AppUserPageParam;
 import com.jumeirah.common.param.app.AppSmsRegisterParam;
+import com.jumeirah.common.param.app.DeviceTokenParam;
 import com.jumeirah.common.service.AppUserService;
 import com.jumeirah.common.vo.AppUserQueryVo;
 import com.jumeirah.common.vo.app.LoginAppUserTokenVo;
@@ -161,6 +162,23 @@ public class AppUserServiceImpl extends BaseServiceImpl<AppUserMapper, AppUser>
 
     @Transactional(rollbackFor = Exception.class)
     @Override
+    public boolean updateDeviceToken(DeviceTokenParam deviceTokenParam, int deviceType) throws Exception {
+        AppUser appUser = new AppUser();
+        appUser.setDeviceToken(deviceTokenParam.getDeviceToken());
+        appUser.setDeviceType(deviceType);
+
+        JwtToken jwtToken = (JwtToken) SecurityUtils.getSubject().getPrincipal();
+
+        appUser.setId(jwtToken.getUserId());
+
+        // 重置redis中的token
+
+
+        return this.updateAppUser(appUser);
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
     public boolean deleteAppUser(Long id) throws Exception {
         return super.removeById(id);
     }

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

@@ -207,6 +207,7 @@ public class MerchantUserServiceImpl extends BaseServiceImpl<MerchantUserMapper,
         loginSysUserTokenVo.setToken(token);
         loginSysUserTokenVo.setLoginSysUserVo(loginSysUserVo);
         loginSysUserTokenVo.setIsAdmin(merchantUser.getIsAdmin());
+        loginSysUserTokenVo.setMerchantId(merchantUser.getMcId());
 
         return ApiResult.ok(loginSysUserTokenVo);
     }

common/src/main/java/com/jumeirah/common/vo/LoginMerUserTokenVo.java

@@ -40,6 +40,9 @@ public class LoginMerUserTokenVo implements LoginToken {
     @ApiModelProperty("是否为管理员，0：普通，1：超级管理员")
     private Integer isAdmin;
 
+    @ApiModelProperty("商户ID")
+    private Long merchantId;
+
     /**
      * 登录用户对象
      */

framework/src/main/java/io/geekidea/springbootplus/framework/shiro/cache/AppLoginRedisService.java

@@ -64,13 +64,13 @@ public interface AppLoginRedisService {
      */
     LoginUserVo getLoginSysUserVo(String username);
 
-    /**
-     * 通过用户名称获取盐值
-     *
-     * @param username
-     * @return
-     */
-    String getSalt(String username);
+//    /**
+//     * 通过用户名称获取盐值
+//     *
+//     * @param username
+//     * @return
+//     */
+//    String getSalt(String username);
 
     /**
      * 删除对应用户的Redis缓存

framework/src/main/java/io/geekidea/springbootplus/framework/shiro/cache/impl/AppLoginRedisServiceImpl.java

@@ -118,15 +118,15 @@ public class AppLoginRedisServiceImpl implements AppLoginRedisService {
         LoginUserRedisVo userRedisVo = getLoginSysUserRedisVo(username);
         return userRedisVo;
     }
-
-    @Override
-    public String getSalt(String username) {
-        if (StringUtils.isBlank(username)) {
-            throw new IllegalArgumentException("username不能为空");
-        }
-        String salt = (String) redisTemplate.opsForValue().get(String.format(CommonRedisKey.LOGIN_SALT, username));
-        return salt;
-    }
+//
+//    @Override
+//    public String getSalt(String username) {
+//        if (StringUtils.isBlank(username)) {
+//            throw new IllegalArgumentException("username不能为空");
+//        }
+//        String salt = (String) redisTemplate.opsForValue().get(String.format(CommonRedisKey.LOGIN_SALT, username));
+//        return salt;
+//    }
 
     @Override
     public void deleteLoginInfo(String token, String username) {