添加类管理器管理spring类

carbon-api-mbg/src/main/java/com/hcloud/microserver/api/factory/BankClearingFallbackFactory.java

@@ -0,0 +1,37 @@
+package com.hcloud.microserver.api.factory;
+
+import com.hcloud.microserver.api.domain.R;
+import com.hcloud.microserver.api.domain.SysOperLog;
+import com.hcloud.microserver.api.service.BankClearingService;
+import com.hcloud.microserver.api.service.PlatformLogService;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * 日志服务降级处理
+ *
+ */
+@Component
+public class BankClearingFallbackFactory implements FallbackFactory<BankClearingService>
+{
+    private static final Logger log = LoggerFactory.getLogger(BankClearingFallbackFactory.class);
+
+    @Override
+    public BankClearingService create(Throwable throwable)
+    {
+        log.error("日志服务调用失败:{}", throwable.getMessage());
+        return new BankClearingService()
+        {
+
+            @Override
+            public ResponseBase rollDetail() {
+                return null;
+            }
+        };
+
+    }
+}

carbon-api-mbg/src/main/java/com/hcloud/microserver/api/service/BankClearingService.java

@@ -0,0 +1,12 @@
+package com.hcloud.microserver.api.service;
+
+import com.hcloud.microserver.api.factory.PlatformLogFallbackFactory;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@FeignClient(contextId = "bankClearingService", value = "carbon-bank", fallbackFactory = PlatformLogFallbackFactory.class)
+public interface BankClearingService {
+    @GetMapping("detail")
+    public ResponseBase rollDetail();
+}

carbon-api-mbg/src/main/resources/META-INF/spring.factories

@@ -1 +1,2 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.hcloud.microserver.api.service.BankClearingService

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/CarbonSystemApplication.java

@@ -1,12 +1,14 @@
 package com.hcloud.microserver.system;
 
 
+import com.hcloud.microserver.commoncore.util.SpringUtils;
 import com.hcloud.microserver.security.annotation.EnableCustomConfig;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Import;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/controller/SysUserOnlineController.java

@@ -6,6 +6,7 @@ import com.hcloud.microserver.commoncore.web.controller.RyBaseController;
 import  com.hcloud.microserver.commoncore.web.domain.AjaxResult;
 import com.hcloud.microserver.commoncore.web.page.TableDataInfo;
 import com.hcloud.microserver.security.service.SystemRedisService;
+import com.hcloud.microserver.security.service.TokenService;
 import com.hcloud.microserver.system.log.annotation.Log;
 import com.hcloud.microserver.system.log.enums.BusinessType;
 import com.hcloud.microserver.security.annotation.PreAuthorize;
@@ -35,6 +36,8 @@ public class SysUserOnlineController extends RyBaseController
     @Autowired
     private SystemRedisService systemRedisService;
 
+    @Autowired
+    private TokenService tokenService;
     @PreAuthorize(hasPermi = "monitor:online:list")
     @GetMapping("/list")
     public TableDataInfo list(String ipaddr, String userName)
@@ -43,7 +46,8 @@ public class SysUserOnlineController extends RyBaseController
         List<SysUserOnline> userOnlineList = new ArrayList<SysUserOnline>();
         for (String key : keys)
         {
-            LoginUser user = systemRedisService.getCacheObject(key);
+            LoginUser user = tokenService.getLoginUser();
+//            LoginUser user = systemRedisService.getCacheObject(key);
             if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName))
             {
                 if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername()))

carbon-bank/carbon-bank-service/src/main/java/com/hcloud/microserver/system/bank/BankServiceApplication.java

@@ -5,9 +5,12 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
+import com.hcloud.microserver.security.annotation.EnableRyFeignClients;
 
 /**
  * @author qiubo

carbon-bank/carbon-bank-service/src/main/java/com/hcloud/microserver/system/bank/config/DateConverter.java

@@ -1,12 +1,11 @@
 package com.hcloud.microserver.system.bank.config;
 
-import com.sun.org.slf4j.internal.LoggerFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.convert.converter.Converter;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.logging.Logger;
+
 
 /**
  * 日期转换类

carbon-bank/carbon-bank-service/src/main/java/com/hcloud/microserver/system/bank/controller/BankRallBackCheckController.java

@@ -0,0 +1,25 @@
+package com.hcloud.microserver.system.bank.controller;
+
+
+import com.hcloud.microserver.commoncore.base.BaseController;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/rollback")
+@Api("银行清分确认")
+@Slf4j
+public class BankRallBackCheckController extends BaseController {
+
+    @ApiOperation("明细确认")
+    @GetMapping("detail")
+    public ResponseBase rollDetail(){
+        log.info("到此一游");
+        return responseResultSuccess();
+    }
+}

carbon-h5/pom.xml

@@ -17,7 +17,6 @@
     <modules>
         <module>carbon-h5-common</module>
         <module>carbon-h5-service</module>
-        <module>carbon-h5-mbg</module>
     </modules>
 
     <dependencies>

carbon-job/src/main/java/com/hcloud/microserver/job/PlatformJobApplication.java

@@ -13,15 +13,14 @@ import org.springframework.context.annotation.Import;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
-@EnableRyFeignClients
 @EnableCustomConfig
 @EnableAsync
 @EnableDiscoveryClient
 @EnableTransactionManagement
-@MapperScan(basePackages = {"com.hcloud.microserver.mbg.mapper","com.hcloud.microserver.job.mapper"})
+@ComponentScan(basePackages = "com.hcloud")
+@MapperScan(basePackages = {"com.hcloud.microserver.mbg.mapper",
+        "com.hcloud.microserver.job.mapper"})
 @SpringBootApplication
-@SpringCloudApplication
-@Import(SpringUtils.class)
 public class PlatformJobApplication
 {
     public static void main(String[] args)

carbon-job/src/main/java/com/hcloud/microserver/job/task/PlatformTask.java

@@ -1,16 +1,25 @@
 package com.hcloud.microserver.job.task;
 
+import com.hcloud.microserver.api.service.BankClearingService;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
 import com.hcloud.microserver.commoncore.util.string.StringUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
+
 /**
  * 定时任务调度测试
  * 
  * @author qiubo
  */
+@Slf4j
 @Component("platformTask")
 public class PlatformTask
 {
+    @Resource
+    private BankClearingService bankClearingService;
     public void platformMultipleParams(String s, Boolean b, Long l, Double d, Integer i)
     {
         System.out.println(StringUtils.format("执行多参方法： 字符串类型{}，布尔类型{}，长整型{}，浮点型{}，整形{}", s, b, l, d, i));
@@ -25,4 +34,14 @@ public class PlatformTask
     {
         System.out.println("执行无参方法");
     }
+
+    public void bankRollClearingStatus(){
+        log.info("进入定时任务");
+        ResponseBase responseBase = bankClearingService.rollDetail();
+        if (responseBase == null){
+            log.info("错误");
+        }else {
+            log.info("不是错误的哦");
+        }
+    }
 }

carbon-security/src/main/java/com/hcloud/microserver/security/annotation/EnableRyFeignClients.java

@@ -7,7 +7,7 @@ import java.lang.annotation.*;
 /**
  * 自定义feign注解
  * 添加basePackages路径
- * 
+ *
  * @author ruoyi
  */
 @Target(ElementType.TYPE)

common-core/src/main/java/com/hcloud/microserver/commoncore/util/SpringUtils.java

@@ -6,8 +6,6 @@ import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
 import org.springframework.stereotype.Component;
 
 /**
@@ -16,33 +14,16 @@ import org.springframework.stereotype.Component;
  * @author ruoyi
  */
 @Component
-public final class SpringUtils implements ApplicationContextAware
+public final class SpringUtils implements BeanFactoryPostProcessor
 {
-
-    private static ApplicationContext beanFactory;
+    /** Spring应用上下文环境 */
+    private static ConfigurableListableBeanFactory beanFactory;
 
     @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        if(SpringUtils.beanFactory == null) {
-            SpringUtils.beanFactory = applicationContext;
-        }
-        System.out.println("---------------------------------------------------------------------");
-
-        System.out.println("---------------------------------------------------------------------");
-
-        System.out.println("---------------com.hcloud.microserver.commoncore.util------------------------------------------------------");
-
-        System.out.println("---------------------------------------------------------------------");
+    public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException
+    {
+        SpringUtils.beanFactory = beanFactory;
     }
-//    /** Spring应用上下文环境 */
-//    private static ConfigurableListableBeanFactory beanFactory;
-//
-//    @Override
-//    @Autowired
-//    public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException
-//    {
-//        SpringUtils.beanFactory = beanFactory;
-//    }
 
     /**
      * 获取对象