diff --git a/bin/deploy.sh b/bin/deploy.sh index 97ff8361..42b80cb4 100755 --- a/bin/deploy.sh +++ b/bin/deploy.sh @@ -1,13 +1,14 @@ #!/bin/bash +# 远程机器上程序发布目录 user@ip:/dir +remote_dist=$1 +if [[ $remote_dist ]];then -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 + scp -r ./ruoyi-auth/build/libs/project-ruoyi-auth-*.jar $remote_dist/auth & + scp -r ./ruoyi-gateway/build/libs/project-ruoyi-gateway-*.jar $remote_dist/gateway & + scp -r ./ruoyi-modules/ruoyi-file/build/libs/project-ruoyi-file-*.jar $remote_dist/file & + scp -r ./ruoyi-modules/ruoyi-gen/build/libs/project-ruoyi-modules-gen-*.jar $remote_dist/gen & + scp -r ./ruoyi-modules/ruoyi-job/build/libs/project-ruoyi-modules-job-*.jar $remote_dist/job & + scp -r ./ruoyi-modules/ruoyi-system/build/libs/project-ruoyi-modules-system-*.jar $remote_dist/system & + scp -r ./ruoyi-visual/ruoyi-monitor/build/libs/project-ruoyi-visual-monitor-*.jar $remote_dist/monitor & fi diff --git a/bin/mvn-package.sh b/bin/mvn-package.sh new file mode 100755 index 00000000..426da60c --- /dev/null +++ b/bin/mvn-package.sh @@ -0,0 +1,2 @@ +#!/bin/bash +mvn clean package -Dmaven.test.skip=true diff --git a/bin/start-nginx.sh b/bin/start-nginx.sh index 44465364..57b4e816 100755 --- a/bin/start-nginx.sh +++ b/bin/start-nginx.sh @@ -1,4 +1,6 @@ #!/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 +#项目程序部署目录 +project=$1 +docker run --name=nginx-latest --restart=always -p 80:80 -v ${project}/nginx-conf/:/etc/nginx/ -v /var/logs/nginx:/var/logs/nginx -v ${project}/www:/opt/pscada-online/www -e TZ="Asia/Shanghai" -d nginx diff --git a/bin/start-redis.sh b/bin/start-redis.sh index 9b813429..4fb8f897 100755 --- a/bin/start-redis.sh +++ b/bin/start-redis.sh @@ -1,3 +1,6 @@ #! /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 + +#项目程序部署目录 +project=$1 +docker run --name=redis-6.0 --restart=always -itd -v ${project}/redis-conf/redis.conf:/etc/redis/redis.conf -p 6379:6379 redis diff --git a/build-config/build-all.gradle b/build-config/build-all.gradle index b93612e0..d5405d3c 100644 --- a/build-config/build-all.gradle +++ b/build-config/build-all.gradle @@ -6,9 +6,5 @@ allprojects { ext { buildProduct = System.getProperty("buildProduct") ?: false } -task abuildAllModule(type: Exec) { - workingDir("../") - executable "build-config/build_jar.sh" - args(project.name) -} + diff --git a/build-config/build-base.gradle b/build-config/build-base.gradle index 537c6a2b..71eacd2c 100644 --- a/build-config/build-base.gradle +++ b/build-config/build-base.gradle @@ -4,6 +4,7 @@ ext { lombokVersion = "1.18.16" junitVersion = "4.13.1" logbackVersion = "1.2.3" + repoUrl="http://192.168.8.200:8081/repository" } @@ -28,7 +29,7 @@ repositories { mavenLocal() mavenCentral() maven { url "https://maven.aliyun.com/repository/public/" } - maven { url "http://192.168.8.200:8081/repository/public/" } + maven { url "${repoUrl}/public/" } } configurations.all { resolutionStrategy.cacheChangingModulesFor 0, "seconds" @@ -52,25 +53,25 @@ dependencies { jar { // 排除掉模块调试的资源文件, 启动类. - excludes = [] + excludes = ['*.yml','logback.xml'] manifest { attributes "releaseVersion": version + "-" + getGitVersion() - attributes "vendor": "GRIDNT山东网聪信息科技有限" + attributes "vendor": "vendor" 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" + } +} diff --git a/build-config/build-boot-jar.gradle b/build-config/build-boot-jar.gradle index 8aa27817..0a4ad57a 100644 --- a/build-config/build-boot-jar.gradle +++ b/build-config/build-boot-jar.gradle @@ -32,7 +32,7 @@ bootJar { // 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 "vendor": "vendor" attributes "buildTime": new Date().format("yyyy-MM-dd HH:mm:ss", TimeZone.getTimeZone("GMT+08:00")) } launchScript() diff --git a/bin/build_java.sh b/build-config/build-java.sh similarity index 83% rename from bin/build_java.sh rename to build-config/build-java.sh index 3f2fd331..4c5a0498 100755 --- a/bin/build_java.sh +++ b/build-config/build-java.sh @@ -1,15 +1,15 @@ #!/bin/bash -## 编译每个 服务 +## 编译每个服务 for gfile in $(find . -name "build.gradle") do if [[ $1 = cl ]];then - gradle -b $gfile clean; + gradle -b $gfile clean & echo -e "\033[32m----------------- $gfile 模块 清理 成功 ---------------------- \033[0m" else - gradle -b $gfile clean build -x test -DbuildProduct=true -DreleaseVersion=$1 + gradle -b $gfile clean build -x test -DbuildProduct=true -DreleaseVersion=$1 echo -e "\033[32m----------------- $gfile 模块编译成功 ---------------------- \033[0m" fi diff --git a/build-config/build-publish.gradle b/build-config/build-publish.gradle index 35781a32..2266c393 100644 --- a/build-config/build-publish.gradle +++ b/build-config/build-publish.gradle @@ -19,8 +19,8 @@ publishing.publications { publishing.repositories { maven { - def releasesRepoUrl = "http://192.168.8.200:8081/repository/releases" - def snapshotsRepoUrl = "http://192.168.8.200:8081/repository/snapshots/" + def releasesRepoUrl = "${repoUrl}/releases" + def snapshotsRepoUrl = "${repoUrl}/snapshots/" url = version.endsWith("SNAPSHOT") ? snapshotsRepoUrl : releasesRepoUrl println "${group} ${archivesBaseName} publishing version is ${version}" credentials { diff --git a/bin/checkThirdPaty.sh b/build-config/checkThirdPaty.sh similarity index 87% rename from bin/checkThirdPaty.sh rename to build-config/checkThirdPaty.sh index 8c495001..e1804f20 100755 --- a/bin/checkThirdPaty.sh +++ b/build-config/checkThirdPaty.sh @@ -5,7 +5,7 @@ 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 +'|implementation " >> temp sort temp |uniq >> ${shortName}-third-jar.gradle rm -rf temp diff --git a/build-config/formart.sh b/build-config/formart.sh index 86df1d51..9bedbfa7 100755 --- a/build-config/formart.sh +++ b/build-config/formart.sh @@ -1,6 +1,6 @@ #!/bin/bash -## 格式化 jar 引用 +## 格式化 jar 引用，避免出错 find . -name "build.gradle" | xargs sed -r -i "s/'/\"/g" find . -name "build.gradle" | xargs sed -r -i 's/compile group: /compile /g'