root
/
WuXiDiKe
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/admin' into acs_v1.0.0 

# Conflicts:
#	nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml
#	nladmin-system/nlsso-server/src/main/resources/config/application.yml
master
李永德 8 months ago
parent
b8561580d5 77271cc801
commit
694be67936
2 changed files with 71 additions and 72 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 107
      nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml
  2. 36
      nladmin-system/nlsso-server/src/main/resources/config/application.yml

107
nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml
View File

@ -1,6 +1,32 @@
server: server:
port: 8011 port: 8011
#配置数据源 # 项目配置
nl:
config:
mysql:
ip: 127.0.0.1
port: 3306
username: root
password: 12356
database: nl-platform
redis:
ip: 127.0.0.1
port: 6379
password: null
database: 1
oracle:
ip: 172.27.37.66
port: 1521
scheme: RTMES
username: LMSTELCOM
password: LMSTELCOM_6463
sqlserver:
ip: 10.93.41.2
port: WINCC
username: sa
password: 123
database: 马钢_RH
# 配置数据源
spring: spring:
autoconfigure: autoconfigure:
exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
@ -10,30 +36,27 @@ spring:
datasource: datasource:
mysql: mysql:
driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
# url: jdbc:log4jdbc:mysql://${DB_HOST:10.93.41.198}:${DB_PORT:3306}/${DB_NAME:rl_mg_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true url: jdbc:log4jdbc:mysql://${DB_HOST:${nl.config.mysql.ip}}:${DB_PORT:${nl.config.mysql.port}}/${DB_NAME:${nl.config.mysql.database}}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
# username: ${DB_USER:root} username: ${DB_USER:${nl.config.mysql.username}}
# password: ${DB_PWD:123456} password: ${DB_PWD:${nl.config.mysql.password}}
url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:nladmin-acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
username: ${DB_USER:root}
password: ${DB_PWD:12356}
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
oracle: oracle:
driver-class-name: oracle.jdbc.OracleDriver driver-class-name: oracle.jdbc.OracleDriver
url: jdbc:oracle:thin:@172.27.37.66:1521:RTMES url: jdbc:oracle:thin:@${nl.config.oracle.ip}:${nl.config.oracle.port}:${nl.config.oracle.scheme}
username: ${DB_USER:LMSTELCOM} username: ${DB_USER:${nl.config.oracle.username}}
password: ${DB_PWD:LMSTELCOM_6463} password: ${DB_PWD:${nl.config.oracle.password}}
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
sqlserver: sqlserver:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
url: jdbc:sqlserver://10.93.41.2\WINCC;DatabaseName=马钢_RH url: jdbc:sqlserver://${nl.config.sqlserver.ip}\${nl.config.sqlserver.port};DatabaseName=${nl.config.sqlserver.database}
username: ${DB_USER:sa} username: ${DB_USER:${nl.config.sqlserver.username}}
password: ${DB_PWD:123} password: ${DB_PWD:${nl.config.sqlserver.password}}
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
redis: redis:
#数据库索引 # 数据库索引
host: ${REDIS_HOST:127.0.0.1} host: ${REDIS_HOST:${nl.config.redis.ip}}
port: ${REDIS_PORT:6379} port: ${REDIS_PORT:${nl.config.redis.port}}
password: ${REDIS_PWD:} password: ${REDIS_PWD:${nl.config.redis.password}}
redisson: redisson:
config: | config: |
threads: 4 threads: 4
@ -45,30 +68,26 @@ spring:
address: redis://127.0.0.1:6379 address: redis://127.0.0.1:6379
idleConnectionTimeout: 10000 idleConnectionTimeout: 10000
timeout: 3000 timeout: 3000
jetcache:
# 登录相关配置 statIntervalMinutes: 15
login: areaInCacheName: false
# 登录缓存 local:
cache-enable: true default:
# 是否限制单用户登录 type: linkedhashmap
single-login: false keyConvertor: fastjson
# 验证码 remote:
login-code: default:
# 验证码类型配置 查看 LoginProperties 类 type: redis
code-type: arithmetic keyConvertor: fastjson2
# 登录图形验证码有效时间/分钟 broadcastChannel: projectA
expiration: 2 valueEncoder: java
# 验证码高度 valueDecoder: java
width: 111 poolConfig:
# 验证码宽度 minIdle: 5
heigth: 36 maxIdle: 20
# 内容长度 maxTotal: 50
length: 2 host: ${nl.config.redis.ip}
# 字体名称，为空则使用默认字体 port: ${nl.config.redis.port}
font-name:
# 字体大小
font-size: 25
#是否允许生成代码，生产环境设置为false #是否允许生成代码，生产环境设置为false
generator: generator:
enabled: true enabled: true
@ -134,11 +153,11 @@ sa-token:
token-session-check-login: false token-session-check-login: false
alone-redis: alone-redis:
# Redis数据库索引（默认为0） # Redis数据库索引（默认为0）
database: 1 database: ${nl.config.redis.database}
# Redis服务器地址 # Redis服务器地址
host: 127.0.0.1 host: ${nl.config.redis.ip}
# Redis服务器连接端口 # Redis服务器连接端口
port: 6379 port: ${nl.config.redis.port}
# Redis服务器连接密码（默认为空） # Redis服务器连接密码（默认为空）
password: password:
# 连接超时时间 # 连接超时时间

36
nladmin-system/nlsso-server/src/main/resources/config/application.yml
View File

@ -106,14 +106,12 @@ task:
# 队列容量 # 队列容量
queue-capacity: 50 queue-capacity: 50
#七牛云 # 登录相关配置
qiniu: login:
# 文件大小 /M # 登录缓存
max-size: 15 cache-enable: true
# 是否限制单用户登录
#邮箱验证码有效时间/秒 single-login: false
code:
expiration: 300
#密码加密传输，前端公钥加密，后端私钥解密 #密码加密传输，前端公钥加密，后端私钥解密
rsa: rsa:
@ -151,6 +149,7 @@ security:
- /api/localStorage/pictures - /api/localStorage/pictures
# 参数 # 参数
- /api/param/getValueByCode - /api/param/getValueByCode
# mybatis-plus配置
mybatis-plus: mybatis-plus:
configuration: configuration:
map-underscore-to-camel-case: false map-underscore-to-camel-case: false
@ -163,26 +162,6 @@ mybatis-plus:
db-config: db-config:
id-type: INPUT id-type: INPUT
banner: false banner: false
jetcache:
statIntervalMinutes: 15
areaInCacheName: false
local:
default:
type: linkedhashmap
keyConvertor: fastjson
remote:
default:
type: redis
keyConvertor: fastjson
broadcastChannel: projectA
valueEncoder: java
valueDecoder: java
poolConfig:
minIdle: 5
maxIdle: 20
maxTotal: 50
host: 127.0.0.1
port: 6379
lucene: lucene:
index: index:
path: D:\lucene\index path: D:\lucene\index
@ -209,5 +188,6 @@ sa-token:
domain: domain:
is-read-cookie: false is-read-cookie: false
is-print: false is-print: false
agvToAcs: agvToAcs:
addr: 127.0.0.1 addr: 127.0.0.1

Write Preview
Loading…
Cancel
Save