From 0c3726a38154e662153c64e6afa94d463548392e Mon Sep 17 00:00:00 2001 From: zhangdaiscott Date: Sat, 28 Nov 2020 00:05:27 +0800 Subject: [PATCH] =?UTF-8?q?JeecgBoot=202.4=20=E5=BE=AE=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E7=89=88=E6=9C=AC=E5=8F=91=E5=B8=83=EF=BC=8C?= =?UTF-8?q?=E5=9F=BA=E4=BA=8ESpringBoot=E7=9A=84=E4=BD=8E=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=B9=B3=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ant-design-vue-jeecg/src/components/jeecg/index.js | 2 ++ ant-design-vue-jeecg/src/utils/util.js | 2 ++ .../src/views/system/modules/GateWayRouteModal.vue | 5 ----- ant-design-vue-jeecg/yarn.lock | 2 +- .../src/main/java/org/jeecg/JeecgSystemApplication.java | 1 - .../nacos/jeecg-gateway-router.json | 7 +++++-- .../jeecg-cloud-gateway/src/main/resources/application.yml | 4 ++-- jeecg-boot/pom.xml | 2 +- 8 files changed, 13 insertions(+), 12 deletions(-) diff --git a/ant-design-vue-jeecg/src/components/jeecg/index.js b/ant-design-vue-jeecg/src/components/jeecg/index.js index 4504cb2b..91100dfb 100644 --- a/ant-design-vue-jeecg/src/components/jeecg/index.js +++ b/ant-design-vue-jeecg/src/components/jeecg/index.js @@ -14,6 +14,7 @@ import JImageUpload from './JImageUpload.vue' import JTreeDict from './JTreeDict.vue' import JCheckbox from './JCheckbox.vue' import JCron from './JCron.vue' +import JSelectMultiple from './JSelectMultiple.vue' import JPopupOnlReport from './modal/JPopupOnlReport.vue' export default { @@ -35,5 +36,6 @@ export default { Vue.component('JCheckbox', JCheckbox) Vue.component('JCron', JCron) Vue.component('JPopupOnlReport', JPopupOnlReport) + Vue.component('JSelectMultiple', JSelectMultiple) } } \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/utils/util.js b/ant-design-vue-jeecg/src/utils/util.js index 4dcdcd86..cc18fb47 100644 --- a/ant-design-vue-jeecg/src/utils/util.js +++ b/ant-design-vue-jeecg/src/utils/util.js @@ -126,6 +126,8 @@ function generateChildRouters (data) { componentPath = onlineCommons.OnlCgformTreeList }else if(item.component=="modules/online/cgform/auto/erp/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"){ componentPath = onlineCommons.OnlCgformInnerTableList }else if(item.component=="modules/online/cgreport/OnlCgreportHeadList"){ diff --git a/ant-design-vue-jeecg/src/views/system/modules/GateWayRouteModal.vue b/ant-design-vue-jeecg/src/views/system/modules/GateWayRouteModal.vue index 0feabd4f..66333132 100644 --- a/ant-design-vue-jeecg/src/views/system/modules/GateWayRouteModal.vue +++ b/ant-design-vue-jeecg/src/views/system/modules/GateWayRouteModal.vue @@ -127,11 +127,6 @@ loading: false } }, - watch: { - 'router.routerId'(val) { - this.router.uri = 'lb://' + val - } - }, methods: { getRouter() { return { diff --git a/ant-design-vue-jeecg/yarn.lock b/ant-design-vue-jeecg/yarn.lock index 98e86e55..efd5f044 100644 --- a/ant-design-vue-jeecg/yarn.lock +++ b/ant-design-vue-jeecg/yarn.lock @@ -1642,7 +1642,7 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0: "@types/color-name" "^1.1.1" color-convert "^2.0.1" -ant-design-vue@^1.6.3: +ant-design-vue@^1.7.2: version "1.7.2" resolved "https://registry.npmjs.org/ant-design-vue/-/ant-design-vue-1.7.2.tgz#aac7ff802205711631c8698e2a0c7b4e61dfd73e" integrity sha512-iVskTSG62OSiptyGQkvyhoeLlLMiqKtAOTcWZ7MmsMrj38h0TCpGtqSYS4/fwq4yYgyzloYSteBo8U8TrV99RA== diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/JeecgSystemApplication.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/JeecgSystemApplication.java index 2da3b207..ddfb4883 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/JeecgSystemApplication.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/JeecgSystemApplication.java @@ -19,7 +19,6 @@ import java.net.UnknownHostException; @Slf4j @SpringBootApplication -//@EnableAutoConfiguration(exclude={org.activiti.spring.boot.SecurityAutoConfiguration.class}) public class JeecgSystemApplication extends SpringBootServletInitializer { @Override diff --git a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-cloud/nacos/jeecg-gateway-router.json b/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-cloud/nacos/jeecg-gateway-router.json index 5b66e27a..bf0b06a0 100644 --- a/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-cloud/nacos/jeecg-gateway-router.json +++ b/jeecg-boot/jeecg-boot-starter/jeecg-boot-starter-cloud/nacos/jeecg-gateway-router.json @@ -12,7 +12,9 @@ "_genkey_5": "/desform/**", "_genkey_6": "/online/**", "_genkey_8": "/act/**", - "_genkey_9": "/plug-in/**" + "_genkey_9": "/plug-in/**", + "_genkey_10": "/generic/**", + "_genkey_11": "/druid/**" } }], "filters": [], @@ -38,7 +40,8 @@ "name": "Path", "args": { "_genkey_0": "/websocket/**", - "_genkey_1": "/eoaSocket/**" + "_genkey_1": "/eoaSocket/**", + "_genkey_2": "/newsWebsocket/**" } }], "filters": [], diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/src/main/resources/application.yml b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/src/main/resources/application.yml index 81078dfb..395337b7 100644 --- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/src/main/resources/application.yml +++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-gateway/src/main/resources/application.yml @@ -24,11 +24,11 @@ spring: - id: jeecg-system uri: lb://jeecg-system 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 uri: lb:ws://jeecg-system predicates: - - Path=/websocket/**,/eoaSocket/** + - Path=/websocket/**,/eoaSocket/**,/newsWebsocket/** - id: jeecg-demo-websocket uri: lb:ws://jeecg-demo predicates: diff --git a/jeecg-boot/pom.xml b/jeecg-boot/pom.xml index f91c9a09..9a4f6cf0 100644 --- a/jeecg-boot/pom.xml +++ b/jeecg-boot/pom.xml @@ -42,7 +42,7 @@ 1.2.5 1.2.2 4.0.0 - 1.3.3 + 1.3.2 1.6.1 7.2.23