🔖 升级版本.
This commit is contained in:
@@ -29,7 +29,7 @@
|
|||||||
|
|
||||||
<br/>
|
<br/>
|
||||||
|
|
||||||
当前版本: **1.0.5**
|
当前版本: **1.0.6**
|
||||||
github: https://github.com/lijiahangmax/orion-ops-pro
|
github: https://github.com/lijiahangmax/orion-ops-pro
|
||||||
gitee: https://gitee.com/lijiahangmax/orion-ops-pro
|
gitee: https://gitee.com/lijiahangmax/orion-ops-pro
|
||||||
文档: https://lijiahangmax.gitee.io/orion-ops-pro/#/
|
文档: https://lijiahangmax.gitee.io/orion-ops-pro/#/
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
version: '3.3'
|
version: '3.3'
|
||||||
services:
|
services:
|
||||||
orion-ops-pro:
|
orion-ops-pro:
|
||||||
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-pro:1.0.5
|
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-ops-pro:1.0.6
|
||||||
ports:
|
ports:
|
||||||
- 1081:80
|
- 1081:80
|
||||||
environment:
|
environment:
|
||||||
@@ -13,6 +13,7 @@ services:
|
|||||||
- SECRET_KEY=uQeacXV8b3isvKLK
|
- SECRET_KEY=uQeacXV8b3isvKLK
|
||||||
volumes:
|
volumes:
|
||||||
- /data/orion-ops-pro-space/docker-volumes/orion-ops-pro/logs:/root/orion/logs/orion-ops-pro
|
- /data/orion-ops-pro-space/docker-volumes/orion-ops-pro/logs:/root/orion/logs/orion-ops-pro
|
||||||
|
- /data/orion-ops-pro-space/docker-volumes/orion-ops-pro/app:/root/orion/orion-ops-pro
|
||||||
depends_on:
|
depends_on:
|
||||||
- orion-ops-pro-db
|
- orion-ops-pro-db
|
||||||
- orion-ops-pro-redis
|
- orion-ops-pro-redis
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
mv ../../orion-ops-launch/target/orion-ops-launch.jar ./
|
mv ../../orion-ops-launch/target/orion-ops-launch.jar ./
|
||||||
mv ../../orion-ops-ui/dist ./dist
|
mv ../../orion-ops-ui/dist ./dist
|
||||||
docker build -t orion-ops-pro:1.0.5 .
|
docker build -t orion-ops-pro:1.0.6 .
|
||||||
|
|||||||
@@ -29,7 +29,7 @@
|
|||||||
|
|
||||||
<br/>
|
<br/>
|
||||||
|
|
||||||
当前版本: **1.0.5**
|
当前版本: **1.0.6**
|
||||||
github: https://github.com/lijiahangmax/orion-ops-pro
|
github: https://github.com/lijiahangmax/orion-ops-pro
|
||||||
gitee: https://gitee.com/lijiahangmax/orion-ops-pro
|
gitee: https://gitee.com/lijiahangmax/orion-ops-pro
|
||||||
文档: https://lijiahangmax.gitee.io/orion-ops-pro/#/
|
文档: https://lijiahangmax.gitee.io/orion-ops-pro/#/
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# orion-ops-pro <small>1.0.5</small>
|
# orion-ops-pro <small>1.0.6</small>
|
||||||
|
|
||||||
> 一款开箱即用的运维平台。
|
> 一款开箱即用的运维平台。
|
||||||
|
|
||||||
|
|||||||
11
docs/update/v1.0.7.md
Normal file
11
docs/update/v1.0.7.md
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
## v1.0.7
|
||||||
|
|
||||||
|
> sql 脚本 - DDL
|
||||||
|
|
||||||
|
```sql
|
||||||
|
```
|
||||||
|
|
||||||
|
> sql 脚本 - DML
|
||||||
|
|
||||||
|
```sql
|
||||||
|
```
|
||||||
@@ -14,7 +14,7 @@
|
|||||||
<url>https://github.com/lijiahangmax/orion-ops-pro</url>
|
<url>https://github.com/lijiahangmax/orion-ops-pro</url>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<revision>1.0.5</revision>
|
<revision>1.0.6</revision>
|
||||||
<spring.boot.version>2.7.17</spring.boot.version>
|
<spring.boot.version>2.7.17</spring.boot.version>
|
||||||
<spring.boot.admin.version>2.7.15</spring.boot.admin.version>
|
<spring.boot.admin.version>2.7.15</spring.boot.admin.version>
|
||||||
<flatten.maven.plugin.version>1.5.0</flatten.maven.plugin.version>
|
<flatten.maven.plugin.version>1.5.0</flatten.maven.plugin.version>
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ public interface AppConst extends OrionConst {
|
|||||||
/**
|
/**
|
||||||
* 同 ${orion.version} 迭代时候需要手动更改
|
* 同 ${orion.version} 迭代时候需要手动更改
|
||||||
*/
|
*/
|
||||||
String VERSION = "1.0.5";
|
String VERSION = "1.0.6";
|
||||||
|
|
||||||
String ORION_OPS_PRO = "orion-ops-pro";
|
String ORION_OPS_PRO = "orion-ops-pro";
|
||||||
|
|
||||||
|
|||||||
@@ -37,7 +37,6 @@ public class PathUtils {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取应用路径
|
* 获取应用路径
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ public interface FavoriteApi {
|
|||||||
* @param userId userId
|
* @param userId userId
|
||||||
* @return relIdList
|
* @return relIdList
|
||||||
*/
|
*/
|
||||||
Future<List<Long>> getFavoriteRelIdListAsync(FavoriteTypeEnum type, java.lang.Long userId);
|
Future<List<Long>> getFavoriteRelIdListAsync(FavoriteTypeEnum type, Long userId);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 通过 relId 删除收藏
|
* 通过 relId 删除收藏
|
||||||
|
|||||||
@@ -16,11 +16,11 @@ import com.orion.ops.framework.common.utils.Valid;
|
|||||||
import com.orion.ops.framework.redis.core.utils.RedisStrings;
|
import com.orion.ops.framework.redis.core.utils.RedisStrings;
|
||||||
import com.orion.ops.framework.redis.core.utils.RedisUtils;
|
import com.orion.ops.framework.redis.core.utils.RedisUtils;
|
||||||
import com.orion.ops.framework.security.core.utils.SecurityUtils;
|
import com.orion.ops.framework.security.core.utils.SecurityUtils;
|
||||||
import com.orion.ops.module.infra.define.config.AppAuthenticationConfig;
|
|
||||||
import com.orion.ops.module.infra.convert.SystemUserConvert;
|
import com.orion.ops.module.infra.convert.SystemUserConvert;
|
||||||
import com.orion.ops.module.infra.dao.SystemUserDAO;
|
import com.orion.ops.module.infra.dao.SystemUserDAO;
|
||||||
import com.orion.ops.module.infra.dao.SystemUserRoleDAO;
|
import com.orion.ops.module.infra.dao.SystemUserRoleDAO;
|
||||||
import com.orion.ops.module.infra.define.cache.UserCacheKeyDefine;
|
import com.orion.ops.module.infra.define.cache.UserCacheKeyDefine;
|
||||||
|
import com.orion.ops.module.infra.define.config.AppAuthenticationConfig;
|
||||||
import com.orion.ops.module.infra.entity.domain.SystemUserDO;
|
import com.orion.ops.module.infra.entity.domain.SystemUserDO;
|
||||||
import com.orion.ops.module.infra.entity.dto.LoginTokenDTO;
|
import com.orion.ops.module.infra.entity.dto.LoginTokenDTO;
|
||||||
import com.orion.ops.module.infra.entity.dto.LoginTokenIdentityDTO;
|
import com.orion.ops.module.infra.entity.dto.LoginTokenIdentityDTO;
|
||||||
@@ -240,7 +240,7 @@ public class AuthenticationServiceImpl implements AuthenticationService {
|
|||||||
}
|
}
|
||||||
// 刷新登录失败缓存
|
// 刷新登录失败缓存
|
||||||
String failedCountKey = UserCacheKeyDefine.LOGIN_FAILED_COUNT.format(request.getUsername());
|
String failedCountKey = UserCacheKeyDefine.LOGIN_FAILED_COUNT.format(request.getUsername());
|
||||||
Long failedLoginCount = redisTemplate.opsForValue().increment(failedCountKey);
|
redisTemplate.opsForValue().increment(failedCountKey);
|
||||||
RedisUtils.setExpire(failedCountKey, appAuthenticationConfig.getLoginFailedLockTime(), TimeUnit.MINUTES);
|
RedisUtils.setExpire(failedCountKey, appAuthenticationConfig.getLoginFailedLockTime(), TimeUnit.MINUTES);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ public class FavoriteServiceImpl implements FavoriteService {
|
|||||||
FavoriteDO record = FavoriteConvert.MAPPER.to(request);
|
FavoriteDO record = FavoriteConvert.MAPPER.to(request);
|
||||||
record.setUserId(userId);
|
record.setUserId(userId);
|
||||||
// 插入
|
// 插入
|
||||||
int effect = favoriteDAO.insert(record);
|
favoriteDAO.insert(record);
|
||||||
// 删除缓存
|
// 删除缓存
|
||||||
RedisLists.delete(FavoriteCacheKeyDefine.FAVORITE.format(type, userId));
|
RedisLists.delete(FavoriteCacheKeyDefine.FAVORITE.format(type, userId));
|
||||||
return record.getId();
|
return record.getId();
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
VITE_API_BASE_URL= 'http://127.0.0.1:9200/orion/api'
|
VITE_API_BASE_URL= 'http://127.0.0.1:9200/orion/api'
|
||||||
VITE_WS_BASE_URL= 'ws://127.0.0.1:9200/orion/keep-alive'
|
VITE_WS_BASE_URL= 'ws://127.0.0.1:9200/orion/keep-alive'
|
||||||
VITE_APP_VERSION= '1.0.5'
|
VITE_APP_VERSION= '1.0.6'
|
||||||
VITE_SFTP_PREVIEW_MB= 2
|
VITE_SFTP_PREVIEW_MB= 2
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
VITE_API_BASE_URL= '/orion/api'
|
VITE_API_BASE_URL= '/orion/api'
|
||||||
VITE_WS_BASE_URL= '/orion/keep-alive'
|
VITE_WS_BASE_URL= '/orion/keep-alive'
|
||||||
VITE_APP_VERSION= '1.0.5'
|
VITE_APP_VERSION= '1.0.6'
|
||||||
VITE_SFTP_PREVIEW_MB= 2
|
VITE_SFTP_PREVIEW_MB= 2
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "orion-ops-pro-ui",
|
"name": "orion-ops-pro-ui",
|
||||||
"description": "Orion Ops Pro for Vue",
|
"description": "Orion Ops Pro for Vue",
|
||||||
"version": "1.0.5",
|
"version": "1.0.6",
|
||||||
"private": true,
|
"private": true,
|
||||||
"author": "Jiahang Li",
|
"author": "Jiahang Li",
|
||||||
"license": "Apache 2.0",
|
"license": "Apache 2.0",
|
||||||
|
|||||||
2
pom.xml
2
pom.xml
@@ -22,7 +22,7 @@
|
|||||||
</modules>
|
</modules>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<revision>1.0.5</revision>
|
<revision>1.0.6</revision>
|
||||||
<maven.compiler.source>8</maven.compiler.source>
|
<maven.compiler.source>8</maven.compiler.source>
|
||||||
<maven.compiler.target>8</maven.compiler.target>
|
<maven.compiler.target>8</maven.compiler.target>
|
||||||
<maven.surefire.plugin.version>3.0.0-M5</maven.surefire.plugin.version>
|
<maven.surefire.plugin.version>3.0.0-M5</maven.surefire.plugin.version>
|
||||||
|
|||||||
Reference in New Issue
Block a user