CaiXiang/cigs4
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: CaiXiang:41207394e5b636c498ed85236f7c0dd33f299707
Branches Tags
CaiXiang:master
CaiXiang:yanyang
CaiXiang:cicd
CaiXiang:dynamicDs
..
compare: CaiXiang:cade1cc1b9a03ed1ea75b7e664cee0f814235425
Branches Tags
CaiXiang:master
CaiXiang:yanyang
CaiXiang:cicd
CaiXiang:dynamicDs

No commits in common. "41207394e5b636c498ed85236f7c0dd33f299707" and "cade1cc1b9a03ed1ea75b7e664cee0f814235425" have entirely different histories.
41207394e5 ... cade1cc1b9

2 changed files with 15 additions and 15 deletions
Show Stats Expand all files Collapse all files

18
ym-gateway/src/main/resources/application-dev.yml
View File

@ -61,14 +61,14 @@ dynamic:
# username: root # username: root
# password: 1qaz@WSX3edc$RFV # password: 1qaz@WSX3edc$RFV
## camline系统 ## camline系统
camline:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://mysql.picaiba.com:30307/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
username: root
password: 1qaz@WSX3edc$RFV
#
# camline: # camline:
# driver-class-name: com.mysql.cj.jdbc.Driver # driver-class-name: com.mysql.cj.jdbc.Driver
# url: jdbc:mysql://10.0.1.23:3306/synapse?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true # url: jdbc:mysql://mysql.picaiba.com:30307/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
# username: offline_data # username: root
# password: tpvmfab4 # password: 1qaz@WSX3edc$RFV
#
camline:
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://10.0.1.23:3306/synapse?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
username: offline_data
password: tpvmfab4

12
ym-packing/src/main/java/com/cnbm/dispatch/KukaJoinThread.java
View File

@ -150,12 +150,12 @@ public class KukaJoinThread implements ApplicationRunner {
@Override @Override
public void run(ApplicationArguments args) throws Exception { public void run(ApplicationArguments args) throws Exception {
// kukaStep1.scheduleAtFixedRate(new Runnable() { kukaStep1.scheduleAtFixedRate(new Runnable() {
// @Override @Override
// public void run() { public void run() {
// logger.info("================= 现在开始执行 过程一 任务 =================="); logger.info("================= 现在开始执行 过程一 任务 ==================");
// } }
// },1,1, TimeUnit.SECONDS); },1,1, TimeUnit.SECONDS);