diff --git a/servers/boe-server-all/pom.xml b/servers/boe-server-all/pom.xml
index 8477af7e..b72e8a3a 100644
--- a/servers/boe-server-all/pom.xml
+++ b/servers/boe-server-all/pom.xml
@@ -234,6 +234,13 @@
1.1.24
+
+ com.xuxueli
+ xxl-job-core
+ 2.3.0
+
+
+
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..03e99bef
--- /dev/null
+++ b/servers/boe-server-all/src/main/resources/application-dev.yml
@@ -0,0 +1,159 @@
+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
+ 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
+
+xboe:
+ api:
+ cross_filter: true
+ local:
+ dev: true
+ upload:
+ file:
+ temp_path: D:/Projects/BOE/10/static/temp
+ save_path: /home/www/elearning/upload
+ http_path: http://127.0.0.1/upload
+ externalinterface:
+ url:
+ system: http://localhost:9091
+ old:
+ base:
+ url: http://192.168.0.101
+ server:
+ userbasic:
+ url: http://192.168.0.101/userbasic
+ stat:
+ base:
+ url: http://127.0.0.1:9080
+ elasticsearch:
+ server:
+ ip: 192.168.0.101
+ port: 9200
+ user:
+ password:
+ email:
+ url: http://192.168.0.101/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
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..d26d20bf
--- /dev/null
+++ b/servers/boe-server-all/src/main/resources/application-test.yml
@@ -0,0 +1,159 @@
+spring:
+ # application.yml
+ servlet:
+ multipart:
+ max-file-size: 500MB
+ max-request-size: 500MB
+ redis:
+ database: 1
+ host: 10.251.186.27
+ password: qwert!W577
+ 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://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/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
+
+xboe:
+ api:
+ cross_filter: true
+ local:
+ dev: true
+ upload:
+ file:
+ temp_path: /Projects/BOE/10/static/temp
+ save_path: /home/www/elearning/upload
+ http_path: http://127.0.0.1/upload
+ externalinterface:
+ url:
+ system: http://localhost:9091
+ old:
+ base:
+ url: http://localhost
+ server:
+ userbasic:
+ url: http://localhost/userbasic
+ stat:
+ base:
+ url: http://localhost:9080
+ elasticsearch:
+ server:
+ ip: 10.251.129.25
+ port: 9200
+ user:
+ password:
+ email:
+ url: http://localhost/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
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..d26d20bf
--- /dev/null
+++ b/servers/boe-server-all/src/main/resources/application.yml
@@ -0,0 +1,159 @@
+spring:
+ # application.yml
+ servlet:
+ multipart:
+ max-file-size: 500MB
+ max-request-size: 500MB
+ redis:
+ database: 1
+ host: 10.251.186.27
+ password: qwert!W577
+ 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://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/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
+
+xboe:
+ api:
+ cross_filter: true
+ local:
+ dev: true
+ upload:
+ file:
+ temp_path: /Projects/BOE/10/static/temp
+ save_path: /home/www/elearning/upload
+ http_path: http://127.0.0.1/upload
+ externalinterface:
+ url:
+ system: http://localhost:9091
+ old:
+ base:
+ url: http://localhost
+ server:
+ userbasic:
+ url: http://localhost/userbasic
+ stat:
+ base:
+ url: http://localhost:9080
+ elasticsearch:
+ server:
+ ip: 10.251.129.25
+ port: 9200
+ user:
+ password:
+ email:
+ url: http://localhost/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
diff --git a/servers/boe-server-all/src/main/resources/bootstrap.yml b/servers/boe-server-all/src/main/resources/bootstrap.yml
index fc606304..640c5944 100644
--- a/servers/boe-server-all/src/main/resources/bootstrap.yml
+++ b/servers/boe-server-all/src/main/resources/bootstrap.yml
@@ -1,22 +1,22 @@
spring:
application:
name: boe-server-all
- profiles:
- active: dev
+# profiles:
+# active: test
cloud:
nacos:
discovery:
- server-addr: 192.168.0.101:8848
+ server-addr: 10.251.186.27:8848
config:
- server-addr: 192.168.0.101:8848
- file-extension: yaml
- namespace: fd5741ee-c2aa-4002-a9b0-43a11436d35c
- name: boe-server-all
- group: SERVER_GROUP
- extension-configs:
- - data-id: redis0.yaml
- group: COMMON_GROUP
- refresh: true
+ server-addr: 10.251.186.27:8848
+# file-extension: yaml
+# namespace: fd5741ee-c2aa-4002-a9b0-43a11436d35c
+# name: boe-server-all
+# group: SERVER_GROUP
+# extension-configs:
+# - data-id: redis0.yaml
+# group: COMMON_GROUP
+# refresh: true
# shared-configs:
# - data-id: redis0.yaml