From f6fc896982978a98b1e601ea0239d567a62d7f5c Mon Sep 17 00:00:00 2001 From: zhangdaiscott Date: Thu, 22 Sep 2022 15:46:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F=E5=92=8C?= =?UTF-8?q?=E6=96=87=E5=AD=97=E7=AE=80=E5=8D=95=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeecg-cloud-gateway/pom.xml | 6 +++++ .../jeecg/config/GatewayRoutersConfig.java | 24 +++++++++---------- .../jeecg-cloud-nacos/README.md | 5 ++++ .../src/main/resources/application.yml | 2 +- .../jeecg-demo-cloud-start/pom.xml | 1 + .../jeecg-system-cloud-start/pom.xml | 2 +- .../controller/JeecgTestFeignController.java | 2 +- .../jeecg/modules/test/lock/DemoLockTest.java | 2 -- .../jeecg-cloud-test-seata/pom.xml | 2 +- .../JeecgShardingDemoController.java | 2 +- 10 files changed, 29 insertions(+), 19 deletions(-) diff --git a/jeecg-server-cloud/jeecg-cloud-gateway/pom.xml b/jeecg-server-cloud/jeecg-cloud-gateway/pom.xml index dc3e879c..b619cb1e 100644 --- a/jeecg-server-cloud/jeecg-cloud-gateway/pom.xml +++ b/jeecg-server-cloud/jeecg-cloud-gateway/pom.xml @@ -45,6 +45,12 @@ com.alibaba.cloud spring-cloud-starter-alibaba-sentinel + + + fastjson + com.alibaba + + diff --git a/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/config/GatewayRoutersConfig.java b/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/config/GatewayRoutersConfig.java index fc6ae189..b20e6723 100644 --- a/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/config/GatewayRoutersConfig.java +++ b/jeecg-server-cloud/jeecg-cloud-gateway/src/main/java/org/jeecg/config/GatewayRoutersConfig.java @@ -23,16 +23,11 @@ public class GatewayRoutersConfig { public String username; public String password; - @Value("${spring.cloud.nacos.discovery.server-addr}") - public void setServerAddr(String serverAddr) { - this.serverAddr = serverAddr; - } - - @Value("${spring.cloud.nacos.discovery.namespace:#{null}}") - public void setNamespace(String namespace) { - this.namespace = namespace; + @Value("${jeecg.route.config.data-type:#{null}}") + public void setDataType(String dataType) { + this.dataType = dataType; } - + @Value("${jeecg.route.config.data-id:#{null}}") public void setRouteDataId(String dataId) { this.dataId = dataId + ".json"; @@ -43,9 +38,14 @@ public class GatewayRoutersConfig { this.routeGroup = routeGroup; } - @Value("${jeecg.route.config.data-type:#{null}}") - public void setDataType(String dataType) { - this.dataType = dataType; + @Value("${spring.cloud.nacos.discovery.server-addr}") + public void setServerAddr(String serverAddr) { + this.serverAddr = serverAddr; + } + + @Value("${spring.cloud.nacos.discovery.namespace:#{null}}") + public void setNamespace(String namespace) { + this.namespace = namespace; } @Value("${spring.cloud.nacos.config.username:#{null}}") diff --git a/jeecg-server-cloud/jeecg-cloud-nacos/README.md b/jeecg-server-cloud/jeecg-cloud-nacos/README.md index 50023da0..e8031c3f 100644 --- a/jeecg-server-cloud/jeecg-cloud-nacos/README.md +++ b/jeecg-server-cloud/jeecg-cloud-nacos/README.md @@ -9,3 +9,8 @@ - 3、如何不用此模块，使用自己的naocs，请创建下面目录中的配置文件 目录：jeecg-cloud-nacos/docs/config 配置文件： YAML + + +# 常见问题 +- UnsupportedOperationException: Cannot determine JNI library name for ARCH='x86' OS='windows 10' + 解决方案：http://t.zoukankan.com/mindzone-p-15808190.html \ No newline at end of file diff --git a/jeecg-server-cloud/jeecg-cloud-nacos/src/main/resources/application.yml b/jeecg-server-cloud/jeecg-cloud-nacos/src/main/resources/application.yml index 74cceb2f..ded1f18d 100644 --- a/jeecg-server-cloud/jeecg-cloud-nacos/src/main/resources/application.yml +++ b/jeecg-server-cloud/jeecg-cloud-nacos/src/main/resources/application.yml @@ -51,4 +51,4 @@ nacos: security: ignore: urls: /,/error,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-ui/public/**,/v1/auth/**,/v1/console/health/**,/actuator/**,/v1/console/server/** - standalone: true + standalone: true \ No newline at end of file diff --git a/jeecg-server-cloud/jeecg-demo-cloud-start/pom.xml b/jeecg-server-cloud/jeecg-demo-cloud-start/pom.xml index 242be4c1..6e1fe8ec 100644 --- a/jeecg-server-cloud/jeecg-demo-cloud-start/pom.xml +++ b/jeecg-server-cloud/jeecg-demo-cloud-start/pom.xml @@ -29,6 +29,7 @@ jeecg-boot-starter-job + org.jeecgframework.boot jeecg-module-demo diff --git a/jeecg-server-cloud/jeecg-system-cloud-start/pom.xml b/jeecg-server-cloud/jeecg-system-cloud-start/pom.xml index 18952a0a..411fb121 100644 --- a/jeecg-server-cloud/jeecg-system-cloud-start/pom.xml +++ b/jeecg-server-cloud/jeecg-system-cloud-start/pom.xml @@ -9,7 +9,7 @@ 4.0.0 jeecg-system-cloud-start - System微服务启动 + System项目微服务启动 diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/feign/controller/JeecgTestFeignController.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/feign/controller/JeecgTestFeignController.java index ea6b4c02..cc4d6752 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/feign/controller/JeecgTestFeignController.java +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/feign/controller/JeecgTestFeignController.java @@ -4,7 +4,7 @@ package org.jeecg.modules.test.feign.controller; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.test.feign.client.*; +import org.jeecg.modules.test.feign.client.JeecgTestClient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import com.alibaba.csp.sentinel.annotation.SentinelResource; diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/lock/DemoLockTest.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/lock/DemoLockTest.java index d6c1eaa1..68c8d999 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/lock/DemoLockTest.java +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-more/src/main/java/org/jeecg/modules/test/lock/DemoLockTest.java @@ -3,8 +3,6 @@ package org.jeecg.modules.test.lock; import lombok.extern.slf4j.Slf4j; import org.jeecg.boot.starter.lock.annotation.JLock; import org.jeecg.boot.starter.lock.client.RedissonLockClient; -import org.jeecg.boot.starter.rabbitmq.client.RabbitMqClient; -import org.jeecg.common.base.BaseMap; import org.jeecg.modules.test.constant.CloudConstant; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/pom.xml b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/pom.xml index 9bc4d694..9cf54de1 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/pom.xml +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/pom.xml @@ -27,4 +27,4 @@ ${jeecgboot.version} - \ No newline at end of file + diff --git a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/src/main/java/org/jeecg/modules/test/sharding/controller/JeecgShardingDemoController.java b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/src/main/java/org/jeecg/modules/test/sharding/controller/JeecgShardingDemoController.java index 0b157845..ab4f70d0 100644 --- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/src/main/java/org/jeecg/modules/test/sharding/controller/JeecgShardingDemoController.java +++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-shardingsphere/src/main/java/org/jeecg/modules/test/sharding/controller/JeecgShardingDemoController.java @@ -65,7 +65,7 @@ public class JeecgShardingDemoController extends JeecgController test2() { int start=20; - int size=50; + int size=30; for (int i = start; i <= size; i++) { ShardingSysLog shardingSysLog = new ShardingSysLog(); shardingSysLog.setLogContent("分库分表测试");