测试环境
This commit is contained in:
@ -4,4 +4,4 @@ ENV LANG=zh_CN.utf8
|
|||||||
ENV LANGUAGE=zh_CN.utf8
|
ENV LANGUAGE=zh_CN.utf8
|
||||||
RUN localedef -c -f UTF-8 -i zh_CN zh_CN.utf8
|
RUN localedef -c -f UTF-8 -i zh_CN zh_CN.utf8
|
||||||
ADD /target/biz_service_ebtp_project-0.0.1.jar /biz_service_ebtp_project-0.0.1.jar
|
ADD /target/biz_service_ebtp_project-0.0.1.jar /biz_service_ebtp_project-0.0.1.jar
|
||||||
ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "/biz_service_ebtp_project-0.0.1.jar"]
|
ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-Dspring.profiles.active=uat", "-jar", "/biz_service_ebtp_project-0.0.1.jar"]
|
||||||
|
7
Dockerfile-test
Normal file
7
Dockerfile-test
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
FROM harbor.dcos.guangzhou.unicom.local/eshop/skywalking_agent_springboot_8.1.0:v1.0
|
||||||
|
ENV LC_ALL=zh_CN.utf8
|
||||||
|
ENV LANG=zh_CN.utf8
|
||||||
|
ENV LANGUAGE=zh_CN.utf8
|
||||||
|
RUN localedef -c -f UTF-8 -i zh_CN zh_CN.utf8
|
||||||
|
ADD /target/biz_service_ebtp_project-0.0.1.jar /biz_service_ebtp_project-0.0.1.jar
|
||||||
|
ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-Dspring.profiles.active=test", "-jar", "/biz_service_ebtp_project-0.0.1.jar"]
|
17
config-test
Normal file
17
config-test
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
apiVersion: v1
|
||||||
|
clusters:
|
||||||
|
- cluster:
|
||||||
|
insecure-skip-tls-verify: true
|
||||||
|
server: https://10.125.164.54:41967
|
||||||
|
name: demok8s
|
||||||
|
contexts:
|
||||||
|
- context:
|
||||||
|
cluster: demok8s
|
||||||
|
user: cluster-admin
|
||||||
|
name: default
|
||||||
|
current-context: default
|
||||||
|
kind: Config
|
||||||
|
users:
|
||||||
|
- name: cluster-admin
|
||||||
|
user:
|
||||||
|
token: b69792983bfe0ec502e081ad8a31f9e2
|
71
deployment-test.yaml
Normal file
71
deployment-test.yaml
Normal file
@ -0,0 +1,71 @@
|
|||||||
|
# 接口版本
|
||||||
|
apiVersion: apps/v1
|
||||||
|
# 接口类型
|
||||||
|
kind: Deployment
|
||||||
|
metadata:
|
||||||
|
name: biz-service-ebtp-project
|
||||||
|
namespace: default
|
||||||
|
labels:
|
||||||
|
app: biz-service-ebtp-project
|
||||||
|
|
||||||
|
# 必选,详细定义
|
||||||
|
spec:
|
||||||
|
# pod 副本数量
|
||||||
|
replicas: 1
|
||||||
|
|
||||||
|
# 滚动升级配置信息
|
||||||
|
strategy:
|
||||||
|
rollingUpdate:
|
||||||
|
maxSurge: 1
|
||||||
|
maxUnavailable: 1
|
||||||
|
|
||||||
|
# 选择器,匹配pod模板
|
||||||
|
selector:
|
||||||
|
matchLabels:
|
||||||
|
app: biz-service-ebtp-project
|
||||||
|
|
||||||
|
template:
|
||||||
|
metadata:
|
||||||
|
labels:
|
||||||
|
# 模板名称
|
||||||
|
app: biz-service-ebtp-project
|
||||||
|
annotations:
|
||||||
|
prometheus.io/port: '18012'
|
||||||
|
prometheus.io/jl-pod: 'true'
|
||||||
|
|
||||||
|
# 定义容器模板,该模板可以包含多个容器
|
||||||
|
spec:
|
||||||
|
# 必选,Pod中容器列表
|
||||||
|
containers:
|
||||||
|
- name: biz-service-ebtp-project
|
||||||
|
image: harbor.dcos.guangzhou.unicom.local/eshop/biz-service-ebtp-project:latest
|
||||||
|
# 需要暴露的端口库号列表
|
||||||
|
ports:
|
||||||
|
- containerPort: 18012
|
||||||
|
# 容器运行前需设置的环境变量列表
|
||||||
|
env:
|
||||||
|
# Apollo 配置中心变量设置
|
||||||
|
- name: APOLLO_CONFIGSERVICE
|
||||||
|
value: http://10.242.37.148:6001
|
||||||
|
---
|
||||||
|
kind: Service
|
||||||
|
apiVersion: v1
|
||||||
|
metadata:
|
||||||
|
name: biz-service-ebtp-project
|
||||||
|
namespace: default
|
||||||
|
labels:
|
||||||
|
app: biz-service-ebtp-project
|
||||||
|
annotations:
|
||||||
|
lb.cke.tg.unicom/target-vports: 18012-18012
|
||||||
|
prometheus.io/port: '18012'
|
||||||
|
prometheus.io/jl-svc: 'true'
|
||||||
|
spec:
|
||||||
|
ports:
|
||||||
|
- port: 18012
|
||||||
|
targetPort: 18012
|
||||||
|
selector:
|
||||||
|
app: biz-service-ebtp-project
|
||||||
|
status:
|
||||||
|
loadBalancer: {}
|
||||||
|
|
||||||
|
---
|
177
src/main/resources/application-local.yml
Normal file
177
src/main/resources/application-local.yml
Normal file
@ -0,0 +1,177 @@
|
|||||||
|
server:
|
||||||
|
port: 18012
|
||||||
|
servlet:
|
||||||
|
context-path: /
|
||||||
|
|
||||||
|
# 对应 apollo 配置中心的应用名
|
||||||
|
app:
|
||||||
|
id: biz-service-ebtp-project-dev
|
||||||
|
|
||||||
|
# Apollo 配置信息
|
||||||
|
apollo:
|
||||||
|
meta: http://10.242.37.148:6001/
|
||||||
|
bootstrap:
|
||||||
|
namespace: application
|
||||||
|
enabled: true
|
||||||
|
eagerLoad:
|
||||||
|
enabled: true
|
||||||
|
|
||||||
|
seata:
|
||||||
|
service:
|
||||||
|
vgroup-mapping:
|
||||||
|
biz-service-ebtp-project-dev-service-group: default
|
||||||
|
grouplist:
|
||||||
|
default: 10.242.37.148:18035
|
||||||
|
|
||||||
|
spring:
|
||||||
|
aop:
|
||||||
|
auto: true #开启spring的aop配置
|
||||||
|
proxy-target-class: true
|
||||||
|
|
||||||
|
application:
|
||||||
|
name: biz-service-ebtp-project-dev
|
||||||
|
|
||||||
|
shardingsphere:
|
||||||
|
datasource:
|
||||||
|
names: ds0
|
||||||
|
ds0:
|
||||||
|
type: com.alibaba.druid.pool.DruidDataSource
|
||||||
|
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||||
|
username: root
|
||||||
|
password: root
|
||||||
|
jdbc-url: jdbc:mysql://10.242.37.148:3033/ebtp_mall_project?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
|
||||||
|
url: jdbc:mysql://10.242.37.148:3033/ebtp_mall_project?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
|
||||||
|
|
||||||
|
# 天宫Kafka增加了安全认证,需要配置安全属性
|
||||||
|
kafka:
|
||||||
|
bootstrap-servers: 10.125.164.192:32005,10.125.164.193:32005,10.125.164.194:32005
|
||||||
|
template:
|
||||||
|
default-topic: jl_test
|
||||||
|
|
||||||
|
# 生产者配置参数
|
||||||
|
producer:
|
||||||
|
client-id: core-service-ebtp-crypt
|
||||||
|
properties:
|
||||||
|
security.protocol: SASL_PLAINTEXT
|
||||||
|
sasl.mechanism: SCRAM-SHA-256
|
||||||
|
sasl.jaas.config: org.apache.kafka.common.security.scram.ScramLoginModule required username="jltest" password="Unicom#123";
|
||||||
|
|
||||||
|
# 消费者配置参数
|
||||||
|
consumer:
|
||||||
|
group-id: core-service-ebtp-crypt-consumer
|
||||||
|
auto-offset-reset: latest
|
||||||
|
properties:
|
||||||
|
security.protocol: SASL_PLAINTEXT
|
||||||
|
sasl.mechanism: SCRAM-SHA-256
|
||||||
|
sasl.jaas.config: org.apache.kafka.common.security.scram.ScramLoginModule required username="jltest" password="Unicom#123";
|
||||||
|
|
||||||
|
# 天宫 redis 需要使用哨兵进行访问
|
||||||
|
redis:
|
||||||
|
sentinel:
|
||||||
|
master: eshop-redis
|
||||||
|
nodes: 10.125.164.124:32718, 10.125.164.118:32716, 10.125.164.121:32716
|
||||||
|
password: Unicom#135
|
||||||
|
|
||||||
|
# 天宫Eureka配置
|
||||||
|
eureka:
|
||||||
|
client:
|
||||||
|
service-url:
|
||||||
|
defaultZone: http://10.242.37.148:5001/eureka
|
||||||
|
|
||||||
|
instance:
|
||||||
|
prefer-ip-address: true
|
||||||
|
instance-id: http://10.242.37.148:${server.port}
|
||||||
|
# 这是客户端的注册地址, eureka 会通过这个地址建立管道
|
||||||
|
ip-address: 10.242.37.148
|
||||||
|
|
||||||
|
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-delete-field: flag # 全局逻辑删除的实体字段名(since 3.3.0,配置后可以忽略不配置步骤2) @TableLogic
|
||||||
|
logic-not-delete-value: normal # 逻辑删除标记:正常数据
|
||||||
|
logic-delete-value: deleted # 逻辑删除标记:已删除的数据
|
||||||
|
type-aliases-package: com.chinaunicom.mall.ebtp.project
|
||||||
|
|
||||||
|
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:
|
||||||
|
swagger-ui-open: true
|
||||||
|
exception-handle-enabled: true
|
||||||
|
seata-open-enabled: false
|
||||||
|
work-id: 1 #终端ID
|
||||||
|
datacenter-id: 1 #数据中心ID
|
||||||
|
host-name: http://10.242.37.148/
|
||||||
|
service-name-purp: mall-purp #采购系统委托项目微服务
|
||||||
|
service-name-wfap: mall-wfap #重新评审 流程微服务
|
||||||
|
service-name-resu: mall-resu #重新评审 项目中心查询服务
|
||||||
|
service-price-query : biz-service-price-query #商城询价服务
|
||||||
|
service-price-usercenter: core-service-usercenter-public #用户中心服务
|
||||||
|
#内部服务
|
||||||
|
service-name-auction: biz-service-ebtp-auction #竞拍服务API
|
||||||
|
service-name-calibration: biz-service-ebtp-calibration #标段定标接口
|
||||||
|
service-name-bid: biz-service-ebtp-bid #标段出始化流程
|
||||||
|
service-name-process: biz-service-ebtp-process #标段出始化流程
|
||||||
|
service-name-resps : biz-service-ebtp-resps #标段应答文件
|
||||||
|
service-name-rsms : biz-service-ebtp-rsms #评审微服务
|
||||||
|
service-name-tender : biz-service-ebtp-tender #标段投标微服务
|
||||||
|
wfSectionNo: '080'
|
||||||
|
wfSectionName: 标段重新评审审批单
|
||||||
|
|
||||||
|
# 用户暴露给 prometheus 的健康数据
|
||||||
|
management:
|
||||||
|
endpoints:
|
||||||
|
web:
|
||||||
|
exposure:
|
||||||
|
include: "*"
|
||||||
|
cors:
|
||||||
|
allowed-origins: "*"
|
||||||
|
allowed-methods: "*"
|
@ -3,22 +3,25 @@ server:
|
|||||||
servlet:
|
servlet:
|
||||||
context-path: /
|
context-path: /
|
||||||
|
|
||||||
|
seata:
|
||||||
|
service:
|
||||||
|
vgroup-mapping:
|
||||||
|
biz-service-ebtp-project-service-group: default
|
||||||
|
grouplist:
|
||||||
|
default: 10.242.37.148:18035
|
||||||
|
|
||||||
# 对应 apollo 配置中心的应用名
|
# 对应 apollo 配置中心的应用名
|
||||||
app:
|
app:
|
||||||
id: biz-service-ebtp-project-dev
|
id: biz-service-ebtp-project
|
||||||
|
|
||||||
# Apollo 配置信息
|
# Apollo 配置信息
|
||||||
apollo:
|
apollo:
|
||||||
meta: http://10.242.31.158:6001/
|
meta: http://10.242.37.148:6001/
|
||||||
bootstrap:
|
bootstrap:
|
||||||
namespace: application
|
namespace: application
|
||||||
enabled: true
|
enabled: true
|
||||||
eagerLoad:
|
eagerLoad:
|
||||||
enabled: true
|
enabled: true
|
||||||
seata:
|
|
||||||
service:
|
|
||||||
vgroup-mapping:
|
|
||||||
biz-service-ebtp-project-dev-service-group: default
|
|
||||||
|
|
||||||
spring:
|
spring:
|
||||||
aop:
|
aop:
|
||||||
@ -26,7 +29,7 @@ spring:
|
|||||||
proxy-target-class: true
|
proxy-target-class: true
|
||||||
|
|
||||||
application:
|
application:
|
||||||
name: biz-service-ebtp-project-dev
|
name: biz-service-ebtp-project
|
||||||
|
|
||||||
shardingsphere:
|
shardingsphere:
|
||||||
datasource:
|
datasource:
|
||||||
@ -36,8 +39,8 @@ spring:
|
|||||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||||
username: root
|
username: root
|
||||||
password: root
|
password: root
|
||||||
jdbc-url: jdbc:mysql://10.242.31.158:3033/ebtp_mall_project?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
|
jdbc-url: jdbc:mysql://10.242.37.148:3033/ebtp_mall_project?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
|
||||||
url: jdbc:mysql://10.242.31.158:3033/ebtp_mall_project?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
|
url: jdbc:mysql://10.242.37.148:3033/ebtp_mall_project?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
|
||||||
filters: stat,wall,log4j
|
filters: stat,wall,log4j
|
||||||
maxActive: 20
|
maxActive: 20
|
||||||
initialSize: 1
|
initialSize: 1
|
||||||
@ -96,11 +99,12 @@ spring:
|
|||||||
eureka:
|
eureka:
|
||||||
client:
|
client:
|
||||||
service-url:
|
service-url:
|
||||||
defaultZone: http://10.242.31.158:5001/eureka,http://10.242.31.158:5002/eureka,http://10.242.31.158:5003/eureka
|
defaultZone: http://eureka-1-svc:8080/eureka, http://eureka-2-svc:8080/eureka, http://eureka-3-svc:8080/eureka
|
||||||
instance:
|
instance:
|
||||||
instance-id: 125.32.114.204:${server.port}
|
prefer-ip-address: true
|
||||||
hostname: 125.32.114.204
|
instance-id: http://10.242.37.148:${server.port}
|
||||||
ip-address: 125.32.114.204
|
# 这是客户端的注册地址, eureka 会通过这个地址建立管道
|
||||||
|
ip-address: 10.242.37.148
|
||||||
|
|
||||||
mybatis-plus:
|
mybatis-plus:
|
||||||
configuration:
|
configuration:
|
||||||
@ -144,7 +148,7 @@ mconfig:
|
|||||||
seata-open-enabled: false
|
seata-open-enabled: false
|
||||||
work-id: 1 #终端ID
|
work-id: 1 #终端ID
|
||||||
datacenter-id: 1 #数据中心ID
|
datacenter-id: 1 #数据中心ID
|
||||||
host-name: http://10.242.31.158/
|
host-name: http://10.242.37.148/
|
||||||
service-name-purp: mall-purp #采购系统委托项目微服务
|
service-name-purp: mall-purp #采购系统委托项目微服务
|
||||||
service-name-wfap: mall-wfap #重新评审 流程微服务
|
service-name-wfap: mall-wfap #重新评审 流程微服务
|
||||||
service-name-resu: mall-resu #重新评审 项目中心查询服务
|
service-name-resu: mall-resu #重新评审 项目中心查询服务
|
||||||
@ -170,3 +174,4 @@ management:
|
|||||||
cors:
|
cors:
|
||||||
allowed-origins: "*"
|
allowed-origins: "*"
|
||||||
allowed-methods: "*"
|
allowed-methods: "*"
|
||||||
|
|
@ -1,3 +1,3 @@
|
|||||||
spring:
|
spring:
|
||||||
profiles:
|
profiles:
|
||||||
active: dev
|
active: uat
|
Reference in New Issue
Block a user