Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
b693354748
@ -35,8 +35,8 @@ public class QRCServiceImpl implements QRCService{
|
|||||||
collectIconList.setQr_url(base64);
|
collectIconList.setQr_url(base64);
|
||||||
collectIconListDao.insertSelective(collectIconList);
|
collectIconListDao.insertSelective(collectIconList);
|
||||||
// return JSON.toJSONString(collectIconListDao.selectByUrlid(url_id));
|
// return JSON.toJSONString(collectIconListDao.selectByUrlid(url_id));
|
||||||
// return JSON.toJSONString(base64);
|
return JSON.toJSONString(base64);
|
||||||
return null;
|
// return null;
|
||||||
}else {
|
}else {
|
||||||
return JSON.toJSONString(collectIconListDao.selectByUrlid(url_id));
|
return JSON.toJSONString(collectIconListDao.selectByUrlid(url_id));
|
||||||
}
|
}
|
||||||
|
@ -1,10 +1,14 @@
|
|||||||
spring:
|
spring:
|
||||||
|
spring:
|
||||||
|
jackson:
|
||||||
|
time-zone: GMT+8
|
||||||
|
date-format: yyyy-MM-dd
|
||||||
mvc:
|
mvc:
|
||||||
static-path-pattern: /static/**
|
static-path-pattern: /static/**
|
||||||
datasource:
|
datasource:
|
||||||
url: jdbc:mysql://localhost:3306/love-nav
|
url: jdbc:mysql://localhost:3306/love-nav
|
||||||
username: root
|
username: root
|
||||||
password: 123456
|
password: sjm123
|
||||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||||
redis:
|
redis:
|
||||||
host: localhost
|
host: localhost
|
||||||
|
Loading…
Reference in New Issue
Block a user