diff --git a/servers/boe-server-all/src/main/resources/application-dev.yml b/servers/boe-server-all/src/main/resources/application-dev.yml index 03e99bef..6fb77b17 100644 --- a/servers/boe-server-all/src/main/resources/application-dev.yml +++ b/servers/boe-server-all/src/main/resources/application-dev.yml @@ -1,159 +1,102 @@ +boe: + domain: http://192.168.0.253 spring: - # application.yml servlet: multipart: - max-file-size: 500MB - max-request-size: 500MB - redis: - database: 1 - host: 192.168.0.101 - password: boe@123 - port: 6379 - lettuce: - pool: - max-active: 8 - min-idle: 0 - max-idle: 30 - max-wait: 10000ms - shutdown-timeout: 100ms - jpa: - database: MYSQL - properties: - hibernate: - naming_strategy: org.hibernate.cfg.EJB3NamingStrategy - dialect: org.hibernate.dialect.MySQL5InnoDBDialect - current_session_context_class: org.springframework.orm.hibernate5.SpringSessionContext - 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 + max-file-size: 1000MB + max-request-size: 1000MB web: resources: - static-locations: file:E:/Projects/BOE/10/static -server: - port: 9090 - servlet: - multipart: - max-file-size: 500MB - max-request-size: 500MB - session: - timeout: 30m - encoding: - charset: UTF-8 - enabled: true - force: true - tomcat: - uri-encoding: UTF-8 - servlet: - multipart: - maxFileSize: 1024MB - maxRequestSize: 1024MB - mvc: - static-path-pattern: /cdn/** - -#logging.level.org.hibernate.SQL=DEBUG -#logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE -#logging.config=classpath:log/logback-@profileActive@.xml - -# logging: -# config: classpath:log/logback-${spring.profiles.active}.xml -# level: -# org: -# hibernate: -# SQL: DEBUG -# type: -# descriptor: -# sql: -# BasicBinder: TRACE - -xcaching: - specs: - favorites: - timeout: 10s - praises: - timeout: 10s - shares: - timeout: 10s - + static-locations: file:E:/Projects/BOE/java/static + cloud: + nacos: + discovery: + server-addr: 192.168.0.253:8848 + config: + server-addr: 192.168.0.253:8848 + redis: + database: 1 + host: 192.168.0.253 + password: boe@123 + port: 6379 + jpa: + hibernate: + ddl-auto: none + datasource: + driverClassName: com.mysql.jdbc.Driver + url: jdbc:mysql://192.168.0.253:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull + username: root + password: boe#1234A + 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 +logging: + level: + org: + hibernate: + SQL: ERROR + config: classpath:log/logback-@profileActive@.xml xboe: api: cross_filter: true - local: - dev: true upload: file: - temp_path: D:/Projects/BOE/10/static/temp + temp_path: /tmp save_path: /home/www/elearning/upload - http_path: http://127.0.0.1/upload + http_path: https://192.168.0.253/upload externalinterface: url: - system: http://localhost:9091 + system: http://127.0.0.1:9091 old: base: - url: http://192.168.0.101 - server: - userbasic: - url: http://192.168.0.101/userbasic + url: https://192.168.0.253 stat: base: url: http://127.0.0.1:9080 + server: + userbasic: + url: https://192.168.0.253/userbasic elasticsearch: server: - ip: 192.168.0.101 + ip: 192.168.0.253 port: 9200 user: password: email: - url: http://192.168.0.101/api/b1/email/send + url: https://192.168.0.253/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 - -ok: - http: - connect-timeout: 30 - read-timeout: 30 - write-timeout: 30 - max-idle-connections: 200 - keep-alive-duration: 300 - - - -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 \ No newline at end of file + jasypt: + encryptor: + algorithm: PBEWithMD5AndDES + iv-generator-classname: org.jasypt.iv.NoIvGenerator +xxl: + job: + accessToken: 65ddc683-22f5-83b4-de3a-3c97a0a29af0 + admin: + addresses: http://192.168.0.253/jobAdmin + executor: + appname: java-servers-job-api + port: 9995 + address: + ip: + logpath: /var/log/xxl-job/dw/ + logretentiondays: 30 +aop-log-record: + #是否开启日志记录 + enabled: true + #不进行拦截的包或者类 + excludeClassNames: + activemq: + broker-url: tcp://192.168.0.253:61616 + user: admin + password: admin + elasticsearch: + host: 192.168.0.253 + port: 9200 \ No newline at end of file diff --git a/servers/boe-server-basic/src/main/resources/application-dev.yml b/servers/boe-server-basic/src/main/resources/application-dev.yml index 01d5dc7f..19e6f7ca 100644 --- a/servers/boe-server-basic/src/main/resources/application-dev.yml +++ b/servers/boe-server-basic/src/main/resources/application-dev.yml @@ -1,13 +1,13 @@ -# application-dev.yml +# application-pro.yml spring: redis: - database: 2 - port: 6379 - host: 192.168.0.101 + database: 1 + host: 192.168.0.253 password: boe@123 + port: 6379 jpa: hibernate: - ddl-auto: none + ddl-auto: update open-in-view: false properties: hibernate: @@ -16,41 +16,46 @@ spring: driverClassName: com.mysql.jdbc.Driver db1: driverClassName: com.mysql.jdbc.Driver - jdbc-url: jdbc:mysql://192.168.0.101:3306/boe_basic?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull + jdbc-url: jdbc:mysql://192.168.0.253:3306/boe_basic?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull username: root password: boe#1234A db2: driverClassName: com.mysql.jdbc.Driver - jdbc-url: jdbc:mysql://192.168.0.101:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull + jdbc-url: jdbc:mysql://192.168.0.253:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull username: root password: boe#1234A - web: - resources: - static-locations: file:E:/Projects/BOE/java/static + + web: + resources: + static-locations: file:E:/Projects/BOE/java/static logging: level: org: hibernate: - SQL: DEBUG - type: - descriptor: - sql: - BasicBinder: TRACE + SQL: ERROR + # type: + # descriptor: + # sql: + # BasicBinder: TRACE config: classpath:log/logback-dev.xml + + xboe: + api: + cross_filter: true upload: file: - temp_path: E:/Projects/BOE/java/static/temp - save_path: E:/Projects/BOE/java/static/upload - http_path: http://localhost:9090/upload + temp_path: /tmp + save_path: /home/www/elearning/upload + http_path: https://192.168.0.253/upload inner: data: sync: - baseurl: http://localhost:9090 + baseurl: http://127.0.0.1:9090 jasypt: encryptor: algorithm: PBEWithMD5AndDES - iv-generator-classname: org.jasypt.iv.NoIvGenerator + iv-generator-classname: org.jasypt.iv.NoIvGenerator \ No newline at end of file