From 234bbebd417a295da5ab5a1d8c776e799acd52e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=85=E5=90=84=E5=B8=83=E5=A5=87?= <676422208@qq.com> Date: Wed, 30 Jun 2021 17:20:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 30 +--- ruoyi-admin/pom.xml | 34 +---- .../main/java/com/ruoyi/RuoYiApplication.java | 14 +- .../com/ruoyi/RuoYiServletInitializer.java | 18 --- .../src/main/resources/application-druid.yml | 10 +- .../src/main/resources/application.yml | 4 +- ruoyi-admin/src/main/resources/banner.txt | 2 +- ruoyi-admin/src/main/resources/logback.xml | 2 +- ruoyi-common/pom.xml | 15 ++ ruoyi-framework/pom.xml | 141 ++++++++++-------- ruoyi-generator/pom.xml | 15 ++ ruoyi-system/pom.xml | 15 ++ 12 files changed, 148 insertions(+), 152 deletions(-) delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java diff --git a/pom.xml b/pom.xml index 5f81e13e3..648191d4e 100644 --- a/pom.xml +++ b/pom.xml @@ -232,9 +232,6 @@ pom - - - @@ -251,29 +248,12 @@ - + - public - aliyun nexus - http://maven.aliyun.com/nexus/content/groups/public/ - - true - + wendu-release + wendu-release + http://repo.wendukeji.cn:6518/repository/maven-releases/ - - - - - public - aliyun nexus - http://maven.aliyun.com/nexus/content/groups/public/ - - true - - - false - - - + \ No newline at end of file diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index e29eeaf3c..c2c0c516e 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -94,39 +94,7 @@ false ${project.artifactId} - - + ${project.artifactId} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java index a0e726bd4..26aa83be7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java @@ -3,15 +3,16 @@ package com.ruoyi; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; /** * 启动程序 - * - * @author ruoyi */ @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class }) -public class RuoYiApplication -{ +public class RuoYiApplication extends SpringBootServletInitializer { + + public static void main(String[] args) { // System.setProperty("spring.devtools.restart.enabled", "false"); @@ -27,4 +28,9 @@ public class RuoYiApplication " | | \\ / \\ / \n" + " ''-' `'-' `-..-' "); } + @Override + protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { + return application.sources(RuoYiApplication.class); + } + } \ No newline at end of file diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java deleted file mode 100644 index 9d82a2378..000000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.ruoyi; - -import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; - -/** - * web容器中进行部署 - * - * @author ruoyi - */ -public class RuoYiServletInitializer extends SpringBootServletInitializer -{ - @Override - protected SpringApplicationBuilder configure(SpringApplicationBuilder application) - { - return application.sources(RuoYiApplication.class); - } -} diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml index 3c46fd50b..7124e29b7 100644 --- a/ruoyi-admin/src/main/resources/application-druid.yml +++ b/ruoyi-admin/src/main/resources/application-druid.yml @@ -6,9 +6,9 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - username: root - password: password + url: jdbc:mysql://47.111.160.177:6321/zklz?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: zklz + password: zKlz_2021! # 从库数据源 slave: # 从数据源开关/默认关闭 @@ -43,8 +43,8 @@ spring: allow: url-pattern: /druid/* # 控制台管理用户名和密码 - login-username: ruoyi - login-password: 123456 + login-username: root + login-password: jacobKing filter: stat: enabled: true diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index cf8cb187b..b927f8f04 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -9,14 +9,14 @@ ruoyi: # 实例演示开关 demoEnabled: true # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath） - profile: D:/ruoyi/uploadPath + profile: /Volumes/T/oss/zklz/upload # 获取ip地址开关 addressEnabled: false # 开发环境配置 server: # 服务器的HTTP端口，默认为80 - port: 80 + port: 6030 servlet: # 应用的访问路径 context-path: / diff --git a/ruoyi-admin/src/main/resources/banner.txt b/ruoyi-admin/src/main/resources/banner.txt index 94662592f..80e8b0841 100644 --- a/ruoyi-admin/src/main/resources/banner.txt +++ b/ruoyi-admin/src/main/resources/banner.txt @@ -20,5 +20,5 @@ Spring Boot Version: ${spring-boot.version} // ========`-.____`-.___\_____/___.-`____.-'======== // // `=---=' // // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ // -// 佛祖保佑 永不宕机 永无BUG // +// 佛祖保佑 永不宕机 永无BUG // //////////////////////////////////////////////////////////////////// \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/logback.xml b/ruoyi-admin/src/main/resources/logback.xml index d69a57207..d1432cd18 100644 --- a/ruoyi-admin/src/main/resources/logback.xml +++ b/ruoyi-admin/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index fd7b8bfe1..b8bedde6e 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -102,5 +102,20 @@ + + + + org.apache.maven.plugins + maven-compiler-plugin + + + + + + wendu-release + wendu-release + http://repo.wendukeji.cn:6518/repository/maven-releases/ + + \ No newline at end of file diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml index 4785ff9eb..7768d17b7 100644 --- a/ruoyi-framework/pom.xml +++ b/ruoyi-framework/pom.xml @@ -2,81 +2,96 @@ - - ruoyi - com.ruoyi - 4.6.1 - - 4.0.0 + + ruoyi + com.ruoyi + 4.6.1 + + 4.0.0 - ruoyi-framework + ruoyi-framework - - framework框架核心 - + + framework框架核心 + - + - - - org.springframework.boot - spring-boot-starter-web - + + + org.springframework.boot + spring-boot-starter-web + - - - org.springframework.boot - spring-boot-starter-aop - + + + org.springframework.boot + spring-boot-starter-aop + - - - com.alibaba - druid-spring-boot-starter - + + + com.alibaba + druid-spring-boot-starter + - - - com.github.penggle - kaptcha - - - javax.servlet-api - javax.servlet - - - + + + com.github.penggle + kaptcha + + + javax.servlet-api + javax.servlet + + + - - - org.apache.shiro - shiro-spring - + + + org.apache.shiro + shiro-spring + - - - com.github.theborakompanioni - thymeleaf-extras-shiro - + + + com.github.theborakompanioni + thymeleaf-extras-shiro + - - - eu.bitwalker - UserAgentUtils - + + + eu.bitwalker + UserAgentUtils + - - - com.github.oshi - oshi-core - + + + com.github.oshi + oshi-core + - - - com.ruoyi - ruoyi-system - + + + com.ruoyi + ruoyi-system + - + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + + + + wendu-release + wendu-release + http://repo.wendukeji.cn:6518/repository/maven-releases/ + + \ No newline at end of file diff --git a/ruoyi-generator/pom.xml b/ruoyi-generator/pom.xml index 233c57822..788b8042b 100644 --- a/ruoyi-generator/pom.xml +++ b/ruoyi-generator/pom.xml @@ -30,5 +30,20 @@ + + + + org.apache.maven.plugins + maven-compiler-plugin + + + + + + wendu-release + wendu-release + http://repo.wendukeji.cn:6518/repository/maven-releases/ + + \ No newline at end of file diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml index 71018fea1..7d250dfb6 100644 --- a/ruoyi-system/pom.xml +++ b/ruoyi-system/pom.xml @@ -24,5 +24,20 @@ + + + + org.apache.maven.plugins + maven-compiler-plugin + + + + + + wendu-release + wendu-release + http://repo.wendukeji.cn:6518/repository/maven-releases/ + + \ No newline at end of file