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);
|
||||
collectIconListDao.insertSelective(collectIconList);
|
||||
// return JSON.toJSONString(collectIconListDao.selectByUrlid(url_id));
|
||||
// return JSON.toJSONString(base64);
|
||||
return null;
|
||||
return JSON.toJSONString(base64);
|
||||
// return null;
|
||||
}else {
|
||||
return JSON.toJSONString(collectIconListDao.selectByUrlid(url_id));
|
||||
}
|
||||
|
@ -1,10 +1,14 @@
|
||||
spring:
|
||||
spring:
|
||||
jackson:
|
||||
time-zone: GMT+8
|
||||
date-format: yyyy-MM-dd
|
||||
mvc:
|
||||
static-path-pattern: /static/**
|
||||
datasource:
|
||||
url: jdbc:mysql://localhost:3306/love-nav
|
||||
username: root
|
||||
password: 123456
|
||||
password: sjm123
|
||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
redis:
|
||||
host: localhost
|
||||
|
Loading…
Reference in New Issue
Block a user