diff --git a/model/src/main/java/cn/org/gitlink/notification/model/service/notification/impl/SysNotificationServiceImpl.java b/model/src/main/java/cn/org/gitlink/notification/model/service/notification/impl/SysNotificationServiceImpl.java index 4ab4420..1c4bc8e 100644 --- a/model/src/main/java/cn/org/gitlink/notification/model/service/notification/impl/SysNotificationServiceImpl.java +++ b/model/src/main/java/cn/org/gitlink/notification/model/service/notification/impl/SysNotificationServiceImpl.java @@ -12,7 +12,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.Arrays; import java.util.List; -@Service +@Service(value = "sysNotificationServiceImpl") public class SysNotificationServiceImpl extends ServiceImpl implements SysNotificationService { @Override diff --git a/model/src/main/java/resources/application.yml b/model/src/main/java/resources/application.yml index 68da3cd..b5c14d1 100644 --- a/model/src/main/java/resources/application.yml +++ b/model/src/main/java/resources/application.yml @@ -2,6 +2,6 @@ spring: datasource: # 配置数据源类型 driver-class-name: com.mysql.jdbc.Driver - url: jdbc:mysql://192.168.199.117/gitlink-notification-system?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2B8&allowMultiQueries=true - username: root - password: 950611 \ No newline at end of file + url: jdbc:mysql://localhost:33306/gitlink_notification?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2B8&allowMultiQueries=true + username: gitlink + password: giTlinK0^827 \ No newline at end of file diff --git a/reader/pom.xml b/reader/pom.xml index 9c70c9f..577800a 100644 --- a/reader/pom.xml +++ b/reader/pom.xml @@ -25,6 +25,11 @@ gns-common 1.0.0 + + cn.org.gitlink.notification + gns-model + 1.0.0 + diff --git a/reader/src/main/java/cn/org/gitlink/notification/reader/controller/IndexController.java b/reader/src/main/java/cn/org/gitlink/notification/reader/controller/IndexController.java deleted file mode 100644 index b0fb217..0000000 --- a/reader/src/main/java/cn/org/gitlink/notification/reader/controller/IndexController.java +++ /dev/null @@ -1,19 +0,0 @@ -package cn.org.gitlink.notification.reader.controller; - -import cn.org.gitlink.notification.common.response.DataPacketUtil; -import cn.org.gitlink.notification.common.response.ResponseData; -import cn.org.gitlink.notification.common.utils.RedisUtil; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -public class IndexController { - @Autowired - private RedisUtil redisUtil; - @GetMapping(value = "") - public ResponseData index() { - redisUtil.set("hello", "Hello reader!"); - return DataPacketUtil.jsonSuccessResult(redisUtil.get("hello").toString()); - } -} diff --git a/reader/src/main/java/cn/org/gitlink/notification/reader/controller/SysNotificationController.java b/reader/src/main/java/cn/org/gitlink/notification/reader/controller/SysNotificationController.java new file mode 100644 index 0000000..b3408a9 --- /dev/null +++ b/reader/src/main/java/cn/org/gitlink/notification/reader/controller/SysNotificationController.java @@ -0,0 +1,40 @@ +package cn.org.gitlink.notification.reader.controller; + +import cn.org.gitlink.notification.common.response.DataPacketUtil; +import cn.org.gitlink.notification.common.response.ResponseData; +import cn.org.gitlink.notification.common.utils.RedisUtil; +import cn.org.gitlink.notification.model.dao.entity.SysNotification; +import cn.org.gitlink.notification.model.service.notification.SysNotificationService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping(value = "/gns/sys_notification") +public class SysNotificationController { + + public static final String GITLINK_PLATFORM_CODE = "gitlink"; + + @Autowired + private RedisUtil redisUtil; + + @Autowired + @Qualifier(value = "sysNotificationServiceImpl") + private SysNotificationService notificationService; + + + @GetMapping(value = "/unread_message_count/{receiver}") + public ResponseData unreadMessageCount(@PathVariable(name = "receiver", required = true) Integer receiver) { + if (receiver > 0) { + List foundList = notificationService.getUnreadSysNotificationsList(SysNotificationController.GITLINK_PLATFORM_CODE, receiver, 20); + return DataPacketUtil.jsonSuccessResult(foundList); + } else { + return DataPacketUtil.jsonFailResult("参数 {receiver} 非法"); + } + } +} diff --git a/reader/src/main/resources/application.yml b/reader/src/main/resources/application.yml index 079c435..dc9bb80 100644 --- a/reader/src/main/resources/application.yml +++ b/reader/src/main/resources/application.yml @@ -5,6 +5,7 @@ logging: config: classpath:logback.xml spring: + redis: # Redis数据库索引(默认为0) database: 0 @@ -26,5 +27,12 @@ spring: # 连接超时时间(毫秒) timeout: 1000 + datasource: + # 配置数据源类型 + driver-class-name: com.mysql.jdbc.Driver + url: jdbc:mysql://localhost:33306/gitlink_notification?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2B8&allowMultiQueries=true + username: gitlink + password: giTlinK0^827 + #ip白名单列表,多个ip用逗号隔开,允许所有用*号 white-list: '*' \ No newline at end of file