Skip to content

C
cust-api
Commit cce9aea6 authored by 罗林杰's avatar 罗林杰
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents f976eb93 5de0e5f2
Show whitespace changes
Inline Side-by-side
Showing with 43 additions and 818 deletions
config/application-common.yml
View file @ cce9aea6
......@@ -63,46 +63,6 @@ spring:
orderActivityStatusQueue: ${cy_rabbitMq.orderActivityStatusQueue}
orderActivityCloseQueue: ${cy_rabbitMq.orderActivityCloseQueue}
orderActivityCloseDelayQueue: ${cy_rabbitMq.orderActivityCloseDelayQueue}
# 2. redis ------
# redis:
# host: ${cy_redis.ip}
# port: ${cy_redis.port}
# database: ${cy_redis.database:0}
# password: ${cy_redis.password}
# timeout: 3000
# jedis:
# pool:
# max-active: 32
# max-idle: 16
# max-wait: 300ms
# min-idle: 8
# 3. redis-cluster ------
# redis:
# database: 0
# timeout: PT2M
# lettuce:
# cache:
# database: 0
# timeout: 2000 #客户端超时时间单位是毫秒 默认是2000
# maxIdle: 10 #最大空闲数
# minIdle: 10 #最xiao空闲数
# maxTotal: 40 #控制一个pool可分配多少个jedis实例,用来替换上面的redis.maxActive,如果是jedis 2.4以后用该属性
# maxWaitMillis: 4000 #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
# minEvictableIdleTimeMillis: 300000 #连接的最小空闲时间 默认1800000毫秒(30分钟)
# numTestsPerEvictionRun: 1024 #每次释放连接的最大数目,默认3
# timeBetweenEvictionRunsMillis: 30000 #逐出扫描的时间间隔(毫秒) 如果为负数,则不运行逐出线程, 默认-1
# testOnBorrow: true #是否在从池中取出连接前进行检验,如果检验失败,则从池中去除连接并尝试取出另一个
# testWhileIdle: true #在空闲时检查有效性, 默认false
# commandTimeout: 2000
# maxRedirects: 6
# clusterNodes: ${redisIp}:6391,${redisIp}:6393,${redisIp}:6396,${redisIp}:6394,${redisIp}:6392,${redisIp}:6395
# password: '098765'
# pool:
# max-active: 20
# max-idle: 10
# min-idle: 10
# max-wait: -1s
# 4. mongodb
data:
......@@ -134,66 +94,10 @@ spring:
connection-timeout: 3000
# mysql
connection-test-query: select 1 from dual
#---------5.1 MYSQL-------------
# mysql5.0
#driver-class-name: com.mysql.jdbc.Driver
# driver-class-name: com.mysql.cj.jdbc.Driver
# url: jdbc:mysql://${cy_db.ip}:${cy_db.port}/${cy_db.db}?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&failOverReadOnly=false&allowMultiQueries=true&serverTimezone=GMT%2B8
# username: ${cy_db.username}
# password: ${cy_db.password}
#----------5.2 POSTGRES------------
#url: jdbc:postgresql://10.96.131.16:15432/91isoft
#username: postgres
#password: postgres
#driver-class-name: org.postgresql.Driver
#---------5.3 ORACLE-------------
#driver-class-name: oracle.jdbc.driver.OracleDriver
#type: com.zaxxer.hikari.HikariDataSource
#url: jdbc:oracle:thin:@106.2.17.221:1521:fydb
#username: fy_first
#password: fy
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://${cy_db.ip}:${cy_db.port}/${cy_db.db}?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&failOverReadOnly=false&allowMultiQueries=true&serverTimezone=GMT%2B8
username: ${cy_db.username}
password: ${cy_db.password}
# type: com.zaxxer.hikari.HikariDataSource
# hikari:
# minimum-idle: 50
# maximum-pool-size: 200
# idle-timeout: 20000
# pool-name: DatebookHikariCP
# max-lifetime: 180000
# connection-timeout: 3000
#----------5.5 KINGBASE------------
#type: com.alibaba.druid.pool.DruidDataSource
#driverClassName: com.kingbase8.Driver
#druid:
# url: jdbc:kingbase8://127.0.0.1:54321/FP?characterEncoding=utf8&&useSSL=true&allowMultiQueries=true&serverTimezone=Asia/Shanghai
# username: SYSTEM
# password: root
# driverClassName: com.kingbase8.Driver
# initialSize: 5
# minIdle: 5
# maxActive: 20
# maxWait: 60000
# timeBetweenEvictionRunsMillis: 60000
# minEvictableIdleTimeMillis: 300000
# maxPoolPreparedStatementPerConnectionSize: 20
# maxOpenPreparedStatements: 20
# validationQuery: SELECT 'x'
# testWhileIdle: true
# testOnBorrow: true
# testOnReturn: false
# connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
minio:
......@@ -224,10 +128,7 @@ knife4j:
enable: true
setting:
language: zh_cn
# basic:
# enable: false
# username: zhangsan
# password: 123456
......@@ -304,57 +205,3 @@ rocketmq:
# 一次拉取消息最大值，注意是拉取消息的最大值而非消费最大值
pull-batch-size: 10
global:
default_location:
#ossinfo id
course: 1
student: /default/student.png
teacher: 2
carousel: /default/carousel.jpg
news: 3
lk:
publicalias: publiccert
storePwd: rcrtcyedu2
subject: edu2
licPath: /lk/license.lic
pubPath: /lk/publicCerts.store
password:
default: 123456
min_password: 6
max_password: 16
path:
base_upload_server_location: /Users/lyl/Downloads/eduServer
physical_upload_server_location: /Users/lyl/Downloads/eduServer
course_location: course
lesson_location: lesson
sl_location: sl
freemarker_location: /freemarker
image_location: /upload
ppt_location: ppt
pdf_location: pdf
cut_pdf_location: cutPdf
excel_template_location: excel-template/
cource_logo_location: /course/logo
lanch_logo_location: /lanch/logo
md_file_location: mdFiles
che_def_template_location: /WEB-INF/classes/che-def-jsonfile/java-mysql.json
che_project_init_location: /working/dockervolume/chedir/project
cource_code_location: code
cource_project_location: project
student_code_location: studentCode
xml_location: /xmlTemp
other:
server_url: http://106.2.3.134:10180/eduServer
is_server_linux: 5
max_code_length: 15
open_office_home: D:/oppenOffice/openOffice
cut_pdf_num: 30
code:
teacher: ROLE_1002
student: ROLE_1003
java: '001'
html: '002'
java_simple: '0001'
java_project: '0002'
html_simple: '1001'
html_project: '1002'
config/application-dev-conf.yml
View file @ cce9aea6
......@@ -39,21 +39,6 @@ cy_minio:
readAccessKey: xxxxxxxxxxxxxx
readSecretKey: xxxxxxxxxxxxxx
# 6.db
#cy_db:
# ip: ENC(vw6fzLP+xitWOx+5/+daH0du1HeO2mWXYKQ5+FQtLv2SvUfIWgqsYrzKRNKTfxLp)
# port: ENC(HebzQAlq/De7b7Ntq6ZHU9QLgFwk761DXuHAL8mg7PW1qkarc9LzIT5WH49UGfpa)
# username: ENC(oBZSjAdFD8wwGj3wheK6Jwbkuc+4SYI5p//m61C4G/2Ory7NutRUkOXzfvnS2aHy)
# password: ENC(v2dv818F45rL4ZCZQaEgV/+ruvGFPx65AMPV52sk56N7ZuJCMTo9lUGT9j4aDccy7FND4QHN1gyDZqG3cY8w8Q==)
# db: exam
#cy_db:
# ip: 127.0.0.1
# port: 3306
# username: root
# password: root
# db: 91_root
cy_db:
ip: localhost
port: 3306
......@@ -180,11 +165,7 @@ global:
base_discovery: 'http://192.168.1.80/upload/'
fileUploadFormatRestrictions: ".exe,.php,.asp,.jsp,.aspx"
code_generate_location: /code
video_location: /video
temp_location: /temp
file_location: /file
images_location: /images
zsp_location: /zsp
code:
admin: ROLE_1001
resetPassword: 123456
......@@ -208,3 +189,17 @@ member:
- "0001-2000"
- "2001-3000"
- "4001-5000"
wx:
appId: wxf16fd3cfcd958706
secret: 6583a162408deebcba7ce43bff7d47dd
timeOut: 3600
pay:
# 支付请求回调地址
notifyUrl: https://qf.91isoft.com/lh/app/wxPay/notifyCallBack
notifyRefundUrl: https://qf.91isoft.com/lh/app/wxPay/notifyRefundCallBack
# 微信商户号
mchId: 1615816319
# 微信支付的商户密钥
key: b90d421495604c33a943bb9be12d28c0
certPath: /working/file/config/certs/apiclient_cert.p12
config/application-kube-conf.yml deleted 100644 → 0
View file @ f976eb93
# 1. redis
cy_redis:
ip: 127.0.0.1
port: 6379
password:
database: 7
# 2. rabbitMq
cy_rabbitMq:
ip: 106.2.17.236
port: 5677
username: mq
password: mq
# 3. rocketMq
cy_rocketMq:
ns: 106.3.97.198:9876,106.3.99.36:9876
# 4. mongodb
cy_mongodb:
ip: 127.0.0.1
port: 27017
username: fox
password: fox
db: cy
authDb: cy
# 5. minio
cy_minio:
endpoint: http://103.131.168.155:22038/
writeAccessKey: 6bejbsayqGMfPA75nZr4
writeSecretKey: gMjb5EjYtB8CZrxXIUclyKgTfqAo7iMK59bJ0JHs
readAccessKey: xxxxxxxxxxxxxx
readSecretKey: xxxxxxxxxxxxxx
# 6.db
#cy_db:
# ip: ENC(vw6fzLP+xitWOx+5/+daH0du1HeO2mWXYKQ5+FQtLv2SvUfIWgqsYrzKRNKTfxLp)
# port: ENC(HebzQAlq/De7b7Ntq6ZHU9QLgFwk761DXuHAL8mg7PW1qkarc9LzIT5WH49UGfpa)
# username: ENC(oBZSjAdFD8wwGj3wheK6Jwbkuc+4SYI5p//m61C4G/2Ory7NutRUkOXzfvnS2aHy)
# password: ENC(v2dv818F45rL4ZCZQaEgV/+ruvGFPx65AMPV52sk56N7ZuJCMTo9lUGT9j4aDccy7FND4QHN1gyDZqG3cY8w8Q==)
# db: exam
cy_db:
ip: 106.3.99.36
port: 20096
username: zt
password: zt
db: zt_db
cy:
model:
swagger3Config: true
sms:
enable: true
realSend: true
model: yuntongxun
# 1 "", 2 math, 3 char, 4 block,5 word
captchaType: 3
# 是否开启短信登录拦截
secure: true
login:
# 是否开启登录日志
log: true
# 1 "", 2 math, 3 char, 4 block,5 word
captcha: 3
# 是否开启登录拦截
secure: true
security:
enable: true
permission: false
defaultFilter: true
gateway: false
acAllowOrigin: '*'
acAllowMethods: 'POST, GET, OPTIONS, DELETE,PUT'
acAllowHeaders: '*'
permit-all:
permitUnStatic:
- "/static/**"
- "/webjars/**"
- "/v3/**"
- "/swagger-resources/**"
- "/api-docs/**"
- "/auth/**"
- "/code/**/**"
- "/captcha/***"
- "/excelUtil/**"
#- "/cros/**"
- "/office/getFile"
- "/office/callback"
- "/common/getKSA"
#- "/**/**"
permitStatic: [ "/", "/*.html", "/favicon.ico", "/**/*.html", "/**/*.js", "/**/*.css" ,"/swagger-ui/*"]
logoutSuccessUrl: "/login"
loginPage: "/login"
loginfailureUrl: "/login-error.html"
# 注册
register:
autoLogin: false
sms: false
# 登录拦截
login:
# 1. 同一个登录名 密码 每天 / 每分钟 允许失败的次数
unameDayCount: 5
unameMinCount: 2
# 2. 同一手机号 每天 / 每分钟 允许失败的次数
phoneDayCount: 5
phoneMinCount: 5
# 3. 同一ip 每分钟 / 每天 允许失败的次数
ipMinCount: 7
ipDayCount: 7
# 4. 分钟锁定时间 基本单位是秒
lockTimeMin: 60
# 5. 一天锁定时间 基本单位是秒
lockTimeDay: 120
# 6. 分钟IP锁定时间 基本单位是秒
lockTimeIpMin: 300
# 6. 一天IP锁定时间 基本单位是秒
lockTimeIpDay: 300
# sms 发送安全拦截
sms:
# 1. 通知类短信 同一 phone & template 每天 / 每分钟 最大数量
noticeMinCount: 5
noticeDayCount: 5
# 2. 图形验证码 同一 ip & template 每天 / 每分钟 最大数量
graphicIpMinCount: 100
graphicIpDayCount: 2000
# 3.短信验证码 同一 phone & template 每天 / 每分钟 最大数量
captchaTimeInterval: 60
captchaDayCount: 2
# 4.短信验证码 同一 ip & template 每天 / 每分钟 最大数量
ipMinCount: 5
ipDayCount: 5
# 6. 验证码存在时间 基本单位是秒
existTime: 60
# 注册验证码模版
registerTemplateCaptchaId: 2586438
# 登录验证码模版
loginCaptchaTemplateId: 2586438
# 忘记密码验证码模板
forgotPasswordCaptchaTemplateId: 2586438
# 容联云
yuntongxun:
serverIp: app.cloopen.com
serverPort: 8883
accountSId: xxxxxxxxxxxxxxxxxxxxxxxxxx
accountToken: xxxxxxxxxxxxxxxxxxxxxxxx
appId: xxxxxxxxxxxxxxxxxxxxxxxxxx
global:
path:
# base_upload_location: E:\working\resource\eduServer\
base_upload_location: /working/resource/eduServer/
base_discovery: 'http://192.168.1.12:8888/eduServer/'
fileUploadFormatRestrictions: ".exe,.php,.asp,.jsp,.aspx"
code_generate_location: /code
video_location: /video
temp_location: /temp
file_location: /file
images_location: /images
zsp_location: /zsp
code:
admin: ROLE_1001
resetPassword: 123456
oss:
request: "https://"
endpoint: "oss-cn-beijing.aliyuncs.com"
putAcessKey:
putSecretKey:
logging:
config: /data/config/logback-spring.xml
level:
root: info
com.alibaba.nacos: info
path: \working\test
member:
generate:
codes:
- "0001-2000"
- "2001-3000"
- "4001-5000"
config/application-prod-conf.yml deleted 100644 → 0
View file @ f976eb93
# 1. redis
cy_redis:
ip: 127.0.0.1
port: 6379
password:
database: 7
# 2. rabbitMq
cy_rabbitMq:
ip: 106.2.17.236
port: 5677
username: mq
password: mq
# 3. rocketMq
cy_rocketMq:
ns: 106.3.97.198:9876,106.3.99.36:9876
# 4. mongodb
cy_mongodb:
ip: 127.0.0.1
port: 27017
username: fox
password: fox
db: cy
authDb: cy
# 5. minio
cy_minio:
endpoint: http://103.131.168.155:22038/
writeAccessKey: 6bejbsayqGMfPA75nZr4
writeSecretKey: gMjb5EjYtB8CZrxXIUclyKgTfqAo7iMK59bJ0JHs
readAccessKey: xxxxxxxxxxxxxx
readSecretKey: xxxxxxxxxxxxxx
# 6.db
#cy_db:
# ip: ENC(vw6fzLP+xitWOx+5/+daH0du1HeO2mWXYKQ5+FQtLv2SvUfIWgqsYrzKRNKTfxLp)
# port: ENC(HebzQAlq/De7b7Ntq6ZHU9QLgFwk761DXuHAL8mg7PW1qkarc9LzIT5WH49UGfpa)
# username: ENC(oBZSjAdFD8wwGj3wheK6Jwbkuc+4SYI5p//m61C4G/2Ory7NutRUkOXzfvnS2aHy)
# password: ENC(v2dv818F45rL4ZCZQaEgV/+ruvGFPx65AMPV52sk56N7ZuJCMTo9lUGT9j4aDccy7FND4QHN1gyDZqG3cY8w8Q==)
# db: exam
cy_db:
ip: 106.3.99.36
port: 20096
username: zt
password: zt
db: zt_db
cy:
model:
swagger3Config: true
sms:
enable: true
realSend: true
model: yuntongxun
# 1 "", 2 math, 3 char, 4 block,5 word
captchaType: 3
# 是否开启短信登录拦截
secure: true
login:
# 是否开启登录日志
log: true
# 1 "", 2 math, 3 char, 4 block,5 word
captcha: 3
# 是否开启登录拦截
secure: true
security:
enable: true
permission: false
defaultFilter: true
gateway: false
acAllowOrigin: '*'
acAllowMethods: 'POST, GET, OPTIONS, DELETE,PUT'
acAllowHeaders: '*'
permit-all:
permitUnStatic:
- "/static/**"
- "/webjars/**"
- "/v3/**"
- "/swagger-resources/**"
- "/api-docs/**"
- "/auth/**"
- "/code/**/**"
- "/captcha/**"
- "/excelUtil/**"
- "/office/getFile"
- "/office/callback"
#- "/cros/**"
- "/common/getKSA"
permitStatic: [ "/", "/*.html", "/favicon.ico", "/**/*.html", "/**/*.js", "/**/*.css","/swagger-ui/*" ]
logoutSuccessUrl: "/login"
loginPage: "/login"
loginfailureUrl: "/login-error.html"
# 注册
register:
autoLogin: false
sms: false
# 登录拦截
login:
# 1. 同一个登录名 密码 每天 / 每分钟 允许失败的次数
unameDayCount: 5
unameMinCount: 2
# 2. 同一手机号 每天 / 每分钟 允许失败的次数
phoneDayCount: 5
phoneMinCount: 5
# 3. 同一ip 每分钟 / 每天 允许失败的次数
ipMinCount: 7
ipDayCount: 7
# 4. 分钟锁定时间 基本单位是秒
lockTimeMin: 60
# 5. 一天锁定时间 基本单位是秒
lockTimeDay: 120
# 6. 分钟IP锁定时间 基本单位是秒
lockTimeIpMin: 300
# 6. 一天IP锁定时间 基本单位是秒
lockTimeIpDay: 300
# 注册验证码模版
registerTemplateCaptchaId: 2586438
# 登录验证码模版
loginCaptchaTemplateId: 2586438
# 忘记密码验证码模板
forgotPasswordCaptchaTemplateId: 2586438
# sms 发送安全拦截
sms:
# 1. 通知类短信 同一 phone & template 每天 / 每分钟 最大数量
noticeMinCount: 5
noticeDayCount: 5
# 2. 图形验证码 同一 ip & template 每天 / 每分钟 最大数量
graphicIpMinCount: 100
graphicIpDayCount: 2000
# 3.短信验证码 同一 phone & template 每天 / 每分钟 最大数量
captchaTimeInterval: 60
captchaDayCount: 2
# 4.短信验证码 同一 ip & template 每天 / 每分钟 最大数量
ipMinCount: 5
ipDayCount: 5
# 6. 验证码存在时间 基本单位是秒
existTime: 60
# 容联云
yuntongxun:
serverIp: app.cloopen.com
serverPort: 8883
accountSId: xxxxxxxxxxxxxxxxxxxxxxxxxx
accountToken: xxxxxxxxxxxxxxxxxxxxxxxx
appId: xxxxxxxxxxxxxxxxxxxxxxxxxx
global:
path:
# base_upload_location: E:\working\resource\eduServer\
base_upload_location: /working/resource/eduServer/
base_discovery: 'http://192.168.1.12:8888/eduServer/'
fileUploadFormatRestrictions: ".exe,.php,.asp,.jsp,.aspx"
code_generate_location: /code
video_location: /video
temp_location: /temp
file_location: /file
images_location: /images
zsp_location: /zsp
code:
admin: ROLE_1001
resetPassword: 123456
oss:
request: "https://"
endpoint: "oss-cn-beijing.aliyuncs.com"
putAcessKey:
putSecretKey:
logging:
config: /data/config/logback-spring.xml
level:
root: info
com.alibaba.nacos: info
path: \working\test
member:
generate:
codes:
- "0001-2000"
- "2001-3000"
- "4001-5000"
config/application-spbt.yml
View file @ cce9aea6
#---------------------自定义配置----------------------------
wx:
appId: wxf16fd3cfcd958706
secret: 6583a162408deebcba7ce43bff7d47dd
timeOut: 3600
pay:
# 支付请求回调地址
notifyUrl: https://qf.91isoft.com/lh/app/wxPay/notifyCallBack
notifyRefundUrl: https://qf.91isoft.com/lh/app/wxPay/notifyRefundCallBack
# 微信商户号
mchId: 1615816319
# 微信支付的商户密钥
key: b90d421495604c33a943bb9be12d28c0
certPath: /working/file/config/certs/apiclient_cert.p12
jwt:
header: Authorization
secret: mySecret
......@@ -73,10 +60,6 @@ cy:
ignorePackage: org.rcisoft.web.sys
schema: standalone
addressEnabled: true
activiti:
enable: false
schemaUpdate: true
databaseType: mysql
code:
enable: true
author: cy
......
config/application-test-conf.yml
View file @ cce9aea6
......@@ -11,10 +11,16 @@ cy_rabbitMq:
port: 5677
username: mq
password: mq
# 3. rocketMq
orderActivityExchange: orderActivityExchange
orderActivityDelayExchange: orderActivityDelayExchange
orderActivityAddQueue: orderActivityAddQueue
orderActivityCloseQueue: orderActivityCloseQueue
orderActivityCloseDelayQueue: orderActivityCloseDelayQueue
orderActivityStatusQueue: orderActivityStatusQueue
# 3. rocketMq 使用 ; 分隔
cy_rocketMq:
ns: 106.3.97.198:9876,106.3.99.36:9876
ns: 106.3.97.198:9876;106.3.99.36:9876
# 4. mongodb
cy_mongodb:
......@@ -33,14 +39,6 @@ cy_minio:
readAccessKey: xxxxxxxxxxxxxx
readSecretKey: xxxxxxxxxxxxxx
# 6.db
#cy_db:
# ip: ENC(vw6fzLP+xitWOx+5/+daH0du1HeO2mWXYKQ5+FQtLv2SvUfIWgqsYrzKRNKTfxLp)
# port: ENC(HebzQAlq/De7b7Ntq6ZHU9QLgFwk761DXuHAL8mg7PW1qkarc9LzIT5WH49UGfpa)
# username: ENC(oBZSjAdFD8wwGj3wheK6Jwbkuc+4SYI5p//m61C4G/2Ory7NutRUkOXzfvnS2aHy)
# password: ENC(v2dv818F45rL4ZCZQaEgV/+ruvGFPx65AMPV52sk56N7ZuJCMTo9lUGT9j4aDccy7FND4QHN1gyDZqG3cY8w8Q==)
# db: exam
cy_db:
ip: 106.3.99.36
port: 20096
......@@ -50,6 +48,7 @@ cy_db:
cy:
model:
swagger3Config: true
# sms
sms:
enable: false
realSend: true
......@@ -154,15 +153,11 @@ sms:
global:
path:
# base_upload_location: E:\working\resource\eduServer\
base_upload_location: /working/resource/eduServer/
base_discovery: 'http://192.168.1.12:8888/eduServer/'
fileUploadFormatRestrictions: ".exe,.php,.asp,.jsp,.aspx"
code_generate_location: /code
video_location: /video
temp_location: /temp
file_location: /file
images_location: /images
zsp_location: /zsp
code:
admin: ROLE_1001
resetPassword: 123456
......@@ -185,3 +180,17 @@ member:
- "0001-2000"
- "2001-3000"
- "4001-5000"
wx:
appId: wxf16fd3cfcd958706
secret: 6583a162408deebcba7ce43bff7d47dd
timeOut: 3600
pay:
# 支付请求回调地址
notifyUrl: https://qf.91isoft.com/lh/app/wxPay/notifyCallBack
notifyRefundUrl: https://qf.91isoft.com/lh/app/wxPay/notifyRefundCallBack
# 微信商户号
mchId: 1615816319
# 微信支付的商户密钥
key: b90d421495604c33a943bb9be12d28c0
certPath: /working/file/config/certs/apiclient_cert.p12
src/main/java/org/rcisoft/business/cmsActivity/service/impl/CmsActivityServiceImpl.java
View file @ cce9aea6
......@@ -8,7 +8,6 @@ import lombok.extern.slf4j.Slf4j;
import org.rcisoft.business.cmsActivity.dao.CmsActivityRepository;
import org.rcisoft.business.cmsActivity.entity.CmsActivity;
import org.rcisoft.business.cmsActivity.service.CmsActivityService;
import org.rcisoft.common.component.Global;
import org.rcisoft.core.exception.CyServiceException;
import org.rcisoft.core.model.CyPageInfo;
import org.rcisoft.core.model.CyPersistModel;
......@@ -40,8 +39,6 @@ import java.util.concurrent.TimeUnit;
@Slf4j
public class CmsActivityServiceImpl extends ServiceImpl<CmsActivityRepository, CmsActivity> implements CmsActivityService {
@Autowired
private Global global;
@Autowired(required = false)
private CyRedisService cyRedisServiceImpl;
@Autowired
......
src/main/java/org/rcisoft/business/cmsApplication/service/impl/CmsApplicationServiceImpl.java
View file @ cce9aea6
......@@ -6,7 +6,6 @@ import lombok.extern.slf4j.Slf4j;
import org.rcisoft.business.cmsApplication.entity.CmsApplication;
import org.rcisoft.business.cmsApplication.dao.CmsApplicationRepository;
import org.rcisoft.business.cmsApplication.service.CmsApplicationService;
import org.rcisoft.common.component.Global;
import org.rcisoft.core.model.CyPageInfo;
import org.rcisoft.core.model.CyPersistModel;
import org.rcisoft.core.util.*;
......@@ -32,8 +31,6 @@ public class CmsApplicationServiceImpl extends ServiceImpl<CmsApplicationReposit
@Autowired
private SysUserRepository sysUserRepository;
@Autowired
private Global global;
/**
* 保存 活动
*
......
src/main/java/org/rcisoft/business/cmsBanner/service/impl/CmsBannerServiceImpl.java
View file @ cce9aea6
......@@ -7,7 +7,6 @@ import lombok.extern.slf4j.Slf4j;
import org.rcisoft.business.cmsBanner.dao.CmsBannerRepository;
import org.rcisoft.business.cmsBanner.entity.CmsBanner;
import org.rcisoft.business.cmsBanner.service.CmsBannerService;
import org.rcisoft.common.component.Global;
import org.rcisoft.core.model.CyPageInfo;
import org.rcisoft.core.model.CyPersistModel;
import org.rcisoft.core.util.CyUserUtil;
......@@ -27,8 +26,6 @@ import java.util.List;
@Slf4j
public class CmsBannerServiceImpl extends ServiceImpl<CmsBannerRepository, CmsBanner> implements CmsBannerService {
@Autowired
private Global global;
/**
* 保存 banner管理
* @param cmsBanner
......
src/main/java/org/rcisoft/business/cmsNotice/service/impl/CmsNoticeServiceImpl.java
View file @ cce9aea6
......@@ -7,7 +7,6 @@ import lombok.extern.slf4j.Slf4j;
import org.rcisoft.business.cmsNotice.dao.CmsNoticeRepository;
import org.rcisoft.business.cmsNotice.entity.CmsNotice;
import org.rcisoft.business.cmsNotice.service.CmsNoticeService;
import org.rcisoft.common.component.Global;
import org.rcisoft.core.exception.CyServiceException;
import org.rcisoft.core.model.CyPageInfo;
import org.rcisoft.core.model.CyPersistModel;
......@@ -29,8 +28,7 @@ import java.util.List;
@Slf4j
public class CmsNoticeServiceImpl extends ServiceImpl<CmsNoticeRepository, CmsNotice> implements CmsNoticeService {
@Autowired
private Global global;
/**
......
src/main/java/org/rcisoft/business/opmTopic/service/impl/OpmTopicServiceImpl.java
View file @ cce9aea6
......@@ -7,7 +7,6 @@ import lombok.extern.slf4j.Slf4j;
import org.rcisoft.business.opmTopic.dao.OpmTopicRepository;
import org.rcisoft.business.opmTopic.entity.OpmTopic;
import org.rcisoft.business.opmTopic.service.OpmTopicService;
import org.rcisoft.common.component.Global;
import org.rcisoft.core.exception.CyServiceException;
import org.rcisoft.core.model.CyPageInfo;
import org.rcisoft.core.model.CyPersistModel;
......@@ -29,8 +28,7 @@ import java.util.List;
@Slf4j
public class OpmTopicServiceImpl extends ServiceImpl<OpmTopicRepository, OpmTopic> implements OpmTopicService {
@Autowired
private Global global;
/**
......
src/main/java/org/rcisoft/common/component/Global.java
View file @ cce9aea6
......@@ -19,216 +19,10 @@ import java.util.Map;
public class Global {
/**
* 保存全局属性值
*/
static Map<String, String> map = Maps.newHashMap();
/**
* 服务器文件保存基本位置
*/
@Value("${global.path.base_upload_location}")
private String Base_Upload_Location;
/**
* 服务器地址
*/
@Value("${global.path.base_discovery}")
private String Base_Discovery;
/*服务器地址*/
@Value("${global.other.server_url}")
private String SERVER_URL;
/*服务器保存图片路径*/
@Value("${global.path.base_upload_server_location}")
private String BASE_UPLOAD_SERVER_LOCATION;
/*容器外路径*/
@Value("${global.path.physical_upload_server_location}")
private String PHYSICAL_UPLOAD_SERVER_LOCATION;
/*课程相关文件路径*/
@Value("${global.path.course_location}")
private String COURSE_LOCATION;
/*lesson相关文件路径*/
@Value("${global.path.lesson_location}")
private String LESSON_LOCATION;
/*sl相关文件路径*/
@Value("${global.path.sl_location}")
private String SL_LOCATION;
/*服务器freemarker模板位置*/
@Value("${global.path.freemarker_location}")
private String FREEMARKER_LOCATION;
/*服务器上传路径*/
@Value("${global.path.images_location}")
private String IMAGE_LOCATION;
/*视频路径*/
@Value("${global.path.video_location}")
private String VIDEO_LOCATION;
/*旧视频路径*/
@Value("${global.path.temp_location}")
private String TEMP_LOCATION;
/*附件路径*/
@Value("${global.path.file_location}")
private String FILE_LOCATION;
/*ppt路径*/
@Value("${global.path.ppt_location}")
private String PPT_LOCATION;
/*pdf路径*/
@Value("${global.path.pdf_location}")
private String PDF_LOCATION;
/*切割pdf路径*/
@Value("${global.path.cut_pdf_location}")
private String CUT_PDF_LOCATION;
/*每次切割pdf的页数*/
@Value("${global.other.cut_pdf_num}")
private Integer CUT_PDF_NUM;
/*excel模板位置*/
@Value("${global.path.excel_template_location}")
private String EXCEL_TEMPLATE_LOCATION;
/*课程封面路径*/
@Value("${global.path.cource_logo_location}")
private String COURSE_LOGO_LOCATION;
/*课程代码路径*/
@Value("${global.path.cource_code_location}")
private String COURSE_CODE_LOCATION;
/*课程工程代码路径*/
@Value("${global.path.cource_project_location}")
private String COURSE_PROJECT_LOCATION;
/*图片路径*/
@Value("${global.path.images_location}")
private String IMAGES_LOCATION;
/*课程默认图片路径*/
@Value("${global.default_location.course}")
private String DEFAULT_COURSE_LOCATION;
/*新闻默认图片路径*/
@Value("${global.default_location.news}")
private String DEFAULT_NEWS_LOCATION;
/*默认学生头像路径*/
@Value("${global.default_location.student}")
private String DEFAULT_STUDENT_LOCATION;
/*默认教师头像路径*/
@Value("${global.default_location.teacher}")
private String DEFAULT_TEACHER_LOCATION;
/*默认轮播图路径*/
@Value("${global.default_location.carousel}")
private String DEFAULT_CAROUSEL_LOCATION;
/*开课封面路径*/
@Value("${global.path.lanch_logo_location}")
private String LANCH_LOGO_LOCATION;
/*mdtup*/
@Value("${global.path.md_file_location}")
private String MD_FILE_LOCATION;
// /*登录验证秘钥*/
// @Value("${jwt.login_secert_key}")
// private String LOGIN_SECERT_KEY;
@Value("${jwt.header}")
private String JWT_HEADER;
@Value("${jwt.tokenHead}")
private String JWT_TOKEN_HEAD;
/*是否是服务器（为1代表是服务器）*/
@Value("${global.other.is_server_linux}")
private String IS_SERVER_LINUX;
/*code长度限制*/
@Value("${global.other.max_code_length}")
private String MAX_CODE_LENGTH;
/*用户默认密码*/
@Value("${global.password.default}")
private String DEFAULT_PASSWORD;
/*password最小长度*/
@Value("${global.password.min_password}")
private String PASSWORD_MIN_PASSWORD;
/*password最大长度*/
@Value("${global.password.max_password}")
private String PASSWORD_MAX_PASSWORD;
/*che的配置模板路径*/
@Value("${global.path.che_def_template_location}")
private String CHE_DEF_TEMPLATE_LOCATION;
/*che初始化项目目录*/
@Value("${global.path.che_project_init_location}")
private String CHE_PROJECT_INIT_LOCATION;
/*管理员Code*/
@Value("${global.code.admin}")
private String adminCode;
/*教师Code*/
@Value("${global.code.teacher}")
private String teacherCode;
/*学生Code*/
@Value("${global.code.student}")
private String studentCode;
/*java 单文件*/
@Value("${global.code.java_simple}")
private String javaSimple;
/*java 工程*/
@Value("${global.code.java_project}")
private String javaProject;
/*html 单文件*/
@Value("${global.code.html_simple}")
private String htmlSimple;
/*html 工程*/
@Value("${global.code.html_project}")
private String htmlProject;
/*导出的学生作业暂存路径*/
@Value("${global.path.student_code_location}")
private String STUDENT_CODE_LOCATION;
/*openOffice安装路径*/
@Value("${global.other.open_office_home}")
private String OPEN_OFFICE_HOME;
/*redis缓存超时时间*/
@Value("${spring.data.redis.timeout}")
private Integer REDIS_TIMEOUT;
@Value("${global.path.xml_location}")
private String XML_LOCATION;
}
src/main/resources/mapper/business/cmsActivity.mapper/CmsActivityMapper.xml
View file @ cce9aea6
......@@ -36,18 +36,6 @@
<select id="queryCmsActivity" resultMap="BaseResultMap">
select * from cms_activity
where 1=1
<!-- <if test="entity.beginTime !=null and entity.beginTime != '' ">
and publish_date &gt;= #{entity.beginTime}
</if>
<if test="entity.endTime !=null and entity.endTime != '' ">
and publish_date &lt;= #{entity.endTime}
</if>
<if test="entity.beginTime !=null and entity.beginTime != '' ">
and create_date &gt;= #{entity.beginTime}
</if>
<if test="entity.endTime !=null and entity.endTime != '' ">
and create_date &lt;= #{entity.endTime}
</if>-->
<if test="entity.createBy !=null and entity.createBy != '' ">
and create_by like concat('%',#{entity.createBy},'%')
</if>
......
src/main/resources/mapper/business/cmsNotice.mapper/CmsNoticeMapper.xml
View file @ cce9aea6
......@@ -138,7 +138,7 @@
</update>
<select id="selectById" resultMap="BaseResultMap" parameterType="java.lang.Integer">
select cn.*,
oi.path
oi.url
from cms_notice cn
left join oss_info oi on oi.business_id = cn.picture_id
where cn.business_id = #{businessId}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment