merge:代码合并

lms/nladmin-system/pom.xml

@@ -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>

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

@@ -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);
             }

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

@@ -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: