mirror of https://github.com/chillzhuang/Saber.git
🎉 2.6.0发布 升级Hoxton.SR1 适配最新架构
This commit is contained in:
smallchill
parent
aa39e306d5
commit
d6e7dd61b5
|
|
@ -1,9 +1,9 @@
|
|||
<p align="center">
|
||||
<img src="https://img.shields.io/badge/Release-V2.5.2-green.svg" alt="Downloads">
|
||||
<img src="https://img.shields.io/badge/Release-V2.6.0-green.svg" alt="Downloads">
|
||||
<img src="https://img.shields.io/badge/JDK-1.8+-green.svg" alt="Build Status">
|
||||
<img src="https://img.shields.io/badge/license-Apache%202-blue.svg" alt="Build Status">
|
||||
<img src="https://img.shields.io/badge/Spring%20Cloud-Greenwich.SR3-blue.svg" alt="Coverage Status">
|
||||
<img src="https://img.shields.io/badge/Spring%20Boot-2.1.8.RELEASE-blue.svg" alt="Downloads">
|
||||
<img src="https://img.shields.io/badge/Spring%20Cloud-Hoxton.SR1-blue.svg" alt="Coverage Status">
|
||||
<img src="https://img.shields.io/badge/Spring%20Boot-2.2.2.RELEASE-blue.svg" alt="Downloads">
|
||||
<a target="_blank" href="https://bladex.vip">
|
||||
<img src="https://img.shields.io/badge/Author-Small%20Chill-ff69b4.svg" alt="Downloads">
|
||||
</a>
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@
|
|||
"js-base64": "^2.5.1",
|
||||
"js-cookie": "^2.2.0",
|
||||
"mockjs": "^1.0.1-beta3",
|
||||
"node-gyp": "^5.0.6",
|
||||
"nprogress": "^0.2.0",
|
||||
"script-loader": "^0.7.2",
|
||||
"vue": "^2.5.16",
|
||||
|
|
@ -31,7 +32,7 @@
|
|||
"@vue/cli-plugin-eslint": "^3.1.5",
|
||||
"@vue/cli-service": "^3.1.4",
|
||||
"chai": "^4.1.2",
|
||||
"node-sass": "^4.9.0",
|
||||
"node-sass": "^4.12.0",
|
||||
"sass-loader": "^7.0.1",
|
||||
"vue-template-compiler": "^2.5.17",
|
||||
"webpack-bundle-analyzer": "^3.0.3"
|
||||
|
|
|
|||
24
src/App.vue
24
src/App.vue
|
|
@ -12,30 +12,6 @@ export default {
|
|||
},
|
||||
watch: {},
|
||||
created() {
|
||||
this.$notify.success({
|
||||
title: "授权信息",
|
||||
dangerouslyUseHTMLString: true,
|
||||
message:
|
||||
'<p>欢迎使用Saber!</p>' +
|
||||
'<p>该系统可用BladeX增强开发，</p>' +
|
||||
'<p>若要商用强烈推荐高度定制的商业化框架，具体授权信息请访问如下地址。️</p>' +
|
||||
'</br>' +
|
||||
'<p>BladeX 授权地址：<a target="_blank" href="https://bladex.vip/#/vip">点击授权</a></p>' +
|
||||
'<p>AvueX 授权地址：<a target="_blank" href="https://avuejs.com/vip">点击授权</a></p>',
|
||||
duration: 20000,
|
||||
type: "success"
|
||||
});
|
||||
setTimeout(()=>{
|
||||
this.$notify.success({
|
||||
title: "开发手册",
|
||||
dangerouslyUseHTMLString: true,
|
||||
message:
|
||||
'<p>后端开发手册：<a target="_blank" href="https://www.kancloud.cn/smallchill/blade">点击查看</a></p>'+
|
||||
'<p>前端开发手册：<a target="_blank" href="https://www.kancloud.cn/smallchill/saber">点击查看</a></p>',
|
||||
duration: 20000,
|
||||
type: "success"
|
||||
});
|
||||
},500);
|
||||
},
|
||||
methods: {},
|
||||
computed: {}
|
||||
|
|
|
|||
|
|
@ -11,6 +11,12 @@ import 'nprogress/nprogress.css' // progress bar style
|
|||
NProgress.configure({showSpinner: false});
|
||||
const lockPage = store.getters.website.lockPage; //锁屏页
|
||||
router.beforeEach((to, from, next) => {
|
||||
if (to.matched.length === 0 && to.fullPath.indexOf("?sec") === -1) {
|
||||
next(to.path + "?sec");
|
||||
window.location.reload();
|
||||
} else {
|
||||
next();
|
||||
}
|
||||
//缓冲设置
|
||||
if (to.meta.keepAlive === true && store.state.tags.tagList.some(ele => {
|
||||
return ele.value === to.fullPath;
|
||||
|
|
@ -26,7 +32,7 @@ router.beforeEach((to, from, next) => {
|
|||
}
|
||||
const meta = to.meta || {};
|
||||
if (getToken()) {
|
||||
if (store.getters.isLock && to.path != lockPage) { //如果系统激活锁屏，全部跳转到锁屏页
|
||||
if (store.getters.isLock && to.path !== lockPage) { //如果系统激活锁屏，全部跳转到锁屏页
|
||||
next({path: lockPage})
|
||||
} else if (to.path === '/login') { //如果登录成功访问登录页跳转到主页
|
||||
next({path: '/'})
|
||||
|
|
|
|||
|
|
@ -60,3 +60,12 @@
|
|||
.el-dropdown-menu__item--divided:before, .el-menu, .el-menu--horizontal>.el-menu-item:not(.is-disabled):focus, .el-menu--horizontal>.el-menu-item:not(.is-disabled):hover, .el-menu--horizontal>.el-submenu .el-submenu__title:hover{
|
||||
background-color: transparent !important;
|
||||
}
|
||||
|
||||
.el-card__header {
|
||||
padding: 6px 18px !important;
|
||||
}
|
||||
|
||||
.el-card__body {
|
||||
padding: 16px !important;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +1,11 @@
|
|||
<template>
|
||||
<div>
|
||||
<basic-container>
|
||||
<p style="text-align: center;">
|
||||
<img src="https://img.shields.io/badge/Release-V2.5.4-green.svg" alt="Downloads"/>
|
||||
<img src="https://img.shields.io/badge/Release-V2.6.0-green.svg" alt="Downloads"/>
|
||||
<img src="https://img.shields.io/badge/JDK-1.8+-green.svg" alt="Build Status"/>
|
||||
<img src="https://img.shields.io/badge/Spring%20Cloud-Greenwich.SR3-blue.svg" alt="Coverage Status"/>
|
||||
<img src="https://img.shields.io/badge/Spring%20Boot-2.1.9.RELEASE-blue.svg" alt="Downloads"/>
|
||||
<img src="https://img.shields.io/badge/Spring%20Cloud-Hoxton.SR1-blue.svg" alt="Coverage Status"/>
|
||||
<img src="https://img.shields.io/badge/Spring%20Boot-2.2.2.RELEASE-blue.svg" alt="Downloads"/>
|
||||
<a target="_blank" href="https://bladex.vip">
|
||||
<img src="https://img.shields.io/badge/Saber%20Author-Small%20Chill-ff69b4.svg" alt="Downloads"/>
|
||||
</a>
|
||||
|
|
@ -12,7 +13,9 @@
|
|||
<img src="https://img.shields.io/badge/Copyright%20-@BladeX-%23ff3f59.svg" alt="Downloads"/>
|
||||
</a>
|
||||
</p>
|
||||
</basic-container>
|
||||
<el-col :span="16">
|
||||
<basic-container>
|
||||
<el-collapse v-model="activeNames" @change="handleChange">
|
||||
<el-collapse-item title="欢迎使用Saber" name="1">
|
||||
<div>1.Saber是SpringBlade前端UI系统</div>
|
||||
|
|
@ -72,9 +75,66 @@
|
|||
<div>3.有意向请联系唯一指定QQ:85088620</div>
|
||||
</el-collapse-item>
|
||||
</el-collapse>
|
||||
</basic-container>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-row>
|
||||
<basic-container>
|
||||
<div class="el-font-size">
|
||||
<span>产品名称</span>
|
||||
<el-divider direction="vertical"/>
|
||||
<span><el-tag>SpringBlade企业级微服务开发平台</el-tag></span>
|
||||
<el-divider content-position="right"><i class="el-icon-star-off"/></el-divider>
|
||||
<span>账号密码</span>
|
||||
<el-divider direction="vertical"/>
|
||||
<el-tag effect="plain">管理员(admin)</el-tag>
|
||||
<el-divider content-position="right"><i class="el-icon-star-off"/></el-divider>
|
||||
<span>官网地址</span>
|
||||
<el-divider direction="vertical"/>
|
||||
<span><el-link href="https://bladex.vip" target="_blank"
|
||||
type="primary">https://bladex.vip</el-link></span>
|
||||
<el-divider content-position="right"><i class="el-icon-star-off"/></el-divider>
|
||||
<span>社区地址</span>
|
||||
<el-divider direction="vertical"/>
|
||||
<span><el-link href="https://sns.bladex.vip" target="_blank"
|
||||
type="primary">https://sns.bladex.vip</el-link></span>
|
||||
<el-divider content-position="right"><i class="el-icon-star-off"/></el-divider>
|
||||
<span>获取文档</span>
|
||||
<el-divider direction="vertical"/>
|
||||
<span class="tag-group">
|
||||
<el-tag type="success" style="cursor: pointer"
|
||||
onclick="window.open('https://sns.bladex.vip/note/view/1.html')">免费版</el-tag>
|
||||
<el-divider direction="vertical"/>
|
||||
<el-tag type="danger" style="cursor: pointer"
|
||||
onclick="window.open('https://www.kancloud.cn/@smallchill')">收费版</el-tag>
|
||||
</span>
|
||||
<el-divider content-position="right"><i class="el-icon-star-off"/></el-divider>
|
||||
<span>获取源码</span>
|
||||
<el-divider direction="vertical"/>
|
||||
<span class="tag-group">
|
||||
<el-tag type="success" effect="dark" style="cursor: pointer"
|
||||
onclick="window.open('https://gitee.com/smallc/SpringBlade')">开源版</el-tag>
|
||||
<el-divider direction="vertical"/>
|
||||
<el-tag type="danger" effect="dark" style="cursor: pointer"
|
||||
onclick="window.open('https://bladex.vip/#/vip')">商业版</el-tag>
|
||||
</span>
|
||||
</div>
|
||||
</basic-container>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<basic-container>
|
||||
<el-collapse v-model="logActiveNames" @change="handleChange">
|
||||
<el-collapse-item title="2.6.0发布 升级Hoxton.SR1 适配最新架构" name="14">
|
||||
<div>1.升级SpringCloud Hoxton.SR1</div>
|
||||
<div>2.升级SpringBoot 2.2.2.RELEASE</div>
|
||||
<div>3.升级Alibaba Cloud 2.1.1.RELEASE</div>
|
||||
<div>4.升级Seata 1.0.0</div>
|
||||
<div>5.升级Swagger-Bootstrap-UI为最新的Knife4j 2.0.1</div>
|
||||
<div>6.升级Xss过滤机制以适配最新架构</div>
|
||||
<div>7.升级前端请求机制以适配最新架构</div>
|
||||
<div>8.修复blade-resource无法进行docker打包的问题</div>
|
||||
<div>9.修复blade-demo没有配置LauncherService导致启动失败的问题</div>
|
||||
</el-collapse-item>
|
||||
<el-collapse-item title="2.5.4发布 增加多数据源示例工程" name="13">
|
||||
<div>1.增加示例工程，增加多种常见场景的解决方案</div>
|
||||
<div>2.增加不同包名运行的示例</div>
|
||||
|
|
@ -186,8 +246,10 @@
|
|||
<div>3.SpringBlade 致力于创造新颖的开发模式，将开发中遇到的痛点、生产中所踩的坑整理归纳，并将解决方案都融合到框架中</div>
|
||||
</el-collapse-item>
|
||||
</el-collapse>
|
||||
</el-col>
|
||||
</basic-container>
|
||||
</el-row>
|
||||
</el-col>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
|
@ -198,7 +260,7 @@
|
|||
data() {
|
||||
return {
|
||||
activeNames: ['1', '2', '3', '5'],
|
||||
logActiveNames: ['13']
|
||||
logActiveNames: ['14']
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
|
|
@ -214,3 +276,13 @@
|
|||
};
|
||||
</script>
|
||||
|
||||
<style>
|
||||
.el-divider--horizontal {
|
||||
margin: 12px 0 !important;
|
||||
}
|
||||
|
||||
.el-font-size {
|
||||
font-size: 14px;
|
||||
}
|
||||
</style>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue