diff --git a/README.md b/README.md
index 9a50c424..acd3e7e5 100644
--- a/README.md
+++ b/README.md
@@ -51,12 +51,13 @@
## 演示环境
-演示地址: http://101.43.254.243:1081/
-演示账号: admin/admin
-
-⭐ 体验后可以点一下 `star` 这对我很重要!
-🌈 如果本项目对你有帮助请帮忙推广一下 让更多的人知道此项目!
-[github](https://github.com/lijiahangmax/orion-visor) [gitee](https://gitee.com/lijiahangmax/orion-visor)
+* 🔗 演示地址: http://101.43.254.243:1081/
+* 🔏 演示账号: admin/admin
+* ⭐ 体验后可以点一下 `star` 这对我很重要! [github](https://github.com/lijiahangmax/orion-visor) [gitee](https://gitee.com/lijiahangmax/orion-visor)
+* 🌈 如果本项目对你有帮助请帮忙推广一下 让更多的人知道此项目!
+* 🎭 演示环境部分功能不可用, 完整功能请本地部署!
+* 📛 演示环境请不要随便删除数据!
+* 📧 如果演示环境不可用请联系我!
## 快速开始
diff --git a/docker-compose.yml b/docker-compose.yml
index 85085b05..705b773b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
version: '3.3'
services:
orion-visor-service:
- image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.0.5
+ image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.0.6
ports:
- 1081:80
environment:
@@ -20,7 +20,7 @@ services:
- orion-visor-mysql
- orion-visor-redis
orion-visor-mysql:
- image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.0.5
+ image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.0.6
privileged: true
ports:
- 3307:3306
@@ -34,7 +34,7 @@ services:
- /data/orion-visor-space/docker-volumes/orion-visor-mysql/var-lib-mysql-files:/var/lib/mysql-files
- /data/orion-visor-space/docker-volumes/orion-visor-mysql/etc-mysql:/etc/mysql
orion-visor-redis:
- image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.0.5
+ image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.0.6
privileged: true
ports:
- 6380:6379
diff --git a/docker/orion-visor-mysql/build.sh b/docker/orion-visor-mysql/build.sh
index 4f267ddb..960d3eda 100644
--- a/docker/orion-visor-mysql/build.sh
+++ b/docker/orion-visor-mysql/build.sh
@@ -1,5 +1,5 @@
#/bin/bash
-version=2.0.5
+version=2.0.6
cp -r ../../sql ./sql
docker build -t orion-visor-mysql:${version} .
rm -rf ./sql
diff --git a/docker/orion-visor-redis/build.sh b/docker/orion-visor-redis/build.sh
index 61ab0bad..cef014d5 100644
--- a/docker/orion-visor-redis/build.sh
+++ b/docker/orion-visor-redis/build.sh
@@ -1,5 +1,5 @@
#/bin/bash
-version=2.0.5
+version=2.0.6
docker build -t orion-visor-redis:${version} .
docker tag orion-visor-redis:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version}
docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version}
diff --git a/docker/orion-visor-service/build.sh b/docker/orion-visor-service/build.sh
index 13bafc9d..f8fea604 100644
--- a/docker/orion-visor-service/build.sh
+++ b/docker/orion-visor-service/build.sh
@@ -1,5 +1,5 @@
#/bin/bash
-version=2.0.5
+version=2.0.6
mv ../../orion-visor-launch/target/orion-visor-launch.jar ./orion-visor-launch.jar
mv ../../orion-visor-ui/dist ./dist
docker build -t orion-visor-service:${version} .
diff --git a/orion-visor-dependencies/pom.xml b/orion-visor-dependencies/pom.xml
index eaf501a6..10503d6c 100644
--- a/orion-visor-dependencies/pom.xml
+++ b/orion-visor-dependencies/pom.xml
@@ -14,7 +14,7 @@
https://github.com/lijiahangmax/orion-visor
- 2.0.5
+ 2.0.6
2.7.17
2.7.15
1.5.0
diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/AppConst.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/AppConst.java
index fbec7e9b..33851407 100644
--- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/AppConst.java
+++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/AppConst.java
@@ -14,7 +14,7 @@ public interface AppConst extends OrionConst {
/**
* 同 ${orion.version} 迭代时候需要手动更改
*/
- String VERSION = "2.0.5";
+ String VERSION = "2.0.6";
String ORION_VISOR = "orion-visor";
diff --git a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/Const.java b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/Const.java
index d91c838c..6e2c0e8e 100644
--- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/Const.java
+++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/constant/Const.java
@@ -25,8 +25,6 @@ public interface Const extends com.orion.lang.constant.Const, FieldConst, CnCons
Integer DEFAULT_SORT = 10;
- int LOGIN_HISTORY_COUNT = 30;
-
Long NONE_ID = -1L;
Integer DEFAULT_VERSION = 1;
diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/MineController.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/MineController.java
index a320a149..153fdf1b 100644
--- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/MineController.java
+++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/MineController.java
@@ -70,8 +70,8 @@ public class MineController {
@IgnoreLog(IgnoreLogMode.RET)
@GetMapping("/login-history")
@Operation(summary = "查询当前用户登录日志")
- public List getCurrentLoginHistory() {
- return mineService.getCurrentLoginHistory();
+ public List getCurrentLoginHistory(@RequestParam("count") Integer count) {
+ return mineService.getCurrentLoginHistory(count);
}
@IgnoreLog(IgnoreLogMode.RET)
diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/SystemUserController.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/SystemUserController.java
index 30ed137d..c386b044 100644
--- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/SystemUserController.java
+++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/controller/SystemUserController.java
@@ -182,8 +182,9 @@ public class SystemUserController {
@GetMapping("/login-history")
@Operation(summary = "查询用户登录日志")
@PreAuthorize("@ss.hasPermission('infra:system-user:login-history')")
- public List getLoginHistory(@RequestParam("username") String username) {
- return operatorLogService.getLoginHistory(username);
+ public List getLoginHistory(@RequestParam("username") String username,
+ @RequestParam("count") Integer count) {
+ return operatorLogService.getLoginHistory(username, count);
}
}
diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/MineService.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/MineService.java
index d744f570..3286e261 100644
--- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/MineService.java
+++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/MineService.java
@@ -46,9 +46,10 @@ public interface MineService {
/**
* 获取当前用户登录日志
*
+ * @param count count
* @return 登录日志
*/
- List getCurrentLoginHistory();
+ List getCurrentLoginHistory(Integer count);
/**
* 获取当前用户会话列表
diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/OperatorLogService.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/OperatorLogService.java
index 78a6d5c7..e60827b3 100644
--- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/OperatorLogService.java
+++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/OperatorLogService.java
@@ -60,8 +60,9 @@ public interface OperatorLogService {
* 查询用户登录日志
*
* @param username username
+ * @param count count
* @return rows
*/
- List getLoginHistory(String username);
+ List getLoginHistory(String username, Integer count);
}
diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/MineServiceImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/MineServiceImpl.java
index 1bea7dfd..9fde8a95 100644
--- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/MineServiceImpl.java
+++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/MineServiceImpl.java
@@ -77,9 +77,9 @@ public class MineServiceImpl implements MineService {
}
@Override
- public List getCurrentLoginHistory() {
+ public List getCurrentLoginHistory(Integer count) {
String username = SecurityUtils.getLoginUsername();
- return operatorLogService.getLoginHistory(username);
+ return operatorLogService.getLoginHistory(username, count);
}
@Override
diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/OperatorLogServiceImpl.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/OperatorLogServiceImpl.java
index e2ac7db6..37fe8062 100644
--- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/OperatorLogServiceImpl.java
+++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/OperatorLogServiceImpl.java
@@ -4,9 +4,10 @@ import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.orion.lang.define.wrapper.DataGrid;
import com.orion.lang.utils.Arrays1;
+import com.orion.lang.utils.Valid;
import com.orion.visor.framework.biz.operator.log.core.model.OperatorLogModel;
import com.orion.visor.framework.biz.operator.log.core.utils.OperatorLogs;
-import com.orion.visor.framework.common.constant.Const;
+import com.orion.visor.framework.common.constant.ErrorMessage;
import com.orion.visor.module.infra.convert.OperatorLogConvert;
import com.orion.visor.module.infra.dao.OperatorLogDAO;
import com.orion.visor.module.infra.define.operator.AuthenticationOperatorType;
@@ -81,7 +82,8 @@ public class OperatorLogServiceImpl implements OperatorLogService {
}
@Override
- public List getLoginHistory(String username) {
+ public List getLoginHistory(String username, Integer count) {
+ Valid.gt(count, 0, ErrorMessage.PARAM_ERROR);
// 条件
OperatorLogQueryRequest request = new OperatorLogQueryRequest();
request.setUsername(username);
@@ -89,7 +91,7 @@ public class OperatorLogServiceImpl implements OperatorLogService {
LambdaQueryWrapper wrapper = this.buildQueryWrapper(request);
// 查询
return operatorLogDAO.of(wrapper)
- .limit(Const.LOGIN_HISTORY_COUNT)
+ .limit(count)
.list(OperatorLogConvert.MAPPER::toLoginHistory);
}
diff --git a/orion-visor-ui/.env.development b/orion-visor-ui/.env.development
index 6067f583..ad5823d0 100644
--- a/orion-visor-ui/.env.development
+++ b/orion-visor-ui/.env.development
@@ -1,5 +1,6 @@
VITE_API_BASE_URL= 'http://127.0.0.1:9200/orion-visor/api'
VITE_WS_BASE_URL= 'ws://127.0.0.1:9200/orion-visor/keep-alive'
-VITE_APP_VERSION= '2.0.5'
+VITE_APP_VERSION= '2.0.6'
+VITE_APP_RELEASE= 'Community'
VITE_SFTP_PREVIEW_MB= 2
VITE_DEMO_MODE= false
diff --git a/orion-visor-ui/.env.production b/orion-visor-ui/.env.production
index 080e62ee..dc1245e0 100644
--- a/orion-visor-ui/.env.production
+++ b/orion-visor-ui/.env.production
@@ -1,5 +1,6 @@
VITE_API_BASE_URL= '/orion-visor/api'
VITE_WS_BASE_URL= '/orion-visor/keep-alive'
-VITE_APP_VERSION= '2.0.5'
+VITE_APP_VERSION= '2.0.6'
+VITE_APP_RELEASE= 'Community'
VITE_SFTP_PREVIEW_MB= 2
VITE_DEMO_MODE= false
diff --git a/orion-visor-ui/package.json b/orion-visor-ui/package.json
index 1ed44479..30435206 100644
--- a/orion-visor-ui/package.json
+++ b/orion-visor-ui/package.json
@@ -1,7 +1,7 @@
{
"name": "orion-visor-ui",
"description": "Orion Visor UI",
- "version": "2.0.5",
+ "version": "2.0.6",
"private": true,
"author": "Jiahang Li",
"license": "Apache 2.0",
diff --git a/orion-visor-ui/src/api/asset/host-sftp.ts b/orion-visor-ui/src/api/asset/host-sftp.ts
index fda18c3d..d874bbd8 100644
--- a/orion-visor-ui/src/api/asset/host-sftp.ts
+++ b/orion-visor-ui/src/api/asset/host-sftp.ts
@@ -65,7 +65,7 @@ export function deleteHostSftpLog(idList: Array) {
/**
* 下载文件
*/
-export function downloadWithTransferToken(channelId: string, transferToken: string) {
- window.open(`${httpBaseUrl}/asset/host-sftp/download?channelId=${channelId}&transferToken=${transferToken}`, 'newWindow');
+export function getDownloadTransferUrl(channelId: string, transferToken: string) {
+ return `${httpBaseUrl}/asset/host-sftp/download?channelId=${channelId}&transferToken=${transferToken}`;
}
diff --git a/orion-visor-ui/src/api/user/mine.ts b/orion-visor-ui/src/api/user/mine.ts
index 0192299e..b768ba55 100644
--- a/orion-visor-ui/src/api/user/mine.ts
+++ b/orion-visor-ui/src/api/user/mine.ts
@@ -35,8 +35,8 @@ export function updateCurrentUser(request: UserUpdateRequest) {
/**
* 查询当前用户登录日志
*/
-export function getCurrentLoginHistory() {
- return axios.get('/infra/mine/login-history');
+export function getCurrentLoginHistory(count: number) {
+ return axios.get('/infra/mine/login-history', { params: { count } });
}
/**
diff --git a/orion-visor-ui/src/api/user/user.ts b/orion-visor-ui/src/api/user/user.ts
index 819502bb..00a81eaf 100644
--- a/orion-visor-ui/src/api/user/user.ts
+++ b/orion-visor-ui/src/api/user/user.ts
@@ -192,6 +192,6 @@ export function offlineUserSession(request: UserSessionOfflineRequest) {
/**
* 查询登录日志
*/
-export function getLoginHistory(username: string) {
- return axios.get('/infra/system-user/login-history', { params: { username } });
+export function getLoginHistory(username: string, count: number) {
+ return axios.get('/infra/system-user/login-history', { params: { username, count } });
}
diff --git a/orion-visor-ui/src/components/app/app-footer/index.vue b/orion-visor-ui/src/components/app/app-footer/index.vue
index e99d2c52..50257901 100644
--- a/orion-visor-ui/src/components/app/app-footer/index.vue
+++ b/orion-visor-ui/src/components/app/app-footer/index.vue
@@ -6,7 +6,7 @@
gitee
文档
License
- v{{ version }} Community
+ v{{ version }} {{ release }}
Copyright 2023 - {{ new Date().getFullYear() }} Li Jiahang, All rights reserved.
@@ -17,6 +17,7 @@