Commit b5488231cb8cfc868db62a0003f9c937ba5412b6
1 parent
f944da4b
文字修改
Showing
5 changed files
with
7 additions
and
6 deletions
README.md
@@ -349,7 +349,7 @@ Jeecg-Boot低代码开发平台,可以应用在任何J2EE项目的开发中, | @@ -349,7 +349,7 @@ Jeecg-Boot低代码开发平台,可以应用在任何J2EE项目的开发中, | ||
349 |  | 349 |  |
350 | 350 | ||
351 | ### Jeecg Boot 产品功能蓝图 | 351 | ### Jeecg Boot 产品功能蓝图 |
352 | - | 352 | + |
353 | 353 | ||
354 | 354 | ||
355 | 后台开发环境和依赖 | 355 | 后台开发环境和依赖 |
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; | @@ -12,7 +12,6 @@ import net.sf.jsqlparser.expression.operators.relational.ExpressionList; | ||
12 | import net.sf.jsqlparser.expression.operators.relational.InExpression; | 12 | import net.sf.jsqlparser.expression.operators.relational.InExpression; |
13 | import net.sf.jsqlparser.schema.Column; | 13 | import net.sf.jsqlparser.schema.Column; |
14 | import org.apache.ibatis.reflection.MetaObject; | 14 | import org.apache.ibatis.reflection.MetaObject; |
15 | -import org.jeecg.common.util.oConvertUtils; | ||
16 | import org.mybatis.spring.annotation.MapperScan; | 15 | import org.mybatis.spring.annotation.MapperScan; |
17 | import org.springframework.context.annotation.Bean; | 16 | import org.springframework.context.annotation.Bean; |
18 | import org.springframework.context.annotation.Configuration; | 17 | import org.springframework.context.annotation.Configuration; |
@@ -73,7 +72,7 @@ public class MybatisPlusConfig { | @@ -73,7 +72,7 @@ public class MybatisPlusConfig { | ||
73 | 72 | ||
74 | @Override | 73 | @Override |
75 | public Expression getTenantId(boolean select) { | 74 | public Expression getTenantId(boolean select) { |
76 | - String tenant_id = oConvertUtils.getString(TenantContext.getTenant(),"0"); | 75 | + String tenant_id = TenantContext.getTenant(); |
77 | return new LongValue(tenant_id); | 76 | return new LongValue(tenant_id); |
78 | } | 77 | } |
79 | @Override | 78 | @Override |
jeecg-boot/jeecg-boot-module-system/src/main/resources/application-prod.yml
@@ -191,7 +191,7 @@ jeecg : | @@ -191,7 +191,7 @@ jeecg : | ||
191 | # ElasticSearch 设置 | 191 | # ElasticSearch 设置 |
192 | elasticsearch: | 192 | elasticsearch: |
193 | cluster-name: jeecg-ES | 193 | cluster-name: jeecg-ES |
194 | - cluster-nodes: 111.225.222.176:9200 | 194 | + cluster-nodes: 127.0.0.1:9200 |
195 | check-enabled: true | 195 | check-enabled: true |
196 | # 表单设计器配置 | 196 | # 表单设计器配置 |
197 | desform: | 197 | desform: |
jeecg-boot/jeecg-boot-module-system/src/main/resources/application-test.yml
@@ -191,7 +191,7 @@ jeecg : | @@ -191,7 +191,7 @@ jeecg : | ||
191 | # ElasticSearch 设置 | 191 | # ElasticSearch 设置 |
192 | elasticsearch: | 192 | elasticsearch: |
193 | cluster-name: jeecg-ES | 193 | cluster-name: jeecg-ES |
194 | - cluster-nodes: http://fileview.jeecg.com | 194 | + cluster-nodes: ?? |
195 | check-enabled: false | 195 | check-enabled: false |
196 | # 表单设计器配置 | 196 | # 表单设计器配置 |
197 | desform: | 197 | desform: |
jeecg-boot/pom.xml
@@ -52,8 +52,10 @@ | @@ -52,8 +52,10 @@ | ||
52 | <module>jeecg-boot-base</module> | 52 | <module>jeecg-boot-base</module> |
53 | <module>jeecg-boot-module-demo</module> | 53 | <module>jeecg-boot-module-demo</module> |
54 | <module>jeecg-boot-module-system</module> | 54 | <module>jeecg-boot-module-system</module> |
55 | + | ||
56 | + <!-- 需要微服务,请打开注释 | ||
55 | <module>jeecg-boot-starter</module> | 57 | <module>jeecg-boot-starter</module> |
56 | - <module>jeecg-cloud-module</module> | 58 | + <module>jeecg-cloud-module</module>--> |
57 | </modules> | 59 | </modules> |
58 | 60 | ||
59 | <distributionManagement> | 61 | <distributionManagement> |