1.0.0

api-server/src/main/java/com/zq/api/config/ConfigCache.java

@@ -2,11 +2,11 @@ package com.zq.api.config;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.zq.api.dao.SysConfigDao;
+import com.zq.api.entity.SysConfig;
 import com.zq.api.utils.NumberUtils;
 import com.zq.common.cache.Cache;
 import com.zq.common.cache.CacheManager;
 import com.zq.common.config.base.SpringContextHolder;
-import com.zq.common.entity.SysConfig;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.HashMap;

api-server/src/main/java/com/zq/api/dao/ApiLogDao.java

 package com.zq.api.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zq.common.entity.ApiLog;
+import com.zq.api.entity.ApiLog;
 import org.springframework.stereotype.Repository;
 
 /**

api-server/src/main/java/com/zq/api/dao/SysConfigDao.java

 package com.zq.api.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zq.common.entity.SysConfig;
+import com.zq.api.entity.SysConfig;
 import org.springframework.stereotype.Repository;
 
 /**

common-utils/src/main/java/com/zq/common/entity/ApiLog.java → api-server/src/main/java/com/zq/api/entity/ApiLog.java

-package com.zq.common.entity;
+package com.zq.api.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

common-utils/src/main/java/com/zq/common/entity/SysConfig.java → api-server/src/main/java/com/zq/api/entity/SysConfig.java

-package com.zq.common.entity;
+package com.zq.api.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

api-server/src/main/java/com/zq/api/service/ApiService.java

@@ -4,11 +4,11 @@ import cn.hutool.core.date.DateUtil;
 import com.zq.api.config.ConfigCache;
 import com.zq.api.constant.ApiCodeEnum;
 import com.zq.api.dao.ApiLogDao;
+import com.zq.api.entity.ApiLog;
 import com.zq.api.form.ApiForm;
 import com.zq.api.form.ApiResp;
 import com.zq.api.utils.ApiUtils;
 import com.zq.api.utils.ReflectionUtils;
-import com.zq.common.entity.ApiLog;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Async;

common-utils/src/main/java/com/zq/common/entity/SysLog.java

-package com.zq.common.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.Date;
-
-/**
- * 系统日志(SysLog)实体类
- *
- * @author makejava
- * @since 2021-07-12 12:43:07
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-@TableName(value = "sys_log")
-public class SysLog {
-
-    /**
-     * ID
-     */
-    @ApiModelProperty("ID")
-    private Long logId;
-
-    /**
-     * description
-     */
-    private String description;
-
-    /**
-     * logType
-     */
-    private String logType;
-
-    /**
-     * method
-     */
-    private String method;
-
-    /**
-     * params
-     */
-    private String params;
-
-    /**
-     * requestIp
-     */
-    private String requestIp;
-
-    /**
-     * time
-     */
-    private Long time;
-
-    /**
-     * username
-     */
-    private String username;
-
-    /**
-     * address
-     */
-    private String address;
-
-    /**
-     * browser
-     */
-    private String browser;
-
-    /**
-     * exceptionDetail
-     */
-    private String exceptionDetail;
-
-    /**
-     * createTime
-     */
-    private Date createTime;
-
-}
\ No newline at end of file

pom.xml

@@ -33,7 +33,7 @@
         <module>gateway-server</module>
         <module>eureka-server</module>
         <module>config-server</module>
-        <module>common-utils</module>
+        <module>xxx-common-utils</module>
         <module>sys-server</module>
         <module>file-server</module>
         <module>api-server</module>

user-server/pom.xml

@@ -14,7 +14,7 @@
     <dependencies>
         <dependency>
             <groupId>com.zq</groupId>
-            <artifactId>common-utils</artifactId>
+            <artifactId>xxx-common-utils</artifactId>
             <version>1.0.0</version>
         </dependency>
         <dependency>

user-server/src/main/java/com/zq/user/controller/admin/UserAdminController.java

 package com.zq.user.controller.admin;
 
-import com.zq.common.entity.AppUser;
 import com.zq.common.vo.PageVo;
 import com.zq.common.vo.ResultVo;
+import com.zq.user.entity.AppUser;
 import com.zq.user.service.UserService;
 import com.zq.user.vo.FindAppUserVo;
 import io.swagger.annotations.Api;

user-server/src/main/java/com/zq/user/controller/app/UserController.java

@@ -3,12 +3,12 @@ package com.zq.user.controller.app;
 
 import com.zq.common.annotation.Limit;
 import com.zq.common.config.limit.LimitType;
-import com.zq.common.entity.AppUser;
 import com.zq.common.utils.AssertUtils;
 import com.zq.common.utils.ValidateUtil;
 import com.zq.common.vo.ApiTokenVo;
 import com.zq.common.vo.PageVo;
 import com.zq.common.vo.ResultVo;
+import com.zq.user.entity.AppUser;
 import com.zq.user.service.UserService;
 import com.zq.user.vo.FindAppUserVo;
 import com.zq.user.vo.LoginVo;

user-server/src/main/java/com/zq/user/dao/AppUserDao.java

 package com.zq.user.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.zq.common.entity.AppUser;
+import com.zq.user.entity.AppUser;
 import org.springframework.stereotype.Repository;
 
 /**

common-utils/src/main/java/com/zq/common/entity/AppUser.java → user-server/src/main/java/com/zq/user/entity/AppUser.java

-package com.zq.common.entity;
+package com.zq.user.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

user-server/src/main/java/com/zq/user/service/UserService.java

@@ -8,13 +8,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.zq.common.config.redis.RedisUtils;
 import com.zq.common.config.security.ApiTokenUtils;
-import com.zq.common.entity.AppUser;
 import com.zq.common.http.HttpRequestUtils;
 import com.zq.common.utils.AssertUtils;
 import com.zq.common.utils.PagingUtils;
 import com.zq.common.vo.ApiTokenVo;
 import com.zq.common.vo.PageVo;
 import com.zq.user.dao.AppUserDao;
+import com.zq.user.entity.AppUser;
 import com.zq.user.manager.UserCacheKeys;
 import com.zq.user.vo.FindAppUserVo;
 import com.zq.user.vo.LoginVo;