Commit f194d294 by liyanlin

1、去除同步wms库存同步服务,用MQ版代替;

2、修复部分bug。
parent 91911531
...@@ -36,15 +36,25 @@ ...@@ -36,15 +36,25 @@
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <artifactId>maven-assembly-plugin</artifactId>
<artifactId>spring-boot-maven-plugin</artifactId> <version>3.1.0</version>
<configuration> <configuration>
<mainClass>com.bailuntec.Application</mainClass> <archive>
<manifest>
<mainClass>com.bailuntec.Application</mainClass>
</manifest>
</archive>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<appendAssemblyId>false</appendAssemblyId>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
<id>make-assembly</id>
<phase>package</phase>
<goals> <goals>
<goal>repackage</goal> <goal>single</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
......
...@@ -30,7 +30,7 @@ public class Application { ...@@ -30,7 +30,7 @@ public class Application {
private static final String EVENT_RDB_STORAGE_PASSWORD = propertiesUtil.getPropertyAsString("EVENT_RDB_STORAGE_PASSWORD"); private static final String EVENT_RDB_STORAGE_PASSWORD = propertiesUtil.getPropertyAsString("EVENT_RDB_STORAGE_PASSWORD");
public static void main(String[] args) { public static void main(String[] args) {
new JobScheduler(createRegistryCenter(),createJobConfiguration(),createJobEventConfiguration(),new FbaStockListener()).init(); new JobScheduler(createRegistryCenter(),createJobConfiguration(),createJobEventConfiguration(),new FbaStockListener()).init();
new JobScheduler(createRegistryCenter(),createJobConfiguration1(),createJobEventConfiguration(),new WmsStockListener()).init(); //new JobScheduler(createRegistryCenter(),createJobConfiguration1(),createJobEventConfiguration(),new WmsStockListener()).init();
new JobScheduler(createRegistryCenter(),createJobConfiguration2()).init(); new JobScheduler(createRegistryCenter(),createJobConfiguration2()).init();
new JobScheduler(createRegistryCenter(),createJobConfiguration3()).init(); new JobScheduler(createRegistryCenter(),createJobConfiguration3()).init();
} }
...@@ -48,12 +48,12 @@ public class Application { ...@@ -48,12 +48,12 @@ public class Application {
return simpleJobRootConfig; return simpleJobRootConfig;
} }
private static LiteJobConfiguration createJobConfiguration1() { /*private static LiteJobConfiguration createJobConfiguration1() {
JobCoreConfiguration simpleCoreConfig = JobCoreConfiguration.newBuilder(propertiesUtil.getPropertyAsString("JOB_NAME_WMS"), propertiesUtil.getPropertyAsString("JOB_CRON_WMS"), propertiesUtil.getPropertyAsInt("SHARDING_TOTAL_COUNT")).build(); JobCoreConfiguration simpleCoreConfig = JobCoreConfiguration.newBuilder(propertiesUtil.getPropertyAsString("JOB_NAME_WMS"), propertiesUtil.getPropertyAsString("JOB_CRON_WMS"), propertiesUtil.getPropertyAsInt("SHARDING_TOTAL_COUNT")).build();
SimpleJobConfiguration simpleJobConfig = new SimpleJobConfiguration(simpleCoreConfig, WmsStockJob.class.getCanonicalName()); SimpleJobConfiguration simpleJobConfig = new SimpleJobConfiguration(simpleCoreConfig, WmsStockJob.class.getCanonicalName());
LiteJobConfiguration simpleJobRootConfig = LiteJobConfiguration.newBuilder(simpleJobConfig).build(); LiteJobConfiguration simpleJobRootConfig = LiteJobConfiguration.newBuilder(simpleJobConfig).build();
return simpleJobRootConfig; return simpleJobRootConfig;
} }*/
private static LiteJobConfiguration createJobConfiguration2() { private static LiteJobConfiguration createJobConfiguration2() {
JobCoreConfiguration simpleCoreConfig = JobCoreConfiguration.newBuilder(propertiesUtil.getPropertyAsString("JOB_NAME_LOGISTICS"), propertiesUtil.getPropertyAsString("JOB_CRON_LOGISTICS"), propertiesUtil.getPropertyAsInt("SHARDING_TOTAL_COUNT")).build(); JobCoreConfiguration simpleCoreConfig = JobCoreConfiguration.newBuilder(propertiesUtil.getPropertyAsString("JOB_NAME_LOGISTICS"), propertiesUtil.getPropertyAsString("JOB_CRON_LOGISTICS"), propertiesUtil.getPropertyAsInt("SHARDING_TOTAL_COUNT")).build();
......
#STOCK_FBA_URL=http://172.31.255.247/api/services/app/ThirdStockFbaService/GetFbaStocks #STOCK_FBA_URL=http://172.31.255.247/api/services/app/ThirdStockFbaService/GetFbaStocks
#STOCK_WMS_URL=http://172.31.255.247/api/services/app/WMSStockService/SearchAllProductStockByPage #STOCK_WMS_URL=http://172.31.255.247/api/services/app/WMSStockService/SearchAllProductStockByPage
STOCK_FBA_URL=http://api.wms.bailuntec.com/api/services/app/ThirdStockFbaService/GetFbaStocks STOCK_FBA_URL=http://172.31.255.247:5001/api/services/app/ThirdStockFbaService/GetFbaStocks
STOCK_WMS_URL=http://api.wms.bailuntec.com/api/services/app/WMSStockService/SearchAllProductStockByPage STOCK_WMS_URL=http://172.31.255.247:5001/api/services/app/WMSStockService/SearchAllProductStockByPage
LOGISTICS_WMS_URL=http://wms.bailuntec.com/api/services/app/LogisticsReconciliationService/GetNormalDataQuery LOGISTICS_WMS_URL=http://wms.bailuntec.com/api/services/app/LogisticsReconciliationService/GetNormalDataQuery
LOGISTICS_WMS_RECONCILIATION_URL=http://wms.bailuntec.com/api/services/app/LogisticsReconciliationService/GetBaseDataQuery LOGISTICS_WMS_RECONCILIATION_URL=http://wms.bailuntec.com/api/services/app/LogisticsReconciliationService/GetBaseDataQuery
package com.bailuntec.mapper; package com.bailuntec.mapper;
import com.bailuntec.domain.entity.DcBaseOmsOrderExt; import com.bailuntec.domain.entity.DcBaseOmsOrderExt;
import com.bailuntec.domain.entity.DcBaseSkuMapping;
import com.bailuntec.domain.example.DcBaseSkuMappingExample;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
......
...@@ -21,7 +21,7 @@ public class RedisUtils { ...@@ -21,7 +21,7 @@ public class RedisUtils {
config.setMaxWaitMillis(propertiesUtil.getPropertyAsInt("SETMAXWAITMILLLIS")); config.setMaxWaitMillis(propertiesUtil.getPropertyAsInt("SETMAXWAITMILLLIS"));
config.setTestOnBorrow(true); config.setTestOnBorrow(true);
jedisPool = new JedisPool(config, propertiesUtil.getPropertyAsString("REDIS_URL"), propertiesUtil.getPropertyAsInt("REDIS_PORT")); jedisPool = new JedisPool(config, propertiesUtil.getPropertyAsString("REDIS_URL"), propertiesUtil.getPropertyAsInt("REDIS_PORT"));
log.warn("初始化连接池"); //log.warn("初始化连接池");
} }
/* /*
......
driver=com.mysql.jdbc.Driver driver=com.mysql.jdbc.Driver
url=jdbc:mysql://gz-cdb-kp7s5i79.sql.tencentcdb.com:61691/bailun_datacenter?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&rewriteBatchedStatements=true url=jdbc:mysql://gz-cdb-kp7s5i79.sql.tencentcdb.com:61691/bailun_datacenter?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&rewriteBatchedStatements=true&useSSL=false
username=root username=root
password=#7kfnymAM$Y9-Ntf password=#7kfnymAM$Y9-Ntf
driver=com.mysql.jdbc.Driver driver=com.mysql.jdbc.Driver
url=jdbc:mysql://10.0.8.15:3306/bailun_datacenter?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull url=jdbc:mysql://10.0.8.15:3306/bailun_datacenter?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
username=root username=root
password=#7kfnymAM$Y9-Ntf password=#7kfnymAM$Y9-Ntf
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment