WIN10-20210525Q\Administrator 1 год назад
Родитель
Сommit
788a6c5a99

+ 1 - 1
citu-framework/citu-common/src/main/java/com/citu/framework/common/exception/enums/ServiceErrorCodeRange.java

@@ -48,6 +48,6 @@ public class ServiceErrorCodeRange {
     // 模块 menduner-reward [1_110_000_000 ~ 1_110_999_999]
 
 
-    // 模块 menduner-im [1_200_000_000 ~ 1_110_999_999]
+    // 模块 menduner-im [1_120_000_000 ~ 1_120_999_999]
 
 }

+ 1 - 1
menduner/menduner-im-api/src/main/java/com/citu/module/menduner/im/enums/ApiConstants.java

@@ -1,4 +1,4 @@
-package com.citu.module.menduner.reward.enums;
+package com.citu.module.menduner.im.enums;
 
 import com.citu.framework.common.enums.RpcConstants;
 

+ 3 - 9
menduner/menduner-im-api/src/main/java/com/citu/module/menduner/im/enums/ErrorCodeConstants.java

@@ -1,15 +1,11 @@
-package com.citu.module.menduner.reward.enums;
+package com.citu.module.menduner.im.enums;
 
 import com.citu.framework.common.exception.ErrorCode;
 import com.citu.framework.common.exception.enums.GlobalErrorCodeConstants;
 import com.citu.framework.common.exception.enums.ServiceErrorCodeRange;
 
 /**
- * 门墩儿 积分 错误码枚举类
- * 错误码增减原则 规范
- * 1、每个模块都有单独的错误码;
- * 2、假设招聘职位模块要效验企业id,则在”招聘职位模块"下新增"企业id不能为空"错误码,不允许引用"企业模块"的"id不能为空";
- * 3、列外,所有模块都可以引用 {公共 1_110_000_000} or {@link GlobalErrorCodeConstants} 的错误码,除此之外不可引用不同业务块的错误码;
+ * 门墩儿 im 错误码枚举类
  * 参见 {@link ServiceErrorCodeRange}
  *
  * @author Rayson
@@ -17,9 +13,7 @@ import com.citu.framework.common.exception.enums.ServiceErrorCodeRange;
 public interface ErrorCodeConstants {
 
     // ========== 公共配置  1_110_000_000 ==========
-    ErrorCode POINT_RULE_CONFIG_STATUS_CAN_NOT_BE_EMPTY = new ErrorCode(1_110_000_001, "状态不能为空");
-    ErrorCode POINT_RULE_CONFIG_ID_CAN_NOT_BE_EMPTY = new ErrorCode(1_110_000_002, "id不能为空");
-    ErrorCode USER_ID_CAN_NOT_BE_EMPTY = new ErrorCode(1_110_000_003, "用户id不能为空");
+    ErrorCode USER_ID_CAN_NOT_BE_EMPTY = new ErrorCode(1_120_000_001, "用户id不能为空");
 
 
 }

+ 0 - 2
menduner/menduner-im-biz/src/main/java/com/citu/module/menduner/im/MendunerIMApplication.java

@@ -8,8 +8,6 @@ import org.springframework.context.ConfigurableApplicationContext;
 
 /**
  * 项目的启动类
- * 门墩儿 招聘模块 启动类
- * @author Rayson
  */
 @SpringBootApplication
 @EnableConfigurationProperties(WuKongConfig.class)

+ 0 - 4
menduner/menduner-im-biz/src/main/java/com/citu/module/menduner/im/config/package-info.java

@@ -1,4 +0,0 @@
-/**
- * @author Rayson
- */
-package com.citu.module.menduner.system.config;

+ 0 - 6
menduner/menduner-im-biz/src/main/java/com/citu/module/menduner/im/config/permission/package-info.java

@@ -1,6 +0,0 @@
-/**
- * 基于企业的数据权限规则
- *
- * @author Rayson
- */
-package com.citu.module.menduner.system.config.permission;

+ 4 - 2
menduner/menduner-im-biz/src/main/java/com/citu/module/menduner/im/controller/app/UserController.java

@@ -9,10 +9,12 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.validation.Valid;
+
 /**
  * @eo.api-type http
  * @eo.groupName 新门墩儿.聊天.用户信息获取
- * @eo.path /admin-api/im
+ * @eo.path /app-api
  */
 
 @RestController
@@ -29,7 +31,7 @@ public class UserController {
      * @return CommonResult
      */
     @PostMapping("/im/user/get")
-    public CommonResult<ImUserResoVO> getUser(@RequestBody ImUserReqVo reqVo){
+    public CommonResult<ImUserResoVO> getUser(@Valid  @RequestBody ImUserReqVo reqVo){
         return userService.getUser(reqVo);
     }
 

+ 6 - 1
menduner/menduner-im-biz/src/main/java/com/citu/module/menduner/im/controller/app/base/user/ImUserReqVo.java

@@ -1,7 +1,12 @@
 package com.citu.module.menduner.im.controller.app.base.user;
 
-public class ImUserReqVo {
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import javax.validation.constraints.NotNull;
 
+public class ImUserReqVo {
+    @Schema(description = "用户id", requiredMode = Schema.RequiredMode.REQUIRED, example = "6824")
+    @NotNull(message = "{1_099_000_006}")
     private Long userId;
 
     public Long getUserId() {

+ 0 - 4
menduner/menduner-im-biz/src/main/java/com/citu/module/menduner/im/framework/datapermission/package-info.java

@@ -1,4 +0,0 @@
-/**
- * system 模块的数据权限配置
- */
-package com.citu.module.menduner.im.framework.datapermission;

+ 0 - 4
menduner/menduner-im-biz/src/main/java/com/citu/module/menduner/im/framework/security/core/package-info.java

@@ -1,4 +0,0 @@
-/**
- * 占位
- */
-package com.citu.module.menduner.im.framework.security.core;

+ 0 - 4
menduner/menduner-im-biz/src/main/java/com/citu/module/menduner/im/package-info.java

@@ -1,4 +0,0 @@
-/**
- * menduner 招聘模块
- */
-package com.citu.module.menduner.system;

+ 4 - 3
menduner/menduner-im-biz/src/main/resources/bootstrap.yaml

@@ -1,11 +1,14 @@
 spring:
+  messages:
+    basename: i18n/messages
+    encoding: UTF-8
   application:
     name: im-server
   main:
     allow-circular-references: true # 允许循环依赖,因为项目是三层架构,无法避免这个情况。
     allow-bean-definition-overriding: true # 允许 Bean 覆盖,例如说 Feign 等会存在重复定义的服务
   profiles:
-    active: prod
+    active: local
   cloud:
     nacos:
       server-addr: ${nacosHost:127.0.0.1:8848}
@@ -30,5 +33,3 @@ logging:
     name: ${user.home}/logs/${spring.application.name}.log # 日志文件名,全路径
 
 
-
-