Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
dc-java
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
huluobin
dc-java
Commits
f194d294
Commit
f194d294
authored
Nov 19, 2021
by
liyanlin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1、去除同步wms库存同步服务,用MQ版代替;
2、修复部分bug。
parent
91911531
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
22 additions
and
14 deletions
+22
-14
pom.xml
data-base/base-sync-stock-wms/pom.xml
+14
-4
Application.java
...nc-stock-wms/src/main/java/com/bailuntec/Application.java
+3
-3
const.properties
...e/base-sync-stock-wms/src/main/resources/const.properties
+2
-2
DcBaseOmsOrderExtMapper.java
...in/java/com/bailuntec/mapper/DcBaseOmsOrderExtMapper.java
+0
-2
RedisUtils.java
...-common/src/main/java/com/bailuntec/utils/RedisUtils.java
+1
-1
db-dev.properties
data-common/src/main/resources/db-dev.properties
+1
-1
db-prod.properties
data-common/src/main/resources/db-prod.properties
+1
-1
No files found.
data-base/base-sync-stock-wms/pom.xml
View file @
f194d294
...
...
@@ -36,15 +36,25 @@
</plugin>
<plugin>
<
groupId>
org.springframework.boot
</group
Id>
<
artifactId>
spring-boot-maven-plugin
</artifactId
>
<
artifactId>
maven-assembly-plugin
</artifact
Id>
<
version>
3.1.0
</version
>
<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>
<executions>
<execution>
<id>
make-assembly
</id>
<phase>
package
</phase>
<goals>
<goal>
repackag
e
</goal>
<goal>
singl
e
</goal>
</goals>
</execution>
</executions>
...
...
data-base/base-sync-stock-wms/src/main/java/com/bailuntec/Application.java
View file @
f194d294
...
...
@@ -30,7 +30,7 @@ public class Application {
private
static
final
String
EVENT_RDB_STORAGE_PASSWORD
=
propertiesUtil
.
getPropertyAsString
(
"EVENT_RDB_STORAGE_PASSWORD"
);
public
static
void
main
(
String
[]
args
)
{
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
(),
createJobConfiguration3
()).
init
();
}
...
...
@@ -48,12 +48,12 @@ public class Application {
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();
SimpleJobConfiguration simpleJobConfig = new SimpleJobConfiguration(simpleCoreConfig, WmsStockJob.class.getCanonicalName());
LiteJobConfiguration simpleJobRootConfig = LiteJobConfiguration.newBuilder(simpleJobConfig).build();
return simpleJobRootConfig;
}
}
*/
private
static
LiteJobConfiguration
createJobConfiguration2
()
{
JobCoreConfiguration
simpleCoreConfig
=
JobCoreConfiguration
.
newBuilder
(
propertiesUtil
.
getPropertyAsString
(
"JOB_NAME_LOGISTICS"
),
propertiesUtil
.
getPropertyAsString
(
"JOB_CRON_LOGISTICS"
),
propertiesUtil
.
getPropertyAsInt
(
"SHARDING_TOTAL_COUNT"
)).
build
();
...
...
data-base/base-sync-stock-wms/src/main/resources/const.properties
View file @
f194d294
#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_FBA_URL
=
http://
api.wms.bailuntec.com
/api/services/app/ThirdStockFbaService/GetFbaStocks
STOCK_WMS_URL
=
http://
api.wms.bailuntec.com
/api/services/app/WMSStockService/SearchAllProductStockByPage
STOCK_FBA_URL
=
http://
172.31.255.247:5001
/api/services/app/ThirdStockFbaService/GetFbaStocks
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_RECONCILIATION_URL
=
http://wms.bailuntec.com/api/services/app/LogisticsReconciliationService/GetBaseDataQuery
data-common/src/main/java/com/bailuntec/mapper/DcBaseOmsOrderExtMapper.java
View file @
f194d294
package
com
.
bailuntec
.
mapper
;
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
java.util.List
;
...
...
data-common/src/main/java/com/bailuntec/utils/RedisUtils.java
View file @
f194d294
...
...
@@ -21,7 +21,7 @@ public class RedisUtils {
config
.
setMaxWaitMillis
(
propertiesUtil
.
getPropertyAsInt
(
"SETMAXWAITMILLLIS"
));
config
.
setTestOnBorrow
(
true
);
jedisPool
=
new
JedisPool
(
config
,
propertiesUtil
.
getPropertyAsString
(
"REDIS_URL"
),
propertiesUtil
.
getPropertyAsInt
(
"REDIS_PORT"
));
log
.
warn
(
"初始化连接池"
);
//
log.warn("初始化连接池");
}
/*
...
...
data-common/src/main/resources/db-dev.properties
View file @
f194d294
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
password
=
#7kfnymAM$Y9-Ntf
data-common/src/main/resources/db-prod.properties
View file @
f194d294
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
password
=
#7kfnymAM$Y9-Ntf
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment