Commit Graph
7 Commits
Author SHA1 Message Date
Hellohao bd77e4cbb6 2019-08-29更新 2019-08-29 14:13:25 +08:00
Hellohao 0f4cfa98e5 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	sql/picturebed.sql
#	src/main/java/cn/hellohao/controller/AdminRootController.java
#	src/main/java/cn/hellohao/controller/UpdateImgController.java
#	src/main/java/cn/hellohao/controller/UserController.java
#	src/main/java/cn/hellohao/dao/SysConfigMapper.java
#	src/main/java/cn/hellohao/pojo/Config.java
#	src/main/java/cn/hellohao/service/SysConfigService.java
#	src/main/java/cn/hellohao/service/UserService.java
#	src/main/java/cn/hellohao/service/impl/UserServiceImpl.java
#	src/main/java/cn/hellohao/utils/SendEmail.java
#	src/main/resources/application.properties
#	src/main/resources/mapper/UserMapper.xml
#	src/main/resources/static/layui/layui/css/layui.css
#	src/main/resources/templates/admin/about.html
#	src/main/resources/templates/admin/index.html
#	src/main/resources/templates/admin/setuser.html
#	src/main/resources/templates/admin/user.html
#	src/main/resources/templates/admin/webconfig.html
#	src/main/resources/templates/index.html
2019-08-25 17:59:52 +08:00
Hellohao dad6001214 2019-08-25更新2.0版本 2019-08-25 17:58:15 +08:00
Hellohao f05f389e02 2019-08-10更新 2019-08-10 16:26:59 +08:00
Hellohao d777f42719 2019-08-07更新 增加API接口 2019-08-07 23:22:44 +08:00
Hellohao 832d141020 2019-7-25更新 修复多个错误 2019-07-25 17:51:49 +08:00
Hellohao 52a70aaf96 2019-7-21更新 支持自定义图片url格式 2019-07-23 21:10:29 +08:00