Schisandra-Cloud-Storage/schisandra-cloud-storage
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 修复循环依赖问题

Browse Source
This commit is contained in:
landaiqing
2024-06-25 16:12:31 +08:00
parent 283e7cad98
commit 6298f9038b
9 changed files with 47 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-application/schisandra-cloud-storage-auth-application-mq/pom.xml
View File

@@ -19,10 +19,10 @@
</properties> </properties>
<dependencies> <dependencies>
<dependency> <!-- <dependency>-->
<groupId>com.schisandra</groupId> <!-- <groupId>com.schisandra</groupId>-->
<artifactId>schisandra-cloud-storage-auth-domain</artifactId> <!-- <artifactId>schisandra-cloud-storage-auth-domain</artifactId>-->
<version>1.0-SNAPSHOT</version> <!-- <version>1.0-SNAPSHOT</version>-->
</dependency> <!-- </dependency>-->
</dependencies> </dependencies>
</project> </project>

50
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
View File

@@ -1,25 +1,25 @@
package com.schisandra.auth.application.mq; //package com.schisandra.auth.application.mq;
//
import lombok.extern.slf4j.Slf4j; //import lombok.extern.slf4j.Slf4j;
import org.apache.rocketmq.spring.annotation.RocketMQMessageListener; //import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
import org.apache.rocketmq.spring.core.RocketMQListener; //import org.apache.rocketmq.spring.core.RocketMQListener;
import org.springframework.stereotype.Component; //import org.springframework.stereotype.Component;
//
/** ///**
* @Classname TestConsumer // * @Classname TestConsumer
* @BelongsProject: schisandra-cloud-storage // * @BelongsProject: schisandra-cloud-storage
* @BelongsPackage: com.schisandra.auth.application.mq // * @BelongsPackage: com.schisandra.auth.application.mq
* @Author: landaiqing // * @Author: landaiqing
* @CreateTime: 2024-06-25 14:39 // * @CreateTime: 2024-06-25 14:39
* @Description: TODO // * @Description: TODO
* @Version: 1.0 // * @Version: 1.0
*/ // */
@Component //@Component
@RocketMQMessageListener(topic = "first-topic", consumerGroup = "schisandra-cloud-storage-auth-producer") //@RocketMQMessageListener(topic = "first-topic", consumerGroup = "schisandra-cloud-storage-auth-producer")
@Slf4j //@Slf4j
public class TestConsumer implements RocketMQListener<String> { //public class TestConsumer implements RocketMQListener<String> {
@Override // @Override
public void onMessage(String s) { // public void onMessage(String s) {
log.info("接收到ma消息：{}", s); // log.info("接收到ma消息：{}", s);
} // }
} //}

10
schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/pom.xml
View File

@@ -67,10 +67,10 @@
<artifactId>schisandra-cloud-storage-auth-common</artifactId> <artifactId>schisandra-cloud-storage-auth-common</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>org.apache.rocketmq</groupId> <!-- <groupId>org.apache.rocketmq</groupId>-->
<artifactId>rocketmq-spring-boot-starter</artifactId> <!-- <artifactId>rocketmq-spring-boot-starter</artifactId>-->
<version>2.1.1</version> <!-- <version>2.1.1</version>-->
</dependency> <!-- </dependency>-->
</dependencies> </dependencies>
</project> </project>

8
schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/application.yml
View File

@@ -103,7 +103,7 @@ web:
cipher: cipher:
salt: E2754BC007CA407190E85DFF6E566003 salt: E2754BC007CA407190E85DFF6E566003
rocketmq: #rocketmq:
name-server: 1.95.0.111:9876 # name-server: 1.95.0.111:9876
producer: # producer:
group: schisandra-cloud-storage-auth-producer # group: schisandra-cloud-storage-auth-producer

1
schisandra-cloud-storage-system/schisandra-cloud-storage-system-domain/src/main/java/com/schisandra/system/domain/redis/RedisConfig.java
View File

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.fasterxml.jackson.annotation.PropertyAccessor; import com.fasterxml.jackson.annotation.PropertyAccessor;
import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.connection.RedisConnectionFactory;

2
schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/dao/SchisandraSmsConfigDao.java
View File

@@ -1,7 +1,7 @@
package com.schisandra.system.infra.basic.dao; package com.schisandra.system.infra.basic.dao;
import com.schisandra.system.infra.basic.entity.SchisandraSmsConfig;
import com.mybatisflex.core.BaseMapper; import com.mybatisflex.core.BaseMapper;
import com.schisandra.system.infra.basic.entity.SchisandraSmsConfig;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
/** /**

7
schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/dao/SchisandraSysLogDao.java
View File

@@ -1,10 +1,9 @@
package com.schisandra.system.infra.basic.dao; package com.schisandra.system.infra.basic.dao;
import com.mybatisflex.core.BaseMapper;
import com.mybatisflex.core.BaseMapper; import com.schisandra.system.infra.basic.entity.SchisandraSysLog;
import com.schisandra.system.infra.basic.entity.SchisandraSysLog; import org.springframework.stereotype.Repository;
import org.springframework.stereotype.Repository;
/** /**
* 表数据库访问层 * 表数据库访问层

7
schisandra-cloud-storage-system/schisandra-cloud-storage-system-infra/src/main/java/com/schisandra/system/infra/basic/dao/SchisandraSysOauthDao.java
View File

@@ -1,10 +1,9 @@
package com.schisandra.system.infra.basic.dao; package com.schisandra.system.infra.basic.dao;
import com.mybatisflex.core.BaseMapper;
import com.mybatisflex.core.BaseMapper; import com.schisandra.system.infra.basic.entity.SchisandraSysOauth;
import com.schisandra.system.infra.basic.entity.SchisandraSysOauth; import org.springframework.stereotype.Repository;
import org.springframework.stereotype.Repository;
/** /**
* 表数据库访问层 * 表数据库访问层

6
schisandra-cloud-storage-system/schisandra-cloud-storage-system-starter/pom.xml
View File

@@ -58,12 +58,6 @@
<artifactId>schisandra-cloud-storage-system-infra</artifactId> <artifactId>schisandra-cloud-storage-system-infra</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency>
<groupId>com.schisandra</groupId>
<artifactId>schisandra-cloud-storage-auth-application-mq</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
</dependencies> </dependencies>
<dependencyManagement> <dependencyManagement>