..

.idea/encodings.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/lxq-admin/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/lxq-admin/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/lxq-common/lxq-common-core/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/lxq-common/lxq-common-core/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/lxq-common/lxq-common-excel/src/main/java" charset="UTF-8" />

.idea/misc.xml

@@ -7,6 +7,7 @@
         <option value="$PROJECT_DIR$/pom.xml" />
         <option value="$PROJECT_DIR$/lxq-common/pom.xml" />
         <option value="$PROJECT_DIR$/lxq-system/pom.xml" />
+        <option value="$PROJECT_DIR$/lxq-admin/pom.xml" />
       </list>
     </option>
     <option name="ignoredFiles">

lxq-admin/pom.xml

@@ -0,0 +1,25 @@
+<?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">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>lxq</artifactId>
+        <groupId>com.lxq</groupId>
+        <version>3.5.9</version>
+    </parent>
+
+    <artifactId>lxq-admin</artifactId>
+
+    <description>管理后台</description>
+
+    <dependencies>
+
+        <!--日志处理-->
+        <dependency>
+            <groupId>com.lxq</groupId>
+            <artifactId>lxq-system</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

lxq-system/src/main/java/com/lxq/system/biz/KxsSysApplication.java → lxq-admin/src/main/java/com/lxq/admin/biz/LxqAdminApplication.java

@@ -1,8 +1,8 @@
-package com.lxq.system.biz;
+package com.lxq.admin.biz;
 
 import com.lxq.common.security.annotation.EnableAuthResourceServer;
 import com.lxq.common.security.annotation.EnableLoginResourceServer;
-import com.lxq.common.swagger.annotation.EnableKxsDoc;
+import com.lxq.common.swagger.annotation.EnablelxqDoc;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.scheduling.annotation.EnableAsync;
@@ -16,12 +16,12 @@ import org.springframework.scheduling.annotation.EnableAsync;
 @SpringBootApplication
 @EnableLoginResourceServer
 @EnableAuthResourceServer
-@EnableKxsDoc(value = "admin")
+@EnablelxqDoc(value = "admin")
 @EnableAsync
-public class KxsSysApplication {
+public class LxqAdminApplication {
 
 	public static void main(String[] args) {
-		SpringApplication.run(KxsSysApplication.class, args);
+		SpringApplication.run(LxqAdminApplication.class, args);
 	}
 
 }

lxq-system/src/main/java/com/lxq/system/biz/controller/SysClientController.java → lxq-admin/src/main/java/com/lxq/admin/biz/controller/SysClientController.java

@@ -1,4 +1,4 @@
-package com.lxq.system.biz.controller;
+package com.lxq.admin.biz.controller;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;

lxq-system/src/main/java/com/lxq/system/biz/controller/SysDeptController.java → lxq-admin/src/main/java/com/lxq/admin/biz/controller/SysDeptController.java

@@ -1,5 +1,5 @@
 
-package com.lxq.system.biz.controller;
+package com.lxq.admin.biz.controller;
 
 import com.lxq.common.core.util.R;
 import com.lxq.common.log.annotation.SysLog;

lxq-system/src/main/java/com/lxq/system/biz/controller/SysDictController.java → lxq-admin/src/main/java/com/lxq/admin/biz/controller/SysDictController.java

@@ -1,4 +1,4 @@
-package com.lxq.system.biz.controller;
+package com.lxq.admin.biz.controller;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;

lxq-system/src/main/java/com/lxq/system/biz/controller/SysFileController.java → lxq-admin/src/main/java/com/lxq/admin/biz/controller/SysFileController.java

@@ -1,5 +1,5 @@
 
-package com.lxq.system.biz.controller;
+package com.lxq.admin.biz.controller;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

lxq-system/src/main/java/com/lxq/system/biz/controller/SysLogController.java → lxq-admin/src/main/java/com/lxq/admin/biz/controller/SysLogController.java

@@ -1,4 +1,4 @@
-package com.lxq.system.biz.controller;
+package com.lxq.admin.biz.controller;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.lxq.common.core.util.R;
 import com.lxq.common.excel.annotation.ResponseExcel;
 import com.lxq.common.security.annotation.Inner;
-import com.lxq.system.biz.dto.admin.SysLogDTO;
+import com.lxq.system.biz.domain.dto.SysLogDTO;
 import com.lxq.system.biz.model.SysLog;
 import com.lxq.system.biz.service.SysLogService;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;

lxq-system/src/main/java/com/lxq/system/biz/controller/SysMenuController.java → lxq-admin/src/main/java/com/lxq/admin/biz/controller/SysMenuController.java

@@ -1,4 +1,4 @@
-package com.lxq.system.biz.controller;
+package com.lxq.admin.biz.controller;
 
 import com.lxq.common.core.util.R;
 import com.lxq.common.log.annotation.SysLog;

lxq-system/src/main/java/com/lxq/system/biz/controller/SysPostController.java → lxq-admin/src/main/java/com/lxq/admin/biz/controller/SysPostController.java

@@ -1,4 +1,4 @@
-package com.lxq.system.biz.controller;
+package com.lxq.admin.biz.controller;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;

lxq-system/src/main/java/com/lxq/system/biz/controller/SysPublicParamController.java → lxq-admin/src/main/java/com/lxq/admin/biz/controller/SysPublicParamController.java

@@ -1,4 +1,4 @@
-package com.lxq.system.biz.controller;
+package com.lxq.admin.biz.controller;
 
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;

lxq-system/src/main/java/com/lxq/system/biz/controller/SysRoleController.java → lxq-admin/src/main/java/com/lxq/admin/biz/controller/SysRoleController.java

@@ -1,4 +1,4 @@
-package com.lxq.system.biz.controller;
+package com.lxq.admin.biz.controller;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.text.CharSequenceUtil;
@@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.lxq.common.core.constant.CacheConstants;
 import com.lxq.common.core.util.R;
 import com.lxq.common.log.annotation.SysLog;
+import com.lxq.system.biz.domain.vo.RoleVO;
 import com.lxq.system.biz.model.SysRole;
-import com.lxq.system.biz.vo.admin.RoleVO;
 import com.lxq.system.biz.service.SysRoleService;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;

lxq-system/src/main/java/com/lxq/system/biz/controller/SysRuleMakingController.java → lxq-admin/src/main/java/com/lxq/admin/biz/controller/SysRuleMakingController.java

@@ -1,4 +1,4 @@
-package com.lxq.system.biz.controller;
+package com.lxq.admin.biz.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.lxq.common.core.util.R;

lxq-system/src/main/java/com/lxq/system/biz/controller/SysUserController.java → lxq-admin/src/main/java/com/lxq/admin/biz/controller/SysUserController.java

@@ -1,5 +1,5 @@
 
-package com.lxq.system.biz.controller;
+package com.lxq.admin.biz.controller;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,10 +8,10 @@ import com.lxq.common.core.util.R;
 import com.lxq.common.log.annotation.SysLog;
 import com.lxq.common.security.annotation.Inner;
 import com.lxq.common.security.util.SecurityUtils;
-import com.lxq.system.biz.dto.admin.UserDTO;
-import com.lxq.system.biz.model.SysUser;
-import com.lxq.system.biz.vo.admin.UserVO;
 import com.lxq.system.biz.constant.enums.SysErrorTypeEnum;
+import com.lxq.system.biz.domain.dto.UserDTO;
+import com.lxq.system.biz.domain.vo.UserVO;
+import com.lxq.system.biz.model.SysUser;
 import com.lxq.system.biz.service.SysUserService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
@@ -38,18 +38,6 @@ public class SysUserController {
 
 	private final SysUserService userService;
 
-	@Inner(value = false)
-	@GetMapping("/testJoinPage")
-	public R testJoinPage(@ParameterObject Page<UserVO> page, @ParameterObject UserDTO param) {
-
-		Page<UserVO> users = userService.testJoinPage(page, param);
-
-		return R.ok(users);
-	}
-
-
-
-
 	/**
 	 * 获取指定用户全部信息
 	 * @return 用户信息

lxq-system/src/main/java/com/lxq/system/biz/controller/TokenController.java → lxq-admin/src/main/java/com/lxq/admin/biz/controller/TokenController.java

@@ -1,5 +1,5 @@
 
-package com.lxq.system.biz.controller;
+package com.lxq.admin.biz.controller;
 
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.TemporalAccessorUtil;

lxq-common/lxq-common-log/src/main/java/com/lxq/common/log/event/SysLogListener.java → lxq-admin/src/main/java/com/lxq/admin/biz/event/SysLogListener.java

@@ -1,4 +1,4 @@
-package com.lxq.common.log.event;
+package com.lxq.admin.biz.event;
 
 import cn.hutool.core.text.CharSequenceUtil;
 import com.fasterxml.jackson.annotation.JsonFilter;
@@ -6,11 +6,12 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ser.FilterProvider;
 import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter;
 import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;
-import com.lxq.common.core.constant.SecurityConstants;
 import com.lxq.common.core.jackson.SkyJavaTimeModule;
 import com.lxq.common.log.config.SkyLogProperties;
-import com.lxq.system.biz.feign.RemoteLogService;
+import com.lxq.common.log.event.SysLogEvent;
+import com.lxq.common.log.event.SysLogEventSource;
 import com.lxq.system.biz.model.SysLog;
+import com.lxq.system.biz.service.SysLogService;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
@@ -35,7 +36,7 @@ public class SysLogListener implements InitializingBean {
 	// new 一个 避免日志脱敏策略影响全局ObjectMapper
 	private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
 
-	private final RemoteLogService remoteLogService;
+	private final SysLogService sysLogService;
 
 	private final SkyLogProperties logProperties;
 
@@ -54,7 +55,7 @@ public class SysLogListener implements InitializingBean {
 			sysLog.setParams(CharSequenceUtil.subPre(params, logProperties.getMaxLength()));
 		}
 		log.info("保存日志:{}", sysLog);
-		remoteLogService.saveLog(sysLog, SecurityConstants.FROM_IN);
+		sysLogService.saveLog(sysLog);
 	}
 
 	@Override

lxq-system/src/main/java/com/lxq/system/biz/security/service/LxqRemoteRegisteredClientRepository.java → lxq-admin/src/main/java/com/lxq/admin/biz/security/LxqRemoteRegisteredClientRepository.java

@@ -1,4 +1,4 @@
-package com.lxq.system.biz.security.service;
+package com.lxq.admin.biz.security;
 
 import cn.hutool.core.util.BooleanUtil;
 import cn.hutool.core.util.StrUtil;

lxq-system/src/main/java/com/lxq/system/biz/security/service/LxqUserDetailsServiceImpl.java → lxq-admin/src/main/java/com/lxq/admin/biz/security/LxqUserDetailsServiceImpl.java

@@ -1,4 +1,4 @@
-package com.lxq.system.biz.security.service;
+package com.lxq.admin.biz.security;
 
 import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.ArrayUtil;

lxq-common/lxq-common-core/src/main/java/com/lxq/common/core/constant/enums/PrintChannelCodeEnum.java

@@ -1,39 +0,0 @@
-package com.lxq.common.core.constant.enums;
-
-import jakarta.validation.constraints.NotBlank;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * 打印通道代码枚举
- *
- * @author lixueqiang
- * @date 2025/07/22
- */
-@Getter
-@RequiredArgsConstructor
-public enum PrintChannelCodeEnum {
-
-    FEIE("feie", "飞鹅打印"),
-    SUNMI("sunmi", "商米打印")
-    ;
-
-    private final String code;
-
-    private final String description;
-
-    private static final Map<String, PrintChannelCodeEnum> CHANNEL_CODE_ENUM_MAP = new HashMap<>();
-
-    static {
-        for (PrintChannelCodeEnum value : PrintChannelCodeEnum.values()) {
-            CHANNEL_CODE_ENUM_MAP.put(value.getCode(), value);
-        }
-    }
-
-    public static PrintChannelCodeEnum getChannelCode(@NotBlank String ifCode) {
-        return CHANNEL_CODE_ENUM_MAP.get(ifCode);
-    }
-}

lxq-common/lxq-common-log/pom.xml

@@ -26,6 +26,11 @@
             <groupId>com.lxq</groupId>
             <artifactId>lxq-common-core</artifactId>
         </dependency>
+        <!--引入AOP依赖-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+        </dependency>
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-extra</artifactId>

lxq-common/lxq-common-log/src/main/java/com/lxq/common/log/aspect/SysLogAspect.java

@@ -2,7 +2,6 @@
 package com.lxq.common.log.aspect;
 
 import cn.hutool.core.text.CharSequenceUtil;
-import cn.hutool.core.util.StrUtil;
 import com.lxq.common.core.util.SpringContextHolder;
 import com.lxq.common.log.event.SysLogEvent;
 import com.lxq.common.log.event.SysLogEventSource;

lxq-common/lxq-common-log/src/main/java/com/lxq/common/log/event/SysLog.java

@@ -0,0 +1,103 @@
+package com.lxq.common.log.event;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 日志表
+ * </p>
+ *
+ * @author 没秃顶的码农
+ * @since 2023-11-20
+ */
+@Data
+public class SysLog implements Serializable {
+
+	@Serial
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 编号
+	 */
+	private Long id;
+
+	/**
+	 * 日志类型
+	 */
+	private String logType;
+
+	/**
+	 * 日志标题
+	 */
+	private String title;
+
+	/**
+	 * 创建者
+	 */
+	private String createBy;
+
+	/**
+	 * 创建时间
+	 */
+	private LocalDateTime createTime;
+
+	/**
+	 * 更新时间
+	 */
+	private LocalDateTime updateTime;
+
+	/**
+	 * 操作IP地址
+	 */
+	private String remoteAddr;
+
+	/**
+	 * 用户代理
+	 */
+	private String userAgent;
+
+	/**
+	 * 请求URI
+	 */
+	private String requestUri;
+
+	/**
+	 * 操作方式
+	 */
+	private String method;
+
+	/**
+	 * 操作提交的数据
+	 */
+	private String params;
+
+	/**
+	 * 执行时间
+	 */
+	private Long time;
+
+	/**
+	 * 异常信息
+	 */
+	private String exception;
+
+	/**
+	 * 服务ID
+	 */
+	private String serviceId;
+
+	/**
+	 * 删除标记
+	 */
+	private String delFlag;
+
+	/**
+	 * 动态表名后缀
+	 */
+	private String tableSuffix;
+
+}

lxq-common/lxq-common-log/src/main/java/com/lxq/common/log/event/SysLogEvent.java

@@ -1,6 +1,5 @@
 package com.lxq.common.log.event;
 
-import com.lxq.system.biz.model.SysLog;
 import org.springframework.context.ApplicationEvent;
 
 /**

lxq-common/lxq-common-log/src/main/java/com/lxq/common/log/event/SysLogEventSource.java

@@ -1,6 +1,5 @@
 package com.lxq.common.log.event;
 
-import com.lxq.system.biz.model.SysLog;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

lxq-system/src/main/java/com/lxq/system/biz/service/SysLogService.java

@@ -2,7 +2,7 @@ package com.lxq.system.biz.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.lxq.system.biz.dto.admin.SysLogDTO;
+import com.lxq.system.biz.domain.dto.SysLogDTO;
 import com.lxq.system.biz.model.SysLog;
 
 /**

lxq-system/src/main/java/com/lxq/system/biz/service/SysRoleService.java

@@ -1,8 +1,8 @@
 package com.lxq.system.biz.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.lxq.system.biz.vo.admin.RoleExcelVO;
-import com.lxq.system.biz.vo.admin.RoleVO;
+import com.lxq.system.biz.domain.vo.RoleExcelVO;
+import com.lxq.system.biz.domain.vo.RoleVO;
 import com.lxq.system.biz.model.SysRole;
 
 import java.util.List;

lxq-system/src/main/java/com/lxq/system/biz/service/impl/SysLogServiceImpl.java

@@ -7,10 +7,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.lxq.system.biz.dto.admin.SysLogDTO;
+import com.lxq.system.biz.domain.dto.SysLogDTO;
 import com.lxq.system.biz.mapper.SysLogMapper;
 import com.lxq.system.biz.service.SysLogService;
 import com.lxq.system.biz.model.SysLog;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -50,13 +51,14 @@ public class SysLogServiceImpl extends ServiceImpl<SysLogMapper, SysLog> impleme
 
 	/**
 	 * 插入日志
-	 * @param sysLog 日志对象
+	 * @param param 日志对象
 	 * @return true/false
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public Boolean saveLog(SysLog sysLog) {
-		baseMapper.insert(sysLog);
+	public Boolean saveLog(SysLog param) {
+
+		baseMapper.insert(param);
 		return Boolean.TRUE;
 	}
 

lxq-system/src/main/java/com/lxq/system/biz/service/impl/SysRoleServiceImpl.java

@@ -4,8 +4,8 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.lxq.system.biz.vo.admin.RoleExcelVO;
-import com.lxq.system.biz.vo.admin.RoleVO;
+import com.lxq.system.biz.domain.vo.RoleExcelVO;
+import com.lxq.system.biz.domain.vo.RoleVO;
 import com.lxq.system.biz.mapper.SysRoleMapper;
 import com.lxq.system.biz.service.SysRoleMenuService;
 import com.lxq.system.biz.service.SysRoleService;

pom.xml

@@ -119,6 +119,12 @@
                 <version>${alipay.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.lxq</groupId>
+                <artifactId>lxq-system</artifactId>
+                <version>${lxq.common.version}</version>
+            </dependency>
+
             <!--lxq 公共版本定义-->
             <dependency>
                 <groupId>com.lxq</groupId>