diff --git a/QUICKSTART.md b/QUICKSTART.md
new file mode 100644
index 0000000000000000000000000000000000000000..90e16d9b11e3938991928b217da4513391ea0d0a
--- /dev/null
+++ b/QUICKSTART.md
@@ -0,0 +1,49 @@
+## 导入到IDE
+
+ - Eclipse/STS:File->Import->Existing Maven Projects
+
+## 开发环境搭建
+
+### 配置/准备mysql数据库(aidex-admin)
+
+ ```shell
+
+ aidex-admin\src\main\resources\application-druid.yml
+
+ 导入sql\quartz.sql;sql\aidex.sql到mysql数据库
+
+ (默认:url=jdbc:mysql://localhost:3306/aidex_sharp;username=aidex_sharp;password=aidex_sharp)
+ ```
+
+
+### 配置redis(aidex-admin)
+
+ ```shell
+ aidex-admin\src\main\resources\application.yml:spring.redis.*
+ (默认host=localhost;port=6379;database=0;password为空)
+ ```
+
+
+## 启动服务端(aidex-admin)
+
+ ```shell
+ aidex-admin\src\main\java\com\aidex\AiDexApplication.java
+ Eclipse: Run As -> Java Application
+ STS: Run As -> Spring Boot Application
+ (服务端默认监听端口8080:aidex-admin\src\main\resources\application.yml:server.port=8080)
+ ```
+
+## 启动前端(aidex-ui)
+
+
+ ```shell
+ yarn install
+ yarn dev
+ ```
+
+ App running at:
+ - Local: http://localhost:81/
+ - username: admin password:admin
+
+
+
diff --git a/aidex-admin/src/main/resources/application-druid.yml b/aidex-admin/src/main/resources/application-druid.yml
index 31c12226f9e350094bb803c82c4ba15397852251..3368ef9eecc2f8227840c8cfbf9a4a37440495d7 100644
--- a/aidex-admin/src/main/resources/application-druid.yml
+++ b/aidex-admin/src/main/resources/application-druid.yml
@@ -6,9 +6,9 @@ spring:
druid:
# 主库数据源
master:
- url: jdbc:mysql://localhost:3306/gitee?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&&allowMultiQueries=true
- username: root
- password: root
+ url: jdbc:mysql://localhost:3306/aidex_sharp?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&&allowMultiQueries=true
+ username: aidex_sharp
+ password: aidex_sharp
# 从库数据源
slave:
# 从数据源开关/默认关闭
diff --git a/aidex-admin/src/main/resources/application.yml b/aidex-admin/src/main/resources/application.yml
index 6c7fe3899a668f10191551a5697c77023defdb96..42329df41cfa61ff178fbebfb277769d6431840e 100644
--- a/aidex-admin/src/main/resources/application.yml
+++ b/aidex-admin/src/main/resources/application.yml
@@ -9,11 +9,11 @@ aidex:
# 实例演示开关
demoEnabled: true
# 文件路径 示例( Windows配置D:/aidex/uploadPath,Linux配置 /home/aidex/uploadPath)
- profile: D:/aidex/uploadPath
+ profile: c:/aidex/uploadPath
# 获取ip地址开关
addressEnabled: false
# 验证码类型 math 数组计算 char 字符验证
- captchaType: math
+ captchaType: char
# 开发环境配置
server:
diff --git a/aidex-admin/src/main/resources/banner.txt b/aidex-admin/src/main/resources/banner.txt
index b5ef644b3050b0f33e27d8129e8165c41ed8c81d..52e5c3c5137419ef1607ea89df1e66bc5712c4d2 100644
--- a/aidex-admin/src/main/resources/banner.txt
+++ b/aidex-admin/src/main/resources/banner.txt
@@ -1,24 +1,2 @@
Application Version: ${aidex.version}
-Spring Boot Version: ${spring-boot.version}
-////////////////////////////////////////////////////////////////////
-// _ooOoo_ //
-// o8888888o //
-// 88" . "88 //
-// (| ^_^ |) //
-// O\ = /O //
-// ____/`---'\____ //
-// .' \\| |// `. //
-// / \\||| : |||// \ //
-// / _||||| -:- |||||- \ //
-// | | \\\ - /// | | //
-// | \_| ''\---/'' | | //
-// \ .-\__ `-` ___/-. / //
-// ___`. .' /--.--\ `. . ___ //
-// ."" '< `.___\_<|>_/___.' >'"". //
-// | | : `- \`.;`\ _ /`;.`/ - ` : | | //
-// \ \ `-. \_ __\ /__ _/ .-` / / //
-// ========`-.____`-.___\_____/___.-`____.-'======== //
-// `=---=' //
-// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ //
-// 佛祖保佑 永不宕机 永无BUG //
-////////////////////////////////////////////////////////////////////
\ No newline at end of file
+Spring Boot Version: ${spring-boot.version}
\ No newline at end of file
diff --git a/aidex-common/src/main/java/com/aidex/common/core/page/PageDomain.java b/aidex-common/src/main/java/com/aidex/common/core/page/PageDomain.java
index b4dedefef149b528654db2c73d305158280e21e7..d9522a5e0baa87a4713110d5e7884b535d5bf5a4 100644
--- a/aidex-common/src/main/java/com/aidex/common/core/page/PageDomain.java
+++ b/aidex-common/src/main/java/com/aidex/common/core/page/PageDomain.java
@@ -2,7 +2,6 @@ package com.aidex.common.core.page;
import com.aidex.common.utils.ServletUtils;
import com.aidex.common.utils.StringUtils;
-import jdk.nashorn.internal.objects.Global;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
diff --git a/aidex-system/pom.xml b/aidex-system/pom.xml
index 1b8fcc1ccf11e214fbd5a5d4408c690dd5e255c9..250eb3ab2fd9c33464a08fe33d1e2d7baa27c5da 100644
--- a/aidex-system/pom.xml
+++ b/aidex-system/pom.xml
@@ -11,11 +11,6 @@
aidex-system
-
- 1.4.1.Final
- 1.9.4
-
-
system系统模块
@@ -32,34 +27,29 @@
org.mapstruct
mapstruct
- ${org.mapstruct.version}
-
+
org.mapstruct
mapstruct-processor
- ${org.mapstruct.version}
compile
commons-beanutils
commons-beanutils
- ${commons-beanutils.version}
-
+
com.aliyun
aliyun-java-sdk-core
- 4.5.16
-
+
com.thoughtworks.xstream
xstream
- 1.3.1
-
+
\ No newline at end of file
diff --git a/aidex-ui/README.md b/aidex-ui/README.md
index def96d2bfa5a3b5e168d3309914585c574db563c..bb7e00f3a93748b09012406b6be3e2dc8b8c9cd6 100644
--- a/aidex-ui/README.md
+++ b/aidex-ui/README.md
@@ -56,13 +56,13 @@
进入项目根目录
```shell
- npm install
+ yarn install
```
> 若耗时太长可使用`npm install --registry=https://registry.npm.taobao.org`
```shell
- npm run serve
+ yarn dev
```
> 打开浏览器访问 [http://localhost:8000](http://localhost:8080/)
diff --git a/aidex-ui/src/config/defaultSettings.js b/aidex-ui/src/config/defaultSettings.js
index 2b46a995bb76f6fb61fc5f447d7bf9ea6aa3fdd0..1dd440f2083d971eb4863c3a9f8b20b2bf099aae 100644
--- a/aidex-ui/src/config/defaultSettings.js
+++ b/aidex-ui/src/config/defaultSettings.js
@@ -19,7 +19,7 @@ export default {
fixedHeader: true, // sticky header
fixSiderbar: true, // sticky siderbar
colorWeak: false,
- multiTab: true,
+ multiTab: false,
menu: {
locale: true
},
diff --git a/pom.xml b/pom.xml
index f4473d70fb55da30f9750d8f8a1be0e96a4252e6..7c12d0bd9d35af78305bc1c2cfa14f204dbbc1a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,6 +40,7 @@
2.5.0
1.3.1
2.4.0
+ 1.9.4
@@ -172,7 +173,13 @@
commons-fileupload
${commons.fileupload.version}
-
+
+
+ commons-beanutils
+ commons-beanutils
+ ${commons-beanutils.version}
+
+
org.apache.poi