Solution added for issue shopizer-ecommerce#905

SaibalCts23 · Jan 25, 2024 · 301df8e · 301df8e
1 parent 054a3bd
commit 301df8e
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 2 deletions.
diff --git a/sm-core-model/.factorypath b/sm-core-model/.factorypath
@@ -0,0 +1,3 @@
+<factorypath>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/mapstruct/mapstruct-processor/1.3.0.Final/mapstruct-processor-1.3.0.Final.jar" enabled="true" runInBatchMode="false"/>
+</factorypath>
diff --git a/sm-core-modules/.factorypath b/sm-core-modules/.factorypath
@@ -0,0 +1,3 @@
+<factorypath>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/mapstruct/mapstruct-processor/1.3.0.Final/mapstruct-processor-1.3.0.Final.jar" enabled="true" runInBatchMode="false"/>
+</factorypath>
diff --git a/sm-core/.factorypath b/sm-core/.factorypath
@@ -0,0 +1,3 @@
+<factorypath>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/mapstruct/mapstruct-processor/1.3.0.Final/mapstruct-processor-1.3.0.Final.jar" enabled="true" runInBatchMode="false"/>
+</factorypath>
diff --git a/...alesmanager/core/business/modules/integration/shipping/impl/CustomShippingQuoteRules.java b/...alesmanager/core/business/modules/integration/shipping/impl/CustomShippingQuoteRules.java
@@ -14,6 +14,7 @@
 import org.kie.internal.io.ResourceFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.context.annotation.Primary;
 
 import com.salesmanager.core.business.configuration.DroolsBeanFactory;
 import com.salesmanager.core.model.common.Delivery;
@@ -30,7 +31,7 @@
 import com.salesmanager.core.modules.integration.IntegrationException;
 import com.salesmanager.core.modules.integration.shipping.model.ShippingQuoteModule;
 
-
+@Primary
 public class CustomShippingQuoteRules implements ShippingQuoteModule {
 
 	private static final Logger LOGGER = LoggerFactory.getLogger(CustomShippingQuoteRules.class);

diff --git a/sm-shop-model/.factorypath b/sm-shop-model/.factorypath
@@ -0,0 +1,3 @@
+<factorypath>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/mapstruct/mapstruct-processor/1.3.0.Final/mapstruct-processor-1.3.0.Final.jar" enabled="true" runInBatchMode="false"/>
+</factorypath>
diff --git a/sm-shop/.factorypath b/sm-shop/.factorypath
@@ -0,0 +1,3 @@
+<factorypath>
+    <factorypathentry kind="VARJAR" id="M2_REPO/org/mapstruct/mapstruct-processor/1.3.0.Final/mapstruct-processor-1.3.0.Final.jar" enabled="true" runInBatchMode="false"/>
+</factorypath>
diff --git a/sm-shop/.temp-sm-shop - ShopApplication-classpath-arg-1706177472837.txt b/sm-shop/.temp-sm-shop - ShopApplication-classpath-arg-1706177472837.txt
diff --git a/sm-shop/files/store/DownlaodRepository.dat b/sm-shop/files/store/DownlaodRepository.dat
diff --git a/sm-shop/src/main/resources/application.properties b/sm-shop/src/main/resources/application.properties
@@ -7,6 +7,7 @@ server.port=8080
 #spring.jpa.properties.hibernate.generate_statistics=true
 #default database schema
 spring.jpa.properties.hibernate.default_schema=SALESMANAGER
+spring.config.location=classpath:database.properties
 #logging.level.org.hibernate.stat=debug
 
 # Enable logging to verify that HikariCP is used, the second entry is specific to HikariCP

diff --git a/sm-shop/src/main/resources/profiles/mysql/database.properties b/sm-shop/src/main/resources/profiles/mysql/database.properties
@@ -8,8 +8,10 @@
 #mysql>GRANT ALL ON SALESMANAGER.* TO shopizer;
 #mysql>FLUSH PRIVILEGES;
 
-#db.jdbcUrl=jdbc:mysql://localhost:3306/SALESMANAGER?autoReconnect=true&serverTimeZone=UTC&useUnicode=true&characterEncoding=UTF-8
+db.jdbcUrl=jdbc:mysql://localhost:3306/SALESMANAGER?autoReconnect=true&serverTimeZone=UTC&useUnicode=true&characterEncoding=UTF-8
 #db.user=shopizer_db_user
+db.user=root
+db.password=Saibal@2000
 #db.password=shopizer_db_password
 db.driverClass=com.mysql.cj.jdbc.Driver
 hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect