提交 7799afbf 编写于 作者: O o2null

Merge branch 'feat/consumeQueue' into 'develop'

Deprecated v2

See merge request o2oa/o2oa!499
...@@ -77,6 +77,7 @@ class ActionCreate extends BaseAction { ...@@ -77,6 +77,7 @@ class ActionCreate extends BaseAction {
return result; return result;
} }
@Deprecated
private void save(Instant instant, List<Message> messages) throws Exception { private void save(Instant instant, List<Message> messages) throws Exception {
try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) { try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
emc.beginTransaction(Instant.class); emc.beginTransaction(Instant.class);
...@@ -91,6 +92,7 @@ class ActionCreate extends BaseAction { ...@@ -91,6 +92,7 @@ class ActionCreate extends BaseAction {
} }
} }
@Deprecated
private List<Message> assemble(Wi wi, Map<String, String> consumersV2, Instant instant) throws Exception { private List<Message> assemble(Wi wi, Map<String, String> consumersV2, Instant instant) throws Exception {
List<Message> messages = new ArrayList<>(); List<Message> messages = new ArrayList<>();
if (!consumersV2.isEmpty()) { if (!consumersV2.isEmpty()) {
...@@ -108,6 +110,7 @@ class ActionCreate extends BaseAction { ...@@ -108,6 +110,7 @@ class ActionCreate extends BaseAction {
return messages; return messages;
} }
@Deprecated
private Wi executeFun(Wi wi, String func, String consumer) { private Wi executeFun(Wi wi, String func, String consumer) {
Wi cpWi = wi; Wi cpWi = wi;
try { try {
...@@ -143,6 +146,7 @@ class ActionCreate extends BaseAction { ...@@ -143,6 +146,7 @@ class ActionCreate extends BaseAction {
return cpWi; return cpWi;
} }
@Deprecated
private Message assembleMessage(String consumer, Wi cpWi, Instant instant) throws Exception { private Message assembleMessage(String consumer, Wi cpWi, Instant instant) throws Exception {
Message message = null; Message message = null;
switch (Objects.toString(consumer, "")) { switch (Objects.toString(consumer, "")) {
...@@ -177,6 +181,7 @@ class ActionCreate extends BaseAction { ...@@ -177,6 +181,7 @@ class ActionCreate extends BaseAction {
} }
@Deprecated
private void sendMessage(List<Message> messages) throws Exception { private void sendMessage(List<Message> messages) throws Exception {
for (Message message : messages) { for (Message message : messages) {
switch (message.getConsumer()) { switch (message.getConsumer()) {
...@@ -210,6 +215,7 @@ class ActionCreate extends BaseAction { ...@@ -210,6 +215,7 @@ class ActionCreate extends BaseAction {
} }
} }
@Deprecated
private void sendMessageMPWeixin(Message message) throws Exception { private void sendMessageMPWeixin(Message message) throws Exception {
if (BooleanUtils.isTrue(Config.mPweixin().getEnable()) if (BooleanUtils.isTrue(Config.mPweixin().getEnable())
&& BooleanUtils.isTrue(Config.mPweixin().getMessageEnable())) { && BooleanUtils.isTrue(Config.mPweixin().getMessageEnable())) {
...@@ -217,12 +223,15 @@ class ActionCreate extends BaseAction { ...@@ -217,12 +223,15 @@ class ActionCreate extends BaseAction {
} }
} }
@Deprecated
private void sendMessagePmsInner(Message message) throws Exception { private void sendMessagePmsInner(Message message) throws Exception {
if (BooleanUtils.isTrue(Config.pushConfig().getEnable())) { if (BooleanUtils.isTrue(Config.pushConfig().getEnable())) {
ThisApplication.pmsInnerConsumeQueue.send(message); ThisApplication.pmsInnerConsumeQueue.send(message);
} }
} }
@Deprecated
private void sendMessageQiyeweixin(Message message) throws Exception { private void sendMessageQiyeweixin(Message message) throws Exception {
if (BooleanUtils.isTrue(Config.qiyeweixin().getEnable()) if (BooleanUtils.isTrue(Config.qiyeweixin().getEnable())
&& BooleanUtils.isTrue(Config.qiyeweixin().getMessageEnable())) { && BooleanUtils.isTrue(Config.qiyeweixin().getMessageEnable())) {
...@@ -230,6 +239,7 @@ class ActionCreate extends BaseAction { ...@@ -230,6 +239,7 @@ class ActionCreate extends BaseAction {
} }
} }
@Deprecated
private void sendMessageZhengwuDingding(Message message) throws Exception { private void sendMessageZhengwuDingding(Message message) throws Exception {
if (BooleanUtils.isTrue(Config.zhengwuDingding().getEnable()) if (BooleanUtils.isTrue(Config.zhengwuDingding().getEnable())
&& BooleanUtils.isTrue(Config.zhengwuDingding().getMessageEnable())) { && BooleanUtils.isTrue(Config.zhengwuDingding().getMessageEnable())) {
...@@ -237,6 +247,7 @@ class ActionCreate extends BaseAction { ...@@ -237,6 +247,7 @@ class ActionCreate extends BaseAction {
} }
} }
@Deprecated
private void sendMessageWeLink(Message message) throws Exception { private void sendMessageWeLink(Message message) throws Exception {
if (BooleanUtils.isTrue(Config.weLink().getEnable()) if (BooleanUtils.isTrue(Config.weLink().getEnable())
&& BooleanUtils.isTrue(Config.weLink().getMessageEnable())) { && BooleanUtils.isTrue(Config.weLink().getMessageEnable())) {
...@@ -244,6 +255,7 @@ class ActionCreate extends BaseAction { ...@@ -244,6 +255,7 @@ class ActionCreate extends BaseAction {
} }
} }
@Deprecated
private void sendMessageDingding(Message message) throws Exception { private void sendMessageDingding(Message message) throws Exception {
if (BooleanUtils.isTrue(Config.dingding().getEnable()) if (BooleanUtils.isTrue(Config.dingding().getEnable())
&& BooleanUtils.isTrue(Config.dingding().getMessageEnable())) { && BooleanUtils.isTrue(Config.dingding().getMessageEnable())) {
...@@ -251,18 +263,21 @@ class ActionCreate extends BaseAction { ...@@ -251,18 +263,21 @@ class ActionCreate extends BaseAction {
} }
} }
@Deprecated
private void sendMessageCalendar(Message message) throws Exception { private void sendMessageCalendar(Message message) throws Exception {
if (BooleanUtils.isTrue(Config.communicate().calendarEnable())) { if (BooleanUtils.isTrue(Config.communicate().calendarEnable())) {
ThisApplication.calendarConsumeQueue.send(message); ThisApplication.calendarConsumeQueue.send(message);
} }
} }
@Deprecated
private void sendMessageWs(Message message) throws Exception { private void sendMessageWs(Message message) throws Exception {
if (BooleanUtils.isTrue(Config.communicate().wsEnable())) { if (BooleanUtils.isTrue(Config.communicate().wsEnable())) {
ThisApplication.wsConsumeQueue.send(message); ThisApplication.wsConsumeQueue.send(message);
} }
} }
@Deprecated
private Instant instant(Wi wi, List<String> consumers) { private Instant instant(Wi wi, List<String> consumers) {
Instant instant = new Instant(); Instant instant = new Instant();
instant.setBody(Objects.toString(wi.getBody())); instant.setBody(Objects.toString(wi.getBody()));
...@@ -274,6 +289,7 @@ class ActionCreate extends BaseAction { ...@@ -274,6 +289,7 @@ class ActionCreate extends BaseAction {
return instant; return instant;
} }
@Deprecated
private Message wsMessage(Wi wi, Instant instant) throws Exception { private Message wsMessage(Wi wi, Instant instant) throws Exception {
Message message = null; Message message = null;
if (BooleanUtils.isTrue(Config.communicate().wsEnable())) { if (BooleanUtils.isTrue(Config.communicate().wsEnable())) {
...@@ -289,6 +305,7 @@ class ActionCreate extends BaseAction { ...@@ -289,6 +305,7 @@ class ActionCreate extends BaseAction {
return message; return message;
} }
@Deprecated
private Message pmsInnerMessage(Wi wi, Instant instant) { private Message pmsInnerMessage(Wi wi, Instant instant) {
Message message = null; Message message = null;
try { try {
...@@ -308,6 +325,7 @@ class ActionCreate extends BaseAction { ...@@ -308,6 +325,7 @@ class ActionCreate extends BaseAction {
return message; return message;
} }
@Deprecated
private Message dingdingMessage(Wi wi, Instant instant) { private Message dingdingMessage(Wi wi, Instant instant) {
Message message = null; Message message = null;
try { try {
...@@ -328,6 +346,7 @@ class ActionCreate extends BaseAction { ...@@ -328,6 +346,7 @@ class ActionCreate extends BaseAction {
return message; return message;
} }
@Deprecated
private Message weLinkMessage(Wi wi, Instant instant) { private Message weLinkMessage(Wi wi, Instant instant) {
Message message = null; Message message = null;
try { try {
...@@ -348,6 +367,7 @@ class ActionCreate extends BaseAction { ...@@ -348,6 +367,7 @@ class ActionCreate extends BaseAction {
return message; return message;
} }
@Deprecated
private Message zhengwudingdingMessage(Wi wi, Instant instant) { private Message zhengwudingdingMessage(Wi wi, Instant instant) {
Message message = null; Message message = null;
try { try {
...@@ -367,6 +387,7 @@ class ActionCreate extends BaseAction { ...@@ -367,6 +387,7 @@ class ActionCreate extends BaseAction {
return message; return message;
} }
@Deprecated
private Message qiyeweixinMessage(Wi wi, Instant instant) { private Message qiyeweixinMessage(Wi wi, Instant instant) {
Message message = null; Message message = null;
try { try {
...@@ -387,6 +408,7 @@ class ActionCreate extends BaseAction { ...@@ -387,6 +408,7 @@ class ActionCreate extends BaseAction {
return message; return message;
} }
@Deprecated
private Message mpweixinMessage(Wi wi, Instant instant) { private Message mpweixinMessage(Wi wi, Instant instant) {
Message message = null; Message message = null;
try { try {
...@@ -407,6 +429,7 @@ class ActionCreate extends BaseAction { ...@@ -407,6 +429,7 @@ class ActionCreate extends BaseAction {
return message; return message;
} }
@Deprecated
private Message calendarMessage(Wi wi, Instant instant) { private Message calendarMessage(Wi wi, Instant instant) {
Message message = null; Message message = null;
try { try {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册