Merge remote-tracking branch 'boe/cloud' into cloud

servers/boe-server-all/src/main/resources/application-pro.properties

@@ -1,56 +1,20 @@
-# tomcat 优化配置
-# 默认是200，Tomcat工作线程的最大数量
-server.tomcat.threads.max=500
-# 默认是10， Tomcat工作线程 最小数据，最小空闲数量
-server.tomcat.threads.min-spare=20
-
-# 默认是200，Maximum number of idle processors that will be retained in the cache and reused with a subsequent request. When set to -1 the cache will be unlimited with a theoretical maximum size equal to the maximum number of connections.
-server.tomcat.processor-cache=500
-
-# 配置Web服务器时，设置服务器连接超时也可能很有用。这表示服务器在连接关闭之前等待客户端发出请求的最长时间
-server.tomcat.connection-timeout=5s
-
-#定义请求头的最大大小
-#server.max-http-header-size= 8KB
-# 请求正文的最大大小
-# server.tomcat.max-swallow-size= 2MB
-
-# 不用设置，强制设置需要根据实际请求是否需要来控制
-# server.tomcat.keep-alive-timeout=
-# 默认 8192 ，最大连接数量
-server.tomcat.max-connections=12000
-# Maximum number of HTTP requests that can be pipelined before the connection is closed. When set to 0 or 1, keep-alive and pipelining are disabled. When set to -1, an unlimited number of pipelined or keep-alive requests are allowed.
-# 默认是100
-server.tomcat.max-keep-alive-requests=200
-
-# server.tomcat.resource.allow-caching=
-# 默认是100， 超过最大连接数，可以接收的排队的请求数量
-server.tomcat.accept-count=200
-
-# cloud nacos config
-spring.cloud.nacos.discovery.server-addr=10.251.181.11:8848
-
 ## redis
 spring.redis.database=1
-spring.redis.host=127.0.0.1
-spring.redis.password=ENC(zA5LNV8xw3yEx6LMwdGGBGgNsOaD3Cg+)
+spring.redis.host=10.251.129.122
+spring.redis.password=qwert!W588
 spring.redis.port=6379
 
-spring.redis.lettuce.pool.max-active=8
-spring.redis.lettuce.pool.min-idle=0
-spring.redis.lettuce.pool.max-idle=30
-spring.redis.lettuce.pool.max-wait=10000ms
-spring.redis.lettuce.shutdown-timeout=100ms
-
+spring.cloud.nacos.discovery.server-addr=10.251.129.51:8848
 
 ## datasource config
 spring.jpa.hibernate.ddl-auto=none
 spring.datasource.driverClassName=com.mysql.jdbc.Driver
 # spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
-spring.datasource.url=jdbc:mysql://127.0.0.1:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
-spring.datasource.username=root
-spring.datasource.password=ENC(lAoFOYuc8CAypPtigTNLYg==)
-## 使用 hikari 连接池
+
+spring.datasource.url=jdbc:mysql://10.251.129.126:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+spring.datasource.username=admin
+spring.datasource.password=boeRds01
+## ?? hikari ???
 spring.datasource.type=com.zaxxer.hikari.HikariDataSource
 spring.datasource.hikari.auto-commit: true
 spring.datasource.hikari.minimum-idle=5
@@ -59,45 +23,46 @@ spring.datasource.hikari.connection-timeout=30000
 spring.datasource.hikari.max-lifetime=1800000
 spring.datasource.hikari.maximum-pool-size=20
 
+
 logging.level.org.hibernate.SQL=ERROR
 # logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
 
-# 设置logback.xml位置
-logging.config=classpath:log/logback-pro.xml
+# ??logback.xml??
+logging.config=classpath:log/logback-dev.xml
 
-## 静态文件目录，默认是在static下面，以后独立到nginx下面配置
+## ???????????static????????nginx????
 spring.web.resources.static-locations=file:E:/Projects/BOE/java/static
 
 ## xboe config
 xboe.api.cross_filter=true
 
-## 上传相磁的路径配置
-xboe.upload.file.temp_path=E:/Projects/BOE/java/static/temp
-xboe.upload.file.save_path=E:/Projects/BOE/java/static/upload
-xboe.upload.file.http_path=http://localhost:9090/cdn/upload
+## ?????????
+xboe.upload.file.temp_path=/tmp
+xboe.upload.file.save_path=/home/www/elearning/upload
+xboe.upload.file.http_path=https://u.boe.com/upload
 
-## 外部接口调用地址 旧系统机构及用户数据接口
-xboe.externalinterface.url.system=http://localhost:9091
+## ???????? ????????????
+xboe.externalinterface.url.system=http://127.0.0.1:9091
 
-## 新增加的教师的内部调用接口
+## ?????????????
 xboe.old.base.url=https://u.boe.com
 
-## 用户统计接口的api地址
+## ???????api??
 xboe.stat.base.url=http://127.0.0.1:9080
 xboe.server.userbasic.url=https://u.boe.com/userbasic
 
-#加密盐
+#???
 #jasypt.encryptor.password=jasypt
 jasypt.encryptor.algorithm=PBEWithMD5AndDES
 jasypt.encryptor.iv-generator-classname=org.jasypt.iv.NoIvGenerator
 
 # elasticsearch config
-xboe.elasticsearch.server.ip=127.0.0.1
+xboe.elasticsearch.server.ip=10.251.129.21
 xboe.elasticsearch.server.port=9200
-xboe.elasticsearch.server.user=elastic
-xboe.elasticsearch.server.password=Boe@es123
+xboe.elasticsearch.server.user=
+xboe.elasticsearch.server.password=
 
-## 邮件的配置
+## ?????
 xboe.email.url=https://u.boe.com/api/b1/email/send
 xboe.email.from=boeu_learning@boe.com.cn
 xboe.email.user=