From 7caf24207e3ba0ba028b056fbe7d362588179a33 Mon Sep 17 00:00:00 2001 From: wangshaoping Date: Wed, 12 Jun 2024 14:40:13 +0800 Subject: [PATCH] update --- .../templates/pgp/app/build.gradle | 6 ++-- .../templates/pgp/setup/build-version.gradle | 6 ++-- .../templates/pgp/setup/build.gradle.txt | 17 ++++++--- .../templates/pgp/setup/gradle.properties | 7 ++-- .../orm/service/impl/DaoServiceImpl.java | 36 +++++++++++-------- .../public/configure.js | 6 ++-- .../src/views/corporation/Corporation.vue | 3 +- .../src/views/department/Department.vue | 3 +- .../src/views/menu/Menu.vue | 5 +-- .../src/views/org/Org.vue | 3 +- 10 files changed, 56 insertions(+), 36 deletions(-) diff --git a/io.sc.platform.gradle/templates/pgp/app/build.gradle b/io.sc.platform.gradle/templates/pgp/app/build.gradle index 2a592956..583824a5 100644 --- a/io.sc.platform.gradle/templates/pgp/app/build.gradle +++ b/io.sc.platform.gradle/templates/pgp/app/build.gradle @@ -33,10 +33,10 @@ dependencies { // project(":io.sc.engine.st"), // project(":io.sc.engine.st.frontend"), // -// project(":erm"), -// project(":erm.frontend"), + project(":erm"), + project(":erm.frontend"), - project(":io.sc.standard"), +// project(":io.sc.standard"), ) } diff --git a/io.sc.platform.gradle/templates/pgp/setup/build-version.gradle b/io.sc.platform.gradle/templates/pgp/setup/build-version.gradle index 07d87a20..80626d04 100755 --- a/io.sc.platform.gradle/templates/pgp/setup/build-version.gradle +++ b/io.sc.platform.gradle/templates/pgp/setup/build-version.gradle @@ -4,13 +4,15 @@ ext['PlatformDependencyVersions'] =[ "commons-io:commons-io" : "${commons_io_version}", "org.ow2.asm:asm" : "${asm_version}", - "org.checkerframework:checker-qual" : "3.43.0", + "org.checkerframework:checker-qual" : "${checker_version}", + "com.google.guava:guava" : "${guava_version}", + "com.nimbusds:nimbus-jose-jwt" : "9.22", ]; /*********************************************************************** * 覆盖 springboot 默认包版本 **********************************************************************/ -ext['groovy.version'] ='3.0.19' +// ext['groovy.version'] ='3.0.17' // ext['activemq.version'] = // ext['antlr2.version'] = // ext['appengine-sdk.version'] = 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 0f5fa374..431c1d33 100644 --- a/io.sc.platform.gradle/templates/pgp/setup/build.gradle.txt +++ b/io.sc.platform.gradle/templates/pgp/setup/build.gradle.txt @@ -50,9 +50,9 @@ subprojects { //resolutionStrategy.cacheChangingModulesFor 0, 'seconds' //静态版本: 1.1.2 //排除不需要的外部依赖 - exclude group: "org.apache.logging.log4j", module: "log4j-api" - exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" - exclude group: "org.slf4j", module: "slf4j-jdk14" +// exclude group: "org.apache.logging.log4j", module: "log4j-api" +// exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j" +// exclude group: "org.slf4j", module: "slf4j-jdk14" exclude group: "org.slf4j", module: "slf4j-nop" resolutionStrategy.eachDependency { DependencyResolveDetails detail -> @@ -682,7 +682,16 @@ subprojects { processResources { if(isFrontendProject(file('.'))) { - exclude("**/${project.name}/*.*") + exclude("**/${project.name}/*.*"); + if(project.name!='io.sc.platform.mvc.frontend' && project.name!='io.sc.platform.security.frontend'){ +// exclude("**/${project.name}/javascript/codemirror.*"); +// exclude("**/${project.name}/javascript/echarts.*"); +// exclude("**/${project.name}/javascript/platform-core.*"); +// exclude("**/${project.name}/javascript/quasar.*"); +// exclude("**/${project.name}/javascript/vue.*"); +// exclude("**/${project.name}/fonts/*.*"); +// exclude("**/${project.name}/webjars/**/*.*"); + } } } } diff --git a/io.sc.platform.gradle/templates/pgp/setup/gradle.properties b/io.sc.platform.gradle/templates/pgp/setup/gradle.properties index df8ce84a..a6d84582 100644 --- a/io.sc.platform.gradle/templates/pgp/setup/gradle.properties +++ b/io.sc.platform.gradle/templates/pgp/setup/gradle.properties @@ -36,15 +36,16 @@ application_version=1.0.0 # platform ########################################################### platform_group=io.sc -platform_version=8.1.43 +platform_version=8.1.44 platform_plugin_version=8.1.13 -platform_core_frontend_version=8.1.217 +platform_core_frontend_version=8.1.229 ########################################################### # dependencies version ########################################################### asciidoctor_version=3.3.2 asm_version=9.7 +checker_version=3.43.0 commons_fileupload_version=1.4 commons_io_version=2.16.1 cxf_version=3.2.7 @@ -64,7 +65,7 @@ jxls_poi_version=1.0.15 jxls_version=2.4.6 mybatis_version=3.5.10 opencsv_version=5.7.1 -oshi_version=6.4.2 +oshi_version=6.6.1 p6spy_version=3.9.1 pinyin4j_version=2.5.1 poi_version=5.2.5 diff --git a/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/impl/DaoServiceImpl.java b/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/impl/DaoServiceImpl.java index 645d14b7..685d80aa 100644 --- a/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/impl/DaoServiceImpl.java +++ b/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/impl/DaoServiceImpl.java @@ -6,8 +6,6 @@ import io.sc.platform.orm.repository.DaoRepository; import io.sc.platform.orm.service.DaoService; import io.sc.platform.orm.service.support.*; import io.sc.platform.orm.service.support.criteria.Criteria; -import io.sc.platform.orm.service.support.criteria.impl.Equals; -import io.sc.platform.orm.service.support.criteria.impl.IContains; import io.sc.platform.security.util.SecurityUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; @@ -26,7 +24,6 @@ import javax.persistence.criteria.Predicate; import javax.persistence.metamodel.PluralAttribute; import javax.persistence.metamodel.SingularAttribute; import java.io.Serializable; -import java.lang.reflect.Modifier; import java.util.*; public abstract class DaoServiceImpl> implements DaoService{ @@ -415,7 +412,11 @@ public abstract class DaoServiceImpl specification =buildSpecification(queryParameter); specification =andCorporationSpecification(specification); - return query(specification,queryParameter.getJpaPageable(),queryParameter.getSort()); + if(queryParameter.getPageable()) { + return query(specification, queryParameter.getJpaPageable(), queryParameter.getSort()); + }else{ + return query(specification, null, queryParameter.getSort()); + } }else{ buildDefaultSortBy(queryParameter); Specification specification =andCorporationSpecification(null); @@ -428,7 +429,11 @@ public abstract class DaoServiceImpl