bonus
/
cqdevicemgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
liang.chao 2024-09-30 17:40:26 +08:00
parent 5823ed3eaf fca2c75f9d
commit 971be0601c
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sgzb-modules/sgzb-material/pom.xml
View File

@ -88,21 +88,13 @@
<artifactId>sgzb-common-log</artifactId> <artifactId>sgzb-common-log</artifactId>
</dependency> </dependency>
<!-- RuoYi Common Swagger -->
<!-- RuoYi Common Swagger -->
<dependency>
<groupId>com.bonus.sgzb</groupId>
<artifactId>sgzb-common-swagger</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId> <artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency>
<groupId>com.bonus.sgzb</groupId>
<artifactId>sgzb-common-swagger</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>

4
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/SgzbMaterialApplication.java
View File

@ -3,7 +3,7 @@ package com.bonus.sgzb;
import com.bonus.sgzb.common.security.annotation.EnableCustomConfig; import com.bonus.sgzb.common.security.annotation.EnableCustomConfig;
import com.bonus.sgzb.common.security.annotation.EnableRyFeignClients; import com.bonus.sgzb.common.security.annotation.EnableRyFeignClients;
import com.bonus.sgzb.common.swagger.annotation.EnableCustomSwagger2; //import com.bonus.sgzb.common.swagger.annotation.EnableCustomSwagger2;
import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
@ -15,7 +15,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
* *
* @author ruoyi * @author ruoyi
*/ */
@EnableCustomSwagger2 //@EnableCustomSwagger2
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
@EnableCustomConfig @EnableCustomConfig
@EnableRyFeignClients @EnableRyFeignClients