aidar/SHiNE-server
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI: исправить автообновление и хронологию диалогов; обновить деплой-цели

Browse Source
This commit is contained in:
AidarKC
2026-04-23 18:04:14 +03:00
parent f213e9aa43
commit 93aef6e18b
7 changed files with 457 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle
+36 -18
View File
@@ -174,10 +174,10 @@ tasks.named('build') {
tasks.register('deployServer', JavaExec) {
group = "!!deployment"
description = "Build → upload to server → clean remote data → restart service → run IT against server"
description = "Build → upload to server → restart service (без удаления БД, без IT тестов)"
classpath = sourceSets.test.runtimeClasspath
mainClass = "test.it.IT_DeployRestartAndRunRemoteMain"
mainClass = "test.it.IT_DeployRestartNoCleanNoTestsMain"
// можно переопределить при запуске:
// ./gradlew deployServer -Dit.remoteHost=... -Dit.wsUri=...
@@ -185,13 +185,30 @@ tasks.register('deployServer', JavaExec) {
systemProperty "it.remoteHost", System.getProperty("it.remoteHost", "194.87.0.247")
systemProperty "it.remoteUser", System.getProperty("it.remoteUser", "user")
systemProperty "it.remoteDir", System.getProperty("it.remoteDir", "/home/user/docker/shine-server")
systemProperty "it.remoteDataDir", System.getProperty("it.remoteDataDir", "/home/user/docker/shine-server/data")
systemProperty "it.service", System.getProperty("it.service", "shine-server")
systemProperty "it.localJar", System.getProperty("it.localJar", "build/libs/shine-server.jar")
systemProperty "it.wsUri", System.getProperty("it.wsUri", "wss://shineup.me/ws")
systemProperty "it.login", System.getProperty("it.login", "anya24")
dependsOn testClasses
}
tasks.register('deployServerWithBackupCleanAndTests', JavaExec) {
group = "!!deployment"
description = "DANGER: deploy + backup data + clean data + restart + run IT tests (с обязательным подтверждением)"
classpath = sourceSets.test.runtimeClasspath
mainClass = "test.it.IT_DeployBackupCleanAndRunRemoteMain"
dependsOn shadowJar
systemProperty "it.remoteHost", System.getProperty("it.remoteHost", "194.87.0.247")
systemProperty "it.remoteUser", System.getProperty("it.remoteUser", "user")
systemProperty "it.remoteDir", System.getProperty("it.remoteDir", "/home/user/docker/shine-server")
systemProperty "it.remoteDataDir", System.getProperty("it.remoteDataDir", "/home/user/docker/shine-server/data")
systemProperty "it.remoteBackupDir", System.getProperty("it.remoteBackupDir", "/home/user/docker/shine-server/backup")
systemProperty "it.service", System.getProperty("it.service", "shine-server")
systemProperty "it.localJar", System.getProperty("it.localJar", "build/libs/shine-server.jar")
systemProperty "it.wsUri", System.getProperty("it.wsUri", "wss://shineup.me/ws")
standardInput = System.in
dependsOn testClasses
}
@@ -214,21 +231,22 @@ tasks.register('deployServerNoCleanNoTests', JavaExec) {
dependsOn testClasses
}
tasks.register('deployWEB', Exec) {
group = "!!deployment"
description = "Deploy WEB via deploy_shine-PWA.sh"
workingDir = rootDir
commandLine 'bash', file('deploy_shine-PWA.sh').absolutePath
def registerWebDeployTask = { String taskName, String target, String descriptionText ->
tasks.register(taskName, Exec) {
group = "!!deployment"
description = descriptionText
workingDir = rootDir
commandLine 'bash', file('deploy_shine-PWA.sh').absolutePath, target
}
}
tasks.register('deployAll') {
group = "!!deployment"
description = "Deploy server and WEB"
dependsOn tasks.named('deployServer')
dependsOn tasks.named('deployWEB')
}
registerWebDeployTask('deployWEB_Production', 'prod', 'Deploy WEB (production: shineup.me)')
registerWebDeployTask('deployWEB_ui_1', 'ui_1', 'Deploy WEB (ui-1.shineup.me)')
registerWebDeployTask('deployWEB_ui_2', 'ui_2', 'Deploy WEB (ui-2.shineup.me)')
registerWebDeployTask('deployWEB_ui_3', 'ui_3', 'Deploy WEB (ui-3.shineup.me)')
registerWebDeployTask('deployWEB_DrygMira', 'ui_drygmira', 'Deploy WEB (ui-drygmira.shineup.me)')
registerWebDeployTask('deployWEB_Milana', 'ui_milana', 'Deploy WEB (ui-milana.shineup.me)')
registerWebDeployTask('deployWEB_Aidar', 'ui_aidar', 'Deploy WEB (ui-aidar.shineup.me)')
tasks.register('startLocal', Exec) {
group = "!!run"