clunt
/
RuoYi-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

都运行成功，除了getaway模块

This commit is contained in:
陈云志 2020-12-18 13:28:13 +08:00
parent 467279cc19
commit b4d580ab79
34 changed files with 1588 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
build-config/build-base.gradle
View File

@ -12,17 +12,7 @@ apply plugin: "idea"
apply plugin: "io.spring.dependency-management"
task copyConfig(type: Copy) {
from "src/main/resources/application.properties"
from "src/main/resources/application.yaml"
from "src/main/resources/appServer.conf"
from "src/main/resources/subGui.conf"
into "build/libs/"
}
task copySql(type: Copy) {
from "src/main/resources/sql"
into "build/libs/sql"
}
task cleanGridnt(type: Exec) {
executable "../rmGridntJar.sh"
}
@ -60,27 +50,27 @@ dependencies {
}
jar {
// // 排除掉模块调试的资源文件, 启动类.
// excludes = ["file/WaveAnalysis", "com/gridnt/**/*Starter*", "logback*.xml",
// "application*.properties", "application*.yaml", "config"
// ]
// 排除掉模块调试的资源文件, 启动类.
excludes = []
manifest {
attributes "releaseVersion": version + "-" + getGitVersion()
attributes "vendor": "GRIDNT山东网聪信息科技有限公司"
attributes "buildTime": new Date().format("yyyy-MM-dd HH:mm:ss", TimeZone.getTimeZone("GMT+08:00"))
}
}
apply plugin: "org.sonarqube"
sonarqube {
properties {
property "sonar.projectKey", "${project.name}"
property "sonar.projectName", "${project.name}"
property "sonar.sources", "src"
property "sonar.java.binaries", "build"
property "sonar.exclusions", "**/**test**/**"
property "sonar.sourceEncoding", "UTF-8"
}
}
//apply plugin: "org.sonarqube"
//sonarqube {
// properties {
// property "sonar.projectKey", "${project.name}"
// property "sonar.projectName", "${project.name}"
// property "sonar.sources", "src"
// property "sonar.java.binaries", "build"
// property "sonar.exclusions", "**/**test**/**"
// property "sonar.sourceEncoding", "UTF-8"
// }
//}

25
build-config/build-boot-jar.gradle
View File

@ -1,11 +1,23 @@
//该产品的构建基本配置，公司统一模板，禁止开发人员开发过程中修改。
apply plugin: "org.springframework.boot"
archivesBaseName = "project-${project.name}"
// 清除现有的lib目录
task clearJar(type: Delete) {
delete "$buildDir\\libs\\lib"
}
task copyConfig(type: Copy) {
from "src/main/resources/bootstrap.yml"
into "$buildDir/libs/"
}
task copySql(type: Copy) {
from "src/main/resources/sql"
into "$buildDir/libs/sql"
}
// 将依赖包复制到lib目录
task copyJar(type: Copy, dependsOn: "clearJar") {
from configurations.compileClasspath
@ -13,16 +25,17 @@ task copyJar(type: Copy, dependsOn: "clearJar") {
}
bootJar {
// excludes = ["file/WaveAnalysis", "*.jar", "*.properties", "*.yaml", "config", "*.conf"]
excludes = ["*.properties", "*.yaml", "config", "*.conf",
// "*.jar"
]
manifest {
attributes "Main-Class": "org.springframework.boot.loader.PropertiesLauncher"
attributes "Manifest-Release-Version": version + "-" + getGitVersion()
// attributes "Class-Path": configurations.runtime.files.collect { "../lib/$it.name" }.join(" ")
// attributes "Main-Class": "org.springframework.boot.loader.PropertiesLauncher"
// attributes "Class-Path": configurations.compileClasspath.files.collect { "../lib/$it.name" }.join(" ")
attributes "releaseVersion": version + "-" + getGitVersion()
attributes "vendor": "GRIDNT山东网聪信息科技有限公司"
attributes "buildTime": new Date().format("yyyy-MM-dd HH:mm:ss", TimeZone.getTimeZone("GMT+08:00"))
}
// launchScript()
} dependsOn(clearJar, copyJar, copyConfig, copySql)
launchScript()
} dependsOn(copyConfig, copySql)

51
build-config/build-publish.gradle
View File

@ -1,46 +1,31 @@
apply plugin: "maven-publish"
group = "com.ruoyi"
archivesBaseName = "${project.name}"
task sourcesJar(type: Jar) {
from sourceSets.main.allJava
archiveClassifier = "sources"
}
publishing {
publications {
maven(MavenPublication) {
artifactId "${archivesBaseName}"
version project.version
//如果是war包填写components.web，如果是jar包填写components.java
from components.java
artifact sourcesJar
}
mavenJava(MavenPublication) {
versionMapping {
usage("java-api") {
fromResolutionOf("runtimeClasspath")
}
usage("java-runtime") {
fromResolutionResult()
}
}
}
publishing.publications {
mavenJava(MavenPublication) {
artifactId "${archivesBaseName}"
version project.version
//如果是war包填写components.web，如果是jar包填写components.java
from components.java
artifact sourcesJar
}
}
repositories {
maven {
//指定要上传的maven私服仓库
def releasesRepoUrl = "http://192.168.8.200:8081/repository/releases"
def snapshotsRepoUrl = "http://192.168.8.200:8081/repository/snapshots/"
url = version.endsWith("SNAPSHOT") ? snapshotsRepoUrl : releasesRepoUrl
println "${group} ${archivesBaseName} publishing version is ${version}"
//认证用户和密码
credentials {
username "developer"
password "dev123"
}
publishing.repositories {
maven {
def releasesRepoUrl = "http://192.168.8.200:8081/repository/releases"
def snapshotsRepoUrl = "http://192.168.8.200:8081/repository/snapshots/"
url = version.endsWith("SNAPSHOT") ? snapshotsRepoUrl : releasesRepoUrl
println "${group} ${archivesBaseName} publishing version is ${version}"
credentials {
username "developer"
password "dev123"
}
}
}

1
build-config/formart.sh
View File

@ -6,6 +6,7 @@ find . -name "build.gradle" | xargs sed -r -i "s/'/\"/g"
find . -name "build.gradle" | xargs sed -r -i 's/compile group: /compile /g'
find . -name "build.gradle" | xargs sed -r -i 's/compileOnly group: /compileOnly /g'
find . -name "build.gradle" | xargs sed -r -i 's/implementation group: /implementation /g'
find . -name "build.gradle" | xargs sed -r -i 's/runtime group: /runtime /g'
find . -name "build.gradle" | xargs sed -r -i 's/testRuntime group: /testRuntime /g'
find . -name "build.gradle" | xargs sed -r -i 's/testImplementation group: /testImplementation /g'
find . -name "build.gradle" | xargs sed -r -i 's/", name: "|", version: "/:/g'

30
build-product.gradle
View File

@ -1,12 +1,4 @@
ext {
springBoot = "2.4.0"
alibabaCloud = "2.2.3.RELEASE"
springCloud = "2.2.6.RELEASE"
}
dependencies {
runtime group: 'org.springframework.cloud', name: 'spring-cloud-dependencies', version: 'Hoxton.SR9', ext: 'pom'
implementation "org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.4"
dependencies {
implementation "com.alibaba.cloud:spring-cloud-alibaba-sentinel-gateway:${alibabaCloud}"
implementation "com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-config:${alibabaCloud}"
implementation "com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:${alibabaCloud}"
@ -28,20 +20,24 @@ dependencies {
implementation "org.apache.commons:commons-lang3:3.11"
implementation "org.apache.commons:commons-pool2:2.9.0"
implementation "org.apache.poi:poi-ooxml:4.1.2"
implementation "org.apache.velocity:velocity:1.7"
implementation "org.aspectj:aspectjweaver:1.9.6"
implementation "org.mariadb.jdbc:mariadb-java-client:2.7.1"
implementation "org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.4"
implementation "org.quartz-scheduler:quartz:2.3.2"
implementation "org.springframework:spring-context-support:5.3.2"
implementation "org.springframework.boot:spring-boot-autoconfigure:${springBoot}"
// implementation "org.springframework.boot:spring-boot-autoconfigure:${springBoot}"
implementation "org.springframework.boot:spring-boot-starter-actuator:${springBoot}"
implementation "org.springframework.boot:spring-boot-starter-data-redis:${springBoot}"
implementation "org.springframework.boot:spring-boot-starter-data-redis:2.3.4.RELEASE"
implementation "org.springframework.boot:spring-boot-starter-jdbc:${springBoot}"
implementation "org.springframework.boot:spring-boot-starter-security:${springBoot}"
// implementation "org.springframework.boot:spring-boot-starter-security:${springBoot}"
implementation "org.springframework.boot:spring-boot-starter-validation:${springBoot}"
// implementation "org.springframework.boot:spring-boot-starter-validation:${springBoot}"
implementation "org.springframework.boot:spring-boot-starter-web:${springBoot}"
implementation "org.springframework.boot:spring-boot-starter-web:2.3.4.RELEASE"
implementation "org.springframework.cloud:spring-cloud-starter-gateway:${springCloud}"
implementation "org.springframework.cloud:spring-cloud-starter-openfeign:${springCloud}"
implementation "org.springframework.boot:spring-boot-starter-web:${springBoot}"
}
implementation "org.springframework:spring-context-support:5.3.2"
}

14
build_java.sh Executable file
View File

@ -0,0 +1,14 @@
#!/bin/bash
## 编译每个 服务
for gfile in $(find . -name "build.gradle")
do
gradle -b $gfile clean build -x test -DbuildProduct=true
echo -e "\033[32m----------------- $gfile 模块编译成功 ---------------------- \033[0m"
done

16
checkThirdPaty.sh Executable file
View File

@ -0,0 +1,16 @@
#!/bin/bash
currentDir=`pwd`
shortName=${currentDir##*/}
rm -rf temp build-product-${shortName}.gradle
echo "dependencies { ">> build-product-${shortName}.gradle
find . -name "build.gradle" | xargs cat |grep -E "compile group|compile '|implementation " | egrep -v 'gridnt' >> temp
sort temp |uniq >> build-product-${shortName}.gradle
rm -rf temp
echo "} ">> build-product-${shortName}.gradle
rm -rf temp gridnt-jar-${shortName}.md
find . -name "build.gradle" | xargs cat |grep -E "compile group|compile '|implementation " | grep -E 'gridnt' >> temp
sort temp |uniq >> gridnt-jar-${shortName}.md
rm -rf temp

7
ruoyi-api/ruoyi-api-system/build.gradle
View File

@ -5,13 +5,13 @@ buildscript {
maven { url "https://maven.aliyun.com/repository/public/" }
maven { url "https://plugins.gradle.org/m2/" }
}
ext {
springBoot = "2.4.0"
springBoot = "2.3.4.RELEASE"
alibabaCloud = "2.2.3.RELEASE"
springCloud = "2.2.6.RELEASE"
}
dependencies {
classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBoot}")
classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.8"
@ -21,6 +21,7 @@ buildscript {
ext {
devVersion = "dev-9-SNAPSHOT"
devVersion = "2.3.0"
}

12
ruoyi-auth/build.gradle
View File

@ -3,9 +3,9 @@ buildscript {
maven { url "https://plugins.gradle.org/m2/" }
}
ext {
springBoot = "2.4.0"
alibabaCloud = "2.2.3.RELEASE"
springBoot = "2.3.4.RELEASE"
springCloud = "2.2.6.RELEASE"
alibabaCloud = "2.2.3.RELEASE"
}
dependencies {
classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBoot}")
@ -22,10 +22,9 @@ apply from: "../build-config/build-all.gradle"
apply from: "../build-config/build-base.gradle"
apply from: "../build-config/build-boot-jar.gradle"
group = "com.ruoyi"
archivesBaseName = "${project.name}"
dependencies {
implementation "com.ruoyi:ruoyi-common-core:${devVersion}"
implementation "com.ruoyi:ruoyi-common-security:${devVersion}"
implementation "com.ruoyi:ruoyi-api-system:${devVersion}"
@ -37,9 +36,12 @@ dependencies {
implementation "org.springframework.boot:spring-boot-starter-web:${springBoot}"
implementation "org.springframework.boot:spring-boot-starter-actuator:${springBoot}"
implementation "mysql:mysql-connector-java:8.0.21"
implementation "org.mariadb.jdbc:mariadb-java-client:2.7.1"
}
static def getGitVersion() {
return System.getProperty("gitVersion") ?: "git rev-parse --short HEAD".execute().text.trim()
}

1
ruoyi-auth/formart.sh Symbolic link
View File

@ -0,0 +1 @@
../build-config/formart.sh

4
ruoyi-auth/src/main/resources/bootstrap.yml
View File

@ -14,10 +14,10 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 127.0.0.1:8848
server-addr: 192.168.8.201:8848
config:
# 配置中心地址
server-addr: 127.0.0.1:8848
server-addr: 192.168.8.201:8848
# 配置文件格式
file-extension: yml
# 共享配置

6
ruoyi-common/build.gradle
View File

@ -18,9 +18,7 @@ buildscript {
ext {
devVersion = "dev-9-SNAPSHOT"
springBoot = "2.4.0"
alibabaCloud = "2.2.3.RELEASE"
springCloud = "2.2.6.RELEASE"
// devVersion = "2.3.0"
}
apply from: "../build-config/build-all.gradle"
@ -30,8 +28,6 @@ subprojects {
apply from: "../../build-config/build-base.gradle"
apply from: "../../build-config/build-publish.gradle"
group = "com.ruoyi"
archivesBaseName = "${project.name}"
}
static def getGitVersion() {

3
ruoyi-common/ruoyi-common-core/build.gradle
View File

@ -1,8 +1,7 @@
dependencies {
implementation "org.springframework.cloud:spring-cloud-starter-openfeign:${springCloud}"
implementation "org.springframework.boot:spring-boot-starter-validation:${springBoot}"
implementation "org.springframework.boot:spring-boot-starter-web:${springBoot}"
implementation "com.github.pagehelper:pagehelper-spring-boot-starter:1.3.0"
implementation "com.alibaba:fastjson:1.2.75"
implementation "com.fasterxml.jackson.core:jackson-databind:2.12.0"

2
ruoyi-common/ruoyi-common-datascope/build.gradle
View File

@ -3,8 +3,8 @@ dependencies {
implementation project(":ruoyi-common-core")
implementation project(":ruoyi-common-security")
implementation "com.ruoyi:ruoyi-api-system:${devVersion}"
implementation "com.ruoyi:ruoyi-api-system:${devVersion}"
implementation "org.aspectj:aspectjweaver:1.9.6"
implementation "org.apache.commons:commons-lang3:3.11"
implementation "org.springframework.boot:spring-boot-starter-validation:${springBoot}"

1
ruoyi-common/ruoyi-common-log/build.gradle
View File

@ -8,7 +8,6 @@ dependencies {
implementation "org.apache.commons:commons-lang3:3.11"
implementation "org.aspectj:aspectjweaver:1.9.6"
implementation "org.springframework.boot:spring-boot-starter-web:${springBoot}"
implementation "org.springframework.boot:spring-boot-autoconfigure:${springBoot}"
}

4
ruoyi-common/ruoyi-common-security/build.gradle
View File

@ -3,14 +3,12 @@ description = "ruoyi-common-security"
dependencies {
implementation project(":ruoyi-common-core")
implementation project(":ruoyi-common-redis")
implementation "com.ruoyi:ruoyi-api-system:${devVersion}"
implementation "javax.servlet:javax.servlet-api:4.0.1"
implementation "org.apache.commons:commons-lang3:3.11"
implementation "org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.4"
// implementation "org.springframework.boot:spring-boot-autoconfigure:${springBoot}"
implementation "org.springframework.boot:spring-boot-starter-web:${springBoot}"
implementation "org.springframework.boot:spring-boot-starter-security:${springBoot}"
implementation "org.springframework.boot:spring-boot-starter-validation:${springBoot}"
implementation "org.springframework.cloud:spring-cloud-starter-openfeign:${springCloud}"

2
ruoyi-common/ruoyi-common-swagger/build.gradle
View File

@ -1,5 +1,5 @@
dependencies {
implementation "org.springframework.boot:spring-boot-starter-web:2.3.4.RELEASE"
implementation "org.springframework.boot:spring-boot-autoconfigure:${springBoot}"
implementation "io.springfox:springfox-swagger2:2.9.2"
}

32
ruoyi-gateway/build.gradle
View File

@ -3,9 +3,9 @@ buildscript {
maven { url "https://plugins.gradle.org/m2/" }
}
ext {
springBoot = "2.4.0"
springBoot = "2.3.4.RELEASE"
alibabaCloud = "2.2.3.RELEASE"
springCloud = "2.2.6.RELEASE"
springCloud = "2.2.5.RELEASE"
}
dependencies {
classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBoot}")
@ -16,39 +16,41 @@ buildscript {
ext {
devVersion = "dev-9-SNAPSHOT"
}
description = "ruoyi-api-system"
apply from: "../build-config/build-all.gradle"
apply from: "../build-config/build-base.gradle"
apply from: "../build-config/build-boot-jar.gradle"
group = "com.ruoyi"
archivesBaseName = "${project.name}"
archivesBaseName = "project-${project.name}"
dependencies {
implementation "com.ruoyi:ruoyi-api-system:${devVersion}"
implementation "com.ruoyi:ruoyi-common-core:${devVersion}"
implementation "com.ruoyi:ruoyi-common-redis:${devVersion}"
implementation "com.ruoyi:ruoyi-common-security:${devVersion}"
implementation "com.ruoyi:ruoyi-api-system:${devVersion}"
implementation "com.github.penggle:kaptcha:2.3.2"
implementation "io.springfox:springfox-swagger2:2.9.2"
implementation "io.springfox:springfox-swagger-ui:2.9.2"
implementation "com.alibaba.csp:sentinel-datasource-nacos:1.8.0"
implementation "org.springframework.boot:spring-boot-starter-actuator:${springBoot}"
implementation "org.springframework.boot:spring-boot-starter-data-redis:${springBoot}"
implementation "org.springframework.cloud:spring-cloud-starter-gateway:${springCloud}"
// compile "com.alibaba.cloud:spring-cloud-alibaba-dependencies:${alibabaCloud}"
implementation "com.alibaba.cloud:spring-cloud-alibaba-sentinel-gateway:${alibabaCloud}"
implementation "com.alibaba.cloud:spring-cloud-starter-alibaba-sentinel:${alibabaCloud}"
implementation "com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-config:${alibabaCloud}"
implementation "com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:${alibabaCloud}"
implementation "com.alibaba.cloud:spring-cloud-alibaba-sentinel-gateway:${alibabaCloud}"
implementation "org.springframework.boot:spring-boot-starter-actuator:${springBoot}"
implementation "org.springframework.boot:spring-boot-starter-data-redis:${springBoot}"
implementation "org.springframework.boot:spring-boot-autoconfigure:${springBoot}"
// compile "org.springframework.cloud:spring-cloud-dependencies:Hoxton.SR8"
implementation("org.springframework.cloud:spring-cloud-starter-gateway:${springCloud}") {
exclude group: "org.springframework.boot", module: "spring-boot-starter-web"
exclude group: "org.springframework.boot", module: "spring-boot-starter-webflux"
}
// implementation "org.springframework.boot:spring-boot-starter-webflux:${springBoot}"
}
static def getGitVersion() {

1
ruoyi-gateway/pom.xml
View File

@ -99,5 +99,4 @@
</plugin>
</plugins>
</build>
</project>

8
ruoyi-gateway/src/main/resources/bootstrap.yml
View File

@ -3,7 +3,7 @@ server:
port: 8080
# Spring
spring:
spring:
application:
# 应用名称
name: ruoyi-gateway
@ -16,10 +16,10 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 127.0.0.1:8848
server-addr: 192.168.8.201:8848
config:
# 配置中心地址
server-addr: 127.0.0.1:8848
server-addr: 192.168.8.201:8848
# 配置文件格式
file-extension: yml
# 共享配置
@ -34,7 +34,7 @@ spring:
datasource:
ds1:
nacos:
server-addr: 127.0.0.1:8848
server-addr: 192.168.8.201:8848
dataId: sentinel-ruoyi-gateway
groupId: DEFAULT_GROUP
data-type: json

4
ruoyi-modules/ruoyi-file/build.gradle
View File

@ -3,7 +3,7 @@ buildscript {
maven { url "https://plugins.gradle.org/m2/" }
}
ext {
springBoot = "2.4.0"
springBoot = "2.3.4.RELEASE"
alibabaCloud = "2.2.3.RELEASE"
springCloud = "2.2.6.RELEASE"
}
@ -22,8 +22,6 @@ apply from: "../../build-config/build-all.gradle"
apply from: "../../build-config/build-base.gradle"
apply from: "../../build-config/build-boot-jar.gradle"
group = "com.ruoyi"
archivesBaseName = "${project.name}"
dependencies {

4
ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml
View File

@ -14,10 +14,10 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 127.0.0.1:8848
server-addr: 192.168.8.201:8848
config:
# 配置中心地址
server-addr: 127.0.0.1:8848
server-addr: 192.168.8.201:8848
# 配置文件格式
file-extension: yml
# 共享配置

12
ruoyi-modules/ruoyi-gen/build.gradle
View File

@ -3,9 +3,9 @@ buildscript {
maven { url "https://plugins.gradle.org/m2/" }
}
ext {
springBoot = "2.4.0"
alibabaCloud = "2.2.3.RELEASE"
springBoot = "2.3.4.RELEASE"
springCloud = "2.2.6.RELEASE"
alibabaCloud = "2.2.3.RELEASE"
}
dependencies {
classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBoot}")
@ -16,14 +16,11 @@ buildscript {
ext {
devVersion = "dev-9-SNAPSHOT"
}
description = "ruoyi-modules-file"
description = "ruoyi-modules-gen"
apply from: "../../build-config/build-all.gradle"
apply from: "../../build-config/build-base.gradle"
apply from: "../../build-config/build-boot-jar.gradle"
group = "com.ruoyi"
archivesBaseName = "${project.name}"
dependencies {
@ -33,7 +30,7 @@ dependencies {
implementation "com.ruoyi:ruoyi-common-swagger:${devVersion}"
implementation "org.apache.velocity:velocity:1.7"
implementation "mysql:mysql-connector-java:8.0.21"
implementation "org.mariadb.jdbc:mariadb-java-client:2.7.1"
implementation "io.springfox:springfox-swagger-ui:2.9.2"
implementation "org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.4"
@ -41,6 +38,7 @@ dependencies {
implementation "com.alibaba.cloud:spring-cloud-starter-alibaba-nacos-discovery:${alibabaCloud}"
implementation "com.alibaba.cloud:spring-cloud-starter-alibaba-sentinel:${alibabaCloud}"
implementation "org.springframework.boot:spring-boot-autoconfigure:${springBoot}"
implementation "org.springframework.boot:spring-boot-starter-web:${springBoot}"
implementation "org.springframework.boot:spring-boot-starter-actuator:${springBoot}"
implementation "org.springframework.boot:spring-boot-starter-validation:${springBoot}"

4
ruoyi-modules/ruoyi-gen/settings.gradle
View File

@ -1,5 +1 @@
/*
* This file was generated by the Gradle 'init' task.
*/
rootProject.name = 'ruoyi-modules-gen'

4
ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml
View File

@ -14,10 +14,10 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 127.0.0.1:8848
server-addr: 192.168.8.201:8848
config:
# 配置中心地址
server-addr: 127.0.0.1:8848
server-addr: 192.168.8.201:8848
# 配置文件格式
file-extension: yml
# 共享配置

6
ruoyi-modules/ruoyi-job/build.gradle
View File

@ -3,7 +3,7 @@ buildscript {
maven { url "https://plugins.gradle.org/m2/" }
}
ext {
springBoot = "2.4.0"
springBoot = "2.3.4.RELEASE"
alibabaCloud = "2.2.3.RELEASE"
springCloud = "2.2.6.RELEASE"
}
@ -22,8 +22,6 @@ apply from: "../../build-config/build-all.gradle"
apply from: "../../build-config/build-base.gradle"
apply from: "../../build-config/build-boot-jar.gradle"
group = "com.ruoyi"
archivesBaseName = "${project.name}"
dependencies {
@ -33,7 +31,7 @@ dependencies {
implementation "com.ruoyi:ruoyi-common-core:${devVersion}"
implementation "mysql:mysql-connector-java:8.0.21"
implementation "org.mariadb.jdbc:mariadb-java-client:2.7.1"
implementation "org.quartz-scheduler:quartz:2.3.2"
implementation "io.springfox:springfox-swagger-ui:2.9.2"
implementation "com.github.tobato:fastdfs-client:1.27.2"

4
ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml
View File

@ -14,10 +14,10 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 127.0.0.1:8848
server-addr: 192.168.8.201:8848
config:
# 配置中心地址
server-addr: 127.0.0.1:8848
server-addr: 192.168.8.201:8848
# 配置文件格式
file-extension: yml
# 共享配置

8
ruoyi-modules/ruoyi-system/build.gradle
View File

@ -3,7 +3,7 @@ buildscript {
maven { url "https://plugins.gradle.org/m2/" }
}
ext {
springBoot = "2.4.0"
springBoot = "2.3.4.RELEASE"
alibabaCloud = "2.2.3.RELEASE"
springCloud = "2.2.6.RELEASE"
}
@ -21,9 +21,7 @@ apply from: "../../build-config/build-all.gradle"
apply from: "../../build-config/build-base.gradle"
apply from: "../../build-config/build-boot-jar.gradle"
group = "com.ruoyi"
archivesBaseName = "${project.name}"
description = 'ruoyi-modules-system'
description = "ruoyi-modules-system"
dependencies {
implementation "com.ruoyi:ruoyi-common-core:${devVersion}"
implementation "com.ruoyi:ruoyi-common-log:${devVersion}"
@ -34,7 +32,7 @@ dependencies {
implementation "com.ruoyi:ruoyi-api-system:${devVersion}"
implementation "org.apache.poi:poi-ooxml:4.1.2"
implementation 'mysql:mysql-connector-java:8.0.21'
implementation "org.mariadb.jdbc:mariadb-java-client:2.7.1"
implementation "io.springfox:springfox-swagger-ui:2.9.2"
implementation "org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.4"
implementation "org.springframework.boot:spring-boot-starter-web:${springBoot}"

4
ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
View File

@ -14,10 +14,10 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 127.0.0.1:8848
server-addr: 192.168.8.201:8848
config:
# 配置中心地址
server-addr: 127.0.0.1:8848
server-addr: 192.168.8.201:8848
# 配置文件格式
file-extension: yml
# 共享配置

5
ruoyi-visual/ruoyi-monitor/build.gradle
View File

@ -3,7 +3,7 @@ buildscript {
maven { url "https://plugins.gradle.org/m2/" }
}
ext {
springBoot = "2.4.0"
springBoot = "2.3.4.RELEASE"
alibabaCloud = "2.2.3.RELEASE"
springCloud = "2.2.6.RELEASE"
}
@ -22,9 +22,6 @@ apply from: "../../build-config/build-all.gradle"
apply from: "../../build-config/build-base.gradle"
apply from: "../../build-config/build-boot-jar.gradle"
group = "com.ruoyi"
archivesBaseName = "${project.name}"
dependencies {
implementation "de.codecentric:spring-boot-admin-starter-server:2.3.0"

4
ruoyi-visual/ruoyi-monitor/src/main/resources/bootstrap.yml
View File

@ -14,10 +14,10 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 127.0.0.1:8848
server-addr: 192.168.8.201:8848
config:
# 配置中心地址
server-addr: 127.0.0.1:8848
server-addr: 192.168.8.201:8848
# 配置文件格式
file-extension: yml
# 共享配置

662
sql/pscada_online.sql Normal file
View File

File diff suppressed because one or more lines are too long

416
sql/pscada_online_config.sql Normal file
View File

File diff suppressed because one or more lines are too long

351
sql/pscada_online_quartz.sql Normal file
View File

@ -0,0 +1,351 @@
-- MySQL dump 10.16 Distrib 10.1.37-MariaDB, for debian-linux-gnu (x86_64)
--
-- Host: 192.168.8.201 Database: pscada_online
-- ------------------------------------------------------
-- Server version 10.3.24-MariaDB-log
/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
/*!40101 SET NAMES utf8 */;
/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
/*!40103 SET TIME_ZONE='+00:00' */;
/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
--
-- Table structure for table `QRTZ_BLOB_TRIGGERS`
--
DROP TABLE IF EXISTS `QRTZ_BLOB_TRIGGERS`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `QRTZ_BLOB_TRIGGERS` (
`sched_name` varchar(120) NOT NULL,
`trigger_name` varchar(200) NOT NULL,
`trigger_group` varchar(200) NOT NULL,
`blob_data` blob DEFAULT NULL,
PRIMARY KEY (`sched_name`,`trigger_name`,`trigger_group`),
CONSTRAINT `QRTZ_BLOB_TRIGGERS_ibfk_1` FOREIGN KEY (`sched_name`, `trigger_name`, `trigger_group`) REFERENCES `QRTZ_TRIGGERS` (`sched_name`, `trigger_name`, `trigger_group`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `QRTZ_BLOB_TRIGGERS`
--
LOCK TABLES `QRTZ_BLOB_TRIGGERS` WRITE;
/*!40000 ALTER TABLE `QRTZ_BLOB_TRIGGERS` DISABLE KEYS */;
/*!40000 ALTER TABLE `QRTZ_BLOB_TRIGGERS` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `QRTZ_CALENDARS`
--
DROP TABLE IF EXISTS `QRTZ_CALENDARS`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `QRTZ_CALENDARS` (
`sched_name` varchar(120) NOT NULL,
`calendar_name` varchar(200) NOT NULL,
`calendar` blob NOT NULL,
PRIMARY KEY (`sched_name`,`calendar_name`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `QRTZ_CALENDARS`
--
LOCK TABLES `QRTZ_CALENDARS` WRITE;
/*!40000 ALTER TABLE `QRTZ_CALENDARS` DISABLE KEYS */;
/*!40000 ALTER TABLE `QRTZ_CALENDARS` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `QRTZ_CRON_TRIGGERS`
--
DROP TABLE IF EXISTS `QRTZ_CRON_TRIGGERS`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `QRTZ_CRON_TRIGGERS` (
`sched_name` varchar(120) NOT NULL,
`trigger_name` varchar(200) NOT NULL,
`trigger_group` varchar(200) NOT NULL,
`cron_expression` varchar(200) NOT NULL,
`time_zone_id` varchar(80) DEFAULT NULL,
PRIMARY KEY (`sched_name`,`trigger_name`,`trigger_group`),
CONSTRAINT `QRTZ_CRON_TRIGGERS_ibfk_1` FOREIGN KEY (`sched_name`, `trigger_name`, `trigger_group`) REFERENCES `QRTZ_TRIGGERS` (`sched_name`, `trigger_name`, `trigger_group`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `QRTZ_CRON_TRIGGERS`
--
LOCK TABLES `QRTZ_CRON_TRIGGERS` WRITE;
/*!40000 ALTER TABLE `QRTZ_CRON_TRIGGERS` DISABLE KEYS */;
/*!40000 ALTER TABLE `QRTZ_CRON_TRIGGERS` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `QRTZ_FIRED_TRIGGERS`
--
DROP TABLE IF EXISTS `QRTZ_FIRED_TRIGGERS`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `QRTZ_FIRED_TRIGGERS` (
`sched_name` varchar(120) NOT NULL,
`entry_id` varchar(95) NOT NULL,
`trigger_name` varchar(200) NOT NULL,
`trigger_group` varchar(200) NOT NULL,
`instance_name` varchar(200) NOT NULL,
`fired_time` bigint(13) NOT NULL,
`sched_time` bigint(13) NOT NULL,
`priority` int(11) NOT NULL,
`state` varchar(16) NOT NULL,
`job_name` varchar(200) DEFAULT NULL,
`job_group` varchar(200) DEFAULT NULL,
`is_nonconcurrent` varchar(1) DEFAULT NULL,
`requests_recovery` varchar(1) DEFAULT NULL,
PRIMARY KEY (`sched_name`,`entry_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `QRTZ_FIRED_TRIGGERS`
--
LOCK TABLES `QRTZ_FIRED_TRIGGERS` WRITE;
/*!40000 ALTER TABLE `QRTZ_FIRED_TRIGGERS` DISABLE KEYS */;
/*!40000 ALTER TABLE `QRTZ_FIRED_TRIGGERS` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `QRTZ_JOB_DETAILS`
--
DROP TABLE IF EXISTS `QRTZ_JOB_DETAILS`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `QRTZ_JOB_DETAILS` (
`sched_name` varchar(120) NOT NULL,
`job_name` varchar(200) NOT NULL,
`job_group` varchar(200) NOT NULL,
`description` varchar(250) DEFAULT NULL,
`job_class_name` varchar(250) NOT NULL,
`is_durable` varchar(1) NOT NULL,
`is_nonconcurrent` varchar(1) NOT NULL,
`is_update_data` varchar(1) NOT NULL,
`requests_recovery` varchar(1) NOT NULL,
`job_data` blob DEFAULT NULL,
PRIMARY KEY (`sched_name`,`job_name`,`job_group`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `QRTZ_JOB_DETAILS`
--
LOCK TABLES `QRTZ_JOB_DETAILS` WRITE;
/*!40000 ALTER TABLE `QRTZ_JOB_DETAILS` DISABLE KEYS */;
/*!40000 ALTER TABLE `QRTZ_JOB_DETAILS` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `QRTZ_LOCKS`
--
DROP TABLE IF EXISTS `QRTZ_LOCKS`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `QRTZ_LOCKS` (
`sched_name` varchar(120) NOT NULL,
`lock_name` varchar(40) NOT NULL,
PRIMARY KEY (`sched_name`,`lock_name`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `QRTZ_LOCKS`
--
LOCK TABLES `QRTZ_LOCKS` WRITE;
/*!40000 ALTER TABLE `QRTZ_LOCKS` DISABLE KEYS */;
/*!40000 ALTER TABLE `QRTZ_LOCKS` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `QRTZ_PAUSED_TRIGGER_GRPS`
--
DROP TABLE IF EXISTS `QRTZ_PAUSED_TRIGGER_GRPS`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `QRTZ_PAUSED_TRIGGER_GRPS` (
`sched_name` varchar(120) NOT NULL,
`trigger_group` varchar(200) NOT NULL,
PRIMARY KEY (`sched_name`,`trigger_group`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `QRTZ_PAUSED_TRIGGER_GRPS`
--
LOCK TABLES `QRTZ_PAUSED_TRIGGER_GRPS` WRITE;
/*!40000 ALTER TABLE `QRTZ_PAUSED_TRIGGER_GRPS` DISABLE KEYS */;
/*!40000 ALTER TABLE `QRTZ_PAUSED_TRIGGER_GRPS` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `QRTZ_SCHEDULER_STATE`
--
DROP TABLE IF EXISTS `QRTZ_SCHEDULER_STATE`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `QRTZ_SCHEDULER_STATE` (
`sched_name` varchar(120) NOT NULL,
`instance_name` varchar(200) NOT NULL,
`last_checkin_time` bigint(13) NOT NULL,
`checkin_interval` bigint(13) NOT NULL,
PRIMARY KEY (`sched_name`,`instance_name`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `QRTZ_SCHEDULER_STATE`
--
LOCK TABLES `QRTZ_SCHEDULER_STATE` WRITE;
/*!40000 ALTER TABLE `QRTZ_SCHEDULER_STATE` DISABLE KEYS */;
/*!40000 ALTER TABLE `QRTZ_SCHEDULER_STATE` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `QRTZ_SIMPLE_TRIGGERS`
--
DROP TABLE IF EXISTS `QRTZ_SIMPLE_TRIGGERS`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `QRTZ_SIMPLE_TRIGGERS` (
`sched_name` varchar(120) NOT NULL,
`trigger_name` varchar(200) NOT NULL,
`trigger_group` varchar(200) NOT NULL,
`repeat_count` bigint(7) NOT NULL,
`repeat_interval` bigint(12) NOT NULL,
`times_triggered` bigint(10) NOT NULL,
PRIMARY KEY (`sched_name`,`trigger_name`,`trigger_group`),
CONSTRAINT `QRTZ_SIMPLE_TRIGGERS_ibfk_1` FOREIGN KEY (`sched_name`, `trigger_name`, `trigger_group`) REFERENCES `QRTZ_TRIGGERS` (`sched_name`, `trigger_name`, `trigger_group`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `QRTZ_SIMPLE_TRIGGERS`
--
LOCK TABLES `QRTZ_SIMPLE_TRIGGERS` WRITE;
/*!40000 ALTER TABLE `QRTZ_SIMPLE_TRIGGERS` DISABLE KEYS */;
/*!40000 ALTER TABLE `QRTZ_SIMPLE_TRIGGERS` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `QRTZ_SIMPROP_TRIGGERS`
--
DROP TABLE IF EXISTS `QRTZ_SIMPROP_TRIGGERS`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `QRTZ_SIMPROP_TRIGGERS` (
`sched_name` varchar(120) NOT NULL,
`trigger_name` varchar(200) NOT NULL,
`trigger_group` varchar(200) NOT NULL,
`str_prop_1` varchar(512) DEFAULT NULL,
`str_prop_2` varchar(512) DEFAULT NULL,
`str_prop_3` varchar(512) DEFAULT NULL,
`int_prop_1` int(11) DEFAULT NULL,
`int_prop_2` int(11) DEFAULT NULL,
`long_prop_1` bigint(20) DEFAULT NULL,
`long_prop_2` bigint(20) DEFAULT NULL,
`dec_prop_1` decimal(13,4) DEFAULT NULL,
`dec_prop_2` decimal(13,4) DEFAULT NULL,
`bool_prop_1` varchar(1) DEFAULT NULL,
`bool_prop_2` varchar(1) DEFAULT NULL,
PRIMARY KEY (`sched_name`,`trigger_name`,`trigger_group`),
CONSTRAINT `QRTZ_SIMPROP_TRIGGERS_ibfk_1` FOREIGN KEY (`sched_name`, `trigger_name`, `trigger_group`) REFERENCES `QRTZ_TRIGGERS` (`sched_name`, `trigger_name`, `trigger_group`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `QRTZ_SIMPROP_TRIGGERS`
--
LOCK TABLES `QRTZ_SIMPROP_TRIGGERS` WRITE;
/*!40000 ALTER TABLE `QRTZ_SIMPROP_TRIGGERS` DISABLE KEYS */;
/*!40000 ALTER TABLE `QRTZ_SIMPROP_TRIGGERS` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `QRTZ_TRIGGERS`
--
DROP TABLE IF EXISTS `QRTZ_TRIGGERS`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `QRTZ_TRIGGERS` (
`sched_name` varchar(120) NOT NULL,
`trigger_name` varchar(200) NOT NULL,
`trigger_group` varchar(200) NOT NULL,
`job_name` varchar(200) NOT NULL,
`job_group` varchar(200) NOT NULL,
`description` varchar(250) DEFAULT NULL,
`next_fire_time` bigint(13) DEFAULT NULL,
`prev_fire_time` bigint(13) DEFAULT NULL,
`priority` int(11) DEFAULT NULL,
`trigger_state` varchar(16) NOT NULL,
`trigger_type` varchar(8) NOT NULL,
`start_time` bigint(13) NOT NULL,
`end_time` bigint(13) DEFAULT NULL,
`calendar_name` varchar(200) DEFAULT NULL,
`misfire_instr` smallint(2) DEFAULT NULL,
`job_data` blob DEFAULT NULL,
PRIMARY KEY (`sched_name`,`trigger_name`,`trigger_group`),
KEY `sched_name` (`sched_name`,`job_name`,`job_group`),
CONSTRAINT `QRTZ_TRIGGERS_ibfk_1` FOREIGN KEY (`sched_name`, `job_name`, `job_group`) REFERENCES `QRTZ_JOB_DETAILS` (`sched_name`, `job_name`, `job_group`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `QRTZ_TRIGGERS`
--
LOCK TABLES `QRTZ_TRIGGERS` WRITE;
/*!40000 ALTER TABLE `QRTZ_TRIGGERS` DISABLE KEYS */;
/*!40000 ALTER TABLE `QRTZ_TRIGGERS` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Dumping events for database 'pscada_online'
--
--
-- Dumping routines for database 'pscada_online'
--
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-- Dump completed on 2020-12-18 12:14:05