wangshaoping
/
platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

update

main
wangshaoping 9 months ago
parent
c1d6f52ff0
commit
7caf24207e
10 changed files with 56 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      io.sc.platform.gradle/templates/pgp/app/build.gradle
  2. 6
      io.sc.platform.gradle/templates/pgp/setup/build-version.gradle
  3. 17
      io.sc.platform.gradle/templates/pgp/setup/build.gradle.txt
  4. 7
      io.sc.platform.gradle/templates/pgp/setup/gradle.properties
  5. 14
      io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/impl/DaoServiceImpl.java
  6. 6
      io.sc.platform.system.frontend/public/configure.js
  7. 3
      io.sc.platform.system.frontend/src/views/corporation/Corporation.vue
  8. 3
      io.sc.platform.system.frontend/src/views/department/Department.vue
  9. 5
      io.sc.platform.system.frontend/src/views/menu/Menu.vue
  10. 3
      io.sc.platform.system.frontend/src/views/org/Org.vue

6
io.sc.platform.gradle/templates/pgp/app/build.gradle
View File

@ -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"),
)
}

6
io.sc.platform.gradle/templates/pgp/setup/build-version.gradle
View File

@ -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'] =

17
io.sc.platform.gradle/templates/pgp/setup/build.gradle.txt
View File

@ -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/**/*.*");
}
}
}
}

7
io.sc.platform.gradle/templates/pgp/setup/gradle.properties
View File

@ -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

14
io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/impl/DaoServiceImpl.java
View File

@ -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<E,ID extends Serializable,R extends DaoRepository<E,ID>> implements DaoService<E,ID,R>{
@ -415,7 +412,11 @@ public abstract class DaoServiceImpl<E,ID extends Serializable,R extends DaoRepo
buildDefaultSortBy(queryParameter);
Specification<E> specification =buildSpecification(queryParameter);
specification =andCorporationSpecification(specification);
if(queryParameter.getPageable()) {
return query(specification, queryParameter.getJpaPageable(), queryParameter.getSort());
}else{
return query(specification, null, queryParameter.getSort());
}
}else{
buildDefaultSortBy(queryParameter);
Specification<E> specification =andCorporationSpecification(null);
@ -428,7 +429,11 @@ public abstract class DaoServiceImpl<E,ID extends Serializable,R extends DaoRepo
if(queryParameter!=null) {
buildDefaultSortBy(queryParameter);
specification =andCorporationSpecification(specification);
if(queryParameter.getPageable()) {
return query(specification, queryParameter.getJpaPageable(), queryParameter.getSort());
}else{
return query(specification, null, queryParameter.getSort());
}
}else{
specification =andCorporationSpecification(specification);
return query(specification,null,null);
@ -443,7 +448,7 @@ public abstract class DaoServiceImpl<E,ID extends Serializable,R extends DaoRepo
}else{
return repository.findAll(pageable);
}
}
}else{
if(sort!=null){
if(specification!=null) {
return QueryResult.page(repository.findAll(specification, sort));
@ -458,6 +463,7 @@ public abstract class DaoServiceImpl<E,ID extends Serializable,R extends DaoRepo
}
}
}
}
/**
* 添加法人条件

6
io.sc.platform.system.frontend/public/configure.js
View File

@ -23,10 +23,8 @@ window.APP.configure ={
crossdomain: true,
basicAuth: {
enable: true,
username: 'admin_jn_cq',
password: 'password',
// username: 'admin',
// password: 'admin',
username: 'admin',
password: 'admin',
}
}
}

3
io.sc.platform.system.frontend/src/views/corporation/Corporation.vue
View File

@ -21,11 +21,12 @@
:toolbar-actions="[
'refresh',
'separator',
'expand',
[
{ extend: 'add', click: undefined },
{ extend: 'addTop', label: $t('system.corporation.grid.toolbar.addTop') },
{ extend: 'addChild', label: $t('system.corporation.grid.toolbar.addChild') },
],
'expand',
'edit',
'remove',
'separator',

3
io.sc.platform.system.frontend/src/views/department/Department.vue
View File

@ -21,11 +21,12 @@
:toolbar-actions="[
'refresh',
'separator',
'expand',
[
{ extend: 'add', click: undefined },
{ extend: 'addTop', label: $t('system.department.grid.toolbar.addTop') },
{ extend: 'addChild', label: $t('system.department.grid.toolbar.addChild') },
],
'expand',
'edit',
'remove',
'separator',

5
io.sc.platform.system.frontend/src/views/menu/Menu.vue
View File

@ -20,13 +20,15 @@
}
}
"
:data-url="Environment.apiContextPath('/api/system/menu')"
:data-url="Environment.apiContextPath('/api/system/menu?pageable=false')"
:pageable="false"
:toolbar-configure="{ noIcon: false }"
:toolbar-actions="[
'refresh',
'separator',
'expand',
[
{ extend: 'add', click: undefined },
{
extend: 'addTop',
label: $t('system.menu.grid.toolbar.addTop'),
@ -36,7 +38,6 @@
label: $t('system.menu.grid.toolbar.addChild'),
},
],
'expand',
'edit',
'remove',
'separator',

3
io.sc.platform.system.frontend/src/views/org/Org.vue
View File

@ -20,11 +20,12 @@
:toolbar-actions="[
'refresh',
'separator',
'expand',
[
{ extend: 'add', click: undefined },
{ extend: 'addTop', label: $t('system.org.grid.toolbar.addTop') },
{ extend: 'addChild', label: $t('system.org.grid.toolbar.addChild') },
],
'expand',
'edit',
'remove',
'separator',

Write Preview
Loading…
Cancel
Save