From fe55254e84cce4f92062f48fc4d1840dfdfdc02a Mon Sep 17 00:00:00 2001 From: 安瑾然 <107107765@qq.com> Date: 星期二, 12 七月 2022 16:36:25 +0800 Subject: [PATCH] commit --- src/main/java/com/example/jz/dao/CauseDao.java | 1 src/main/java/com/example/jz/modle/entity/Publicity.java | 1 src/main/java/com/example/jz/dao/AnnouncementDao.java | 1 src/main/java/com/example/jz/enums/BusinessHttpStatus.java | 13 ---- src/main/java/com/example/jz/modle/R.java | 3 src/main/java/com/example/jz/modle/entity/Announcement.java | 1 src/main/java/com/example/jz/service/impl/PublicityServiceImpl.java | 1 src/main/java/com/example/jz/service/impl/GroupUserServiceImpl.java | 1 src/main/java/com/example/jz/controller/MessageController.java | 1 src/main/java/com/example/jz/modle/entity/GroupUser.java | 2 src/main/java/com/example/jz/service/impl/GroupServiceImpl.java | 1 src/main/java/com/example/jz/service/CommonQuestionService.java | 2 src/main/java/com/example/jz/service/impl/AnnouncementServiceImpl.java | 1 src/main/java/com/example/jz/modle/dto/CommonQuestionDto.java | 1 src/main/java/com/example/jz/modle/dto/PublicityDto.java | 1 src/main/java/com/example/jz/service/impl/CauseServiceImpl.java | 1 src/main/java/com/example/jz/config/SwaggerConfig.java | 2 src/main/java/com/example/jz/modle/entity/Group.java | 7 +- src/main/java/com/example/jz/controller/CommonQuestionController.java | 1 src/main/java/com/example/jz/modle/entity/Message.java | 1 src/main/java/com/example/jz/service/MessageService.java | 1 src/main/java/com/example/jz/modle/entity/CommonQuestion.java | 1 src/main/java/com/example/jz/dao/GroupDao.java | 1 src/main/java/com/example/jz/controller/UserController.java | 1 src/main/java/com/example/jz/dao/CommonQuestionDao.java | 1 src/main/java/com/example/jz/controller/PublicityController.java | 1 src/main/java/com/example/jz/service/GroupService.java | 1 src/main/java/com/example/jz/controller/GroupUserController.java | 1 src/main/java/com/example/jz/controller/AnnouncementController.java | 1 src/main/java/com/example/jz/modle/entity/Cause.java | 5 + src/main/java/com/example/jz/exception/BusinessException.java | 9 -- src/main/java/com/example/jz/modle/entity/User.java | 5 + src/main/java/com/example/jz/controller/CauseController.java | 1 src/main/java/com/example/jz/dao/PublicityDao.java | 1 src/main/java/com/example/jz/service/UserService.java | 1 /dev/null | 31 ---------- src/main/java/com/example/jz/service/impl/UserServiceImpl.java | 1 src/main/java/com/example/jz/dao/GroupUserDao.java | 1 src/main/java/com/example/jz/modle/PageParam.java | 1 src/main/java/com/example/jz/service/GroupUserService.java | 1 src/main/java/com/example/jz/service/impl/MessageServiceImpl.java | 1 src/main/java/com/example/jz/service/PublicityService.java | 1 src/main/java/com/example/jz/dao/UserDao.java | 1 src/main/java/com/example/jz/controller/GroupController.java | 1 src/main/java/com/example/jz/service/impl/CommonQuestionServiceImpl.java | 1 src/main/resources/application.yml | 44 ++++++++++++++ src/main/java/com/example/jz/dao/MessageDao.java | 1 47 files changed, 59 insertions(+), 100 deletions(-) diff --git a/src/main/java/com/example/jz/config/SwaggerConfig.java b/src/main/java/com/example/jz/config/SwaggerConfig.java index 4269a27..39929ea 100644 --- a/src/main/java/com/example/jz/config/SwaggerConfig.java +++ b/src/main/java/com/example/jz/config/SwaggerConfig.java @@ -35,4 +35,4 @@ .version("1.0") .build(); } -} \ No newline at end of file +} diff --git a/src/main/java/com/example/jz/controller/AnnouncementController.java b/src/main/java/com/example/jz/controller/AnnouncementController.java index 3dadd1e..1a91dbb 100644 --- a/src/main/java/com/example/jz/controller/AnnouncementController.java +++ b/src/main/java/com/example/jz/controller/AnnouncementController.java @@ -83,4 +83,3 @@ return R.ok(this.announcementService.removeByIds(idList)); } } - diff --git a/src/main/java/com/example/jz/controller/CauseController.java b/src/main/java/com/example/jz/controller/CauseController.java index ec40390..29f16da 100644 --- a/src/main/java/com/example/jz/controller/CauseController.java +++ b/src/main/java/com/example/jz/controller/CauseController.java @@ -83,4 +83,3 @@ return success(this.causeService.removeByIds(idList)); } } - diff --git a/src/main/java/com/example/jz/controller/CommonQuestionController.java b/src/main/java/com/example/jz/controller/CommonQuestionController.java index eca49b5..a8256a0 100644 --- a/src/main/java/com/example/jz/controller/CommonQuestionController.java +++ b/src/main/java/com/example/jz/controller/CommonQuestionController.java @@ -93,4 +93,3 @@ return R.ok(commonQuestionService.removeByIds(idList)); } } - diff --git a/src/main/java/com/example/jz/controller/GroupController.java b/src/main/java/com/example/jz/controller/GroupController.java index 6999861..933a24c 100644 --- a/src/main/java/com/example/jz/controller/GroupController.java +++ b/src/main/java/com/example/jz/controller/GroupController.java @@ -86,4 +86,3 @@ return success(this.groupService.removeByIds(idList)); } } - diff --git a/src/main/java/com/example/jz/controller/GroupUserController.java b/src/main/java/com/example/jz/controller/GroupUserController.java index 53a7ea7..12deb72 100644 --- a/src/main/java/com/example/jz/controller/GroupUserController.java +++ b/src/main/java/com/example/jz/controller/GroupUserController.java @@ -83,4 +83,3 @@ return success(this.groupUserService.removeByIds(idList)); } } - diff --git a/src/main/java/com/example/jz/controller/MessageController.java b/src/main/java/com/example/jz/controller/MessageController.java index 0b09f6e..bd4137e 100644 --- a/src/main/java/com/example/jz/controller/MessageController.java +++ b/src/main/java/com/example/jz/controller/MessageController.java @@ -85,4 +85,3 @@ return success(this.messageService.removeByIds(idList)); } } - diff --git a/src/main/java/com/example/jz/controller/PublicityController.java b/src/main/java/com/example/jz/controller/PublicityController.java index 6521d7d..8ae7a06 100644 --- a/src/main/java/com/example/jz/controller/PublicityController.java +++ b/src/main/java/com/example/jz/controller/PublicityController.java @@ -118,4 +118,3 @@ return R.ok(publicityService.removeById(id)); } } - diff --git a/src/main/java/com/example/jz/controller/UserController.java b/src/main/java/com/example/jz/controller/UserController.java index 8dfb55c..6b2c106 100644 --- a/src/main/java/com/example/jz/controller/UserController.java +++ b/src/main/java/com/example/jz/controller/UserController.java @@ -83,4 +83,3 @@ return success(this.userService.removeByIds(idList)); } } - diff --git a/src/main/java/com/example/jz/dao/AnnouncementDao.java b/src/main/java/com/example/jz/dao/AnnouncementDao.java index 8185a36..bc48731 100644 --- a/src/main/java/com/example/jz/dao/AnnouncementDao.java +++ b/src/main/java/com/example/jz/dao/AnnouncementDao.java @@ -12,4 +12,3 @@ public interface AnnouncementDao extends BaseMapper<Announcement> { } - diff --git a/src/main/java/com/example/jz/dao/CauseDao.java b/src/main/java/com/example/jz/dao/CauseDao.java index 5161083..7338e9b 100644 --- a/src/main/java/com/example/jz/dao/CauseDao.java +++ b/src/main/java/com/example/jz/dao/CauseDao.java @@ -12,4 +12,3 @@ public interface CauseDao extends BaseMapper<Cause> { } - diff --git a/src/main/java/com/example/jz/dao/CommonQuestionDao.java b/src/main/java/com/example/jz/dao/CommonQuestionDao.java index 0db6c35..0121f29 100644 --- a/src/main/java/com/example/jz/dao/CommonQuestionDao.java +++ b/src/main/java/com/example/jz/dao/CommonQuestionDao.java @@ -18,4 +18,3 @@ IPage<CommonQuestionDto> findByPage(Page<CommonQuestionDto> page,@Param("qw") QueryWrapper<Object> objectQueryWrapper); } - diff --git a/src/main/java/com/example/jz/dao/GroupDao.java b/src/main/java/com/example/jz/dao/GroupDao.java index 7a44ce8..d7dbcea 100644 --- a/src/main/java/com/example/jz/dao/GroupDao.java +++ b/src/main/java/com/example/jz/dao/GroupDao.java @@ -13,4 +13,3 @@ public interface GroupDao extends BaseMapper<Group> { } - diff --git a/src/main/java/com/example/jz/dao/GroupUserDao.java b/src/main/java/com/example/jz/dao/GroupUserDao.java index b55c70c..f7514e4 100644 --- a/src/main/java/com/example/jz/dao/GroupUserDao.java +++ b/src/main/java/com/example/jz/dao/GroupUserDao.java @@ -12,4 +12,3 @@ public interface GroupUserDao extends BaseMapper<GroupUser> { } - diff --git a/src/main/java/com/example/jz/dao/MessageDao.java b/src/main/java/com/example/jz/dao/MessageDao.java index e9bf134..621a475 100644 --- a/src/main/java/com/example/jz/dao/MessageDao.java +++ b/src/main/java/com/example/jz/dao/MessageDao.java @@ -12,4 +12,3 @@ public interface MessageDao extends BaseMapper<Message> { } - diff --git a/src/main/java/com/example/jz/dao/PublicityDao.java b/src/main/java/com/example/jz/dao/PublicityDao.java index 8235881..a8e463c 100644 --- a/src/main/java/com/example/jz/dao/PublicityDao.java +++ b/src/main/java/com/example/jz/dao/PublicityDao.java @@ -18,4 +18,3 @@ IPage<PublicityDto> findByPage(PageParam<PublicityDto> page,@Param("qw") QueryWrapper<PublicityDto> publicityDtoQueryWrapper); } - diff --git a/src/main/java/com/example/jz/dao/UserDao.java b/src/main/java/com/example/jz/dao/UserDao.java index 16e00ea..59e9595 100644 --- a/src/main/java/com/example/jz/dao/UserDao.java +++ b/src/main/java/com/example/jz/dao/UserDao.java @@ -12,4 +12,3 @@ public interface UserDao extends BaseMapper<User> { } - diff --git a/src/main/java/com/example/jz/enums/BusinessHttpStatus.java b/src/main/java/com/example/jz/enums/BusinessHttpStatus.java index 975f63d..5578fbc 100644 --- a/src/main/java/com/example/jz/enums/BusinessHttpStatus.java +++ b/src/main/java/com/example/jz/enums/BusinessHttpStatus.java @@ -4,6 +4,7 @@ // 鏈櫥褰� UNAUTHORIZED(401, "鏈櫥褰�"), + // 鏈煡寮傚父 BAD_EXCEPTION(10000, "绯荤粺寮傚父"), // 鎴愬姛 SUCCESS(200, "鎴愬姛"); @@ -12,35 +13,23 @@ private final String msg; - BusinessHttpStatus(int value, String msg) { this.value = value; this.msg = msg; } - - /** - * Return the integer value of this status code. - */ public int value() { return this.value; } - /** - * Return the msg of this status code. - */ public String getMsg() { return msg; } - /** - * Return a string representation of this status code. - */ @Override public String toString() { return this.value + " " + name(); } - public static BusinessHttpStatus valueOf(int statusCode) { BusinessHttpStatus status = resolve(statusCode); diff --git a/src/main/java/com/example/jz/exception/BusinessException.java b/src/main/java/com/example/jz/exception/BusinessException.java index 13df96e..0da499a 100644 --- a/src/main/java/com/example/jz/exception/BusinessException.java +++ b/src/main/java/com/example/jz/exception/BusinessException.java @@ -5,16 +5,12 @@ public class BusinessException extends RuntimeException { - /** - * - */ private static final long serialVersionUID = -4137688758944857209L; /** * http鐘舵�佺爜 */ private Integer httpStatusCode; - /** * @param httpStatus http鐘舵�佺爜 @@ -32,15 +28,12 @@ this.httpStatusCode = httpStatus.value(); } - public BusinessException(String msg) { super(msg); this.httpStatusCode = BusinessHttpStatus.BAD_EXCEPTION.value(); } - public Integer getHttpStatusCode() { return httpStatusCode; } - -} \ No newline at end of file +} diff --git a/src/main/java/com/example/jz/modle/PageParam.java b/src/main/java/com/example/jz/modle/PageParam.java index c68f6a0..2fd9400 100644 --- a/src/main/java/com/example/jz/modle/PageParam.java +++ b/src/main/java/com/example/jz/modle/PageParam.java @@ -12,6 +12,7 @@ */ @ApiParam(hidden = true) private List<T> records; + /** * 鎬绘暟 */ diff --git a/src/main/java/com/example/jz/modle/R.java b/src/main/java/com/example/jz/modle/R.java index 8498f22..5f25390 100644 --- a/src/main/java/com/example/jz/modle/R.java +++ b/src/main/java/com/example/jz/modle/R.java @@ -67,5 +67,4 @@ apiResult.setMsg(msg); return apiResult; } - -} \ No newline at end of file +} diff --git a/src/main/java/com/example/jz/modle/dto/CommonQuestionDto.java b/src/main/java/com/example/jz/modle/dto/CommonQuestionDto.java index b2391c4..b3ab005 100644 --- a/src/main/java/com/example/jz/modle/dto/CommonQuestionDto.java +++ b/src/main/java/com/example/jz/modle/dto/CommonQuestionDto.java @@ -58,4 +58,3 @@ return this.id; } } - diff --git a/src/main/java/com/example/jz/modle/dto/PublicityDto.java b/src/main/java/com/example/jz/modle/dto/PublicityDto.java index bf0904a..d1e21a1 100644 --- a/src/main/java/com/example/jz/modle/dto/PublicityDto.java +++ b/src/main/java/com/example/jz/modle/dto/PublicityDto.java @@ -58,4 +58,3 @@ return this.id; } } - diff --git a/src/main/java/com/example/jz/modle/entity/Announcement.java b/src/main/java/com/example/jz/modle/entity/Announcement.java index 349b27a..24eed75 100644 --- a/src/main/java/com/example/jz/modle/entity/Announcement.java +++ b/src/main/java/com/example/jz/modle/entity/Announcement.java @@ -65,4 +65,3 @@ return this.announcementId; } } - diff --git a/src/main/java/com/example/jz/modle/entity/Cause.java b/src/main/java/com/example/jz/modle/entity/Cause.java index 94a7c0c..a5de68c 100644 --- a/src/main/java/com/example/jz/modle/entity/Cause.java +++ b/src/main/java/com/example/jz/modle/entity/Cause.java @@ -1,7 +1,9 @@ package com.example.jz.modle.entity; import java.util.Date; + import com.baomidou.mybatisplus.extension.activerecord.Model; + import java.io.Serializable; /** @@ -123,5 +125,4 @@ protected Serializable pkVal() { return this.id; } - } - +} diff --git a/src/main/java/com/example/jz/modle/entity/CommonQuestion.java b/src/main/java/com/example/jz/modle/entity/CommonQuestion.java index 31e83b9..9943efa 100644 --- a/src/main/java/com/example/jz/modle/entity/CommonQuestion.java +++ b/src/main/java/com/example/jz/modle/entity/CommonQuestion.java @@ -59,4 +59,3 @@ return this.id; } } - diff --git a/src/main/java/com/example/jz/modle/entity/Group.java b/src/main/java/com/example/jz/modle/entity/Group.java index a921058..009564e 100644 --- a/src/main/java/com/example/jz/modle/entity/Group.java +++ b/src/main/java/com/example/jz/modle/entity/Group.java @@ -1,12 +1,14 @@ package com.example.jz.modle.entity; import java.util.Date; + import com.baomidou.mybatisplus.extension.activerecord.Model; + import java.io.Serializable; /** * 缇よ〃 -(Group)琛ㄥ疄浣撶被 + * (Group)琛ㄥ疄浣撶被 * * @author makejava * @since 2022-07-11 16:35:57 @@ -74,5 +76,4 @@ protected Serializable pkVal() { return this.groupId; } - } - +} diff --git a/src/main/java/com/example/jz/modle/entity/GroupUser.java b/src/main/java/com/example/jz/modle/entity/GroupUser.java index 39ce007..8146e70 100644 --- a/src/main/java/com/example/jz/modle/entity/GroupUser.java +++ b/src/main/java/com/example/jz/modle/entity/GroupUser.java @@ -41,6 +41,4 @@ public void setBanSpeech(Object banSpeech) { this.banSpeech = banSpeech; } - } - diff --git a/src/main/java/com/example/jz/modle/entity/Message.java b/src/main/java/com/example/jz/modle/entity/Message.java index 24051af..f92f9e1 100644 --- a/src/main/java/com/example/jz/modle/entity/Message.java +++ b/src/main/java/com/example/jz/modle/entity/Message.java @@ -39,4 +39,3 @@ return this.id; } } - diff --git a/src/main/java/com/example/jz/modle/entity/Publicity.java b/src/main/java/com/example/jz/modle/entity/Publicity.java index 8b2d8ae..a8bf353 100644 --- a/src/main/java/com/example/jz/modle/entity/Publicity.java +++ b/src/main/java/com/example/jz/modle/entity/Publicity.java @@ -60,4 +60,3 @@ return this.id; } } - diff --git a/src/main/java/com/example/jz/modle/entity/User.java b/src/main/java/com/example/jz/modle/entity/User.java index 0311bb3..4be7481 100644 --- a/src/main/java/com/example/jz/modle/entity/User.java +++ b/src/main/java/com/example/jz/modle/entity/User.java @@ -1,7 +1,9 @@ package com.example.jz.modle.entity; import java.util.Date; + import com.baomidou.mybatisplus.extension.activerecord.Model; + import java.io.Serializable; /** @@ -163,5 +165,4 @@ protected Serializable pkVal() { return this.userId; } - } - +} diff --git a/src/main/java/com/example/jz/service/CommonQuestionService.java b/src/main/java/com/example/jz/service/CommonQuestionService.java index ed001a5..5ebab46 100644 --- a/src/main/java/com/example/jz/service/CommonQuestionService.java +++ b/src/main/java/com/example/jz/service/CommonQuestionService.java @@ -14,7 +14,5 @@ * @since 2022-07-11 16:35:57 */ public interface CommonQuestionService extends IService<CommonQuestion> { - IPage<CommonQuestionDto> findByPage(Page<CommonQuestionDto> page, QueryWrapper<Object> objectQueryWrapper); } - diff --git a/src/main/java/com/example/jz/service/GroupService.java b/src/main/java/com/example/jz/service/GroupService.java index f11c69b..a87496f 100644 --- a/src/main/java/com/example/jz/service/GroupService.java +++ b/src/main/java/com/example/jz/service/GroupService.java @@ -13,4 +13,3 @@ public interface GroupService extends IService<Group> { } - diff --git a/src/main/java/com/example/jz/service/GroupUserService.java b/src/main/java/com/example/jz/service/GroupUserService.java index 2ea911e..9b53918 100644 --- a/src/main/java/com/example/jz/service/GroupUserService.java +++ b/src/main/java/com/example/jz/service/GroupUserService.java @@ -12,4 +12,3 @@ public interface GroupUserService extends IService<GroupUser> { } - diff --git a/src/main/java/com/example/jz/service/MessageService.java b/src/main/java/com/example/jz/service/MessageService.java index db6d184..4c9a28c 100644 --- a/src/main/java/com/example/jz/service/MessageService.java +++ b/src/main/java/com/example/jz/service/MessageService.java @@ -12,4 +12,3 @@ public interface MessageService extends IService<Message> { } - diff --git a/src/main/java/com/example/jz/service/PublicityService.java b/src/main/java/com/example/jz/service/PublicityService.java index 34c52b3..7173d3a 100644 --- a/src/main/java/com/example/jz/service/PublicityService.java +++ b/src/main/java/com/example/jz/service/PublicityService.java @@ -23,4 +23,3 @@ IPage<PublicityDto> findByPage(PageParam<PublicityDto> page, QueryWrapper<PublicityDto> publicityDtoQueryWrapper); } - diff --git a/src/main/java/com/example/jz/service/UserService.java b/src/main/java/com/example/jz/service/UserService.java index 05077cf..a0ea84e 100644 --- a/src/main/java/com/example/jz/service/UserService.java +++ b/src/main/java/com/example/jz/service/UserService.java @@ -12,4 +12,3 @@ public interface UserService extends IService<User> { } - diff --git a/src/main/java/com/example/jz/service/impl/AnnouncementServiceImpl.java b/src/main/java/com/example/jz/service/impl/AnnouncementServiceImpl.java index b9e29ff..0887f7e 100644 --- a/src/main/java/com/example/jz/service/impl/AnnouncementServiceImpl.java +++ b/src/main/java/com/example/jz/service/impl/AnnouncementServiceImpl.java @@ -16,4 +16,3 @@ public class AnnouncementServiceImpl extends ServiceImpl<AnnouncementDao, Announcement> implements AnnouncementService { } - diff --git a/src/main/java/com/example/jz/service/impl/CauseServiceImpl.java b/src/main/java/com/example/jz/service/impl/CauseServiceImpl.java index a69c7a7..b88d5f7 100644 --- a/src/main/java/com/example/jz/service/impl/CauseServiceImpl.java +++ b/src/main/java/com/example/jz/service/impl/CauseServiceImpl.java @@ -16,4 +16,3 @@ public class CauseServiceImpl extends ServiceImpl<CauseDao, Cause> implements CauseService { } - diff --git a/src/main/java/com/example/jz/service/impl/CommonQuestionServiceImpl.java b/src/main/java/com/example/jz/service/impl/CommonQuestionServiceImpl.java index 085bc84..1f1d972 100644 --- a/src/main/java/com/example/jz/service/impl/CommonQuestionServiceImpl.java +++ b/src/main/java/com/example/jz/service/impl/CommonQuestionServiceImpl.java @@ -28,4 +28,3 @@ return commonQuestionDao.findByPage(page, objectQueryWrapper); } } - diff --git a/src/main/java/com/example/jz/service/impl/GroupServiceImpl.java b/src/main/java/com/example/jz/service/impl/GroupServiceImpl.java index 7f5d4ef..4e23eca 100644 --- a/src/main/java/com/example/jz/service/impl/GroupServiceImpl.java +++ b/src/main/java/com/example/jz/service/impl/GroupServiceImpl.java @@ -17,4 +17,3 @@ public class GroupServiceImpl extends ServiceImpl<GroupDao, Group> implements GroupService { } - diff --git a/src/main/java/com/example/jz/service/impl/GroupUserServiceImpl.java b/src/main/java/com/example/jz/service/impl/GroupUserServiceImpl.java index 6103704..6a221c9 100644 --- a/src/main/java/com/example/jz/service/impl/GroupUserServiceImpl.java +++ b/src/main/java/com/example/jz/service/impl/GroupUserServiceImpl.java @@ -16,4 +16,3 @@ public class GroupUserServiceImpl extends ServiceImpl<GroupUserDao, GroupUser> implements GroupUserService { } - diff --git a/src/main/java/com/example/jz/service/impl/MessageServiceImpl.java b/src/main/java/com/example/jz/service/impl/MessageServiceImpl.java index 99f7e20..7ef1480 100644 --- a/src/main/java/com/example/jz/service/impl/MessageServiceImpl.java +++ b/src/main/java/com/example/jz/service/impl/MessageServiceImpl.java @@ -16,4 +16,3 @@ public class MessageServiceImpl extends ServiceImpl<MessageDao, Message> implements MessageService { } - diff --git a/src/main/java/com/example/jz/service/impl/PublicityServiceImpl.java b/src/main/java/com/example/jz/service/impl/PublicityServiceImpl.java index 64c5953..90390a8 100644 --- a/src/main/java/com/example/jz/service/impl/PublicityServiceImpl.java +++ b/src/main/java/com/example/jz/service/impl/PublicityServiceImpl.java @@ -52,4 +52,3 @@ return publicityDao.findByPage(page, publicityDtoQueryWrapper); } } - diff --git a/src/main/java/com/example/jz/service/impl/UserServiceImpl.java b/src/main/java/com/example/jz/service/impl/UserServiceImpl.java index c0cdb29..0b23871 100644 --- a/src/main/java/com/example/jz/service/impl/UserServiceImpl.java +++ b/src/main/java/com/example/jz/service/impl/UserServiceImpl.java @@ -16,4 +16,3 @@ public class UserServiceImpl extends ServiceImpl<UserDao, User> implements UserService { } - diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties deleted file mode 100644 index 5ab70b3..0000000 --- a/src/main/resources/application.properties +++ /dev/null @@ -1,31 +0,0 @@ -### web -server.port=8080 -### datasource -#test -spring.datasource.url=jdbc:mysql://42.193.1.25:3306/qyjz?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai -spring.datasource.username=root -spring.datasource.password=321$YcYl@1970! -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -### datasource-pool -spring.datasource.type=com.zaxxer.hikari.HikariDataSource -spring.datasource.hikari.minimum-idle=10 -spring.datasource.hikari.maximum-pool-size=30 -spring.datasource.hikari.auto-commit=true -spring.datasource.hikari.idle-timeout=30000 -spring.datasource.hikari.pool-name=HikariCP -spring.datasource.hikari.max-lifetime=900000 -spring.datasource.hikari.connection-timeout=10000 -spring.datasource.hikari.connection-test-query=SELECT 1 -spring.datasource.hikari.validation-timeout=1000 -# ???????? -spring.servlet.multipart.max-file-size=50MB -# minio?? -minio.address=http://119.28.5.249:9000 -minio.accessKey=minioadmin -minio.secretKey=minioadmin -minio.bucketName=img -# mybatis?? -mybatis-plus.global-config.banner=false -mybatis-plus.global-config.db-config.id-type=auto -mybatis-plus.global-config.db-config.field-strategy=NOT_NULL -mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml new file mode 100644 index 0000000..85a0d04 --- /dev/null +++ b/src/main/resources/application.yml @@ -0,0 +1,44 @@ +# 绔彛鍙� +server: + port: 8080 + +# spring閰嶇疆 +spring: + # 鏁版嵁婧愰厤缃� + datasource: + url: jdbc:mysql://42.193.1.25:3306/qyjz?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&serverTimezone=Asia/Shanghai + username: root + password: 321$YcYl@1970! + driverClassName: com.mysql.cj.jdbc.Driver + type: com.zaxxer.hikari.HikariDataSource + # 鏁版嵁搴撹繛鎺ユ睜閰嶇疆 + hikari: + minimum-idle: 10 + maximum-pool-size: 30 + auto-commit: true + idle-timeout: 30000 + pool-name: HikariCP + max-lifetime: 900000 + connection-timeout: 10000 + connection-test-query: SELECT 1 + validation-timeout: 1000 + servlet: + multipart: + max-file-size: 50MB + +# minio閰嶇疆 +minio: + address: http://119.28.5.249:9000 + accessKey: minioadmin + secretKey: minioadmin + bucketName: img + +# mybatis閰嶇疆 +mybatis-plus: + global-config: + banner: false + db-config: + id-type: auto + field-strategy: NOT_NULL + configuration: + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl -- Gitblit v1.8.0