Merge branch 'caihaohan' into lixuetao
# Conflicts: # adc-da-main/target/classes/application-dev.properties # adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java # adc-da-report/target/classes/com/adc/da/report/controller/ReportManageConroller.class # adc-da-report/target/classes/com/adc/da/report/service/impl/IReportServiceImpl.class # adc-da-report/target/classes/com/adc/da/report/util/PdfUtil.class # adc-da-report/target/classes/com/adc/da/report/util/PptUtil.class # adc-da-report/target/classes/mybatis/mapper/mysql/ReportManageMapper.xml # adc-da-sys/src/main/java/com/adc/da/sys/dao/mysql/UserEODao.java # adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java # adc-da-sys/src/main/java/com/adc/da/sys/service/iservice/IUserEoService.java # adc-da-sys/src/main/resources/mybatis/mapper/sys/mysql/UserEOMapper.xml # adc-da-sys/target/classes/com/adc/da/sys/controller/UserEOController.class # adc-da-sys/target/classes/com/adc/da/sys/service/RoleEOService.class # adc-da-sys/target/classes/dozer/dozer-mappings-ddm.xml # pom.xml
This commit is contained in:
bupengxiang
@@ -0,0 +1,142 @@
|
||||
#Development System
|
||||
#spring.datasource.driverClassName = oracle.jdbc.OracleDriver
|
||||
#spring.datasource.url = jdbc:oracle:thin:@//60.247.58.117:50011/ADC
|
||||
##spring.datasource.username = ADC_PLATFORM
|
||||
##spring.datasource.password = ADC_PLATFORM
|
||||
|
||||
#spring.datasource.url = jdbc:oracle:thin:@//192.168.144.136:19290/ADC
|
||||
#spring.datasource.username = EPR
|
||||
#spring.datasource.password = EPR
|
||||
|
||||
#spring.datasource.url = jdbc:oracle:thin:@//192.168.144.103:19290/ADC
|
||||
#spring.datasource.username = EPR_TEST
|
||||
#spring.datasource.password = EPR_TEST
|
||||
|
||||
#spring.datasource.driverClassName = com.mysql.jdbc.Driver
|
||||
#spring.datasource.url = jdbc:mysql://192.168.144.124:3306/cadata2?characterEncoding=utf-8&&zeroDateTimeBehavior=convertToNull
|
||||
#spring.datasource.username = adc_forecast
|
||||
#spring.datasource.password = adc_forecast
|
||||
|
||||
|
||||
#kylin数据库 ds1
|
||||
#spring.datasource.kylin.name=PROJECT_MI
|
||||
#spring.datasource.kylin.driverClassName=org.apache.kylin.jdbc.Driver
|
||||
#spring.datasource.kylin.url=jdbc:kylin://10.64.23.8:7070/PROJECT_MI
|
||||
#spring.datasource.kylin.username=64459
|
||||
#spring.datasource.kylin.password=ichangan_ps9
|
||||
##10s
|
||||
#spring.datasource.kylin.maxWaitTime=10000
|
||||
#spring.datasource.kylin.poolSize=10
|
||||
#
|
||||
##mysql数据库 ds2
|
||||
#spring.datasource.mysql.driverClassName = com.mysql.jdbc.Driver
|
||||
#spring.datasource.mysql.url = jdbc:mysql://192.168.144.80:3306/cadata?characterEncoding=utf-8&&zeroDateTimeBehavior=convertToNull
|
||||
#spring.datasource.mysql.username = root
|
||||
#spring.datasource.mysql.password = root
|
||||
|
||||
spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver
|
||||
spring.datasource.url = jdbc:mysql://121.36.69.172:3307/report-library?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
|
||||
spring.datasource.username = root
|
||||
spring.datasource.password = hzwlsoft.com
|
||||
|
||||
#后端端口
|
||||
server.port=7060
|
||||
|
||||
#验证码后台模式，默认为1：1为不开启，2为开启，3为输错 用户名或密码 ${maxLoginErrorCount} 次 才开启
|
||||
verifyCodeMode=3
|
||||
#仅当验证码模式 ${verifyCodeMode} 为 3时生效，设置错误登录出现验证码的阈值，默认为3
|
||||
maxLoginErrorCount=3
|
||||
|
||||
#密码Base64加密开关,true为开启,false为关闭
|
||||
isPassEncrypted=true
|
||||
#{
|
||||
#"password": "YWJjMTIz",
|
||||
#"username": "YWRtaW4x"
|
||||
#}
|
||||
#swagger 显示api，1为只显示${restPath:/api}前缀的api,0为显示所有api，其他为不显示api
|
||||
swaggerLevel=0
|
||||
|
||||
|
||||
#uploadFile=/EPR/file/EPR/test/
|
||||
#
|
||||
#picPath=/EPR/file/home/pic/
|
||||
|
||||
# 本地存储文件的磁盘地址
|
||||
uploadFile=D:\\work\\idea\\changan\\
|
||||
# 本地文件访问的url地址
|
||||
picPath=/api/home/pic/
|
||||
|
||||
|
||||
serverIp=http://127.0.0.1:7060/
|
||||
|
||||
|
||||
#MAIL_SMTP =smtp.163.com
|
||||
#MAIL_SMTP_PORT=465
|
||||
#MAIL_USERNAME=cagds@catarc.ac.cn
|
||||
#MAIL_PASSWORD=Cagds9760
|
||||
|
||||
MAIL_SMTP =smtp.163.com
|
||||
MAIL_SMTP_PORT=465
|
||||
MAIL_USERNAME=simashihao@163.com
|
||||
MAIL_PASSWORD=VQBNNQBLDIALAYCV
|
||||
|
||||
#MAIL_SMTP =cmp.changan.com
|
||||
#MAIL_SMTP_PORT=25
|
||||
MAIL_POP_PORT=110
|
||||
#MAIL_USERNAME=64459@Any3.com
|
||||
#MAIL_PASSWORD=65316975Xiaoq
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
IPANDPORT=http://localhost:7061/
|
||||
|
||||
#redis
|
||||
#Redis服务器地址
|
||||
spring.redis.host=192.168.144.29
|
||||
#spring.redis.host=localhost
|
||||
## Redis服务器连接端口
|
||||
spring.redis.port=6379
|
||||
## Redis服务器连接密码（默认为空）
|
||||
spring.redis.password=123321
|
||||
## 连接超时时间（毫秒）
|
||||
spring.redis.timeout=200000ms
|
||||
## 连接池中的最大空闲连接，默认值是8。
|
||||
spring.redis.jedis.pool.max-idle=50
|
||||
##连接池中的最小空闲连接，默认值是0。
|
||||
spring.redis.jedis.pool.min-idle=10
|
||||
## 如果赋值为-1，则表示不限制；如果pool已经分配了maxActive个jedis实例，则此时pool的状态为exhausted(耗尽)。
|
||||
spring.redis.jedis.pool.max-active=2000
|
||||
## 等待可用连接的最大时间，单位毫秒，默认值为-1，表示永不超时。如果超过等待时间，则直接抛出JedisConnectionException
|
||||
spring.redis.jedis.pool.max-wait=2000ms
|
||||
|
||||
spring.redis.database=6
|
||||
|
||||
# 上传方式：阿里云：alioss 华为云：hwobs
|
||||
uploadType: hwobs
|
||||
|
||||
# ======= 阿里OSS配置 =========
|
||||
aliyun.OSS.endpoint=https://oss-cn-hangzhou.aliyuncs.com
|
||||
aliyun.OSS.accessKeyId= LTAI5tBmUfVF6Z8R6sHTdTG7
|
||||
aliyun.OSS.accessKeySecret= mY6UvWv20Tg2R46ORe6uV5gL6TQloC
|
||||
aliyun.OSS.bucketName=qqxexamplebucket
|
||||
aliyun.OSS.fileMaxSize=10 #文件上传最大M数
|
||||
|
||||
# ======= 华为OBS配置 =========
|
||||
huawei.OBS.endPoint=https://obs.cn-north-4.myhuaweicloud.com
|
||||
huawei.OBS.accessKey=EEMAGYTHP9KKPF18TZCL
|
||||
huawei.OBS.secretKey=3NmFNf1uX3EV1LbCEzgw6gDv0tZ6WAVwG37BGq1p
|
||||
huawei.OBS.bucketName=gcpa
|
||||
huawei.OBS.fileMaxSize=10 #文件上传最大M数
|
||||
|
||||
logging.level.com.adc: debug
|
||||
|
||||
|
||||
# ======= ddm权限接口 集成 =========
|
||||
ddm-identity=changan_test
|
||||
ddm-company=9
|
||||
ddm-ras-public-key=
|
||||
|
||||
|
||||
Reference in New Issue
Block a user