JeecgBoot 2.4 微服务正式版本发布,基于SpringBoot的低代码平台
This commit is contained in:
parent
b62bacd785
commit
0c3726a381
|
@ -14,6 +14,7 @@ import JImageUpload from './JImageUpload.vue'
|
||||||
import JTreeDict from './JTreeDict.vue'
|
import JTreeDict from './JTreeDict.vue'
|
||||||
import JCheckbox from './JCheckbox.vue'
|
import JCheckbox from './JCheckbox.vue'
|
||||||
import JCron from './JCron.vue'
|
import JCron from './JCron.vue'
|
||||||
|
import JSelectMultiple from './JSelectMultiple.vue'
|
||||||
import JPopupOnlReport from './modal/JPopupOnlReport.vue'
|
import JPopupOnlReport from './modal/JPopupOnlReport.vue'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
|
@ -35,5 +36,6 @@ export default {
|
||||||
Vue.component('JCheckbox', JCheckbox)
|
Vue.component('JCheckbox', JCheckbox)
|
||||||
Vue.component('JCron', JCron)
|
Vue.component('JCron', JCron)
|
||||||
Vue.component('JPopupOnlReport', JPopupOnlReport)
|
Vue.component('JPopupOnlReport', JPopupOnlReport)
|
||||||
|
Vue.component('JSelectMultiple', JSelectMultiple)
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -126,6 +126,8 @@ function generateChildRouters (data) {
|
||||||
componentPath = onlineCommons.OnlCgformTreeList
|
componentPath = onlineCommons.OnlCgformTreeList
|
||||||
}else if(item.component=="modules/online/cgform/auto/erp/OnlCgformErpList"){
|
}else if(item.component=="modules/online/cgform/auto/erp/OnlCgformErpList"){
|
||||||
componentPath = onlineCommons.OnlCgformErpList
|
componentPath = onlineCommons.OnlCgformErpList
|
||||||
|
}else if(item.component=="modules/online/cgform/auto/tab/OnlCgformTabList"){
|
||||||
|
componentPath = onlineCommons.OnlCgformTabList
|
||||||
}else if(item.component=="modules/online/cgform/auto/innerTable/OnlCgformInnerTableList"){
|
}else if(item.component=="modules/online/cgform/auto/innerTable/OnlCgformInnerTableList"){
|
||||||
componentPath = onlineCommons.OnlCgformInnerTableList
|
componentPath = onlineCommons.OnlCgformInnerTableList
|
||||||
}else if(item.component=="modules/online/cgreport/OnlCgreportHeadList"){
|
}else if(item.component=="modules/online/cgreport/OnlCgreportHeadList"){
|
||||||
|
|
|
@ -127,11 +127,6 @@
|
||||||
loading: false
|
loading: false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
watch: {
|
|
||||||
'router.routerId'(val) {
|
|
||||||
this.router.uri = 'lb://' + val
|
|
||||||
}
|
|
||||||
},
|
|
||||||
methods: {
|
methods: {
|
||||||
getRouter() {
|
getRouter() {
|
||||||
return {
|
return {
|
||||||
|
|
|
@ -1642,7 +1642,7 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
|
||||||
"@types/color-name" "^1.1.1"
|
"@types/color-name" "^1.1.1"
|
||||||
color-convert "^2.0.1"
|
color-convert "^2.0.1"
|
||||||
|
|
||||||
ant-design-vue@^1.6.3:
|
ant-design-vue@^1.7.2:
|
||||||
version "1.7.2"
|
version "1.7.2"
|
||||||
resolved "https://registry.npmjs.org/ant-design-vue/-/ant-design-vue-1.7.2.tgz#aac7ff802205711631c8698e2a0c7b4e61dfd73e"
|
resolved "https://registry.npmjs.org/ant-design-vue/-/ant-design-vue-1.7.2.tgz#aac7ff802205711631c8698e2a0c7b4e61dfd73e"
|
||||||
integrity sha512-iVskTSG62OSiptyGQkvyhoeLlLMiqKtAOTcWZ7MmsMrj38h0TCpGtqSYS4/fwq4yYgyzloYSteBo8U8TrV99RA==
|
integrity sha512-iVskTSG62OSiptyGQkvyhoeLlLMiqKtAOTcWZ7MmsMrj38h0TCpGtqSYS4/fwq4yYgyzloYSteBo8U8TrV99RA==
|
||||||
|
|
|
@ -19,7 +19,6 @@ import java.net.UnknownHostException;
|
||||||
|
|
||||||
@Slf4j
|
@Slf4j
|
||||||
@SpringBootApplication
|
@SpringBootApplication
|
||||||
//@EnableAutoConfiguration(exclude={org.activiti.spring.boot.SecurityAutoConfiguration.class})
|
|
||||||
public class JeecgSystemApplication extends SpringBootServletInitializer {
|
public class JeecgSystemApplication extends SpringBootServletInitializer {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -12,7 +12,9 @@
|
||||||
"_genkey_5": "/desform/**",
|
"_genkey_5": "/desform/**",
|
||||||
"_genkey_6": "/online/**",
|
"_genkey_6": "/online/**",
|
||||||
"_genkey_8": "/act/**",
|
"_genkey_8": "/act/**",
|
||||||
"_genkey_9": "/plug-in/**"
|
"_genkey_9": "/plug-in/**",
|
||||||
|
"_genkey_10": "/generic/**",
|
||||||
|
"_genkey_11": "/druid/**"
|
||||||
}
|
}
|
||||||
}],
|
}],
|
||||||
"filters": [],
|
"filters": [],
|
||||||
|
@ -38,7 +40,8 @@
|
||||||
"name": "Path",
|
"name": "Path",
|
||||||
"args": {
|
"args": {
|
||||||
"_genkey_0": "/websocket/**",
|
"_genkey_0": "/websocket/**",
|
||||||
"_genkey_1": "/eoaSocket/**"
|
"_genkey_1": "/eoaSocket/**",
|
||||||
|
"_genkey_2": "/newsWebsocket/**"
|
||||||
}
|
}
|
||||||
}],
|
}],
|
||||||
"filters": [],
|
"filters": [],
|
||||||
|
|
|
@ -24,11 +24,11 @@ spring:
|
||||||
- id: jeecg-system
|
- id: jeecg-system
|
||||||
uri: lb://jeecg-system
|
uri: lb://jeecg-system
|
||||||
predicates:
|
predicates:
|
||||||
- Path=/sys/**,/eoa/**,/joa/**,/online/**,/bigscreen/**,/jmreport/**,/desform/**,/act/**,/plug-in/**
|
- Path=/sys/**,/eoa/**,/joa/**,/online/**,/bigscreen/**,/jmreport/**,/desform/**,/act/**,/plug-in/**,/generic/**,/druid/**
|
||||||
- id: jeecg-system-websocket
|
- id: jeecg-system-websocket
|
||||||
uri: lb:ws://jeecg-system
|
uri: lb:ws://jeecg-system
|
||||||
predicates:
|
predicates:
|
||||||
- Path=/websocket/**,/eoaSocket/**
|
- Path=/websocket/**,/eoaSocket/**,/newsWebsocket/**
|
||||||
- id: jeecg-demo-websocket
|
- id: jeecg-demo-websocket
|
||||||
uri: lb:ws://jeecg-demo
|
uri: lb:ws://jeecg-demo
|
||||||
predicates:
|
predicates:
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
<codegenerate.version>1.2.5</codegenerate.version>
|
<codegenerate.version>1.2.5</codegenerate.version>
|
||||||
<autopoi-web.version>1.2.2</autopoi-web.version>
|
<autopoi-web.version>1.2.2</autopoi-web.version>
|
||||||
<minio.version>4.0.0</minio.version>
|
<minio.version>4.0.0</minio.version>
|
||||||
<justauth-spring-boot-starter.version>1.3.3</justauth-spring-boot-starter.version>
|
<justauth-spring-boot-starter.version>1.3.2</justauth-spring-boot-starter.version>
|
||||||
<dom4j.version>1.6.1</dom4j.version>
|
<dom4j.version>1.6.1</dom4j.version>
|
||||||
<qiniu-java-sdk.version>7.2.23</qiniu-java-sdk.version>
|
<qiniu-java-sdk.version>7.2.23</qiniu-java-sdk.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
Loading…
Reference in New Issue