24282 2 tahun lalu
induk
melakukan
2538ce7373

+ 7 - 0
hx-admin/pom.xml

@@ -13,10 +13,17 @@
     <artifactId>hx-admin</artifactId>
 
     <dependencies>
+
         <dependency>
             <groupId>com.fjhx</groupId>
             <artifactId>hx-base</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>hx-item</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>

+ 3 - 4
hx-admin/src/main/resources/application-dev.yml

@@ -2,16 +2,15 @@
 spring:
     datasource:
         dynamic:
-            primary: master
-            strict: false
+            strict: true
             datasource:
                 master:
                     driver-class-name: com.mysql.cj.jdbc.Driver
                     url: jdbc:mysql://36.134.91.96:17330/winfaster_master?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                     username: fjhx2012mysql
                     password: 3PN-Mzn#vnP&q6d
-                slave:
-                    url: jdbc:mysql://36.134.91.96:17330/winfaster_slave?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                base:
+                    url: jdbc:mysql://36.134.91.96:17330/bytesailing_base?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                     username: fjhx2012mysql
                     password: 3PN-Mzn#vnP&q6d
 

+ 2 - 2
hx-admin/src/main/resources/application.yml

@@ -48,7 +48,7 @@ user:
 # Spring配置
 spring:
   mvc:
-    pathmatch:
+    path-match:
       matching-strategy: ant_path_matcher
   # 资源信息
   messages:
@@ -85,7 +85,7 @@ mybatis-plus:
     banner: false
 
 # PageHelper分页插件
-pagehelper:
+page-helper:
   helperDialect: mysql
   supportMethodsArguments: true
   params: count=countSql

+ 6 - 0
hx-item/pom.xml

@@ -12,5 +12,11 @@
 
     <artifactId>hx-item</artifactId>
 
+    <dependencies>
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>hx-base</artifactId>
+        </dependency>
+    </dependencies>
 
 </project>