LoveNav/love-nav
LoveNav/love-nav
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
cyk 2023-12-27 19:01:27 +08:00
commit b693354748
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/lovenav/service/serviceImpl/QRCServiceImpl.java
View File

@ -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));
} }

6
src/main/resources/application.yml
View File

@ -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