Commit abd3b85b by 阳浪

配置信息

parent 610eaf92
...@@ -38,6 +38,12 @@ ...@@ -38,6 +38,12 @@
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>com.yizhi</groupId>
<artifactId>cloud-comment-api</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
......
...@@ -43,12 +43,6 @@ ...@@ -43,12 +43,6 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>com.yizhi</groupId>
<artifactId>cloud-orm</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>com.yizhi</groupId> <groupId>com.yizhi</groupId>
...@@ -109,4 +103,9 @@ ...@@ -109,4 +103,9 @@
</plugins> </plugins>
</build> </build>
<properties>
<!-- 跳过测试 -->
<skipTests>true</skipTests>
</properties>
</project> </project>
\ No newline at end of file
...@@ -2,6 +2,7 @@ package com.yizhi.documents.application; ...@@ -2,6 +2,7 @@ package com.yizhi.documents.application;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient; import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.ComponentScan;
...@@ -10,7 +11,7 @@ import org.springframework.context.annotation.ComponentScan; ...@@ -10,7 +11,7 @@ import org.springframework.context.annotation.ComponentScan;
* @Author: hutao * @Author: hutao
* @Date: 2019 * @Date: 2019
*/ */
@SpringBootApplication @SpringBootApplication(exclude = {RabbitAutoConfiguration.class})
@EnableDiscoveryClient @EnableDiscoveryClient
@EnableFeignClients(basePackages = {"com.yizhi"}) @EnableFeignClients(basePackages = {"com.yizhi"})
@ComponentScan(basePackages = {"com.yizhi"}) @ComponentScan(basePackages = {"com.yizhi"})
......
...@@ -11,6 +11,7 @@ import com.yizhi.documents.application.vo.documents.SecondClassifyVo; ...@@ -11,6 +11,7 @@ import com.yizhi.documents.application.vo.documents.SecondClassifyVo;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -26,9 +27,9 @@ import java.util.List; ...@@ -26,9 +27,9 @@ import java.util.List;
@RequestMapping("/classify") @RequestMapping("/classify")
public class ClassifyComtroller { public class ClassifyComtroller {
@Autowired @Resource
private ClassifyService classifyService; private ClassifyService classifyService;
@Autowired @Resource
private DocumentService documentService; private DocumentService documentService;
......
...@@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.io.File; import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
...@@ -32,10 +33,10 @@ import java.util.Map; ...@@ -32,10 +33,10 @@ import java.util.Map;
@Component @Component
public class DocumentListExcel extends AbstractDefaultTask<String, DocumentParamVo> { public class DocumentListExcel extends AbstractDefaultTask<String, DocumentParamVo> {
@Autowired @Resource
private DocumentService documentService; private DocumentService documentService;
@Autowired @Resource
private ClassifyService classifyService; private ClassifyService classifyService;
private static final Logger logger = LoggerFactory.getLogger(DocumentListExcel.class); private static final Logger logger = LoggerFactory.getLogger(DocumentListExcel.class);
...@@ -95,7 +96,7 @@ public class DocumentListExcel extends AbstractDefaultTask<String, DocumentParam ...@@ -95,7 +96,7 @@ public class DocumentListExcel extends AbstractDefaultTask<String, DocumentParam
XSSFCellStyle style = workbook.createCellStyle(); XSSFCellStyle style = workbook.createCellStyle();
style.setAlignment(HorizontalAlignment.CENTER);//创建居中格式 style.setAlignment(HorizontalAlignment.CENTER);//创建居中格式
style.setFillForegroundColor(HSSFColor.GREY_25_PERCENT.index); style.setFillForegroundColor(HSSFColor.GREY_25_PERCENT.index);
style.setFillPattern(HSSFCellStyle.SOLID_FOREGROUND); // style.setFillPattern(HSSFCellStyle.SOLID_FOREGROUND);
XSSFCell cell = null; XSSFCell cell = null;
//创建标题行 //创建标题行
......
server.port=35006 server.port=35006
spring.application.name=documents spring.application.name=documents
ACTIVE=${spring.profiles.active} ACTIVE=${spring.profiles.active}
spring.profiles.active=wmy401 spring.profiles.active=prod
# nacos # nacos
spring.cloud.nacos.config.shared-dataids=common-${spring.profiles.active}.properties spring.cloud.nacos.config.shared-dataids=common-${spring.profiles.active}.properties
spring.cloud.nacos.config.namespace=${spring.profiles.active} spring.cloud.nacos.config.namespace=${spring.profiles.active}
spring.cloud.nacos.config.prefix=${spring.application.name} spring.cloud.nacos.config.prefix=${spring.application.name}
spring.cloud.nacos.config.file-extension=properties spring.cloud.nacos.config.file-extension=properties
spring.cloud.nacos.config.server-addr=127.0.0.1:8850 spring.cloud.nacos.config.server-addr=10.23.1.183:8848
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment