Mr.qian пре 1 дан
родитељ
комит
e57b48e61c
2 измењених фајлова са 45 додато и 31 уклоњено
  1. 41 30
      mall-api/pom.xml
  2. 4 1
      mall-service/src/main/resources/bootstrap.properties

+ 41 - 30
mall-api/pom.xml

@@ -11,42 +11,53 @@
     <version>1.0.0-SNAPSHOT</version>
     <dependencies>
 
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.18.10</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-            <version>1.2.69</version>
-            <scope>compile</scope>
+         <dependency>
+            <groupId>com.txz</groupId>
+            <artifactId>common</artifactId>
         </dependency>
+
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
-            <version>RELEASE</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-            <version>1.6.2</version>
+            <version>5.8.39</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.hibernate.validator</groupId>
-            <artifactId>hibernate-validator</artifactId>
-        </dependency>
+        <!-- <dependency> -->
+        <!--     <groupId>org.projectlombok</groupId> -->
+        <!--     <artifactId>lombok</artifactId> -->
+        <!--     <version>1.18.10</version> -->
+        <!--     <scope>provided</scope> -->
+        <!-- </dependency> -->
+        <!-- <dependency> -->
+        <!--     <groupId>com.alibaba</groupId> -->
+        <!--     <artifactId>fastjson</artifactId> -->
+        <!--     <version>1.2.69</version> -->
+        <!--     <scope>compile</scope> -->
+        <!-- </dependency> -->
+        <!-- <dependency> -->
+        <!--     <groupId>cn.hutool</groupId> -->
+        <!--     <artifactId>hutool-all</artifactId> -->
+        <!--     <version>RELEASE</version> -->
+        <!--     <scope>compile</scope> -->
+        <!-- </dependency> -->
+        <!-- <dependency> -->
+        <!--     <groupId>io.swagger</groupId> -->
+        <!--     <artifactId>swagger-annotations</artifactId> -->
+        <!--     <version>1.6.2</version> -->
+        <!--     <scope>compile</scope> -->
+        <!-- </dependency> -->
+        <!-- <dependency> -->
+        <!--     <groupId>javax.validation</groupId> -->
+        <!--     <artifactId>validation-api</artifactId> -->
+        <!-- </dependency> -->
+        <!-- <dependency> -->
+        <!--     <groupId>com.fasterxml.jackson.core</groupId> -->
+        <!--     <artifactId>jackson-annotations</artifactId> -->
+        <!-- </dependency> -->
+        <!-- <dependency> -->
+        <!--     <groupId>org.hibernate.validator</groupId> -->
+        <!--     <artifactId>hibernate-validator</artifactId> -->
+        <!-- </dependency> -->
         <!--        <dependency>-->
 <!--            <groupId>org.springframework.data</groupId>-->
 <!--            <artifactId>spring-data-redis</artifactId>-->

+ 4 - 1
mall-service/src/main/resources/bootstrap.properties

@@ -138,12 +138,15 @@ spring.datasource.hikari.auto-commit=true
 spring.datasource.hikari.idle-timeout=60000
 spring.datasource.hikari.pool-name=DatebookHikariCP
 spring.datasource.hikari.max-lifetime=28740000
-spring.datasource.hikari.connection-test-query=SELECT 1
+#spring.datasource.hikari.connection-test-query=SELECT 1
 
 spring.main.allow-bean-definition-overriding=true
 
 server.host=124.222.152.234
 
+# Disable datasource health indicator to avoid isValid issue with ShardingSphere
+management.health.db.enabled=false
+management.health.datasource.enabled=false
 
 
 sharding.datasource.dsdefault.jdbc-url=jdbc:mysql://124.222.152.234:3306/mall?serverTimezone=GMT%2b8&useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false