修改打包问题

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

@@ -23,8 +23,8 @@ public class BankClearingFallbackFactory implements FallbackFactory<BankClearing
         {
 
             @Override
-            public ResponseBase rollDetail() {
-                return null;
+            public String rollDetail() {
+                return "错误返回";
             }
         };
 

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

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

carbon-back/carbon-back-service/pom.xml

@@ -116,5 +116,20 @@
         </dependency>
 
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>

carbon-bank/carbon-bank-service/pom.xml

@@ -114,6 +114,20 @@
         </dependency>
 
     </dependencies>
-
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>

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

@@ -1,5 +1,6 @@
 package com.hcloud.microserver.system.bank;
 
+import com.hcloud.microserver.commoncore.annotation.PlatformOauth2FeignClient;
 import com.hcloud.microserver.security.annotation.EnableCustomConfig;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
@@ -21,6 +22,7 @@ import com.hcloud.microserver.security.annotation.EnablePlatformFeignClients;
 @MapperScan(basePackages = {"com.hcloud.microserver.mbg","com.hcloud.microserver.system.bank.dao"})
 @SpringBootApplication
 @EnablePlatformFeignClients(basePackages = "com.hcloud.microserver.api.service")
+@PlatformOauth2FeignClient
 public class BankServiceApplication {
 
     public static void main(String[] args) {

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

@@ -2,11 +2,9 @@ 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.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -19,9 +17,9 @@ public class BankRallBackCheckController extends BaseController {
 
     @ApiOperation("明细确认")
     @PostMapping
-    public ResponseBase rollDetail(){
+    public String rollDetail(){
         log.info("到此一游------------------------------------------------------------------------------------------------------------------------" +
                 "-");
-        return responseResultSuccess();
+        return "正确返回";
     }
 }

carbon-gateway/src/main/java/com/hcloud/microserver/gateway/config/IgnoreUrlsConfig.java

@@ -1,11 +1,28 @@
 package com.hcloud.microserver.gateway.config;
 
+import com.hcloud.microserver.commoncore.conf.AuthIgnore;
+import com.hcloud.microserver.commoncore.util.ReUtil;
 import lombok.Getter;
 import lombok.Setter;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.reactive.result.method.RequestMappingInfo;
+import org.springframework.web.reactive.result.method.annotation.RequestMappingHandlerMapping;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.regex.Pattern;
+
+
+import org.springframework.beans.factory.annotation.Configurable;
+import org.springframework.core.annotation.AnnotationUtils;
+
+import org.springframework.web.method.HandlerMethod;
+import java.util.Map;
+import java.util.Optional;
+
 
 /**
  * 用于配置不需要保护的资源路径
@@ -20,4 +37,5 @@ public class IgnoreUrlsConfig {
 
     private List<String> checks = new ArrayList<>();
 
+
 }

carbon-h5/carbon-h5-common/carbon-h5-common.iml

@@ -146,8 +146,6 @@
     <orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.60" level="project" />
     <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.60" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.1.0.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.1.0.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form-spring:3.5.0" level="project" />
     <orderEntry type="library" name="Maven: io.github.openfeign.form:feign-form:3.5.0" level="project" />
     <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.3.3" level="project" />
@@ -157,9 +155,20 @@
     <orderEntry type="library" name="Maven: io.github.openfeign:feign-slf4j:10.1.0" level="project" />
     <orderEntry type="library" name="Maven: io.github.openfeign:feign-hystrix:10.1.0" level="project" />
     <orderEntry type="library" name="Maven: com.netflix.archaius:archaius-core:0.7.6" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-hystrix:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-hystrix:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-archaius:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-archaius:2.1.0.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.8" level="project" />
     <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-core:1.5.18" level="project" />
     <orderEntry type="library" name="Maven: io.reactivex:rxjava:1.3.8" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-serialization:1.5.18" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: com.fasterxml.jackson.module:jackson-module-afterburner:2.9.10" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-metrics-event-stream:1.5.18" level="project" />
+    <orderEntry type="library" name="Maven: com.netflix.hystrix:hystrix-javanica:1.5.18" level="project" />
+    <orderEntry type="library" name="Maven: io.reactivex:rxjava-reactive-streams:1.2.1" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.1.13.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.1.13.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:2.1.13.RELEASE" level="project" />

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

@@ -6,6 +6,8 @@ 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 org.springframework.web.context.request.RequestAttributes;
+import org.springframework.web.context.request.RequestContextHolder;
 
 import javax.annotation.Resource;
 
@@ -36,12 +38,13 @@ public class PlatformTask
     }
 
     public void bankRollClearingStatus(){
+        RequestAttributes attributes = RequestContextHolder.getRequestAttributes();
         log.info("进入定时任务");
-        ResponseBase responseBase = bankClearingService.rollDetail();
+        String responseBase = bankClearingService.rollDetail();
         if (responseBase == null){
             log.info("错误");
         }else {
-            log.info("不是错误的哦");
+            log.info("不是错误的哦"+responseBase);
         }
     }
 }

common-core/pom.xml

@@ -215,6 +215,10 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
+        </dependency>
 
     </dependencies>
 

common-core/src/main/java/com/hcloud/microserver/commoncore/annotation/PlatformOauth2FeignClient.java

@@ -0,0 +1,14 @@
+package com.hcloud.microserver.commoncore.annotation;
+
+import com.hcloud.microserver.commoncore.conf.FeignConfig;
+import org.springframework.context.annotation.Import;
+
+import java.lang.annotation.*;
+
+@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Import(FeignConfig.class)
+public @interface PlatformOauth2FeignClient {
+
+}

common-core/src/main/java/com/hcloud/microserver/commoncore/conf/AuthIgnore.java

@@ -0,0 +1,11 @@
+package com.hcloud.microserver.commoncore.conf;
+
+
+import java.lang.annotation.*;
+
+@Target({ElementType.TYPE, ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface AuthIgnore {
+
+}

common-core/src/main/java/com/hcloud/microserver/commoncore/conf/FeignConfig.java

@@ -1,20 +1,54 @@
 package com.hcloud.microserver.commoncore.conf;
 
-import com.hcloud.microserver.commoncore.constant.GlobleConstant;
-import com.hcloud.microserver.commoncore.util.TokenUtil;
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Enumeration;
 
 
 /**
  * feign拦截器配置
  *
- * @author yys
  */
-//@Configuration
-public class FeignConfig /*implements RequestInterceptor*/ {
-//    @Override
-//    public void apply(RequestTemplate requestTemplate) {
-//        requestTemplate.header(GlobleConstant.ACCESS_TOKEN,
-//                TokenUtil.createJwtToken(GlobleConstant.FEIGN_TOKEN, GlobleConstant.FEIGN_TOKEN).getAccessToken());
-//    }
+@Configuration
+public class FeignConfig implements RequestInterceptor {
+
+
+    @Override
+    public void apply(RequestTemplate template) {
+
+        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder
+                .getRequestAttributes();
+        if (attributes != null){
+            HttpServletRequest request = attributes.getRequest();
+            Enumeration headerNames = request.getHeaderNames();
+            if (headerNames != null) {
+                while (headerNames.hasMoreElements()) {
+                    Object name = headerNames.nextElement();
+                    String values = request.getHeader(name.toString());
+                    template.header(name.toString(), values);
+                }
+            }
+            Enumeration bodyNames = request.getParameterNames();
+            StringBuffer body =new StringBuffer();
+            if (bodyNames != null) {
+                while (bodyNames.hasMoreElements()) {
+                    String name = bodyNames.nextElement().toString();
+                    String values = request.getParameter(name);
+                    body.append(name).append("=").append(values).append("&");
+                }
+            }
+            if(body.length()!=0) {
+                body.deleteCharAt(body.length()-1);
+                template.body(body.toString());
+            }
+        }
+
+
+    }
 
 }

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

@@ -0,0 +1,166 @@
+package com.hcloud.microserver.commoncore.util;
+
+import com.hcloud.microserver.commoncore.text.Convert;
+import com.hcloud.microserver.commoncore.util.string.StringUtils;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+
+public class ReUtil
+{
+    public final static Pattern GROUP_VAR = Pattern.compile("\\$(\\d+)");
+
+    /**
+     * 正则中需要被转义的关键字
+     */
+    public final static Set<Character> RE_KEYS = new HashSet<>(
+            Arrays.asList('$', '(', ')', '*', '+', '.', '[', ']', '?', '\\', '^', '{', '}', '|'));;
+
+    /**
+     * 正则替换指定值<br>
+     * 通过正则查找到字符串，然后把匹配到的字符串加入到replacementTemplate中，$1表示分组1的字符串
+     *
+     * <p>
+     * 例如：原字符串是：中文1234，我想把1234换成(1234)，则可以：
+     *
+     * <pre>
+     * ReUtil.replaceAll("中文1234", "(\\d+)", "($1)"))
+     *
+     * 结果：中文(1234)
+     * </pre>
+     *
+     * @param content 文本
+     * @param regex 正则
+     * @param replacementTemplate 替换的文本模板，可以使用$1类似的变量提取正则匹配出的内容
+     * @return 处理后的文本
+     */
+    public static String replaceAll(String content, String regex, String replacementTemplate)
+    {
+        final Pattern pattern = Pattern.compile(regex, Pattern.DOTALL);
+        return replaceAll(content, pattern, replacementTemplate);
+    }
+
+    /**
+     * 正则替换指定值<br>
+     * 通过正则查找到字符串，然后把匹配到的字符串加入到replacementTemplate中，$1表示分组1的字符串
+     *
+     * @param content 文本
+     * @param pattern {@link Pattern}
+     * @param replacementTemplate 替换的文本模板，可以使用$1类似的变量提取正则匹配出的内容
+     * @return 处理后的文本
+     * @since 3.0.4
+     */
+    public static String replaceAll(String content, Pattern pattern, String replacementTemplate)
+    {
+        if (StringUtils.isEmpty(content))
+        {
+            return StringUtils.EMPTY;
+        }
+
+        final Matcher matcher = pattern.matcher(content);
+        boolean result = matcher.find();
+        if (result)
+        {
+            final Set<String> varNums = findAll(GROUP_VAR, replacementTemplate, 1, new HashSet<>());
+            final StringBuffer sb = new StringBuffer();
+            do
+            {
+                String replacement = replacementTemplate;
+                for (String var : varNums)
+                {
+                    int group = Integer.parseInt(var);
+                    replacement = replacement.replace("$" + var, matcher.group(group));
+                }
+                matcher.appendReplacement(sb, escape(replacement));
+                result = matcher.find();
+            }
+            while (result);
+            matcher.appendTail(sb);
+            return sb.toString();
+        }
+        return Convert.toStr(content);
+    }
+
+    /**
+     * 取得内容中匹配的所有结果
+     *
+     * @param <T> 集合类型
+     * @param pattern 编译后的正则模式
+     * @param content 被查找的内容
+     * @param group 正则的分组
+     * @param collection 返回的集合类型
+     * @return 结果集
+     */
+    public static <T extends Collection<String>> T findAll(Pattern pattern, CharSequence content, int group,
+                                                           T collection)
+    {
+        if (null == pattern || null == content)
+        {
+            return null;
+        }
+
+        if (null == collection)
+        {
+            throw new NullPointerException("Null collection param provided!");
+        }
+
+        final Matcher matcher = pattern.matcher(content);
+        while (matcher.find())
+        {
+            collection.add(matcher.group(group));
+        }
+        return collection;
+    }
+
+    /**
+     * 转义字符，将正则的关键字转义
+     *
+     * @param c 字符
+     * @return 转义后的文本
+     */
+    public static String escape(char c)
+    {
+        final StringBuilder builder = new StringBuilder();
+        if (RE_KEYS.contains(c))
+        {
+            builder.append('\\');
+        }
+        builder.append(c);
+        return builder.toString();
+    }
+
+    /**
+     * 转义字符串，将正则的关键字转义
+     *
+     * @param content 文本
+     * @return 转义后的文本
+     */
+    public static String escape(CharSequence content)
+    {
+        if (StringUtils.isBlank(content))
+        {
+            return StringUtils.EMPTY;
+        }
+
+        final StringBuilder builder = new StringBuilder();
+        int len = content.length();
+        char current;
+        for (int i = 0; i < len; i++)
+        {
+            current = content.charAt(i);
+            if (RE_KEYS.contains(current))
+            {
+                builder.append('\\');
+            }
+            builder.append(current);
+        }
+        return builder.toString();
+    }
+
+}
+