From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 service-community/src/main/java/com/java110/community/CommunityServiceApplicationStart.java |   41 +++++++++++++++++++++++++++++++++++++----
 1 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/service-community/src/main/java/com/java110/community/CommunityServiceApplicationStart.java b/service-community/src/main/java/com/java110/community/CommunityServiceApplicationStart.java
old mode 100644
new mode 100755
index 982c9ae..1f33628
--- a/service-community/src/main/java/com/java110/community/CommunityServiceApplicationStart.java
+++ b/service-community/src/main/java/com/java110/community/CommunityServiceApplicationStart.java
@@ -1,11 +1,31 @@
+/*
+ * Copyright 2017-2020 鍚村鏂� and java110 team.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.java110.community;
 
+import com.java110.core.annotation.Java110CmdDiscovery;
 import com.java110.core.annotation.Java110ListenerDiscovery;
+import com.java110.core.trace.Java110RestTemplateInterceptor;
 import com.java110.core.client.RestTemplate;
+import com.java110.core.event.cmd.ServiceCmdEventPublishing;
 import com.java110.core.event.service.BusinessServiceDataFlowEventPublishing;
+import com.java110.doc.annotation.Java110CmdDocDiscovery;
+import com.java110.doc.registrar.ApiDocCmdPublishing;
 import com.java110.service.init.ServiceStartInit;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import com.java110.core.log.LoggerFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.client.RestTemplateBuilder;
@@ -16,6 +36,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.http.converter.StringHttpMessageConverter;
 
+import javax.annotation.Resource;
 import java.nio.charset.Charset;
 
 
@@ -29,15 +50,23 @@
  * @tag
  */
 @SpringBootApplication(scanBasePackages = {"com.java110.service", "com.java110.community",
-        "com.java110.core", "com.java110.config.properties.code", "com.java110.db"})
+        "com.java110.core", "com.java110.config.properties.code", "com.java110.db","com.java110.doc"})
 @EnableDiscoveryClient
 @Java110ListenerDiscovery(listenerPublishClass = BusinessServiceDataFlowEventPublishing.class,
         basePackages = {"com.java110.community.listener"})
-@EnableFeignClients(basePackages = {"com.java110.intf.user", "com.java110.intf.common","com.java110.intf.fee"})
+@Java110CmdDiscovery(cmdPublishClass = ServiceCmdEventPublishing.class,
+        basePackages = {"com.java110.community.cmd"})
+@EnableFeignClients(basePackages = {"com.java110.intf.user", "com.java110.intf.common", "com.java110.intf.fee",
+        "com.java110.intf.order", "com.java110.intf.store", "com.java110.intf.acct", "com.java110.intf.oa", "com.java110.intf.report"})
+@Java110CmdDocDiscovery(basePackages = {
+        "com.java110.community.cmd",
+},
+        cmdDocClass = ApiDocCmdPublishing.class)
 public class CommunityServiceApplicationStart {
 
     private static Logger logger = LoggerFactory.getLogger(CommunityServiceApplicationStart.class);
-
+    @Resource
+    private Java110RestTemplateInterceptor java110RestTemplateInterceptor;
 
     /**
      * 瀹炰緥鍖朢estTemplate锛岄�氳繃@LoadBalanced娉ㄨВ寮�鍚潎琛¤礋杞借兘鍔�.
@@ -49,6 +78,7 @@
     public RestTemplate restTemplate() {
         StringHttpMessageConverter m = new StringHttpMessageConverter(Charset.forName("UTF-8"));
         RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build(RestTemplate.class);
+        restTemplate.getInterceptors().add(java110RestTemplateInterceptor);
         return restTemplate;
     }
 
@@ -66,8 +96,11 @@
 
     public static void main(String[] args) throws Exception {
         try {
+            ServiceStartInit.preInitSystemConfig();
             ApplicationContext context = SpringApplication.run(CommunityServiceApplicationStart.class, args);
             ServiceStartInit.initSystemConfig(context);
+            //鏈嶅姟鍚姩瀹屾垚
+            ServiceStartInit.printStartSuccessInfo();
         } catch (Throwable e) {
             logger.error("绯荤粺鍚姩澶辫触", e);
         }

--
Gitblit v1.8.0