mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git
synced 2025-12-09 02:46:50 +08:00
Compare commits
14 Commits
pre
...
master-tea
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3d9b26982c | ||
|
|
a65fa797cc | ||
|
|
feba3237ab | ||
|
|
2919fceef1 | ||
|
|
f7dcda551d | ||
|
|
cdf5d2a052 | ||
|
|
ba45fc53d9 | ||
|
|
5272e15449 | ||
|
|
d1fe0dc37f | ||
|
|
c886f05309 | ||
|
|
046886521d | ||
|
|
25e9043bea | ||
|
|
6d3a9955af | ||
|
|
2651d256a6 |
@@ -122,12 +122,19 @@ public class OutSideDataServiceImpl implements IOutSideDataService {
|
|||||||
//这里应该是单独的线程去处理
|
//这里应该是单独的线程去处理
|
||||||
user.setId(getNodeText(result.get("userId")));//最新接口变化,id改成userId
|
user.setId(getNodeText(result.get("userId")));//最新接口变化,id改成userId
|
||||||
String band=getNodeText(result.get("bandCode"));
|
String band=getNodeText(result.get("bandCode"));
|
||||||
if(StringUtils.isNotBlank(band) && band.length()>4) {
|
try {
|
||||||
|
if(StringUtils.isNotBlank(band) && band.length()>4 && band.contains("band")) {
|
||||||
String bandNum=band.substring(4);
|
String bandNum=band.substring(4);
|
||||||
user.setBandLevel(Integer.valueOf(bandNum));
|
user.setBandLevel(Integer.valueOf(bandNum));
|
||||||
|
}else if (StringUtils.isNotBlank(band) && band.length()>4 && band.contains("Level")) {
|
||||||
|
String bandNum=band.substring(5);
|
||||||
|
user.setBandLevel(Integer.valueOf(bandNum));
|
||||||
}else {
|
}else {
|
||||||
user.setBandLevel(0);
|
user.setBandLevel(0);
|
||||||
}
|
}
|
||||||
|
} catch (NumberFormatException e) {
|
||||||
|
user.setBandLevel(0);
|
||||||
|
}
|
||||||
user.setAvatar(getNodeText(result.get("avatar")));
|
user.setAvatar(getNodeText(result.get("avatar")));
|
||||||
user.setCode(getNodeText(result.get("userNo")));
|
user.setCode(getNodeText(result.get("userNo")));
|
||||||
|
|
||||||
|
|||||||
@@ -140,6 +140,9 @@ public class CasesApi extends ApiBaseController {
|
|||||||
List<Cases> cases = views.getList();
|
List<Cases> cases = views.getList();
|
||||||
if (CollUtil.isNotEmpty(cases)) {
|
if (CollUtil.isNotEmpty(cases)) {
|
||||||
for (Cases c : cases) {
|
for (Cases c : cases) {
|
||||||
|
if ("null".equals(c.getSummary())) {
|
||||||
|
c.setSummary(null);
|
||||||
|
}
|
||||||
StringBuffer stringBuffer = new StringBuffer();
|
StringBuffer stringBuffer = new StringBuffer();
|
||||||
List<CasesMajorType> caseId = casesMajorTypeDao.findList(FieldFilters.eq("caseId", c.getId()));
|
List<CasesMajorType> caseId = casesMajorTypeDao.findList(FieldFilters.eq("caseId", c.getId()));
|
||||||
if (caseId != null && !caseId.isEmpty()) {
|
if (caseId != null && !caseId.isEmpty()) {
|
||||||
|
|||||||
@@ -327,7 +327,9 @@ public class CoursePortalApi extends ApiBaseController{
|
|||||||
teacherCourseDto.setSysCreateBy(ct.getSysCreateBy());
|
teacherCourseDto.setSysCreateBy(ct.getSysCreateBy());
|
||||||
teacherCourseDto.setSysCreateTime(ct.getSysCreateTime());
|
teacherCourseDto.setSysCreateTime(ct.getSysCreateTime());
|
||||||
teacherCourseDto.setId(ct.getId());
|
teacherCourseDto.setId(ct.getId());
|
||||||
|
if(user!=null){
|
||||||
teacherCourseDto.setUserNo(user.getUserNo());
|
teacherCourseDto.setUserNo(user.getUserNo());
|
||||||
|
}
|
||||||
teacherCourseDtos.add(teacherCourseDto);
|
teacherCourseDtos.add(teacherCourseDto);
|
||||||
}else if (redisTemplate.opsForValue().get(ct.getTeacherId())==null){
|
}else if (redisTemplate.opsForValue().get(ct.getTeacherId())==null){
|
||||||
List<String> list=new ArrayList<>();
|
List<String> list=new ArrayList<>();
|
||||||
@@ -345,7 +347,9 @@ public class CoursePortalApi extends ApiBaseController{
|
|||||||
teacherCourseDto.setSysCreateBy(ct.getSysCreateBy());
|
teacherCourseDto.setSysCreateBy(ct.getSysCreateBy());
|
||||||
teacherCourseDto.setSysCreateTime(ct.getSysCreateTime());
|
teacherCourseDto.setSysCreateTime(ct.getSysCreateTime());
|
||||||
teacherCourseDto.setId(ct.getId());
|
teacherCourseDto.setId(ct.getId());
|
||||||
|
if(user!=null){
|
||||||
teacherCourseDto.setUserNo(user.getUserNo());
|
teacherCourseDto.setUserNo(user.getUserNo());
|
||||||
|
}
|
||||||
teacherCourseDtos.add(teacherCourseDto);
|
teacherCourseDtos.add(teacherCourseDto);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,159 +1,102 @@
|
|||||||
|
boe:
|
||||||
|
domain: http://192.168.0.253
|
||||||
spring:
|
spring:
|
||||||
# application.yml
|
|
||||||
servlet:
|
servlet:
|
||||||
multipart:
|
multipart:
|
||||||
max-file-size: 500MB
|
max-file-size: 1000MB
|
||||||
max-request-size: 500MB
|
max-request-size: 1000MB
|
||||||
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:
|
web:
|
||||||
resources:
|
resources:
|
||||||
static-locations: file:E:/Projects/BOE/10/static
|
static-locations: file:E:/Projects/BOE/java/static
|
||||||
server:
|
cloud:
|
||||||
port: 9090
|
nacos:
|
||||||
servlet:
|
discovery:
|
||||||
multipart:
|
server-addr: 192.168.0.253:8848
|
||||||
max-file-size: 500MB
|
config:
|
||||||
max-request-size: 500MB
|
server-addr: 192.168.0.253:8848
|
||||||
session:
|
redis:
|
||||||
timeout: 30m
|
database: 1
|
||||||
encoding:
|
host: 192.168.0.253
|
||||||
charset: UTF-8
|
password: boe@123
|
||||||
enabled: true
|
port: 6379
|
||||||
force: true
|
jpa:
|
||||||
tomcat:
|
hibernate:
|
||||||
uri-encoding: UTF-8
|
ddl-auto: none
|
||||||
servlet:
|
datasource:
|
||||||
multipart:
|
driverClassName: com.mysql.jdbc.Driver
|
||||||
maxFileSize: 1024MB
|
url: jdbc:mysql://192.168.0.253:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
|
||||||
maxRequestSize: 1024MB
|
username: root
|
||||||
mvc:
|
password: boe#1234A
|
||||||
static-path-pattern: /cdn/**
|
type: com.zaxxer.hikari.HikariDataSource
|
||||||
|
hikari:
|
||||||
#logging.level.org.hibernate.SQL=DEBUG
|
auto-commit: true
|
||||||
#logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
|
minimum-idle: 5
|
||||||
#logging.config=classpath:log/logback-@profileActive@.xml
|
idle-timeout: 60000
|
||||||
|
connection-timeout: 30000
|
||||||
# logging:
|
max-lifetime: 1800000
|
||||||
# config: classpath:log/logback-${spring.profiles.active}.xml
|
maximum-pool-size: 20
|
||||||
# level:
|
logging:
|
||||||
# org:
|
level:
|
||||||
# hibernate:
|
org:
|
||||||
# SQL: DEBUG
|
hibernate:
|
||||||
# type:
|
SQL: ERROR
|
||||||
# descriptor:
|
config: classpath:log/logback-@profileActive@.xml
|
||||||
# sql:
|
|
||||||
# BasicBinder: TRACE
|
|
||||||
|
|
||||||
xcaching:
|
|
||||||
specs:
|
|
||||||
favorites:
|
|
||||||
timeout: 10s
|
|
||||||
praises:
|
|
||||||
timeout: 10s
|
|
||||||
shares:
|
|
||||||
timeout: 10s
|
|
||||||
|
|
||||||
xboe:
|
xboe:
|
||||||
api:
|
api:
|
||||||
cross_filter: true
|
cross_filter: true
|
||||||
local:
|
|
||||||
dev: true
|
|
||||||
upload:
|
upload:
|
||||||
file:
|
file:
|
||||||
temp_path: D:/Projects/BOE/10/static/temp
|
temp_path: /tmp
|
||||||
save_path: /home/www/elearning/upload
|
save_path: /home/www/elearning/upload
|
||||||
http_path: http://127.0.0.1/upload
|
http_path: http://192.168.0.253/upload
|
||||||
externalinterface:
|
externalinterface:
|
||||||
url:
|
url:
|
||||||
system: http://localhost:9091
|
system: http://127.0.0.1:9091
|
||||||
old:
|
old:
|
||||||
base:
|
base:
|
||||||
url: http://192.168.0.101
|
url: http://192.168.0.253
|
||||||
server:
|
|
||||||
userbasic:
|
|
||||||
url: http://192.168.0.101/userbasic
|
|
||||||
stat:
|
stat:
|
||||||
base:
|
base:
|
||||||
url: http://127.0.0.1:9080
|
url: http://127.0.0.1:9080
|
||||||
|
server:
|
||||||
|
userbasic:
|
||||||
|
url: http://192.168.0.253/userbasic
|
||||||
elasticsearch:
|
elasticsearch:
|
||||||
server:
|
server:
|
||||||
ip: 192.168.0.101
|
ip: 192.168.0.253
|
||||||
port: 9200
|
port: 9200
|
||||||
user:
|
user:
|
||||||
password:
|
password:
|
||||||
email:
|
email:
|
||||||
url: http://192.168.0.101/api/b1/email/send
|
url: http://192.168.0.253/api/b1/email/send
|
||||||
from: boeu_learning@boe.com.cn
|
from: boeu_learning@boe.com.cn
|
||||||
user:
|
user:
|
||||||
security:
|
security:
|
||||||
|
|
||||||
jasypt:
|
jasypt:
|
||||||
encryptor:
|
encryptor:
|
||||||
algorithm: PBEWithMD5AndDES
|
algorithm: PBEWithMD5AndDES
|
||||||
iv-generator-classname: org.jasypt.iv.NoIvGenerator
|
iv-generator-classname: org.jasypt.iv.NoIvGenerator
|
||||||
|
xxl:
|
||||||
boe:
|
job:
|
||||||
domain: http://127.0.0.1
|
accessToken: 65ddc683-22f5-83b4-de3a-3c97a0a29af0
|
||||||
|
admin:
|
||||||
ok:
|
addresses: http://192.168.0.253/jobAdmin
|
||||||
http:
|
executor:
|
||||||
connect-timeout: 30
|
appname: java-servers-job-api
|
||||||
read-timeout: 30
|
port: 9995
|
||||||
write-timeout: 30
|
address:
|
||||||
max-idle-connections: 200
|
ip:
|
||||||
keep-alive-duration: 300
|
logpath: /var/log/xxl-job/dw/
|
||||||
|
logretentiondays: 30
|
||||||
|
aop-log-record:
|
||||||
|
#是否开启日志记录
|
||||||
orgTree:
|
enabled: true
|
||||||
orgTreeList: ${boe.domain}/userbasic/org/list
|
#不进行拦截的包或者类
|
||||||
orgChildTreeList: ${boe.domain}/userbasic/org/childOrgs
|
excludeClassNames:
|
||||||
|
activemq:
|
||||||
userBasic:
|
broker-url: tcp://192.168.0.253:61616
|
||||||
searchUserList: ${boe.domain}/userbasic/user/list
|
user: admin
|
||||||
getUserBasicInfo: ${boe.domain}/userbasic/user/getUserBasicInfo
|
password: admin
|
||||||
getTeacherIds: ${boe.domain}/userbasic/user/getTeacherInfo
|
elasticsearch:
|
||||||
|
host: 192.168.0.253
|
||||||
audience:
|
port: 9200
|
||||||
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
|
|
||||||
@@ -76,9 +76,9 @@ xboe:
|
|||||||
iv-generator-classname: org.jasypt.iv.NoIvGenerator
|
iv-generator-classname: org.jasypt.iv.NoIvGenerator
|
||||||
xxl:
|
xxl:
|
||||||
job:
|
job:
|
||||||
|
accessToken: 65ddc683-22f5-83b4-de3a-3c97a0a29af0
|
||||||
admin:
|
admin:
|
||||||
addresses: http://u.boe.com/jobAdmin
|
addresses: http://u.boe.com/jobAdmin
|
||||||
accessToken: 65ddc683-22f5-83b4-de3a-3c97a0a29af0
|
|
||||||
executor:
|
executor:
|
||||||
appname: java-servers-job-api
|
appname: java-servers-job-api
|
||||||
port: 9995
|
port: 9995
|
||||||
|
|||||||
183
servers/boe-server-all/src/main/resources/application-test.yml
Normal file
183
servers/boe-server-all/src/main/resources/application-test.yml
Normal file
@@ -0,0 +1,183 @@
|
|||||||
|
spring:
|
||||||
|
# application.yml
|
||||||
|
servlet:
|
||||||
|
multipart:
|
||||||
|
max-file-size: 1000MB
|
||||||
|
max-request-size: 1000MB
|
||||||
|
cloud:
|
||||||
|
nacos:
|
||||||
|
discovery:
|
||||||
|
server-addr: 10.251.186.27:8848
|
||||||
|
config:
|
||||||
|
server-addr: 10.251.186.27:8848
|
||||||
|
redis:
|
||||||
|
database: 1
|
||||||
|
host: 10.251.160.38
|
||||||
|
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
|
||||||
|
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: /tmp
|
||||||
|
save_path: /home/www/elearning/upload
|
||||||
|
http_path: http://10.251.186.27/upload
|
||||||
|
externalinterface:
|
||||||
|
url:
|
||||||
|
system: http://localhost:9091
|
||||||
|
old:
|
||||||
|
base:
|
||||||
|
url: http://10.251.186.27
|
||||||
|
server:
|
||||||
|
userbasic:
|
||||||
|
url: http://10.251.186.27/userbasic
|
||||||
|
stat:
|
||||||
|
base:
|
||||||
|
url: http://10.251.186.27:9080
|
||||||
|
elasticsearch:
|
||||||
|
server:
|
||||||
|
ip: 10.251.129.25
|
||||||
|
port: 9200
|
||||||
|
user: elastic
|
||||||
|
password: Boe@es123
|
||||||
|
email:
|
||||||
|
url: http://10.251.186.27/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://10.251.186.27
|
||||||
|
|
||||||
|
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
|
||||||
|
|
||||||
|
xxl:
|
||||||
|
job:
|
||||||
|
admin:
|
||||||
|
addresses: http://10.251.186.27/jobAdmin
|
||||||
|
accessToken: 65ddc683-22f5-83b4-de3a-3c97a0a29af0
|
||||||
|
executor:
|
||||||
|
appname: java-servers-job-api
|
||||||
|
port: 9995
|
||||||
|
address:
|
||||||
|
ip:
|
||||||
|
logpath: /var/log/xxl-job/system/
|
||||||
|
logretentiondays: 30
|
||||||
|
|
||||||
|
aop-log-record:
|
||||||
|
#是否开启日志记录
|
||||||
|
enabled: true
|
||||||
|
#不进行拦截的包或者类
|
||||||
|
excludeClassNames:
|
||||||
|
activemq:
|
||||||
|
broker-url: tcp://10.251.129.25:61616
|
||||||
|
user: admin
|
||||||
|
password: admin
|
||||||
|
elasticsearch:
|
||||||
|
host: 10.251.129.25
|
||||||
|
port: 9200
|
||||||
|
user: elastic
|
||||||
|
password: Boe@es123
|
||||||
@@ -0,0 +1,56 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<configuration debug="false" scan="false">
|
||||||
|
<springProperty scop="context" name="spring.application.name" source="spring.application.name" defaultValue=""/>
|
||||||
|
<property name="log.path" value="/home/logs/${spring.application.name}"/>
|
||||||
|
<!-- 彩色日志格式 -->
|
||||||
|
<property name="CONSOLE_LOG_PATTERN"
|
||||||
|
value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
|
||||||
|
<!-- 彩色日志依赖的渲染类 -->
|
||||||
|
<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
|
||||||
|
<conversionRule conversionWord="wex"
|
||||||
|
converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
|
||||||
|
<conversionRule conversionWord="wEx"
|
||||||
|
converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
|
||||||
|
<!-- Console log output -->
|
||||||
|
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
|
||||||
|
<encoder>
|
||||||
|
<pattern>${CONSOLE_LOG_PATTERN}</pattern>
|
||||||
|
</encoder>
|
||||||
|
</appender>
|
||||||
|
|
||||||
|
<!-- Log file debug output -->
|
||||||
|
<appender name="info" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||||
|
<file>${log.path}/debug.log</file>
|
||||||
|
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
|
||||||
|
<fileNamePattern>${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
|
||||||
|
<maxFileSize>50MB</maxFileSize>
|
||||||
|
<maxHistory>30</maxHistory>
|
||||||
|
</rollingPolicy>
|
||||||
|
<encoder>
|
||||||
|
<pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
|
||||||
|
</encoder>
|
||||||
|
</appender>
|
||||||
|
|
||||||
|
<!-- Log file error output -->
|
||||||
|
<appender name="error" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||||
|
<file>${log.path}/error.log</file>
|
||||||
|
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
|
||||||
|
<fileNamePattern>${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
|
||||||
|
<maxFileSize>50MB</maxFileSize>
|
||||||
|
<maxHistory>30</maxHistory>
|
||||||
|
</rollingPolicy>
|
||||||
|
<encoder>
|
||||||
|
<pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
|
||||||
|
</encoder>
|
||||||
|
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
|
||||||
|
<level>ERROR</level>
|
||||||
|
</filter>
|
||||||
|
</appender>
|
||||||
|
|
||||||
|
<!-- Level: FATAL 0 ERROR 3 WARN 4 INFO 6 DEBUG 7 -->
|
||||||
|
<root level="INFO">
|
||||||
|
<appender-ref ref="info"/>
|
||||||
|
<!-- <appender-ref ref="console"/>-->
|
||||||
|
<!-- <appender-ref ref="error"/> -->
|
||||||
|
</root>
|
||||||
|
</configuration>
|
||||||
@@ -51,5 +51,6 @@
|
|||||||
<root level="INFO">
|
<root level="INFO">
|
||||||
<appender-ref ref="debug"/>
|
<appender-ref ref="debug"/>
|
||||||
<appender-ref ref="error"/>
|
<appender-ref ref="error"/>
|
||||||
|
<appender-ref ref="console"/>
|
||||||
</root>
|
</root>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
|||||||
@@ -98,7 +98,7 @@
|
|||||||
<filtering>true</filtering>
|
<filtering>true</filtering>
|
||||||
<directory>src/main/resources</directory>
|
<directory>src/main/resources</directory>
|
||||||
<includes>
|
<includes>
|
||||||
<include>application-${profileActive}.yml</include>
|
<include>application-*.yml</include>
|
||||||
<include>application.yml</include>
|
<include>application.yml</include>
|
||||||
</includes>
|
</includes>
|
||||||
</resource>
|
</resource>
|
||||||
|
|||||||
@@ -1,13 +1,13 @@
|
|||||||
# application-dev.yml
|
# application-pro.yml
|
||||||
spring:
|
spring:
|
||||||
redis:
|
redis:
|
||||||
database: 2
|
database: 1
|
||||||
port: 6379
|
host: 192.168.0.253
|
||||||
host: 192.168.0.101
|
|
||||||
password: boe@123
|
password: boe@123
|
||||||
|
port: 6379
|
||||||
jpa:
|
jpa:
|
||||||
hibernate:
|
hibernate:
|
||||||
ddl-auto: none
|
ddl-auto: update
|
||||||
open-in-view: false
|
open-in-view: false
|
||||||
properties:
|
properties:
|
||||||
hibernate:
|
hibernate:
|
||||||
@@ -16,14 +16,15 @@ spring:
|
|||||||
driverClassName: com.mysql.jdbc.Driver
|
driverClassName: com.mysql.jdbc.Driver
|
||||||
db1:
|
db1:
|
||||||
driverClassName: com.mysql.jdbc.Driver
|
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
|
username: root
|
||||||
password: boe#1234A
|
password: boe#1234A
|
||||||
db2:
|
db2:
|
||||||
driverClassName: com.mysql.jdbc.Driver
|
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
|
username: root
|
||||||
password: boe#1234A
|
password: boe#1234A
|
||||||
|
|
||||||
web:
|
web:
|
||||||
resources:
|
resources:
|
||||||
static-locations: file:E:/Projects/BOE/java/static
|
static-locations: file:E:/Projects/BOE/java/static
|
||||||
@@ -32,23 +33,27 @@ logging:
|
|||||||
level:
|
level:
|
||||||
org:
|
org:
|
||||||
hibernate:
|
hibernate:
|
||||||
SQL: DEBUG
|
SQL: ERROR
|
||||||
type:
|
# type:
|
||||||
descriptor:
|
# descriptor:
|
||||||
sql:
|
# sql:
|
||||||
BasicBinder: TRACE
|
# BasicBinder: TRACE
|
||||||
config: classpath:log/logback-dev.xml
|
config: classpath:log/logback-dev.xml
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
xboe:
|
xboe:
|
||||||
|
api:
|
||||||
|
cross_filter: true
|
||||||
upload:
|
upload:
|
||||||
file:
|
file:
|
||||||
temp_path: E:/Projects/BOE/java/static/temp
|
temp_path: /tmp
|
||||||
save_path: E:/Projects/BOE/java/static/upload
|
save_path: /home/www/elearning/upload
|
||||||
http_path: http://localhost:9090/upload
|
http_path: http://192.168.0.253/upload
|
||||||
inner:
|
inner:
|
||||||
data:
|
data:
|
||||||
sync:
|
sync:
|
||||||
baseurl: http://localhost:9090
|
baseurl: http://127.0.0.1:9090
|
||||||
|
|
||||||
jasypt:
|
jasypt:
|
||||||
encryptor:
|
encryptor:
|
||||||
|
|||||||
@@ -1,9 +1,7 @@
|
|||||||
# application-pro.yml
|
# application-pro.yml
|
||||||
spring:
|
spring:
|
||||||
profiles:
|
|
||||||
active: pro
|
|
||||||
redis:
|
redis:
|
||||||
database: 3
|
database: 1
|
||||||
host: 10.251.88.213
|
host: 10.251.88.213
|
||||||
password: qwert!W588
|
password: qwert!W588
|
||||||
port: 6379
|
port: 6379
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
# application.yml
|
# application.yml
|
||||||
spring:
|
spring:
|
||||||
profiles:
|
profiles:
|
||||||
active: @profileActive@
|
active: dev
|
||||||
application:
|
application:
|
||||||
name: boe-server-basic
|
name: boe-server-basic
|
||||||
jackson:
|
jackson:
|
||||||
@@ -62,4 +62,4 @@ ok:
|
|||||||
|
|
||||||
# 设置logback.xml位置
|
# 设置logback.xml位置
|
||||||
logging:
|
logging:
|
||||||
config: classpath:log/logback-@profileActive@.xml
|
config: classpath:log/logback-${spring.profiles.active}.xml
|
||||||
@@ -0,0 +1,55 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<configuration debug="false" scan="false">
|
||||||
|
<springProperty scop="context" name="spring.application.name" source="spring.application.name" defaultValue=""/>
|
||||||
|
<property name="log.path" value="/home/logs/${spring.application.name}"/>
|
||||||
|
<!-- 彩色日志格式 -->
|
||||||
|
<property name="CONSOLE_LOG_PATTERN"
|
||||||
|
value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
|
||||||
|
<!-- 彩色日志依赖的渲染类 -->
|
||||||
|
<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
|
||||||
|
<conversionRule conversionWord="wex"
|
||||||
|
converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
|
||||||
|
<conversionRule conversionWord="wEx"
|
||||||
|
converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
|
||||||
|
<!-- Console log output -->
|
||||||
|
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
|
||||||
|
<encoder>
|
||||||
|
<pattern>${CONSOLE_LOG_PATTERN}</pattern>
|
||||||
|
</encoder>
|
||||||
|
</appender>
|
||||||
|
|
||||||
|
<!-- Log file debug output -->
|
||||||
|
<appender name="debug" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||||
|
<file>${log.path}/debug.log</file>
|
||||||
|
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
|
||||||
|
<fileNamePattern>${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
|
||||||
|
<maxFileSize>50MB</maxFileSize>
|
||||||
|
<maxHistory>30</maxHistory>
|
||||||
|
</rollingPolicy>
|
||||||
|
<encoder>
|
||||||
|
<pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
|
||||||
|
</encoder>
|
||||||
|
</appender>
|
||||||
|
|
||||||
|
<!-- Log file error output -->
|
||||||
|
<appender name="error" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||||
|
<file>${log.path}/error.log</file>
|
||||||
|
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
|
||||||
|
<fileNamePattern>${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
|
||||||
|
<maxFileSize>50MB</maxFileSize>
|
||||||
|
<maxHistory>30</maxHistory>
|
||||||
|
</rollingPolicy>
|
||||||
|
<encoder>
|
||||||
|
<pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
|
||||||
|
</encoder>
|
||||||
|
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
|
||||||
|
<level>ERROR</level>
|
||||||
|
</filter>
|
||||||
|
</appender>
|
||||||
|
|
||||||
|
<!-- Level: FATAL 0 ERROR 3 WARN 4 INFO 6 DEBUG 7 -->
|
||||||
|
<root level="WARN">
|
||||||
|
<appender-ref ref="debug"/>
|
||||||
|
<appender-ref ref="error"/>
|
||||||
|
</root>
|
||||||
|
</configuration>
|
||||||
Reference in New Issue
Block a user