更换若依相关
This commit is contained in:
酱子
parent
dbe6f3c498
commit
3f352fdef1
2
pom.xml
2
pom.xml
@ -10,7 +10,7 @@
|
|||||||
|
|
||||||
<name>ruoyi</name>
|
<name>ruoyi</name>
|
||||||
<url>http://www.ruoyi.vip</url>
|
<url>http://www.ruoyi.vip</url>
|
||||||
<description>若依管理系统</description>
|
<description>阿狸云管理</description>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<ruoyi.version>3.8.1</ruoyi.version>
|
<ruoyi.version>3.8.1</ruoyi.version>
|
||||||
|
|||||||
@ -113,7 +113,7 @@ public class SwaggerConfig
|
|||||||
// 用ApiInfoBuilder进行定制
|
// 用ApiInfoBuilder进行定制
|
||||||
return new ApiInfoBuilder()
|
return new ApiInfoBuilder()
|
||||||
// 设置标题
|
// 设置标题
|
||||||
.title("标题：若依管理系统_接口文档")
|
.title("标题：阿狸云管理_接口文档")
|
||||||
// 描述
|
// 描述
|
||||||
.description("描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...")
|
.description("描述：用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...")
|
||||||
// 作者信息
|
// 作者信息
|
||||||
|
|||||||
@ -1,11 +1,11 @@
|
|||||||
# 页面标题
|
# 页面标题
|
||||||
VUE_APP_TITLE = 若依管理系统
|
VUE_APP_TITLE = 阿狸云管理
|
||||||
|
|
||||||
# 开发环境配置
|
# 开发环境配置
|
||||||
ENV = 'development'
|
ENV = 'development'
|
||||||
|
|
||||||
# 若依管理系统/开发环境
|
# 阿狸云管理/开发环境
|
||||||
VUE_APP_BASE_API = '/dev-api'
|
VUE_APP_BASE_API = '/dev-api'
|
||||||
|
|
||||||
# 路由懒加载
|
# 路由懒加载
|
||||||
VUE_CLI_BABEL_TRANSPILE_MODULES = true
|
VUE_CLI_BABEL_TRANSPILE_MODULES = true
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
# 页面标题
|
# 页面标题
|
||||||
VUE_APP_TITLE = 若依管理系统
|
VUE_APP_TITLE = 阿狸云管理
|
||||||
|
|
||||||
# 生产环境配置
|
# 生产环境配置
|
||||||
ENV = 'production'
|
ENV = 'production'
|
||||||
|
|
||||||
# 若依管理系统/生产环境
|
# 阿狸云管理/生产环境
|
||||||
VUE_APP_BASE_API = '/prod-api'
|
VUE_APP_BASE_API = '/prod-api'
|
||||||
|
|||||||
@ -1,10 +1,10 @@
|
|||||||
# 页面标题
|
# 页面标题
|
||||||
VUE_APP_TITLE = 若依管理系统
|
VUE_APP_TITLE = 阿狸云管理
|
||||||
|
|
||||||
NODE_ENV = production
|
NODE_ENV = production
|
||||||
|
|
||||||
# 测试环境配置
|
# 测试环境配置
|
||||||
ENV = 'staging'
|
ENV = 'staging'
|
||||||
|
|
||||||
# 若依管理系统/测试环境
|
# 阿狸云管理/测试环境
|
||||||
VUE_APP_BASE_API = '/stage-api'
|
VUE_APP_BASE_API = '/stage-api'
|
||||||
|
|||||||
@ -1,90 +1,90 @@
|
|||||||
{
|
{
|
||||||
"name": "ruoyi",
|
"name": "ruoyi",
|
||||||
"version": "3.8.1",
|
"version": "3.8.1",
|
||||||
"description": "若依管理系统",
|
"description": "阿狸云管理",
|
||||||
"author": "若依",
|
"author": "阿狸",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vue-cli-service serve",
|
"dev": "vue-cli-service serve",
|
||||||
"build:prod": "vue-cli-service build",
|
"build:prod": "vue-cli-service build",
|
||||||
"build:stage": "vue-cli-service build --mode staging",
|
"build:stage": "vue-cli-service build --mode staging",
|
||||||
"preview": "node build/index.js --preview",
|
"preview": "node build/index.js --preview",
|
||||||
"lint": "eslint --ext .js,.vue src"
|
"lint": "eslint --ext .js,.vue src"
|
||||||
},
|
},
|
||||||
"husky": {
|
"husky": {
|
||||||
"hooks": {
|
"hooks": {
|
||||||
"pre-commit": "lint-staged"
|
"pre-commit": "lint-staged"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"lint-staged": {
|
"lint-staged": {
|
||||||
"src/**/*.{js,vue}": [
|
"src/**/*.{js,vue}": [
|
||||||
"eslint --fix",
|
"eslint --fix",
|
||||||
"git add"
|
"git add"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"keywords": [
|
"keywords": [
|
||||||
"vue",
|
"vue",
|
||||||
"admin",
|
"admin",
|
||||||
"dashboard",
|
"dashboard",
|
||||||
"element-ui",
|
"element-ui",
|
||||||
"boilerplate",
|
"boilerplate",
|
||||||
"admin-template",
|
"admin-template",
|
||||||
"management-system"
|
"management-system"
|
||||||
],
|
],
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://gitee.com/y_project/RuoYi-Vue.git"
|
"url": "https://gitee.com/y_project/RuoYi-Vue.git"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@riophae/vue-treeselect": "0.4.0",
|
"@riophae/vue-treeselect": "0.4.0",
|
||||||
"axios": "0.24.0",
|
"axios": "0.24.0",
|
||||||
"clipboard": "2.0.8",
|
"clipboard": "2.0.8",
|
||||||
"core-js": "3.19.1",
|
"core-js": "3.19.1",
|
||||||
"echarts": "4.9.0",
|
"echarts": "4.9.0",
|
||||||
"element-ui": "2.15.6",
|
"element-ui": "2.15.6",
|
||||||
"file-saver": "2.0.5",
|
"file-saver": "2.0.5",
|
||||||
"fuse.js": "6.4.3",
|
"fuse.js": "6.4.3",
|
||||||
"highlight.js": "9.18.5",
|
"highlight.js": "9.18.5",
|
||||||
"js-beautify": "1.13.0",
|
"js-beautify": "1.13.0",
|
||||||
"js-cookie": "3.0.1",
|
"js-cookie": "3.0.1",
|
||||||
"jsencrypt": "3.2.1",
|
"jsencrypt": "3.2.1",
|
||||||
"nprogress": "0.2.0",
|
"nprogress": "0.2.0",
|
||||||
"quill": "1.3.7",
|
"quill": "1.3.7",
|
||||||
"screenfull": "5.0.2",
|
"screenfull": "5.0.2",
|
||||||
"sortablejs": "1.10.2",
|
"sortablejs": "1.10.2",
|
||||||
"vue": "2.6.12",
|
"vue": "2.6.12",
|
||||||
"vue-count-to": "1.0.13",
|
"vue-count-to": "1.0.13",
|
||||||
"vue-cropper": "0.5.5",
|
"vue-cropper": "0.5.5",
|
||||||
"vue-meta": "2.4.0",
|
"vue-meta": "2.4.0",
|
||||||
"vue-router": "3.4.9",
|
"vue-router": "3.4.9",
|
||||||
"vuedraggable": "2.24.3",
|
"vuedraggable": "2.24.3",
|
||||||
"vuex": "3.6.0"
|
"vuex": "3.6.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@vue/cli-plugin-babel": "4.4.6",
|
"@vue/cli-plugin-babel": "4.4.6",
|
||||||
"@vue/cli-plugin-eslint": "4.4.6",
|
"@vue/cli-plugin-eslint": "4.4.6",
|
||||||
"@vue/cli-service": "4.4.6",
|
"@vue/cli-service": "4.4.6",
|
||||||
"babel-eslint": "10.1.0",
|
"babel-eslint": "10.1.0",
|
||||||
"babel-plugin-dynamic-import-node": "2.3.3",
|
"babel-plugin-dynamic-import-node": "2.3.3",
|
||||||
"chalk": "4.1.0",
|
"chalk": "4.1.0",
|
||||||
"compression-webpack-plugin": "5.0.2",
|
"compression-webpack-plugin": "5.0.2",
|
||||||
"connect": "3.6.6",
|
"connect": "3.6.6",
|
||||||
"eslint": "7.15.0",
|
"eslint": "7.15.0",
|
||||||
"eslint-plugin-vue": "7.2.0",
|
"eslint-plugin-vue": "7.2.0",
|
||||||
"lint-staged": "10.5.3",
|
"lint-staged": "10.5.3",
|
||||||
"runjs": "4.4.2",
|
"runjs": "4.4.2",
|
||||||
"sass": "1.32.13",
|
"sass": "1.32.13",
|
||||||
"sass-loader": "10.1.1",
|
"sass-loader": "10.1.1",
|
||||||
"script-ext-html-webpack-plugin": "2.1.5",
|
"script-ext-html-webpack-plugin": "2.1.5",
|
||||||
"svg-sprite-loader": "5.1.1",
|
"svg-sprite-loader": "5.1.1",
|
||||||
"vue-template-compiler": "2.6.12"
|
"vue-template-compiler": "2.6.12"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=8.9",
|
"node": ">=8.9",
|
||||||
"npm": ">= 3.0.0"
|
"npm": ">= 3.0.0"
|
||||||
},
|
},
|
||||||
"browserslist": [
|
"browserslist": [
|
||||||
"> 1%",
|
"> 1%",
|
||||||
"last 2 versions"
|
"last 2 versions"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
BIN
ruoyi-ui/src/assets/images/ba.png
Normal file
BIN
ruoyi-ui/src/assets/images/ba.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 19 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 509 KiB After Width: | Height: | Size: 304 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 5.5 KiB After Width: | Height: | Size: 19 KiB |
@ -1,93 +1,93 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="sidebar-logo-container" :class="{'collapse':collapse}" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
|
<div class="sidebar-logo-container" :class="{'collapse':collapse}" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
|
||||||
<transition name="sidebarLogoFade">
|
<transition name="sidebarLogoFade">
|
||||||
<router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
|
<router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
|
||||||
<img v-if="logo" :src="logo" class="sidebar-logo" />
|
<img v-if="logo" :src="logo" class="sidebar-logo" />
|
||||||
<h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
|
<h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
|
||||||
</router-link>
|
</router-link>
|
||||||
<router-link v-else key="expand" class="sidebar-logo-link" to="/">
|
<router-link v-else key="expand" class="sidebar-logo-link" to="/">
|
||||||
<img v-if="logo" :src="logo" class="sidebar-logo" />
|
<img v-if="logo" :src="logo" class="sidebar-logo" />
|
||||||
<h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
|
<h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
|
||||||
</router-link>
|
</router-link>
|
||||||
</transition>
|
</transition>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import logoImg from '@/assets/logo/logo.png'
|
import logoImg from '@/assets/logo/logo.png'
|
||||||
import variables from '@/assets/styles/variables.scss'
|
import variables from '@/assets/styles/variables.scss'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'SidebarLogo',
|
name: 'SidebarLogo',
|
||||||
props: {
|
props: {
|
||||||
collapse: {
|
collapse: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
required: true
|
required: true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
variables() {
|
variables() {
|
||||||
return variables;
|
return variables;
|
||||||
},
|
},
|
||||||
sideTheme() {
|
sideTheme() {
|
||||||
return this.$store.state.settings.sideTheme
|
return this.$store.state.settings.sideTheme
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
title: '若依管理系统',
|
title: '阿狸云管理',
|
||||||
logo: logoImg
|
logo: logoImg
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.sidebarLogoFade-enter-active {
|
.sidebarLogoFade-enter-active {
|
||||||
transition: opacity 1.5s;
|
transition: opacity 1.5s;
|
||||||
}
|
}
|
||||||
|
|
||||||
.sidebarLogoFade-enter,
|
.sidebarLogoFade-enter,
|
||||||
.sidebarLogoFade-leave-to {
|
.sidebarLogoFade-leave-to {
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.sidebar-logo-container {
|
.sidebar-logo-container {
|
||||||
position: relative;
|
position: relative;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 50px;
|
height: 50px;
|
||||||
line-height: 50px;
|
line-height: 50px;
|
||||||
background: #2b2f3a;
|
background: #2b2f3a;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
|
||||||
& .sidebar-logo-link {
|
& .sidebar-logo-link {
|
||||||
height: 100%;
|
height: 100%;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
|
||||||
& .sidebar-logo {
|
& .sidebar-logo {
|
||||||
width: 32px;
|
width: 32px;
|
||||||
height: 32px;
|
height: 32px;
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
margin-right: 12px;
|
margin-right: 12px;
|
||||||
}
|
}
|
||||||
|
|
||||||
& .sidebar-title {
|
& .sidebar-title {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
line-height: 50px;
|
line-height: 50px;
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
|
font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
&.collapse {
|
&.collapse {
|
||||||
.sidebar-logo {
|
.sidebar-logo {
|
||||||
margin-right: 0px;
|
margin-right: 0px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@ -1,827 +1,110 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="app-container home">
|
<div class="dashboard-editor-container">
|
||||||
<el-row :gutter="20">
|
<el-row :gutter="20">
|
||||||
<el-col :sm="24" :lg="24">
|
<el-col :sm="24" :lg="24">
|
||||||
<blockquote class="text-warning" style="font-size: 14px">
|
<blockquote class="text-warning" style="font-size: 14px">
|
||||||
领取阿里云通用云产品1888优惠券
|
路，要靠自己走。永远不要把希望都寄托在他人身上，关键时候，他人可以推你一把，但不可能完全替代你。
|
||||||
<br />
|
<br />
|
||||||
<el-link
|
学做一只蜗牛吧，即使步履缓慢，也要努力一步一步自己往前爬
|
||||||
href="https://www.aliyun.com/minisite/goods?userCode=brki8iof"
|
<br />
|
||||||
type="primary"
|
<h4 class="text-danger">
|
||||||
target="_blank"
|
交流群号694716003
|
||||||
>https://www.aliyun.com/minisite/goods?userCode=brki8iof</el-link
|
</h4>
|
||||||
>
|
</blockquote>
|
||||||
<br />
|
<hr />
|
||||||
领取腾讯云通用云产品2860优惠券
|
</el-col>
|
||||||
<br />
|
</el-row>
|
||||||
<el-link
|
<panel-group @handleSetLineChartData="handleSetLineChartData" />
|
||||||
href="https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console"
|
<el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
|
||||||
type="primary"
|
<line-chart :chart-data="lineChartData" />
|
||||||
target="_blank"
|
</el-row>
|
||||||
>https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console</el-link
|
|
||||||
>
|
<el-row :gutter="32">
|
||||||
<br />
|
<el-col :xs="24" :sm="24" :lg="8">
|
||||||
阿里云服务器折扣区
|
<div class="chart-wrapper">
|
||||||
<el-link href="http://aly.ruoyi.vip" type="primary" target="_blank"
|
<raddar-chart />
|
||||||
>>☛☛点我进入☚☚</el-link
|
</div>
|
||||||
>
|
</el-col>
|
||||||
腾讯云服务器秒杀区
|
<el-col :xs="24" :sm="24" :lg="8">
|
||||||
<el-link href="http://txy.ruoyi.vip" type="primary" target="_blank"
|
<div class="chart-wrapper">
|
||||||
>>☛☛点我进入☚☚</el-link
|
<pie-chart />
|
||||||
><br />
|
</div>
|
||||||
<h4 class="text-danger">
|
</el-col>
|
||||||
云产品通用红包，可叠加官网常规优惠使用。(仅限新用户)
|
<el-col :xs="24" :sm="24" :lg="8">
|
||||||
</h4>
|
<div class="chart-wrapper">
|
||||||
</blockquote>
|
<bar-chart />
|
||||||
|
</div>
|
||||||
<hr />
|
</el-col>
|
||||||
</el-col>
|
</el-row>
|
||||||
</el-row>
|
|
||||||
<el-row :gutter="20">
|
|
||||||
<el-col :sm="24" :lg="12" style="padding-left: 20px">
|
</div>
|
||||||
<h2>若依后台管理框架</h2>
|
</template>
|
||||||
<p>
|
|
||||||
一直想做一款后台管理系统，看了很多优秀的开源项目但是发现没有合适自己的。于是利用空闲休息时间开始自己写一套后台系统。如此有了若依管理系统。，她可以用于所有的Web应用程序，如网站管理后台，网站会员中心，CMS，CRM，OA等等，当然，您也可以对她进行深度定制，以做出更强系统。所有前端后台代码封装过后十分精简易上手，出错概率低。同时支持移动客户端访问。系统会陆续更新一些实用功能。
|
<script>
|
||||||
</p>
|
import PanelGroup from './dashboard/PanelGroup'
|
||||||
<p>
|
import LineChart from './dashboard/LineChart'
|
||||||
<b>当前版本:</b> <span>v{{ version }}</span>
|
import RaddarChart from './dashboard/RaddarChart'
|
||||||
</p>
|
import PieChart from './dashboard/PieChart'
|
||||||
<p>
|
import BarChart from './dashboard/BarChart'
|
||||||
<el-tag type="danger">¥免费开源</el-tag>
|
|
||||||
</p>
|
const lineChartData = {
|
||||||
<p>
|
newVisitis: {
|
||||||
<el-button
|
expectedData: [100, 120, 161, 134, 105, 160, 165],
|
||||||
type="primary"
|
actualData: [120, 82, 91, 154, 162, 140, 145]
|
||||||
size="mini"
|
},
|
||||||
icon="el-icon-cloudy"
|
messages: {
|
||||||
plain
|
expectedData: [200, 192, 120, 144, 160, 130, 140],
|
||||||
@click="goTarget('https://gitee.com/y_project/RuoYi-Vue')"
|
actualData: [180, 160, 151, 106, 145, 150, 130]
|
||||||
>访问码云</el-button
|
},
|
||||||
>
|
purchases: {
|
||||||
<el-button
|
expectedData: [80, 100, 121, 104, 105, 90, 100],
|
||||||
size="mini"
|
actualData: [120, 90, 100, 138, 142, 130, 130]
|
||||||
icon="el-icon-s-home"
|
},
|
||||||
plain
|
shoppings: {
|
||||||
@click="goTarget('http://ruoyi.vip')"
|
expectedData: [130, 140, 141, 142, 145, 150, 160],
|
||||||
>访问主页</el-button
|
actualData: [120, 82, 91, 154, 162, 140, 130]
|
||||||
>
|
}
|
||||||
</p>
|
}
|
||||||
</el-col>
|
|
||||||
|
export default {
|
||||||
<el-col :sm="24" :lg="12" style="padding-left: 50px">
|
name: 'Index',
|
||||||
<el-row>
|
components: {
|
||||||
<el-col :span="12">
|
PanelGroup,
|
||||||
<h2>技术选型</h2>
|
LineChart,
|
||||||
</el-col>
|
RaddarChart,
|
||||||
</el-row>
|
PieChart,
|
||||||
<el-row>
|
BarChart
|
||||||
<el-col :span="6">
|
},
|
||||||
<h4>后端技术</h4>
|
data() {
|
||||||
<ul>
|
return {
|
||||||
<li>SpringBoot</li>
|
lineChartData: lineChartData.newVisitis
|
||||||
<li>Spring Security</li>
|
}
|
||||||
<li>JWT</li>
|
},
|
||||||
<li>MyBatis</li>
|
methods: {
|
||||||
<li>Druid</li>
|
handleSetLineChartData(type) {
|
||||||
<li>Fastjson</li>
|
this.lineChartData = lineChartData[type]
|
||||||
<li>...</li>
|
}
|
||||||
</ul>
|
}
|
||||||
</el-col>
|
}
|
||||||
<el-col :span="6">
|
</script>
|
||||||
<h4>前端技术</h4>
|
|
||||||
<ul>
|
<style lang="scss" scoped>
|
||||||
<li>Vue</li>
|
.dashboard-editor-container {
|
||||||
<li>Vuex</li>
|
padding: 32px;
|
||||||
<li>Element-ui</li>
|
background-color: rgb(240, 242, 245);
|
||||||
<li>Axios</li>
|
position: relative;
|
||||||
<li>Sass</li>
|
|
||||||
<li>Quill</li>
|
.chart-wrapper {
|
||||||
<li>...</li>
|
background: #fff;
|
||||||
</ul>
|
padding: 16px 16px 0;
|
||||||
</el-col>
|
margin-bottom: 32px;
|
||||||
</el-row>
|
}
|
||||||
</el-col>
|
}
|
||||||
</el-row>
|
|
||||||
<el-divider />
|
@media (max-width:1024px) {
|
||||||
<el-row :gutter="20">
|
.chart-wrapper {
|
||||||
<el-col :xs="24" :sm="24" :md="12" :lg="8">
|
padding: 8px;
|
||||||
<el-card class="update-log">
|
}
|
||||||
<div slot="header" class="clearfix">
|
}
|
||||||
<span>联系信息</span>
|
</style>
|
||||||
</div>
|
|
||||||
<div class="body">
|
|
||||||
<p>
|
|
||||||
<i class="el-icon-s-promotion"></i> 官网：<el-link
|
|
||||||
href="http://www.ruoyi.vip"
|
|
||||||
target="_blank"
|
|
||||||
>http://www.ruoyi.vip</el-link
|
|
||||||
>
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
<i class="el-icon-user-solid"></i> QQ群：<s>满937441</s>
|
|
||||||
<s>满887144332</s> <s>满180251782</s> <s>满104180207</s> <s>满186866453</s>
|
|
||||||
<s>满201396349</s> <s>满101456076</s> <s>满101539465</s> <s>满264312783</s>
|
|
||||||
<a href="https://jq.qq.com/?_wv=1027&k=SWCtLnMz" target="_blank">
|
|
||||||
167385320</a
|
|
||||||
>
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
<i class="el-icon-chat-dot-round"></i> 微信：<a
|
|
||||||
href="javascript:;"
|
|
||||||
>/ *若依</a
|
|
||||||
>
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
<i class="el-icon-money"></i> 支付宝：<a
|
|
||||||
href="javascript:;"
|
|
||||||
class="支付宝信息"
|
|
||||||
>/ *若依</a
|
|
||||||
>
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</el-card>
|
|
||||||
</el-col>
|
|
||||||
<el-col :xs="24" :sm="24" :md="12" :lg="8">
|
|
||||||
<el-card class="update-log">
|
|
||||||
<div slot="header" class="clearfix">
|
|
||||||
<span>更新日志</span>
|
|
||||||
</div>
|
|
||||||
<el-collapse accordion>
|
|
||||||
<el-collapse-item title="v3.8.1 - 2022-01-01">
|
|
||||||
<ol>
|
|
||||||
<li>新增Vue3前端代码生成模板</li>
|
|
||||||
<li>新增图片预览组件</li>
|
|
||||||
<li>新增压缩插件实现打包Gzip</li>
|
|
||||||
<li>自定义xss校验注解实现</li>
|
|
||||||
<li>自定义文字复制剪贴指令</li>
|
|
||||||
<li>代码生成预览支持复制内容</li>
|
|
||||||
<li>路由支持单独配置菜单或角色权限</li>
|
|
||||||
<li>用户管理部门查询选择节点后分页参数初始</li>
|
|
||||||
<li>修复用户分配角色属性错误</li>
|
|
||||||
<li>修复打包后字体图标偶现的乱码问题</li>
|
|
||||||
<li>修复菜单管理重置表单出现的错误</li>
|
|
||||||
<li>修复版本差异导致的懒加载报错问题</li>
|
|
||||||
<li>修复Cron组件中周回显问题</li>
|
|
||||||
<li>修复定时任务多参数逗号分隔的问题</li>
|
|
||||||
<li>修复根据ID查询列表可能出现的主键溢出问题</li>
|
|
||||||
<li>修复tomcat配置参数已过期问题</li>
|
|
||||||
<li>升级clipboard到最新版本2.0.8</li>
|
|
||||||
<li>升级oshi到最新版本v5.8.6</li>
|
|
||||||
<li>升级fastjson到最新版1.2.79</li>
|
|
||||||
<li>升级spring-boot到最新版本2.5.8</li>
|
|
||||||
<li>升级log4j2到2.17.1，防止漏洞风险</li>
|
|
||||||
<li>优化下载解析blob异常提示</li>
|
|
||||||
<li>优化代码生成字典组重复问题</li>
|
|
||||||
<li>优化查询用户的角色组&岗位组代码</li>
|
|
||||||
<li>优化定时任务cron表达式小时设置24</li>
|
|
||||||
<li>优化用户导入提示溢出则显示滚动条</li>
|
|
||||||
<li>优化防重复提交标识组合为(key+url+header)</li>
|
|
||||||
<li>优化分页方法设置成通用方便灵活调用</li>
|
|
||||||
<li>其他细节优化</li>
|
|
||||||
</ol>
|
|
||||||
</el-collapse-item>
|
|
||||||
<el-collapse-item title="v3.8.0 - 2021-12-01">
|
|
||||||
<ol>
|
|
||||||
<li>新增配套并同步的Vue3前端版本</li>
|
|
||||||
<li>新增通用方法简化模态/缓存/下载/权限/页签使用</li>
|
|
||||||
<li>优化导出数据/使用通用下载方法</li>
|
|
||||||
<li>Excel注解支持自定义数据处理器</li>
|
|
||||||
<li>Excel注解支持导入导出标题信息</li>
|
|
||||||
<li>Excel导入支持@Excels注解</li>
|
|
||||||
<li>新增组件data-dict，简化数据字典使用</li>
|
|
||||||
<li>新增Jaxb依赖，防止jdk8以上出现的兼容错误</li>
|
|
||||||
<li>生产环境使用路由懒加载提升页面响应速度</li>
|
|
||||||
<li>修复五级以上菜单出现的404问题</li>
|
|
||||||
<li>防重提交注解支持配置间隔时间/提示消息</li>
|
|
||||||
<li>日志注解新增是否保存响应参数</li>
|
|
||||||
<li>任务屏蔽违规字符&参数忽略双引号中的逗号</li>
|
|
||||||
<li>升级SpringBoot到最新版本2.5.6</li>
|
|
||||||
<li>升级pagehelper到最新版1.4.0</li>
|
|
||||||
<li>升级spring-boot-mybatis到最新版2.2.0</li>
|
|
||||||
<li>升级oshi到最新版本v5.8.2</li>
|
|
||||||
<li>升级druid到最新版1.2.8</li>
|
|
||||||
<li>升级velocity到最新版本2.3</li>
|
|
||||||
<li>升级fastjson到最新版1.2.78</li>
|
|
||||||
<li>升级axios到最新版本0.24.0</li>
|
|
||||||
<li>升级dart-sass到版本1.32.13</li>
|
|
||||||
<li>升级core-js到最新版本3.19.1</li>
|
|
||||||
<li>升级jsencrypt到最新版本3.2.1</li>
|
|
||||||
<li>升级js-cookie到最新版本3.0.1</li>
|
|
||||||
<li>升级file-saver到最新版本2.0.5</li>
|
|
||||||
<li>升级sass-loader到最新版本10.1.1</li>
|
|
||||||
<li>升级element-ui到最新版本2.15.6</li>
|
|
||||||
<li>新增sendGet无参请求方法</li>
|
|
||||||
<li>禁用el-tag组件的渐变动画</li>
|
|
||||||
<li>代码生成点击预览重置激活tab</li>
|
|
||||||
<li>AjaxResult重写put方法，以方便链式调用</li>
|
|
||||||
<li>优化登录/验证码请求headers不设置token</li>
|
|
||||||
<li>优化用户个人信息接口防止修改用户名</li>
|
|
||||||
<li>优化Cron表达式生成器关闭时销毁避免缓存</li>
|
|
||||||
<li>优化注册成功提示消息类型success</li>
|
|
||||||
<li>优化aop语法，使用spring自动注入注解</li>
|
|
||||||
<li>优化记录登录信息，移除不必要的修改</li>
|
|
||||||
<li>优化mybatis全局默认的执行器</li>
|
|
||||||
<li>优化Excel导入图片可能出现的异常</li>
|
|
||||||
<li>修复代码生成模板主子表删除缺少事务</li>
|
|
||||||
<li>修复日志记录可能出现的转换异常</li>
|
|
||||||
<li>修复代码生成复选框字典遗漏问题</li>
|
|
||||||
<li>修复关闭xss功能导致可重复读RepeatableFilter失效</li>
|
|
||||||
<li>修复字符串无法被反转义问题</li>
|
|
||||||
<li>修复后端主子表代码模板方法名生成错误问题</li>
|
|
||||||
<li>修复xss过滤后格式出现的异常</li>
|
|
||||||
<li>修复swagger没有指定dataTypeClass导致启动出现warn日志</li>
|
|
||||||
<li>其他细节优化</li>
|
|
||||||
</ol>
|
|
||||||
</el-collapse-item>
|
|
||||||
<el-collapse-item title="v3.7.0 - 2021-09-13">
|
|
||||||
<ol>
|
|
||||||
<li>参数管理支持配置验证码开关</li>
|
|
||||||
<li>新增是否开启用户注册功能</li>
|
|
||||||
<li>定时任务支持在线生成cron表达式</li>
|
|
||||||
<li>菜单管理支持配置路由参数</li>
|
|
||||||
<li>支持自定义注解实现接口限流</li>
|
|
||||||
<li>Excel注解支持Image图片导入</li>
|
|
||||||
<li>自定义弹层溢出滚动样式</li>
|
|
||||||
<li>自定义可拖动弹窗宽度指令</li>
|
|
||||||
<li>自定义可拖动弹窗高度指令</li>
|
|
||||||
<li>修复任意账户越权问题</li>
|
|
||||||
<li>修改时检查用户数据权限范围</li>
|
|
||||||
<li>修复保存配置主题颜色失效问题</li>
|
|
||||||
<li>新增暗色菜单风格主题</li>
|
|
||||||
<li>菜单&部门新增展开/折叠功能</li>
|
|
||||||
<li>页签新增关闭左侧&添加图标</li>
|
|
||||||
<li>顶部菜单排除隐藏的默认路由</li>
|
|
||||||
<li>顶部菜单同步系统主题样式</li>
|
|
||||||
<li>跳转路由高亮相对应的菜单栏</li>
|
|
||||||
<li>代码生成主子表多选行数据</li>
|
|
||||||
<li>日期范围支持添加多组</li>
|
|
||||||
<li>升级element-ui到最新版本2.15.5</li>
|
|
||||||
<li>升级oshi到最新版本v5.8.0</li>
|
|
||||||
<li>升级commons.io到最新版本v2.11.0</li>
|
|
||||||
<li>定时任务屏蔽ldap远程调用</li>
|
|
||||||
<li>定时任务屏蔽http(s)远程调用</li>
|
|
||||||
<li>补充定时任务表字段注释</li>
|
|
||||||
<li>定时任务对检查异常进行事务回滚</li>
|
|
||||||
<li>启用父部门状态排除顶级节点</li>
|
|
||||||
<li>富文本新增上传文件大小限制</li>
|
|
||||||
<li>默认首页使用keep-alive缓存</li>
|
|
||||||
<li>修改代码生成字典回显样式</li>
|
|
||||||
<li>自定义分页合理化传入参数</li>
|
|
||||||
<li>修复字典组件值为整形不显示问题</li>
|
|
||||||
<li>修复定时任务日志执行状态显示</li>
|
|
||||||
<li>角色&菜单新增字段属性提示信息</li>
|
|
||||||
<li>修复角色分配用户页面参数类型错误提醒</li>
|
|
||||||
<li>优化布局设置动画特效</li>
|
|
||||||
<li>优化异常处理信息</li>
|
|
||||||
<li>优化错误token导致的解析异常</li>
|
|
||||||
<li>密码框新增显示切换密码图标</li>
|
|
||||||
<li>定时任务新增更多操作</li>
|
|
||||||
<li>更多操作按钮添加权限控制</li>
|
|
||||||
<li>导入用户样式优化</li>
|
|
||||||
<li>提取通用方法到基类控制器</li>
|
|
||||||
<li>优化使用权限工具获取用户信息</li>
|
|
||||||
<li>优化用户不能删除自己</li>
|
|
||||||
<li>优化XSS跨站脚本过滤</li>
|
|
||||||
<li>优化代码生成模板</li>
|
|
||||||
<li>验证码默认20s超时</li>
|
|
||||||
<li>BLOB下载时清除URL对象引用</li>
|
|
||||||
<li>代码生成导入表按创建时间排序</li>
|
|
||||||
<li>修复代码生成页面数据编辑保存之后总是跳转第一页的问题</li>
|
|
||||||
<li>修复带safari浏览器无法格式化utc日期格式yyyy-MM-dd'T'HH:mm:ss.SSS问题</li>
|
|
||||||
<li>多图上传组件移除多余的api地址&验证失败导致图片删除问题&无法删除相应图片修复</li>
|
|
||||||
<li>其他细节优化</li>
|
|
||||||
</ol>
|
|
||||||
</el-collapse-item>
|
|
||||||
<el-collapse-item title="v3.6.0 - 2021-07-12">
|
|
||||||
<ol>
|
|
||||||
<li>角色管理新增分配用户功能</li>
|
|
||||||
<li>用户管理新增分配角色功能</li>
|
|
||||||
<li>日志列表支持排序操作</li>
|
|
||||||
<li>优化参数&字典缓存操作</li>
|
|
||||||
<li>系统布局配置支持动态标题开关</li>
|
|
||||||
<li>菜单路由配置支持内链访问</li>
|
|
||||||
<li>默认访问后端首页新增提示语</li>
|
|
||||||
<li>富文本默认上传返回url类型</li>
|
|
||||||
<li>新增自定义弹窗拖拽指令</li>
|
|
||||||
<li>全局注册常用通用组件</li>
|
|
||||||
<li>全局挂载字典标签组件</li>
|
|
||||||
<li>ImageUpload组件支持多图片上传</li>
|
|
||||||
<li>FileUpload组件支持多文件上传</li>
|
|
||||||
<li>文件上传组件添加数量限制属性</li>
|
|
||||||
<li>富文本编辑组件添加类型属性</li>
|
|
||||||
<li>富文本组件工具栏配置视频</li>
|
|
||||||
<li>封装通用iframe组件</li>
|
|
||||||
<li>限制超级管理员不允许操作</li>
|
|
||||||
<li>用户信息长度校验限制</li>
|
|
||||||
<li>分页组件新增pagerCount属性</li>
|
|
||||||
<li>添加bat脚本执行应用</li>
|
|
||||||
<li>升级oshi到最新版本v5.7.4</li>
|
|
||||||
<li>升级element-ui到最新版本2.15.2</li>
|
|
||||||
<li>升级pagehelper到最新版1.3.1</li>
|
|
||||||
<li>升级commons.io到最新版本v2.10.0</li>
|
|
||||||
<li>升级commons.fileupload到最新版本v1.4</li>
|
|
||||||
<li>升级swagger到最新版本v3.0.0</li>
|
|
||||||
<li>修复关闭confirm提示框控制台报错问题</li>
|
|
||||||
<li>修复存在的SQL注入漏洞问题</li>
|
|
||||||
<li>定时任务屏蔽rmi远程调用</li>
|
|
||||||
<li>修复用户搜索分页变量错误</li>
|
|
||||||
<li>修复导出角色数据范围翻译缺少仅本人</li>
|
|
||||||
<li>修复表单构建选择下拉选择控制台报错问题</li>
|
|
||||||
<li>优化图片工具类读取文件</li>
|
|
||||||
<li>其他细节优化</li>
|
|
||||||
</ol>
|
|
||||||
</el-collapse-item>
|
|
||||||
<el-collapse-item title="v3.5.0 - 2021-05-25">
|
|
||||||
<ol>
|
|
||||||
<li>新增菜单导航显示风格TopNav（false为左侧导航菜单，true为顶部导航菜单）</li>
|
|
||||||
<li>布局设置支持保存&重置配置</li>
|
|
||||||
<li>修复树表数据显示不全&加载慢问题</li>
|
|
||||||
<li>新增IE浏览器版本过低提示页面</li>
|
|
||||||
<li>用户登录后记录最后登录IP&时间</li>
|
|
||||||
<li>页面导出按钮点击之后添加遮罩</li>
|
|
||||||
<li>富文本编辑器支持自定义上传地址</li>
|
|
||||||
<li>富文本编辑组件新增readOnly属性</li>
|
|
||||||
<li>页签TagsView新增关闭右侧功能</li>
|
|
||||||
<li>显隐列组件加载初始默认隐藏列</li>
|
|
||||||
<li>关闭头像上传窗口还原默认图片</li>
|
|
||||||
<li>个人信息添加手机&邮箱重复验证</li>
|
|
||||||
<li>代码生成模板导出按钮点击后添加遮罩</li>
|
|
||||||
<li>代码生成模板树表操作列添加新增按钮</li>
|
|
||||||
<li>代码生成模板修复主子表字段重名问题</li>
|
|
||||||
<li>升级fastjson到最新版1.2.76</li>
|
|
||||||
<li>升级druid到最新版本v1.2.6</li>
|
|
||||||
<li>升级mybatis到最新版3.5.6 阻止远程代码执行漏洞</li>
|
|
||||||
<li>升级oshi到最新版本v5.6.0</li>
|
|
||||||
<li>velocity剔除commons-collections版本，防止3.2.1版本的反序列化漏洞</li>
|
|
||||||
<li>数据监控页默认账户密码防止越权访问</li>
|
|
||||||
<li>修复firefox下表单构建拖拽会新打卡一个选项卡</li>
|
|
||||||
<li>修正后端导入表权限标识</li>
|
|
||||||
<li>修正前端操作日志&登录日志权限标识</li>
|
|
||||||
<li>设置Redis配置HashKey序列化</li>
|
|
||||||
<li>删除操作日志记录信息</li>
|
|
||||||
<li>上传媒体类型添加视频格式</li>
|
|
||||||
<li>修复请求形参未传值记录日志异常问题</li>
|
|
||||||
<li>优化xss校验json请求条件</li>
|
|
||||||
<li>树级结构更新子节点使用replaceFirst</li>
|
|
||||||
<li>优化ExcelUtil空值处理</li>
|
|
||||||
<li>日志记录过滤BindingResult对象，防止异常</li>
|
|
||||||
<li>修改主题后mini类型按钮无效问题</li>
|
|
||||||
<li>优化通用下载完成后删除节点</li>
|
|
||||||
<li>通用Controller添加响应返回消息</li>
|
|
||||||
<li>其他细节优化</li>
|
|
||||||
</ol>
|
|
||||||
</el-collapse-item>
|
|
||||||
<el-collapse-item title="v3.4.0 - 2021-02-22">
|
|
||||||
<ol>
|
|
||||||
<li>代码生成模板支持主子表</li>
|
|
||||||
<li>表格右侧工具栏组件支持显隐列</li>
|
|
||||||
<li>图片组件添加预览&移除功能</li>
|
|
||||||
<li>Excel注解支持Image图片导出</li>
|
|
||||||
<li>操作按钮组调整为朴素按钮样式</li>
|
|
||||||
<li>代码生成支持文件上传组件</li>
|
|
||||||
<li>代码生成日期控件区分范围</li>
|
|
||||||
<li>代码生成数据库文本类型生成表单文本域</li>
|
|
||||||
<li>用户手机邮箱&菜单组件修改允许空字符串</li>
|
|
||||||
<li>升级SpringBoot到最新版本2.2.13 提升启动速度</li>
|
|
||||||
<li>升级druid到最新版本v1.2.4</li>
|
|
||||||
<li>升级fastjson到最新版1.2.75</li>
|
|
||||||
<li>升级element-ui到最新版本2.15.0</li>
|
|
||||||
<li>修复IE11浏览器报错问题</li>
|
|
||||||
<li>优化多级菜单之间切换无法缓存的问题</li>
|
|
||||||
<li>修复四级菜单无法显示问题</li>
|
|
||||||
<li>修正侧边栏静态路由丢失问题</li>
|
|
||||||
<li>修复角色管理-编辑角色-功能权限显示异常</li>
|
|
||||||
<li>配置文件新增redis数据库索引属性</li>
|
|
||||||
<li>权限工具类增加admin判断</li>
|
|
||||||
<li>角色非自定义权限范围清空选择值</li>
|
|
||||||
<li>修复导入数据为负浮点数时丢失精度问题</li>
|
|
||||||
<li>移除path-to-regexp正则匹配插件</li>
|
|
||||||
<li>修复生成树表代码异常</li>
|
|
||||||
<li>修改ip字段长度防止ipv6地址长度不够</li>
|
|
||||||
<li>防止get请求参数值为false或0等特殊值会导致无法正确的传参</li>
|
|
||||||
<li>登录后push添加catch防止出现检查错误</li>
|
|
||||||
<li>其他细节优化</li>
|
|
||||||
</ol>
|
|
||||||
</el-collapse-item>
|
|
||||||
<el-collapse-item title="v3.3.0 - 2020-12-14">
|
|
||||||
<ol>
|
|
||||||
<li>新增缓存监控功能</li>
|
|
||||||
<li>支持主题风格配置</li>
|
|
||||||
<li>修复多级菜单之间切换无法缓存的问题</li>
|
|
||||||
<li>多级菜单自动配置组件</li>
|
|
||||||
<li>代码生成预览支持高亮显示</li>
|
|
||||||
<li>支持Get请求映射Params参数</li>
|
|
||||||
<li>删除用户和角色解绑关联</li>
|
|
||||||
<li>去除用户手机邮箱部门必填验证</li>
|
|
||||||
<li>Excel支持注解align对齐方式</li>
|
|
||||||
<li>Excel支持导入Boolean型数据</li>
|
|
||||||
<li>优化头像样式，鼠标移入悬停遮罩</li>
|
|
||||||
<li>代码生成预览提供滚动机制</li>
|
|
||||||
<li>代码生成删除多余的数字float类型</li>
|
|
||||||
<li>修正转换字符串的目标字符集属性</li>
|
|
||||||
<li>回显数据字典防止空值报错</li>
|
|
||||||
<li>日志记录增加过滤多文件场景</li>
|
|
||||||
<li>修改缓存Set方法可能导致嵌套的问题</li>
|
|
||||||
<li>移除前端一些多余的依赖</li>
|
|
||||||
<li>防止安全扫描YUI出现的风险提示</li>
|
|
||||||
<li>修改node-sass为dart-sass</li>
|
|
||||||
<li>升级SpringBoot到最新版本2.1.18</li>
|
|
||||||
<li>升级poi到最新版本4.1.2</li>
|
|
||||||
<li>升级oshi到最新版本v5.3.6</li>
|
|
||||||
<li>升级bitwalker到最新版本1.21</li>
|
|
||||||
<li>升级axios到最新版本0.21.0</li>
|
|
||||||
<li>升级element-ui到最新版本2.14.1</li>
|
|
||||||
<li>升级vue到最新版本2.6.12</li>
|
|
||||||
<li>升级vuex到最新版本3.6.0</li>
|
|
||||||
<li>升级vue-cli到版本4.5.9</li>
|
|
||||||
<li>升级vue-router到最新版本3.4.9</li>
|
|
||||||
<li>升级vue-cli到最新版本4.4.6</li>
|
|
||||||
<li>升级vue-cropper到最新版本0.5.5</li>
|
|
||||||
<li>升级clipboard到最新版本2.0.6</li>
|
|
||||||
<li>升级core-js到最新版本3.8.1</li>
|
|
||||||
<li>升级echarts到最新版本4.9.0</li>
|
|
||||||
<li>升级file-saver到最新版本2.0.4</li>
|
|
||||||
<li>升级fuse.js到最新版本6.4.3</li>
|
|
||||||
<li>升级js-beautify到最新版本1.13.0</li>
|
|
||||||
<li>升级js-cookie到最新版本2.2.1</li>
|
|
||||||
<li>升级path-to-regexp到最新版本6.2.0</li>
|
|
||||||
<li>升级quill到最新版本1.3.7</li>
|
|
||||||
<li>升级screenfull到最新版本5.0.2</li>
|
|
||||||
<li>升级sortablejs到最新版本1.10.2</li>
|
|
||||||
<li>升级vuedraggable到最新版本2.24.3</li>
|
|
||||||
<li>升级chalk到最新版本4.1.0</li>
|
|
||||||
<li>升级eslint到最新版本7.15.0</li>
|
|
||||||
<li>升级eslint-plugin-vue到最新版本7.2.0</li>
|
|
||||||
<li>升级lint-staged到最新版本10.5.3</li>
|
|
||||||
<li>升级runjs到最新版本4.4.2</li>
|
|
||||||
<li>升级sass-loader到最新版本10.1.0</li>
|
|
||||||
<li>升级script-ext-html-webpack-plugin到最新版本2.1.5</li>
|
|
||||||
<li>升级svg-sprite-loader到最新版本5.1.1</li>
|
|
||||||
<li>升级vue-template-compiler到最新版本2.6.12</li>
|
|
||||||
<li>其他细节优化</li>
|
|
||||||
</ol>
|
|
||||||
</el-collapse-item>
|
|
||||||
<el-collapse-item title="v3.2.1 - 2020-11-18">
|
|
||||||
<ol>
|
|
||||||
<li>阻止任意文件下载漏洞</li>
|
|
||||||
<li>代码生成支持上传控件</li>
|
|
||||||
<li>新增图片上传组件</li>
|
|
||||||
<li>调整默认首页</li>
|
|
||||||
<li>升级druid到最新版本v1.2.2</li>
|
|
||||||
<li>mapperLocations配置支持分隔符</li>
|
|
||||||
<li>权限信息调整</li>
|
|
||||||
<li>调整sql默认时间</li>
|
|
||||||
<li>解决代码生成没有bit类型的问题</li>
|
|
||||||
<li>升级pagehelper到最新版1.3.0</li>
|
|
||||||
</ol>
|
|
||||||
</el-collapse-item>
|
|
||||||
<el-collapse-item title="v3.2.0 - 2020-10-10">
|
|
||||||
<ol>
|
|
||||||
<li>升级springboot版本到2.1.17 提升安全性</li>
|
|
||||||
<li>升级oshi到最新版本v5.2.5</li>
|
|
||||||
<li>升级druid到最新版本v1.2.1</li>
|
|
||||||
<li>升级jjwt到版本0.9.1</li>
|
|
||||||
<li>升级fastjson到最新版1.2.74</li>
|
|
||||||
<li>修改sass为node-sass，避免el-icon图标乱码</li>
|
|
||||||
<li>代码生成支持同步数据库</li>
|
|
||||||
<li>代码生成支持富文本控件</li>
|
|
||||||
<li>代码生成页面时不忽略remark属性</li>
|
|
||||||
<li>代码生成添加select必填选项</li>
|
|
||||||
<li>Excel导出类型NUMERIC支持精度浮点类型</li>
|
|
||||||
<li>Excel导出targetAttr优化获取值，防止get方法不规范</li>
|
|
||||||
<li>Excel注解支持自动统计数据总和</li>
|
|
||||||
<li>Excel注解支持设置BigDecimal精度&舍入规则</li>
|
|
||||||
<li>菜单&数据权限新增（展开/折叠 全选/全不选 父子联动）</li>
|
|
||||||
<li>允许用户分配到部门父节点</li>
|
|
||||||
<li>菜单新增是否缓存keep-alive</li>
|
|
||||||
<li>表格操作列间距调整</li>
|
|
||||||
<li>限制系统内置参数不允许删除</li>
|
|
||||||
<li>富文本组件优化，支持自定义高度&图片冲突问题</li>
|
|
||||||
<li>富文本工具栏样式对齐</li>
|
|
||||||
<li>导入excel整形值校验优化</li>
|
|
||||||
<li>修复页签关闭所有时固定标签路由不刷新问题</li>
|
|
||||||
<li>表单构建布局型组件新增按钮</li>
|
|
||||||
<li>左侧菜单文字过长显示省略号</li>
|
|
||||||
<li>修正根节点为子部门时，树状结构显示问题</li>
|
|
||||||
<li>修正调用目标字符串最大长度</li>
|
|
||||||
<li>修正菜单提示信息错误</li>
|
|
||||||
<li>修正定时任务执行一次权限标识</li>
|
|
||||||
<li>修正数据库字符串类型nvarchar</li>
|
|
||||||
<li>优化递归子节点</li>
|
|
||||||
<li>优化数据权限判断</li>
|
|
||||||
<li>其他细节优化</li>
|
|
||||||
</ol>
|
|
||||||
</el-collapse-item>
|
|
||||||
|
|
||||||
<el-collapse-item title="v3.1.0 - 2020-08-13">
|
|
||||||
<ol>
|
|
||||||
<li>表格工具栏右侧添加刷新&显隐查询组件</li>
|
|
||||||
<li>后端支持CORS跨域请求</li>
|
|
||||||
<li>代码生成支持选择上级菜单</li>
|
|
||||||
<li>代码生成支持自定义路径</li>
|
|
||||||
<li>代码生成支持复选框</li>
|
|
||||||
<li>Excel导出导入支持dictType字典类型</li>
|
|
||||||
<li>Excel支持分割字符串组内容</li>
|
|
||||||
<li>验证码类型支持（数组计算、字符验证）</li>
|
|
||||||
<li>升级vue-cli版本到4.4.4</li>
|
|
||||||
<li>修改 node-sass 为 dart-sass</li>
|
|
||||||
<li>表单类型为Integer/Long设置整形默认值</li>
|
|
||||||
<li>代码生成器默认mapper路径与默认mapperScan路径不一致</li>
|
|
||||||
<li>优化防重复提交拦截器</li>
|
|
||||||
<li>优化上级菜单不能选择自己</li>
|
|
||||||
<li>修复角色的权限分配后，未实时生效问题</li>
|
|
||||||
<li>修复在线用户日志记录类型</li>
|
|
||||||
<li>修复富文本空格和缩进保存后不生效问题</li>
|
|
||||||
<li>修复在线用户判断逻辑</li>
|
|
||||||
<li>唯一限制条件只返回单条数据</li>
|
|
||||||
<li>添加获取当前的环境配置方法</li>
|
|
||||||
<li>超时登录后页面跳转到首页</li>
|
|
||||||
<li>全局异常状态汉化拦截处理</li>
|
|
||||||
<li>HTML过滤器改为将html转义</li>
|
|
||||||
<li>检查字符支持小数点&降级改成异常提醒</li>
|
|
||||||
<li>其他细节优化</li>
|
|
||||||
</ol>
|
|
||||||
</el-collapse-item>
|
|
||||||
|
|
||||||
<el-collapse-item title="v3.0.0 - 2020-07-20">
|
|
||||||
<ol>
|
|
||||||
<li>单应用调整为多模块项目</li>
|
|
||||||
<li>升级element-ui版本到2.13.2</li>
|
|
||||||
<li>删除babel，提高编译速度。</li>
|
|
||||||
<li>新增菜单默认主类目</li>
|
|
||||||
<li>编码文件名修改为uuid方式</li>
|
|
||||||
<li>定时任务cron表达式验证</li>
|
|
||||||
<li>角色权限修改时已有权限未自动勾选异常修复</li>
|
|
||||||
<li>防止切换权限用户后登录出现404</li>
|
|
||||||
<li>Excel支持sort导出排序</li>
|
|
||||||
<li>创建用户不允许选择超级管理员角色</li>
|
|
||||||
<li>修复代码生成导入表结构出现异常页面不提醒问题</li>
|
|
||||||
<li>修复代码生成点击多次表修改数据不变化的问题</li>
|
|
||||||
<li>修复头像上传成功二次打开无法改变裁剪框大小和位置问题</li>
|
|
||||||
<li>修复布局为small者mini用户表单显示错位问题</li>
|
|
||||||
<li>修复热部署导致的强换异常问题</li>
|
|
||||||
<li>修改用户管理复选框宽度，防止部分浏览器出现省略号</li>
|
|
||||||
<li>IpUtils工具，清除Xss特殊字符，防止Xff注入攻击</li>
|
|
||||||
<li>生成domain 如果是浮点型 统一用BigDecimal</li>
|
|
||||||
<li>定时任务调整label-width，防止部署出现错位</li>
|
|
||||||
<li>调整表头固定列默认样式</li>
|
|
||||||
<li>代码生成模板调整，字段为String并且必填则加空串条件</li>
|
|
||||||
<li>代码生成字典Integer/Long使用parseInt</li>
|
|
||||||
<li>
|
|
||||||
修复dict_sort不可update为0的问题&查询返回增加dict_sort升序排序
|
|
||||||
</li>
|
|
||||||
<li>修正岗位导出权限注解</li>
|
|
||||||
<li>禁止加密密文返回前端</li>
|
|
||||||
<li>修复代码生成页面中的查询条件创建时间未生效的问题</li>
|
|
||||||
<li>修复首页搜索菜单外链无法点击跳转问题</li>
|
|
||||||
<li>修复菜单管理选择图标，backspace删除时不过滤数据</li>
|
|
||||||
<li>用户管理部门分支节点不可检查&显示计数</li>
|
|
||||||
<li>数据范围过滤属性调整</li>
|
|
||||||
<li>其他细节优化</li>
|
|
||||||
</ol>
|
|
||||||
</el-collapse-item>
|
|
||||||
|
|
||||||
<el-collapse-item title="v2.3.0 - 2020-06-01">
|
|
||||||
<ol>
|
|
||||||
<li>升级fastjson到最新版1.2.70 修复高危安全漏洞</li>
|
|
||||||
<li>dev启动默认打开浏览器</li>
|
|
||||||
<li>vue-cli使用默认source-map</li>
|
|
||||||
<li>slidebar eslint报错优化</li>
|
|
||||||
<li>当tags-view滚动关闭右键菜单</li>
|
|
||||||
<li>字典管理添加缓存读取</li>
|
|
||||||
<li>参数管理支持缓存操作</li>
|
|
||||||
<li>支持一级菜单（和主页同级）在main区域显示</li>
|
|
||||||
<li>限制外链地址必须以http(s)开头</li>
|
|
||||||
<li>tagview & sidebar 主题颜色与element ui(全局)同步</li>
|
|
||||||
<li>修改数据源类型优先级，先根据方法，再根据类</li>
|
|
||||||
<li>支持是否需要设置token属性，自定义返回码消息。</li>
|
|
||||||
<li>swagger请求前缀加入配置。</li>
|
|
||||||
<li>登录地点设置内容过长则隐藏显示</li>
|
|
||||||
<li>修复定时任务执行一次按钮后不提示消息问题</li>
|
|
||||||
<li>修改上级部门（选择项排除本身和下级）</li>
|
|
||||||
<li>通用http发送方法增加参数 contentType 编码类型</li>
|
|
||||||
<li>更换IP地址查询接口</li>
|
|
||||||
<li>修复页签变量undefined</li>
|
|
||||||
<li>添加校验部门包含未停用的子部门</li>
|
|
||||||
<li>修改定时任务详情下次执行时间日期显示错误</li>
|
|
||||||
<li>角色管理查询设置默认排序字段</li>
|
|
||||||
<li>swagger添加enable参数控制是否启用</li>
|
|
||||||
<li>只对json类型请求构建可重复读取inputStream的request</li>
|
|
||||||
<li>修改代码生成字典字段int类型没有自动选中问题</li>
|
|
||||||
<li>vuex用户名取值修正</li>
|
|
||||||
<li>表格树模板去掉多余的)</li>
|
|
||||||
<li>代码生成序号修正</li>
|
|
||||||
<li>全屏情况下不调整上外边距</li>
|
|
||||||
<li>代码生成Date字段添加默认格式</li>
|
|
||||||
<li>用户管理角色选择权限控制</li>
|
|
||||||
<li>修复路由懒加载报错问题</li>
|
|
||||||
<li>模板sql.vm添加菜单状态</li>
|
|
||||||
<li>设置用户名称不能修改</li>
|
|
||||||
<li>dialog添加append-to-body属性，防止ie遮罩</li>
|
|
||||||
<li>菜单区分状态和显示隐藏功能</li>
|
|
||||||
<li>升级fastjson到最新版1.2.68 修复安全加固</li>
|
|
||||||
<li>修复代码生成如果选择字典类型缺失逗号问题</li>
|
|
||||||
<li>登录请求params更换为data，防止暴露url</li>
|
|
||||||
<li>日志返回时间格式处理</li>
|
|
||||||
<li>添加handle控制允许拖动的元素</li>
|
|
||||||
<li>布局设置点击扩大范围</li>
|
|
||||||
<li>代码生成列属性排序查询</li>
|
|
||||||
<li>代码生成列支持拖动排序</li>
|
|
||||||
<li>修复时间格式不支持ios问题</li>
|
|
||||||
<li>表单构建添加父级class，防止冲突</li>
|
|
||||||
<li>定时任务并发属性修正</li>
|
|
||||||
<li>角色禁用&菜单隐藏不查询权限</li>
|
|
||||||
<li>其他细节优化</li>
|
|
||||||
</ol>
|
|
||||||
</el-collapse-item>
|
|
||||||
|
|
||||||
<el-collapse-item title="v2.2.0 - 2020-03-18">
|
|
||||||
<ol>
|
|
||||||
<li>系统监控新增定时任务功能</li>
|
|
||||||
<li>添加一个打包Web工程bat</li>
|
|
||||||
<li>修复页签鼠标滚轮按下的时候，可以关闭不可关闭的tag</li>
|
|
||||||
<li>修复点击退出登录有时会无提示问题</li>
|
|
||||||
<li>修复防重复提交注解无效问题</li>
|
|
||||||
<li>修复通知公告批量删除异常问题</li>
|
|
||||||
<li>添加菜单时路由地址必填限制</li>
|
|
||||||
<li>代码生成字段描述可编辑</li>
|
|
||||||
<li>修复用户修改个人信息导致缓存不过期问题</li>
|
|
||||||
<li>个人信息创建时间获取正确属性值</li>
|
|
||||||
<li>操作日志详细显示正确类型</li>
|
|
||||||
<li>导入表单击行数据时选中对应的复选框</li>
|
|
||||||
<li>批量替换表前缀逻辑调整</li>
|
|
||||||
<li>固定重定向路径表达式</li>
|
|
||||||
<li>升级element-ui版本到2.13.0</li>
|
|
||||||
<li>操作日志排序调整</li>
|
|
||||||
<li>修复charts切换侧边栏或者缩放窗口显示bug</li>
|
|
||||||
<li>其他细节优化</li>
|
|
||||||
</ol>
|
|
||||||
</el-collapse-item>
|
|
||||||
|
|
||||||
<el-collapse-item title="v2.1.0 - 2020-02-24">
|
|
||||||
<ol>
|
|
||||||
<li>新增表单构建</li>
|
|
||||||
<li>代码生成支持树表结构</li>
|
|
||||||
<li>新增用户导入</li>
|
|
||||||
<li>修复动态加载路由页面刷新问题</li>
|
|
||||||
<li>修复地址开关无效问题</li>
|
|
||||||
<li>汉化错误提示页面</li>
|
|
||||||
<li>代码生成已知问题修改</li>
|
|
||||||
<li>修复多数据源下配置关闭出现异常处理</li>
|
|
||||||
<li>添加HTML过滤器，用于去除XSS漏洞隐患</li>
|
|
||||||
<li>修复上传头像控制台出现异常</li>
|
|
||||||
<li>修改用户管理分页不正确的问题</li>
|
|
||||||
<li>修复验证码记录提示错误</li>
|
|
||||||
<li>修复request.js缺少Message引用</li>
|
|
||||||
<li>修复表格时间为空出现的异常</li>
|
|
||||||
<li>添加Jackson日期反序列化时区配置</li>
|
|
||||||
<li>调整根据用户权限加载菜单数据树形结构</li>
|
|
||||||
<li>调整成功登录不恢复按钮，防止多次点击</li>
|
|
||||||
<li>修改用户个人资料同步缓存信息</li>
|
|
||||||
<li>修复页面同时出现el-upload和Editor不显示处理</li>
|
|
||||||
<li>修复在角色管理页修改菜单权限偶尔未选中问题</li>
|
|
||||||
<li>配置文件新增redis密码属性</li>
|
|
||||||
<li>设置mybatis全局的配置文件</li>
|
|
||||||
<li>其他细节优化</li>
|
|
||||||
</ol>
|
|
||||||
</el-collapse-item>
|
|
||||||
|
|
||||||
<el-collapse-item title="v2.0.0 - 2019-12-02">
|
|
||||||
<ol>
|
|
||||||
<li>新增代码生成</li>
|
|
||||||
<li>新增@RepeatSubmit注解，防止重复提交</li>
|
|
||||||
<li>新增菜单主目录添加/删除操作</li>
|
|
||||||
<li>日志记录过滤特殊对象，防止转换异常</li>
|
|
||||||
<li>修改代码生成路由脚本错误</li>
|
|
||||||
<li>用户上传头像实时同步缓存，无需重新登录</li>
|
|
||||||
<li>调整切换页签后不重新加载数据</li>
|
|
||||||
<li>添加jsencrypt实现参数的前端加密</li>
|
|
||||||
<li>系统退出删除用户缓存记录</li>
|
|
||||||
<li>其他细节优化</li>
|
|
||||||
</ol>
|
|
||||||
</el-collapse-item>
|
|
||||||
<el-collapse-item title="v1.1.0 - 2019-11-11">
|
|
||||||
<ol>
|
|
||||||
<li>新增在线用户管理</li>
|
|
||||||
<li>新增按钮组功能实现（批量删除、导出、清空）</li>
|
|
||||||
<li>新增查询条件重置按钮</li>
|
|
||||||
<li>新增Swagger全局Token配置</li>
|
|
||||||
<li>新增后端参数校验</li>
|
|
||||||
<li>修复字典管理页面的日期查询异常</li>
|
|
||||||
<li>修改时间函数命名防止冲突</li>
|
|
||||||
<li>去除菜单上级校验，默认为顶级</li>
|
|
||||||
<li>修复用户密码无法修改问题</li>
|
|
||||||
<li>修复菜单类型为按钮时不显示权限标识</li>
|
|
||||||
<li>其他细节优化</li>
|
|
||||||
</ol>
|
|
||||||
</el-collapse-item>
|
|
||||||
<el-collapse-item title="v1.0.0 - 2019-10-08">
|
|
||||||
<ol>
|
|
||||||
<li>若依前后端分离系统正式发布</li>
|
|
||||||
</ol>
|
|
||||||
</el-collapse-item>
|
|
||||||
</el-collapse>
|
|
||||||
</el-card>
|
|
||||||
</el-col>
|
|
||||||
<el-col :xs="24" :sm="24" :md="12" :lg="8">
|
|
||||||
<el-card class="update-log">
|
|
||||||
<div slot="header" class="clearfix">
|
|
||||||
<span>捐赠支持</span>
|
|
||||||
</div>
|
|
||||||
<div class="body">
|
|
||||||
<img
|
|
||||||
src="https://oscimg.oschina.net/oscnet/up-d6695f82666e5018f715c41cb7ee60d3b73.png"
|
|
||||||
alt="donate"
|
|
||||||
width="100%"
|
|
||||||
/>
|
|
||||||
<span style="display: inline-block; height: 30px; line-height: 30px"
|
|
||||||
>你可以请作者喝杯咖啡表示鼓励</span
|
|
||||||
>
|
|
||||||
</div>
|
|
||||||
</el-card>
|
|
||||||
</el-col>
|
|
||||||
</el-row>
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script>
|
|
||||||
export default {
|
|
||||||
name: "Index",
|
|
||||||
data() {
|
|
||||||
return {
|
|
||||||
// 版本号
|
|
||||||
version: "3.8.1",
|
|
||||||
};
|
|
||||||
},
|
|
||||||
methods: {
|
|
||||||
goTarget(href) {
|
|
||||||
window.open(href, "_blank");
|
|
||||||
},
|
|
||||||
},
|
|
||||||
};
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<style scoped lang="scss">
|
|
||||||
.home {
|
|
||||||
blockquote {
|
|
||||||
padding: 10px 20px;
|
|
||||||
margin: 0 0 20px;
|
|
||||||
font-size: 17.5px;
|
|
||||||
border-left: 5px solid #eee;
|
|
||||||
}
|
|
||||||
hr {
|
|
||||||
margin-top: 20px;
|
|
||||||
margin-bottom: 20px;
|
|
||||||
border: 0;
|
|
||||||
border-top: 1px solid #eee;
|
|
||||||
}
|
|
||||||
.col-item {
|
|
||||||
margin-bottom: 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
ul {
|
|
||||||
padding: 0;
|
|
||||||
margin: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
font-family: "open sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
|
|
||||||
font-size: 13px;
|
|
||||||
color: #676a6c;
|
|
||||||
overflow-x: hidden;
|
|
||||||
|
|
||||||
ul {
|
|
||||||
list-style-type: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
h4 {
|
|
||||||
margin-top: 0px;
|
|
||||||
}
|
|
||||||
|
|
||||||
h2 {
|
|
||||||
margin-top: 10px;
|
|
||||||
font-size: 26px;
|
|
||||||
font-weight: 100;
|
|
||||||
}
|
|
||||||
|
|
||||||
p {
|
|
||||||
margin-top: 10px;
|
|
||||||
|
|
||||||
b {
|
|
||||||
font-weight: 700;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.update-log {
|
|
||||||
ol {
|
|
||||||
display: block;
|
|
||||||
list-style-type: decimal;
|
|
||||||
margin-block-start: 1em;
|
|
||||||
margin-block-end: 1em;
|
|
||||||
margin-inline-start: 0;
|
|
||||||
margin-inline-end: 0;
|
|
||||||
padding-inline-start: 40px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
|
|
||||||
|
|||||||
@ -1,98 +0,0 @@
|
|||||||
<template>
|
|
||||||
<div class="dashboard-editor-container">
|
|
||||||
|
|
||||||
<panel-group @handleSetLineChartData="handleSetLineChartData" />
|
|
||||||
|
|
||||||
<el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
|
|
||||||
<line-chart :chart-data="lineChartData" />
|
|
||||||
</el-row>
|
|
||||||
|
|
||||||
<el-row :gutter="32">
|
|
||||||
<el-col :xs="24" :sm="24" :lg="8">
|
|
||||||
<div class="chart-wrapper">
|
|
||||||
<raddar-chart />
|
|
||||||
</div>
|
|
||||||
</el-col>
|
|
||||||
<el-col :xs="24" :sm="24" :lg="8">
|
|
||||||
<div class="chart-wrapper">
|
|
||||||
<pie-chart />
|
|
||||||
</div>
|
|
||||||
</el-col>
|
|
||||||
<el-col :xs="24" :sm="24" :lg="8">
|
|
||||||
<div class="chart-wrapper">
|
|
||||||
<bar-chart />
|
|
||||||
</div>
|
|
||||||
</el-col>
|
|
||||||
</el-row>
|
|
||||||
|
|
||||||
|
|
||||||
</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script>
|
|
||||||
import PanelGroup from './dashboard/PanelGroup'
|
|
||||||
import LineChart from './dashboard/LineChart'
|
|
||||||
import RaddarChart from './dashboard/RaddarChart'
|
|
||||||
import PieChart from './dashboard/PieChart'
|
|
||||||
import BarChart from './dashboard/BarChart'
|
|
||||||
|
|
||||||
const lineChartData = {
|
|
||||||
newVisitis: {
|
|
||||||
expectedData: [100, 120, 161, 134, 105, 160, 165],
|
|
||||||
actualData: [120, 82, 91, 154, 162, 140, 145]
|
|
||||||
},
|
|
||||||
messages: {
|
|
||||||
expectedData: [200, 192, 120, 144, 160, 130, 140],
|
|
||||||
actualData: [180, 160, 151, 106, 145, 150, 130]
|
|
||||||
},
|
|
||||||
purchases: {
|
|
||||||
expectedData: [80, 100, 121, 104, 105, 90, 100],
|
|
||||||
actualData: [120, 90, 100, 138, 142, 130, 130]
|
|
||||||
},
|
|
||||||
shoppings: {
|
|
||||||
expectedData: [130, 140, 141, 142, 145, 150, 160],
|
|
||||||
actualData: [120, 82, 91, 154, 162, 140, 130]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export default {
|
|
||||||
name: 'Index',
|
|
||||||
components: {
|
|
||||||
PanelGroup,
|
|
||||||
LineChart,
|
|
||||||
RaddarChart,
|
|
||||||
PieChart,
|
|
||||||
BarChart
|
|
||||||
},
|
|
||||||
data() {
|
|
||||||
return {
|
|
||||||
lineChartData: lineChartData.newVisitis
|
|
||||||
}
|
|
||||||
},
|
|
||||||
methods: {
|
|
||||||
handleSetLineChartData(type) {
|
|
||||||
this.lineChartData = lineChartData[type]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
|
||||||
.dashboard-editor-container {
|
|
||||||
padding: 32px;
|
|
||||||
background-color: rgb(240, 242, 245);
|
|
||||||
position: relative;
|
|
||||||
|
|
||||||
.chart-wrapper {
|
|
||||||
background: #fff;
|
|
||||||
padding: 16px 16px 0;
|
|
||||||
margin-bottom: 32px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (max-width:1024px) {
|
|
||||||
.chart-wrapper {
|
|
||||||
padding: 8px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
@ -1,219 +1,220 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="login">
|
<div class="login">
|
||||||
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
|
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
|
||||||
<h3 class="title">若依后台管理系统</h3>
|
<h3 class="title">阿狸云管理</h3>
|
||||||
<el-form-item prop="username">
|
<el-form-item prop="username">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="loginForm.username"
|
v-model="loginForm.username"
|
||||||
type="text"
|
type="text"
|
||||||
auto-complete="off"
|
auto-complete="off"
|
||||||
placeholder="账号"
|
placeholder="账号"
|
||||||
>
|
>
|
||||||
<svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
|
<svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
|
||||||
</el-input>
|
</el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item prop="password">
|
<el-form-item prop="password">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="loginForm.password"
|
v-model="loginForm.password"
|
||||||
type="password"
|
type="password"
|
||||||
auto-complete="off"
|
auto-complete="off"
|
||||||
placeholder="密码"
|
placeholder="密码"
|
||||||
@keyup.enter.native="handleLogin"
|
@keyup.enter.native="handleLogin"
|
||||||
>
|
>
|
||||||
<svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
|
<svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
|
||||||
</el-input>
|
</el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item prop="code" v-if="captchaOnOff">
|
<el-form-item prop="code" v-if="captchaOnOff">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="loginForm.code"
|
v-model="loginForm.code"
|
||||||
auto-complete="off"
|
auto-complete="off"
|
||||||
placeholder="验证码"
|
placeholder="验证码"
|
||||||
style="width: 63%"
|
style="width: 63%"
|
||||||
@keyup.enter.native="handleLogin"
|
@keyup.enter.native="handleLogin"
|
||||||
>
|
>
|
||||||
<svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
|
<svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
|
||||||
</el-input>
|
</el-input>
|
||||||
<div class="login-code">
|
<div class="login-code">
|
||||||
<img :src="codeUrl" @click="getCode" class="login-code-img"/>
|
<img :src="codeUrl" @click="getCode" class="login-code-img"/>
|
||||||
</div>
|
</div>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
|
<el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
|
||||||
<el-form-item style="width:100%;">
|
<el-form-item style="width:100%;">
|
||||||
<el-button
|
<el-button
|
||||||
:loading="loading"
|
:loading="loading"
|
||||||
size="medium"
|
size="medium"
|
||||||
type="primary"
|
type="primary"
|
||||||
style="width:100%;"
|
style="width:100%;"
|
||||||
@click.native.prevent="handleLogin"
|
@click.native.prevent="handleLogin"
|
||||||
>
|
>
|
||||||
<span v-if="!loading">登 录</span>
|
<span v-if="!loading">登 录</span>
|
||||||
<span v-else>登 录 中...</span>
|
<span v-else>登 录 中...</span>
|
||||||
</el-button>
|
</el-button>
|
||||||
<div style="float: right;" v-if="register">
|
<div style="float: right;" v-if="register">
|
||||||
<router-link class="link-type" :to="'/register'">立即注册</router-link>
|
<router-link class="link-type" :to="'/register'">立即注册</router-link>
|
||||||
</div>
|
</div>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
<!-- 底部 -->
|
<!-- 底部 -->
|
||||||
<div class="el-login-footer">
|
<div class="el-login-footer">
|
||||||
<span>Copyright © 2018-2022 ruoyi.vip All Rights Reserved.</span>
|
<span><img src="../assets/images/ba.png"/><a href="https://beian.miit.gov.cn/" target="_blank">黔ICP备2021003733号</a></span>
|
||||||
</div>
|
<span class="text-danger"> 技术交流QQ群：694716003</span>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</div>
|
||||||
|
</template>
|
||||||
<script>
|
|
||||||
import { getCodeImg } from "@/api/login";
|
<script>
|
||||||
import Cookies from "js-cookie";
|
import { getCodeImg } from "@/api/login";
|
||||||
import { encrypt, decrypt } from '@/utils/jsencrypt'
|
import Cookies from "js-cookie";
|
||||||
|
import { encrypt, decrypt } from '@/utils/jsencrypt'
|
||||||
export default {
|
|
||||||
name: "Login",
|
export default {
|
||||||
data() {
|
name: "Login",
|
||||||
return {
|
data() {
|
||||||
codeUrl: "",
|
return {
|
||||||
loginForm: {
|
codeUrl: "",
|
||||||
username: "admin",
|
loginForm: {
|
||||||
password: "admin123",
|
username: "",
|
||||||
rememberMe: false,
|
password: "",
|
||||||
code: "",
|
rememberMe: false,
|
||||||
uuid: ""
|
code: "",
|
||||||
},
|
uuid: ""
|
||||||
loginRules: {
|
},
|
||||||
username: [
|
loginRules: {
|
||||||
{ required: true, trigger: "blur", message: "请输入您的账号" }
|
username: [
|
||||||
],
|
{ required: true, trigger: "blur", message: "请输入您的账号" }
|
||||||
password: [
|
],
|
||||||
{ required: true, trigger: "blur", message: "请输入您的密码" }
|
password: [
|
||||||
],
|
{ required: true, trigger: "blur", message: "请输入您的密码" }
|
||||||
code: [{ required: true, trigger: "change", message: "请输入验证码" }]
|
],
|
||||||
},
|
code: [{ required: true, trigger: "change", message: "请输入验证码" }]
|
||||||
loading: false,
|
},
|
||||||
// 验证码开关
|
loading: false,
|
||||||
captchaOnOff: true,
|
// 验证码开关
|
||||||
// 注册开关
|
captchaOnOff: true,
|
||||||
register: false,
|
// 注册开关
|
||||||
redirect: undefined
|
register: false,
|
||||||
};
|
redirect: undefined
|
||||||
},
|
};
|
||||||
watch: {
|
},
|
||||||
$route: {
|
watch: {
|
||||||
handler: function(route) {
|
$route: {
|
||||||
this.redirect = route.query && route.query.redirect;
|
handler: function(route) {
|
||||||
},
|
this.redirect = route.query && route.query.redirect;
|
||||||
immediate: true
|
},
|
||||||
}
|
immediate: true
|
||||||
},
|
}
|
||||||
created() {
|
},
|
||||||
this.getCode();
|
created() {
|
||||||
this.getCookie();
|
this.getCode();
|
||||||
},
|
this.getCookie();
|
||||||
methods: {
|
},
|
||||||
getCode() {
|
methods: {
|
||||||
getCodeImg().then(res => {
|
getCode() {
|
||||||
this.captchaOnOff = res.captchaOnOff === undefined ? true : res.captchaOnOff;
|
getCodeImg().then(res => {
|
||||||
if (this.captchaOnOff) {
|
this.captchaOnOff = res.captchaOnOff === undefined ? true : res.captchaOnOff;
|
||||||
this.codeUrl = "data:image/gif;base64," + res.img;
|
if (this.captchaOnOff) {
|
||||||
this.loginForm.uuid = res.uuid;
|
this.codeUrl = "data:image/gif;base64," + res.img;
|
||||||
}
|
this.loginForm.uuid = res.uuid;
|
||||||
});
|
}
|
||||||
},
|
});
|
||||||
getCookie() {
|
},
|
||||||
const username = Cookies.get("username");
|
getCookie() {
|
||||||
const password = Cookies.get("password");
|
const username = Cookies.get("username");
|
||||||
const rememberMe = Cookies.get('rememberMe')
|
const password = Cookies.get("password");
|
||||||
this.loginForm = {
|
const rememberMe = Cookies.get('rememberMe')
|
||||||
username: username === undefined ? this.loginForm.username : username,
|
this.loginForm = {
|
||||||
password: password === undefined ? this.loginForm.password : decrypt(password),
|
username: username === undefined ? this.loginForm.username : username,
|
||||||
rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
|
password: password === undefined ? this.loginForm.password : decrypt(password),
|
||||||
};
|
rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
|
||||||
},
|
};
|
||||||
handleLogin() {
|
},
|
||||||
this.$refs.loginForm.validate(valid => {
|
handleLogin() {
|
||||||
if (valid) {
|
this.$refs.loginForm.validate(valid => {
|
||||||
this.loading = true;
|
if (valid) {
|
||||||
if (this.loginForm.rememberMe) {
|
this.loading = true;
|
||||||
Cookies.set("username", this.loginForm.username, { expires: 30 });
|
if (this.loginForm.rememberMe) {
|
||||||
Cookies.set("password", encrypt(this.loginForm.password), { expires: 30 });
|
Cookies.set("username", this.loginForm.username, { expires: 30 });
|
||||||
Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 });
|
Cookies.set("password", encrypt(this.loginForm.password), { expires: 30 });
|
||||||
} else {
|
Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 });
|
||||||
Cookies.remove("username");
|
} else {
|
||||||
Cookies.remove("password");
|
Cookies.remove("username");
|
||||||
Cookies.remove('rememberMe');
|
Cookies.remove("password");
|
||||||
}
|
Cookies.remove('rememberMe');
|
||||||
this.$store.dispatch("Login", this.loginForm).then(() => {
|
}
|
||||||
this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
|
this.$store.dispatch("Login", this.loginForm).then(() => {
|
||||||
}).catch(() => {
|
this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
|
||||||
this.loading = false;
|
}).catch(() => {
|
||||||
if (this.captchaOnOff) {
|
this.loading = false;
|
||||||
this.getCode();
|
if (this.captchaOnOff) {
|
||||||
}
|
this.getCode();
|
||||||
});
|
}
|
||||||
}
|
});
|
||||||
});
|
}
|
||||||
}
|
});
|
||||||
}
|
}
|
||||||
};
|
}
|
||||||
</script>
|
};
|
||||||
|
</script>
|
||||||
<style rel="stylesheet/scss" lang="scss">
|
|
||||||
.login {
|
<style rel="stylesheet/scss" lang="scss">
|
||||||
display: flex;
|
.login {
|
||||||
justify-content: center;
|
display: flex;
|
||||||
align-items: center;
|
justify-content: center;
|
||||||
height: 100%;
|
align-items: center;
|
||||||
background-image: url("../assets/images/login-background.jpg");
|
height: 100%;
|
||||||
background-size: cover;
|
background-image: url("../assets/images/login-background.jpg");
|
||||||
}
|
background-size: cover;
|
||||||
.title {
|
}
|
||||||
margin: 0px auto 30px auto;
|
.title {
|
||||||
text-align: center;
|
margin: 0px auto 30px auto;
|
||||||
color: #707070;
|
text-align: center;
|
||||||
}
|
color: #707070;
|
||||||
|
}
|
||||||
.login-form {
|
|
||||||
border-radius: 6px;
|
.login-form {
|
||||||
background: #ffffff;
|
border-radius: 6px;
|
||||||
width: 400px;
|
background: #ffffff;
|
||||||
padding: 25px 25px 5px 25px;
|
width: 400px;
|
||||||
.el-input {
|
padding: 25px 25px 5px 25px;
|
||||||
height: 38px;
|
.el-input {
|
||||||
input {
|
height: 38px;
|
||||||
height: 38px;
|
input {
|
||||||
}
|
height: 38px;
|
||||||
}
|
}
|
||||||
.input-icon {
|
}
|
||||||
height: 39px;
|
.input-icon {
|
||||||
width: 14px;
|
height: 39px;
|
||||||
margin-left: 2px;
|
width: 14px;
|
||||||
}
|
margin-left: 2px;
|
||||||
}
|
}
|
||||||
.login-tip {
|
}
|
||||||
font-size: 13px;
|
.login-tip {
|
||||||
text-align: center;
|
font-size: 13px;
|
||||||
color: #bfbfbf;
|
text-align: center;
|
||||||
}
|
color: #bfbfbf;
|
||||||
.login-code {
|
}
|
||||||
width: 33%;
|
.login-code {
|
||||||
height: 38px;
|
width: 33%;
|
||||||
float: right;
|
height: 38px;
|
||||||
img {
|
float: right;
|
||||||
cursor: pointer;
|
img {
|
||||||
vertical-align: middle;
|
cursor: pointer;
|
||||||
}
|
vertical-align: middle;
|
||||||
}
|
}
|
||||||
.el-login-footer {
|
}
|
||||||
height: 40px;
|
.el-login-footer {
|
||||||
line-height: 40px;
|
height: 40px;
|
||||||
position: fixed;
|
line-height: 40px;
|
||||||
bottom: 0;
|
position: fixed;
|
||||||
width: 100%;
|
bottom: 0;
|
||||||
text-align: center;
|
width: 100%;
|
||||||
color: #fff;
|
text-align: center;
|
||||||
font-family: Arial;
|
color: #fff;
|
||||||
font-size: 12px;
|
font-family: Arial;
|
||||||
letter-spacing: 1px;
|
font-size: 12px;
|
||||||
}
|
letter-spacing: 1px;
|
||||||
.login-code-img {
|
}
|
||||||
height: 38px;
|
.login-code-img {
|
||||||
}
|
height: 38px;
|
||||||
</style>
|
}
|
||||||
|
</style>
|
||||||
|
|||||||
@ -1,209 +1,209 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="register">
|
<div class="register">
|
||||||
<el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
|
<el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
|
||||||
<h3 class="title">若依后台管理系统</h3>
|
<h3 class="title">阿狸云管理</h3>
|
||||||
<el-form-item prop="username">
|
<el-form-item prop="username">
|
||||||
<el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
|
<el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
|
||||||
<svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
|
<svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
|
||||||
</el-input>
|
</el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item prop="password">
|
<el-form-item prop="password">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="registerForm.password"
|
v-model="registerForm.password"
|
||||||
type="password"
|
type="password"
|
||||||
auto-complete="off"
|
auto-complete="off"
|
||||||
placeholder="密码"
|
placeholder="密码"
|
||||||
@keyup.enter.native="handleRegister"
|
@keyup.enter.native="handleRegister"
|
||||||
>
|
>
|
||||||
<svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
|
<svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
|
||||||
</el-input>
|
</el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item prop="confirmPassword">
|
<el-form-item prop="confirmPassword">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="registerForm.confirmPassword"
|
v-model="registerForm.confirmPassword"
|
||||||
type="password"
|
type="password"
|
||||||
auto-complete="off"
|
auto-complete="off"
|
||||||
placeholder="确认密码"
|
placeholder="确认密码"
|
||||||
@keyup.enter.native="handleRegister"
|
@keyup.enter.native="handleRegister"
|
||||||
>
|
>
|
||||||
<svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
|
<svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
|
||||||
</el-input>
|
</el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item prop="code" v-if="captchaOnOff">
|
<el-form-item prop="code" v-if="captchaOnOff">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="registerForm.code"
|
v-model="registerForm.code"
|
||||||
auto-complete="off"
|
auto-complete="off"
|
||||||
placeholder="验证码"
|
placeholder="验证码"
|
||||||
style="width: 63%"
|
style="width: 63%"
|
||||||
@keyup.enter.native="handleRegister"
|
@keyup.enter.native="handleRegister"
|
||||||
>
|
>
|
||||||
<svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
|
<svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
|
||||||
</el-input>
|
</el-input>
|
||||||
<div class="register-code">
|
<div class="register-code">
|
||||||
<img :src="codeUrl" @click="getCode" class="register-code-img"/>
|
<img :src="codeUrl" @click="getCode" class="register-code-img"/>
|
||||||
</div>
|
</div>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item style="width:100%;">
|
<el-form-item style="width:100%;">
|
||||||
<el-button
|
<el-button
|
||||||
:loading="loading"
|
:loading="loading"
|
||||||
size="medium"
|
size="medium"
|
||||||
type="primary"
|
type="primary"
|
||||||
style="width:100%;"
|
style="width:100%;"
|
||||||
@click.native.prevent="handleRegister"
|
@click.native.prevent="handleRegister"
|
||||||
>
|
>
|
||||||
<span v-if="!loading">注 册</span>
|
<span v-if="!loading">注 册</span>
|
||||||
<span v-else>注 册 中...</span>
|
<span v-else>注 册 中...</span>
|
||||||
</el-button>
|
</el-button>
|
||||||
<div style="float: right;">
|
<div style="float: right;">
|
||||||
<router-link class="link-type" :to="'/login'">使用已有账户登录</router-link>
|
<router-link class="link-type" :to="'/login'">使用已有账户登录</router-link>
|
||||||
</div>
|
</div>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
<!-- 底部 -->
|
<!-- 底部 -->
|
||||||
<div class="el-register-footer">
|
<div class="el-register-footer">
|
||||||
<span>Copyright © 2018-2022 ruoyi.vip All Rights Reserved.</span>
|
<span>Copyright © 2018-2022 ruoyi.vip All Rights Reserved.</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { getCodeImg, register } from "@/api/login";
|
import { getCodeImg, register } from "@/api/login";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "Register",
|
name: "Register",
|
||||||
data() {
|
data() {
|
||||||
const equalToPassword = (rule, value, callback) => {
|
const equalToPassword = (rule, value, callback) => {
|
||||||
if (this.registerForm.password !== value) {
|
if (this.registerForm.password !== value) {
|
||||||
callback(new Error("两次输入的密码不一致"));
|
callback(new Error("两次输入的密码不一致"));
|
||||||
} else {
|
} else {
|
||||||
callback();
|
callback();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
return {
|
return {
|
||||||
codeUrl: "",
|
codeUrl: "",
|
||||||
registerForm: {
|
registerForm: {
|
||||||
username: "",
|
username: "",
|
||||||
password: "",
|
password: "",
|
||||||
confirmPassword: "",
|
confirmPassword: "",
|
||||||
code: "",
|
code: "",
|
||||||
uuid: ""
|
uuid: ""
|
||||||
},
|
},
|
||||||
registerRules: {
|
registerRules: {
|
||||||
username: [
|
username: [
|
||||||
{ required: true, trigger: "blur", message: "请输入您的账号" },
|
{ required: true, trigger: "blur", message: "请输入您的账号" },
|
||||||
{ min: 2, max: 20, message: '用户账号长度必须介于 2 和 20 之间', trigger: 'blur' }
|
{ min: 2, max: 20, message: '用户账号长度必须介于 2 和 20 之间', trigger: 'blur' }
|
||||||
],
|
],
|
||||||
password: [
|
password: [
|
||||||
{ required: true, trigger: "blur", message: "请输入您的密码" },
|
{ required: true, trigger: "blur", message: "请输入您的密码" },
|
||||||
{ min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
|
{ min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
|
||||||
],
|
],
|
||||||
confirmPassword: [
|
confirmPassword: [
|
||||||
{ required: true, trigger: "blur", message: "请再次输入您的密码" },
|
{ required: true, trigger: "blur", message: "请再次输入您的密码" },
|
||||||
{ required: true, validator: equalToPassword, trigger: "blur" }
|
{ required: true, validator: equalToPassword, trigger: "blur" }
|
||||||
],
|
],
|
||||||
code: [{ required: true, trigger: "change", message: "请输入验证码" }]
|
code: [{ required: true, trigger: "change", message: "请输入验证码" }]
|
||||||
},
|
},
|
||||||
loading: false,
|
loading: false,
|
||||||
captchaOnOff: true
|
captchaOnOff: true
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
this.getCode();
|
this.getCode();
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
getCode() {
|
getCode() {
|
||||||
getCodeImg().then(res => {
|
getCodeImg().then(res => {
|
||||||
this.captchaOnOff = res.captchaOnOff === undefined ? true : res.captchaOnOff;
|
this.captchaOnOff = res.captchaOnOff === undefined ? true : res.captchaOnOff;
|
||||||
if (this.captchaOnOff) {
|
if (this.captchaOnOff) {
|
||||||
this.codeUrl = "data:image/gif;base64," + res.img;
|
this.codeUrl = "data:image/gif;base64," + res.img;
|
||||||
this.registerForm.uuid = res.uuid;
|
this.registerForm.uuid = res.uuid;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
handleRegister() {
|
handleRegister() {
|
||||||
this.$refs.registerForm.validate(valid => {
|
this.$refs.registerForm.validate(valid => {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
this.loading = true;
|
this.loading = true;
|
||||||
register(this.registerForm).then(res => {
|
register(this.registerForm).then(res => {
|
||||||
const username = this.registerForm.username;
|
const username = this.registerForm.username;
|
||||||
this.$alert("<font color='red'>恭喜你，您的账号 " + username + " 注册成功！</font>", '系统提示', {
|
this.$alert("<font color='red'>恭喜你，您的账号 " + username + " 注册成功！</font>", '系统提示', {
|
||||||
dangerouslyUseHTMLString: true,
|
dangerouslyUseHTMLString: true,
|
||||||
type: 'success'
|
type: 'success'
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
this.$router.push("/login");
|
this.$router.push("/login");
|
||||||
}).catch(() => {});
|
}).catch(() => {});
|
||||||
}).catch(() => {
|
}).catch(() => {
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
if (this.captchaOnOff) {
|
if (this.captchaOnOff) {
|
||||||
this.getCode();
|
this.getCode();
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style rel="stylesheet/scss" lang="scss">
|
<style rel="stylesheet/scss" lang="scss">
|
||||||
.register {
|
.register {
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
background-image: url("../assets/images/login-background.jpg");
|
background-image: url("../assets/images/login-background.jpg");
|
||||||
background-size: cover;
|
background-size: cover;
|
||||||
}
|
}
|
||||||
.title {
|
.title {
|
||||||
margin: 0px auto 30px auto;
|
margin: 0px auto 30px auto;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
color: #707070;
|
color: #707070;
|
||||||
}
|
}
|
||||||
|
|
||||||
.register-form {
|
.register-form {
|
||||||
border-radius: 6px;
|
border-radius: 6px;
|
||||||
background: #ffffff;
|
background: #ffffff;
|
||||||
width: 400px;
|
width: 400px;
|
||||||
padding: 25px 25px 5px 25px;
|
padding: 25px 25px 5px 25px;
|
||||||
.el-input {
|
.el-input {
|
||||||
height: 38px;
|
height: 38px;
|
||||||
input {
|
input {
|
||||||
height: 38px;
|
height: 38px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.input-icon {
|
.input-icon {
|
||||||
height: 39px;
|
height: 39px;
|
||||||
width: 14px;
|
width: 14px;
|
||||||
margin-left: 2px;
|
margin-left: 2px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.register-tip {
|
.register-tip {
|
||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
color: #bfbfbf;
|
color: #bfbfbf;
|
||||||
}
|
}
|
||||||
.register-code {
|
.register-code {
|
||||||
width: 33%;
|
width: 33%;
|
||||||
height: 38px;
|
height: 38px;
|
||||||
float: right;
|
float: right;
|
||||||
img {
|
img {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.el-register-footer {
|
.el-register-footer {
|
||||||
height: 40px;
|
height: 40px;
|
||||||
line-height: 40px;
|
line-height: 40px;
|
||||||
position: fixed;
|
position: fixed;
|
||||||
bottom: 0;
|
bottom: 0;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
font-family: Arial;
|
font-family: Arial;
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
letter-spacing: 1px;
|
letter-spacing: 1px;
|
||||||
}
|
}
|
||||||
.register-code-img {
|
.register-code-img {
|
||||||
height: 38px;
|
height: 38px;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@ -1,135 +1,135 @@
|
|||||||
'use strict'
|
'use strict'
|
||||||
const path = require('path')
|
const path = require('path')
|
||||||
|
|
||||||
function resolve(dir) {
|
function resolve(dir) {
|
||||||
return path.join(__dirname, dir)
|
return path.join(__dirname, dir)
|
||||||
}
|
}
|
||||||
|
|
||||||
const CompressionPlugin = require('compression-webpack-plugin')
|
const CompressionPlugin = require('compression-webpack-plugin')
|
||||||
|
|
||||||
const name = process.env.VUE_APP_TITLE || '若依管理系统' // 网页标题
|
const name = process.env.VUE_APP_TITLE || '阿狸云管理' // 网页标题
|
||||||
|
|
||||||
const port = process.env.port || process.env.npm_config_port || 80 // 端口
|
const port = process.env.port || process.env.npm_config_port || 80 // 端口
|
||||||
|
|
||||||
// vue.config.js 配置说明
|
// vue.config.js 配置说明
|
||||||
//官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
|
//官方vue.config.js 参考文档 https://cli.vuejs.org/zh/config/#css-loaderoptions
|
||||||
// 这里只列一部分，具体配置参考文档
|
// 这里只列一部分，具体配置参考文档
|
||||||
module.exports = {
|
module.exports = {
|
||||||
// 部署生产环境和开发环境下的URL。
|
// 部署生产环境和开发环境下的URL。
|
||||||
// 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
|
// 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
|
||||||
// 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
|
// 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
|
||||||
publicPath: process.env.NODE_ENV === "production" ? "/" : "/",
|
publicPath: process.env.NODE_ENV === "production" ? "/" : "/",
|
||||||
// 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
|
// 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
|
||||||
outputDir: 'dist',
|
outputDir: 'dist',
|
||||||
// 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
|
// 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
|
||||||
assetsDir: 'static',
|
assetsDir: 'static',
|
||||||
// 是否开启eslint保存检测，有效值：ture | false | 'error'
|
// 是否开启eslint保存检测，有效值：ture | false | 'error'
|
||||||
lintOnSave: process.env.NODE_ENV === 'development',
|
lintOnSave: process.env.NODE_ENV === 'development',
|
||||||
// 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。
|
// 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。
|
||||||
productionSourceMap: false,
|
productionSourceMap: false,
|
||||||
// webpack-dev-server 相关配置
|
// webpack-dev-server 相关配置
|
||||||
devServer: {
|
devServer: {
|
||||||
host: '0.0.0.0',
|
host: '0.0.0.0',
|
||||||
port: port,
|
port: port,
|
||||||
open: true,
|
open: true,
|
||||||
proxy: {
|
proxy: {
|
||||||
// detail: https://cli.vuejs.org/config/#devserver-proxy
|
// detail: https://cli.vuejs.org/config/#devserver-proxy
|
||||||
[process.env.VUE_APP_BASE_API]: {
|
[process.env.VUE_APP_BASE_API]: {
|
||||||
target: `http://localhost:8080`,
|
target: `http://localhost:8080`,
|
||||||
changeOrigin: true,
|
changeOrigin: true,
|
||||||
pathRewrite: {
|
pathRewrite: {
|
||||||
['^' + process.env.VUE_APP_BASE_API]: ''
|
['^' + process.env.VUE_APP_BASE_API]: ''
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
disableHostCheck: true
|
disableHostCheck: true
|
||||||
},
|
},
|
||||||
css: {
|
css: {
|
||||||
loaderOptions: {
|
loaderOptions: {
|
||||||
sass: {
|
sass: {
|
||||||
sassOptions: { outputStyle: "expanded" }
|
sassOptions: { outputStyle: "expanded" }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
configureWebpack: {
|
configureWebpack: {
|
||||||
name: name,
|
name: name,
|
||||||
resolve: {
|
resolve: {
|
||||||
alias: {
|
alias: {
|
||||||
'@': resolve('src')
|
'@': resolve('src')
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
plugins: [
|
plugins: [
|
||||||
// http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#使用gzip解压缩静态文件
|
// http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#使用gzip解压缩静态文件
|
||||||
new CompressionPlugin({
|
new CompressionPlugin({
|
||||||
test: /\.(js|css|html)?$/i, // 压缩文件格式
|
test: /\.(js|css|html)?$/i, // 压缩文件格式
|
||||||
filename: '[path].gz[query]', // 压缩后的文件名
|
filename: '[path].gz[query]', // 压缩后的文件名
|
||||||
algorithm: 'gzip', // 使用gzip压缩
|
algorithm: 'gzip', // 使用gzip压缩
|
||||||
minRatio: 0.8 // 压缩率小于1才会压缩
|
minRatio: 0.8 // 压缩率小于1才会压缩
|
||||||
})
|
})
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
chainWebpack(config) {
|
chainWebpack(config) {
|
||||||
config.plugins.delete('preload') // TODO: need test
|
config.plugins.delete('preload') // TODO: need test
|
||||||
config.plugins.delete('prefetch') // TODO: need test
|
config.plugins.delete('prefetch') // TODO: need test
|
||||||
|
|
||||||
// set svg-sprite-loader
|
// set svg-sprite-loader
|
||||||
config.module
|
config.module
|
||||||
.rule('svg')
|
.rule('svg')
|
||||||
.exclude.add(resolve('src/assets/icons'))
|
.exclude.add(resolve('src/assets/icons'))
|
||||||
.end()
|
.end()
|
||||||
config.module
|
config.module
|
||||||
.rule('icons')
|
.rule('icons')
|
||||||
.test(/\.svg$/)
|
.test(/\.svg$/)
|
||||||
.include.add(resolve('src/assets/icons'))
|
.include.add(resolve('src/assets/icons'))
|
||||||
.end()
|
.end()
|
||||||
.use('svg-sprite-loader')
|
.use('svg-sprite-loader')
|
||||||
.loader('svg-sprite-loader')
|
.loader('svg-sprite-loader')
|
||||||
.options({
|
.options({
|
||||||
symbolId: 'icon-[name]'
|
symbolId: 'icon-[name]'
|
||||||
})
|
})
|
||||||
.end()
|
.end()
|
||||||
|
|
||||||
config
|
config
|
||||||
.when(process.env.NODE_ENV !== 'development',
|
.when(process.env.NODE_ENV !== 'development',
|
||||||
config => {
|
config => {
|
||||||
config
|
config
|
||||||
.plugin('ScriptExtHtmlWebpackPlugin')
|
.plugin('ScriptExtHtmlWebpackPlugin')
|
||||||
.after('html')
|
.after('html')
|
||||||
.use('script-ext-html-webpack-plugin', [{
|
.use('script-ext-html-webpack-plugin', [{
|
||||||
// `runtime` must same as runtimeChunk name. default is `runtime`
|
// `runtime` must same as runtimeChunk name. default is `runtime`
|
||||||
inline: /runtime\..*\.js$/
|
inline: /runtime\..*\.js$/
|
||||||
}])
|
}])
|
||||||
.end()
|
.end()
|
||||||
config
|
config
|
||||||
.optimization.splitChunks({
|
.optimization.splitChunks({
|
||||||
chunks: 'all',
|
chunks: 'all',
|
||||||
cacheGroups: {
|
cacheGroups: {
|
||||||
libs: {
|
libs: {
|
||||||
name: 'chunk-libs',
|
name: 'chunk-libs',
|
||||||
test: /[\\/]node_modules[\\/]/,
|
test: /[\\/]node_modules[\\/]/,
|
||||||
priority: 10,
|
priority: 10,
|
||||||
chunks: 'initial' // only package third parties that are initially dependent
|
chunks: 'initial' // only package third parties that are initially dependent
|
||||||
},
|
},
|
||||||
elementUI: {
|
elementUI: {
|
||||||
name: 'chunk-elementUI', // split elementUI into a single package
|
name: 'chunk-elementUI', // split elementUI into a single package
|
||||||
priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
|
priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
|
||||||
test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
|
test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
|
||||||
},
|
},
|
||||||
commons: {
|
commons: {
|
||||||
name: 'chunk-commons',
|
name: 'chunk-commons',
|
||||||
test: resolve('src/components'), // can customize your rules
|
test: resolve('src/components'), // can customize your rules
|
||||||
minChunks: 3, // minimum common number
|
minChunks: 3, // minimum common number
|
||||||
priority: 5,
|
priority: 5,
|
||||||
reuseExistingChunk: true
|
reuseExistingChunk: true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
config.optimization.runtimeChunk('single'),
|
config.optimization.runtimeChunk('single'),
|
||||||
{
|
{
|
||||||
from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
|
from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
|
||||||
to: './' //到根目录下
|
to: './' //到根目录下
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user