Merge branch 'pro' into 'master'
# Conflicts: # src/main/resources/application.yml
This commit is contained in:
付庆吉
@ -1,5 +1,6 @@
|
||||
package com.chinaunicom.mall.ebtp.extend.export.service.impl;
|
||||
|
||||
import com.chinaunicom.mall.ebtp.common.util.JsonUtils;
|
||||
import com.chinaunicom.mall.ebtp.extend.export.bean.ExportParame;
|
||||
import com.chinaunicom.mall.ebtp.extend.export.service.ExportService;
|
||||
import com.chinaunicom.mall.ebtp.extend.export.service.TemplateFileService;
|
||||
@ -38,13 +39,19 @@ public class ZjcnExportServiceImpl implements ExportService {
|
||||
@SneakyThrows
|
||||
@Override
|
||||
public void doExport(ExportParame param, HttpServletRequest request, HttpServletResponse response) {
|
||||
log.info("评标专家承诺书：{}", JsonUtils.objectToJson(param));
|
||||
//文件模板从数据库或者项目位置取得
|
||||
InputStream file = templateFileService.getExportTemplet("zjcn");
|
||||
log.info("获取模板：{}", file);
|
||||
XWPFTemplate template = XWPFTemplate.compile(file);
|
||||
log.info("template：{}", template);
|
||||
|
||||
String fileName = new String("评标专家承诺书.docx".getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1);
|
||||
log.info("fileName：{}", fileName);
|
||||
OutputStream os = response.getOutputStream();
|
||||
|
||||
response.setHeader("Content-disposition", "attachment; filename=" + fileName);
|
||||
log.info("开始write");
|
||||
template.write(os);
|
||||
|
||||
}
|
||||
|
||||
153
src/main/resources/application-localpro.yml
Normal file
153
src/main/resources/application-localpro.yml
Normal file
@ -0,0 +1,153 @@
|
||||
server:
|
||||
port: 18003
|
||||
servlet:
|
||||
context-path: /
|
||||
|
||||
seata:
|
||||
service:
|
||||
vgroup-mapping:
|
||||
biz-service-ebtp-extend-local-service-group: seata-server-jl
|
||||
registry:
|
||||
type: eureka
|
||||
eureka:
|
||||
serviceUrl: http://10.238.25.112:5001/eureka,http://10.238.25.112:5002/eureka,http://10.238.25.112:5003/eureka
|
||||
|
||||
# 对应 apollo 配置中心的应用名
|
||||
app:
|
||||
id: biz-service-ebtp-extend
|
||||
|
||||
# Apollo 配置信息
|
||||
apollo:
|
||||
meta: http://10.238.25.112:6001/
|
||||
bootstrap:
|
||||
namespace: application
|
||||
enabled: true
|
||||
eagerLoad:
|
||||
enabled: true
|
||||
|
||||
spring:
|
||||
aop:
|
||||
auto: true #开启spring的aop配置
|
||||
proxy-target-class: true
|
||||
application:
|
||||
name: biz-service-ebtp-extend-local
|
||||
|
||||
shardingsphere:
|
||||
datasource:
|
||||
names: ds0
|
||||
ds0:
|
||||
type: com.alibaba.druid.pool.DruidDataSource
|
||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
username: auction
|
||||
password: ProdMall3_0118auction
|
||||
jdbc-url: jdbc:mysql://10.238.25.112:3001/ebtp_mall_extend?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
|
||||
url: jdbc:mysql://10.238.25.112:3001/ebtp_mall_extend?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
|
||||
filters: stat,wall,log4j
|
||||
maxActive: 20
|
||||
initialSize: 1
|
||||
maxWait: 60000
|
||||
minIdle: 1
|
||||
timeBetweenEvictionRunsMillis: 60000
|
||||
minEvictableIdleTimeMillis: 300000
|
||||
validationQuery: select 'x'
|
||||
testWhileIdle: true
|
||||
testOnBorrow: false
|
||||
testOnReturn: false
|
||||
poolPreparedStatements: true
|
||||
maxOpenPreparedStatements: 20
|
||||
connection-properties: druid.stat.merggSql=ture;druid.stat.slowSqlMillis=5000
|
||||
props:
|
||||
sql:
|
||||
show: true
|
||||
|
||||
jackson:
|
||||
date-format: yyyy-MM-dd HH:mm:ss
|
||||
time-zone: GMT+8
|
||||
serialization:
|
||||
write-dates-as-timestamps: false
|
||||
|
||||
# 生产区 redis 配置
|
||||
redis:
|
||||
sentinel:
|
||||
master: eshop-redis2
|
||||
nodes: 10.172.48.83:32521,10.172.48.100:32521,10.172.48.94:32561
|
||||
password: Unicom#135
|
||||
|
||||
# 天宫Eureka配置
|
||||
eureka:
|
||||
client:
|
||||
service-url:
|
||||
defaultZone: http://10.238.25.112:5001/eureka,http://10.238.25.112:5002/eureka,http://10.238.25.112:5003/eureka
|
||||
instance:
|
||||
prefer-ip-address: true
|
||||
instance-ip: ${spring.cloud.client.ip-address}:${server.port}
|
||||
|
||||
mybatis-plus:
|
||||
configuration:
|
||||
# 是否开启自动驼峰命名规则映射:从数据库列名到Java属性驼峰命名的类似映射
|
||||
map-underscore-to-camel-case: true
|
||||
auto-mapping-behavior: full
|
||||
# 这个配置会将执行的sql打印出来，在开发或测试的时候可以用
|
||||
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
|
||||
mapper-locations: classpath*:com/chinaunicom/mall/ebtp/**/mapper/*Mapper.xml
|
||||
global-config:
|
||||
# 逻辑删除配置
|
||||
db-config:
|
||||
logic-not-delete-value: normal # 逻辑删除标记：正常数据
|
||||
logic-delete-value: deleted # 逻辑删除标记：已删除的数据
|
||||
|
||||
feign:
|
||||
httpclient:
|
||||
enabled: false
|
||||
okhttp:
|
||||
enabled: true
|
||||
client:
|
||||
config:
|
||||
default:
|
||||
connect-timeout: 20000
|
||||
read-timeout: 20000
|
||||
hystrix:
|
||||
command:
|
||||
default:
|
||||
execution:
|
||||
timeout:
|
||||
enabled: true
|
||||
isolation:
|
||||
strategy: SEMAPHORE
|
||||
thread:
|
||||
timeoutInMilliseconds: 200000 #熔断超时时间
|
||||
circuitBreaker:
|
||||
sleepWindowInMilliseconds: 20000
|
||||
forceClosed: true
|
||||
|
||||
ribbon:
|
||||
ReadTimeout: 20000 #请求处理的超时时间
|
||||
ConnectTimeout: 20000 #请求连接超时时间
|
||||
MaxAutoRetries: 0 #对当前实例的重试次数
|
||||
MaxAutoRetriesNextServer: 1 #切换实例的重试次数 1
|
||||
|
||||
mconfig:
|
||||
workerId: 1
|
||||
datacenterId: 1
|
||||
# 服务名
|
||||
feign:
|
||||
name:
|
||||
open: biz-service-ebtp-opening #开标大厅服务
|
||||
process: biz-service-ebtp-process #评审流程服务
|
||||
project: biz-service-ebtp-project #项目服务
|
||||
resps: biz-service-ebtp-resps #应答结构化服务
|
||||
rsms: biz-service-ebtp-rsms #评审结构化服务
|
||||
tender: biz-service-ebtp-tender #投标服务
|
||||
documentcenter: core-service-document-center #文档中心
|
||||
document:
|
||||
clientHttpUrl: http://10.238.25.112:8100/auth/oauth/token?grant_type=client_credentials&client_id=bVS46ElU&client_secret=58ea04ba02475c8da2321cc99849d2a10f15b749
|
||||
|
||||
# 用户暴露给 prometheus 的健康数据
|
||||
management:
|
||||
endpoints:
|
||||
web:
|
||||
exposure:
|
||||
include: "*"
|
||||
cors:
|
||||
allowed-origins: "*"
|
||||
allowed-methods: "*"
|
||||
@ -1,3 +1,3 @@
|
||||
spring:
|
||||
profiles:
|
||||
active: test
|
||||
active: pro
|
||||
Reference in New Issue
Block a user