大屏项目初始化
This commit is contained in:
@@ -64,15 +64,15 @@ const isLoading = ref(false)
|
||||
|
||||
const handleLogin = async () => {
|
||||
try {
|
||||
await loginFormRef.value.validate()
|
||||
isLoading.value = true
|
||||
const res = await login(loginForm.value)
|
||||
localStorage.setItem('token', res.token)
|
||||
localStorage.setItem('username', res.username)
|
||||
ElMessage.success('登录成功！')
|
||||
await loginFormRef.value.validate();
|
||||
isLoading.value = true;
|
||||
const res = await login(loginForm.value);
|
||||
localStorage.setItem('token', res.token);
|
||||
localStorage.setItem('userName', res.userName);
|
||||
ElMessage.success('登录成功！');
|
||||
setTimeout(() => {
|
||||
router.push('/dashboard');
|
||||
}, 3000)
|
||||
}, 3000);
|
||||
} catch (error) {
|
||||
ElMessage.error(res.msg);
|
||||
}finally{
|
||||
|
||||
@@ -18,13 +18,10 @@
|
||||
</div>
|
||||
<div class="query-group">
|
||||
<el-date-picker
|
||||
type="daterange"
|
||||
type="year"
|
||||
v-model="queryDate"
|
||||
range-separator="至"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
popper-class="dark-date-popper"
|
||||
value-format="YYYY-MM-DD"
|
||||
value-format="YYYY"
|
||||
></el-date-picker>
|
||||
<button class="query-btn" @click="handleQuery">查询</button>
|
||||
</div>
|
||||
@@ -33,49 +30,60 @@
|
||||
|
||||
<main class="screen-content">
|
||||
<div v-if="activeTab === 'home'" class="screen-page">
|
||||
<HomeIndex />
|
||||
<HomeIndex :formParams="FormValues" />
|
||||
</div>
|
||||
<div v-else-if="activeTab === 'work'" class="screen-page">
|
||||
<WorkIndex />
|
||||
<WorkIndex :formParams="FormValues" />
|
||||
</div>
|
||||
<div v-else-if="activeTab === 'test'" class="screen-page">
|
||||
<TestIndex :formParams="FormValues" />
|
||||
</div>
|
||||
<div v-else-if="activeTab === 'erp'" class="screen-page">
|
||||
<ErpIndex />
|
||||
<ErpIndex :formParams="FormValues" />
|
||||
</div>
|
||||
</main>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { ref } from 'vue';
|
||||
import { ref, onMounted } from 'vue';
|
||||
import HomeIndex from './screen/Home/index.vue';
|
||||
import ErpIndex from './screen/Erp/index.vue';
|
||||
import WorkIndex from './screen/Work/index.vue';
|
||||
import TestIndex from './screen/Test/index.vue';
|
||||
|
||||
const screenTitle = ref('数字化可视化');
|
||||
const currentYear = new Date().getFullYear().toString();
|
||||
|
||||
const FormValues = ref({
|
||||
startDate: "",
|
||||
endDate: ""
|
||||
reqParam: currentYear
|
||||
});
|
||||
|
||||
const allTabs = [
|
||||
{ key: 'home', name: '首页' },
|
||||
{ key: 'work', name: '工作' },
|
||||
{ key: 'test', name: '测试' },
|
||||
{ key: 'erp', name: '财务' },
|
||||
]
|
||||
|
||||
const activeTab = ref('home')
|
||||
const queryDate = ref('')
|
||||
const queryDate = ref();
|
||||
|
||||
const switchTab = (key) => {
|
||||
activeTab.value = key
|
||||
}
|
||||
|
||||
const handleQuery = () => {
|
||||
const [startDate, endDate] = queryDate.value || [];
|
||||
FormValues.value.startDate = startDate || "";
|
||||
FormValues.value.endDate = endDate || "";
|
||||
FormValues.value.reqParam = queryDate.value;
|
||||
}
|
||||
|
||||
const initApp = () =>{
|
||||
queryDate.value = currentYear;
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
initApp();
|
||||
});
|
||||
</script>
|
||||
|
||||
<style>
|
||||
@@ -247,7 +255,6 @@ const handleQuery = () => {
|
||||
:deep(.el-input__inner) {
|
||||
background-color: #0f3460 !important;
|
||||
color: #e0e6ff !important;
|
||||
border: 1px solid #1a508b !important;
|
||||
box-shadow: none !important;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,163 +0,0 @@
|
||||
<template>
|
||||
<div class="chart-card">
|
||||
<div class="chart-card-header">
|
||||
<span class="chart-card-title">月度销售额与增长率分析</span>
|
||||
</div>
|
||||
<div class="bar-line-chart-container" ref="chartRef"></div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { ref, onMounted } from 'vue'
|
||||
import * as echarts from 'echarts'
|
||||
|
||||
const chartRef = ref(null)
|
||||
let chartInstance = null
|
||||
|
||||
const initBarLineChart = () => {
|
||||
const el = chartRef.value
|
||||
if (!el) return
|
||||
|
||||
chartInstance = echarts.init(el)
|
||||
|
||||
const option = {
|
||||
tooltip: {
|
||||
trigger: 'axis',
|
||||
axisPointer: { type: 'cross' },
|
||||
backgroundColor: 'rgba(145, 200, 255, 0.9)',
|
||||
borderColor: '#409EFF',
|
||||
borderWidth: 1,
|
||||
textStyle: { color: '#0a3b70' },
|
||||
padding: [8, 12],
|
||||
borderRadius: 6,
|
||||
formatter: function(params) {
|
||||
let res = `<b>${params[0].axisValue}</b>`
|
||||
params.forEach(item => {
|
||||
res += `<br/>${item.seriesName}：${item.value}${item.seriesName === '增长率' ? '%' : '万元'}`
|
||||
})
|
||||
return res
|
||||
}
|
||||
},
|
||||
legend: {
|
||||
top: '10',
|
||||
left: 'center',
|
||||
textStyle: { fontSize: 12, color: '#e0e6ff' }
|
||||
},
|
||||
grid: {
|
||||
left: '4%',
|
||||
right: '4%',
|
||||
bottom: '10%',
|
||||
top: '12%',
|
||||
containLabel: true
|
||||
},
|
||||
xAxis: [
|
||||
{
|
||||
type: 'category',
|
||||
data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],
|
||||
axisLabel: {
|
||||
fontSize: 11,
|
||||
interval: 0,
|
||||
color: '#b4c7e7'
|
||||
},
|
||||
axisLine: { lineStyle: { color: '#1a508b' } },
|
||||
boundaryGap: true
|
||||
}
|
||||
],
|
||||
yAxis: [
|
||||
{
|
||||
type: 'value',
|
||||
name: '销售额 (万元)',
|
||||
nameTextStyle: { fontSize: 12, color: '#b4c7e7' },
|
||||
axisLabel: { formatter: '{value}', color: '#b4c7e7' },
|
||||
axisLine: { lineStyle: { color: '#1a508b' } },
|
||||
splitLine: { lineStyle: { color: 'rgba(26, 80, 139, 0.3)' } },
|
||||
nameLocation: 'center',
|
||||
nameGap: 30
|
||||
},
|
||||
{
|
||||
type: 'value',
|
||||
name: '增长率 (%)',
|
||||
nameTextStyle: { fontSize: 12, color: '#b4c7e7' },
|
||||
axisLabel: { formatter: '{value} %', color: '#b4c7e7' },
|
||||
axisLine: { lineStyle: { color: '#1a508b' } },
|
||||
splitLine: { lineStyle: { color: 'rgba(26, 80, 139, 0.3)' } },
|
||||
nameLocation: 'center',
|
||||
nameGap: 30
|
||||
}
|
||||
],
|
||||
series: [
|
||||
{
|
||||
name: '销售额',
|
||||
type: 'bar',
|
||||
yAxisIndex: 0,
|
||||
data: [120, 200, 150, 80, 70, 110, 130, 180, 160, 90, 100, 140],
|
||||
itemStyle: { color: '#409EFF' },
|
||||
barWidth: '15%'
|
||||
},
|
||||
{
|
||||
name: '增长率',
|
||||
type: 'line',
|
||||
yAxisIndex: 1,
|
||||
data: [12, 20, 15, 8, 7, 11, 13, 18, 16, 9, 10, 14],
|
||||
itemStyle: { color: '#E6A23C' },
|
||||
symbol: 'circle',
|
||||
symbolSize: 5,
|
||||
emphasis: { symbolSize: 7 },
|
||||
areaStyle: {
|
||||
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
|
||||
{ offset: 0, color: 'rgba(230, 162, 60, 0.3)' },
|
||||
{ offset: 1, color: 'rgba(230, 162, 60, 0.0)' }
|
||||
])
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
chartInstance.setOption(option)
|
||||
window.addEventListener('resize', () => chartInstance.resize())
|
||||
}
|
||||
|
||||
onMounted(() => initBarLineChart())
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.chart-card {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.chart-card-header {
|
||||
height: 40px;
|
||||
line-height: 40px;
|
||||
padding: 0 16px;
|
||||
background-color: rgba(26, 80, 139, 0.5);
|
||||
border-bottom: 1px solid #1a508b;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.chart-card-title {
|
||||
font-size: 16px;
|
||||
font-weight: 600;
|
||||
color: #409EFF;
|
||||
letter-spacing: 0.5px;
|
||||
}
|
||||
|
||||
.bar-line-chart-container {
|
||||
flex: 1;
|
||||
width: 100%;
|
||||
height: calc(100% - 40px);
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
:deep(.echarts-tooltip) {
|
||||
background-color: rgba(145, 200, 255, 0.9) !important;
|
||||
border-color: #409EFF !important;
|
||||
color: #0a3b70 !important;
|
||||
border-radius: 6px !important;
|
||||
}
|
||||
</style>
|
||||
@@ -1,183 +0,0 @@
|
||||
<template>
|
||||
<div class="chart-card">
|
||||
<div class="chart-card-header">
|
||||
<span class="chart-card-title">年度销售额占比分析</span>
|
||||
</div>
|
||||
<div class="pie-chart-container" ref="chartRef"></div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { ref, onMounted } from 'vue'
|
||||
import * as echarts from 'echarts'
|
||||
|
||||
const chartRef = ref(null)
|
||||
let chartInstance = null
|
||||
|
||||
const initPieChart = () => {
|
||||
const el = chartRef.value
|
||||
if (!el) return
|
||||
|
||||
chartInstance = echarts.init(el)
|
||||
|
||||
const pieData = [
|
||||
{ value: 85, name: 'A-华东' },
|
||||
{ value: 78, name: 'A-华南' },
|
||||
{ value: 92, name: 'A-华北' },
|
||||
{ value: 65, name: 'B-华东' },
|
||||
{ value: 72, name: 'B-华南' },
|
||||
{ value: 88, name: 'B-华北' },
|
||||
{ value: 58, name: 'C-华东' },
|
||||
{ value: 66, name: 'C-华南' },
|
||||
{ value: 75, name: 'C-华北' },
|
||||
{ value: 48, name: 'D-华东' },
|
||||
{ value: 55, name: 'D-华南' },
|
||||
{ value: 62, name: 'D-华北' },
|
||||
{ value: 42, name: 'E-华东' },
|
||||
{ value: 49, name: 'E-华南' },
|
||||
{ value: 58, name: 'E-华北' }
|
||||
]
|
||||
|
||||
const colorList = [
|
||||
'#409EFF', '#36CFc9', '#67C23A', '#E6A23C', '#F56C6C',
|
||||
'#909399', '#722ED1', '#EB2F96', '#1890FF', '#52C41A',
|
||||
'#FAAD14', '#F5222D', '#8C8C8C', '#A062D4', '#F7BA1E'
|
||||
]
|
||||
|
||||
const option = {
|
||||
tooltip: {
|
||||
trigger: 'item',
|
||||
backgroundColor: 'rgba(145, 200, 255, 0.9)',
|
||||
borderColor: '#409EFF',
|
||||
borderWidth: 1,
|
||||
textStyle: { color: '#0a3b70', fontSize: 12 },
|
||||
padding: [10, 15],
|
||||
borderRadius: 6,
|
||||
formatter: function(params) {
|
||||
return `分类：${params.name}<br/>销售额：${params.value}万元<br/>占比：${params.percent.toFixed(1)}%`
|
||||
}
|
||||
},
|
||||
legend: {
|
||||
orient: 'horizontal',
|
||||
top: '10%',
|
||||
left: 'center',
|
||||
textStyle: { fontSize: 11, color: '#e0e6ff' },
|
||||
itemWidth: 12,
|
||||
itemHeight: 12,
|
||||
itemGap: 10,
|
||||
pageIconColor: '#409EFF',
|
||||
pageTextStyle: { color: '#e0e6ff', fontSize: 10 },
|
||||
pageButtonItemGap: 6,
|
||||
pageButtonGap: 10,
|
||||
type: 'scroll'
|
||||
},
|
||||
series: [
|
||||
{
|
||||
name: '销售额',
|
||||
type: 'pie',
|
||||
radius: ['30%', '55%'],
|
||||
center: ['50%', '65%'],
|
||||
avoidLabelOverlap: true,
|
||||
itemStyle: {
|
||||
borderRadius: 4,
|
||||
borderColor: 'rgba(15, 52, 96, 0.9)',
|
||||
borderWidth: 1
|
||||
},
|
||||
label: {
|
||||
show: true,
|
||||
position: 'outside',
|
||||
fontSize: 10,
|
||||
color: '#e0e6ff',
|
||||
formatter: '{b} {d}%',
|
||||
overflow: 'truncate',
|
||||
ellipsis: '...',
|
||||
distance: 8
|
||||
},
|
||||
labelLine: {
|
||||
show: true,
|
||||
length: 12,
|
||||
length2: 8,
|
||||
lineStyle: { color: '#e0e6ff', width: 1 },
|
||||
smooth: 0.2,
|
||||
minTurnAngle: 45
|
||||
},
|
||||
data: pieData,
|
||||
color: colorList
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
chartInstance.setOption(option)
|
||||
window.addEventListener('resize', () => chartInstance.resize())
|
||||
}
|
||||
|
||||
onMounted(() => initPieChart())
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.chart-card {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.chart-card-header {
|
||||
height: 40px;
|
||||
line-height: 40px;
|
||||
padding: 0 16px;
|
||||
background-color: rgba(26, 80, 139, 0.5);
|
||||
border-bottom: 1px solid #1a508b;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.chart-card-title {
|
||||
font-size: 16px;
|
||||
font-weight: 600;
|
||||
color: #409EFF;
|
||||
letter-spacing: 0.5px;
|
||||
}
|
||||
|
||||
.pie-chart-container {
|
||||
flex: 1;
|
||||
width: 100%;
|
||||
height: calc(100% - 40px);
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
:deep(.echarts-tooltip) {
|
||||
background-color: rgba(145, 200, 255, 0.9) !important;
|
||||
border-color: #409EFF !important;
|
||||
color: #0a3b70 !important;
|
||||
border-radius: 6px !important;
|
||||
}
|
||||
|
||||
:deep(.echarts-legend-scroll) {
|
||||
background-color: transparent !important;
|
||||
}
|
||||
:deep(.echarts-legend-scroll-text) {
|
||||
color: #e0e6ff !important;
|
||||
font-size: 11px !important;
|
||||
}
|
||||
:deep(.echarts-legend-scroll-button) {
|
||||
border-color: #1a508b !important;
|
||||
}
|
||||
:deep(.echarts-legend-scroll-button-icon) {
|
||||
color: #409EFF !important;
|
||||
}
|
||||
|
||||
:deep(.ec-label) {
|
||||
z-index: 9999 !important;
|
||||
white-space: nowrap !important;
|
||||
font-size: 10px !important;
|
||||
color: #e0e6ff !important;
|
||||
}
|
||||
|
||||
:deep(.ec-label-line) {
|
||||
stroke: #e0e6ff !important;
|
||||
stroke-width: 1px !important;
|
||||
}
|
||||
</style>
|
||||
@@ -10,20 +10,17 @@
|
||||
<div class="erp-section erp-upper-section">
|
||||
<div class="erp-col erp-col-1-3">
|
||||
<div class="erp-card">
|
||||
<h3>上部列1</h3>
|
||||
<p>ERP数据面板1</p>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="erp-col erp-col-1-3">
|
||||
<div class="erp-card">
|
||||
<h3>上部列2</h3>
|
||||
<p>ERP数据面板2</p>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="erp-col erp-col-1-3">
|
||||
<div class="erp-card">
|
||||
<h3>上部列3</h3>
|
||||
<p>ERP数据面板3</p>
|
||||
<ChartV03 :formParams="props.formParams" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -33,22 +30,19 @@
|
||||
<div class="erp-inner-layout">
|
||||
<div class="erp-col erp-col-1-2">
|
||||
<div class="erp-card">
|
||||
<h3>中部左1列</h3>
|
||||
<p>ERP明细1</p>
|
||||
<ChartV04 :formParams="props.formParams" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="erp-col erp-col-1-2">
|
||||
<div class="erp-card">
|
||||
<h3>中部左2列</h3>
|
||||
<p>ERP明细2</p>
|
||||
<ChartV05 :formParams="props.formParams" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="erp-col erp-col-1-2">
|
||||
<div class="erp-card">
|
||||
<h3>中部右侧列</h3>
|
||||
<p>ERP核心数据展示</p>
|
||||
<ChartV01 :formParams="props.formParams" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -58,22 +52,19 @@
|
||||
<div class="erp-inner-layout">
|
||||
<div class="erp-col erp-col-1-2">
|
||||
<div class="erp-card">
|
||||
<h3>下部左1列</h3>
|
||||
<p>ERP统计1</p>
|
||||
<ChartV06 :formParams="props.formParams" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="erp-col erp-col-1-2">
|
||||
<div class="erp-card">
|
||||
<h3>下部左2列</h3>
|
||||
<p>ERP统计2</p>
|
||||
<ChartV02 :formParams="props.formParams" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="erp-col erp-col-1-2">
|
||||
<div class="erp-card">
|
||||
<h3>下部右侧列</h3>
|
||||
<p>ERP报表/图表展示</p>
|
||||
<ChartV07 :formParams="props.formParams" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -81,6 +72,29 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { ref, watch } from 'vue';
|
||||
import ChartV01 from './components/ChartV01.vue';
|
||||
import ChartV02 from './components/ChartV02.vue';
|
||||
import ChartV03 from './components/ChartV03.vue';
|
||||
import ChartV04 from './components/ChartV04.vue';
|
||||
import ChartV05 from './components/ChartV05.vue';
|
||||
import ChartV06 from './components/ChartV06.vue';
|
||||
import ChartV07 from './components/ChartV07.vue';
|
||||
|
||||
const props = defineProps({
|
||||
formParams: {
|
||||
type: Object,
|
||||
default: () => ({})
|
||||
}
|
||||
});
|
||||
|
||||
watch(
|
||||
() => props.formParams,
|
||||
{
|
||||
deep: true,
|
||||
immediate: true
|
||||
}
|
||||
);
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
@@ -143,9 +157,9 @@
|
||||
background-color: rgba(15, 52, 96, 0.9);
|
||||
border: 1px solid #1a508b;
|
||||
border-radius: 8px;
|
||||
padding: 12px;
|
||||
padding: 2px;
|
||||
box-sizing: border-box;
|
||||
display: flex;
|
||||
display: block;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
|
||||
@@ -17,6 +17,35 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { ref, watch } from 'vue';
|
||||
|
||||
const currentYear = new Date().getFullYear().toString();
|
||||
|
||||
const FormValues = ref({
|
||||
reqParam: currentYear
|
||||
});
|
||||
|
||||
const initApp = (params) =>{
|
||||
FormValues.value.reqParam = params;
|
||||
}
|
||||
|
||||
const props = defineProps({
|
||||
formParams: {
|
||||
type: Object,
|
||||
default: () => ({})
|
||||
}
|
||||
});
|
||||
|
||||
watch(
|
||||
() => props.formParams,
|
||||
(newVal) => {
|
||||
initApp(newVal);
|
||||
},
|
||||
{
|
||||
deep: true,
|
||||
immediate: true
|
||||
}
|
||||
);
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
@@ -87,7 +116,7 @@
|
||||
color: #e0e6ff;
|
||||
text-align: center;
|
||||
height: 100%;
|
||||
display: flex;
|
||||
display: block;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
|
||||
@@ -130,9 +130,9 @@
|
||||
background-color: rgba(15, 52, 96, 0.9);
|
||||
border: 1px solid #1a508b;
|
||||
border-radius: 8px;
|
||||
padding: 12px;
|
||||
padding: 2px;
|
||||
box-sizing: border-box;
|
||||
display: flex;
|
||||
display: block;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
|
||||
@@ -1,7 +1,12 @@
|
||||
package com.mini.mybigscreen.Auth;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||
import com.mini.mybigscreen.Model.LoginRequest;
|
||||
import com.mini.mybigscreen.Model.Result;
|
||||
import com.mini.mybigscreen.biz.domain.HomeUser;
|
||||
import com.mini.mybigscreen.biz.service.HomeUserService;
|
||||
import com.mini.mybigscreen.utils.AesUtil;
|
||||
import jakarta.annotation.Resource;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import jakarta.servlet.http.HttpSession;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
@@ -12,21 +17,26 @@ import org.springframework.web.bind.annotation.RestController;
|
||||
public class userController {
|
||||
|
||||
|
||||
@Resource
|
||||
private HomeUserService userService;
|
||||
|
||||
|
||||
/**
|
||||
* 系统登录
|
||||
*/
|
||||
@PostMapping("/userLogin")
|
||||
public Result<?> getUserInfo(@RequestBody LoginRequest loginRequest, HttpServletRequest request) {
|
||||
String username = loginRequest.getUsername();
|
||||
String password = loginRequest.getPassword();
|
||||
if ("admin".equals(username) && "123456".equals(password)) {
|
||||
QueryWrapper<HomeUser> queryWrapper = new QueryWrapper<>();
|
||||
queryWrapper.eq("user_name", loginRequest.getUsername())
|
||||
.eq("password", AesUtil.encrypt(loginRequest.getPassword()));
|
||||
HomeUser user = userService.getOne(queryWrapper, true);
|
||||
if (user != null) {
|
||||
String token = "admin-token-" + System.currentTimeMillis();
|
||||
HttpSession session = request.getSession(true);
|
||||
session.setAttribute("loginUser", username);
|
||||
session.setAttribute("userName", user.getUserName());
|
||||
session.setAttribute("token", token);
|
||||
return Result.success(token);
|
||||
} else {
|
||||
}
|
||||
return Result.error("账号或密码错误");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -29,7 +29,7 @@ public class demo {
|
||||
.pathInfo(Collections.singletonMap(OutputFile.xml, System.getProperty("user.dir") + "/src/main/resources/mapper"));
|
||||
})
|
||||
.strategyConfig(builder -> {
|
||||
builder.addInclude("biz_item_info")
|
||||
builder.addInclude("biz_home_user")
|
||||
.addTablePrefix("biz_")
|
||||
.entityBuilder()
|
||||
.enableLombok()
|
||||
|
||||
109
src/main/java/com/mini/mybigscreen/utils/AesUtil.java
Normal file
109
src/main/java/com/mini/mybigscreen/utils/AesUtil.java
Normal file
@@ -0,0 +1,109 @@
|
||||
package com.mini.mybigscreen.utils;
|
||||
|
||||
import javax.crypto.Cipher;
|
||||
import javax.crypto.spec.IvParameterSpec;
|
||||
import javax.crypto.spec.SecretKeySpec;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.Base64;
|
||||
import java.util.Arrays;
|
||||
import java.util.concurrent.ThreadLocalRandom;
|
||||
|
||||
/**
|
||||
* AES加密解密工具类（CBC/PKCS5Padding）
|
||||
* 优化说明：修复密钥BUG+解决换行问题+性能优化+安全加固+零依赖
|
||||
*/
|
||||
public class AesUtil {
|
||||
|
||||
|
||||
private static final LoggerUtils logger = LoggerUtils.getInstance();
|
||||
private static final String AES_KEY_HEX = "AD42F6697B035B7580E4FEF93BE20BAD"; // 你的32位16进制密钥
|
||||
private static final String CHARSET = StandardCharsets.UTF_8.name();
|
||||
private static final int IV_LENGTH = 16; // AES CBC IV固定16字节
|
||||
private static final String TRANSFORMATION = "AES/CBC/PKCS5Padding";
|
||||
private static final String ALGORITHM = "AES";
|
||||
|
||||
private static final ThreadLocal<Cipher> ENCRYPT_CIPHER = ThreadLocal.withInitial(() -> {
|
||||
try {
|
||||
return Cipher.getInstance(TRANSFORMATION);
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
});
|
||||
private static final ThreadLocal<Cipher> DECRYPT_CIPHER = ThreadLocal.withInitial(() -> {
|
||||
try {
|
||||
return Cipher.getInstance(TRANSFORMATION);
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
});
|
||||
|
||||
/**
|
||||
* 加密
|
||||
*/
|
||||
public static String encrypt(String content) {
|
||||
return encrypt(content, hex2Bytes(AES_KEY_HEX));
|
||||
}
|
||||
|
||||
/**
|
||||
* 解密
|
||||
*/
|
||||
public static String decrypt(String content) {
|
||||
return decrypt(content, hex2Bytes(AES_KEY_HEX));
|
||||
}
|
||||
|
||||
public static String encrypt(String content, byte[] key) {
|
||||
if (content == null || content.isEmpty()) {
|
||||
return "";
|
||||
}
|
||||
try {
|
||||
SecretKeySpec secretKey = new SecretKeySpec(key, ALGORITHM);
|
||||
IvParameterSpec iv = new IvParameterSpec(Arrays.copyOf(key, IV_LENGTH));
|
||||
Cipher cipher = ENCRYPT_CIPHER.get();
|
||||
cipher.init(Cipher.ENCRYPT_MODE, secretKey, iv);
|
||||
byte[] encryptBytes = cipher.doFinal(content.getBytes(CHARSET));
|
||||
return Base64.getEncoder().encodeToString(encryptBytes);
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
public static String decrypt(String content, byte[] key) {
|
||||
if (content == null || content.isEmpty()) {
|
||||
return "";
|
||||
}
|
||||
try {
|
||||
SecretKeySpec secretKey = new SecretKeySpec(key, ALGORITHM);
|
||||
IvParameterSpec iv = new IvParameterSpec(Arrays.copyOf(key, IV_LENGTH));
|
||||
Cipher cipher = DECRYPT_CIPHER.get();
|
||||
cipher.init(Cipher.DECRYPT_MODE, secretKey, iv);
|
||||
byte[] decryptBytes = cipher.doFinal(Base64.getDecoder().decode(content));
|
||||
String result = new String(decryptBytes, CHARSET);
|
||||
return result.trim();
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 32位16进制字符串转16字节数组（解决你的密钥长度BUG的核心方法）
|
||||
*/
|
||||
private static byte[] hex2Bytes(String hexStr) {
|
||||
if (hexStr == null || hexStr.length() % 2 != 0) {
|
||||
throw new IllegalArgumentException("密钥必须是偶数长度的16进制字符串");
|
||||
}
|
||||
byte[] bytes = new byte[hexStr.length() / 2];
|
||||
for (int i = 0; i < bytes.length; i++) {
|
||||
bytes[i] = (byte) Integer.parseInt(hexStr.substring(i * 2, i * 2 + 2), 16);
|
||||
}
|
||||
return bytes;
|
||||
}
|
||||
|
||||
/**
|
||||
* 生成随机16字节IV向量（方案2：安全随机IV，新业务推荐使用）
|
||||
*/
|
||||
private static byte[] generateRandomIV() {
|
||||
byte[] iv = new byte[IV_LENGTH];
|
||||
ThreadLocalRandom.current().nextBytes(iv);
|
||||
return iv;
|
||||
}
|
||||
}
|
||||
187
src/main/java/com/mini/mybigscreen/utils/LoggerUtils.java
Normal file
187
src/main/java/com/mini/mybigscreen/utils/LoggerUtils.java
Normal file
@@ -0,0 +1,187 @@
|
||||
package com.mini.mybigscreen.utils;
|
||||
|
||||
import java.io.*;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Paths;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Date;
|
||||
import java.util.concurrent.locks.ReentrantLock;
|
||||
|
||||
|
||||
public class LoggerUtils {
|
||||
|
||||
// 日志级别
|
||||
public enum Level {
|
||||
DEBUG, INFO, WARN, ERROR
|
||||
}
|
||||
|
||||
// 单例实例
|
||||
private static volatile LoggerUtils instance;
|
||||
|
||||
private String baseLogPath;
|
||||
|
||||
|
||||
private final SimpleDateFormat logDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
|
||||
|
||||
// 线程安全锁
|
||||
private final ReentrantLock lock = new ReentrantLock();
|
||||
|
||||
// 禁止外部实例化
|
||||
private LoggerUtils(String baseLogPath) {
|
||||
this.baseLogPath = baseLogPath;
|
||||
initLogDir(); // 初始化日志目录
|
||||
}
|
||||
|
||||
public static LoggerUtils getInstance() {
|
||||
return getInstance("/ogsapp/logs");
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取单例实例（自定义日志路径）
|
||||
*
|
||||
* @param baseLogPath 日志根目录（支持相对路径或绝对路径）
|
||||
*/
|
||||
public static LoggerUtils getInstance(String baseLogPath) {
|
||||
if (instance == null) {
|
||||
synchronized (LoggerUtils.class) {
|
||||
if (instance == null) {
|
||||
instance = new LoggerUtils(baseLogPath);
|
||||
}
|
||||
}
|
||||
}
|
||||
return instance;
|
||||
}
|
||||
|
||||
/**
|
||||
* 初始化日志目录（若不存在则创建多级目录）
|
||||
*/
|
||||
private void initLogDir() {
|
||||
try {
|
||||
Files.createDirectories(Paths.get(baseLogPath));
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException("初始化日志目录失败：" + baseLogPath, e);
|
||||
}
|
||||
}
|
||||
|
||||
private String getCurrentLogFilePath(Level level) {
|
||||
String fileName = level + "_APP" + ".log";
|
||||
return baseLogPath + File.separator + fileName;
|
||||
}
|
||||
|
||||
// ------------------------------ 日志方法（支持多类型可变参数） ------------------------------
|
||||
|
||||
/**
|
||||
* 记录DEBUG级别日志（支持1到多个任意类型参数）
|
||||
*/
|
||||
public void debug(Object... messages) {
|
||||
log(Level.DEBUG, joinMessages(messages), null);
|
||||
}
|
||||
|
||||
/**
|
||||
* 记录INFO级别日志（支持1到多个任意类型参数）
|
||||
*/
|
||||
public void info(Object... messages) {
|
||||
log(Level.INFO, joinMessages(messages), null);
|
||||
}
|
||||
|
||||
/**
|
||||
* 记录WARN级别日志（支持1到多个任意类型参数）
|
||||
*/
|
||||
public void warn(Object... messages) {
|
||||
log(Level.WARN, joinMessages(messages), null);
|
||||
}
|
||||
|
||||
/**
|
||||
* 记录WARN级别日志（支持1到多个任意类型参数+异常）
|
||||
*/
|
||||
public void warn(Object[] messages, Throwable throwable) {
|
||||
log(Level.WARN, joinMessages(messages), throwable);
|
||||
}
|
||||
|
||||
/**
|
||||
* 记录ERROR级别日志（支持1到多个任意类型参数）
|
||||
*/
|
||||
public void error(Object... messages) {
|
||||
log(Level.ERROR, joinMessages(messages), null);
|
||||
}
|
||||
|
||||
/**
|
||||
* 记录ERROR级别日志（支持1到多个任意类型参数+异常）
|
||||
*/
|
||||
public void error(Object[] messages, Throwable throwable) {
|
||||
log(Level.ERROR, joinMessages(messages), throwable);
|
||||
}
|
||||
|
||||
// ------------------------------ 核心方法 ------------------------------
|
||||
|
||||
/**
|
||||
* 核心日志写入逻辑
|
||||
*/
|
||||
private void log(Level level, String message, Throwable throwable) {
|
||||
// 构建日志内容
|
||||
StringBuilder logContent = new StringBuilder();
|
||||
logContent.append("[").append(logDateFormat.format(new Date())).append("] "); // 时间戳
|
||||
logContent.append("[").append(level.name()).append("] "); // 日志级别
|
||||
logContent.append("[Thread-").append(Thread.currentThread().getId()).append("] "); // 线程ID
|
||||
logContent.append(message); // 拼接后的消息
|
||||
|
||||
// 追加异常堆栈信息（如果有）
|
||||
if (throwable != null) {
|
||||
logContent.append("\n").append(getStackTrace(throwable));
|
||||
}
|
||||
logContent.append("\n"); // 每条日志换行
|
||||
|
||||
// 加锁写入文件（保证线程安全）
|
||||
lock.lock();
|
||||
try (BufferedWriter writer = new BufferedWriter(
|
||||
new OutputStreamWriter(
|
||||
new FileOutputStream(getCurrentLogFilePath(level), true), // 追加模式
|
||||
StandardCharsets.UTF_8 // 避免中文乱码
|
||||
)
|
||||
)) {
|
||||
System.out.print(logContent);
|
||||
writer.write(logContent.toString());
|
||||
writer.flush();
|
||||
} catch (IOException e) {
|
||||
System.err.println("日志写入失败：" + e.getMessage());
|
||||
} finally {
|
||||
lock.unlock();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 拼接多类型可变参数为单个字符串（自动转换任意类型为字符串，处理null）
|
||||
*
|
||||
* @param messages 1到多个任意类型参数（不可为空数组）
|
||||
* @return 拼接后的字符串
|
||||
*/
|
||||
private String joinMessages(Object... messages) {
|
||||
if (messages == null || messages.length == 0) {
|
||||
throw new IllegalArgumentException("日志消息至少需要1个参数");
|
||||
}
|
||||
StringBuilder sb = new StringBuilder();
|
||||
for (Object msg : messages) {
|
||||
sb.append(msg);
|
||||
}
|
||||
return sb.toString();
|
||||
}
|
||||
|
||||
/**
|
||||
* 异常堆栈信息转为字符串
|
||||
*/
|
||||
private String getStackTrace(Throwable throwable) {
|
||||
StringWriter sw = new StringWriter();
|
||||
PrintWriter pw = new PrintWriter(sw);
|
||||
throwable.printStackTrace(pw);
|
||||
return sw.toString();
|
||||
}
|
||||
|
||||
/**
|
||||
* 动态修改日志路径
|
||||
*/
|
||||
public void setBaseLogPath(String baseLogPath) {
|
||||
this.baseLogPath = baseLogPath;
|
||||
initLogDir();
|
||||
}
|
||||
}
|
||||
@@ -11,7 +11,7 @@ spring.servlet.multipart.max-file-size=200MB
|
||||
spring.servlet.multipart.max-request-size=1000MB
|
||||
spring.servlet.multipart.file-size-threshold=10MB
|
||||
## MySQL
|
||||
spring.datasource.url=jdbc:mysql://crontab.club:33069/work?useSSL=false&serverTimezone=UTC&characterEncoding=utf8
|
||||
spring.datasource.url=jdbc:mysql://192.168.31.189:33069/work?useSSL=false&serverTimezone=UTC&characterEncoding=utf8
|
||||
spring.datasource.username=dream
|
||||
spring.datasource.password=info_dream
|
||||
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
|
||||
Reference in New Issue
Block a user