diff --git a/servers/boe-server-all/pom.xml b/servers/boe-server-all/pom.xml index 1f8f355b..9b7ed839 100644 --- a/servers/boe-server-all/pom.xml +++ b/servers/boe-server-all/pom.xml @@ -240,15 +240,15 @@ true src/main/resources - application-${profileActive}.properties - application.properties + application-${profileActive}.yml + application.yml false src/main/resources - *.properties + *.yml diff --git a/servers/boe-server-all/src/main/resources/application-dev.properties b/servers/boe-server-all/src/main/resources/application-dev.properties deleted file mode 100644 index d3c161e6..00000000 --- a/servers/boe-server-all/src/main/resources/application-dev.properties +++ /dev/null @@ -1,84 +0,0 @@ -## redis -spring.redis.database=1 -#spring.redis.host=127.0.0.1 -#spring.redis.password=ENC(zA5LNV8xw3yEx6LMwdGGBGgNsOaD3Cg+) -#spring.redis.port=6379 -spring.redis.host=192.168.0.101 -spring.redis.password=boe@123 -spring.redis.port=6379 - -# cloud nacos config -spring.cloud.nacos.discovery.server-addr=192.168.0.101:8848 - -## datasource config -spring.jpa.show-sql = true -spring.jpa.hibernate.ddl-auto=update -spring.datasource.driverClassName=com.mysql.cj.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://192.168.0.101:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull -spring.datasource.username=root -spring.datasource.password=boe#1234A - -logging.level.org.hibernate.SQL=DEBUG -logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE - -# 设置logback.xml位置 -logging.config=classpath:log/logback-@profileActive@.xml - -## 静态文件目录，默认是在static下面，以后独立到nginx下面配置 -spring.web.resources.static-locations=file:E:/Projects/BOE/10/static - -## s秒 ，m分钟 ，h小时，d天 -xcaching.specs.favorites.timeout=10s -xcaching.specs.praises.timeout=10s -xcaching.specs.shares.timeout=10s - -## xboe config -xboe.api.cross_filter=true -## 是否是本地开发模式 -xboe.local.dev=true - -## 上传相磁的路径配置 -xboe.upload.file.temp_path=E:/Projects/BOE/10/static/temp -xboe.upload.file.save_path=E:/Projects/BOE/10/static/upload -xboe.upload.file.http_path=http://127.0.0.1:9090/cdn/upload - -## 外部接口调用地址 旧系统机构及用户数据接口 -xboe.externalinterface.url.system=http://localhost:9091 - -## 新增加的教师的内部调用接口 -xboe.old.base.url=https://u-pre.boe.com -#xboe.old.base.url=https://pretest.zcwytd.com - -# 用户中心的接口配置 -xboe.server.userbasic.url=https://u-pre.boe.com/userbasic - -## 用户统计接口的api地址 -xboe.stat.base.url=http://127.0.0.1:9080 - -#加密盐 -#jasypt.encryptor.password=${JASYPT_ENCRYPTOR_PASSWORD} -jasypt.encryptor.algorithm=PBEWithMD5AndDES -jasypt.encryptor.iv-generator-classname=org.jasypt.iv.NoIvGenerator - -# elasticsearch config -xboe.elasticsearch.server.ip=192.168.0.101 -xboe.elasticsearch.server.port=9200 -xboe.elasticsearch.server.user= -xboe.elasticsearch.server.password= -#xboe.elasticsearch.server.user=elastic -#xboe.elasticsearch.server.password=Boe@es123 -# 默认搜索的索引 -xboe.elasticsearch.index.name=new_resource_list - -## 邮件的配置 -xboe.email.url=https://u-pre.boe.com/api/b1/email/send -#xboe.email.url=https://pretest.zcwytd.com/api/b1/email/send -xboe.email.from=boeu_learning@boe.com.cn -xboe.email.user= -xboe.email.security= - - diff --git a/servers/boe-server-all/src/main/resources/application-dev.yml b/servers/boe-server-all/src/main/resources/application-dev.yml new file mode 100644 index 00000000..d57549e6 --- /dev/null +++ b/servers/boe-server-all/src/main/resources/application-dev.yml @@ -0,0 +1,84 @@ +spring: + redis: + database: 1 + host: 192.168.0.101 + password: boe@123 + port: 6379 + cloud: + nacos: + discovery: + server-addr: 192.168.0.101:8848 + jpa: + show-sql: true + hibernate: + ddl-auto: update + datasource: + driverClassName: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://192.168.0.101:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull + username: root + password: boe#1234A + web: + resources: + static-locations: file:E:/Projects/BOE/10/static + +logging: + level: + org: + hibernate: + SQL: DEBUG + type: + descriptor: + sql: + BasicBinder: TRACE + config: classpath:log/logback-@profileActive@.xml + +xcaching: + specs: + favorites: + timeout: 10s + praises: + timeout: 10s + shares: + timeout: 10s + +xboe: + api: + cross_filter: true + local: + dev: true + upload: + file: + temp_path: E:/Projects/BOE/10/static/temp + save_path: E:/Projects/BOE/10/static/upload + http_path: http://127.0.0.1:9090/cdn/upload + externalinterface: + url: + system: http://localhost:9091 + old: + base: + url: https://u-pre.boe.com + server: + userbasic: + url: https://u-pre.boe.com/userbasic + stat: + base: + url: http://127.0.0.1:9080 + elasticsearch: + server: + ip: 192.168.0.101 + port: 9200 + user: + password: + email: + url: https://u-pre.boe.com/api/b1/email/send + from: boeu_learning@boe.com.cn + user: + security: + +jasypt: + encryptor: + algorithm: PBEWithMD5AndDES + iv-generator-classname: org.jasypt.iv.NoIvGenerator + +boe: + domain: http://127.0.0.1 diff --git a/servers/boe-server-all/src/main/resources/application-pre.properties b/servers/boe-server-all/src/main/resources/application-pre.properties deleted file mode 100644 index ddea8ece..00000000 --- a/servers/boe-server-all/src/main/resources/application-pre.properties +++ /dev/null @@ -1,64 +0,0 @@ -## redis -spring.redis.database=1 -spring.redis.host=10.251.160.38 -spring.redis.password=qwert!W577 -spring.redis.port=6379 -#spring.redis.database=3 -#spring.redis.host=10.251.129.122 -#spring.redis.password=qwert!W588 -#spring.redis.port=6379 - -# cloud nacos config -spring.cloud.nacos.discovery.server-addr=10.251.181.11: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://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 - -# 设置logback.xml位置 -logging.config=classpath:log/logback-@profileActive@.xml - -## 静态文件目录，默认是在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=/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 - -## 用户统计接口的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=10.251.129.21 -xboe.elasticsearch.server.port=9200 -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= -xboe.email.security= diff --git a/servers/boe-server-all/src/main/resources/application-pre.yml b/servers/boe-server-all/src/main/resources/application-pre.yml new file mode 100644 index 00000000..94c4881f --- /dev/null +++ b/servers/boe-server-all/src/main/resources/application-pre.yml @@ -0,0 +1,70 @@ +spring: + profiles: + active: pre + redis: + database: 1 + host: 10.251.160.38 + password: qwert!W577 + port: 6379 + cloud: + nacos: + discovery: + server-addr: 10.251.181.11:8848 + jpa: + hibernate: + ddl-auto: none + datasource: + driverClassName: com.mysql.jdbc.Driver + url: jdbc:mysql://10.251.129.126:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull + username: admin + password: boeRds01 + web: + resources: + static-locations: file:E:/Projects/BOE/java/static + +logging: + level: + org: + hibernate: + SQL: ERROR + config: classpath:log/logback-@profileActive@.xml + +xboe: + api: + cross_filter: true + upload: + file: + temp_path: /tmp + save_path: /home/www/elearning/upload + http_path: https://u.boe.com/upload + externalinterface: + url: + system: http://127.0.0.1:9091 + old: + base: + url: https://u.boe.com + stat: + base: + url: http://127.0.0.1:9080 + server: + userbasic: + url: https://u.boe.com/userbasic + elasticsearch: + server: + ip: 10.251.129.21 + port: 9200 + user: + password: + email: + url: https://u.boe.com/api/b1/email/send + from: boeu_learning@boe.com.cn + user: + security: + +jasypt: + encryptor: + algorithm: PBEWithMD5AndDES + iv-generator-classname: org.jasypt.iv.NoIvGenerator + +boe: + domain: http://127.0.0.1 \ No newline at end of file diff --git a/servers/boe-server-all/src/main/resources/application-pro.properties b/servers/boe-server-all/src/main/resources/application-pro.properties deleted file mode 100644 index 21371d27..00000000 --- a/servers/boe-server-all/src/main/resources/application-pro.properties +++ /dev/null @@ -1,76 +0,0 @@ -# cloud nacos config -spring.cloud.nacos.discovery.server-addr=10.251.113.100:8848 - -## redis -spring.redis.database=1 -spring.redis.host=10.251.88.213 -spring.redis.password=qwert!W588 -spring.redis.port=6379 - - -## 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://10.251.129.129:8066/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull -#spring.datasource.username=admin -#spring.datasource.password=ocYMC>!{8G -spring.datasource.url=jdbc:mysql://10.251.88.216: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 -spring.datasource.hikari.idle-timeout=60000 -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-@profileActive@.xml - -## ???????????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=/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 - - -## ???????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=10.251.88.218 -xboe.elasticsearch.server.port=9200 -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= -xboe.email.security= diff --git a/servers/boe-server-all/src/main/resources/application-pro.yml b/servers/boe-server-all/src/main/resources/application-pro.yml new file mode 100644 index 00000000..857e4376 --- /dev/null +++ b/servers/boe-server-all/src/main/resources/application-pro.yml @@ -0,0 +1,78 @@ +spring: + profiles: + active: pro + cloud: + nacos: + discovery: + server-addr: 10.251.113.100:8848 + redis: + database: 1 + host: 10.251.88.213 + password: qwert!W588 + port: 6379 + jpa: + hibernate: + ddl-auto: none + datasource: + driverClassName: com.mysql.jdbc.Driver + url: jdbc:mysql://10.251.88.216:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull + username: admin + password: boeRds01 + type: com.zaxxer.hikari.HikariDataSource + hikari: + auto-commit: true + minimum-idle: 5 + idle-timeout: 60000 + connection-timeout: 30000 + max-lifetime: 1800000 + maximum-pool-size: 20 + web: + resources: + static-locations: file:E:/Projects/BOE/java/static + +logging: + level: + org: + hibernate: + SQL: ERROR + config: classpath:log/logback-@profileActive@.xml + +xboe: + api: + cross_filter: true + upload: + file: + temp_path: /tmp + save_path: /home/www/elearning/upload + http_path: https://u.boe.com/upload + externalinterface: + url: + system: http://127.0.0.1:9091 + old: + base: + url: https://u.boe.com + stat: + base: + url: http://127.0.0.1:9080 + server: + userbasic: + url: https://u.boe.com/userbasic + elasticsearch: + server: + ip: 10.251.88.218 + port: 9200 + user: + password: + email: + url: https://u.boe.com/api/b1/email/send + from: boeu_learning@boe.com.cn + user: + security: + +jasypt: + encryptor: + algorithm: PBEWithMD5AndDES + iv-generator-classname: org.jasypt.iv.NoIvGenerator + +boe: + domain: http://127.0.0.1 \ No newline at end of file diff --git a/servers/boe-server-all/src/main/resources/application-test.properties b/servers/boe-server-all/src/main/resources/application-test.properties deleted file mode 100644 index 74d42897..00000000 --- a/servers/boe-server-all/src/main/resources/application-test.properties +++ /dev/null @@ -1,83 +0,0 @@ -## redis -spring.redis.database=1 -spring.redis.host=10.251.160.38 -spring.redis.password=qwert!W577 -spring.redis.port=6379 - -# cloud nacos config -spring.cloud.nacos.discovery.server-addr=10.251.186.27: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://10.251.160.40: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 -spring.datasource.hikari.idle-timeout=60000 -spring.datasource.hikari.connection-timeout=30000 -spring.datasource.hikari.max-lifetime=1800000 -spring.datasource.hikari.maximum-pool-size=20 - -logging.level.org.hibernate.SQL=DEBUG -logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE - -# 设置logback.xml位置 -logging.config=classpath:log/logback-test.xml - -server.tomcat.accept-count=1000 - -# 最大可被连接数，默认10000 -server.tomcat.max-connections=10000 - -# 最大工作线程数，默认200, -server.tomcat.threads.max=500 - -# 最小工作线程数，初始化分配线程数，默认10 -server.tomcat.threads.min-spare=100 -# 定制KeepAliveTimeout，设置30秒内没有请求则服务器自动断开keepalive连接 -server.tomcat.keep-alive-timeout=3000 -## 当客户端发送超过10000个请求则自动断开keepalive连接 -server.tomcat.max-keep-alive-requests=10000 - -## xboe config -xboe.api.cross_filter=true - -## 上传存储的路径配置 -xboe.upload.file.temp_path=/tmp -xboe.upload.file.save_path=/home/www/elearning/upload -xboe.upload.file.http_path=http://u-pre.boe.com/upload - -## 外部接口调用地址 旧系统机构及用户数据接口 -xboe.externalinterface.url.system=http://127.0.0.1:9091 - -## 新增加的教师的内部调用接口 -xboe.old.base.url=https://u-pre.boe.com - -## 用户统计接口的api地址 -xboe.stat.base.url=http://127.0.0.1:9080 -xboe.server.userbasic.url=https://u-pre.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=10.251.129.25 -xboe.elasticsearch.server.port=9200 -xboe.elasticsearch.server.user=elastic -xboe.elasticsearch.server.password=Boe@es123 - -## 邮件的配置 -xboe.email.url=https://u-pre.boe.com/api/b1/email/send -xboe.email.from=boeu_learning@boe.com.cn -xboe.email.user= -xboe.email.security= - -boe.domain=https://u-pre.boe.com \ No newline at end of file diff --git a/servers/boe-server-all/src/main/resources/application-test.yml b/servers/boe-server-all/src/main/resources/application-test.yml new file mode 100644 index 00000000..79c9c5b5 --- /dev/null +++ b/servers/boe-server-all/src/main/resources/application-test.yml @@ -0,0 +1,96 @@ +spring: + profiles: + active: test + redis: + database: 1 + host: 10.251.160.38 + password: qwert!W577 + port: 6379 + cloud: + nacos: + discovery: + server-addr: 10.251.186.27:8848 + jpa: + hibernate: + ddl-auto: none + datasource: + driverClassName: com.mysql.jdbc.Driver + url: jdbc:mysql://10.251.160.40:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull + username: admin + password: boeRds01 + type: com.zaxxer.hikari.HikariDataSource + hikari: + auto-commit: true + minimum-idle: 5 + idle-timeout: 60000 + connection-timeout: 30000 + max-lifetime: 1800000 + maximum-pool-size: 20 + web: + resources: + static-locations: file:E:/Projects/BOE/java/static + +logging: + level: + org: + hibernate: + SQL: DEBUG + type: + descriptor: + sql: + BasicBinder: TRACE + config: classpath:log/logback-test.xml + +server: + tomcat: + accept-count: 1000 + max-connections: 10000 + threads: + max: 500 + min-spare: 100 + keep-alive-timeout: 3000 + max-keep-alive-requests: 10000 + +xboe: + api: + cross_filter: true + upload: + file: + temp_path: /tmp + save_path: /home/www/elearning/upload + http_path: http://u-pre.boe.com/upload + externalinterface: + url: + system: http://127.0.0.1:9091 + old: + base: + url: https://u-pre.boe.com + stat: + base: + url: http://127.0.0.1:9080 + server: + userbasic: + url: https://u-pre.boe.com/userbasic + elasticsearch: + server: + ip: 10.251.129.25 + port: 9200 + user: elastic + password: Boe@es123 + email: + url: https://u-pre.boe.com/api/b1/email/send + from: boeu_learning@boe.com.cn + user: + security: + +boe: + domain: https://u-pre.boe.com + +jasypt: + encryptor: + algorithm: PBEWithMD5AndDES + iv-generator-classname: org.jasypt.iv.NoIvGenerator + + +boe: + domain: http://127.0.0.1 \ No newline at end of file diff --git a/servers/boe-server-all/src/main/resources/application-test135.properties b/servers/boe-server-all/src/main/resources/application-test135.properties deleted file mode 100644 index 7ca198d7..00000000 --- a/servers/boe-server-all/src/main/resources/application-test135.properties +++ /dev/null @@ -1,69 +0,0 @@ -## redis -spring.redis.database=2 -spring.redis.host=10.251.160.38 -spring.redis.password=qwert!W577 -spring.redis.port=6379 - -## 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://10.251.160.40:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull -spring.datasource.username=admin -spring.datasource.password=boeRds01 - -logging.level.org.hibernate.SQL=DEBUG -logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE - -# 设置logback.xml位置 -logging.config=classpath:log/logback-test.xml - -server.tomcat.accept-count=1000 - -# 最大可被连接数，默认10000 -server.tomcat.max-connections=10000 - -# 最大工作线程数，默认200, -server.tomcat.threads.max=500 - -# 最小工作线程数，初始化分配线程数，默认10 -server.tomcat.threads.min-spare=100 -# 定制KeepAliveTimeout，设置30秒内没有请求则服务器自动断开keepalive连接 -server.tomcat.keep-alive-timeout=3000 -## 当客户端发送超过10000个请求则自动断开keepalive连接 -server.tomcat.max-keep-alive-requests=10000 - -## xboe config -xboe.api.cross_filter=true - -## 上传存储的路径配置 -xboe.upload.file.temp_path=/tmp -xboe.upload.file.save_path=/home/www/elearning/upload -xboe.upload.file.http_path=http://10.251.160.135/upload - -## 外部接口调用地址 旧系统机构及用户数据接口 -xboe.externalinterface.url.system=http://127.0.0.1:9091 - -## 新增加的教师的内部调用接口 -xboe.old.base.url=https://10.251.160.135 - -## 用户统计接口的api地址 -xboe.stat.base.url=http://127.0.0.1:9080 -xboe.server.userbasic.url=https://10.251.160.135/userbasic - -#加密盐 -#jasypt.encryptor.password=jasypt -jasypt.encryptor.algorithm=PBEWithMD5AndDES -jasypt.encryptor.iv-generator-classname=org.jasypt.iv.NoIvGenerator - -# elasticsearch config -xboe.elasticsearch.server.ip=10.251.129.25 -xboe.elasticsearch.server.port=9200 -xboe.elasticsearch.server.user=elastic -xboe.elasticsearch.server.password=Boe@es123 - -## 邮件的配置 -xboe.email.url=https://10.251.160.135/api/b1/email/send -xboe.email.from=boeu_learning@boe.com.cn -xboe.email.user= -xboe.email.security= \ No newline at end of file diff --git a/servers/boe-server-all/src/main/resources/application-test135.yml b/servers/boe-server-all/src/main/resources/application-test135.yml new file mode 100644 index 00000000..bdfa1452 --- /dev/null +++ b/servers/boe-server-all/src/main/resources/application-test135.yml @@ -0,0 +1,80 @@ +spring: + profiles: + active: test135 + redis: + database: 2 + host: 10.251.160.38 + password: qwert!W577 + port: 6379 + jpa: + hibernate: + ddl-auto: none + datasource: + driverClassName: com.mysql.jdbc.Driver + url: jdbc:mysql://10.251.160.40:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull + username: admin + password: boeRds01 + web: + resources: + static-locations: file:E:/Projects/BOE/java/static + +logging: + level: + org: + hibernate: + SQL: DEBUG + type: + descriptor: + sql: + BasicBinder: TRACE + config: classpath:log/logback-test.xml + +server: + tomcat: + accept-count: 1000 + max-connections: 10000 + threads: + max: 500 + min-spare: 100 + keep-alive-timeout: 3000 + max-keep-alive-requests: 10000 + +xboe: + api: + cross_filter: true + upload: + file: + temp_path: /tmp + save_path: /home/www/elearning/upload + http_path: http://10.251.160.135/upload + externalinterface: + url: + system: http://127.0.0.1:9091 + old: + base: + url: https://10.251.160.135 + stat: + base: + url: http://127.0.0.1:9080 + server: + userbasic: + url: https://10.251.160.135/userbasic + elasticsearch: + server: + ip: 10.251.129.25 + port: 9200 + user: elastic + password: Boe@es123 + email: + url: https://10.251.160.135/api/b1/email/send + from: boeu_learning@boe.com.cn + user: + security: + +jasypt: + encryptor: + algorithm: PBEWithMD5AndDES + iv-generator-classname: org.jasypt.iv.NoIvGenerator + +boe: + domain: http://127.0.0.1 \ No newline at end of file diff --git a/servers/boe-server-all/src/main/resources/application.properties b/servers/boe-server-all/src/main/resources/application.properties deleted file mode 100644 index 28a89c6e..00000000 --- a/servers/boe-server-all/src/main/resources/application.properties +++ /dev/null @@ -1,78 +0,0 @@ -spring.profiles.active=@profileActive@ -spring.application.name=boe-server-all -server.port=9090 -server.servlet.session.timeout=30m -server.servlet.encoding.charset=UTF-8 -server.servlet.encoding.enabled=true -server.servlet.encoding.force=true -server.tomcat.uri-encoding=UTF-8 -ok.http.connect-timeout=30 -ok.http.read-timeout=30 -ok.http.write-timeout=30 -# 连接池中整体的空闲连接的最大数量 -ok.http.max-idle-connections=200 -# 连接空闲时间最多为 300 秒 -ok.http.keep-alive-duration=300 -#spring.jackson.locale= -#spring.jackson.date-format=yyyy-MM-dd HH:mm:ss -# spring.jackson.default-property-inclusion=NON_NULL -spring.jackson.time-zone=GMT+8 - -spring.servlet.multipart.max-file-size=1024MB -spring.servlet.multipart.max-request-size=1024MB -## 静态文件目录，默认是在static下面，以后独立到nginx下面配置 -spring.mvc.static-path-pattern=/cdn/** - - -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.servlet.multipart.location= - -# 上传的临时目录，部署到服务器必须指定 -# spring.servlet.multipart.location= -# jpa config -spring.jpa.database = MYSQL -spring.jpa.show-sql = false -# spring.jpa.properties.hibernate.cache.use_second_level_cache=true -# spring.jpa.properties.hibernate.cache.region.factory_class=org.hibernate.cache.ehcache.EhCacheRegionFactory -spring.jpa.properties.hibernate.naming_strategy=org.hibernate.cfg.EJB3NamingStrategy -spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect -spring.jpa.database-platform=org.hibernate.dialect.MySQL5InnoDBDialect -#spring.transaction -# spring.jpa.properties.hibernate.allow_update_outside_transaction=true -# spring.jpa.properties.hibernate.current_session_context_class=org.springframework.orm.hibernate5.SpringSessionContext -spring.jpa.properties.hibernate.current_session_context_class=org.springframework.orm.hibernate5.SpringSessionContext - - -# 设置logback.xml位置 -logging.config=classpath:log/logback-@profileActive@.xml -# 用于分布式id生成不重复的处理 配置，0-31 的数值 -# config.id.generator.server.num=1 -# config.id.generator.datacenter.num=1 - -#boe.domain=https://pretest.zcwytd.com -boe.domain=http://127.0.0.1 -#boe.domain=http://localhost:30001 -orgTree.orgTreeList=${boe.domain}/userbasic/org/list -# ????id???????????? -orgTree.orgChildTreeList=${boe.domain}/userbasic/org/childOrgs -userBasic.searchUserList=${boe.domain}/userbasic/user/list -audience.usersByAudienceList=${boe.domain}/userbasic/audience/memberList -#获取用户学习课程数据 -statApi.userdynamicList=${boe.domain}/statApi/xboe/m/stat/userdynamic/list -#用户中心根据组织id查询用户信息接口（递归子组织） -audience.getOrgUsers=${boe.domain}/userbasic/user/getOrgUsers -#获取工号 -infrasApi.dict=${boe.domain}/infrasApi/dict/list -#获取非报名课id -manageApi.stu.offcourse=${boe.domain}/manageApi/stu/offcourse/getOffCourseId -manageApi.editExam=${boe.domain}/manageApi/admin/project/editExam -#获取离职教师id -userBasic.getTeacherIds=${boe.domain}/userbasic/user/getTeacherInfo -coursesuilt.getStudyStatus=${boe.domain}/manageApi/stu/project/completeStatus -userBasic.getUserBasicInfo=${boe.domain}/userbasic/user/getUserBasicInfo diff --git a/servers/boe-server-all/src/main/resources/application.yml b/servers/boe-server-all/src/main/resources/application.yml new file mode 100644 index 00000000..c67c0801 --- /dev/null +++ b/servers/boe-server-all/src/main/resources/application.yml @@ -0,0 +1,78 @@ +spring: + profiles: + active: @profileActive@ + application: + name: boe-server-all + servlet: + multipart: + maxFileSize: 1024MB + maxRequestSize: 1024MB + mvc: + static-path-pattern: /cdn/** + redis: + lettuce: + pool: + max-active: 8 + min-idle: 0 + max-idle: 30 + max-wait: 10000ms + shutdown-timeout: 100ms + jpa: + database: MYSQL + show-sql: false + properties: + hibernate: + naming_strategy: org.hibernate.cfg.EJB3NamingStrategy + dialect: org.hibernate.dialect.MySQL5InnoDBDialect + current_session_context_class: org.springframework.orm.hibernate5.SpringSessionContext + +server: + port: 9090 + servlet: + session: + timeout: 30m + encoding: + charset: UTF-8 + enabled: true + force: true + tomcat: + uri-encoding: UTF-8 + +ok: + http: + connect-timeout: 30 + read-timeout: 30 + write-timeout: 30 + max-idle-connections: 200 + keep-alive-duration: 300 + +logging: + config: classpath:log/logback-@profileActive@.xml + + +orgTree: + orgTreeList: ${boe.domain}/userbasic/org/list + orgChildTreeList: ${boe.domain}/userbasic/org/childOrgs + +userBasic: + searchUserList: ${boe.domain}/userbasic/user/list + getUserBasicInfo: ${boe.domain}/userbasic/user/getUserBasicInfo + getTeacherIds: ${boe.domain}/userbasic/user/getTeacherInfo + +audience: + usersByAudienceList: ${boe.domain}/userbasic/audience/memberList + getOrgUsers: ${boe.domain}/userbasic/user/getOrgUsers + +statApi: + userdynamicList: ${boe.domain}/statApi/xboe/m/stat/userdynamic/list + +infrasApi: + dict: ${boe.domain}/infrasApi/dict/list + +manageApi: + stu: + offcourse: ${boe.domain}/manageApi/stu/offcourse/getOffCourseId + editExam: ${boe.domain}/manageApi/admin/project/editExam + getStudyStatus: ${boe.domain}/manageApi/stu/project/completeStatus +coursesuilt: + getStudyStatus: ${boe.domain}/manageApi/stu/project/completeStatus