From db9c63f13ae06ce84d58796e02e7c493d3b98e8c Mon Sep 17 00:00:00 2001 From: hui Date: Wed, 20 Nov 2024 19:14:42 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E6=94=BE?= =?UTF-8?q?=E5=88=B0nacos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- servers/boe-server-all/pom.xml | 12 +++ .../src/main/resources/application-dev.yml | 96 ------------------- .../src/main/resources/application-pre.yml | 70 -------------- .../src/main/resources/application-pro.yml | 78 --------------- .../src/main/resources/application-test.yml | 96 ------------------- .../main/resources/application-test135.yml | 80 ---------------- .../src/main/resources/application.yml | 78 --------------- .../src/main/resources/bootstrap.yml | 22 +++-- 8 files changed, 25 insertions(+), 507 deletions(-) delete mode 100644 servers/boe-server-all/src/main/resources/application-dev.yml delete mode 100644 servers/boe-server-all/src/main/resources/application-pre.yml delete mode 100644 servers/boe-server-all/src/main/resources/application-pro.yml delete mode 100644 servers/boe-server-all/src/main/resources/application-test.yml delete mode 100644 servers/boe-server-all/src/main/resources/application-test135.yml delete mode 100644 servers/boe-server-all/src/main/resources/application.yml diff --git a/servers/boe-server-all/pom.xml b/servers/boe-server-all/pom.xml index 92d1c655..4ced3b4b 100644 --- a/servers/boe-server-all/pom.xml +++ b/servers/boe-server-all/pom.xml @@ -24,6 +24,10 @@ boe-springcloud ${xboe.version} + + org.springframework.boot + spring-boot-configuration-processor + com.xboe @@ -194,6 +198,14 @@ spring-retry 1.3.1 + + + + javax.interceptor + javax.interceptor-api + 1.2 + + diff --git a/servers/boe-server-all/src/main/resources/application-dev.yml b/servers/boe-server-all/src/main/resources/application-dev.yml deleted file mode 100644 index 18fc69e5..00000000 --- a/servers/boe-server-all/src/main/resources/application-dev.yml +++ /dev/null @@ -1,96 +0,0 @@ -spring: - redis: - database: 1 - host: 192.168.0.101 - password: boe@123 - port: 6379 - cloud: - nacos: - discovery: - server-addr: 192.168.0.101:8848 - config: - server-addr: 192.168.0.101:8848 - namespace: ${spring.profiles.active} - shared-configs: - - dataId: boe-server-all - group: DEFAULT_GROUP - refresh: true - - dataId: boe-server-all-dev - group: DEFAULT_GROUP - refresh: true - file-extension: yaml - - 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.yml b/servers/boe-server-all/src/main/resources/application-pre.yml deleted file mode 100644 index 94c4881f..00000000 --- a/servers/boe-server-all/src/main/resources/application-pre.yml +++ /dev/null @@ -1,70 +0,0 @@ -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.yml b/servers/boe-server-all/src/main/resources/application-pro.yml deleted file mode 100644 index 857e4376..00000000 --- a/servers/boe-server-all/src/main/resources/application-pro.yml +++ /dev/null @@ -1,78 +0,0 @@ -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.yml b/servers/boe-server-all/src/main/resources/application-test.yml deleted file mode 100644 index 79c9c5b5..00000000 --- a/servers/boe-server-all/src/main/resources/application-test.yml +++ /dev/null @@ -1,96 +0,0 @@ -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.yml b/servers/boe-server-all/src/main/resources/application-test135.yml deleted file mode 100644 index bdfa1452..00000000 --- a/servers/boe-server-all/src/main/resources/application-test135.yml +++ /dev/null @@ -1,80 +0,0 @@ -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.yml b/servers/boe-server-all/src/main/resources/application.yml deleted file mode 100644 index c67c0801..00000000 --- a/servers/boe-server-all/src/main/resources/application.yml +++ /dev/null @@ -1,78 +0,0 @@ -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 diff --git a/servers/boe-server-all/src/main/resources/bootstrap.yml b/servers/boe-server-all/src/main/resources/bootstrap.yml index 34549c14..c04a5c73 100644 --- a/servers/boe-server-all/src/main/resources/bootstrap.yml +++ b/servers/boe-server-all/src/main/resources/bootstrap.yml @@ -1,20 +1,24 @@ spring: - profiles: - active: dev application: name: boe-server-all + profiles: + active: dev cloud: nacos: discovery: server-addr: 192.168.0.101:8848 config: server-addr: 192.168.0.101:8848 - namespace: dev - shared-configs: - - dataId: boe-server-all + file-extension: yaml + namespace: fd5741ee-c2aa-4002-a9b0-43a11436d35c + name: boe-server-all + group: SERVER_GROUP + extension-configs: + - data-id: redis.yaml group: DEFAULT_GROUP refresh: true - - dataId: boe-server-all-dev - group: DEFAULT_GROUP - refresh: true - file-extension: yaml \ No newline at end of file + +# shared-configs: +# - data-id: redis.yaml +# group: DEFAULT_GROUP +# refresh: true \ No newline at end of file