diff --git a/build-product.gradle b/RuoYi-Cloud-third-jar.gradle similarity index 81% rename from build-product.gradle rename to RuoYi-Cloud-third-jar.gradle index 253cbdec..ee850381 100644 --- a/build-product.gradle +++ b/RuoYi-Cloud-third-jar.gradle @@ -11,12 +11,18 @@ dependencies { implementation "com.github.tobato:fastdfs-client:1.27.2" implementation "commons-fileupload:commons-fileupload:1.4" implementation "commons-io:commons-io:2.8.0" + implementation "com.ruoyi:ruoyi-api-system:${devVersion}" + implementation "com.ruoyi:ruoyi-common-core:${devVersion}" + implementation "com.ruoyi:ruoyi-common-datascope:${devVersion}" + implementation "com.ruoyi:ruoyi-common-log:${devVersion}" + implementation "com.ruoyi:ruoyi-common-redis:${devVersion}" + implementation "com.ruoyi:ruoyi-common-security:${devVersion}" + implementation "com.ruoyi:ruoyi-common-swagger:${devVersion}" implementation "de.codecentric:spring-boot-admin-starter-server:2.3.0" implementation "io.springfox:springfox-swagger2:2.9.2" implementation "io.springfox:springfox-swagger-ui:2.9.2" implementation "io.swagger:swagger-annotations:1.5.24" implementation "javax.servlet:javax.servlet-api:4.0.1" - implementation "mysql:mysql-connector-java:8.0.21" 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" @@ -26,18 +32,17 @@ dependencies { implementation "org.mybatis.spring.boot:mybatis-spring-boot-starter:2.1.4" implementation "org.quartz-scheduler:quartz:2.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:spring-context-support:5.3.2" + implementation project(":ruoyi-common-core") + implementation project(":ruoyi-common-redis") + implementation project(":ruoyi-common-security") } diff --git a/bin/start-all.sh b/bin/start-all.sh new file mode 100644 index 00000000..56b24bb3 --- /dev/null +++ b/bin/start-all.sh @@ -0,0 +1,8 @@ +#! /bin/bash +for dir in $(ls .) +do + if [[ -f $dir/project-*.jar ]];then + ./$dir/project-*.jar & + fi + +done diff --git a/bin/start-nginx.sh b/bin/start-nginx.sh new file mode 100755 index 00000000..44465364 --- /dev/null +++ b/bin/start-nginx.sh @@ -0,0 +1,4 @@ +#!/bin/bash +docker rm -f nginx-latest +docker run --name=nginx-latest --restart=always -p 80:80 -v /opt/pscada-online/nginx-conf/:/etc/nginx/ -v /var/logs/nginx:/var/logs/nginx -v /opt/pscada-online/www:/opt/pscada-online/www -e TZ="Asia/Shanghai" -d nginx + diff --git a/bin/start-redis.sh b/bin/start-redis.sh new file mode 100755 index 00000000..9b813429 --- /dev/null +++ b/bin/start-redis.sh @@ -0,0 +1,3 @@ +#! /bin/bash +docker rm -f redis-6.0 +docker run --name=redis-6.0 --restart=always -itd -v /opt/pscada-online/redis-conf/redis.conf:/etc/redis/redis.conf -p 6379:6379 redis diff --git a/build_java.sh b/build_java.sh index d8d0956b..7a6d0876 100755 --- a/build_java.sh +++ b/build_java.sh @@ -9,6 +9,4 @@ do echo -e "\033[32m----------------- $gfile 模块编译成功 ---------------------- \033[0m" done - - - + diff --git a/checkThirdPaty.sh b/checkThirdPaty.sh index 4728f191..8c495001 100755 --- a/checkThirdPaty.sh +++ b/checkThirdPaty.sh @@ -1,16 +1,14 @@ #!/bin/bash currentDir=`pwd` shortName=${currentDir##*/} -rm -rf temp build-product-${shortName}.gradle -echo "dependencies { ">> build-product-${shortName}.gradle +rm -rf temp ${shortName}-third-jar.gradle +echo "dependencies { ">> ${shortName}-third-jar.gradle -find . -name "build.gradle" | xargs cat |grep -E "compile group|compile '|implementation " | egrep -v 'gridnt' >> temp -sort temp |uniq >> build-product-${shortName}.gradle +find . -name "build.gradle" | xargs cat |grep -E "compile group|compile +'|implementation " | egrep -v 'gridnt' >> temp +sort temp |uniq >> ${shortName}-third-jar.gradle rm -rf temp -echo "} ">> build-product-${shortName}.gradle +echo "} ">> ${shortName}-third-jar.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 + diff --git a/deploy.sh b/deploy.sh new file mode 100755 index 00000000..97ff8361 --- /dev/null +++ b/deploy.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +if [[ $1 ]];then + + scp -r ./ruoyi-auth/build/libs/project-ruoyi-auth-dev-9-SNAPSHOT.jar $1/auth + scp -r ./ruoyi-gateway/build/libs/project-ruoyi-gateway-dev-9-SNAPSHOT.jar $1/gateway + scp -r ./ruoyi-modules/ruoyi-file/build/libs/project-ruoyi-file-dev-9-SNAPSHOT.jar $1/file + scp -r ./ruoyi-modules/ruoyi-gen/build/libs/project-ruoyi-modules-gen-dev-9-SNAPSHOT.jar $1/gen + scp -r ./ruoyi-modules/ruoyi-job/build/libs/project-ruoyi-modules-job-dev-9-SNAPSHOT.jar $1/job + scp -r ./ruoyi-modules/ruoyi-system/build/libs/project-ruoyi-modules-system-dev-9-SNAPSHOT.jar $1/system + scp -r ./ruoyi-visual/ruoyi-monitor/build/libs/project-ruoyi-visual-monitor-dev-9-SNAPSHOT.jar $1/monitor + +fi diff --git a/ruoyi-api/ruoyi-api-system/build.gradle b/ruoyi-api/ruoyi-api-system/build.gradle index 4042b1b9..ee70df00 100644 --- a/ruoyi-api/ruoyi-api-system/build.gradle +++ b/ruoyi-api/ruoyi-api-system/build.gradle @@ -21,7 +21,6 @@ buildscript { ext { devVersion = "dev-9-SNAPSHOT" - devVersion = "2.3.0" } @@ -30,9 +29,6 @@ apply from: "../../build-config/build-all.gradle" apply from: "../../build-config/build-base.gradle" apply from: "../../build-config/build-publish.gradle" -group = "com.ruoyi" -archivesBaseName = "${project.name}" - dependencies { implementation "com.ruoyi:ruoyi-common-core:${devVersion}" diff --git a/ruoyi-auth/build.gradle b/ruoyi-auth/build.gradle index ebac2dcc..10b28617 100644 --- a/ruoyi-auth/build.gradle +++ b/ruoyi-auth/build.gradle @@ -38,7 +38,6 @@ dependencies { implementation "org.springframework.boot:spring-boot-starter-actuator:${springBoot}" implementation "org.mariadb.jdbc:mariadb-java-client:2.7.1" - } diff --git a/ruoyi-common/ruoyi-common-security/build.gradle b/ruoyi-common/ruoyi-common-security/build.gradle index 2d8a5fee..79a4da26 100644 --- a/ruoyi-common/ruoyi-common-security/build.gradle +++ b/ruoyi-common/ruoyi-common-security/build.gradle @@ -9,7 +9,6 @@ dependencies { 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-starter-security:${springBoot}" implementation "org.springframework.boot:spring-boot-starter-validation:${springBoot}" implementation "org.springframework.cloud:spring-cloud-starter-openfeign:${springCloud}" diff --git a/ruoyi-gateway/build.gradle b/ruoyi-gateway/build.gradle index c95949f2..ae8044ac 100644 --- a/ruoyi-gateway/build.gradle +++ b/ruoyi-gateway/build.gradle @@ -4,8 +4,9 @@ buildscript { } ext { springBoot = "2.3.4.RELEASE" +// springBoot = "2.4.0" alibabaCloud = "2.2.3.RELEASE" - springCloud = "2.2.5.RELEASE" + springCloud = "2.2.6.RELEASE" } dependencies { classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBoot}") diff --git a/ruoyi-modules/ruoyi-job/build.gradle b/ruoyi-modules/ruoyi-job/build.gradle index 646a85e4..ad57b96e 100644 --- a/ruoyi-modules/ruoyi-job/build.gradle +++ b/ruoyi-modules/ruoyi-job/build.gradle @@ -17,7 +17,7 @@ ext { devVersion = "dev-9-SNAPSHOT" } -description = "ruoyi-modules-file" +description = "ruoyi-modules-job" apply from: "../../build-config/build-all.gradle" apply from: "../../build-config/build-base.gradle" apply from: "../../build-config/build-boot-jar.gradle" @@ -46,11 +46,6 @@ dependencies { 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-starter-alibaba-sentinel:${alibabaCloud}" - -// implementation "org.springframework.boot:spring-boot-starter-security:${springBoot}" -// implementation "org.springframework.boot:spring-boot-starter-validation:${springBoot}" - - } static def getGitVersion() {