diff --git a/.gitignore b/.gitignore index 9acb04ae..96706270 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,6 @@ */target/* */*.iml /.gradle/ -/application.pid \ No newline at end of file +/application.pid +.DS_Store +arkmodules/eladmin-system/target/* diff --git a/arkmodules/eladmin-system/pom.xml b/arkmodules/eladmin-system/pom.xml index 28bec0b6..992873d8 100644 --- a/arkmodules/eladmin-system/pom.xml +++ b/arkmodules/eladmin-system/pom.xml @@ -17,7 +17,6 @@ 0.11.5 5.8.0 - 2.2.5 @@ -88,6 +87,12 @@ oshi-core 6.1.4 + + + com.alipay.sofa.serverless + sofa-serverless-app-starter + ${sofa.serverless.version} + diff --git a/arkmodules/eladmin-system/src/main/resources/config/application.yml b/arkmodules/eladmin-system/src/main/resources/config/application.yml index 11884259..6bb86a01 100644 --- a/arkmodules/eladmin-system/src/main/resources/config/application.yml +++ b/arkmodules/eladmin-system/src/main/resources/config/application.yml @@ -1,3 +1,4 @@ + server: port: 8000 compression: @@ -33,6 +34,8 @@ spring: password: ${REDIS_PWD:} #连接超时时间 timeout: 5000 + application: + name: eladmin-system task: pool: diff --git a/eladmin-base/pom.xml b/eladmin-base/pom.xml index 36197931..22cb24e5 100644 --- a/eladmin-base/pom.xml +++ b/eladmin-base/pom.xml @@ -16,8 +16,6 @@ 0.11.5 5.8.0 - 2.2.5 - 0.5.5 @@ -31,6 +29,17 @@ netty-ark-plugin ${sofa.ark.version} + + + + + + + + com.alipay.sofa + netty-ark-plugin + ${sofa.ark.version} + me.zhengjie diff --git a/eladmin-base/src/main/resources/config/application.yml b/eladmin-base/src/main/resources/config/application.yml index 427c4476..4857aff6 100644 --- a/eladmin-base/src/main/resources/config/application.yml +++ b/eladmin-base/src/main/resources/config/application.yml @@ -36,6 +36,8 @@ spring: mvc: pathmatch: matching-strategy: ANT_PATH_MATCHER + application: + name: eladmin-base task: pool: diff --git a/pom.xml b/pom.xml index 2444137c..a8de3980 100644 --- a/pom.xml +++ b/pom.xml @@ -10,11 +10,12 @@ 2.7 + eladmin-base eladmin-common eladmin-logging - eladmin-system eladmin-tools eladmin-generator + arkmodules/eladmin-system ELADMIN 后台管理 @@ -23,7 +24,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.4 + 2.7.16 @@ -38,6 +39,8 @@ 1.2.8 2.11.1 1.4.2.Final + 2.2.5 + 0.5.5 @@ -108,8 +111,8 @@ - mysql - mysql-connector-java + com.mysql + mysql-connector-j runtime @@ -207,7 +210,7 @@ public aliyun nexus - http://maven.aliyun.com/nexus/content/groups/public/ + https://maven.aliyun.com/nexus/content/groups/public/ true @@ -218,7 +221,7 @@ public aliyun nexus - http://maven.aliyun.com/nexus/content/groups/public/ + https://maven.aliyun.com/nexus/content/groups/public/ true diff --git a/sql/eladmin.sql b/sql/eladmin.sql index 20ee0949..d5aa3c23 100644 --- a/sql/eladmin.sql +++ b/sql/eladmin.sql @@ -14,6 +14,10 @@ Date: 05/09/2020 10:49:19 */ +CREATE DATABASE IF NOT EXISTS eladmin; + +USE eladmin; + SET NAMES utf8mb4; SET FOREIGN_KEY_CHECKS = 0;