root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: root:master_merge_0523_slave
Branches Tags
root:master root:master_merge_0523 root:acs_dev_kep root:acs_dev root:agv_twoFloorAgvScreen_acs_dev root:master_merge root:detached root:1lms root:master1_0709 root:master_1 root:master_merge_0523_slave root:feature/dev_mdm_0522 root:one_rebuild_dev root:lms_dev root:b_lms root:feature/sso-server-merge-1228 root:feature/sso_function_v1205
...
pull from: root:detached
Branches Tags
root:master_merge_0523 root:acs_dev_kep root:acs_dev root:agv_twoFloorAgvScreen_acs_dev root:master_merge root:detached root:1lms root:master1_0709 root:master_1 root:master root:master_merge_0523_slave root:feature/dev_mdm_0522 root:one_rebuild_dev root:lms_dev root:b_lms root:feature/sso-server-merge-1228 root:feature/sso_function_v1205

2 Commits
master_mer ... detached

Author SHA1 Message Date
zhouz
4fbe1c38c1 merge:代码合并 2025-11-27 17:57:49 +08:00
zhangzq
51f816de93 opt:删除主从配置：WO,WQLCore,WQLObject,DataBaceConfig,ResultBean数据源及数据分装 2025-06-23 10:03:49 +08:00
3 changed files with 6 additions and 6 deletions
Expand all files Collapse all files

2
lms/nladmin-system/pom.xml
View File

@@ -118,7 +118,7 @@
<artifactId>shardingsphere-jdbc-core-spring-boot-starter</artifactId>
<version>5.1.1</version>
</dependency>
<!--Spring boot 核心 -->
<!-- Spring boot 核心 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>

2
lms/nladmin-system/src/main/java/org/nl/modules/wql/core/bean/ResultBean.java
View File

@@ -343,7 +343,7 @@ public class ResultBean implements Serializable, Cloneable {
}
try {
//支持别名的设置
if (sqlResultSet instanceof ShardingSphereResultSet){
if (sqlResultSet instanceof ShardingSphereResultSet){
ShardingSphereResultSet resultSet = (ShardingSphereResultSet) sqlResultSet;
sqlResultSet = resultSet.getResultSets().get(0);
}

8
lms/nladmin-system/src/main/resources/config/application-dev.yml
View File

@@ -43,9 +43,9 @@ spring:
reset-enable: false
filters:
DruidFilter,stat
url: jdbc:mysql://localhost:3306/lms?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true
url: jdbc:mysql://localhost:3306/lms_xc?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true
username: root
password: 123456
password: root
slave:
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
@@ -84,9 +84,9 @@ spring:
reset-enable: false
filters:
DruidFilter,stat
url: jdbc:mysql://127.0.0.1:3306/lms?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true
url: jdbc:mysql://127.0.0.1:3306/lms_xc?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true
username: root
password: 123456
password: root
rules:
readwrite-splitting:
data-sources: