Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Remove_ Ind filtering conditions in create table and import hive #955

Open
wants to merge 2,578 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
2578 commits
Select commit Hold shift + click to select a range
43f0f2c
Merge pull request #588 from WeBankFinTech/dependabot/maven/com.googl…
liuyou2 May 28, 2022
9f5fa8d
Merge branch 'master' into master
liuyou2 May 28, 2022
a3fc9d1
Merge pull request #583 from coombe/master
liuyou2 May 28, 2022
42ad993
Fix Jackson-annotations-2.12.6.1.jar not found
utopianet May 28, 2022
62443a9
Merge pull request #816 from utopianet/master
liuyou2 May 28, 2022
beb9600
update dml
HmhWz May 29, 2022
389b19d
update appconn init.sql
HmhWz May 29, 2022
78d9603
Merge branch 'dev-1.1.4' of github.com:WeDataSphere/DataSphereStudio …
ElishaZhang May 29, 2022
5c1f38c
add datachecker sourceType print log
ElishaZhang May 30, 2022
c7ba224
add datachecker sourceType print log
ElishaZhang May 30, 2022
4c99a04
support project multi activity transformation
ElishaZhang May 30, 2022
988ae17
fix bug
demonray May 31, 2022
227e0ac
Merge branch 'dev-1.1.4' of github.com:WeDataSphere/DataSphereStudio …
demonray May 31, 2022
aa1de80
Optimize worflow edit lock update operations
ElishaZhang May 31, 2022
b5684c8
Merge branch 'dev-1.1.4' of github.com:WeDataSphere/DataSphereStudio …
ElishaZhang May 31, 2022
cf80c3a
Fix the problem of checking multi-source data with datacheck
liuyou2 May 30, 2022
d4b8bbe
update lock
demonray May 31, 2022
98477c4
Merge branch 'dev-1.1.4' of github.com:WeDataSphere/DataSphereStudio …
demonray May 31, 2022
2b34b82
report err desc
demonray May 31, 2022
dc3621e
lock params
demonray May 31, 2022
fad6f46
fix bug
demonray May 31, 2022
aaa810c
drag widget
demonray Jun 1, 2022
a5b2ab3
fix drag problem
demonray Jun 1, 2022
4ba514c
fix fold panel
demonray Jun 1, 2022
6eb5243
delete lock when close tab
demonray Jun 1, 2022
78789d6
guide sync
yuankang134 May 7, 2022
a155850
fix redirect
demonray Jun 1, 2022
e314fce
Merge remote-tracking branch 'origin/dev-1.1.4' into dev-1.1.4
yuankang134 Jun 1, 2022
43e2c31
fix drag
demonray Jun 1, 2022
c2d3078
Merge branch 'dev-1.1.4' of github.com:WeDataSphere/DataSphereStudio …
demonray Jun 1, 2022
8ef564c
Adapter for linkis-1.1.0 version.
HmhWz Jun 1, 2022
a202587
change ip 127.0.0.1
yuankang134 Jun 1, 2022
f7bce96
Merge remote-tracking branch 'origin/dev-1.1.4' into dev-1.1.4
yuankang134 Jun 1, 2022
785e110
dont remove
demonray Jun 2, 2022
e955ee9
Merge branch 'dev-1.1.4' of github.com:WeDataSphere/DataSphereStudio …
demonray Jun 2, 2022
30177a6
fix bug
demonray Jun 2, 2022
1fa925e
fix project privilege sync wrong when modify project.
HmhWz Jun 1, 2022
685874e
sync variableUtils.
HmhWz Jun 1, 2022
6f1ee47
fix bug for multi loaded workflowParser.
HmhWz Jun 2, 2022
089acee
change delete lock api path
demonray Jun 2, 2022
dc397a6
Merge branch 'dev-1.1.4' of github.com:WeDataSphere/DataSphereStudio …
demonray Jun 2, 2022
2e50496
Fix the problem of checking proxy user in workflow
liuyou2 May 31, 2022
acbf9bc
add workflow edit lcok delete interface
liuyou2 May 30, 2022
0e359f6
Merge branch 'dev-1.1.4' of github.com:WeDataSphere/DataSphereStudio …
ElishaZhang Jun 2, 2022
764159b
bug fix.
HmhWz Jun 2, 2022
aaebcf5
Merge branch 'dev-1.1.4' of https://github.com/WeDataSphere/DataSpher…
HmhWz Jun 2, 2022
a347bf7
Merge pull request #819 from HmhWz/master
liuyou2 Jun 2, 2022
e356d96
fix route path
demonray Jun 2, 2022
90eb23e
fix workflow edit lock bug
ElishaZhang Jun 2, 2022
8a30a3f
Merge branch 'dev-1.1.4' of github.com:WeDataSphere/DataSphereStudio …
ElishaZhang Jun 2, 2022
2722b34
Merge branch 'dev-1.1.4' of github.com:WeDataSphere/DataSphereStudio …
demonray Jun 6, 2022
b324f64
scriptis mciro modle
demonray Jun 6, 2022
c32084a
fix select
demonray Jun 6, 2022
a8b7956
redirect gitbook
demonray Jun 7, 2022
475d37f
fix workflow edit lock bug
ElishaZhang Jun 8, 2022
9026c65
Merge branch 'dev-1.1.4' of github.com:WeDataSphere/DataSphereStudio …
ElishaZhang Jun 8, 2022
7eff2c7
fix drag line position bug when toogle shape view
demonray Jun 8, 2022
9bcd6cd
Merge branch 'dev-1.1.4' of github.com:WeDataSphere/DataSphereStudio …
demonray Jun 8, 2022
7ffba95
show error message with notice comp
demonray Jun 8, 2022
b61fba1
bug fix.
HmhWz Jun 9, 2022
b43a73c
Merge branch 'dev-1.1.4' of https://github.com/WeDataSphere/DataSpher…
HmhWz Jun 9, 2022
4a57f05
fix toggle shape view
demonray Jun 9, 2022
40e3a32
Merge branch 'dev-1.1.4' of github.com:WeDataSphere/DataSphereStudio …
demonray Jun 9, 2022
4cc9cbf
fix workflow edit lock delete bug
ElishaZhang Jun 9, 2022
1c66628
Merge branch 'dev-1.1.4' of github.com:WeDataSphere/DataSphereStudio …
ElishaZhang Jun 9, 2022
ac0b88a
fix footer height
demonray Jun 9, 2022
1da4450
Merge branch 'dev-1.1.4' of github.com:WeDataSphere/DataSphereStudio …
demonray Jun 9, 2022
1cc1bff
remove :
demonray Jun 10, 2022
8822806
notice duration
demonray Jun 10, 2022
501afa7
change linkis version to 1.1.1.
jinyangrao Jun 10, 2022
01b7638
modify linkis dependecy message-scheduler to linkis-rpc.
jinyangrao Jun 10, 2022
1c2bff2
api service bug fix.
jinyangrao Jun 10, 2022
c132b83
Modify execution parameter variables.
jinyangrao Jun 10, 2022
f2f3e4c
Fix the problem that appconn execution engine status does not flip.
jinyangrao Jun 10, 2022
e9b6791
The cookie key value is set to bdp-user-ticket-id.
jinyangrao Jun 10, 2022
fe5ec7f
modify wds.linkis.test.mode=false.
jinyangrao Jun 10, 2022
4d9f974
readonly flow without lock
demonray Jun 10, 2022
16c398c
readonly flow without lock
demonray Jun 10, 2022
5c015a3
readonly flow without edit lock
demonray Jun 10, 2022
aee9c41
Merge pull request #823 from JinyangRao/master
liuyou2 Jun 10, 2022
eb71b77
display none
demonray Jun 10, 2022
31458fa
remove nocice msg padding
demonray Jun 13, 2022
a6a4bc1
unsave tips
demonray Jun 13, 2022
22748d4
update dml
HmhWz Jun 13, 2022
368f01b
unsave icon
demonray Jun 14, 2022
60a9921
presto icon
demonray Jun 14, 2022
5bd307a
line height
demonray Jun 14, 2022
7f954e8
超过5000 提示
demonray Jun 14, 2022
f3b934f
debug problems fixed with dolphinscheduler.
HmhWz Jun 14, 2022
c6db46e
Merge branch 'dev-1.1.4' of https://github.com/WeDataSphere/DataSpher…
HmhWz Jun 14, 2022
dbbe8d9
add linkis_version property for dolphinscheduler.
HmhWz Jun 15, 2022
f7083d8
auto save empty tips
demonray Jun 15, 2022
a0775df
load All appconns when orc server and workflow server start
ElishaZhang Jun 15, 2022
a9c883c
Merge branch 'dev-1.1.4' of github.com:WeDataSphere/DataSphereStudio …
ElishaZhang Jun 15, 2022
71e695a
rm scriptis guide
demonray Jun 15, 2022
18bfb2c
Merge branch 'dev-1.1.4' of github.com:WeDataSphere/DataSphereStudio …
demonray Jun 15, 2022
75b6ada
guide link
demonray Jun 15, 2022
8e9694a
open thirty node params
demonray Jun 15, 2022
1eb849a
delete davinci.sql, add update sql for v1.0.1 upgrade to v1.1.0.
HmhWz Jun 15, 2022
ea9a96e
Merge branch 'dev-1.1.4' of https://github.com/WeDataSphere/DataSpher…
HmhWz Jun 15, 2022
ec6d291
params for updateAppConnNode
demonray Jun 16, 2022
2d9b983
Merge branch 'dev-1.1.4' of github.com:WeDataSphere/DataSphereStudio …
demonray Jun 16, 2022
3addd16
Delete default appconn installation in install.sh and create a new st…
zqburde Jun 16, 2022
b9b2d29
Merge remote-tracking branch 'origin/dev-1.1.4' into dev-1.1.4
zqburde Jun 16, 2022
8fcabd3
add global_run_date variable for dolphinscheduler.
HmhWz Jun 16, 2022
3018236
Merge branch 'dev-1.1.4' of https://github.com/WeDataSphere/DataSpher…
HmhWz Jun 16, 2022
4053479
fix bugs
demonray Jun 16, 2022
26a7b42
Merge branch 'dev-1.1.4' of github.com:WeDataSphere/DataSphereStudio …
demonray Jun 16, 2022
48a4c82
fix directory show
demonray Jun 16, 2022
0c30f6f
Optimize the compilation of DSS front-web.
wushengyeyouya Jun 16, 2022
b962bea
Merge remote-tracking branch 'origin/dev-1.1.4' into dev-1.1.4
wushengyeyouya Jun 16, 2022
aeac776
update init.sql. And add getOrCreateOptionalStandard() for DolphinSch…
HmhWz Jun 16, 2022
10415ad
running task log
demonray Jun 17, 2022
2f76eac
Merge branch 'dev-1.1.4' of github.com:WeDataSphere/DataSphereStudio …
demonray Jun 17, 2022
6506ffa
Merge branch 'dev-1.1.4' of https://github.com/WeDataSphere/DataSpher…
HmhWz Jun 17, 2022
dcba815
change watermark
demonray Jun 17, 2022
2620eeb
job type list
demonray Jun 17, 2022
ad10073
Update README-ZH.md
wushengyeyouya Jun 17, 2022
7f5fdad
Update README.md
wushengyeyouya Jun 17, 2022
21dbd32
add help link
demonray Jun 17, 2022
2d67d6a
Update README.md
wushengyeyouya Jun 17, 2022
a752466
Update README-ZH.md
wushengyeyouya Jun 17, 2022
d5c888b
修改样式
demonray Jun 17, 2022
5d8babb
Merge branch 'dev-1.1.4' of https://github.com/WeDataSphere/DataSpher…
HmhWz Jun 17, 2022
f84f092
remove special appconn name in dss.
HmhWz Jun 20, 2022
9664814
revert appconn init update
ElishaZhang Jun 20, 2022
8c9ddd4
Merge branch 'dev-1.1.4' of github.com:WeDataSphere/DataSphereStudio …
ElishaZhang Jun 20, 2022
8692ff7
fix style
demonray Jun 20, 2022
97a1ffc
Merge branch 'dev-1.1.4' of github.com:WeDataSphere/DataSphereStudio …
demonray Jun 20, 2022
faa521e
fix style
demonray Jun 20, 2022
8d6ec34
update appconn init.sql
HmhWz Jun 20, 2022
1b99c45
Merge branch 'dev-1.1.4' of https://github.com/WeDataSphere/DataSpher…
HmhWz Jun 20, 2022
4e1bda5
update appconn init.sql
HmhWz Jun 20, 2022
b6c060a
update appconn init.sql
HmhWz Jun 21, 2022
27b88eb
update dml
HmhWz Jun 21, 2022
39beddc
modify config to scheduler appconn.
HmhWz Jun 21, 2022
46cf6c2
delete redundant config.
HmhWz Jun 21, 2022
10acd21
Optimize the config.sh.
wushengyeyouya Jun 21, 2022
467be69
Merge remote-tracking branch 'origin/dev-1.1.4' into dev-1.1.4
wushengyeyouya Jun 21, 2022
51a78ff
update appconn init.sql
HmhWz Jun 21, 2022
ebef7bd
打包分支信息
demonray Jun 21, 2022
f648b2c
Merge branch 'dev-1.1.4' of github.com:WeDataSphere/DataSphereStudio …
demonray Jun 21, 2022
9a8331d
faq link config
demonray Jun 21, 2022
d58be7f
状态判断
demonray Jun 21, 2022
9c6db9b
version
demonray Jun 21, 2022
15f9dfb
Fix the bug that when creating a workflow, the DSSProjectId in db wil…
wushengyeyouya Jun 21, 2022
d27bb70
Merge remote-tracking branch 'origin/dev-1.1.4' into dev-1.1.4
wushengyeyouya Jun 21, 2022
c7f5b72
fix next step
demonray Jun 22, 2022
81d530a
Fix the bug that when creating a project failed, delete the created p…
wushengyeyouya Jun 22, 2022
5a492c7
Merge remote-tracking branch 'origin/dev-1.1.4' into dev-1.1.4
wushengyeyouya Jun 22, 2022
dbf4f72
fix the bug the project name limit 150 bit when creat project, and re…
yuankang134 Jun 22, 2022
e4bf8c5
Add the ability of supporting flowName and flowId to RefCopyOperation…
wushengyeyouya Jun 22, 2022
8e43e4d
Merge remote-tracking branch 'origin/dev-1.1.4' into dev-1.1.4
wushengyeyouya Jun 22, 2022
5cfabca
click node should not change
demonray Jun 23, 2022
2343991
fix style
demonray Jun 23, 2022
c29093b
modify dss_start_all.sh
ElishaZhang Jun 23, 2022
a5e8428
Merge branch 'dev-1.1.4' of github.com:WeDataSphere/DataSphereStudio …
ElishaZhang Jun 23, 2022
c54c2d3
hide db/tb detail
demonray Jun 23, 2022
a50e780
Merge branch 'dev-1.1.4' of github.com:WeDataSphere/DataSphereStudio …
demonray Jun 23, 2022
61772b0
put back APIservice
demonray Jun 23, 2022
5c84d52
make admin user has all appconn priv when create workspace.
HmhWz Jun 23, 2022
efcdb5c
Merge branch 'dev-1.1.4' of https://github.com/WeDataSphere/DataSpher…
HmhWz Jun 23, 2022
492443c
add debug_port for all service_start.sh
HmhWz Jun 23, 2022
935901f
make scriptis entrance always on page top.
HmhWz Jun 23, 2022
74eef01
remove visualis appconn.
HmhWz Jun 23, 2022
fa3d275
Add configuration properties guide.sync.model in dss-guide-server.pro…
yuankang134 Jun 24, 2022
0484fcc
Add configuration properties guide.sync.model in dss-guide-server.pro…
yuankang134 Jun 24, 2022
3c4742c
Fix the bug that the lower DolphinScheduler versions will block the t…
wushengyeyouya Jun 24, 2022
f1a88b1
Merge remote-tracking branch 'origin/dev-1.1.4' into dev-1.1.4
wushengyeyouya Jun 24, 2022
72bc2c8
jsonchange status is wrong when double click node
demonray Jun 24, 2022
0af9a58
Merge branch 'dev-1.1.4' of github.com:WeDataSphere/DataSphereStudio …
demonray Jun 24, 2022
5814a01
change active status when close tab
demonray Jun 24, 2022
7d3ae8e
fix error tips
demonray Jun 24, 2022
81e13c9
modify dss_start_all.sh
ElishaZhang Jun 24, 2022
33a50a9
Merge branch 'dev-1.1.4' of github.com:WeDataSphere/DataSphereStudio …
ElishaZhang Jun 24, 2022
840a297
Optimize the startup for orchestrator-server and workflow-server sinc…
wushengyeyouya Jun 24, 2022
5b30490
Optimize the dss-start-all.sh.
wushengyeyouya Jun 24, 2022
57f2ec7
Merge remote-tracking branch 'origin/dev-1.1.4' into dev-1.1.4
wushengyeyouya Jun 24, 2022
4d90232
fix the bug that nullpointexception in dataapiservice when fetch resu…
wushengyeyouya Jun 24, 2022
3bf84c0
fix the bug that nullpointexception in dataapiservice when fetch resu…
wushengyeyouya Jun 24, 2022
0c92f5e
The exception cannot be caught because the HTTP status code need to b…
HmhWz Jun 24, 2022
b2379e8
Optimize init sql and add default exportResEnable
zqburde Jun 24, 2022
a2511d9
Merge branch 'dev-1.1.4' of https://github.com/WeDataSphere/DataSpher…
HmhWz Jun 24, 2022
2f000ca
fix error tips
demonray Jun 27, 2022
50bbc20
Merge branch 'dev-1.1.4' of github.com:WeDataSphere/DataSphereStudio …
demonray Jun 27, 2022
a4987f2
fixed bug and update jpb.desc validate to limit 5000
yuankang134 Jun 27, 2022
d55e6ba
export table enable
demonray Jun 27, 2022
a44beb5
上报控制
demonray Jun 27, 2022
a4b65ea
1. Fix bug deprecated jersey annotation
zqburde Jun 27, 2022
b5edace
Merge remote-tracking branch 'origin/dev-1.1.4' into dev-1.1.4
zqburde Jun 27, 2022
2856c07
update upgrade sql.
HmhWz Jun 28, 2022
d83e358
Fix dss_dml.sql bug
zqburde Jun 28, 2022
11dfcac
Merge remote-tracking branch 'origin/dev-1.1.4' into dev-1.1.4
zqburde Jun 28, 2022
e437a87
fix jobtype build error when using jenkins.
HmhWz Jun 28, 2022
be74f98
Merge branch 'dev-1.1.4' of https://github.com/WeDataSphere/DataSpher…
HmhWz Jun 28, 2022
3bb751a
dss appconn sendemail bug fix.
YennyQ Jun 28, 2022
5e43518
remove useless dependency.
wushengyeyouya Jun 28, 2022
b046748
Merge remote-tracking branch 'origin/dev-1.1.4' into dev-1.1.4
wushengyeyouya Jun 28, 2022
1f6a3ad
fix the bug that create contextId failed will not throws exception.
wushengyeyouya Jun 29, 2022
a76b9b0
Optimize the getAppConnNodeUrl in workflow server to bring flowId inf…
wushengyeyouya Jun 29, 2022
fb08777
fix scroll & label text
demonray Jun 30, 2022
ef0db2a
modify label text
demonray Jun 30, 2022
bb62644
Merge pull request #826 from WeDataSphere/dev-1.1.4
wushengyeyouya Jun 30, 2022
0a7f02a
Merge pull request #839 from WeDataSphere/master
zqburde Jun 30, 2022
1824aa5
params flow id
demonray Jun 30, 2022
518f749
solve conflicts
zqburde Jun 30, 2022
7b1eff0
Fix unsolved conflict.
zqburde Jun 30, 2022
ee91cec
readonly mode donot need toolbar
demonray Jul 1, 2022
df29776
Merge branch 'dev-1.1.4'
zqburde Jul 1, 2022
55c0638
Merge pull request #854 from WeDataSphere/master
zqburde Jul 1, 2022
7c0e1c4
Merge pull request #843 from WeBankFinTech/dev-1.1.0
zqburde Jul 1, 2022
c2c7f1f
Bump junit from 4.12 to 4.13.1 in /dss-apps/dss-scriptis-server
dependabot[bot] Jul 1, 2022
1d45815
Bump junit in /dss-apps/dss-data-api/dss-api-sql-template
dependabot[bot] Jul 1, 2022
5dc626d
Bump fastjson from 1.2.70 to 1.2.83 in /dss-apps/dss-scriptis-server
dependabot[bot] Jul 1, 2022
7a7ba54
Update the compatibility of integrated components.
wushengyeyouya Jul 1, 2022
a35845e
Merge remote-tracking branch 'origin/master'
wushengyeyouya Jul 1, 2022
dc9fe40
Merge pull request #856 from WeBankFinTech/dependabot/maven/dss-apps/…
zqburde Jul 1, 2022
6aaed46
Merge pull request #857 from WeBankFinTech/dependabot/maven/dss-apps/…
zqburde Jul 1, 2022
996722d
Merge pull request #859 from WeBankFinTech/dependabot/maven/dss-apps/…
zqburde Jul 1, 2022
01744f7
Fix the bug that the DSS workflow json won't increase version when pu…
wushengyeyouya Jul 4, 2022
5558545
sendemail顶层优化,支持多种报表类型
Jul 4, 2022
29c5945
Fix sql annotation and optimize README-ZH doc
zqburde Jul 4, 2022
0b28404
Merge remote-tracking branch 'origin/dev-1.1.4' into dev-1.1.4
Jul 5, 2022
53c98eb
update regex ignore /r/n
yuankang134 Jul 5, 2022
87508be
Merge remote-tracking branch 'origin/dev-1.1.4' into dev-1.1.4
yuankang134 Jul 5, 2022
834ea4a
Merge remote-tracking branch 'origin/dev-1.1.4' into dev-1.1.4
zqburde Jul 8, 2022
53b00b7
Optimize init sql to adapt all version mysql.
zqburde Jul 8, 2022
89d22b8
Update README and README-ZH doc.
zqburde Jul 8, 2022
ee6c009
Modify fastjson version to 1.2.83
zqburde Jul 8, 2022
738df8c
Merge dev-1.1.4 to master
zqburde Jul 8, 2022
fafb87e
Merge pull request #890 from WeDataSphere/dev-1.1.4
zqburde Jul 11, 2022
268cb6b
Merge pull request #891 from WeBankFinTech/branch-1.1.0
wushengyeyouya Jul 11, 2022
d30de2c
Bump parse-url from 6.0.0 to 6.0.2 in /web
dependabot[bot] Jul 11, 2022
3d78c4d
Merge branch 'master' into master
YennyQ Jul 12, 2022
53e8035
Modify dss installation link.
zqburde Jul 15, 2022
8fe0ce7
Merge pull request #3 from WeDataSphere/dev-1.1.4
zqburde Jul 15, 2022
c47e00d
Merge pull request #898 from WeDataSphere/master
wushengyeyouya Jul 15, 2022
d167211
fix:type conversion exception
ruY9527 Jul 16, 2022
1dc9d99
数据服务入口
demonray Jul 18, 2022
8d53b7f
Merge pull request #4 from WeDataSphere/fix-api-service
zqburde Jul 18, 2022
e926fd7
Merge pull request #905 from WeDataSphere/master
wushengyeyouya Jul 18, 2022
77a5547
Merge pull request #900 from ruY9527/dev-1.1.0-dolphinscheduler-sso
zqburde Jul 19, 2022
d282d24
Merge pull request #907 from WeBankFinTech/dev-1.1.0
wushengyeyouya Jul 19, 2022
f74dcd3
Merge pull request #842 from YennyQ/master
wushengyeyouya Jul 21, 2022
768a0c6
Merge pull request #893 from WeBankFinTech/dependabot/npm_and_yarn/we…
demonray Jul 22, 2022
5a04fc0
Bump moment from 2.29.1 to 2.29.4 in /web
dependabot[bot] Jul 22, 2022
cdb1829
Merge pull request #892 from WeBankFinTech/dependabot/npm_and_yarn/we…
demonray Jul 22, 2022
71e5f5d
Fix the use linkis table (#945)
jackxu2011 Aug 29, 2022
d8a8515
Feat remove linkis annotations (#943)
jackxu2011 Aug 29, 2022
82f6e8f
feat: Remove_ Ind filtering conditions in create table and import hive
ruY9527 Sep 20, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
guide sync
yuankang134 committed Jun 1, 2022
commit 78789d63539e7b0edd8dc89a7d2f6758fd42db2d
Original file line number Diff line number Diff line change
@@ -165,7 +165,7 @@ private GuideChapter buildChapterParams(Map<String, Map<String, String>> map, Ma
logger.info("GuideChapter文件路径:"+ mdFilePath);
String content = MdAnalysis.readMd(mdFilePath);
guideChapter.setContent(content);
guideChapter.setContentHtml(MdAnalysis.markdown2Html(mdFilePath));
guideChapter.setContentHtml(MdAnalysis.changeHtmlTagA(MdAnalysis.markdown2Html(mdFilePath)));
}
guideChapter.setUpdateTime(new Date());
guideChapter.setCreateTime(new Date());
Original file line number Diff line number Diff line change
@@ -125,7 +125,7 @@ private GuideContent buildContentParams(Map<String, Map<String, String>> map, Ma
if (!StringUtils.isEmpty(mdFilePath)) {
String content = MdAnalysis.readMd(mdFilePath);
guideContent.setContent(content);
guideContent.setContentHtml(MdAnalysis.markdown2Html(mdFilePath));
guideContent.setContentHtml(MdAnalysis.changeHtmlTagA(MdAnalysis.markdown2Html(mdFilePath)));
}
guideContent.setType(type);
guideContent.setTitle(map.get(tag.getKey()).get("title"));
Original file line number Diff line number Diff line change
@@ -25,6 +25,8 @@ public class MdAnalysis {

private final static Pattern ATTR_PATTERN2 = Pattern.compile("(?<=\\()(.+?)(?=\\))", Pattern.CASE_INSENSITIVE);

private final static Pattern ATTR_PATTERN1 = Pattern.compile("<a[^>]*href=(\"([^\"]*)\"|'([^']*)'|([^\\s>]*))[^>]*>");

private static int ROOT_COUNT = 0;

private static int Y = 0;
@@ -62,7 +64,7 @@ public static String readMd(String filePath) {
try {
fr.close();
} catch (IOException e) {
logger.error(e.getMessage());
throw new RuntimeException(e);
}
}
return sb.toString();
@@ -188,6 +190,25 @@ public static String markdown2Html(String filePath) throws IOException {
return renderer.render(document);
}

public static String changeHtmlTagA(String htmlContent)throws IOException{
if(StringUtils.isEmpty(htmlContent)){
return htmlContent;
}
//判断是否含有<a>标签
if(!htmlContent.contains("<a href")){
return htmlContent;
}
Matcher matcher = ATTR_PATTERN1.matcher(htmlContent);
String tagA = "";
String href = "";
if (matcher.find()) {
tagA = matcher.group(0);
href = matcher.group(2);
}
String replaceContent = htmlContent.replace(tagA, "<a target=\"_blank\" href = "+"\"/_book" + href +"\"" +">");
return replaceContent;
}

private static String matcherDir(String line) {
Matcher matcher = ATTR_PATTERN2.matcher(line);
return matcher.find() == true ? matcher.group(1) : null;