Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
sv-springboot
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
bsoft
sv-springboot
Commits
cc94c181
Commit
cc94c181
authored
Sep 08, 2020
by
Suvalue
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
前端代码更新 20200908
parent
78c9d722
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
139 additions
and
21 deletions
+139
-21
hs-api/src/main/java/com/hs/api/common/aspect/CorsFilter.java
+18
-19
hs-api/src/main/java/com/hs/api/common/configurations/CorsConfig.java
+25
-0
hs-api/src/main/resources/application-test.properties
+1
-1
hs-api/src/main/resources/更新日志.txt
+95
-1
No files found.
hs-api/src/main/java/com/hs/api/common/aspect/CorsFilter.java
View file @
cc94c181
package
com
.
hs
.
api
.
common
.
aspect
;
import
org.springframework.stereotype.Component
;
import
javax.servlet.*
;
import
javax.servlet.annotation.WebFilter
;
import
javax.servlet.http.HttpServletRequest
;
...
...
@@ -9,32 +11,29 @@ import java.util.Arrays;
import
java.util.HashSet
;
import
java.util.Set
;
@Component
public
class
CorsFilter
implements
Filter
{
@Override
public
void
doFilter
(
ServletRequest
req
,
ServletResponse
res
,
FilterChain
chain
)
throws
IOException
,
ServletException
{
String
[]
allowDomain
=
{
"http://132.12.11.11:8888"
,
"http://123.112.112.12:80"
,
"http://123.16.12.23"
,
"http://121.12.18.13:10195"
};
Set
allowedOrigins
=
new
HashSet
(
Arrays
.
asList
(
allowDomain
));
String
originHeader
=
((
HttpServletRequest
)
req
).
getHeader
(
"Origin"
);
if
(
allowedOrigins
.
contains
(
originHeader
))
{
((
HttpServletResponse
)
res
).
setHeader
(
"Access-Control-Allow-Origin"
,
originHeader
);
((
HttpServletResponse
)
res
).
setContentType
(
"application/json;charset=UTF-8"
);
((
HttpServletResponse
)
res
).
setHeader
(
"Access-Control-Allow-Methods"
,
"POST, GET, OPTIONS, DELETE"
);
((
HttpServletResponse
)
res
).
setHeader
(
"Access-Control-Max-Age"
,
"3600"
);
((
HttpServletResponse
)
res
).
setHeader
(
"Access-Control-Allow-Headers"
,
"Origin, No-Cache, X-Requested-With, If-Modified-Since, Pragma, Last-Modified, Cache-Control, Expires, Content-Type, X-E4M-With,userId,token"
);
//表明服务器支持的所有头信息字段
((
HttpServletResponse
)
res
).
setHeader
(
"Access-Control-Allow-Credentials"
,
"true"
);
//如果要把Cookie发到服务器,需要指定Access-Control-Allow-Credentials字段为true;
((
HttpServletResponse
)
res
).
setHeader
(
"XDomainRequestAllowed"
,
"1"
);
public
void
doFilter
(
ServletRequest
request
,
ServletResponse
response
,
FilterChain
chain
)
throws
IOException
,
ServletException
{
HttpServletResponse
res
=
(
HttpServletResponse
)
response
;
res
.
addHeader
(
"Access-Control-Allow-Credentials"
,
"true"
);
res
.
addHeader
(
"Access-Control-Allow-Origin"
,
"*"
);
res
.
addHeader
(
"Access-Control-Allow-Methods"
,
"GET, POST, DELETE, PUT"
);
res
.
addHeader
(
"Access-Control-Allow-Headers"
,
"Content-Type,X-CAF-Authorization-Token,sessionToken,X-TOKEN,Authorization"
);
if
(((
HttpServletRequest
)
request
).
getMethod
().
equals
(
"OPTIONS"
))
{
response
.
getWriter
().
println
(
"ok"
);
return
;
}
chain
.
doFilter
(
req
,
res
);
return
;
chain
.
doFilter
(
request
,
response
);
}
public
void
init
(
FilterConfig
filterConfig
)
{
// something init
@Override
public
void
destroy
()
{
}
public
void
destroy
()
{
// destroy something
@Override
public
void
init
(
FilterConfig
filterConfig
)
throws
ServletException
{
}
}
hs-api/src/main/java/com/hs/api/common/configurations/CorsConfig.java
0 → 100644
View file @
cc94c181
package
com
.
hs
.
api
.
common
.
configurations
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.http.HttpHeaders
;
import
org.springframework.web.servlet.config.annotation.CorsRegistry
;
import
org.springframework.web.servlet.config.annotation.WebMvcConfigurer
;
@Configuration
public
class
CorsConfig
implements
WebMvcConfigurer
{
@Bean
public
WebMvcConfigurer
corsConfigurer
()
{
return
new
WebMvcConfigurer
()
{
@Override
public
void
addCorsMappings
(
CorsRegistry
registry
)
{
registry
.
addMapping
(
"/**"
).
allowedOrigins
(
"*"
).
//允许跨域的域名,可以用*表示允许任何域名使用
allowedMethods
(
"*"
).
//允许任何方法(post、get等)
allowedHeaders
(
"*"
).
//允许任何请求头
allowCredentials
(
true
).
//带上cookie信息
exposedHeaders
(
HttpHeaders
.
SET_COOKIE
).
maxAge
(
3600L
);
//maxAge(3600)表明在3600秒内,不需要再发送预检验请求,可以缓存该结果
}
};
}
}
hs-api/src/main/resources/application-test.properties
View file @
cc94c181
#### \u6D4B\u8BD5\u73AF\u5883 ###################################################
spring.datasource.url
=
jdbc:mysql://192.168.18.17
6:3306/scml_sy2.0
?useUnicode=true&characterEncoding=utf8&useSSL=false&autoReconnect=true&rewriteBatchedStatements=TRUE&serverTimezone=UTC
spring.datasource.url
=
jdbc:mysql://192.168.18.17
8:3306/scml_zp_cs_2.1
?useUnicode=true&characterEncoding=utf8&useSSL=false&autoReconnect=true&rewriteBatchedStatements=TRUE&serverTimezone=UTC
spring.datasource.username
=
root
spring.datasource.password
=
Suvalue2016
spring.datasource.driver-class-name
=
com.mysql.jdbc.Driver
...
...
hs-api/src/main/resources/更新日志.txt
View file @
cc94c181
时间:2020.08.25 版本号:2.02.0825001
时间:2020.09.08 版本号:2.02.0908001
时间:2020.09.08 版本号:2.02.0908001
前端更新说明
列表搜索病组 下钻错误
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
时间:2020.09.06 版本号:2.02.0906001
前端更新说明
668 加一个等号
667 病组名字放在横线上面
666 医保的收支比偏,浮框增加该指标
665 说明的文字更新
664 名次没有小数点
662 全院的,科室的三级病组层加“病组编码”字段,icd10 icd9的编码
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
时间:2020.09.05 版本号:2.02.0905001
前端更新说明
列表pc端 左右滚动 点击头部排序
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
时间:2020.09.04 版本号:2.02.0904002
前端更新说明
能效、费用模块中间echarts 联动
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
时间:2020.09.04 版本号:2.02.0904001
前端更新说明
640 首页增加病组查询入口
656 PC----悬停 浮框 列表悬停
659 成本全院大的所有科室列表横向无法滚动
660 周浦环境病组无法查询
661 住院预算--》门诊预算---》总览 总览下未显示数据
662 全院的,科室的三级病组层加“病组编码”字段
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
时间:2020.09.03 版本号:2.02.0903002
前端更新说明
三级病组散点浮框 增加病组编码
科室内 医生浮框删除 例均药费 例均耗费
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
时间:2020.09.03 版本号:2.02.0903001
前端更新说明
656 PC----悬停 浮框、
657 所有的三级病组层(全院,科室,每个模块,所有的三级病组(标准目录))浮框加编码
650 病组查询优化,区分核心病组,综合病
652 下钻优化,区分核心病组,综合病组
655 病组层的下钻浮框提示“不可下钻”
640 首页增加病组查询入口、
654 界面增加说明入口
638 科室的病组列表,当为一级病组列表,二级病组列表,三级病组列表时,增加科室的汇总数据
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
时间:2020.09.02 版本号:2.02.0902001
前端更新说明
科室账号登录 成本管理页面筛选时间页面加载错误。
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
时间:2020.08.31 版本号:2.02.0831001
前端更新说明
647 能效图界面放大镜输入三级病组名,点查询,左上角的二级病组名显示异常
632 费用的同级排名优化
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
时间:2020.08.29 版本号:2.02.0829001
前端更新说明
搜索三级病组 左上角应展示二级病组名
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
时间:2020.08.28 版本号:2.02.0828001
前端更新说明
647 能效图界面放大镜输入三级病组名,点查询,左上角的二级病组名显示异常
646 趋势图默认折线改造
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
时间:2020.08.27 版本号:2.02.0827002
前端更新说明
643 医疗组报表优化
645 医疗组报表导出
644 主任医生导出报表
642 主任医生报表优化
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
时间:2020.08.27 版本号:2.02.0827001
前端更新说明
622 病组列表病组,三级病组时,查询出来的列表,对应的三级病组那条数据高亮
624 病组查询模糊匹配的列表要标识综合病组,加*
637 绩效加浮框
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
时间:2020.08.25 版本号:2.02.0825001
前端更新说明
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment