user测试完毕

jiangyg2010 · Nov 15, 2017 · cf5d800 · cf5d800
1 parent 521315e
commit cf5d800
Show file tree

Hide file tree

Showing 15 changed files with 545 additions and 145 deletions.
diff --git a/Gaoxi-Common-Service-Facade/src/main/java/com/gaoxi/exception/ExpCodeEnum.java b/Gaoxi-Common-Service-Facade/src/main/java/com/gaoxi/exception/ExpCodeEnum.java
@@ -21,6 +21,7 @@ public enum ExpCodeEnum implements Serializable {
     PARAM_NULL(ComExpPrefix + "002", "参数为空"),
     NO_REPEAT(ComExpPrefix + "003", "请勿重复提交"),
     SESSION_NULL(ComExpPrefix + "004", "请求头中SessionId不存在"),
+    HTTP_REQ_METHOD_ERROR(ComExpPrefix + "005", "HTTP请求方法不正确"),
 
     /** User模块异常 */
     USERNAME_NULL(UserExpPrefix + "000", "用户名为空"),

diff --git a/Gaoxi-Controller/src/main/java/com/gaoxi/controller/example/ExampleController.java b/Gaoxi-Controller/src/main/java/com/gaoxi/controller/example/ExampleController.java
diff --git a/Gaoxi-Controller/src/main/java/com/gaoxi/controller/example/ExampleControllerImpl.java b/Gaoxi-Controller/src/main/java/com/gaoxi/controller/example/ExampleControllerImpl.java
diff --git a/Gaoxi-Controller/src/main/java/com/gaoxi/controller/order/OrderController.java b/Gaoxi-Controller/src/main/java/com/gaoxi/controller/order/OrderController.java
@@ -38,7 +38,6 @@ public interface OrderController {
      */
     @GetMapping("/sellerOrders")
     @Login
-    @Permission("orders:query")
     Result<List<OrdersEntity>> findOrdersForSeller(OrderQueryReq orderQueryReq, HttpServletRequest httpReq);
 
     /**
@@ -78,7 +77,6 @@ public interface OrderController {
      */
     @PutMapping("/delivery")
     @Login
-    @Permission("order:delivery")
     Result confirmDelivery(String orderId, String expressNo, HttpServletRequest httpReq);
 
     /**

diff --git a/Gaoxi-Controller/src/main/java/com/gaoxi/controller/product/ProductController.java b/Gaoxi-Controller/src/main/java/com/gaoxi/controller/product/ProductController.java
@@ -30,8 +30,8 @@ public interface ProductController {
      * @return 是否创建成功
      */
     @PostMapping("product")
-//    @Login
-//    @Permission("product:create")
+    @Login
+    @Permission("product:create")
     public Result createProduct(ProdInsertReq prodInsertReq);
 
     /**
@@ -42,7 +42,7 @@ public interface ProductController {
      */
     @PostMapping("image")
     @Login
-//    @Permission("image:upload")
+    @Permission("image:upload")
     public Result<ProdImageEntity> uploadImage(MultipartFile file);
 
     /**

diff --git a/Gaoxi-Controller/src/main/java/com/gaoxi/controller/user/UserController.java b/Gaoxi-Controller/src/main/java/com/gaoxi/controller/user/UserController.java
@@ -39,6 +39,7 @@ public interface UserController {
      * @return 注册是否成功
      */
     @PostMapping("/register")
+    // TODO not test
     public Result register(RegisterReq registerReq, HttpServletResponse httpRsp);
 
 
@@ -60,6 +61,7 @@ public interface UserController {
     @PutMapping("/userState")
     @Login
     @Permission("userState:update")
+    // TODO not test
     public Result batchUpdateUserState(BatchReq<UserStateReq> userStateReqs);
 
     /**
@@ -81,6 +83,8 @@ public interface UserController {
     @Permission("role:query")
     public Result<List<RoleEntity>> findRoles();
 
+    // TODO 添加创建角色
+
     /**
      * 删除指定角色
      * @param roleId 角色ID

diff --git a/Gaoxi-Controller/src/main/java/com/gaoxi/handle/ExceptionHandle.java b/Gaoxi-Controller/src/main/java/com/gaoxi/handle/ExceptionHandle.java
@@ -1,9 +1,11 @@
 package com.gaoxi.handle;
 
+import com.gaoxi.exception.ExpCodeEnum;
 import com.gaoxi.rsp.Result;
 import com.gaoxi.exception.CommonBizException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.web.HttpRequestMethodNotSupportedException;
 import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -30,6 +32,16 @@ public <T> Result<T> exceptionHandler(CommonBizException exception) {
         return Result.newFailureResult(exception);
     }
 
+    /**
+     * 请求方法不正确
+     * @param exception
+     * @return
+     */
+    @ExceptionHandler(HttpRequestMethodNotSupportedException.class)
+    public Result HttpRequestMethodNotSupportedException(HttpRequestMethodNotSupportedException exception) {
+        throw new CommonBizException(ExpCodeEnum.HTTP_REQ_METHOD_ERROR);
+    }
+
     /**
      * 系统异常处理
      * @param exception

diff --git a/Gaoxi-Controller/src/main/java/com/gaoxi/init/InitAuth.java b/Gaoxi-Controller/src/main/java/com/gaoxi/init/InitAuth.java
@@ -38,6 +38,7 @@
 @Component
 public class InitAuth implements CommandLineRunner {
 
+    private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
     /** Redis工具包 */
     @Reference(version = "1.0.0")

diff --git a/Gaoxi-Controller/src/main/java/com/gaoxi/util/UserUtil.java b/Gaoxi-Controller/src/main/java/com/gaoxi/util/UserUtil.java
@@ -6,6 +6,7 @@
 import com.gaoxi.exception.CommonBizException;
 import com.gaoxi.exception.ExpCodeEnum;
 import com.gaoxi.facade.redis.RedisService;
+import com.gaoxi.redis.RedisServiceTemp;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
@@ -43,7 +44,9 @@ public UserEntity getUser(HttpServletRequest httpServletReq) {
         }
 
         // 获取UserEntity
-        Object userEntity =  redisService.get(sessionID);
+//        Object userEntity =  redisService.get(sessionID);
+        // TODO 暂时使用本地redis
+        Object userEntity = RedisServiceTemp.userMap.get(sessionID);
         if (userEntity == null) {
             return null;
         }

diff --git a/Gaoxi-User/src/main/java/com/gaoxi/user/dao/DemoDAO.java b/Gaoxi-User/src/main/java/com/gaoxi/user/dao/DemoDAO.java
diff --git a/Gaoxi-User/src/main/java/com/gaoxi/user/service/ExampleServiceImpl.java b/Gaoxi-User/src/main/java/com/gaoxi/user/service/ExampleServiceImpl.java
diff --git a/Gaoxi-User/src/main/java/com/gaoxi/user/service/UserServiceImpl.java b/Gaoxi-User/src/main/java/com/gaoxi/user/service/UserServiceImpl.java
@@ -197,12 +197,12 @@ private void checkParam(RolePermissionReq rolePermissionReq) {
             throw new CommonBizException(ExpCodeEnum.PARAM_NULL);
         }
 
-        // roleId不能为空
+        // roleId不能为空 & TODO roleId 必须存在
         if (StringUtils.isEmpty(rolePermissionReq.getRoleId())) {
             throw new CommonBizException(ExpCodeEnum.ROLEID_NULL);
         }
 
-        // 权限Id列表不能为空
+        // 权限Id列表不能为空 & 权限Id必须都存在
         if (CollectionUtils.isEmpty(rolePermissionReq.getPermissionIdList())) {
             throw new CommonBizException(ExpCodeEnum.PERMISSIONIDLIST_NULL);
         }
@@ -216,11 +216,12 @@ private void checkParam(RoleMenuReq roleMenuReq) {
         }
 
         // roleId不能为空
+        // TODO 确保roleId存在
         if (StringUtils.isEmpty(roleMenuReq.getRoleId())) {
             throw new CommonBizException(ExpCodeEnum.ROLEID_NULL);
         }
 
-        // menuId列表不能为空
+        // menuId列表不能为空 & TODO menuId必须存在
         if (CollectionUtils.isEmpty(roleMenuReq.getMenuIdList())) {
             throw new CommonBizException(ExpCodeEnum.MENUIDLIST_NULL);
         }
@@ -262,17 +263,20 @@ private void checkParam(AdminCreateReq adminCreateReq) {
         }
 
         // 用户名不能为空
+        // TODO 用户名不能重复
         if (StringUtils.isEmpty(adminCreateReq.getUsername())) {
            throw new CommonBizException(ExpCodeEnum.USERNAME_NULL);
         }
 
         // 电话不能为空
+        // TODO 电话不能重复
         if (StringUtils.isEmpty(adminCreateReq.getPhone())) {
             throw new CommonBizException(ExpCodeEnum.PHONE_NULL);
         }
 
         // 角色不能为空
-        if (adminCreateReq.getRoleId() == null) {
+        // TODO 角色必须已存在
+        if (StringUtils.isEmpty(adminCreateReq.getRoleId())) {
             throw new CommonBizException(ExpCodeEnum.ROLE_NULL);
         }
 

diff --git a/Gaoxi-User/src/main/resources/application-dev.properties b/Gaoxi-User/src/main/resources/application-dev.properties
@@ -10,4 +10,6 @@ spring.dubbo.protocol.name=dubbo
 spring.dubbo.protocol.port=20883
 spring.dubbo.scan=com.gaoxi.user.service
 
-server.port=8083
+server.port=8083
+
+logging.level.com.gaoxi.user.dao.UserDAO=debug
diff --git a/Gaoxi-User/src/main/resources/mybatis/mapper/UserMapper.xml b/Gaoxi-User/src/main/resources/mybatis/mapper/UserMapper.xml
@@ -83,30 +83,43 @@
 
         <where>
             <if test="userQueryReq.id != null">
-                id = #{userQueryReq.id}
+                user.id = #{userQueryReq.id}
             </if>
             <if test="userQueryReq.username != null">
-                username like CONCAT('%',#{userQueryReq.username},'%')
+                AND
+
+                  username = #{userQueryReq.username}
+            </if>
+            <if test="userQueryReq.password != null">
+                AND
+                password = #{userQueryReq.password}
             </if>
             <if test="userQueryReq.phone != null">
+                AND
                 phone = #{userQueryReq.phone}
             </if>
             <if test="userQueryReq.mail != null">
+                AND
                 mail = #{userQueryReq.mail}
             </if>
             <if test="userQueryReq.registerTimeStart != null">
+                AND
                 register_time &gt; #{userQueryReq.registerTimeStart}
             </if>
             <if test="userQueryReq.registerTimeEnd != null">
+                AND
                 register_time &lt; #{userQueryReq.registerTimeEnd}
             </if>
             <if test="userQueryReq.userType != null">
+                AND
                 user_type = #{userQueryReq.userType}
             </if>
             <if test="userQueryReq.userState != null">
+                AND
                 user_state = #{userQueryReq.userState}
             </if>
             <if test="userQueryReq.roleId != null">
+                AND
                 role_id = #{userQueryReq.roleId}
             </if>
         </where>