已通过本地自测：Apollo2.0 + jUnit + 新版Logback + 平滑退出 + 全链路追踪

src/main/java/cn/quantgroup/xyqb/Bootstrap.java

@@ -19,11 +19,8 @@ import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.scheduling.annotation.EnableAsync;
 import sun.misc.Signal;
 
-@ComponentScan(basePackages = {"cn.quantgroup.sms", "cn.quantgroup.xyqb"})
-@EnableAutoConfiguration
 @SpringBootApplication
 @EnableCaching
-@Configuration
 @EnableAspectJAutoProxy
 @EnableAsync
 @Slf4j

src/main/java/cn/quantgroup/xyqb/config/http/HttpConfig.java

@@ -112,6 +112,7 @@ public class HttpConfig {
         .register(CookieSpecs.BEST_MATCH, new BestMatchSpecFactory())
         .register(CookieSpecs.BROWSER_COMPATIBILITY, new BrowserCompatSpecFactory())
         .register("easy", httpContext -> new BrowserCompatSpec() {
+          @Override
           public void validate(Cookie cookie, CookieOrigin origin) throws MalformedCookieException {
           }
         }).build();

src/main/java/cn/quantgroup/xyqb/controller/external/queryLog/UserQueryLogController.java

@@ -57,11 +57,11 @@ public class UserQueryLogController {
   @Autowired
   private IAddressService addressService;
 
-  @Value("${xyqb.paycenter.url}")
+  @Value("${payapi.http}")
   private String payCenterUrl;
   @Value("${xyqb.paycenter.id}")
   private String payCenterId;
-  @Value("${xyqb.yunying.url}")
+  @Value("${opapi.http}")
   private String yunyingUrl;
 
 

src/main/java/cn/quantgroup/xyqb/controller/external/user/InnerController.java

@@ -76,12 +76,9 @@ public class InnerController implements IBaseController {
   @Autowired
   private IUserRegisterService userRegisterService;
 
-  @Value("${xyqb.user.query.url}")
+  @Value("${userqry.http}")
   private String queryUrl;
 
-  @Value("${xyqb.auth.url}")
-  private String hanguguanUrl;
-
   private static final ObjectMapper MAPPER = new ObjectMapper();
 
   static {
@@ -1025,15 +1022,6 @@ public class InnerController implements IBaseController {
     }
     int affectedRows=userDetailService.updateIdCard(name, idNo, phoneNo);
     LOGGER.info("更新用户的信息,name;{},idNo:{},phoneNo:{},操作的理由reason:{},受影响的行数affectedRows:{}", name, idNo, phoneNo, reason,affectedRows);
-    ImmutableMap.Builder<String, String> builder = ImmutableMap.builder();
-    builder.put("phoneNo", phoneNo);
-    builder.put("name", name);
-    builder.put("idNo", idNo);
-    builder.put("reason", reason);
-    builder.put("content", content);
-    LOGGER.info("去函谷关修改用户身份证号或姓名");
-    Map<String, String> param = builder.build();
-    httpService.get(hanguguanUrl.concat("/innerapi/updateIdCard"), param);
     return JsonResult.buildSuccessResult("修改用户身份证号或姓名成功", affectedRows);
   }
 
@@ -1058,14 +1046,6 @@ public class InnerController implements IBaseController {
 
     int affectedRows=userService.forbiddenUser(enable, phoneNo);
     LOGGER.info("禁用或者重启用户的理由,reason:{},手机号phoneNo:{},受影响的行数affectedRows:{}", reason, phoneNo,affectedRows);
-    ImmutableMap.Builder<String, String> builder = ImmutableMap.builder();
-    builder.put("phoneNo", phoneNo);
-    builder.put("enable", String.valueOf(enable));
-    builder.put("reason", reason);
-    builder.put("content", content);
-    LOGGER.info("去函谷关禁用或者重启用户");
-    Map<String, String> param = builder.build();
-    httpService.get(hanguguanUrl.concat("/innerapi/forbiddenUserOrNot"), param);
     return JsonResult.buildSuccessResult("用户禁用或重启成功成功", affectedRows);
   }
   private String genRandomPwd() {

src/main/java/cn/quantgroup/xyqb/controller/external/user/WeChatController.java

@@ -67,20 +67,20 @@ public class WeChatController implements IBaseController {
   private IUserService userService;
 
   // https://passport.xyqb.com/landing?key=xxx&target=cashTarget5&registerFrom=198&channelId=%d
-  @Value("${xyqb-user.ui}")
+  @Value("${passport.http}")
   private String userUIAddr;
 
-  @Value("${xyqb.user.domain}")
+  @Value("${passport.http}")
   private String userDomainStr;
 
-  @Value("${xyqb.domain}")
+  @Value("${api.http}")
   private String xyqbDomainStr;
 
   @Autowired
   private IHttpService httpService;
 
   //加https地址
-  @Value("${xyqb-user.ui-s}")
+  @Value("${passport.https}")
   private String userUIAddrS;
 
   /**

src/main/java/cn/quantgroup/xyqb/service/http/impl/HttpServiceImpl.java

@@ -173,6 +173,7 @@ public class HttpServiceImpl implements IHttpService {
         .register(CookieSpecs.BEST_MATCH, new BestMatchSpecFactory())
         .register(CookieSpecs.BROWSER_COMPATIBILITY, new BrowserCompatSpecFactory())
         .register("easy", httpContext -> new BrowserCompatSpec() {
+          @Override
           public void validate(Cookie cookie, CookieOrigin origin) throws MalformedCookieException {
           }
         }).build();

src/main/resources/META-INF/app.properties

 app.id=xyqb-user2
-namespace=application,cash.common,tech.common,tech.msg.sdk,tech.sleuth,tech.service.urls
+namespace=application,cash.common,tech.common,tech.sleuth,tech.service.urls,tech.msg.sdk
\ No newline at end of file