1、优化企业详情-职位接口错误问题

2、增加用户积分表

menduner/menduner-common/pom.xml

@@ -29,12 +29,63 @@
             <artifactId>spring-boot-starter-aop</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.citu</groupId>
+            <artifactId>citu-spring-boot-starter-env</artifactId>
+        </dependency>
+
+        <!-- 业务组件 -->
+        <dependency>
+            <groupId>com.citu</groupId>
+            <artifactId>citu-spring-boot-starter-biz-data-permission</artifactId>
+        </dependency>
+
+        <!-- Web 相关 -->
+        <dependency>
+            <groupId>com.citu</groupId>
+            <artifactId>citu-spring-boot-starter-security</artifactId>
+        </dependency>
+
         <!-- DB 相关 -->
         <dependency>
             <groupId>com.citu</groupId>
             <artifactId>citu-spring-boot-starter-mybatis</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.citu</groupId>
+            <artifactId>citu-spring-boot-starter-biz-tenant</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.citu</groupId>
+            <artifactId>citu-spring-boot-starter-mq</artifactId>
+        </dependency>
+
+        <!-- RPC 远程调用相关 -->
+        <dependency>
+            <groupId>com.citu</groupId>
+            <artifactId>citu-spring-boot-starter-rpc</artifactId>
+        </dependency>
+
+        <!-- 工具类相关 -->
+        <dependency>
+            <groupId>com.citu</groupId>
+            <artifactId>citu-spring-boot-starter-excel</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.citu</groupId>
+            <artifactId>citu-spring-boot-starter-es</artifactId>
+            <version>${revision}</version>
+        </dependency>
+
+        <!-- 监控相关 -->
+        <dependency>
+            <groupId>com.citu</groupId>
+            <artifactId>citu-spring-boot-starter-monitor</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/util/LoginUserContext.java → menduner/menduner-common/src/main/java/com/citu/module/menduner/common/util/LoginUserContext.java

@@ -1,8 +1,9 @@
-package com.citu.module.menduner.system.util;
+package com.citu.module.menduner.common.util;
 
 import cn.hutool.core.collection.CollUtil;
 import com.citu.framework.common.enums.UserTypeEnum;
 import com.citu.framework.security.core.LoginUser;
+import com.citu.framework.security.core.util.SecurityFrameworkUtils;
 
 import static com.citu.framework.common.exception.enums.GlobalErrorCodeConstants.FORBIDDEN;
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -21,7 +22,7 @@ public class LoginUserContext {
      * 为空则抛出异常
      **/
     public static LoginUser get() {
-        LoginUser loginUser = getLoginUser();
+        LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
         if (null == loginUser) {
             // 没权限
             throw exception(FORBIDDEN);
@@ -30,7 +31,7 @@ public class LoginUserContext {
     }
 
     public static LoginUser get2() {
-        LoginUser loginUser = getLoginUser();
+        LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
         if (null == loginUser) {
             // 没权限
             return null;
@@ -71,7 +72,7 @@ public class LoginUserContext {
         if (!checkEnterprise(loginUser)) {
             throw exception(FORBIDDEN);
         }
-        return Long.valueOf(loginUser.getInfo().get(INFO_KEY_DATA_ID));
+        return Long.valueOf(loginUser.getInfo().get(LoginUser.INFO_KEY_DATA_ID));
     }
 
     /**

menduner/menduner-reward-api/src/main/java/com/citu/module/menduner/reward/enums/ErrorCodeConstants.java

@@ -40,7 +40,11 @@ public interface ErrorCodeConstants {
     ErrorCode SIGN_IN_CONFIG_POINT_CAN_NOT_BE_LESS_THAN_ZERO = new ErrorCode(1_110_003_005, "奖励积分不能小于 0");
 
 
-    //========== 签到配置 1_110_004_000 ==========
+    //========== 签到记录 1_110_004_000 ==========
     ErrorCode SIGN_IN_RECORD_TODAY_EXISTS = new ErrorCode(1_110_004_001, "今日已签到，请勿重复签到");
 
+    // ========== 用户相关  1_110_005_000 ============
+    ErrorCode USER_NOT_EXISTS = new ErrorCode(1_110_005_001, "用户不存在");
+    ErrorCode USER_POINT_NOT_ENOUGH = new ErrorCode(1_110_005_002, "用户积分余额不足");
+
 }

menduner/menduner-reward-biz/pom.xml

@@ -45,22 +45,6 @@
             <artifactId>easy-rules-mvel</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.citu</groupId>
-            <artifactId>citu-spring-boot-starter-biz-tenant</artifactId>
-        </dependency>
-
-        <!-- DB 相关 -->
-        <dependency>
-            <groupId>com.citu</groupId>
-            <artifactId>citu-spring-boot-starter-mybatis</artifactId>
-        </dependency>
-
-        <!-- RPC 远程调用相关 -->
-        <dependency>
-            <groupId>com.citu</groupId>
-            <artifactId>citu-spring-boot-starter-rpc</artifactId>
-        </dependency>
 
         <!-- Registry 注册中心相关 -->
         <dependency>
@@ -87,11 +71,6 @@
             <artifactId>citu-spring-boot-starter-monitor</artifactId>
         </dependency>
 
-        <!-- 工具类相关 -->
-        <dependency>
-            <groupId>com.citu</groupId>
-            <artifactId>citu-spring-boot-starter-excel</artifactId>
-        </dependency>
     </dependencies>
 
     <build>

menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/PointRuleConfigTest.java

@@ -13,6 +13,6 @@ public class PointRuleConfigTest {
     private Long id;
     private String url;
     private String triggerRuleJson;
-    private String limitRuleJson;
+    private String constraintRuleJson;
     private Long point;
 }

menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/controller/admin/user/UserPointController.java

@@ -0,0 +1,83 @@
+package com.citu.module.menduner.reward.controller.admin.user;
+
+import cn.hutool.core.collection.CollUtil;
+import com.citu.framework.common.pojo.CommonResult;
+import com.citu.framework.common.pojo.PageResult;
+import com.citu.module.menduner.reward.controller.base.user.UserPointPageReqVO;
+import com.citu.module.menduner.reward.controller.base.user.UserPointRespVO;
+import com.citu.module.menduner.reward.controller.base.user.UserPointUpdateReqVO;
+import com.citu.module.menduner.reward.convert.UserPointConvert;
+import com.citu.module.menduner.reward.dal.dataobject.user.UserPointDO;
+import com.citu.module.menduner.reward.service.record.PointRecordService;
+import com.citu.module.menduner.reward.service.user.UserPointService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import static com.citu.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - 用户积分")
+@RestController
+@RequestMapping("/menduner/reward/user-point")
+@Validated
+public class UserPointController {
+
+    @Resource
+    private UserPointService userService;
+
+    @Resource
+    private PointRecordService pointRecordService;
+
+    @PutMapping("/update")
+    @Operation(summary = "更新用户积分")
+    @PreAuthorize("@ss.hasPermission('menduner:reward:user-point:update')")
+    public CommonResult<Boolean> updateUser(@Valid @RequestBody UserPointUpdateReqVO updateReqVO) {
+        userService.updateUser(updateReqVO);
+        return success(true);
+    }
+
+
+    @PutMapping("/update-point")
+    @Operation(summary = "更新用户积分")
+    @PreAuthorize("@ss.hasPermission('menduner:reward:user-point:update')")
+    public CommonResult<Boolean> updateUserPoint(@Valid @RequestBody UserPointUpdateReqVO updateReqVO) {
+
+        return success(true);
+    }
+
+    @PutMapping("/update-balance")
+    @Operation(summary = "更新用户积分余额")
+    @PreAuthorize("@ss.hasPermission('menduner:reward:user-point:update')")
+    public CommonResult<Boolean> updateUserBalance(@Valid @RequestBody Long id) {
+        // todo @jason：增加一个【修改余额】
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得用户积分")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('menduner:reward:user-point:query')")
+    public CommonResult<UserPointRespVO> getUser(@RequestParam("id") Long id) {
+        UserPointDO user = userService.getUser(id);
+        return success(UserPointConvert.INSTANCE.convert2(user));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得用户积分分页")
+    @PreAuthorize("@ss.hasPermission('menduner:reward:user-point:query')")
+    public CommonResult<PageResult<UserPointRespVO>> getUserPage(@Valid UserPointPageReqVO pageVO) {
+        PageResult<UserPointDO> pageResult = userService.getUserPage(pageVO);
+        if (CollUtil.isEmpty(pageResult.getList())) {
+            return success(PageResult.empty());
+        }
+
+        return success(UserPointConvert.INSTANCE.convertPage(pageResult));
+    }
+
+}

menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/controller/base/signin/config/SignInConfigRespVO.java

@@ -13,8 +13,8 @@ import java.time.LocalDateTime;
 @ToString(callSuper = true)
 public class SignInConfigRespVO extends SignInConfigBaseVO {
 
-    @Schema(description = "自增主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "20937")
-    private Integer id;
+    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "20937")
+    private Long id;
 
     @Schema(description = "创建时间")
     private LocalDateTime createTime;

menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/controller/base/signin/config/SignInConfigUpdateReqVO.java

@@ -13,8 +13,8 @@ import javax.validation.constraints.NotNull;
 @ToString(callSuper = true)
 public class SignInConfigUpdateReqVO extends SignInConfigBaseVO {
 
-    @Schema(description = "规则自增主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "13653")
-    @NotNull(message = "规则自增主键不能为空")
+    @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "13653")
+    @NotNull(message = "id不能为空")
     private Long id;
 
 }

menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/controller/base/user/UserPointBaseVO.java

@@ -0,0 +1,21 @@
+package com.citu.module.menduner.reward.controller.base.user;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 用户积分 Base VO，提供给添加、修改、详细的子 VO 使用
+ * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
+ */
+@Data
+public class UserPointBaseVO {
+    
+    @Schema(description = "用户id", example = "1")
+    private Long userId;
+    
+    @Schema(description = "标签", example = "[1, 2]")
+    private List<Long> tagIds;
+
+}

menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/controller/base/user/UserPointPageReqVO.java

@@ -0,0 +1,29 @@
+package com.citu.module.menduner.reward.controller.base.user;
+
+import com.citu.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+import static com.citu.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 用户积分分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class UserPointPageReqVO extends PageParam {
+    
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "标签编号列表", example = "[1, 2]")
+    private List<Long> tagIds;
+    
+
+}

menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/controller/base/user/UserPointRespVO.java

@@ -0,0 +1,25 @@
+package com.citu.module.menduner.reward.controller.base.user;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Schema(description = "管理后台 - 用户积分 Response VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class UserPointRespVO extends UserPointBaseVO {
+
+    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "23788")
+    private Long id;
+    
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    private LocalDateTime createTime;
+
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+}

menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/controller/base/user/UserPointSaveReqVO.java

@@ -0,0 +1,20 @@
+package com.citu.module.menduner.reward.controller.base.user;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Schema(description = "管理后台 - 用户积分更新 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class UserPointSaveReqVO extends UserPointBaseVO {
+
+    @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "23788")
+    @NotNull(message = "编号不能为空")
+    private Long id;
+
+}

menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/controller/base/user/UserPointUpdateReqVO.java

@@ -0,0 +1,22 @@
+package com.citu.module.menduner.reward.controller.base.user;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Schema(description = "管理后台 - 用户修改积分 Request VO")
+@Data
+@ToString(callSuper = true)
+public class UserPointUpdateReqVO {
+
+    @Schema(description = "用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "23788")
+    @NotNull(message = "用户编号不能为空")
+    private Long userId;
+
+    @Schema(description = "变动积分，正数为增加，负数为减少", requiredMode = Schema.RequiredMode.REQUIRED, example = "100")
+    @NotNull(message = "变动积分不能为空")
+    private Integer point;
+
+}

menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/convert/UserPointConvert.java

@@ -0,0 +1,22 @@
+package com.citu.module.menduner.reward.convert;
+
+import com.citu.framework.common.pojo.PageResult;
+import com.citu.module.menduner.reward.controller.base.user.UserPointRespVO;
+import com.citu.module.menduner.reward.controller.base.user.UserPointUpdateReqVO;
+import com.citu.module.menduner.reward.dal.dataobject.user.UserPointDO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+@Mapper
+public interface UserPointConvert {
+
+    UserPointConvert INSTANCE = Mappers.getMapper(UserPointConvert.class);
+
+    UserPointDO convert(UserPointUpdateReqVO bean);
+
+    UserPointRespVO convert2(UserPointDO bean);
+
+    PageResult<UserPointRespVO> convertPage(PageResult<UserPointDO> page);
+
+
+}

menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/core/PointRule.java

@@ -20,7 +20,7 @@ public class PointRule extends RuleBase {
     /**
      * 限制规则
      **/
-    private String limitRule;
+    private String constraintRule;
 
     /**
      * 缓存触发规则参数内容
@@ -30,7 +30,7 @@ public class PointRule extends RuleBase {
     /**
      * 缓存限制规则参数内容
      **/
-    private Map<String, Object> limitContext;
+    private Map<String, Object> constraintContext;
     /**
      * 数学运算符
      */

menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/dal/dataobject/user/UserPointDO.java

@@ -0,0 +1,41 @@
+package com.citu.module.menduner.reward.dal.dataobject.user;
+
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.citu.framework.mybatis.core.type.LongListTypeHandler;
+import com.citu.framework.tenant.core.db.TenantBaseDO;
+import lombok.*;
+
+import java.util.List;
+
+@TableName(value = "mde_user_point", autoResultMap = true)
+@KeySequence("mde_user_point_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class UserPointDO extends TenantBaseDO {
+
+
+    @TableId
+    private Long id;
+
+    /**
+     * 用户id
+     */
+    private Long userId;
+
+    /**
+     * 积分
+     */
+    private Integer point;
+
+    /**
+     * 预留 标签列表，以逗号分隔
+     */
+    @TableField(typeHandler = LongListTypeHandler.class)
+    private List<Long> tagIds;
+}

menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/dal/mysql/user/UserPointMapper.java

@@ -0,0 +1,78 @@
+package com.citu.module.menduner.reward.dal.mysql.user;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.citu.framework.common.pojo.PageResult;
+import com.citu.framework.mybatis.core.mapper.BaseMapperX;
+import com.citu.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.citu.module.menduner.reward.controller.base.user.UserPointPageReqVO;
+import com.citu.module.menduner.reward.dal.dataobject.user.UserPointDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.stream.Collectors;
+
+/**
+ * 用户积分 Mapper
+ *
+ * @author Rayson
+ */
+@Mapper
+public interface UserPointMapper extends BaseMapperX<UserPointDO> {
+
+
+    default PageResult<UserPointDO> selectPage(UserPointPageReqVO reqVO) {
+        // 处理 tagIds 过滤条件
+        String tagIdSql = "";
+        if (CollUtil.isNotEmpty(reqVO.getTagIds())) {
+            tagIdSql = reqVO.getTagIds().stream()
+                    .map(tagId -> "FIND_IN_SET(" + tagId + ", tag_ids)")
+                    .collect(Collectors.joining(" OR "));
+        }
+        // 分页查询
+        return selectPage(reqVO, new LambdaQueryWrapperX<UserPointDO>()
+                .betweenIfPresent(UserPointDO::getCreateTime, reqVO.getCreateTime())
+                .apply(StrUtil.isNotEmpty(tagIdSql), tagIdSql)
+                .orderByDesc(UserPointDO::getId));
+    }
+
+    default UserPointDO selectByUserId(Long userId) {
+        return selectOne(new LambdaQueryWrapperX<UserPointDO>().eq(UserPointDO::getUserId, userId));
+    }
+
+
+    default Long selectCountByTagId(Long tagId) {
+        return selectCount(new LambdaQueryWrapperX<UserPointDO>()
+                .apply("FIND_IN_SET({0}, tag_ids)", tagId));
+    }
+
+    /**
+     * 更新用户积分（增加）
+     *
+     * @param id        用户编号
+     * @param incrCount 增加积分（正数）
+     */
+    default void updatePointIncr(Long id, Integer incrCount) {
+        Assert.isTrue(incrCount > 0);
+        LambdaUpdateWrapper<UserPointDO> lambdaUpdateWrapper = new LambdaUpdateWrapper<UserPointDO>()
+                .setSql(" point = point + " + incrCount)
+                .eq(UserPointDO::getUserId, id);
+        update(null, lambdaUpdateWrapper);
+    }
+
+    /**
+     * 更新用户积分（减少）
+     *
+     * @param id        用户编号
+     * @param incrCount 增加积分（负数）
+     * @return 更新行数
+     */
+    default int updatePointDecr(Long id, Integer incrCount) {
+        Assert.isTrue(incrCount < 0);
+        LambdaUpdateWrapper<UserPointDO> lambdaUpdateWrapper = new LambdaUpdateWrapper<UserPointDO>()
+                .setSql(" point = point + " + incrCount) // 负数，所以使用 + 号
+                .eq(UserPointDO::getUserId, id);
+        return update(null, lambdaUpdateWrapper);
+    }
+}

menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/rule/DynamicPointRule.java

@@ -45,20 +45,20 @@ public class DynamicPointRule {
             return false;
         }
         // 获取限制条件表达式
-        String limitExpression = fact.getLimitRule();
+        String constraintExpression = fact.getConstraintRule();
 
         // 如果限制条件为空，则直接返回 true
-        if (StringUtils.hasText(limitExpression)) {
+        if (StringUtils.hasText(constraintExpression)) {
             log.warn("when 限制条件为空, 不做效验");
             return true;
         }
-        log.warn("when 限制规则 {} , context {}", limitExpression, fact.getLimitContext());
+        log.warn("when 限制规则 {} , context {}", constraintExpression, fact.getConstraintContext());
         // 解析限制条件表达式
         // 这里你可以根据实际情况添加上下文参数
         // num <=1
 
         // 返回限制条件表达式的结果
-        return expression(limitExpression, fact.getLimitContext());
+        return expression(constraintExpression, fact.getConstraintContext());
     }
 
     /**

menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/rule/DynamicRule.java

@@ -47,24 +47,24 @@ public class DynamicRule {
             return false;
         }
         // 获取限制条件表达式
-        String limitExpression = ruleConfig.getLimitRuleJson();
+        String constraintExpression = ruleConfig.getConstraintRuleJson();
 
         // 如果限制条件为空，则直接返回 true
-        if (limitExpression == null || limitExpression.isEmpty()) {
+        if (constraintExpression == null || constraintExpression.isEmpty()) {
             log.info("when 限制条件为空, 不做效验");
             return true;
         }
 
         context = new HashMap<>();
         context.put("num", "1"); // 从 Redis 中获取年龄
-        log.info("when 限制规则 {} , context {}", limitExpression, context);
+        log.info("when 限制规则 {} , context {}", constraintExpression, context);
         // 解析限制条件表达式
         // 这里你可以根据实际情况添加上下文参数
         // num <=1
-        boolean limitResult = expression(limitExpression, context);
+        boolean constraintResult = expression(constraintExpression, context);
 
         // 返回限制条件表达式的结果
-        return limitResult;
+        return constraintResult;
     }
 
 //    @Action

menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/service/event/EventTrackServiceImpl.java

@@ -1,5 +1,7 @@
 package com.citu.module.menduner.reward.service.event;
 
+import com.citu.framework.security.core.LoginUser;
+import com.citu.module.menduner.common.util.LoginUserContext;
 import com.citu.module.menduner.reward.controller.base.common.TreeRespVO;
 import com.citu.module.menduner.reward.controller.base.event.EventTrackPointRespVO;
 import com.citu.module.menduner.reward.controller.base.event.EventTrackUrlRespVO;
@@ -41,6 +43,38 @@ public class EventTrackServiceImpl implements EventTrackService {
     @Resource
     private MendunerSystemUrlApi mendunerSystemUrlApi;
 
+    public static List<TreeRespVO<List<TreeRespVO<List<UrlInfoRespVO>>>>> convertUrlInfoListToTree(List<UrlInfoRespVO> urlInfoList) {
+        // 首先按client分组，然后在每个client分组内部按module分组
+        Map<String, Map<String, List<UrlInfoRespVO>>> groupedByClientAndModule = urlInfoList.stream()
+                .collect(Collectors.groupingBy(
+                        UrlInfoRespVO::getClient, // 先按client分组
+                        Collectors.groupingBy(UrlInfoRespVO::getModule) // 再按module分组
+                ));
+
+        List<TreeRespVO<List<TreeRespVO<List<UrlInfoRespVO>>>>> tree = new ArrayList<>();
+        for (Map.Entry<String, Map<String, List<UrlInfoRespVO>>> clientEntry : groupedByClientAndModule.entrySet()) {
+            // 创建client节点
+            String clientName = clientEntry.getKey();
+            List<TreeRespVO<List<UrlInfoRespVO>>> modules = new ArrayList<>();
+
+            for (Map.Entry<String, List<UrlInfoRespVO>> moduleEntry : clientEntry.getValue().entrySet()) {
+                // 创建module节点
+                String moduleName = moduleEntry.getKey();
+                List<UrlInfoRespVO> urls = moduleEntry.getValue();
+                TreeRespVO<List<UrlInfoRespVO>> moduleTree = new TreeRespVO<>(moduleName, urls);
+
+                // 将module节点添加到client的children列表中
+                modules.add(moduleTree);
+            }
+
+            // 创建client的TreeRespVO并添加到最终的树形列表中
+            TreeRespVO<List<TreeRespVO<List<UrlInfoRespVO>>>> clientTree = new TreeRespVO<>(clientName, modules);
+            tree.add(clientTree);
+        }
+
+        return tree;
+    }
+
     @Override
     public List<EventTrackUrlRespVO> getEventTrackList() {
         List<PointRuleConfigDO> list = ruleConfigService.getList();
@@ -55,16 +89,17 @@ public class EventTrackServiceImpl implements EventTrackService {
             return null;
         }
 
-        // redis 解析出当前操作用户的参数
-
-        List<String> triggerKeyList = EasyRulesEngine.extractUniqueKeys(config.getConstraintRule());
+        //  解析出当前规则的参数
+        List<String> triggerKeyList = EasyRulesEngine.extractUniqueKeys(config.getTriggerRule());
 
         // 读取对应数据
         // 赋值到 context
 
+        // 用户信息
+        LoginUser loginUser = LoginUserContext.get2();
 
 
-        PointRule pointRule= new PointRule();
+        PointRule pointRule = new PointRule();
         // 基本信息
         pointRule.setRuleId(String.valueOf(config.getId()));
         pointRule.setRuleName(config.getUrl());
@@ -74,9 +109,9 @@ public class EventTrackServiceImpl implements EventTrackService {
 
         // 构造参数
         pointRule.setTriggerRule(EasyRulesEngine.buildWhenExpression(config.getTriggerRule()));
-        pointRule.setLimitRule(EasyRulesEngine.buildThenExpression());
+        pointRule.setConstraintRule(EasyRulesEngine.buildThenExpression());
         pointRule.setTriggerContext(null);
-        pointRule.setLimitContext(null);
+        pointRule.setConstraintContext(null);
         pointRule.setOperation(config.getOperation());
         pointRule.setPoint(config.getPoint());
 
@@ -95,8 +130,8 @@ public class EventTrackServiceImpl implements EventTrackService {
 
         // 调用
         EasyRulesEngine.match(RuleMatch.builder()
-                        .facts(context)
-                        .ruleBase(pointRule)
+                .facts(context)
+                .ruleBase(pointRule)
                 .build());
 
         return null;
@@ -108,36 +143,4 @@ public class EventTrackServiceImpl implements EventTrackService {
         return convertUrlInfoListToTree(list);
     }
 
-    public static List<TreeRespVO<List<TreeRespVO<List<UrlInfoRespVO>>>>> convertUrlInfoListToTree(List<UrlInfoRespVO> urlInfoList) {
-        // 首先按client分组，然后在每个client分组内部按module分组
-        Map<String, Map<String, List<UrlInfoRespVO>>> groupedByClientAndModule = urlInfoList.stream()
-                .collect(Collectors.groupingBy(
-                        UrlInfoRespVO::getClient, // 先按client分组
-                        Collectors.groupingBy(UrlInfoRespVO::getModule) // 再按module分组
-                ));
-
-        List<TreeRespVO<List<TreeRespVO<List<UrlInfoRespVO>>>>> tree = new ArrayList<>();
-        for (Map.Entry<String, Map<String, List<UrlInfoRespVO>>> clientEntry : groupedByClientAndModule.entrySet()) {
-            // 创建client节点
-            String clientName = clientEntry.getKey();
-            List<TreeRespVO<List<UrlInfoRespVO>>> modules = new ArrayList<>();
-
-            for (Map.Entry<String, List<UrlInfoRespVO>> moduleEntry : clientEntry.getValue().entrySet()) {
-                // 创建module节点
-                String moduleName = moduleEntry.getKey();
-                List<UrlInfoRespVO> urls = moduleEntry.getValue();
-                TreeRespVO<List<UrlInfoRespVO>> moduleTree = new TreeRespVO<>(moduleName, urls);
-
-                // 将module节点添加到client的children列表中
-                modules.add(moduleTree);
-            }
-
-            // 创建client的TreeRespVO并添加到最终的树形列表中
-            TreeRespVO<List<TreeRespVO<List<UrlInfoRespVO>>>> clientTree = new TreeRespVO<>(clientName, modules);
-            tree.add(clientTree);
-        }
-
-        return tree;
-    }
-
 }

menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/service/record/PointRecordServiceImpl.java

@@ -1,7 +1,5 @@
 package com.citu.module.menduner.reward.service.record;
 
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.StrUtil;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.module.menduner.reward.controller.base.record.PointRecordPageReqVO;
@@ -14,8 +12,6 @@ import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 
-import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
-
 
 /**
  * 积分记录 Service 实现类

menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/service/signin/SignInRecordService.java

@@ -22,7 +22,7 @@ public interface SignInRecordService {
     PageResult<SignInRecordDO> getSignInRecordPage(SignInRecordPageReqVO pageReqVO);
 
     /**
-     * 【会员】获得签到记录分页
+     * 获得签到记录分页
      *
      * @param userId    用户编号
      * @param pageParam 分页查询

menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/service/user/UserPointService.java

@@ -0,0 +1,76 @@
+package com.citu.module.menduner.reward.service.user;
+
+import com.citu.framework.common.pojo.PageResult;
+import com.citu.module.menduner.reward.controller.base.user.UserPointPageReqVO;
+import com.citu.module.menduner.reward.controller.base.user.UserPointUpdateReqVO;
+import com.citu.module.menduner.reward.dal.dataobject.user.UserPointDO;
+
+import javax.validation.Valid;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 用户积分 Service 接口
+ *
+ * @author Rayson
+ */
+public interface UserPointService {
+
+    /**
+     * 通过用户 ID 查询用户
+     *
+     * @param id 用户ID
+     * @return 用户对象信息
+     */
+    UserPointDO getUser(Long id);
+
+    /**
+     * 通过用户 编号 查询用户
+     *
+     * @param userId 用户 编号
+     * @return 用户对象信息
+     */
+    UserPointDO getPointByUserId(Long userId);
+
+    /**
+     * 通过用户 ID 查询用户们
+     *
+     * @param ids 用户 ID
+     * @return 用户对象信息数组
+     */
+    List<UserPointDO> getUserList(Collection<Long> ids);
+
+    /**
+     * 更新用户积分
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateUser(@Valid UserPointUpdateReqVO updateReqVO);
+
+    /**
+     * 获得用户积分分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 用户积分分页
+     */
+    PageResult<UserPointDO> getUserPage(UserPointPageReqVO pageReqVO);
+
+
+    /**
+     * 获得指定标签下的用户数量
+     *
+     * @param tagId 用户标签编号
+     * @return 用户数量
+     */
+    Long getUserCountByTagId(Long tagId);
+
+    /**
+     * 更新用户的积分
+     *
+     * @param userId 用户编号
+     * @param point  积分数量
+     * @return 更新结果
+     */
+    boolean updateUserPoint(Long userId, Integer point);
+
+}

menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/service/user/UserPointServiceImpl.java

@@ -0,0 +1,91 @@
+package com.citu.module.menduner.reward.service.user;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.ListUtil;
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
+import com.citu.framework.common.pojo.PageResult;
+import com.citu.module.menduner.reward.controller.base.user.UserPointPageReqVO;
+import com.citu.module.menduner.reward.controller.base.user.UserPointUpdateReqVO;
+import com.citu.module.menduner.reward.convert.UserPointConvert;
+import com.citu.module.menduner.reward.dal.dataobject.user.UserPointDO;
+import com.citu.module.menduner.reward.dal.mysql.user.UserPointMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.Collection;
+import java.util.List;
+
+import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.citu.module.menduner.reward.enums.ErrorCodeConstants.USER_NOT_EXISTS;
+
+/**
+ * 用户积分 Service 实现类
+ *
+ * @author Rayson
+ */
+@Service
+@Valid
+@Slf4j
+public class UserPointServiceImpl implements UserPointService {
+
+    @Resource
+    private UserPointMapper userPointMapper;
+
+
+    @Override
+    public UserPointDO getUser(Long id) {
+        return userPointMapper.selectById(id);
+    }
+
+    @Override
+    public UserPointDO getPointByUserId(Long userId) {
+        return userPointMapper.selectByUserId(userId);
+    }
+
+    @Override
+    public List<UserPointDO> getUserList(Collection<Long> ids) {
+        if (CollUtil.isEmpty(ids)) {
+            return ListUtil.empty();
+        }
+        return userPointMapper.selectBatchIds(ids);
+    }
+
+
+    @Override
+    @DSTransactional
+    public void updateUser(UserPointUpdateReqVO updateReqVO) {
+        // 校验存在
+        UserPointDO user = userPointMapper.selectById(updateReqVO.getUserId());
+        if (null == user) {
+            throw exception(USER_NOT_EXISTS);
+        }
+        // 更新
+        UserPointDO updateObj = UserPointConvert.INSTANCE.convert(updateReqVO);
+        userPointMapper.updateById(updateObj);
+    }
+
+
+    @Override
+    public PageResult<UserPointDO> getUserPage(UserPointPageReqVO pageReqVO) {
+        return userPointMapper.selectPage(pageReqVO);
+    }
+
+
+    @Override
+    public Long getUserCountByTagId(Long tagId) {
+        return userPointMapper.selectCountByTagId(tagId);
+    }
+
+    @Override
+    public boolean updateUserPoint(Long id, Integer point) {
+        if (point > 0) {
+            userPointMapper.updatePointIncr(id, point);
+        } else if (point < 0) {
+            return userPointMapper.updatePointDecr(id, point) > 0;
+        }
+        return true;
+    }
+
+}

menduner/menduner-reward-biz/src/main/resources/i18n/messages_en_US.properties

@@ -26,13 +26,16 @@
 1_110_001_005=Mathematical operator cannot be empty
 1_110_001_006=The number of points cannot be empty
 1_110_001_007=Trigger rule cannot be empty
-#========== 积分记录 1_110_002_000 ==========
+# ========== 积分记录 1_110_002_000 ==========
 1_110_002_001=User point record business type not supported
-#========== 签到配置 1_110_003_000 ==========
+# ========== 签到配置 1_110_003_000 ==========
 1_110_003_001=The check-in day rule does not exist
 1_110_003_002=The check-in day rule already exists
 1_110_003_003=Check in days cannot be empty
 1_110_003_004=Reward points cannot be empty
 1_110_003_005=Reward points cannot be less than 0
-#========== 签到配置 1_110_004_000 ==========
-1_110_004_001=Checked in today, please do not sign in again
+# ========== 签到记录 1_110_004_000 ==========
+1_110_004_001=Checked in today, please do not sign in again
+# ========== 用户相关  1_110_005_000 ============
+1_110_005_001=User does not exist
+1_110_005_002=Insufficient user points balance

menduner/menduner-reward-biz/src/main/resources/i18n/messages_zh_CN.properties

@@ -29,11 +29,14 @@
 1_110_001_008=状态不能为空
 #========== 积分记录 1_110_002_000 ==========
 1_110_002_001=用户积分记录业务类型不支持
-#========== 签到配置 1_110_003_000 ==========
+# ========== 签到配置 1_110_003_000 ==========
 1_110_003_001=签到天数规则不存在
 1_110_003_002=签到天数规则已存在
 1_110_003_003=签到天数不能为空
 1_110_003_004=奖励积分不能为空
 1_110_003_005=奖励积分不能小于 0
-#========== 签到配置 1_110_004_000 ==========
+# ========== 签到记录 1_110_004_000 ==========
 1_110_004_001=今日已签到，请勿重复签到
+# ========== 用户相关  1_110_005_000 ============
+1_110_005_001=用户不存在
+1_110_005_002=用户积分余额不足

menduner/menduner-system-biz/pom.xml

@@ -24,11 +24,6 @@
             <artifactId>spring-cloud-starter-bootstrap</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.citu</groupId>
-            <artifactId>citu-spring-boot-starter-env</artifactId>
-        </dependency>
-
         <!-- 依赖服务 -->
         <dependency>
             <groupId>com.citu</groupId>
@@ -36,51 +31,11 @@
             <version>${revision}</version>
         </dependency>
 
-        <!-- 业务组件 -->
-        <dependency>
-            <groupId>com.citu</groupId>
-            <artifactId>citu-spring-boot-starter-biz-data-permission</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.citu</groupId>
-            <artifactId>citu-spring-boot-starter-biz-tenant</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.citu</groupId>
-            <artifactId>citu-spring-boot-starter-es</artifactId>
-            <version>${revision}</version>
-        </dependency>
-
         <dependency>
             <groupId>com.xingyuv</groupId>
             <artifactId>spring-boot-starter-captcha-plus</artifactId> <!-- 验证码，一般用于登录使用 -->
         </dependency>
 
-        <dependency>
-            <groupId>com.citu</groupId>
-            <artifactId>citu-spring-boot-starter-mq</artifactId>
-        </dependency>
-
-        <!-- Web 相关 -->
-        <dependency>
-            <groupId>com.citu</groupId>
-            <artifactId>citu-spring-boot-starter-security</artifactId>
-        </dependency>
-
-        <!-- DB 相关 -->
-        <dependency>
-            <groupId>com.citu</groupId>
-            <artifactId>citu-spring-boot-starter-mybatis</artifactId>
-        </dependency>
-
-        <!-- RPC 远程调用相关 -->
-        <dependency>
-            <groupId>com.citu</groupId>
-            <artifactId>citu-spring-boot-starter-rpc</artifactId>
-        </dependency>
-
         <!-- Registry 注册中心相关 -->
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
@@ -100,23 +55,6 @@
             <scope>test</scope>
         </dependency>
 
-        <!-- 监控相关 -->
-        <dependency>
-            <groupId>com.citu</groupId>
-            <artifactId>citu-spring-boot-starter-monitor</artifactId>
-        </dependency>
-
-        <!-- 工具类相关 -->
-        <dependency>
-            <groupId>com.citu</groupId>
-            <artifactId>citu-spring-boot-starter-excel</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-
     </dependencies>
 
     <build>

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/config/permission/CustomDataPermissionRule.java

@@ -14,7 +14,7 @@ import com.citu.framework.mybatis.core.util.MyBatisUtils;
 import com.citu.framework.security.core.LoginUser;
 import com.citu.framework.security.core.util.SecurityFrameworkUtils;
 import com.citu.module.menduner.system.api.permission.MendunerPermissionApi;
-import com.citu.module.menduner.system.util.LoginUserContext;
+import com.citu.module.menduner.common.util.LoginUserContext;
 import com.citu.module.system.api.permission.dto.DataPermissionRespDTO;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -29,7 +29,7 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import static com.citu.module.menduner.system.util.LoginUserContext.checkEnterprise;
+import static com.citu.module.menduner.common.util.LoginUserContext.checkEnterprise;
 
 /**
  * @author Rayson

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/auth/AppMdeAuthController.java

@@ -8,7 +8,7 @@ import com.citu.framework.security.core.util.SecurityFrameworkUtils;
 import com.citu.module.menduner.system.controller.app.auth.vo.*;
 import com.citu.module.menduner.system.convert.MdeAuthConvert;
 import com.citu.module.menduner.system.service.auth.MdeAuthService;
-import com.citu.module.menduner.system.util.LoginUserContext;
+import com.citu.module.menduner.common.util.LoginUserContext;
 import com.citu.module.system.api.social.SocialClientApi;
 import com.citu.module.system.api.social.dto.SocialWxJsapiSignatureRespDTO;
 import io.swagger.v3.oas.annotations.Operation;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/user/AppMdeUserController.java

@@ -7,7 +7,7 @@ import com.citu.framework.security.core.annotations.PreAuthenticated;
 import com.citu.module.menduner.system.controller.app.user.vo.*;
 import com.citu.module.menduner.system.dal.dataobject.user.MdeUserDO;
 import com.citu.module.menduner.system.service.user.MdeUserService;
-import com.citu.module.menduner.system.util.LoginUserContext;
+import com.citu.module.menduner.common.util.LoginUserContext;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/mysql/enterprise/EnterpriseUserBindMapper.java

@@ -50,7 +50,6 @@ public interface EnterpriseUserBindMapper extends BaseMapperX<EnterpriseUserBind
         return selectOne(new LambdaQueryWrapperX<EnterpriseUserBindDO>()
                 .eqIfPresent(EnterpriseUserBindDO::getEnterpriseId, enterpriseId)
                 .eqIfPresent(EnterpriseUserBindDO::getUserId, userId)
-                .eqIfPresent(EnterpriseUserBindDO::getStatus, MendunerStatusEnum.ENABLE.getStatus())
         );
     }
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/auth/MdeEnterpriseAuthServiceImpl.java

@@ -20,7 +20,7 @@ import com.citu.module.menduner.system.dal.dataobject.user.MdeUserDO;
 import com.citu.module.menduner.system.enums.MendunerStatusEnum;
 import com.citu.module.menduner.system.service.enterprise.bind.EnterpriseUserBindService;
 import com.citu.module.menduner.system.service.user.MdeUserService;
-import com.citu.module.menduner.system.util.LoginUserContext;
+import com.citu.module.menduner.common.util.LoginUserContext;
 import com.citu.module.system.api.logger.LoginLogApi;
 import com.citu.module.system.api.logger.dto.LoginLogCreateReqDTO;
 import com.citu.module.system.api.oauth2.OAuth2TokenApi;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/cvattachment/CvAttachmentServiceImpl.java

@@ -8,7 +8,7 @@ import com.citu.module.menduner.system.controller.base.cvattachment.CvAttachment
 import com.citu.module.menduner.system.controller.base.cvattachment.CvAttachmentSaveReqVO;
 import com.citu.module.menduner.system.dal.dataobject.cvattachment.CvAttachmentDO;
 import com.citu.module.menduner.system.dal.mysql.cvattachment.CvAttachmentMapper;
-import com.citu.module.menduner.system.util.LoginUserContext;
+import com.citu.module.menduner.common.util.LoginUserContext;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/eduexp/EduExpServiceImpl.java

@@ -8,7 +8,7 @@ import com.citu.module.menduner.system.controller.base.eduexp.EduExpPageReqVO;
 import com.citu.module.menduner.system.controller.base.eduexp.EduExpSaveReqVO;
 import com.citu.module.menduner.system.dal.dataobject.eduexp.EduExpDO;
 import com.citu.module.menduner.system.dal.mysql.eduexp.EduExpMapper;
-import com.citu.module.menduner.system.util.LoginUserContext;
+import com.citu.module.menduner.common.util.LoginUserContext;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/EnterpriseServiceImpl.java

@@ -28,7 +28,7 @@ import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseMapper;
 import com.citu.module.menduner.system.dal.redis.RedisKeyConstants;
 import com.citu.module.menduner.system.enums.visits.MdeVisitsEnum;
 import com.citu.module.menduner.system.mq.producer.MdeVisitsProducer;
-import com.citu.module.menduner.system.util.LoginUserContext;
+import com.citu.module.menduner.common.util.LoginUserContext;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/bind/EnterpriseUserBindServiceImpl.java

@@ -22,7 +22,7 @@ import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseUserBindMa
 import com.citu.module.menduner.system.enums.MendunerStatusEnum;
 import com.citu.module.menduner.system.service.enterprise.post.EnterprisePostService;
 import com.citu.module.menduner.system.service.user.MdeUserService;
-import com.citu.module.menduner.system.util.LoginUserContext;
+import com.citu.module.menduner.common.util.LoginUserContext;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
@@ -34,7 +34,7 @@ import java.util.List;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.citu.module.menduner.system.enums.ErrorCodeConstants.*;
-import static com.citu.module.menduner.system.util.LoginUserContext.checkUserTypeIsAdmin;
+import static com.citu.module.menduner.common.util.LoginUserContext.checkUserTypeIsAdmin;
 
 /**
  * 企业登录用户 Service 实现类

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/business/EnterpriseBusinessServiceImpl.java

@@ -5,15 +5,12 @@ import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.common.util.object.BeanUtils;
 import com.citu.module.menduner.system.controller.appadmin.enterprise.vo.AppAdminEnterpriseBusinessRespVO;
 import com.citu.module.menduner.system.controller.appadmin.enterprise.vo.AppAdminEnterpriseBusinessSaveReqVO;
-import com.citu.module.menduner.system.controller.appadmin.enterprise.vo.AppAdminEnterpriseRespVO;
-import com.citu.module.menduner.system.controller.appadmin.enterprise.vo.AppAdminEnterpriseSaveReqVO;
 import com.citu.module.menduner.system.controller.base.enterprise.business.EnterpriseBusinessPageReqVO;
 import com.citu.module.menduner.system.controller.base.enterprise.business.EnterpriseBusinessSaveReqVO;
 import com.citu.module.menduner.system.convert.EnterpriseConvert;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseBusinessDO;
-import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseDO;
 import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseBusinessMapper;
-import com.citu.module.menduner.system.util.LoginUserContext;
+import com.citu.module.menduner.common.util.LoginUserContext;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
@@ -21,7 +18,6 @@ import javax.annotation.Resource;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_ENTERPRISE_BUSINESS_NOT_EXISTS;
-import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_ENTERPRISE_NOT_EXISTS;
 
 /**
  * 企业工商信息 Service 实现类

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/post/EnterprisePostServiceImpl.java

@@ -13,7 +13,7 @@ import com.citu.module.menduner.system.convert.EnterpriseConvert;
 import com.citu.module.menduner.system.convert.EnterprisePostConvert;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterprisePostDO;
 import com.citu.module.menduner.system.dal.mysql.enterprise.EnterprisePostMapper;
-import com.citu.module.menduner.system.util.LoginUserContext;
+import com.citu.module.menduner.common.util.LoginUserContext;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/register/EnterpriseRegisterServiceImpl.java

@@ -23,7 +23,7 @@ import com.citu.module.menduner.system.enums.enterprise.EnterpriseRegisterAuditS
 import com.citu.module.menduner.system.enums.enterprise.EnterpriseUserTypeEnum;
 import com.citu.module.menduner.system.enums.permission.MdeDefaultRoleEnum;
 import com.citu.module.menduner.system.service.permission.MdePermissionService;
-import com.citu.module.menduner.system.util.LoginUserContext;
+import com.citu.module.menduner.common.util.LoginUserContext;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/user/EnterpriseUserApplyServiceImpl.java

@@ -19,7 +19,7 @@ import com.citu.module.menduner.system.enums.enterprise.EnterpriseUserTypeEnum;
 import com.citu.module.menduner.system.enums.permission.MdeDefaultRoleEnum;
 import com.citu.module.menduner.system.service.enterprise.EnterpriseUserApplyService;
 import com.citu.module.menduner.system.service.permission.MdePermissionService;
-import com.citu.module.menduner.system.util.LoginUserContext;
+import com.citu.module.menduner.common.util.LoginUserContext;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/job/JobAdvertisedServiceImpl.java

@@ -26,7 +26,7 @@ import com.citu.module.menduner.system.mq.producer.ESProducer;
 import com.citu.module.menduner.system.service.enterprise.EnterpriseService;
 import com.citu.module.menduner.system.service.enterprise.bind.EnterpriseUserBindService;
 import com.citu.module.menduner.system.util.ESOperateEnum;
-import com.citu.module.menduner.system.util.LoginUserContext;
+import com.citu.module.menduner.common.util.LoginUserContext;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -42,7 +42,6 @@ import java.util.stream.Collectors;
 
 import static com.citu.framework.common.exception.enums.GlobalErrorCodeConstants.FORBIDDEN;
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.citu.framework.security.core.LoginUser.INFO_KEY_DATA_ID;
 import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_JOB_ADVERTISED_NOT_EXISTS;
 
 /**

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/job/JobCvRelServiceImpl.java

@@ -12,7 +12,7 @@ import com.citu.module.menduner.system.dal.mysql.job.JobAdvertisedMapper;
 import com.citu.module.menduner.system.dal.mysql.job.JobCvRelMapper;
 import com.citu.module.menduner.system.enums.MendunerStatusEnum;
 import com.citu.module.menduner.system.enums.cv.JobCvRelStatusEnum;
-import com.citu.module.menduner.system.util.LoginUserContext;
+import com.citu.module.menduner.common.util.LoginUserContext;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/job/JobIntegrationServiceImpl.java

@@ -24,13 +24,12 @@ import com.citu.module.menduner.system.dal.es.job.ESJobAdvertisedMergeDO;
 import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseMapper;
 import com.citu.module.menduner.system.dal.mysql.job.JobAdvertisedMapper;
 import com.citu.module.menduner.system.dal.mysql.job.JobCvRelMapper;
-import com.citu.module.menduner.system.dal.mysql.person.PersonInfoMapper;
 import com.citu.module.menduner.system.service.area.AreaService;
 import com.citu.module.menduner.system.service.enterprise.bind.EnterpriseUserBindService;
 import com.citu.module.menduner.system.service.person.favorite.PersonJobFavoriteService;
 import com.citu.module.menduner.system.service.person.subscribe.PersonEnterpriseSubscribeService;
 import com.citu.module.menduner.system.util.ESQueryBuildUtils;
-import com.citu.module.menduner.system.util.LoginUserContext;
+import com.citu.module.menduner.common.util.LoginUserContext;
 import lombok.extern.slf4j.Slf4j;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/job/JobInterestedServiceImpl.java

@@ -8,7 +8,7 @@ import com.citu.module.menduner.system.controller.base.job.JobInterestedPageReqV
 import com.citu.module.menduner.system.controller.base.job.JobInterestedSaveReqVO;
 import com.citu.module.menduner.system.dal.dataobject.job.JobInterestedDO;
 import com.citu.module.menduner.system.dal.mysql.job.JobInterestedMapper;
-import com.citu.module.menduner.system.util.LoginUserContext;
+import com.citu.module.menduner.common.util.LoginUserContext;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/person/favorite/PersonJobFavoriteServiceImpl.java

@@ -8,7 +8,7 @@ import com.citu.module.menduner.system.controller.base.person.favorite.PersonJob
 import com.citu.module.menduner.system.controller.base.person.favorite.PersonJobFavoriteSaveReqVO;
 import com.citu.module.menduner.system.dal.dataobject.person.PersonJobFavoriteDO;
 import com.citu.module.menduner.system.dal.mysql.person.PersonJobFavoriteMapper;
-import com.citu.module.menduner.system.util.LoginUserContext;
+import com.citu.module.menduner.common.util.LoginUserContext;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/person/info/PersonInfoServiceImpl.java

@@ -9,7 +9,7 @@ import com.citu.module.menduner.system.controller.base.person.info.PersonInfoPag
 import com.citu.module.menduner.system.controller.base.person.info.PersonInfoSaveReqVO;
 import com.citu.module.menduner.system.dal.dataobject.person.PersonInfoDO;
 import com.citu.module.menduner.system.dal.mysql.person.PersonInfoMapper;
-import com.citu.module.menduner.system.util.LoginUserContext;
+import com.citu.module.menduner.common.util.LoginUserContext;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/person/skill/PersonSkillServiceImpl.java

@@ -8,7 +8,7 @@ import com.citu.module.menduner.system.controller.base.person.skill.PersonSkillP
 import com.citu.module.menduner.system.controller.base.person.skill.PersonSkillSaveReqVO;
 import com.citu.module.menduner.system.dal.dataobject.person.PersonSkillDO;
 import com.citu.module.menduner.system.dal.mysql.person.PersonSkillMapper;
-import com.citu.module.menduner.system.util.LoginUserContext;
+import com.citu.module.menduner.common.util.LoginUserContext;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/person/subscribe/PersonEnterpriseSubscribeServiceImpl.java

@@ -8,7 +8,7 @@ import com.citu.module.menduner.system.controller.base.person.subscribe.PersonEn
 import com.citu.module.menduner.system.controller.base.person.subscribe.PersonEnterpriseSubscribeSaveReqVO;
 import com.citu.module.menduner.system.dal.dataobject.person.PersonEnterpriseSubscribeDO;
 import com.citu.module.menduner.system.dal.mysql.person.PersonEnterpriseSubscribeMapper;
-import com.citu.module.menduner.system.util.LoginUserContext;
+import com.citu.module.menduner.common.util.LoginUserContext;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/position/PositionServiceImpl.java

@@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.common.util.object.BeanUtils;
-import com.citu.framework.security.core.LoginUser;
 import com.citu.module.menduner.system.controller.app.position.vo.AppPositionChildrenRespVO;
 import com.citu.module.menduner.system.controller.app.position.vo.AppPositionClickReqVO;
 import com.citu.module.menduner.system.controller.app.position.vo.AppPositionListReqVO;
@@ -20,7 +19,7 @@ import com.citu.module.menduner.system.dal.redis.RedisKeyConstants;
 import com.citu.module.menduner.system.enums.visits.MdeVisitsEnum;
 import com.citu.module.menduner.system.mq.producer.MdeVisitsProducer;
 import com.citu.module.menduner.system.service.visits.MdeVisitsService;
-import com.citu.module.menduner.system.util.LoginUserContext;
+import com.citu.module.menduner.common.util.LoginUserContext;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/projectexp/ProjectExpServiceImpl.java

@@ -8,7 +8,7 @@ import com.citu.module.menduner.system.controller.base.projectexp.ProjectExpPage
 import com.citu.module.menduner.system.controller.base.projectexp.ProjectExpSaveReqVO;
 import com.citu.module.menduner.system.dal.dataobject.projectexp.ProjectExpDO;
 import com.citu.module.menduner.system.dal.mysql.projectexp.ProjectExpMapper;
-import com.citu.module.menduner.system.util.LoginUserContext;
+import com.citu.module.menduner.common.util.LoginUserContext;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/trainexp/TrainExpServiceImpl.java

@@ -8,7 +8,7 @@ import com.citu.module.menduner.system.controller.base.trainexp.TrainExpPageReqV
 import com.citu.module.menduner.system.controller.base.trainexp.TrainExpSaveReqVO;
 import com.citu.module.menduner.system.dal.dataobject.trainexp.TrainExpDO;
 import com.citu.module.menduner.system.dal.mysql.trainexp.TrainExpMapper;
-import com.citu.module.menduner.system.util.LoginUserContext;
+import com.citu.module.menduner.common.util.LoginUserContext;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/visits/MdeVisitsServiceImpl.java

@@ -9,7 +9,7 @@ import com.citu.module.menduner.system.controller.base.visits.MdeVisitsSaveReqVO
 import com.citu.module.menduner.system.dal.dataobject.visits.MdeVisitsDO;
 import com.citu.module.menduner.system.dal.mysql.visits.MdeVisitsMapper;
 import com.citu.module.menduner.system.mq.message.MdeVisitsSendMessage;
-import com.citu.module.menduner.system.util.LoginUserContext;
+import com.citu.module.menduner.common.util.LoginUserContext;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -19,7 +19,6 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.citu.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_VISITS_NOT_EXISTS;
 
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/workexp/WorkExpServiceImpl.java

@@ -8,7 +8,7 @@ import com.citu.module.menduner.system.controller.base.workexp.WorkExpPageReqVO;
 import com.citu.module.menduner.system.controller.base.workexp.WorkExpSaveReqVO;
 import com.citu.module.menduner.system.dal.dataobject.workexp.WorkExpDO;
 import com.citu.module.menduner.system.dal.mysql.workexp.WorkExpMapper;
-import com.citu.module.menduner.system.util.LoginUserContext;
+import com.citu.module.menduner.common.util.LoginUserContext;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;