From 72f03944df3efed1d26d55639fa668f8c51236a1 Mon Sep 17 00:00:00 2001 From: wangshaoping Date: Fri, 20 Sep 2024 14:39:09 +0800 Subject: [PATCH] update --- erm.frontend/package.json | 2 +- gradle.properties | 4 +- io.sc.engine.mv.frontend/package.json | 2 +- io.sc.engine.rule.frontend/package.json | 2 +- io.sc.engine.st.frontend/package.json | 2 +- .../package.json | 2 +- .../templates/pgp/app/build-common.gradle | 2 +- .../templates/pgp/app/build.gradle | 2 +- .../templates/pgp/setup/build.gradle.txt | 89 ++++++++++++------- .../templates/pgp/setup/gradle.properties | 6 +- io.sc.platform.lcdp.frontend/package.json | 2 +- io.sc.platform.mvc.frontend/package.json | 2 +- .../package.json | 2 +- io.sc.platform.system.frontend/package.json | 2 +- io.sc.standard.frontend/package.json | 2 +- 15 files changed, 72 insertions(+), 51 deletions(-) diff --git a/erm.frontend/package.json b/erm.frontend/package.json index 69f7798b..72512da4 100644 --- a/erm.frontend/package.json +++ b/erm.frontend/package.json @@ -1,6 +1,6 @@ { "name": "erm.frontend", - "version": "8.1.48", + "version": "8.1.49", "description": "", "private": false, "keywords": [], diff --git a/gradle.properties b/gradle.properties index ff98deb6..a301c5ce 100644 --- a/gradle.properties +++ b/gradle.properties @@ -36,8 +36,8 @@ application_version=1.0.0 # platform ########################################################### platform_group=io.sc -platform_version=8.1.48 -platform_plugin_version=8.1.48 +platform_version=8.1.49 +platform_plugin_version=8.1.49 platform_core_frontend_version=8.1.355 ########################################################### diff --git a/io.sc.engine.mv.frontend/package.json b/io.sc.engine.mv.frontend/package.json index f652e158..b640220f 100644 --- a/io.sc.engine.mv.frontend/package.json +++ b/io.sc.engine.mv.frontend/package.json @@ -1,6 +1,6 @@ { "name": "io.sc.engine.mv.frontend", - "version": "8.1.48", + "version": "8.1.49", "description": "", "private": false, "keywords": [], diff --git a/io.sc.engine.rule.frontend/package.json b/io.sc.engine.rule.frontend/package.json index e541706d..5072a455 100644 --- a/io.sc.engine.rule.frontend/package.json +++ b/io.sc.engine.rule.frontend/package.json @@ -1,6 +1,6 @@ { "name": "io.sc.engine.rule.frontend", - "version": "8.1.48", + "version": "8.1.49", "description": "", "private": false, "keywords": [], diff --git a/io.sc.engine.st.frontend/package.json b/io.sc.engine.st.frontend/package.json index db325584..8ba3a4f3 100644 --- a/io.sc.engine.st.frontend/package.json +++ b/io.sc.engine.st.frontend/package.json @@ -1,6 +1,6 @@ { "name": "io.sc.engine.st.frontend", - "version": "8.1.48", + "version": "8.1.49", "description": "", "private": false, "keywords": [], diff --git a/io.sc.platform.developer.frontend/package.json b/io.sc.platform.developer.frontend/package.json index 7d894636..8454b413 100644 --- a/io.sc.platform.developer.frontend/package.json +++ b/io.sc.platform.developer.frontend/package.json @@ -1,6 +1,6 @@ { "name": "io.sc.platform.developer.frontend", - "version": "8.1.48", + "version": "8.1.49", "description": "", "private": false, "keywords": [], diff --git a/io.sc.platform.gradle/templates/pgp/app/build-common.gradle b/io.sc.platform.gradle/templates/pgp/app/build-common.gradle index b1acd61d..f6cfe3d5 100644 --- a/io.sc.platform.gradle/templates/pgp/app/build-common.gradle +++ b/io.sc.platform.gradle/templates/pgp/app/build-common.gradle @@ -6,7 +6,7 @@ * 2. gradle bootwar -Dtarget=undertow # undertow, target=undertow * 3. gradle bootwar -Dtarget=jetty # jetty, target=jetty */ -def target =System.getProperty("target") ?: "tomcat"; +def target =System.getProperty("target") ?: "undertow"; System.setProperty('target',target); // 根据 targetRuntime 变量的值执行实际的 build.gradle diff --git a/io.sc.platform.gradle/templates/pgp/app/build.gradle b/io.sc.platform.gradle/templates/pgp/app/build.gradle index d7111a75..7b1349a4 100644 --- a/io.sc.platform.gradle/templates/pgp/app/build.gradle +++ b/io.sc.platform.gradle/templates/pgp/app/build.gradle @@ -62,7 +62,7 @@ processResources { bootWar{ mainClass = "${project.name}.Application" - //launchScript() + launchScript() manifest { attributes 'Implementation-Version': archiveVersion, 'Implementation-Title': project.name diff --git a/io.sc.platform.gradle/templates/pgp/setup/build.gradle.txt b/io.sc.platform.gradle/templates/pgp/setup/build.gradle.txt index 1d88744c..db48ceb6 100644 --- a/io.sc.platform.gradle/templates/pgp/setup/build.gradle.txt +++ b/io.sc.platform.gradle/templates/pgp/setup/build.gradle.txt @@ -55,11 +55,14 @@ subprojects { // exclude group: "org.slf4j", module: "slf4j-jdk14" exclude group: "org.slf4j", module: "slf4j-nop" - resolutionStrategy.eachDependency { DependencyResolveDetails detail -> - def requested =detail.requested; - def groupAndName =requested.group + ":" + requested.name; - if(PlatformDependencyVersions[groupAndName]!=null){ - detail.useVersion(PlatformDependencyVersions[groupAndName]); + if(PlatformDependencyVersions!=null && PlatformDependencyVersions.size()>0) { + resolutionStrategy.eachDependency { DependencyResolveDetails detail -> + def requested = detail.requested; + def groupAndName = requested.group + ":" + requested.name; + String version = PlatformDependencyVersions[groupAndName]; + if (version != null) { + detail.useVersion(version); + } } } } @@ -86,7 +89,7 @@ subprojects { if(repo instanceof MavenArtifactRepository){ def url = repo.url.toString() if ( - url.startsWith('https://repo1.maven.org/maven2') + url.startsWith('https://repo1.maven.org/maven2') || url.startsWith('https://jcenter.bintray.com/') || url.startsWith('https://maven.aliyun.com') ) { @@ -117,7 +120,7 @@ subprojects { *----------------------------------------------------------------*/ group ="${platform_group}" version ="${platform_version}" - + if(file('package.json').exists()){ mkdir 'java-src/main/java'; mkdir 'java-src/main/resources'; @@ -694,6 +697,24 @@ subprojects { } } } + + // 对每个前端项目在 idea 中排除 node_modules 目录, 避免大量耗时的 idea 索引 + idea { + module { + excludeDirs += file('node_modules') + excludeDirs += file('dist') + } + } + + clean { + doFirst{ + if(isFrontendProject(file('.'))) { + delete 'dist' + delete 'node_modules' + delete 'pnpm-lock.yaml' + } + } + } } /*********************************************************************** @@ -703,7 +724,7 @@ subprojects { * idea 配置 *----------------------------------------------------------------*/ tasks.ideaProject.enabled=true //在根工程中执行 ideaProject 任务,用于生成 ipr 文件 -tasks.ideaModule.enabled=false //在根工程中不执行 ideaModule 任务 +tasks.ideaModule.enabled=false //在根工程中不执行 ideaModule 任务 tasks.ideaWorkspace.enabled=true //在根工程中执行 ideaWorkspace 任务,用于修改 iws 文件 tasks.ideaProject.doFirst { @@ -734,7 +755,7 @@ idea { } } project { - vcs = 'Git' + vcs = 'Git' ipr { // 自动化配置生成的 ipr 文件内容,减少手工操作 // 1. 移除根项目模块 @@ -759,22 +780,22 @@ idea { withXml { // 1. 移除根项目模块 def node = it.asNode() - def projectModuleManagerNode =node.find{it.@name=='ProjectModuleManager'} - def rootImlNode =projectModuleManagerNode.modules.module.find{it.@fileurl=='file://$PROJECT_DIR$/' + project.name + '.iml'} - def rootImlParentNode =rootImlNode.parent() + def projectModuleManagerNode = node.find { it.@name == 'ProjectModuleManager' } + def rootImlNode = projectModuleManagerNode.modules.module.find { it.@fileurl == 'file://$PROJECT_DIR$/' + project.name + '.iml' } + def rootImlParentNode = rootImlNode.parent() rootImlParentNode.remove(rootImlNode) // 2. 替换 Encoding - def encodingNode =node.find{it.@name=='Encoding'} - encodingNode.@native2AsciiForPropertiesFiles="true" + def encodingNode = node.find { it.@name == 'Encoding' } + encodingNode.@native2AsciiForPropertiesFiles = "true" // 3. 使 idea 编译器支持注解(enable annotation processing) - def compilerConfigurationNode =node.find{it.@name=='CompilerConfiguration'} - def annotationProcessingNode =compilerConfigurationNode.annotationProcessing[0] - def annotationProcessingParentNode =annotationProcessingNode.parent() + def compilerConfigurationNode = node.find { it.@name == 'CompilerConfiguration' } + def annotationProcessingNode = compilerConfigurationNode.annotationProcessing[0] + def annotationProcessingParentNode = annotationProcessingNode.parent() annotationProcessingParentNode.remove(annotationProcessingNode) - annotationProcessingNode =annotationProcessingParentNode.appendNode("annotationProcessing") - annotationProcessingNode.appendNode("profile",[default:true,enabled:true]) + annotationProcessingNode = annotationProcessingParentNode.appendNode("annotationProcessing") + annotationProcessingNode.appendNode("profile", [default: true, enabled: true]) // 4. 激活 SaveActions 插件, 修改文件后自动编译并发布, 在 .ipr 文件中生成以下 xml 片段 // @@ -788,39 +809,39 @@ idea { // // - def saveActionSettingsNode =node.find{it.@name=='SaveActionSettings'} - if(saveActionSettingsNode==null){ - saveActionSettingsNode =node.appendNode("component",[name:"SaveActionSettings"]) + def saveActionSettingsNode = node.find { it.@name == 'SaveActionSettings' } + if (saveActionSettingsNode == null) { + saveActionSettingsNode = node.appendNode("component", [name: "SaveActionSettings"]) } //