From 6298f9038b19fb7d7bf1d981024689ad530de503 Mon Sep 17 00:00:00 2001
From: landaiqing <3517283258@qq.com>
Date: Tue, 25 Jun 2024 16:12:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=BE=AA=E7=8E=AF?=
=?UTF-8?q?=E4=BE=9D=E8=B5=96=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pom.xml | 10 ++--
.../auth/application/mq/TestConsumer.java | 50 +++++++++----------
.../pom.xml | 10 ++--
.../src/main/resources/application.yml | 8 +--
.../system/domain/redis/RedisConfig.java | 1 +
.../basic/dao/SchisandraSmsConfigDao.java | 2 +-
.../infra/basic/dao/SchisandraSysLogDao.java | 7 ++-
.../basic/dao/SchisandraSysOauthDao.java | 7 ++-
.../pom.xml | 6 ---
9 files changed, 47 insertions(+), 54 deletions(-)
diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-mq/pom.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-mq/pom.xml
index 993ce0c..b3b5321 100644
--- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-mq/pom.xml
+++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-mq/pom.xml
@@ -19,10 +19,10 @@
-
- com.schisandra
- schisandra-cloud-storage-auth-domain
- 1.0-SNAPSHOT
-
+
+
+
+
+
diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-mq/src/main/java/com/schisandra/auth/application/mq/TestConsumer.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-mq/src/main/java/com/schisandra/auth/application/mq/TestConsumer.java
index b670518..d658018 100644
--- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-mq/src/main/java/com/schisandra/auth/application/mq/TestConsumer.java
+++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-mq/src/main/java/com/schisandra/auth/application/mq/TestConsumer.java
@@ -1,25 +1,25 @@
-package com.schisandra.auth.application.mq;
-
-import lombok.extern.slf4j.Slf4j;
-import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
-import org.apache.rocketmq.spring.core.RocketMQListener;
-import org.springframework.stereotype.Component;
-
-/**
- * @Classname TestConsumer
- * @BelongsProject: schisandra-cloud-storage
- * @BelongsPackage: com.schisandra.auth.application.mq
- * @Author: landaiqing
- * @CreateTime: 2024-06-25 14:39
- * @Description: TODO
- * @Version: 1.0
- */
-@Component
-@RocketMQMessageListener(topic = "first-topic", consumerGroup = "schisandra-cloud-storage-auth-producer")
-@Slf4j
-public class TestConsumer implements RocketMQListener {
- @Override
- public void onMessage(String s) {
- log.info("接收到ma消息：{}", s);
- }
-}
+//package com.schisandra.auth.application.mq;
+//
+//import lombok.extern.slf4j.Slf4j;
+//import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
+//import org.apache.rocketmq.spring.core.RocketMQListener;
+//import org.springframework.stereotype.Component;
+//
+///**
+// * @Classname TestConsumer
+// * @BelongsProject: schisandra-cloud-storage
+// * @BelongsPackage: com.schisandra.auth.application.mq
+// * @Author: landaiqing
+// * @CreateTime: 2024-06-25 14:39
+// * @Description: TODO
+// * @Version: 1.0
+// */
+//@Component
+//@RocketMQMessageListener(topic = "first-topic", consumerGroup = "schisandra-cloud-storage-auth-producer")
+//@Slf4j
+//public class TestConsumer implements RocketMQListener {
+// @Override
+// public void onMessage(String s) {
+// log.info("接收到ma消息：{}", s);
+// }
+//}
diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml
index 2ef7753..17b2917 100644
--- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml
+++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml
@@ -67,10 +67,10 @@
schisandra-cloud-storage-auth-common
1.0-SNAPSHOT
-
- org.apache.rocketmq
- rocketmq-spring-boot-starter
- 2.1.1
-
+
+
+
+
+
diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/application.yml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/application.yml
index 84e064f..fdbbc12 100644
--- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/application.yml
+++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/application.yml
@@ -103,7 +103,7 @@ web:
cipher:
salt: E2754BC007CA407190E85DFF6E566003
-rocketmq:
- name-server: 1.95.0.111:9876
- producer:
- group: schisandra-cloud-storage-auth-producer
+#rocketmq:
+# name-server: 1.95.0.111:9876
+# producer:
+# group: schisandra-cloud-storage-auth-producer
diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/redis/RedisConfig.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/redis/RedisConfig.java
index f3827fe..482b0d9 100644
--- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/redis/RedisConfig.java
+++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/redis/RedisConfig.java
@@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.fasterxml.jackson.annotation.PropertyAccessor;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.data.redis.connection.RedisConnectionFactory;
diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/dao/SchisandraSmsConfigDao.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/dao/SchisandraSmsConfigDao.java
index 994c238..02935a7 100644
--- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/dao/SchisandraSmsConfigDao.java
+++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/dao/SchisandraSmsConfigDao.java
@@ -1,7 +1,7 @@
package com.schisandra.system.infra.basic.dao;
-import com.schisandra.system.infra.basic.entity.SchisandraSmsConfig;
import com.mybatisflex.core.BaseMapper;
+import com.schisandra.system.infra.basic.entity.SchisandraSmsConfig;
import org.springframework.stereotype.Repository;
/**
diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/dao/SchisandraSysLogDao.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/dao/SchisandraSysLogDao.java
index 6ce4b8e..ab5167e 100644
--- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/dao/SchisandraSysLogDao.java
+++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/dao/SchisandraSysLogDao.java
@@ -1,10 +1,9 @@
package com.schisandra.system.infra.basic.dao;
-
- import com.mybatisflex.core.BaseMapper;
- import com.schisandra.system.infra.basic.entity.SchisandraSysLog;
- import org.springframework.stereotype.Repository;
+import com.mybatisflex.core.BaseMapper;
+import com.schisandra.system.infra.basic.entity.SchisandraSysLog;
+import org.springframework.stereotype.Repository;
/**
* 表数据库访问层
diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/dao/SchisandraSysOauthDao.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/dao/SchisandraSysOauthDao.java
index 30ca2b0..6e245f1 100644
--- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/dao/SchisandraSysOauthDao.java
+++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/dao/SchisandraSysOauthDao.java
@@ -1,10 +1,9 @@
package com.schisandra.system.infra.basic.dao;
-
- import com.mybatisflex.core.BaseMapper;
- import com.schisandra.system.infra.basic.entity.SchisandraSysOauth;
- import org.springframework.stereotype.Repository;
+import com.mybatisflex.core.BaseMapper;
+import com.schisandra.system.infra.basic.entity.SchisandraSysOauth;
+import org.springframework.stereotype.Repository;
/**
* 表数据库访问层
diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-starter/pom.xml b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-starter/pom.xml
index 113d16d..09dc4fd 100644
--- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-starter/pom.xml
+++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-starter/pom.xml
@@ -58,12 +58,6 @@
schisandra-cloud-storage-system-infra
1.0-SNAPSHOT
-
- com.schisandra
- schisandra-cloud-storage-auth-application-mq
- 1.0-SNAPSHOT
-
-