From 7d2839c733f7d2441bf274aa0ae667b45ded2546 Mon Sep 17 00:00:00 2001
From: Raod <1130305001@qq.com>
Date: Wed, 21 Jul 2021 17:12:46 +0800
Subject: [PATCH] user login update
---
README.md | 21 +++++++-------
doc/docs/guide/quickly.md | 36 +++++++++++++++---------
report-ui/src/views/accessUser/index.vue | 3 +-
3 files changed, 35 insertions(+), 25 deletions(-)
diff --git a/README.md b/README.md
index 5eb2282d..4605b904 100644
--- a/README.md
+++ b/README.md
@@ -20,18 +20,18 @@
## 数据流程图
![An image](https://images.gitee.com/uploads/images/2021/0630/160451_31bb9052_1728982.png)
-## 打包目录
+## 打包目录build
```
├── bin 启动命令脚本
-│ ├── logs 启动日志目录
-│ ├── cache 本地缓存目录
-│ ├── startup.cmd
-│ ├── shutdown.cmd
-│ ├── startup.sh
-│ └── shutdown.sh
-├── config 配置文件目录
-├── lib 自定义扩展包
-├── target report-core核心包
+│ ├── restart.sh
+│ ├── start.bat
+│ ├── start.sh
+│ └── stop.sh
+├── conf 配置文件目录
+│ └── bootstrap-dev.yml
+├── logs 启动日志目录
+├── cache 本地缓存目录
+├── lib 自定义扩展包&report-core核心包
```
## 系统目录
@@ -82,6 +82,7 @@ sh build.sh
unzip report-core-xxxx.zip
cd report-core-xxxx
+vim conf/bootstrap-dev.yml 数据库连接
sh bin/start.sh
启动后访问
diff --git a/doc/docs/guide/quickly.md b/doc/docs/guide/quickly.md
index 21764d6f..a076ccaa 100644
--- a/doc/docs/guide/quickly.md
+++ b/doc/docs/guide/quickly.md
@@ -1,26 +1,34 @@
## 快速部署
+下载地址:[https://gitee.com/anji-plus/report/releases](https://gitee.com/anji-plus/report/releases)
```js
第一步,下载zip包,解压
- 第二步,config->application.properties,修改mysql连接
- 第三步,启动bin目录下startup.cmd(Windows)或者startup.sh(Linux)
+ 第二步,conf->bootstrap-dev.yml,修改mysql连接
+ 第三步,启动bin目录下start.sh
第四步,访问 http://localhost:9095/index.html
```
-## 源码打包
-```js
- 第一步,cd report-ui
- npm install
- npm run build
- 第二步,cd report-core/src/main/resources/static
- 将第一步打包文件dist文件夹下所有文件copy到当前目录
- 第三步,cd cd report-core
- 不可使用install,install会报错的
- mvn clean package -Dmaven.test.skip=true
- 第四步,启动 java -jar report-core-1.0.0-SNAPSHOT.jar
+## 编译打包
+在Linux上先准备好maven、node.js、jdk
+- [Apache Maven] 3.5 +
+- [Node.js] v14.16.0+
+- [Jdk] 1.8+
+```
+git clone https://gitee.com/anji-plus/report.git
+cd report
+sh build.sh
+编译完成放在build文件夹 report-core-xxxx.zip
-也可以前后端分开单独部署,前端部署nginx,后端jar
+unzip report-core-xxxx.zip
+cd report-core-xxxx
+vim conf/bootstrap-dev.yml 数据库连接、上传文件的路径以及地址修改
+sh bin/start.sh
+
+启动后访问
+http://serverip:9095
```
+也可以前后端分开单独部署,前端部署nginx,后端jar
+
## 系统特性
1. 最新最稳定的技术栈;
2. 支持多数据源配置
diff --git a/report-ui/src/views/accessUser/index.vue b/report-ui/src/views/accessUser/index.vue
index 5356a298..aecfe41b 100755
--- a/report-ui/src/views/accessUser/index.vue
+++ b/report-ui/src/views/accessUser/index.vue
@@ -131,10 +131,11 @@ export default {
placeholder: '',
field: 'password',
tableHide: true, // 表格中不显示
+ editHide: true,
editField: 'password',
inputType: 'input',
rules: [
- { required: true, message: '密码必填', trigger: 'blur' },
+ // { required: true, message: '密码必填', trigger: 'blur' },
{ min: 1, max: 128, message: '不超过128个字符', trigger: 'blur' },
],
disabled: false,