代码格式和文字简单调整

jeecg-server-cloud/jeecg-cloud-gateway/pom.xml

@@ -45,6 +45,12 @@
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>fastjson</artifactId>
+                    <groupId>com.alibaba</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!-- sentinel集成nacos作为数据源 -->
         <dependency>

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}")
+    @Value("${jeecg.route.config.data-type:#{null}}")
-    public void setServerAddr(String serverAddr) {
+    public void setDataType(String dataType) {
-        this.serverAddr = serverAddr;
+        this.dataType = dataType;
     }
-
+    
-    @Value("${spring.cloud.nacos.discovery.namespace:#{null}}")
-    public void setNamespace(String namespace) {
-        this.namespace = namespace;
-    }
-
     @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}}")
+    @Value("${spring.cloud.nacos.discovery.server-addr}")
-    public void setDataType(String dataType) {
+    public void setServerAddr(String serverAddr) {
-        this.dataType = dataType;
+        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}}")

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

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

jeecg-server-cloud/jeecg-demo-cloud-start/pom.xml

@@ -29,6 +29,7 @@
             <artifactId>jeecg-boot-starter-job</artifactId>
         </dependency>
 
+        <!-- 引入demo模块 -->
         <dependency>
             <groupId>org.jeecgframework.boot</groupId>
             <artifactId>jeecg-module-demo</artifactId>

jeecg-server-cloud/jeecg-system-cloud-start/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>jeecg-system-cloud-start</artifactId>
-    <description>System微服务启动</description>
+    <description>System项目微服务启动</description>
 
     <dependencies>
         <!-- 引入jeecg-boot-starter-cloud依赖 -->

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;

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;

jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/pom.xml

@@ -27,4 +27,4 @@
             <version>${jeecgboot.version}</version>
         </dependency>
     </dependencies>
-</project>
+</project>

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<ShardingSysLog,
     @ApiOperation(value = "分库分表插入", notes = "分库分表")
     public Result<?> test2() {
         int start=20;
-        int size=50;
+        int size=30;
         for (int i = start; i <= size; i++) {
             ShardingSysLog shardingSysLog = new ShardingSysLog();
             shardingSysLog.setLogContent("分库分表测试");