🔨 拆分出 common-model 模块

🎨 重命名 SpringUtils -> ApplicationContextHolder
⚡ 调整 json 序列化使用 JsonUtils

ballcat-admin/ballcat-admin-core/pom.xml

@@ -20,6 +20,10 @@
         <dependency>
             <groupId>com.hccake</groupId>
             <artifactId>ballcat-common-conf</artifactId>
+        </dependency>
+		<dependency>
+			<groupId>com.hccake</groupId>
+			<artifactId>ballcat-common-model</artifactId>
 		</dependency>
 		<!--缓存注解工具类-->
 		<dependency>

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/UpmsAutoConfiguration.java

@@ -1,7 +1,6 @@
 package com.hccake.ballcat.admin;
 
 import com.anji.captcha.service.CaptchaService;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.hccake.ballcat.admin.constants.SecurityConst;
 import com.hccake.ballcat.admin.modules.notify.push.MailNotifyPusher;
 import com.hccake.ballcat.admin.modules.sys.checker.AdminRuleProperties;
@@ -49,10 +48,9 @@ public class UpmsAutoConfiguration {
 	@Bean
 	@ConditionalOnProperty(prefix = "ballcat.login.captcha", name = "enabled", havingValue = "true",
 			matchIfMissing = true)
-	public FilterRegistrationBean<LoginCaptchaFilter> filterRegistrationBean(ObjectMapper objectMapper,
+	public FilterRegistrationBean<LoginCaptchaFilter> filterRegistrationBean(CaptchaService captchaService) {
-			CaptchaService captchaService) {
 		FilterRegistrationBean<LoginCaptchaFilter> bean = new FilterRegistrationBean<>();
-		LoginCaptchaFilter filter = new LoginCaptchaFilter(objectMapper, captchaService);
+		LoginCaptchaFilter filter = new LoginCaptchaFilter(captchaService);
 		bean.setFilter(filter);
 		// 比密码解密早一步
 		bean.setOrder(-1);

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/controller/AdminAccessLogController.java

@@ -3,9 +3,9 @@ package com.hccake.ballcat.admin.modules.log.controller;
 import com.hccake.ballcat.admin.modules.log.model.qo.AdminAccessLogQO;
 import com.hccake.ballcat.admin.modules.log.model.vo.AdminAccessLogVO;
 import com.hccake.ballcat.admin.modules.log.service.AdminAccessLogService;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
-import com.hccake.ballcat.common.core.result.R;
+import com.hccake.ballcat.common.model.result.R;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/controller/AdminLoginLogController.java

@@ -3,9 +3,9 @@ package com.hccake.ballcat.admin.modules.log.controller;
 import com.hccake.ballcat.admin.modules.log.model.qo.AdminLoginLogQO;
 import com.hccake.ballcat.admin.modules.log.model.vo.AdminLoginLogVO;
 import com.hccake.ballcat.admin.modules.log.service.AdminLoginLogService;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
-import com.hccake.ballcat.common.core.result.R;
+import com.hccake.ballcat.common.model.result.R;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/controller/AdminOperationLogController.java

@@ -3,9 +3,9 @@ package com.hccake.ballcat.admin.modules.log.controller;
 import com.hccake.ballcat.admin.modules.log.model.qo.AdminOperationLogQO;
 import com.hccake.ballcat.admin.modules.log.model.vo.AdminOperationLogVO;
 import com.hccake.ballcat.admin.modules.log.service.OperationLogAdminService;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
-import com.hccake.ballcat.common.core.result.R;
+import com.hccake.ballcat.common.model.result.R;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/handler/AdminAccessLogHandler.java

@@ -1,8 +1,6 @@
 package com.hccake.ballcat.admin.modules.log.handler;
 
 import cn.hutool.core.util.URLUtil;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.hccake.ballcat.admin.modules.log.model.entity.AdminAccessLog;
 import com.hccake.ballcat.admin.modules.log.thread.AccessLogAdminSaveThread;
 import com.hccake.ballcat.admin.oauth.SysUserDetails;
@@ -13,6 +11,7 @@ import com.hccake.ballcat.commom.log.util.LogUtils;
 import com.hccake.ballcat.common.desensitize.DesensitizationHandlerHolder;
 import com.hccake.ballcat.common.desensitize.enums.RegexDesensitizationTypeEnum;
 import com.hccake.ballcat.common.util.IpUtils;
+import com.hccake.ballcat.common.util.JsonUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.MDC;
@@ -42,8 +41,6 @@ public class AdminAccessLogHandler implements AccessLogHandler<AdminAccessLog> {
 
 	private final AccessLogAdminSaveThread accessLogAdminSaveThread;
 
-	private final ObjectMapper objectMapper;
-
 	/**
 	 * 需要脱敏记录的参数
 	 */
@@ -120,9 +117,9 @@ public class AdminAccessLogHandler implements AccessLogHandler<AdminAccessLog> {
 					parameterMap.put(paramKey, new String[] { value });
 				}
 			}
-			params = objectMapper.writeValueAsString(parameterMap);
+			params = JsonUtils.toJson(parameterMap);
 		}
-		catch (JsonProcessingException e) {
+		catch (Exception e) {
 			params = "记录参数异常";
 			log.error("[prodLog]，参数获取序列化异常", e);
 		}

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/mapper/AdminAccessLogMapper.java

@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.hccake.ballcat.admin.modules.log.model.entity.AdminAccessLog;
 import com.hccake.ballcat.admin.modules.log.model.qo.AdminAccessLogQO;
 import com.hccake.ballcat.admin.modules.log.model.vo.AdminAccessLogVO;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
 import com.hccake.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX;
 import com.hccake.extend.mybatis.plus.mapper.ExtendMapper;
 import com.hccake.extend.mybatis.plus.toolkit.WrappersX;

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/mapper/AdminLoginLogMapper.java

@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.hccake.ballcat.admin.modules.log.model.entity.AdminLoginLog;
 import com.hccake.ballcat.admin.modules.log.model.qo.AdminLoginLogQO;
 import com.hccake.ballcat.admin.modules.log.model.vo.AdminLoginLogVO;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
 import com.hccake.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX;
 import com.hccake.extend.mybatis.plus.mapper.ExtendMapper;
 import com.hccake.extend.mybatis.plus.toolkit.WrappersX;

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/mapper/AdminOperationLogMapper.java

@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.hccake.ballcat.admin.modules.log.model.entity.AdminOperationLog;
 import com.hccake.ballcat.admin.modules.log.model.qo.AdminOperationLogQO;
 import com.hccake.ballcat.admin.modules.log.model.vo.AdminOperationLogVO;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
 import com.hccake.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX;
 import com.hccake.extend.mybatis.plus.mapper.ExtendMapper;
 import com.hccake.extend.mybatis.plus.toolkit.WrappersX;

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/service/AdminAccessLogService.java

@@ -3,8 +3,8 @@ package com.hccake.ballcat.admin.modules.log.service;
 import com.hccake.ballcat.admin.modules.log.model.entity.AdminAccessLog;
 import com.hccake.ballcat.admin.modules.log.model.qo.AdminAccessLogQO;
 import com.hccake.ballcat.admin.modules.log.model.vo.AdminAccessLogVO;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
 import com.hccake.extend.mybatis.plus.service.ExtendService;
 
 /**

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/service/AdminLoginLogService.java

@@ -3,8 +3,8 @@ package com.hccake.ballcat.admin.modules.log.service;
 import com.hccake.ballcat.admin.modules.log.model.entity.AdminLoginLog;
 import com.hccake.ballcat.admin.modules.log.model.qo.AdminLoginLogQO;
 import com.hccake.ballcat.admin.modules.log.model.vo.AdminLoginLogVO;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
 import com.hccake.extend.mybatis.plus.service.ExtendService;
 
 /**

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/service/OperationLogAdminService.java

@@ -3,8 +3,8 @@ package com.hccake.ballcat.admin.modules.log.service;
 import com.hccake.ballcat.admin.modules.log.model.entity.AdminOperationLog;
 import com.hccake.ballcat.admin.modules.log.model.qo.AdminOperationLogQO;
 import com.hccake.ballcat.admin.modules.log.model.vo.AdminOperationLogVO;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
 import com.hccake.extend.mybatis.plus.service.ExtendService;
 
 /**

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/service/impl/AdminAccessLogServiceImpl.java

@@ -5,8 +5,8 @@ import com.hccake.ballcat.admin.modules.log.model.entity.AdminAccessLog;
 import com.hccake.ballcat.admin.modules.log.model.qo.AdminAccessLogQO;
 import com.hccake.ballcat.admin.modules.log.model.vo.AdminAccessLogVO;
 import com.hccake.ballcat.admin.modules.log.service.AdminAccessLogService;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
 import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/service/impl/AdminLoginLogServiceImpl.java

@@ -5,8 +5,8 @@ import com.hccake.ballcat.admin.modules.log.model.entity.AdminLoginLog;
 import com.hccake.ballcat.admin.modules.log.model.qo.AdminLoginLogQO;
 import com.hccake.ballcat.admin.modules.log.model.vo.AdminLoginLogVO;
 import com.hccake.ballcat.admin.modules.log.service.AdminLoginLogService;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
 import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl;
 import org.springframework.stereotype.Service;
 

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/service/impl/OperationLogAdminServiceImpl.java

@@ -5,8 +5,8 @@ import com.hccake.ballcat.admin.modules.log.model.entity.AdminOperationLog;
 import com.hccake.ballcat.admin.modules.log.model.qo.AdminOperationLogQO;
 import com.hccake.ballcat.admin.modules.log.model.vo.AdminOperationLogVO;
 import com.hccake.ballcat.admin.modules.log.service.OperationLogAdminService;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
 import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl;
 import org.springframework.stereotype.Service;
 

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/controller/LovController.java

@@ -12,10 +12,10 @@ import com.hccake.ballcat.admin.modules.lov.service.LovService;
 import com.hccake.ballcat.commom.log.operation.annotation.CreateOperationLogging;
 import com.hccake.ballcat.commom.log.operation.annotation.DeleteOperationLogging;
 import com.hccake.ballcat.commom.log.operation.annotation.UpdateOperationLogging;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
-import com.hccake.ballcat.common.core.result.BaseResultCode;
+import com.hccake.ballcat.common.model.result.BaseResultCode;
-import com.hccake.ballcat.common.core.result.R;
+import com.hccake.ballcat.common.model.result.R;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/mapper/LovMapper.java

@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.hccake.ballcat.admin.modules.lov.model.entity.Lov;
 import com.hccake.ballcat.admin.modules.lov.model.qo.LovQO;
 import com.hccake.ballcat.admin.modules.lov.model.vo.LovVO;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
 import com.hccake.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX;
 import com.hccake.extend.mybatis.plus.mapper.ExtendMapper;
 import com.hccake.extend.mybatis.plus.toolkit.WrappersX;

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/service/LovService.java

@@ -5,8 +5,8 @@ import com.hccake.ballcat.admin.modules.lov.model.entity.LovBody;
 import com.hccake.ballcat.admin.modules.lov.model.entity.LovSearch;
 import com.hccake.ballcat.admin.modules.lov.model.qo.LovQO;
 import com.hccake.ballcat.admin.modules.lov.model.vo.LovVO;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
 import com.hccake.extend.mybatis.plus.service.ExtendService;
 
 import java.util.List;

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/service/impl/LovServiceImpl.java

@@ -10,10 +10,10 @@ import com.hccake.ballcat.admin.modules.lov.model.vo.LovVO;
 import com.hccake.ballcat.admin.modules.lov.service.LovBodyService;
 import com.hccake.ballcat.admin.modules.lov.service.LovSearchService;
 import com.hccake.ballcat.admin.modules.lov.service.LovService;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
 import com.hccake.ballcat.common.core.exception.BusinessException;
-import com.hccake.ballcat.common.core.result.BaseResultCode;
+import com.hccake.ballcat.common.model.result.BaseResultCode;
 import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/lov/typehandler/ListLovSelectOptionTypeHandler.java

@@ -1,9 +1,8 @@
 package com.hccake.ballcat.admin.modules.lov.typehandler;
 
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.hccake.ballcat.admin.modules.lov.model.entity.LovSelectOptions;
-import com.hccake.ballcat.common.conf.util.SpringUtils;
+import com.hccake.ballcat.common.util.JsonUtils;
+import com.hccake.ballcat.common.util.json.TypeReference;
 import org.apache.ibatis.type.JdbcType;
 import org.apache.ibatis.type.TypeHandler;
 
@@ -19,20 +18,11 @@ import java.util.List;
  */
 public class ListLovSelectOptionTypeHandler implements TypeHandler<List<LovSelectOptions>> {
 
-	public ObjectMapper om = null;
-
-	public ObjectMapper getOm() {
-		if (om == null) {
-			om = SpringUtils.getBean(ObjectMapper.class);
-		}
-		return om;
-	}
-
 	@Override
 	public void setParameter(PreparedStatement ps, int i, List<LovSelectOptions> parameter, JdbcType jdbcType)
 			throws SQLException {
 		try {
-			ps.setString(i, getOm().writeValueAsString(parameter));
+			ps.setString(i, JsonUtils.toJson(parameter));
 		}
 		catch (Exception e) {
 			ps.setString(i, "[]");
@@ -56,7 +46,7 @@ public class ListLovSelectOptionTypeHandler implements TypeHandler<List<LovSelec
 
 	List<LovSelectOptions> toVal(String string) {
 		try {
-			return getOm().readValue(string, new TypeReference<List<LovSelectOptions>>() {
+			return JsonUtils.toObj(string, new TypeReference<List<LovSelectOptions>>() {
 			});
 		}
 		catch (Exception e) {

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/controller/AnnouncementController.java

@@ -9,10 +9,10 @@ import com.hccake.ballcat.admin.oauth.util.SecurityUtils;
 import com.hccake.ballcat.commom.log.operation.annotation.CreateOperationLogging;
 import com.hccake.ballcat.commom.log.operation.annotation.DeleteOperationLogging;
 import com.hccake.ballcat.commom.log.operation.annotation.UpdateOperationLogging;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
-import com.hccake.ballcat.common.core.result.BaseResultCode;
+import com.hccake.ballcat.common.model.result.BaseResultCode;
-import com.hccake.ballcat.common.core.result.R;
+import com.hccake.ballcat.common.model.result.R;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/controller/UserAnnouncementController.java

@@ -4,9 +4,9 @@ import com.hccake.ballcat.admin.modules.notify.model.qo.UserAnnouncementQO;
 import com.hccake.ballcat.admin.modules.notify.model.vo.UserAnnouncementVO;
 import com.hccake.ballcat.admin.modules.notify.service.UserAnnouncementService;
 import com.hccake.ballcat.admin.oauth.util.SecurityUtils;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
-import com.hccake.ballcat.common.core.result.R;
+import com.hccake.ballcat.common.model.result.R;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/mapper/AnnouncementMapper.java

@@ -7,8 +7,8 @@ import com.hccake.ballcat.admin.constants.AnnouncementStatusEnum;
 import com.hccake.ballcat.admin.modules.notify.model.entity.Announcement;
 import com.hccake.ballcat.admin.modules.notify.model.qo.AnnouncementQO;
 import com.hccake.ballcat.admin.modules.notify.model.vo.AnnouncementVO;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
 import com.hccake.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX;
 import com.hccake.extend.mybatis.plus.mapper.ExtendMapper;
 import com.hccake.extend.mybatis.plus.toolkit.WrappersX;

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/mapper/UserAnnouncementMapper.java

@@ -7,8 +7,8 @@ import com.hccake.ballcat.admin.constants.UserAnnouncementStateEnum;
 import com.hccake.ballcat.admin.modules.notify.model.entity.UserAnnouncement;
 import com.hccake.ballcat.admin.modules.notify.model.qo.UserAnnouncementQO;
 import com.hccake.ballcat.admin.modules.notify.model.vo.UserAnnouncementVO;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
 import com.hccake.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX;
 import com.hccake.extend.mybatis.plus.mapper.ExtendMapper;
 import com.hccake.extend.mybatis.plus.toolkit.WrappersX;

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/service/AnnouncementService.java

@@ -4,8 +4,8 @@ import com.hccake.ballcat.admin.modules.notify.model.dto.AnnouncementDTO;
 import com.hccake.ballcat.admin.modules.notify.model.entity.Announcement;
 import com.hccake.ballcat.admin.modules.notify.model.qo.AnnouncementQO;
 import com.hccake.ballcat.admin.modules.notify.model.vo.AnnouncementVO;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
 import com.hccake.extend.mybatis.plus.service.ExtendService;
 import org.springframework.web.multipart.MultipartFile;
 

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/service/UserAnnouncementService.java

@@ -3,8 +3,8 @@ package com.hccake.ballcat.admin.modules.notify.service;
 import com.hccake.ballcat.admin.modules.notify.model.entity.UserAnnouncement;
 import com.hccake.ballcat.admin.modules.notify.model.qo.UserAnnouncementQO;
 import com.hccake.ballcat.admin.modules.notify.model.vo.UserAnnouncementVO;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
 import com.hccake.extend.mybatis.plus.service.ExtendService;
 
 /**

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/service/impl/AnnouncementServiceImpl.java

@@ -18,11 +18,11 @@ import com.hccake.ballcat.admin.modules.notify.model.vo.AnnouncementVO;
 import com.hccake.ballcat.admin.modules.notify.service.AnnouncementService;
 import com.hccake.ballcat.admin.modules.sys.service.FileService;
 import com.hccake.ballcat.common.core.constant.enums.BooleanEnum;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
 import com.hccake.ballcat.common.core.exception.BusinessException;
-import com.hccake.ballcat.common.core.result.BaseResultCode;
+import com.hccake.ballcat.common.model.result.BaseResultCode;
-import com.hccake.ballcat.common.core.result.SystemResultCode;
+import com.hccake.ballcat.common.model.result.SystemResultCode;
 import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/notify/service/impl/UserAnnouncementServiceImpl.java

@@ -6,8 +6,8 @@ import com.hccake.ballcat.admin.modules.notify.model.entity.UserAnnouncement;
 import com.hccake.ballcat.admin.modules.notify.model.qo.UserAnnouncementQO;
 import com.hccake.ballcat.admin.modules.notify.model.vo.UserAnnouncementVO;
 import com.hccake.ballcat.admin.modules.notify.service.UserAnnouncementService;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
 import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl;
 import org.springframework.stereotype.Service;
 

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/AuthController.java

@@ -1,8 +1,8 @@
 package com.hccake.ballcat.admin.modules.sys.controller;
 
 import cn.hutool.core.util.StrUtil;
-import com.hccake.ballcat.common.core.result.R;
+import com.hccake.ballcat.common.model.result.R;
-import com.hccake.ballcat.common.core.result.SystemResultCode;
+import com.hccake.ballcat.common.model.result.SystemResultCode;
 import io.swagger.annotations.Api;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.ApplicationEventPublisher;

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysConfigController.java

@@ -7,9 +7,9 @@ import com.hccake.ballcat.admin.modules.sys.service.SysConfigService;
 import com.hccake.ballcat.commom.log.operation.annotation.CreateOperationLogging;
 import com.hccake.ballcat.commom.log.operation.annotation.DeleteOperationLogging;
 import com.hccake.ballcat.commom.log.operation.annotation.UpdateOperationLogging;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
-import com.hccake.ballcat.common.core.result.R;
+import com.hccake.ballcat.common.model.result.R;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysDictController.java

@@ -10,10 +10,10 @@ import com.hccake.ballcat.admin.modules.sys.model.vo.SysDictVO;
 import com.hccake.ballcat.commom.log.operation.annotation.CreateOperationLogging;
 import com.hccake.ballcat.commom.log.operation.annotation.DeleteOperationLogging;
 import com.hccake.ballcat.commom.log.operation.annotation.UpdateOperationLogging;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
-import com.hccake.ballcat.common.core.result.BaseResultCode;
+import com.hccake.ballcat.common.model.result.BaseResultCode;
-import com.hccake.ballcat.common.core.result.R;
+import com.hccake.ballcat.common.model.result.R;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysOrganizationController.java

@@ -6,8 +6,8 @@ import com.hccake.ballcat.admin.modules.sys.service.SysOrganizationService;
 import com.hccake.ballcat.commom.log.operation.annotation.CreateOperationLogging;
 import com.hccake.ballcat.commom.log.operation.annotation.DeleteOperationLogging;
 import com.hccake.ballcat.commom.log.operation.annotation.UpdateOperationLogging;
-import com.hccake.ballcat.common.core.result.BaseResultCode;
+import com.hccake.ballcat.common.model.result.BaseResultCode;
-import com.hccake.ballcat.common.core.result.R;
+import com.hccake.ballcat.common.model.result.R;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysPermissionController.java

@@ -13,7 +13,7 @@ import com.hccake.ballcat.admin.oauth.util.SecurityUtils;
 import com.hccake.ballcat.commom.log.operation.annotation.CreateOperationLogging;
 import com.hccake.ballcat.commom.log.operation.annotation.DeleteOperationLogging;
 import com.hccake.ballcat.commom.log.operation.annotation.UpdateOperationLogging;
-import com.hccake.ballcat.common.core.result.R;
+import com.hccake.ballcat.common.model.result.R;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysRoleController.java

@@ -13,11 +13,11 @@ import com.hccake.ballcat.admin.modules.sys.service.SysRoleService;
 import com.hccake.ballcat.commom.log.operation.annotation.CreateOperationLogging;
 import com.hccake.ballcat.commom.log.operation.annotation.DeleteOperationLogging;
 import com.hccake.ballcat.commom.log.operation.annotation.UpdateOperationLogging;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
-import com.hccake.ballcat.common.core.domain.SelectData;
+import com.hccake.ballcat.common.model.domain.SelectData;
-import com.hccake.ballcat.common.core.result.BaseResultCode;
+import com.hccake.ballcat.common.model.result.BaseResultCode;
-import com.hccake.ballcat.common.core.result.R;
+import com.hccake.ballcat.common.model.result.R;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysUserController.java

@@ -14,12 +14,12 @@ import com.hccake.ballcat.admin.modules.sys.service.SysUserService;
 import com.hccake.ballcat.commom.log.operation.annotation.CreateOperationLogging;
 import com.hccake.ballcat.commom.log.operation.annotation.DeleteOperationLogging;
 import com.hccake.ballcat.commom.log.operation.annotation.UpdateOperationLogging;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
-import com.hccake.ballcat.common.core.domain.SelectData;
+import com.hccake.ballcat.common.model.domain.SelectData;
-import com.hccake.ballcat.common.core.result.BaseResultCode;
+import com.hccake.ballcat.common.model.result.BaseResultCode;
-import com.hccake.ballcat.common.core.result.R;
+import com.hccake.ballcat.common.model.result.R;
-import com.hccake.ballcat.common.core.result.SystemResultCode;
+import com.hccake.ballcat.common.model.result.SystemResultCode;
 import com.hccake.ballcat.common.util.PasswordUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/manager/SysDictManager.java

@@ -14,10 +14,10 @@ import com.hccake.ballcat.admin.modules.sys.model.vo.SysDictVO;
 import com.hccake.ballcat.admin.modules.sys.service.SysDictItemService;
 import com.hccake.ballcat.admin.modules.sys.service.SysDictService;
 import com.hccake.ballcat.common.core.constant.enums.BooleanEnum;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
 import com.hccake.ballcat.common.core.exception.BusinessException;
-import com.hccake.ballcat.common.core.result.BaseResultCode;
+import com.hccake.ballcat.common.model.result.BaseResultCode;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysConfigMapper.java

@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.hccake.ballcat.admin.modules.sys.model.entity.SysConfig;
 import com.hccake.ballcat.admin.modules.sys.model.qo.SysConfigQO;
 import com.hccake.ballcat.admin.modules.sys.model.vo.SysConfigVO;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
 import com.hccake.extend.mybatis.plus.mapper.ExtendMapper;
 
 /**

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysDictItemMapper.java

@@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
 import com.hccake.ballcat.admin.modules.sys.model.entity.SysDictItem;
 import com.hccake.ballcat.admin.modules.sys.model.vo.SysDictItemVO;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
 import com.hccake.extend.mybatis.plus.mapper.ExtendMapper;
 
 import java.util.List;

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysDictMapper.java

@@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
 import com.hccake.ballcat.admin.modules.sys.model.entity.SysDict;
 import com.hccake.ballcat.admin.modules.sys.model.qo.SysDictQO;
 import com.hccake.ballcat.admin.modules.sys.model.vo.SysDictVO;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
 import com.hccake.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX;
 import com.hccake.extend.mybatis.plus.mapper.ExtendMapper;
 import com.hccake.extend.mybatis.plus.toolkit.WrappersX;

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysRoleMapper.java

@@ -7,9 +7,9 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.hccake.ballcat.admin.modules.sys.model.entity.SysRole;
 import com.hccake.ballcat.admin.modules.sys.model.qo.SysRoleQO;
 import com.hccake.ballcat.admin.modules.sys.model.vo.SysRoleVO;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
-import com.hccake.ballcat.common.core.domain.SelectData;
+import com.hccake.ballcat.common.model.domain.SelectData;
 import com.hccake.extend.mybatis.plus.mapper.ExtendMapper;
 
 import java.util.List;

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysUserMapper.java

@@ -8,9 +8,9 @@ import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser;
 import com.hccake.ballcat.admin.modules.sys.model.qo.SysUserQO;
 import com.hccake.ballcat.admin.modules.sys.model.vo.SysUserVO;
 import com.hccake.ballcat.common.core.constant.GlobalConstants;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
-import com.hccake.ballcat.common.core.domain.SelectData;
+import com.hccake.ballcat.common.model.domain.SelectData;
 import com.hccake.extend.mybatis.plus.conditions.query.LambdaAliasQueryWrapperX;
 import com.hccake.extend.mybatis.plus.mapper.ExtendMapper;
 import com.hccake.extend.mybatis.plus.toolkit.WrappersX;

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/SysOrganizationTree.java

@@ -1,6 +1,6 @@
 package com.hccake.ballcat.admin.modules.sys.model.vo;
 
-import com.hccake.ballcat.common.core.tree.TreeNode;
+import com.hccake.ballcat.common.model.tree.TreeNode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysConfigService.java

@@ -3,8 +3,8 @@ package com.hccake.ballcat.admin.modules.sys.service;
 import com.hccake.ballcat.admin.modules.sys.model.entity.SysConfig;
 import com.hccake.ballcat.admin.modules.sys.model.qo.SysConfigQO;
 import com.hccake.ballcat.admin.modules.sys.model.vo.SysConfigVO;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
 import com.hccake.extend.mybatis.plus.service.ExtendService;
 
 /**

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysDictItemService.java

@@ -2,8 +2,8 @@ package com.hccake.ballcat.admin.modules.sys.service;
 
 import com.hccake.ballcat.admin.modules.sys.model.entity.SysDictItem;
 import com.hccake.ballcat.admin.modules.sys.model.vo.SysDictItemVO;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
 import com.hccake.extend.mybatis.plus.service.ExtendService;
 
 import java.util.List;

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysDictService.java

@@ -3,8 +3,8 @@ package com.hccake.ballcat.admin.modules.sys.service;
 import com.hccake.ballcat.admin.modules.sys.model.entity.SysDict;
 import com.hccake.ballcat.admin.modules.sys.model.qo.SysDictQO;
 import com.hccake.ballcat.admin.modules.sys.model.vo.SysDictVO;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
 import com.hccake.extend.mybatis.plus.service.ExtendService;
 
 import java.util.List;

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysRoleService.java

@@ -3,9 +3,9 @@ package com.hccake.ballcat.admin.modules.sys.service;
 import com.hccake.ballcat.admin.modules.sys.model.entity.SysRole;
 import com.hccake.ballcat.admin.modules.sys.model.qo.SysRoleQO;
 import com.hccake.ballcat.admin.modules.sys.model.vo.SysRoleVO;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
-import com.hccake.ballcat.common.core.domain.SelectData;
+import com.hccake.ballcat.common.model.domain.SelectData;
 import com.hccake.extend.mybatis.plus.service.ExtendService;
 
 import java.util.List;

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysUserService.java

@@ -6,9 +6,9 @@ import com.hccake.ballcat.admin.modules.sys.model.dto.UserInfoDTO;
 import com.hccake.ballcat.admin.modules.sys.model.entity.SysUser;
 import com.hccake.ballcat.admin.modules.sys.model.qo.SysUserQO;
 import com.hccake.ballcat.admin.modules.sys.model.vo.SysUserVO;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
-import com.hccake.ballcat.common.core.domain.SelectData;
+import com.hccake.ballcat.common.model.domain.SelectData;
 import com.hccake.extend.mybatis.plus.service.ExtendService;
 import org.springframework.web.multipart.MultipartFile;
 

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysConfigServiceImpl.java

@@ -5,8 +5,8 @@ import com.hccake.ballcat.admin.modules.sys.model.entity.SysConfig;
 import com.hccake.ballcat.admin.modules.sys.model.qo.SysConfigQO;
 import com.hccake.ballcat.admin.modules.sys.model.vo.SysConfigVO;
 import com.hccake.ballcat.admin.modules.sys.service.SysConfigService;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
 import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl;
 import org.springframework.stereotype.Service;
 

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysDictItemServiceImpl.java

@@ -4,8 +4,8 @@ import com.hccake.ballcat.admin.modules.sys.mapper.SysDictItemMapper;
 import com.hccake.ballcat.admin.modules.sys.model.entity.SysDictItem;
 import com.hccake.ballcat.admin.modules.sys.model.vo.SysDictItemVO;
 import com.hccake.ballcat.admin.modules.sys.service.SysDictItemService;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
 import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl;
 import org.springframework.stereotype.Service;
 

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysDictServiceImpl.java

@@ -6,8 +6,8 @@ import com.hccake.ballcat.admin.modules.sys.model.entity.SysDict;
 import com.hccake.ballcat.admin.modules.sys.model.qo.SysDictQO;
 import com.hccake.ballcat.admin.modules.sys.model.vo.SysDictVO;
 import com.hccake.ballcat.admin.modules.sys.service.SysDictService;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
 import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl;
 import org.springframework.stereotype.Service;
 

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysPermissionServiceImpl.java

@@ -7,7 +7,7 @@ import com.hccake.ballcat.admin.modules.sys.model.vo.PermissionVO;
 import com.hccake.ballcat.admin.modules.sys.service.SysPermissionService;
 import com.hccake.ballcat.admin.modules.sys.service.SysRolePermissionService;
 import com.hccake.ballcat.common.core.exception.BusinessException;
-import com.hccake.ballcat.common.core.result.BaseResultCode;
+import com.hccake.ballcat.common.model.result.BaseResultCode;
 import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysRoleServiceImpl.java

@@ -7,9 +7,9 @@ import com.hccake.ballcat.admin.modules.sys.model.qo.SysRoleQO;
 import com.hccake.ballcat.admin.modules.sys.model.vo.SysRoleVO;
 import com.hccake.ballcat.admin.modules.sys.service.SysRolePermissionService;
 import com.hccake.ballcat.admin.modules.sys.service.SysRoleService;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
-import com.hccake.ballcat.common.core.domain.SelectData;
+import com.hccake.ballcat.common.model.domain.SelectData;
 import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysUserServiceImpl.java

@@ -19,9 +19,9 @@ import com.hccake.ballcat.admin.modules.sys.model.qo.SysUserQO;
 import com.hccake.ballcat.admin.modules.sys.model.vo.PermissionVO;
 import com.hccake.ballcat.admin.modules.sys.model.vo.SysUserVO;
 import com.hccake.ballcat.admin.modules.sys.service.*;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
-import com.hccake.ballcat.common.core.domain.SelectData;
+import com.hccake.ballcat.common.model.domain.SelectData;
 import com.hccake.ballcat.common.util.PasswordUtils;
 import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl;
 import lombok.RequiredArgsConstructor;

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/CustomAuthenticationEntryPoint.java

@@ -1,9 +1,8 @@
 package com.hccake.ballcat.admin.oauth;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import com.hccake.ballcat.common.model.result.R;
-import com.hccake.ballcat.common.core.result.R;
+import com.hccake.ballcat.common.model.result.SystemResultCode;
-import com.hccake.ballcat.common.core.result.SystemResultCode;
+import com.hccake.ballcat.common.util.JsonUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.security.core.AuthenticationException;
@@ -21,17 +20,14 @@ import java.io.IOException;
  */
 public class CustomAuthenticationEntryPoint implements AuthenticationEntryPoint {
 
-	@Autowired
-	private ObjectMapper objectMapper;
-
 	@Override
 	public void commence(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse,
 			AuthenticationException e) throws IOException, ServletException {
 
 		httpServletResponse.setHeader("Content-Type", MediaType.APPLICATION_JSON.toString());
 		httpServletResponse.setStatus(HttpStatus.UNAUTHORIZED.value());
-		httpServletResponse.getWriter()
+		R<Object> r = R.failed(SystemResultCode.UNAUTHORIZED, e.getMessage());
-				.write(objectMapper.writeValueAsString(R.failed(SystemResultCode.UNAUTHORIZED, e.getMessage())));
+		httpServletResponse.getWriter().write(JsonUtils.toJson(r));
 	}
 
 }

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/exception/CustomOAuth2ExceptionSerializer.java

@@ -3,8 +3,8 @@ package com.hccake.ballcat.admin.oauth.exception;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
-import com.hccake.ballcat.common.core.result.R;
+import com.hccake.ballcat.common.model.result.R;
-import com.hccake.ballcat.common.core.result.SystemResultCode;
+import com.hccake.ballcat.common.model.result.SystemResultCode;
 
 import java.io.IOException;
 

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/filter/LoginCaptchaFilter.java

@@ -3,10 +3,10 @@ package com.hccake.ballcat.admin.oauth.filter;
 import com.anji.captcha.model.common.ResponseModel;
 import com.anji.captcha.model.vo.CaptchaVO;
 import com.anji.captcha.service.CaptchaService;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.hccake.ballcat.admin.oauth.util.SecurityUtils;
-import com.hccake.ballcat.common.core.result.R;
+import com.hccake.ballcat.common.model.result.R;
-import com.hccake.ballcat.common.core.result.SystemResultCode;
+import com.hccake.ballcat.common.model.result.SystemResultCode;
+import com.hccake.ballcat.common.util.JsonUtils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -25,8 +25,6 @@ import java.io.IOException;
 @RequiredArgsConstructor
 public class LoginCaptchaFilter extends OncePerRequestFilter {
 
-	private final ObjectMapper objectMapper;
-
 	private final CaptchaService captchaService;
 
 	private final static String CAPTCHA_VERIFICATION_PARAM = "captchaVerification";
@@ -60,8 +58,8 @@ public class LoginCaptchaFilter extends OncePerRequestFilter {
 			// repCode 6112 获取验证码失败,请联系管理员
 			response.setHeader("Content-Type", MediaType.APPLICATION_JSON.toString());
 			response.setStatus(HttpStatus.UNAUTHORIZED.value());
-			response.getWriter().write(
+			R<String> r = R.failed(SystemResultCode.UNAUTHORIZED, "Captcha code error");
-					objectMapper.writeValueAsString(R.failed(SystemResultCode.UNAUTHORIZED, "Captcha code error")));
+			response.getWriter().write(JsonUtils.toJson(r));
 		}
 
 	}

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/filter/LoginPasswordDecoderFilter.java

@@ -1,11 +1,11 @@
 package com.hccake.ballcat.admin.oauth.filter;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.hccake.ballcat.admin.constants.SecurityConst;
 import com.hccake.ballcat.admin.oauth.util.SecurityUtils;
 import com.hccake.ballcat.common.core.request.wrapper.ModifyParamMapRequestWrapper;
-import com.hccake.ballcat.common.core.result.R;
+import com.hccake.ballcat.common.model.result.R;
-import com.hccake.ballcat.common.core.result.SystemResultCode;
+import com.hccake.ballcat.common.model.result.SystemResultCode;
+import com.hccake.ballcat.common.util.JsonUtils;
 import com.hccake.ballcat.common.util.PasswordUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -35,8 +35,6 @@ import java.util.Map;
 @RequiredArgsConstructor
 public class LoginPasswordDecoderFilter extends OncePerRequestFilter {
 
-	private final ObjectMapper objectMapper;
-
 	@Value("${ballcat.password.secret-key}")
 	private String secretKey;
 
@@ -65,8 +63,8 @@ public class LoginPasswordDecoderFilter extends OncePerRequestFilter {
 		catch (Exception e) {
 			response.setHeader("Content-Type", MediaType.APPLICATION_JSON.toString());
 			response.setStatus(HttpStatus.UNAUTHORIZED.value());
-			response.getWriter()
+			R<String> r = R.failed(SystemResultCode.UNAUTHORIZED, e.getMessage());
-					.write(objectMapper.writeValueAsString(R.failed(SystemResultCode.UNAUTHORIZED, e.getMessage())));
+			response.getWriter().write(JsonUtils.toJson(r));
 			return;
 		}
 

ballcat-admin/ballcat-admin-core/src/main/resources/mapper/sys/RoleMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hccake.ballcat.admin.modules.sys.mapper.SysRoleMapper">
 
-	<select id="listSelectData" resultType="com.hccake.ballcat.common.core.domain.SelectData">
+	<select id="listSelectData" resultType="com.hccake.ballcat.common.model.domain.SelectData">
 		select
 			name, code as value
 		from

ballcat-admin/ballcat-admin-core/src/main/resources/mapper/sys/SysUserMapper.xml

@@ -48,7 +48,7 @@
 		AND su.deleted = 0
 	</select>
 
-	<select id="listSelectData" resultType="com.hccake.ballcat.common.core.domain.SelectData">
+	<select id="listSelectData" resultType="com.hccake.ballcat.common.model.domain.SelectData">
 		select
 		username as name , user_id as value
 		from

ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/controller/DataSourceConfigController.java

@@ -5,11 +5,11 @@ import com.hccake.ballcat.codegen.model.entity.DataSourceConfig;
 import com.hccake.ballcat.codegen.model.qo.DataSourceConfigQO;
 import com.hccake.ballcat.codegen.model.vo.DataSourceConfigVO;
 import com.hccake.ballcat.codegen.service.DataSourceConfigService;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
-import com.hccake.ballcat.common.core.result.BaseResultCode;
+import com.hccake.ballcat.common.model.result.BaseResultCode;
-import com.hccake.ballcat.common.core.result.R;
+import com.hccake.ballcat.common.model.result.R;
-import com.hccake.ballcat.common.core.domain.SelectData;
+import com.hccake.ballcat.common.model.domain.SelectData;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;

ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/controller/GenerateController.java

@@ -6,9 +6,9 @@ import com.hccake.ballcat.codegen.model.qo.TableInfoQO;
 import com.hccake.ballcat.codegen.model.vo.TableInfo;
 import com.hccake.ballcat.codegen.service.GeneratorService;
 import com.hccake.ballcat.codegen.service.TableInfoService;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
-import com.hccake.ballcat.common.core.result.R;
+import com.hccake.ballcat.common.model.result.R;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;

ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/controller/TemplateDirectoryEntryController.java

@@ -5,8 +5,8 @@ import com.hccake.ballcat.codegen.model.dto.TemplateDirectoryCreateDTO;
 import com.hccake.ballcat.codegen.model.entity.TemplateDirectoryEntry;
 import com.hccake.ballcat.codegen.model.vo.TemplateDirectoryEntryVO;
 import com.hccake.ballcat.codegen.service.TemplateDirectoryEntryService;
-import com.hccake.ballcat.common.core.result.BaseResultCode;
+import com.hccake.ballcat.common.model.result.BaseResultCode;
-import com.hccake.ballcat.common.core.result.R;
+import com.hccake.ballcat.common.model.result.R;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;

ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/controller/TemplateGroupController.java

@@ -4,11 +4,11 @@ import com.hccake.ballcat.codegen.model.entity.TemplateGroup;
 import com.hccake.ballcat.codegen.model.qo.TemplateGroupQO;
 import com.hccake.ballcat.codegen.model.vo.TemplateGroupVO;
 import com.hccake.ballcat.codegen.service.TemplateGroupService;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
-import com.hccake.ballcat.common.core.result.BaseResultCode;
+import com.hccake.ballcat.common.model.result.BaseResultCode;
-import com.hccake.ballcat.common.core.result.R;
+import com.hccake.ballcat.common.model.result.R;
-import com.hccake.ballcat.common.core.domain.SelectData;
+import com.hccake.ballcat.common.model.domain.SelectData;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;

ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/controller/TemplateInfoController.java

@@ -2,8 +2,8 @@ package com.hccake.ballcat.codegen.controller;
 
 import com.hccake.ballcat.codegen.model.entity.TemplateInfo;
 import com.hccake.ballcat.codegen.service.TemplateInfoService;
-import com.hccake.ballcat.common.core.result.BaseResultCode;
+import com.hccake.ballcat.common.model.result.BaseResultCode;
-import com.hccake.ballcat.common.core.result.R;
+import com.hccake.ballcat.common.model.result.R;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;

ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/controller/TemplatePropertyController.java

@@ -5,10 +5,10 @@ import com.hccake.ballcat.codegen.model.entity.TemplateProperty;
 import com.hccake.ballcat.codegen.model.qo.TemplatePropertyQO;
 import com.hccake.ballcat.codegen.model.vo.TemplatePropertyVO;
 import com.hccake.ballcat.codegen.service.TemplatePropertyService;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
-import com.hccake.ballcat.common.core.result.BaseResultCode;
+import com.hccake.ballcat.common.model.result.BaseResultCode;
-import com.hccake.ballcat.common.core.result.R;
+import com.hccake.ballcat.common.model.result.R;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;

ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/mapper/DataSourceConfigMapper.java

@@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.hccake.ballcat.codegen.model.entity.DataSourceConfig;
 import com.hccake.ballcat.codegen.model.qo.DataSourceConfigQO;
 import com.hccake.ballcat.codegen.model.vo.DataSourceConfigVO;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
-import com.hccake.ballcat.common.core.domain.SelectData;
+import com.hccake.ballcat.common.model.domain.SelectData;
 import com.hccake.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX;
 import com.hccake.extend.mybatis.plus.mapper.ExtendMapper;
 import com.hccake.extend.mybatis.plus.toolkit.WrappersX;

ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/mapper/TableInfoMapper.java

@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.hccake.ballcat.codegen.model.qo.TableInfoQO;
 import com.hccake.ballcat.codegen.model.vo.ColumnInfo;
 import com.hccake.ballcat.codegen.model.vo.TableInfo;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
 import com.hccake.extend.mybatis.plus.toolkit.PageUtil;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/mapper/TemplateGroupMapper.java

@@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.hccake.ballcat.codegen.model.entity.TemplateGroup;
 import com.hccake.ballcat.codegen.model.qo.TemplateGroupQO;
 import com.hccake.ballcat.codegen.model.vo.TemplateGroupVO;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
-import com.hccake.ballcat.common.core.domain.SelectData;
+import com.hccake.ballcat.common.model.domain.SelectData;
 import com.hccake.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX;
 import com.hccake.extend.mybatis.plus.mapper.ExtendMapper;
 import com.hccake.extend.mybatis.plus.toolkit.WrappersX;

ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/mapper/TemplatePropertyMapper.java

@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.hccake.ballcat.codegen.model.entity.TemplateProperty;
 import com.hccake.ballcat.codegen.model.qo.TemplatePropertyQO;
 import com.hccake.ballcat.codegen.model.vo.TemplatePropertyVO;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
 import com.hccake.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX;
 import com.hccake.extend.mybatis.plus.mapper.ExtendMapper;
 import com.hccake.extend.mybatis.plus.toolkit.WrappersX;

ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/vo/TemplateDirectory.java

@@ -1,6 +1,6 @@
 package com.hccake.ballcat.codegen.model.vo;
 
-import com.hccake.ballcat.common.core.tree.SimpleTreeNode;
+import com.hccake.ballcat.common.model.tree.SimpleTreeNode;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/DataSourceConfigService.java

@@ -4,9 +4,9 @@ import com.hccake.ballcat.codegen.model.dto.DataSourceConfigDTO;
 import com.hccake.ballcat.codegen.model.entity.DataSourceConfig;
 import com.hccake.ballcat.codegen.model.qo.DataSourceConfigQO;
 import com.hccake.ballcat.codegen.model.vo.DataSourceConfigVO;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
-import com.hccake.ballcat.common.core.domain.SelectData;
+import com.hccake.ballcat.common.model.domain.SelectData;
 import com.hccake.extend.mybatis.plus.service.ExtendService;
 
 import java.util.List;

ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/TableInfoService.java

@@ -3,8 +3,8 @@ package com.hccake.ballcat.codegen.service;
 import com.hccake.ballcat.codegen.model.qo.TableInfoQO;
 import com.hccake.ballcat.codegen.model.vo.ColumnInfo;
 import com.hccake.ballcat.codegen.model.vo.TableInfo;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
 
 import java.util.List;
 

ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/TemplateGroupService.java

@@ -3,9 +3,9 @@ package com.hccake.ballcat.codegen.service;
 import com.hccake.ballcat.codegen.model.entity.TemplateGroup;
 import com.hccake.ballcat.codegen.model.qo.TemplateGroupQO;
 import com.hccake.ballcat.codegen.model.vo.TemplateGroupVO;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
-import com.hccake.ballcat.common.core.domain.SelectData;
+import com.hccake.ballcat.common.model.domain.SelectData;
 import com.hccake.extend.mybatis.plus.service.ExtendService;
 
 import java.util.List;

ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/TemplatePropertyService.java

@@ -3,8 +3,8 @@ package com.hccake.ballcat.codegen.service;
 import com.hccake.ballcat.codegen.model.entity.TemplateProperty;
 import com.hccake.ballcat.codegen.model.qo.TemplatePropertyQO;
 import com.hccake.ballcat.codegen.model.vo.TemplatePropertyVO;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
 import com.hccake.extend.mybatis.plus.service.ExtendService;
 
 import java.util.List;

ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/impl/DataSourceConfigServiceImpl.java

@@ -13,9 +13,9 @@ import com.hccake.ballcat.codegen.model.entity.DataSourceConfig;
 import com.hccake.ballcat.codegen.model.qo.DataSourceConfigQO;
 import com.hccake.ballcat.codegen.model.vo.DataSourceConfigVO;
 import com.hccake.ballcat.codegen.service.DataSourceConfigService;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
-import com.hccake.ballcat.common.core.domain.SelectData;
+import com.hccake.ballcat.common.model.domain.SelectData;
 import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/impl/TableInfoServiceImpl.java

@@ -6,8 +6,8 @@ import com.hccake.ballcat.codegen.model.qo.TableInfoQO;
 import com.hccake.ballcat.codegen.model.vo.ColumnInfo;
 import com.hccake.ballcat.codegen.model.vo.TableInfo;
 import com.hccake.ballcat.codegen.service.TableInfoService;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 

ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/impl/TemplateDirectoryEntryServiceImpl.java

@@ -17,7 +17,7 @@ import com.hccake.ballcat.codegen.service.TemplateDirectoryEntryService;
 import com.hccake.ballcat.codegen.service.TemplateInfoService;
 import com.hccake.ballcat.common.core.constant.GlobalConstants;
 import com.hccake.ballcat.common.core.exception.BusinessException;
-import com.hccake.ballcat.common.core.result.BaseResultCode;
+import com.hccake.ballcat.common.model.result.BaseResultCode;
 import com.hccake.ballcat.common.util.TreeUtils;
 import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl;
 import lombok.RequiredArgsConstructor;

ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/impl/TemplateGroupServiceImpl.java

@@ -9,9 +9,9 @@ import com.hccake.ballcat.codegen.model.vo.TemplateGroupVO;
 import com.hccake.ballcat.codegen.service.TemplateDirectoryEntryService;
 import com.hccake.ballcat.codegen.service.TemplateGroupService;
 import com.hccake.ballcat.codegen.service.TemplatePropertyService;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
-import com.hccake.ballcat.common.core.domain.SelectData;
+import com.hccake.ballcat.common.model.domain.SelectData;
 import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;

ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/impl/TemplatePropertyServiceImpl.java

@@ -6,8 +6,8 @@ import com.hccake.ballcat.codegen.model.entity.TemplateProperty;
 import com.hccake.ballcat.codegen.model.qo.TemplatePropertyQO;
 import com.hccake.ballcat.codegen.model.vo.TemplatePropertyVO;
 import com.hccake.ballcat.codegen.service.TemplatePropertyService;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
-import com.hccake.ballcat.common.core.domain.PageResult;
+import com.hccake.ballcat.common.model.domain.PageResult;
 import com.hccake.extend.mybatis.plus.service.impl.ExtendServiceImpl;
 import org.springframework.stereotype.Service;
 

ballcat-codegen/ballcat-codegen-backend/src/main/resources/mapper/DataSourceConfigMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hccake.ballcat.codegen.mapper.DataSourceConfigMapper">
-	<select id="listSelectData" resultType="com.hccake.ballcat.common.core.domain.SelectData">
+	<select id="listSelectData" resultType="com.hccake.ballcat.common.model.domain.SelectData">
 		select
 		name , name as value
 		from

ballcat-codegen/ballcat-codegen-backend/src/main/resources/mapper/TemplateGroupMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hccake.ballcat.codegen.mapper.TemplateGroupMapper">
 
-	<select id="listSelectData" resultType="com.hccake.ballcat.common.core.domain.SelectData">
+	<select id="listSelectData" resultType="com.hccake.ballcat.common.model.domain.SelectData">
 		select
 			name, id as value
 		from

ballcat-common/ballcat-common-conf/pom.xml

@@ -12,6 +12,10 @@
 	<artifactId>ballcat-common-conf</artifactId>
 
 	<dependencies>
+		<dependency>
+			<groupId>com.hccake</groupId>
+			<artifactId>ballcat-common-model</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>com.hccake</groupId>
 			<artifactId>ballcat-common-util</artifactId>

ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/exception/GlobalExceptionHandlerResolver.java

@@ -3,8 +3,8 @@ package com.hccake.ballcat.common.conf.exception;
 import com.hccake.ballcat.common.core.constant.GlobalConstants;
 import com.hccake.ballcat.common.core.exception.BusinessException;
 import com.hccake.ballcat.common.core.exception.handler.GlobalExceptionHandler;
-import com.hccake.ballcat.common.core.result.R;
+import com.hccake.ballcat.common.model.result.R;
-import com.hccake.ballcat.common.core.result.SystemResultCode;
+import com.hccake.ballcat.common.model.result.SystemResultCode;
 import javax.validation.ValidationException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;

ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/holder/ApplicationContextHolder.java

@@ -1,4 +1,4 @@
-package com.hccake.ballcat.common.conf.util;
+package com.hccake.ballcat.common.conf.holder;
 
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
@@ -12,13 +12,13 @@ import java.util.Map;
  * @author lingting 2020/6/12 16:36
  */
 @Component
-public class SpringUtils implements ApplicationContextAware {
+public class ApplicationContextHolder implements ApplicationContextAware {
 
 	private static ApplicationContext context;
 
 	@Override
 	public void setApplicationContext(ApplicationContext context) throws BeansException {
-		SpringUtils.context = context;
+		ApplicationContextHolder.context = context;
 	}
 
 	@SuppressWarnings("unchecked")

ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/web/FilterConfig.java

@@ -1,6 +1,5 @@
 package com.hccake.ballcat.common.conf.web;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.hccake.ballcat.common.conf.config.MonitorProperties;
 import com.hccake.ballcat.common.conf.config.SecurityProperties;
 import com.hccake.ballcat.common.core.filter.ActuatorAuthFilter;
@@ -36,15 +35,13 @@ public class FilterConfig {
 
 	@Bean
 	@ConditionalOnProperty(prefix = "ballcat.actuator", name = "auth", havingValue = "true")
-	public FilterRegistrationBean<ActuatorAuthFilter> actuatorFilterRegistrationBean(MonitorProperties properties,
+	public FilterRegistrationBean<ActuatorAuthFilter> actuatorFilterRegistrationBean(MonitorProperties properties) {
-			ObjectMapper objectMapper) {
 		log.debug("Actuator 过滤器已开启====");
 		FilterRegistrationBean<ActuatorAuthFilter> registrationBean = new FilterRegistrationBean<>();
 		MonitorProperties.Actuator actuator = properties.getActuator();
 		if (actuator.getAuth()) {
 			// 监控开启
-			ActuatorAuthFilter filter = new ActuatorAuthFilter(actuator.getSecretId(), actuator.getSecretKey(),
+			ActuatorAuthFilter filter = new ActuatorAuthFilter(actuator.getSecretId(), actuator.getSecretKey());
-					objectMapper);
 			registrationBean.setFilter(filter);
 			registrationBean.addUrlPatterns("/actuator/*");
 			registrationBean.setOrder(0);

ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/web/IPageArgumentResolver.java

@@ -4,7 +4,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.MethodParameter;
 import org.springframework.web.bind.support.WebDataBinderFactory;
@@ -18,7 +18,7 @@ import java.util.List;
  * 为了兼容处理，当用户直接使用 IPage 类型作为分页参数接收时的 sql 防注入处理 <br/>
  * 现在推荐使用 PageParam 接收分页参数，使用 PageParamArgumentResolver 作为sql过滤处理
  *
- * @see com.hccake.ballcat.common.core.domain.PageParam
+ * @see com.hccake.ballcat.common.model.domain.PageParam
  * @see PageParamArgumentResolver
  * @author Hccake 2021/1/22
  * @version 1.0

ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/web/PageParamArgumentResolver.java

@@ -1,9 +1,9 @@
 package com.hccake.ballcat.common.conf.web;
 
 import cn.hutool.core.util.StrUtil;
-import com.hccake.ballcat.common.core.domain.PageParam;
+import com.hccake.ballcat.common.model.domain.PageParam;
 import com.hccake.ballcat.common.core.exception.SqlCheckedException;
-import com.hccake.ballcat.common.core.result.BaseResultCode;
+import com.hccake.ballcat.common.model.result.BaseResultCode;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.MethodParameter;
 import org.springframework.web.bind.support.WebDataBinderFactory;

ballcat-common/ballcat-common-conf/src/main/resources/META-INF/spring.factories

@@ -5,5 +5,5 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
     com.hccake.ballcat.common.conf.mybatis.MybatisPlusConfig,\
     com.hccake.ballcat.common.conf.web.WebMvcConfig,\
     com.hccake.ballcat.common.conf.config.ExceptionHandleConfig,\
-    com.hccake.ballcat.common.conf.util.SpringUtils
+    com.hccake.ballcat.common.conf.holder.ApplicationContextHolder
 

ballcat-common/ballcat-common-core/pom.xml

@@ -13,6 +13,15 @@
     <packaging>jar</packaging>
 
     <dependencies>
+		<dependency>
+			<groupId>com.hccake</groupId>
+			<artifactId>ballcat-common-model</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.hccake</groupId>
+			<artifactId>ballcat-common-util</artifactId>
+		</dependency>
+
         <!--hutool-->
         <dependency>
             <groupId>cn.hutool</groupId>
@@ -22,19 +31,10 @@
 			<groupId>cn.hutool</groupId>
 			<artifactId>hutool-crypto</artifactId>
 		</dependency>
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-extra</artifactId>
-        </dependency>
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-http</artifactId>
         </dependency>
-        <!--swagger注解-->
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-        </dependency>
 
 		<!-- web相关 -->
 		<dependency>
@@ -46,12 +46,6 @@
 			<artifactId>javax.servlet-api</artifactId>
 		</dependency>
 
-		<!-- security -->
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-core</artifactId>
-        </dependency>
-
 		<!-- slf4j日志 -->
         <dependency>
             <groupId>org.slf4j</groupId>
@@ -70,17 +64,5 @@
 			<scope>compile</scope>
 		</dependency>
 
-		<dependency>
-			<groupId>org.jsoup</groupId>
-			<artifactId>jsoup</artifactId>
-		</dependency>
-        <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-        </dependency>
-		<dependency>
-			<groupId>org.hibernate.validator</groupId>
-			<artifactId>hibernate-validator</artifactId>
-		</dependency>
 	</dependencies>
 </project>

ballcat-common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/exception/BusinessException.java

@@ -1,6 +1,6 @@
 package com.hccake.ballcat.common.core.exception;
 
-import com.hccake.ballcat.common.core.result.ResultCode;
+import com.hccake.ballcat.common.model.result.ResultCode;
 import lombok.Getter;
 
 /**

ballcat-common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/exception/SqlCheckedException.java

@@ -1,6 +1,6 @@
 package com.hccake.ballcat.common.core.exception;
 
-import com.hccake.ballcat.common.core.result.SystemResultCode;
+import com.hccake.ballcat.common.model.result.SystemResultCode;
 
 /**
  * @author Hccake

ballcat-common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/filter/ActuatorAuthFilter.java

@@ -2,10 +2,10 @@ package com.hccake.ballcat.common.core.filter;
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.SecureUtil;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.hccake.ballcat.common.core.constant.HeaderConstants;
-import com.hccake.ballcat.common.core.result.R;
+import com.hccake.ballcat.common.model.result.R;
-import com.hccake.ballcat.common.core.result.SystemResultCode;
+import com.hccake.ballcat.common.model.result.SystemResultCode;
+import com.hccake.ballcat.common.util.JsonUtils;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.web.filter.OncePerRequestFilter;
@@ -29,17 +29,14 @@ public class ActuatorAuthFilter extends OncePerRequestFilter {
 
 	private final String secretKey;
 
-	private final ObjectMapper objectMapper;
-
 	/**
 	 * Instantiates a new Actuator filter.
 	 * @param secretId the secret id
 	 * @param secretKey the secret key
 	 */
-	public ActuatorAuthFilter(String secretId, String secretKey, ObjectMapper objectMapper) {
+	public ActuatorAuthFilter(String secretId, String secretKey) {
 		this.secretId = secretId;
 		this.secretKey = secretKey;
-		this.objectMapper = objectMapper;
 	}
 
 	/**
@@ -67,8 +64,8 @@ public class ActuatorAuthFilter extends OncePerRequestFilter {
 		else {
 			response.setHeader("Content-Type", MediaType.APPLICATION_JSON.toString());
 			response.setStatus(HttpStatus.UNAUTHORIZED.value());
-			String result = objectMapper.writeValueAsString(R.failed(SystemResultCode.UNAUTHORIZED));
+			R<String> r = R.failed(SystemResultCode.UNAUTHORIZED);
-			response.getWriter().write(result);
+			response.getWriter().write(JsonUtils.toJson(r));
 		}
 	}
 

ballcat-common/ballcat-common-desensitize/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>ballcat-common</artifactId>
 		<groupId>com.hccake</groupId>
-		<version>0.0.8-SNAPSHOT</version>
+		<version>${revision}</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

ballcat-common/ballcat-common-model/pom.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<parent>
+		<artifactId>ballcat-common</artifactId>
+		<groupId>com.hccake</groupId>
+		<version>${revision}</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>ballcat-common-model</artifactId>
+	<dependencies>
+		<dependency>
+			<groupId>io.swagger</groupId>
+			<artifactId>swagger-annotations</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>javax.validation</groupId>
+			<artifactId>validation-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.hibernate.validator</groupId>
+			<artifactId>hibernate-validator</artifactId>
+		</dependency>
+
+	</dependencies>
+
+	<properties>
+		<maven.compiler.source>8</maven.compiler.source>
+		<maven.compiler.target>8</maven.compiler.target>
+	</properties>
+
+</project>

ballcat-common/ballcat-common-model/src/main/java/com/hccake/ballcat/common/model/domain/PageParam.java

@@ -1,4 +1,4 @@
-package com.hccake.ballcat.common.core.domain;
+package com.hccake.ballcat.common.model.domain;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

ballcat-common/ballcat-common-model/src/main/java/com/hccake/ballcat/common/model/domain/PageResult.java

@@ -1,4 +1,4 @@
-package com.hccake.ballcat.common.core.domain;
+package com.hccake.ballcat.common.model.domain;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

ballcat-common/ballcat-common-model/src/main/java/com/hccake/ballcat/common/model/domain/SelectData.java

@@ -1,4 +1,4 @@
-package com.hccake.ballcat.common.core.domain;
+package com.hccake.ballcat.common.model.domain;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

ballcat-common/ballcat-common-model/src/main/java/com/hccake/ballcat/common/model/result/BaseResultCode.java

@@ -1,4 +1,4 @@
-package com.hccake.ballcat.common.core.result;
+package com.hccake.ballcat.common.model.result;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

ballcat-common/ballcat-common-model/src/main/java/com/hccake/ballcat/common/model/result/R.java

@@ -1,4 +1,4 @@
-package com.hccake.ballcat.common.core.result;
+package com.hccake.ballcat.common.model.result;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

ballcat-common/ballcat-common-model/src/main/java/com/hccake/ballcat/common/model/result/ResultCode.java

@@ -1,4 +1,4 @@
-package com.hccake.ballcat.common.core.result;
+package com.hccake.ballcat.common.model.result;
 
 /**
  * @author Hccake