From b5488231cb8cfc868db62a0003f9c937ba5412b6 Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Tue, 12 Jan 2021 18:42:30 +0800
Subject: [PATCH] 文字修改

---
 README.md                                                                                                     | 2 +-
 jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusConfig.java | 3 +--
 jeecg-boot/jeecg-boot-module-system/src/main/resources/application-prod.yml                                   | 2 +-
 jeecg-boot/jeecg-boot-module-system/src/main/resources/application-test.yml                                   | 2 +-
 jeecg-boot/pom.xml                                                                                            | 4 +++-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 8edfd19..93b031e 100644
--- a/README.md
+++ b/README.md
@@ -349,7 +349,7 @@ Jeecg-Boot低代码开发平台，可以应用在任何J2EE项目的开发中，
 ![微服务架构图](https://jeecgos.oss-cn-beijing.aliyuncs.com/files/jeecgboot-weifuwu-cloud.png "在这里输入图片标题")
 
 ### Jeecg Boot 产品功能蓝图
-![功能蓝图](https://static.jeecg.com/upload/test/Jeecg-Boot-lantu202005_1590912449914.jpg "在这里输入图片标题")
+![功能蓝图](https://jeecgos.oss-cn-beijing.aliyuncs.com/upload/test/Jeecg-Boot-lantu202005_1590912449914.jpg "在这里输入图片标题")
 
 
 后台开发环境和依赖
diff --git a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusConfig.java b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusConfig.java
index 56abfba..bbab8a0 100644
--- a/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusConfig.java
+++ b/jeecg-boot/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/mybatis/MybatisPlusConfig.java
@@ -12,7 +12,6 @@ import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
 import net.sf.jsqlparser.expression.operators.relational.InExpression;
 import net.sf.jsqlparser.schema.Column;
 import org.apache.ibatis.reflection.MetaObject;
-import org.jeecg.common.util.oConvertUtils;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -73,7 +72,7 @@ public class MybatisPlusConfig {
 
             @Override
             public Expression getTenantId(boolean select) {
-                String tenant_id = oConvertUtils.getString(TenantContext.getTenant(),"0");
+                String tenant_id = TenantContext.getTenant();
                 return new LongValue(tenant_id);
             }
             @Override
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-prod.yml b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-prod.yml
index 3e2614b..43156ed 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-prod.yml
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-prod.yml
@@ -191,7 +191,7 @@ jeecg :
   # ElasticSearch 设置
   elasticsearch:
     cluster-name: jeecg-ES
-    cluster-nodes: 111.225.222.176:9200
+    cluster-nodes: 127.0.0.1:9200
     check-enabled: true
   # 表单设计器配置
   desform:
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-test.yml b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-test.yml
index 743733d..fd242db 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-test.yml
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/application-test.yml
@@ -191,7 +191,7 @@ jeecg :
   # ElasticSearch 设置
   elasticsearch:
     cluster-name: jeecg-ES
-    cluster-nodes: http://fileview.jeecg.com
+    cluster-nodes: ??
     check-enabled: false
   # 表单设计器配置
   desform:
diff --git a/jeecg-boot/pom.xml b/jeecg-boot/pom.xml
index 5028330..a4d0506 100644
--- a/jeecg-boot/pom.xml
+++ b/jeecg-boot/pom.xml
@@ -52,8 +52,10 @@
 		<module>jeecg-boot-base</module>
 		<module>jeecg-boot-module-demo</module>
 		<module>jeecg-boot-module-system</module>
+		
+		<!-- 需要微服务，请打开注释
 		<module>jeecg-boot-starter</module>
-		<module>jeecg-cloud-module</module>
+		<module>jeecg-cloud-module</module>-->
 	</modules>
 
 	<distributionManagement>
--
libgit2 0.22.2