问题修改

bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteConfigFallbackFactory.java

@@ -6,9 +6,10 @@ import com.bonus.common.core.web.page.TableDataInfo;
 import com.bonus.system.api.RemoteConfigService;
 import com.bonus.system.api.domain.SysConfig;
 import com.github.pagehelper.PageInfo;
+import feign.hystrix.FallbackFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
+//import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;

bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteDeptFallbackFactory.java

@@ -3,9 +3,11 @@ package com.bonus.system.api.factory;
 import com.bonus.common.core.web.domain.AjaxResult;
 import com.bonus.system.api.RemoteDeptService;
 import com.bonus.system.api.domain.SysDept;
+import feign.hystrix.FallbackFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
+//import org.springframework.cloud.openfeign.FallbackFactory;
+//import feign.hystrix.FallbackFactory;
 import org.springframework.stereotype.Component;
 
 

bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteDictDataFallbackFactory.java

@@ -8,8 +8,9 @@ import com.bonus.system.api.domain.SysDictData;
 import com.github.pagehelper.PageInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
+//import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
+import feign.hystrix.FallbackFactory;
 
 import java.util.ArrayList;
 import java.util.List;

bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteDictTypeFallbackFactory.java

@@ -6,9 +6,9 @@ import com.bonus.common.core.web.page.TableDataInfo;
 import com.bonus.system.api.RemoteDictTypeService;
 import com.bonus.system.api.domain.SysDictType;
 import com.github.pagehelper.PageInfo;
+import feign.hystrix.FallbackFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;

bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteFileFallbackFactory.java

@@ -1,9 +1,9 @@
 package com.bonus.system.api.factory;
 
 import com.bonus.common.core.web.domain.AjaxResult;
+import feign.hystrix.FallbackFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
 import com.bonus.common.core.domain.R;

bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteLogFallbackFactory.java

@@ -1,11 +1,12 @@
 package com.bonus.system.api.factory;
 
-import com.alibaba.nacos.shaded.com.google.common.collect.Maps;
+//import com.alibaba.nacos.shaded.com.google.common.collect.Maps;
 import com.bonus.common.core.web.domain.AjaxResult;
 import com.bonus.system.api.domain.SysLogsVo;
+import com.google.common.collect.Maps;
+import feign.hystrix.FallbackFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 import com.bonus.common.core.domain.R;
 import com.bonus.system.api.RemoteLogService;

bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteMenuFallbackFactory.java

@@ -3,9 +3,9 @@ package com.bonus.system.api.factory;
 import com.bonus.common.core.web.domain.AjaxResult;
 import com.bonus.system.api.RemoteMenuService;
 import com.bonus.system.api.domain.SysMenu;
+import feign.hystrix.FallbackFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 
 /**

bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteNoticeFallbackFactory.java

@@ -6,9 +6,9 @@ import com.bonus.common.core.web.page.TableDataInfo;
 import com.bonus.system.api.RemoteNoticeService;
 import com.bonus.system.api.domain.SysNotice;
 import com.github.pagehelper.PageInfo;
+import feign.hystrix.FallbackFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;

bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemotePostFallbackFactory.java

@@ -6,9 +6,9 @@ import com.bonus.common.core.web.page.TableDataInfo;
 import com.bonus.system.api.RemotePostService;
 import com.bonus.system.api.domain.SysPost;
 import com.github.pagehelper.PageInfo;
+import feign.hystrix.FallbackFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;

bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteProfileFallbackFactory.java

@@ -3,9 +3,9 @@ package com.bonus.system.api.factory;
 import com.bonus.common.core.web.domain.AjaxResult;
 import com.bonus.system.api.RemoteProfileService;
 import com.bonus.system.api.domain.SysUser;
+import feign.hystrix.FallbackFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 
 /**

bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteRoleFallbackFactory.java

@@ -8,9 +8,9 @@ import com.bonus.system.api.domain.SysRole;
 import com.bonus.system.api.domain.SysUser;
 import com.bonus.system.api.domain.SysUserRole;
 import com.github.pagehelper.PageInfo;
+import feign.hystrix.FallbackFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;

bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/factory/RemoteUserFallbackFactory.java

@@ -5,9 +5,9 @@ import com.bonus.common.core.web.domain.AjaxResult;
 import com.bonus.common.core.web.page.TableDataInfo;
 import com.bonus.system.api.domain.SysDept;
 import com.github.pagehelper.PageInfo;
+import feign.hystrix.FallbackFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 import com.bonus.common.core.domain.R;
 import com.bonus.system.api.RemoteUserService;

bonus-auth/pom.xml

@@ -66,10 +66,10 @@
             <version>${swagger.fox.version}</version>
         </dependency>
         <!-- bonus Common Swagger -->
-        <dependency>
+        <!--<dependency>
             <groupId>com.bonus</groupId>
             <artifactId>bonus-common-swagger</artifactId>
-        </dependency>
+        </dependency>-->
 
         <dependency>
             <groupId>com.hankcs</groupId>
@@ -80,6 +80,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-mail</artifactId>
+            <version>2.1.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.bonus</groupId>

bonus-auth/src/main/java/com/bonus/auth/BonusAuthApplication.java

@@ -1,19 +1,26 @@
 package com.bonus.auth;
 
-import com.bonus.common.swagger.annotation.EnableCustomSwagger2;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import com.bonus.common.security.annotation.EnableRyFeignClients;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 
 /**
  * 认证授权中心
  * 
  * @author bonus
  */
-@EnableCustomSwagger2
 @EnableRyFeignClients
-@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class })
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class },scanBasePackages = {
+        "com.bonus.auth",
+        "com.bonus.common.redis",  // 必须包含RedisService所在包
+        "com.bonus.system.api",
+        "com.bonus.config",
+        "com.bonus.common.security",
+        "org.springframework.mail.javamail"
+})
+@EnableDiscoveryClient
 public class BonusAuthApplication
 {
     public static void main(String[] args)

bonus-auth/src/main/java/com/bonus/auth/controller/TokenController.java

@@ -51,7 +51,7 @@ public class TokenController {
    @Resource
    private SystemConfig config;
 
-    @Autowired
+    @Resource
     private TokenService tokenService;
 
     @Autowired
@@ -78,7 +78,7 @@ public class TokenController {
     @Resource
     private RemoteConfigService configService;
 
-    @Value("${third-party-login.iws.webAppId}")
+   /* @Value("${third-party-login.iws.webAppId}")
     private String iwsWebAppId;
 
     @Value("${third-party-login.iws.webUrl}")
@@ -88,7 +88,7 @@ public class TokenController {
     private String iwsH5AppId;
 
     @Value("${third-party-login.iws.h5Url}")
-    private String iwsH5Url;
+    private String iwsH5Url;*/
 
     @PostMapping("isAdmin")
     public R<?> isAdmin(@RequestBody LoginBody form) {
@@ -173,9 +173,9 @@ public class TokenController {
                 log.info("app端登录");
                 //loginUser = sysLoginService.iwsH5Login(ticket,iwsH5AppId,iwsH5Url);
                 //h5和web端调用同一个接口
-                loginUser = sysLoginService.iwsWebLogin(ticket,iwsH5AppId,iwsWebUrl);
+//                loginUser = sysLoginService.iwsWebLogin(ticket,iwsH5AppId,iwsWebUrl);
             } else if (form.getSysType()!=null && "0".equals(form.getSysType())) {
-                loginUser = sysLoginService.iwsWebLogin(ticket,iwsWebAppId,iwsWebUrl);
+//                loginUser = sysLoginService.iwsWebLogin(ticket,iwsWebAppId,iwsWebUrl);
             }else {
                 throw new ServiceException("登录失败，请稍后重试");
             }

bonus-auth/src/main/java/com/bonus/auth/service/LoginVerificationCodeSender.java

@@ -24,8 +24,8 @@ public class LoginVerificationCodeSender implements VerificationCodeStrategy {
     private static final String EMAIL_REGEX = "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$";
     private static final String PHONE_REGEX = "^1[3-9]\\d{9}$";
 
-    @Resource
+    /*@Resource
-    private EmailService emailService;
+    private EmailService emailService;*/
 
     @Resource
     private SmsService smsService;
@@ -42,7 +42,7 @@ public class LoginVerificationCodeSender implements VerificationCodeStrategy {
     @Override
     public void sendVerificationCode(String contactInfo) {
         if (isEmail(contactInfo)) {
-            emailService.sendSimpleEmail(contactInfo);
+//            emailService.sendSimpleEmail(contactInfo);
         } else if (isPhone(contactInfo)) {
             smsService.sendSimplePhone(contactInfo);
         } else {

bonus-auth/src/main/java/com/bonus/auth/service/PasswordValidatorService.java

@@ -301,7 +301,7 @@ public class PasswordValidatorService {
             String accessEndTime = (String) map.getOrDefault("accessEndTime", null);
 
             // 如果 ipAddress 为空，检查是否在 ip 范围内
-            if (ObjectUtils.isEmpty(ipAddress)) {
+            if (Objects.isNull(ipAddress)) {
                 if (isIpInRange(ip, ipRangeStart, ipRangeEnd)) {
                     boolean result = handleAccessTimeCheck(user, accessStartTime, accessEndTime);
                     if (!result) {
@@ -330,7 +330,7 @@ public class PasswordValidatorService {
      * @param accessEndTime 访问结束时间
      */
     private boolean handleAccessTimeCheck(SysUser user, String accessStartTime, String accessEndTime) {
-        if (ObjectUtils.isNotEmpty(accessStartTime)) {
+        if (StringUtils.isNotEmpty(accessStartTime)) {
             boolean currentTimeInRange = isCurrentTimeInRange(accessStartTime, accessEndTime);
             if (!currentTimeInRange) {
                 recordLogService.saveErrorLogs(user.getUserName(), System.currentTimeMillis(), user.getUserId().toString(),"IP地址异常");

bonus-auth/src/main/java/com/bonus/auth/service/SysPasswordService.java

@@ -19,6 +19,7 @@ import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import java.io.IOException;
+import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -65,7 +66,7 @@ public class SysPasswordService {
             lockTime = Integer.parseInt(lockTimeAjaxResult.get("msg").toString());
         }
 
-        if (ObjectUtils.isEmpty(retryCount)){
+        if (Objects.isNull(retryCount)){
             retryCount = 0;
         }
         if (retryCount >= times) {

bonus-auth/src/main/java/com/bonus/auth/service/SysRecordLogService.java

@@ -1,6 +1,5 @@
 package com.bonus.auth.service;
 
-import com.alibaba.nacos.common.utils.UuidUtils;
 import com.bonus.common.core.utils.DateUtils;
 import com.bonus.common.core.utils.global.SystemGlobal;
 import com.bonus.common.log.enums.OperaResult;

bonus-auth/src/main/resources/bootstrap-dev.yml

@@ -8,13 +8,13 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.87.190:8848
         namespace: e9abf140-675a-4d55-af3f-1f28a6186904
         username: nacos
         password: nacos
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.87.190:8848
         namespace: e9abf140-675a-4d55-af3f-1f28a6186904
         username: nacos
         password: nacos

bonus-auth/src/main/resources/bootstrap.yml

@@ -11,4 +11,7 @@ spring:
 jasypt:
   encryptor:
     password: Encrypt
+feign:
+  hystrix:
+    enabled: true
 

bonus-common/bonus-common-core/src/test/java/com/bonus/common/core/utils/FileUtilsTest.java

@@ -13,7 +13,7 @@ import static org.junit.Assert.assertNotNull;
 
 public class FileUtilsTest {
 
-    File propertiesFile = new File("src/test/java/com/bonus/common/core/utils/test.properties");
+    /*File propertiesFile = new File("src/test/java/com/bonus/common/core/utils/test.properties");
     File ymlFile = new File("src/test/java/com/bonus/common/core/utils/test.yml");
     File xmlFile = new File("src/test/java/com/bonus/common/core/utils/test.xml");
     File jsonFile = new File("src/test/java/com/bonus/common/core/utils/test.json");
@@ -149,5 +149,5 @@ public class FileUtilsTest {
     public void testReadJsonByKey() throws Exception {
         Object value = ConfigFileUtils.readJsonByKey(jsonFile, "key");
         assertEquals("value", value);
-    }
+    }*/
 }

bonus-common/bonus-common-security/pom.xml

@@ -20,6 +20,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webmvc</artifactId>
+            <version>5.1.3.RELEASE</version>
         </dependency>
 
         <!-- bonus Api System -->
@@ -36,6 +37,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-mail</artifactId>
+            <version>2.1.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.bonus</groupId>

bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/aspect/PermissionOrInnerAuthAspect.java

@@ -1,6 +1,5 @@
 package com.bonus.common.security.aspect;
 
-import com.alibaba.nacos.plugin.auth.constant.Constants;
 import com.bonus.common.core.constant.SecurityConstants;
 import com.bonus.common.core.exception.InnerAuthException;
 import com.bonus.common.core.utils.ServletUtils;

bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/service/EmailService.java

@@ -23,8 +23,8 @@ public class EmailService {
     private VerificationCodeConfig verificationCodeConfig;
     @Resource
     private RedisService redisService;
-   @Resource
+    /*@Resource
-    private JavaMailSender mailSender;
+    private JavaMailSender mailSender;*/
 
     /**
      * 发送简单邮件
@@ -45,7 +45,7 @@ public class EmailService {
         // 邮件内容
         message.setText(str);
         // 发送邮件
-        mailSender.send(message);
+//        mailSender.send(message);
         String uuid = StringUtils.randomUUID();
         String verifyKey = CacheConstants.VERIFICATION_CODE + uuid;
         redisService.setCacheObject(verifyKey, code, verificationCodeConfig.getTime(), TimeUnit.MINUTES);

bonus-gateway/pom.xml

@@ -70,6 +70,7 @@
         <dependency>
             <groupId>com.bonus</groupId>
             <artifactId>bonus-common-redis</artifactId>
+            <version>24.12.0-SNAPSHOT</version>
         </dependency>
 
         <!-- Swagger -->

bonus-gateway/src/main/java/com/bonus/gateway/BonusGatewayApplication.java

@@ -5,6 +5,7 @@ import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 
 import javax.annotation.Resource;
 
@@ -13,7 +14,11 @@ import javax.annotation.Resource;
  * 
  * @author bonus
  */
-@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class })
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class },scanBasePackages = {
+        "com.bonus.gateway",
+        "com.bonus.common.redis"  // 必须包含RedisService所在包
+})
+@EnableDiscoveryClient
 public class BonusGatewayApplication  implements CommandLineRunner {
     public static void main(String[] args) {
         SpringApplication.run(BonusGatewayApplication.class, args);

bonus-gateway/src/main/resources/bootstrap-dev.yml

@@ -7,13 +7,13 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.87.190:8848
         namespace: e9abf140-675a-4d55-af3f-1f28a6186904
         username: nacos
         password: nacos
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.87.190:8848
         namespace: e9abf140-675a-4d55-af3f-1f28a6186904
         username: nacos
         password: nacos
@@ -27,12 +27,12 @@ spring:
       eager: true
       transport:
         # 控制台地址
-        dashboard: 192.168.0.16:18858
+        dashboard: 192.168.87.190:8848
       # nacos配置持久化
       datasource:
         ds1:
           nacos:
-            server-addr: 127.0.0.1:8848
+            server-addr: 192.168.87.190:8848
             namespace: e9abf140-675a-4d55-af3f-1f28a6186904
             dataId: sentinel-bonus-gateway
             groupId: DEFAULT_GROUP

bonus-gateway/src/main/resources/bootstrap.yml

@@ -15,4 +15,7 @@ spring:
 jasypt:
   encryptor:
     password: Encrypt
+feign:
+  hystrix:
+    enabled: true
 

bonus-modules/bonus-file/src/main/java/com/bonus/file/service/impl/FastDfsSysFileServiceImpl.java

@@ -1,6 +1,5 @@
 package com.bonus.file.service.impl;
 
-import com.alibaba.nacos.common.utils.IoUtils;
 import com.bonus.common.core.utils.file.FileTypeUtils;
 import com.bonus.common.core.utils.file.MimeTypeUtils;
 import com.bonus.file.entity.FileDetails;

bonus-modules/bonus-file/src/main/resources/bootstrap-dev.yml

@@ -10,11 +10,11 @@ spring:
       password: nacos
       discovery:
         # 服务注册地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.87.190:8848
         namespace: e9abf140-675a-4d55-af3f-1f28a6186904
       config:
         # 配置中心地址
-        server-addr: 127.0.0.1:8848
+        server-addr: 192.168.87.190:8848
         namespace: e9abf140-675a-4d55-af3f-1f28a6186904
         # 配置文件格式
         file-extension: yml

bonus-modules/bonus-file/src/main/resources/bootstrap-jyy_canteen_local.yml

@@ -1,21 +0,0 @@
-# Tomcat
-server:
-  port: 59300
-
-# Spring
-spring:
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: 127.0.0.1:8848
-        namespace: jyy_canteen
-      config:
-        # 配置中心地址
-        server-addr: 127.0.0.1:8848
-        namespace: jyy_canteen
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

bonus-modules/bonus-file/src/main/resources/bootstrap-material_mall_local.yml

@@ -1,21 +0,0 @@
-# Tomcat
-server:
-  port: 29300
-
-# Spring
-spring:
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: 127.0.0.1:8848
-        namespace: material_mall
-      config:
-        # 配置中心地址
-        server-addr: 127.0.0.1:8848
-        namespace: material_mall
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

bonus-modules/bonus-file/src/main/resources/bootstrap-sgzb_bns_local.yml

@@ -1,21 +0,0 @@
-# Tomcat
-server:
-  port: 9300
-
-# Spring
-spring:
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: 127.0.0.1:8848
-        namespace: sgzb_bns
-      config:
-        # 配置中心地址
-        server-addr: 127.0.0.1:8848
-        namespace: sgzb_bns
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

bonus-modules/bonus-file/src/main/resources/bootstrap-smart_canteen_local.yml

@@ -1,21 +0,0 @@
-# Tomcat
-server:
-  port: 59300
-
-# Spring
-spring:
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: 127.0.0.1:8848
-        namespace: smart_canteen
-      config:
-        # 配置中心地址
-        server-addr: 127.0.0.1:8848
-        namespace: smart_canteen
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

bonus-modules/bonus-file/src/main/resources/bootstrap-smart_site_local.yml

@@ -1,21 +0,0 @@
-# Tomcat
-server:
-  port: 39300
-
-# Spring
-spring:
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: 127.0.0.1:8848
-        namespace: smart_site
-      config:
-        # 配置中心地址
-        server-addr: 127.0.0.1:8848
-        namespace: smart_site
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

bonus-modules/bonus-file/src/main/resources/bootstrap.yml

@@ -12,3 +12,6 @@ spring:
 jasypt:
   encryptor:
     password: Encrypt
+feign:
+  hystrix:
+    enabled: true

bonus-modules/bonus-system/pom.xml

@@ -97,6 +97,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-mail</artifactId>
+            <version>2.1.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>

bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysOperLogServiceImpl.java

@@ -5,13 +5,13 @@ import java.util.Map;
 import java.util.Optional;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.nacos.shaded.com.google.common.collect.Maps;
 import com.bonus.common.core.utils.StringUtils;
 import com.bonus.common.log.enums.OperaType;
 import com.bonus.system.api.domain.SysLogsVo;
 import com.bonus.system.domain.SysLogsMenuHead;
 import com.bonus.system.warning.SysWarning;
 import com.bonus.system.warning.WaringLogEvent;
+import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationEventPublisher;

pom.xml

@@ -22,7 +22,7 @@
         <spring-cloud-alibaba.version>2.1.0.RELEASE</spring-cloud-alibaba.version>
         <spring-framework.version>5.1.3.RELEASE</spring-framework.version>
         <spring-boot-admin.version>2.7.15</spring-boot-admin.version>
-        <swagger.fox.version>3.0.0</swagger.fox.version>
+        <swagger.fox.version>2.9.2</swagger.fox.version>
         <swagger.core.version>1.6.2</swagger.core.version>
         <tobato.version>1.27.2</tobato.version>
         <kaptcha.version>2.3.3</kaptcha.version>