Merge remote-tracking branch 'origin/dev/one' into dev/one

user-service/src/main/java/com/diagbot/facade/UserFacade.java

@@ -332,8 +332,8 @@ public class UserFacade extends UserServiceImpl {
      * 重置密码
      *
      * @param username     用户名
-     * @param password     密码
-     * @param diffPassword 重置的密码
+     * @param password     重置密码
+     * @param diffPassword 是否与上次密码不同标识
      * @return 重置密码是否成功
      */
     public RespDTO resetPassword(String username, String password, String diffPassword) {

user-service/src/main/java/com/diagbot/vo/AppkeySecretVO.java

@@ -0,0 +1,22 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Description: appkey和secret接收参数
+ * @Author: ztg
+ * @Date: 2018/9/28 13:14
+ */
+@Getter
+@Setter
+public class AppkeySecretVO {
+
+    @NotBlank(message = "请输入appkey!")
+    private String appkey;
+    @NotBlank(message = "请输入secret!")
+    private String secret;
+
+}

user-service/src/main/java/com/diagbot/vo/ResetPasswordVO.java

@@ -0,0 +1,23 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Description: 重置密码参数
+ * @Author: ztg
+ * @Date: 2018/9/28 13:14
+ */
+@Getter
+@Setter
+public class ResetPasswordVO {
+
+    @NotBlank(message = "请输入手机号!")
+    private String username;
+    @NotBlank(message = "请输入密码!")
+    private String password;
+    private String diffPassword; //密码是否与修改前一样标识
+
+}

user-service/src/main/java/com/diagbot/vo/UserLoginVO.java

@@ -0,0 +1,22 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Description: 登录参数
+ * @Author: ztg
+ * @Date: 2018/9/28 13:14
+ */
+@Getter
+@Setter
+public class UserLoginVO {
+
+    @NotBlank(message = "请输入手机号!")
+    private String username;
+    @NotBlank(message = "请输入密码!")
+    private String password;
+
+}

user-service/src/main/java/com/diagbot/web/UserController.java

@@ -11,6 +11,9 @@ import com.diagbot.entity.Permission;
 import com.diagbot.entity.User;
 import com.diagbot.facade.PermissionFacade;
 import com.diagbot.facade.UserFacade;
+import com.diagbot.vo.AppkeySecretVO;
+import com.diagbot.vo.ResetPasswordVO;
+import com.diagbot.vo.UserLoginVO;
 import com.diagbot.vo.UserSaveVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -66,8 +69,8 @@ public class UserController {
                     "password：密码, 必填<br> ")
     @PostMapping("/login")
     @SysLogger("login")
-    public RespDTO<LoginDTO> login(@RequestParam String username, @RequestParam String password) {
-        return userFacade.login(username, password);
+    public RespDTO<LoginDTO> login(@RequestBody UserLoginVO userLoginVO) {
+        return userFacade.login(userLoginVO.getUsername(), userLoginVO.getPassword());
     }
 
 
@@ -78,8 +81,8 @@ public class UserController {
     @PostMapping("/resetPassword")
     @SysLogger("resetPassword")
     @Transactional
-    public RespDTO<Boolean> resetPassword(String username, String password, String diffPassword) {
-        return userFacade.resetPassword(username, password, diffPassword);
+    public RespDTO<Boolean> resetPassword(@RequestBody ResetPasswordVO resetPasswordVO) {
+        return userFacade.resetPassword(resetPasswordVO.getUsername(), resetPasswordVO.getPassword(), resetPasswordVO.getDiffPassword());
     }
 
 
@@ -116,12 +119,12 @@ public class UserController {
         return userFacade.index(page, userSaveVO);
     }
 
-    @ApiOperation(value = "获取资源信息[by:zhoutg]",
+    @ApiOperation(value = "获取资源信息，接口未用[by:zhoutg]",
             notes = "appkey：用户名,必填<br>" +
                     "secret：密码, 必填<br> ")
     @PostMapping("/getPermission")
-    public RespDTO<Permission> getPermission(@RequestParam String appkey, @RequestParam String secret) {
-        return permissionFacade.getPermission(appkey, secret);
+    public RespDTO<Permission> getPermission(@RequestBody AppkeySecretVO appkeySecretVO) {
+        return permissionFacade.getPermission(appkeySecretVO.getAppkey(), appkeySecretVO.getSecret());
     }