From d853ff4b077dd9adb865a56270740d808f73cee3 Mon Sep 17 00:00:00 2001 From: zhoupan Date: Mon, 25 Apr 2022 10:40:04 +0800 Subject: [PATCH 1/9] Update PageDomain.java MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 删除import jdk.nashorn.internal.objects.Global; --- .../src/main/java/com/aidex/common/core/page/PageDomain.java | 1 - 1 file changed, 1 deletion(-) 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 b4dedef..d9522a5 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; -- Gitee From e6dc5e27ca713b60283ab1f392e1b3fdc42fa68e Mon Sep 17 00:00:00 2001 From: zhoupan Date: Mon, 25 Apr 2022 11:05:38 +0800 Subject: [PATCH 2/9] Update README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 使用yarn替换npm --- aidex-ui/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aidex-ui/README.md b/aidex-ui/README.md index def96d2..bb7e00f 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/) -- Gitee From d9be61b095f40e5b0bf5f3e4cf6e898e974f513f Mon Sep 17 00:00:00 2001 From: zhoupan Date: Mon, 25 Apr 2022 11:06:22 +0800 Subject: [PATCH 3/9] Update application-druid.yml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修改默认数据库配置:aidex_sharp --- aidex-admin/src/main/resources/application-druid.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/aidex-admin/src/main/resources/application-druid.yml b/aidex-admin/src/main/resources/application-druid.yml index 31c1222..3368ef9 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: # 从数据源开关/默认关闭 -- Gitee From e05ba7ab925bd1173f1f3d060d80c7ed559c6edd Mon Sep 17 00:00:00 2001 From: zhoupan Date: Mon, 25 Apr 2022 13:48:00 +0800 Subject: [PATCH 4/9] Update banner.txt --- aidex-admin/src/main/resources/banner.txt | 24 +---------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/aidex-admin/src/main/resources/banner.txt b/aidex-admin/src/main/resources/banner.txt index b5ef644..52e5c3c 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 -- Gitee From 5f4a053230f7e291bc9d28dace68672d6620a8bc Mon Sep 17 00:00:00 2001 From: zhoupan Date: Mon, 25 Apr 2022 13:48:20 +0800 Subject: [PATCH 5/9] Update application.yml --- aidex-admin/src/main/resources/application.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aidex-admin/src/main/resources/application.yml b/aidex-admin/src/main/resources/application.yml index 6c7fe38..42329df 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: -- Gitee From 3d4c51f09fb68754eea180346ed3e85ee1a54523 Mon Sep 17 00:00:00 2001 From: zhoupan Date: Mon, 25 Apr 2022 13:48:40 +0800 Subject: [PATCH 6/9] Update defaultSettings.js multiTab: false --- aidex-ui/src/config/defaultSettings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aidex-ui/src/config/defaultSettings.js b/aidex-ui/src/config/defaultSettings.js index 2b46a99..1dd440f 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 }, -- Gitee From a14e16322afd43df31115f9274a9e8e582b2005e Mon Sep 17 00:00:00 2001 From: zhoupan Date: Mon, 25 Apr 2022 14:38:14 +0800 Subject: [PATCH 7/9] Create QUICKSTART.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 简单描述开发环境搭建的步骤 --- QUICKSTART.md | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 QUICKSTART.md diff --git a/QUICKSTART.md b/QUICKSTART.md new file mode 100644 index 0000000..90e16d9 --- /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 + + + -- Gitee From db7b664f47476ab7362f3d8f084b6b3cb6001d3c Mon Sep 17 00:00:00 2001 From: zhoupan Date: Mon, 25 Apr 2022 14:39:08 +0800 Subject: [PATCH 8/9] Update pom.xml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 统一管理commons-beanutils版本 --- pom.xml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f4473d7..7c12d0b 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 -- Gitee From 4b4a5d1703b3190945b4dc0b3b6766058e306c4c Mon Sep 17 00:00:00 2001 From: zhoupan Date: Mon, 25 Apr 2022 14:40:09 +0800 Subject: [PATCH 9/9] Update pom.xml MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1去掉多余的版本限定 2commons-beanutils的版本由根项目统一管理 --- aidex-system/pom.xml | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/aidex-system/pom.xml b/aidex-system/pom.xml index 1b8fcc1..250eb3a 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 -- Gitee