From a9dac9f91bc1074eff5440864e07af881b250f18 Mon Sep 17 00:00:00 2001
From: wanggeng888 <450292408@qq.com>
Date: Thu, 11 Mar 2021 12:52:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../message/MessageResourceController.java | 45 +++++++++++++++++++
cloud-security/pom.xml | 5 +++
.../src/test/java/com/cm/LicenseTest.java | 4 +-
pom.xml | 6 +++
4 files changed, 58 insertions(+), 2 deletions(-)
create mode 100644 cloud-common-websocket/src/main/java/com/cm/websocket/controller/message/MessageResourceController.java
diff --git a/cloud-common-websocket/src/main/java/com/cm/websocket/controller/message/MessageResourceController.java b/cloud-common-websocket/src/main/java/com/cm/websocket/controller/message/MessageResourceController.java
new file mode 100644
index 0000000..9dbfb21
--- /dev/null
+++ b/cloud-common-websocket/src/main/java/com/cm/websocket/controller/message/MessageResourceController.java
@@ -0,0 +1,45 @@
+package com.cm.websocket.controller.message;
+
+import com.cm.common.annotation.CheckRequestBodyAnnotation;
+import com.cm.common.constants.ISystemConstant;
+import com.cm.common.result.ErrorResult;
+import com.cm.common.result.SuccessResult;
+import com.cm.websocket.pojo.vos.message.NoticeVO;
+import com.cm.websocket.service.IMessageService;
+import io.swagger.annotations.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * When you feel like quitting. Think about why you started
+ * 当你想要放弃的时候，想想当初你为何开始
+ *
+ * @ClassName: MessageResourceController
+ * @Description:
+ * @Author: wanggeng
+ * @Date: 2021/1/19 5:01 下午
+ * @Version: 1.0
+ */
+@Api(tags = ISystemConstant.API_TAGS_RESOURCE_PREFIX + "消息接口")
+@RestController
+@RequestMapping(ISystemConstant.RESOURCE_PREFIX + "/message")
+public class MessageResourceController {
+
+ @Autowired
+ private IMessageService messageService;
+
+ @ApiOperation(value = "通知消息", notes = "通知消息接口")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "access_token", value = "access_token", paramType = "query")
+ })
+ @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
+ @PostMapping("noticewithtarget")
+ @CheckRequestBodyAnnotation
+ public SuccessResult saveNoticeWithTarget(@RequestBody NoticeVO noticeVO) {
+ return messageService.saveNoticeWithTarget(noticeVO);
+ }
+
+}
diff --git a/cloud-security/pom.xml b/cloud-security/pom.xml
index 7875376..93fcfda 100644
--- a/cloud-security/pom.xml
+++ b/cloud-security/pom.xml
@@ -32,6 +32,11 @@
com.alibaba
fastjson
+
+
+
+
+
diff --git a/cloud-security/src/test/java/com/cm/LicenseTest.java b/cloud-security/src/test/java/com/cm/LicenseTest.java
index 2550b5f..298f893 100644
--- a/cloud-security/src/test/java/com/cm/LicenseTest.java
+++ b/cloud-security/src/test/java/com/cm/LicenseTest.java
@@ -36,14 +36,14 @@ public class LicenseTest {
// 本机：F0-79-60-1E-49-FC
// 应急管理局测试服务器(58.18.22.25)：00-50-56-BE-3C-BC
// 包头政法委：00-50-56-93-2D-29
- // 内蒙古艺校：18-66-DA-E8-EC-D4
+ // 内蒙古艺校：84-65-69-5C-23-AA
// String mac = AddressUtil.getMacAddress();
// System.out.println(mac);
// 环保统一用户：FA-16-3E-17-20-7D
// 包头体育局：00-16-3E-00-F3-CE
// 包头安监局业务服务器（00-50-56-93-66-AC）
// 西藏日喀则：08-94-EF-6B-5A-44
- String license = License.getLicense("2020-08-25", "10000", "00-16-3E-00-F3-CE", "_System_License_");
+ String license = License.getLicense("2020-08-25", "10000", "84-65-69-5C-23-AA", "_System_License_");
System.out.println(license);
}
diff --git a/pom.xml b/pom.xml
index 27b298e..880fe53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -464,6 +464,12 @@
2.0.20
+
+
+ log4j
+ log4j
+ 1.2.14
+