diff --git a/servers/boe-server-all/src/main/resources/application-pre.properties b/servers/boe-server-all/src/main/resources/application-pre.properties index 16517eed..10748ce3 100644 --- a/servers/boe-server-all/src/main/resources/application-pre.properties +++ b/servers/boe-server-all/src/main/resources/application-pre.properties @@ -16,7 +16,7 @@ logging.level.org.hibernate.SQL=ERROR #logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE # 设置logback.xml位置 -logging.config=classpath:log/logback-pro.xml +logging.config=classpath:log/logback-dev.xml ## 静态文件目录，默认是在static下面，以后独立到nginx下面配置 spring.web.resources.static-locations=file:E:/Projects/BOE/java/static @@ -29,9 +29,6 @@ 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://127.0.0.1:9091 - ## 新增加的教师的内部调用接口 xboe.old.base.url=https://u.boe.com diff --git a/servers/boe-server-all/src/main/resources/application-pro.properties b/servers/boe-server-all/src/main/resources/application-pro.properties index b748a5b6..10748ce3 100644 --- a/servers/boe-server-all/src/main/resources/application-pro.properties +++ b/servers/boe-server-all/src/main/resources/application-pro.properties @@ -1,59 +1,22 @@ -# 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 - - ## redis -spring.redis.database=2 -spring.redis.host=127.0.0.1 -spring.redis.password=ENC(zA5LNV8xw3yEx6LMwdGGBGgNsOaD3Cg+) +spring.redis.database=3 +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 - - ## 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==) +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 logging.level.org.hibernate.SQL=ERROR -# logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE +#logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE # 设置logback.xml位置 -logging.config=classpath:log/logback-pro.xml +logging.config=classpath:log/logback-dev.xml ## 静态文件目录，默认是在static下面，以后独立到nginx下面配置 spring.web.resources.static-locations=file:E:/Projects/BOE/java/static @@ -62,12 +25,9 @@ spring.web.resources.static-locations=file:E:/Projects/BOE/java/static 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.externalinterface.url.system=http://localhost:9091 +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.old.base.url=https://u.boe.com @@ -81,7 +41,7 @@ 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= diff --git a/servers/boe-server-basic/src/main/resources/application-pre.properties b/servers/boe-server-basic/src/main/resources/application-pre.properties index da0cdab3..8b395662 100644 --- a/servers/boe-server-basic/src/main/resources/application-pre.properties +++ b/servers/boe-server-basic/src/main/resources/application-pre.properties @@ -1,35 +1,52 @@ ## redis -spring.redis.database=2 -spring.redis.host=127.0.0.1 -spring.redis.password=ENC(zA5LNV8xw3yEx6LMwdGGBGgNsOaD3Cg+) +spring.redis.database=3 +spring.redis.host=10.251.129.122 +spring.redis.password=qwert!W588 spring.redis.port=6379 -## datasource config +# datasource config +# basic数据库 +spring.jpa.hibernate.ddl-auto=update +spring.jpa.open-in-view=false +spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true + 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==) +# 当前数据库 basic 对应的数据库 +spring.datasource.db1.driverClassName=com.mysql.jdbc.Driver +spring.datasource.db1.jdbc-url=jdbc:mysql://10.251.129.126:3306/boe_basic?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull +spring.datasource.db1.username=admin +spring.datasource.db1.password=boeRds01 + + + +# 主数据库 all 对应的数据库 +spring.datasource.db2.driverClassName=com.mysql.jdbc.Driver +# spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver +spring.datasource.db2.jdbc-url=jdbc:mysql://10.251.129.126:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull +spring.datasource.db2.username=admin +spring.datasource.db2.password=boeRds01 + logging.level.org.hibernate.SQL=ERROR # logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE -# 设置logback.xml位置 -logging.config=classpath:log/logback-pro.xml - ## 静态文件目录，默认是在static下面，以后独立到nginx下面配置 spring.web.resources.static-locations=file:E:/Projects/BOE/java/static +# 设置logback.xml位置 +logging.config=classpath:log/logback-pro.xml + ## 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 ## 新系统的内部地址，可以不通过nginx调用 -xboe.inner.data.sync.baseurl=http://localhost:9090 +xboe.inner.data.sync.baseurl=http://127.0.0.1:9090 #加密盐 #jasypt.encryptor.password=jasypt diff --git a/servers/boe-server-basic/src/main/resources/application-pro.properties b/servers/boe-server-basic/src/main/resources/application-pro.properties index 80c221a5..6eef96f6 100644 --- a/servers/boe-server-basic/src/main/resources/application-pro.properties +++ b/servers/boe-server-basic/src/main/resources/application-pro.properties @@ -1,7 +1,7 @@ ## redis -spring.redis.database=2 -spring.redis.host=127.0.0.1 -spring.redis.password=ENC(zA5LNV8xw3yEx6LMwdGGBGgNsOaD3Cg+) +spring.redis.database=3 +spring.redis.host=10.251.129.122 +spring.redis.password=qwert!W588 spring.redis.port=6379 # datasource config @@ -14,18 +14,18 @@ spring.datasource.driverClassName=com.mysql.jdbc.Driver # spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver # 当前数据库 basic 对应的数据库 spring.datasource.db1.driverClassName=com.mysql.jdbc.Driver -spring.datasource.db1.jdbc-url=jdbc:mysql://127.0.0.1:3306/boeu_basic?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull -spring.datasource.db1.username=root -spring.datasource.db1.password=root +spring.datasource.db1.jdbc-url=jdbc:mysql://10.251.129.126:3306/boe_basic?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull +spring.datasource.db1.username=admin +spring.datasource.db1.password=boeRds01 # 主数据库 all 对应的数据库 spring.datasource.db2.driverClassName=com.mysql.jdbc.Driver # spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver -spring.datasource.db2.jdbc-url=jdbc:mysql://127.0.0.1:3306/boe_base3?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull -spring.datasource.db2.username=root -spring.datasource.db2.password=root +spring.datasource.db2.jdbc-url=jdbc:mysql://10.251.129.126:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull +spring.datasource.db2.username=admin +spring.datasource.db2.password=boeRds01 logging.level.org.hibernate.SQL=ERROR @@ -35,18 +35,18 @@ logging.level.org.hibernate.SQL=ERROR spring.web.resources.static-locations=file:E:/Projects/BOE/java/static # 设置logback.xml位置 -logging.config=classpath:log/logback-pro.xml +logging.config=classpath:log/logback-dev.xml ## 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 ## 新系统的内部地址，可以不通过nginx调用 -xboe.inner.data.sync.baseurl=http://localhost:9090 +xboe.inner.data.sync.baseurl=http://127.0.0.1:9090 #加密盐 #jasypt.encryptor.password=jasypt