diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/config/ThreadPoolConfig.java b/ruoyi-common/src/main/java/com/ruoyi/common/config/ThreadPoolConfig.java
deleted file mode 100644
index dac6f6e8b..000000000
--- a/ruoyi-common/src/main/java/com/ruoyi/common/config/ThreadPoolConfig.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package com.ruoyi.framework.config;
-
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.ThreadPoolExecutor;
-
-import org.apache.commons.lang3.concurrent.BasicThreadFactory;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
-import com.ruoyi.common.utils.Threads;
-
-/**
- * 线程池配置
- *
- * @author ruoyi
- **/
-@Configuration
-public class ThreadPoolConfig {
- // 核心线程池大小
- private int corePoolSize = 50;
-
- // 最大可创建的线程数
- private int maxPoolSize = 200;
-
- // 队列最大长度
- private int queueCapacity = 1000;
-
- // 线程池维护线程所允许的空闲时间
- private int keepAliveSeconds = 300;
-
- @Bean(name = "threadPoolTaskExecutor")
- public ThreadPoolTaskExecutor threadPoolTaskExecutor() {
- ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
- executor.setMaxPoolSize(maxPoolSize);
- executor.setCorePoolSize(corePoolSize);
- executor.setQueueCapacity(queueCapacity);
- executor.setKeepAliveSeconds(keepAliveSeconds);
- // 线程池对拒绝任务(无线程可用)的处理策略
- executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
- return executor;
- }
-
- /**
- * 执行周期性或定时任务
- */
- @Bean(name = "scheduledExecutorService")
- protected ScheduledExecutorService scheduledExecutorService() {
- return new ScheduledThreadPoolExecutor(corePoolSize,
- new BasicThreadFactory.Builder().namingPattern("schedule-pool-%d").daemon(true).build()) {
- @Override
- protected void afterExecute(Runnable r, Throwable t) {
- super.afterExecute(r, t);
- Threads.printException(r, t);
- }
- };
- }
-}
diff --git a/ruoyi-common/src/main/resources/application.yml b/ruoyi-common/src/main/resources/application.yml
deleted file mode 100644
index 24c97bc13..000000000
--- a/ruoyi-common/src/main/resources/application.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-# 项目相关配置
-ruoyi:
- # 名称
- name: RuoYi
- # 版本
- version: 3.3.0
- # 版权年份
- copyrightYear: 2020
- # 实例演示开关
- demoEnabled: true
- # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
- profile: D:/ruoyi/uploadPath
- # 获取ip地址开关
- addressEnabled: false
-
-# 开发环境配置
-server:
- # 服务器的HTTP端口，默认为8080
- port: 8080
- servlet:
- # 应用的访问路径
- context-path: /
- tomcat:
- # tomcat的URI编码
- uri-encoding: UTF-8
- # tomcat最大线程数，默认为200
- max-threads: 800
- # Tomcat启动初始化的线程数，默认值25
- min-spare-threads: 30
-
-# 日志配置
-logging:
- level:
- com.ruoyi: debug
- org.springframework: warn
diff --git a/ruoyi-ui/src/api/infra/apiAccessLog.js b/ruoyi-ui/src/api/infra/apiAccessLog.js
new file mode 100644
index 000000000..5d1249a1e
--- /dev/null
+++ b/ruoyi-ui/src/api/infra/apiAccessLog.js
@@ -0,0 +1,55 @@
+import request from '@/utils/request'
+
+// 创建API 访问日志
+export function createApiAccessLog(data) {
+ return request({
+ url: '/infra/api-access-log/create',
+ method: 'post',
+ data: data
+ })
+}
+
+// 更新API 访问日志
+export function updateApiAccessLog(data) {
+ return request({
+ url: '/infra/api-access-log/update',
+ method: 'put',
+ data: data
+ })
+}
+
+
+// 删除API 访问日志
+export function deleteApiAccessLog(id) {
+ return request({
+ url: '/infra/api-access-log/delete?id=' + id,
+ method: 'delete'
+ })
+}
+
+// 获得API 访问日志
+export function getApiAccessLog(id) {
+ return request({
+ url: '/infra/api-access-log/get?id=' + id,
+ method: 'get'
+ })
+}
+
+// 获得API 访问日志分页
+export function getApiAccessLogPage(query) {
+ return request({
+ url: '/infra/api-access-log/page',
+ method: 'get',
+ params: query
+ })
+}
+
+// 导出API 访问日志 Excel
+export function exportApiAccessLogExcel(query) {
+ return request({
+ url: '/infra/api-access-log/export-excel',
+ method: 'get',
+ params: query,
+ responseType: 'blob'
+ })
+}
diff --git a/ruoyi-ui/src/utils/dict.js b/ruoyi-ui/src/utils/dict.js
index 30bb2a099..f402fd598 100644
--- a/ruoyi-ui/src/utils/dict.js
+++ b/ruoyi-ui/src/utils/dict.js
@@ -6,6 +6,8 @@
import store from '@/store'
export const DICT_TYPE = {
+ USER_TYPE: 'user_type',
+
SYS_COMMON_STATUS: 'sys_common_status',
SYS_MENU_TYPE: 'sys_menu_type',
SYS_ROLE_TYPE: 'sys_role_type',
diff --git a/ruoyi-ui/src/views/infra/apiAccessLog/index.vue b/ruoyi-ui/src/views/infra/apiAccessLog/index.vue
new file mode 100644
index 000000000..ee7819f3c
--- /dev/null
+++ b/ruoyi-ui/src/views/infra/apiAccessLog/index.vue
@@ -0,0 +1,204 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+ {{ getDictDataLabel(DICT_TYPE.USER_TYPE, scope.row.userType) }}
+
+ >
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.beginTime, '{y}-{m}-{d}') }}
+
+
+
+
+ {{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}
+
+
+
+
+
+
+
+
+
+
+
+