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

Feature #2331

Open
wants to merge 149 commits into
base: master
Choose a base branch
from
Open

Feature #2331

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
149 commits
Select commit Hold shift + click to select a range
9b66ec7
新增链路ID
shiyindaxiaojie Feb 25, 2023
cc32389
update
Feb 27, 2023
d8abda0
update
shiyindaxiaojie Mar 1, 2023
d73e78d
update
shiyindaxiaojie Mar 2, 2023
6289689
update
Mar 3, 2023
b825843
update
shiyindaxiaojie Mar 4, 2023
c4140d8
update
shiyindaxiaojie Mar 4, 2023
55145e0
update
shiyindaxiaojie Mar 4, 2023
7aeb43d
update
shiyindaxiaojie Mar 5, 2023
73a6f1f
Merge pull request #1 from shiyindaxiaojie/3.1.0
shiyindaxiaojie Mar 5, 2023
5ff60dd
update
shiyindaxiaojie Mar 5, 2023
94dc319
update
shiyindaxiaojie Mar 5, 2023
825a069
update
shiyindaxiaojie Mar 6, 2023
e9fc63f
update
Mar 7, 2023
2e03c65
update
shiyindaxiaojie Mar 7, 2023
8dfe925
update
Mar 9, 2023
90761f1
change group id for sonatype
shiyindaxiaojie Mar 12, 2023
324f95f
fixed tracing link
Mar 16, 2023
8a11437
update
shiyindaxiaojie Mar 16, 2023
9eec8a0
fixed tracing link
Mar 17, 2023
e70695a
update
shiyindaxiaojie Mar 19, 2023
9937a3e
update
Mar 20, 2023
9fc8d19
update
Mar 21, 2023
d3085c6
update
shiyindaxiaojie Mar 23, 2023
19184a5
update
Mar 28, 2023
18b8a6f
update
shiyindaxiaojie Mar 28, 2023
9f8e0cc
update
Mar 29, 2023
108fd6f
update
shiyindaxiaojie Mar 29, 2023
4b77801
update
Mar 30, 2023
9f38800
update
shiyindaxiaojie Mar 30, 2023
d515a61
update
Mar 31, 2023
09c4a1b
update
shiyindaxiaojie Mar 31, 2023
dff27cc
update
shiyindaxiaojie Apr 2, 2023
02f1e4c
update
shiyindaxiaojie Apr 2, 2023
6cd4fbc
update
shiyindaxiaojie Apr 2, 2023
f26dbdb
update
Apr 3, 2023
e1d01fe
update
shiyindaxiaojie Apr 3, 2023
91cb5d5
update
Apr 4, 2023
c2127af
update
shiyindaxiaojie Apr 5, 2023
4e5b90e
update
Apr 6, 2023
9620291
update
shiyindaxiaojie Apr 6, 2023
65d3c6b
update
shiyindaxiaojie Apr 8, 2023
9a23393
update
shiyindaxiaojie Apr 9, 2023
a7784c8
233
shiyindaxiaojie Apr 9, 2023
7661a20
update
shiyindaxiaojie Apr 10, 2023
3e717d9
update
shiyindaxiaojie Apr 10, 2023
f717a0d
update
Apr 11, 2023
5584e96
update
shiyindaxiaojie Apr 16, 2023
7e7630a
update
shiyindaxiaojie Apr 19, 2023
65816cf
update
shiyindaxiaojie Apr 20, 2023
4a8af05
Merge pull request #2 from shiyindaxiaojie/feature
shiyindaxiaojie Apr 23, 2023
a28c6ff
update
Apr 24, 2023
8e10733
update
Apr 25, 2023
e0fd746
update
Apr 25, 2023
0d4fa84
update
Apr 25, 2023
eebe8f1
update
Apr 25, 2023
6270c2b
update
Apr 25, 2023
48a6118
update
Apr 25, 2023
ef35722
update
Apr 25, 2023
da5d9a3
update
Apr 25, 2023
fe73f21
update
Apr 25, 2023
01a702f
update
shiyindaxiaojie Apr 25, 2023
ca33fad
Merge remote-tracking branch 'origin/feature' into 3.1.x
shiyindaxiaojie Apr 25, 2023
45a4e2c
update
Apr 26, 2023
2aa09b0
update
Apr 26, 2023
479a042
update once
Apr 26, 2023
39ad1a5
update once
Apr 26, 2023
9f220c2
update
Apr 26, 2023
d2137ff
update sonar
shiyindaxiaojie Apr 26, 2023
a4c70fe
update
May 1, 2023
6469e2f
update
shiyindaxiaojie May 31, 2023
af0dc8e
fuck
shiyindaxiaojie Jun 1, 2023
fcb96a6
update
shiyindaxiaojie Jun 2, 2023
945f14e
update
shiyindaxiaojie Jun 4, 2023
9ed0357
update
shiyindaxiaojie Jun 6, 2023
c7aaeb9
update
Jun 8, 2023
752bd2e
add mobile and web
Jun 8, 2023
b398dc9
update
shiyindaxiaojie Jun 9, 2023
37f9a9b
[maven-release-plugin] rollback the release of v3.2.0
shiyindaxiaojie Jun 11, 2023
9d49e63
update
shiyindaxiaojie Jun 11, 2023
32865eb
update
shiyindaxiaojie Jun 11, 2023
d944977
[maven-release-plugin] prepare release v3.2.0
shiyindaxiaojie Jun 11, 2023
fa76940
update
shiyindaxiaojie Jun 11, 2023
2abd8bb
update
shiyindaxiaojie Jun 11, 2023
3ea65fa
update
shiyindaxiaojie Jun 18, 2023
49b87cc
update
Jun 19, 2023
60a072d
update
shiyindaxiaojie Jun 24, 2023
c6381be
update
shiyindaxiaojie Jun 24, 2023
48d3278
update
Jun 25, 2023
976f8f2
update
shiyindaxiaojie Jun 25, 2023
4394b7d
update
Jun 26, 2023
4c07ed3
update
shiyindaxiaojie Jun 26, 2023
19bb972
Merge branch '3.3.x' into feature
shiyindaxiaojie Jun 27, 2023
3f3f079
Merge pull request #4 from shiyindaxiaojie/feature
shiyindaxiaojie Jun 27, 2023
b463b6c
update
Jun 27, 2023
9ba5f97
Merge remote-tracking branch 'origin/feature' into feature
Jun 27, 2023
d407a4b
Merge pull request #5 from shiyindaxiaojie/feature
shiyindaxiaojie Jun 27, 2023
224d7bb
update
shiyindaxiaojie Jun 29, 2023
24a214c
update
shiyindaxiaojie Jun 29, 2023
6196aca
Merge remote-tracking branch 'origin/feature' into 3.3.x
shiyindaxiaojie Jun 29, 2023
8b48d11
update
shiyindaxiaojie Jun 30, 2023
0d1fdc7
update
shiyindaxiaojie Jul 2, 2023
26f0094
fixed
Jul 12, 2023
d4cb739
fixed
Jul 12, 2023
09e1a80
fixed
Jul 12, 2023
12b3847
fixed
Jul 12, 2023
eed0300
fixed
Jul 12, 2023
a30fdf5
fixed
Jul 13, 2023
2f10472
update README.md
Jul 13, 2023
6af6fa1
update README.md
Jul 25, 2023
08da01d
fixed
Sep 8, 2023
5627ca3
fixed
Sep 8, 2023
391b5e6
test
Sep 8, 2023
d747aa0
fixed
Sep 8, 2023
c184445
fixed
shiyindaxiaojie Oct 11, 2023
782060a
fixed
shiyindaxiaojie Oct 11, 2023
75a0395
fixed
shiyindaxiaojie Oct 13, 2023
4dc70da
[maven-release-plugin] prepare release v3.3.1
shiyindaxiaojie Oct 13, 2023
e2d48e4
[maven-release-plugin] prepare for next development iteration
shiyindaxiaojie Oct 13, 2023
6f9ed75
fixed
shiyindaxiaojie Oct 15, 2023
1f002ae
fixed
shiyindaxiaojie Oct 16, 2023
6ca8b0c
fixed
shiyindaxiaojie Oct 16, 2023
182598c
fixed
shiyindaxiaojie Oct 16, 2023
7dc8cea
update
Jan 26, 2024
657d0df
Merge pull request #11 from shiyindaxiaojie/feature
shiyindaxiaojie Jan 26, 2024
5f1a704
update
Jan 26, 2024
b5df66c
[maven-release-plugin] prepare release v3.3.2
Jan 26, 2024
1d82054
[maven-release-plugin] prepare for next development iteration
Jan 26, 2024
c6b9c97
update
Jan 26, 2024
2788b7b
[maven-release-plugin] prepare release v3.3.2
Jan 26, 2024
10c31a3
[maven-release-plugin] prepare for next development iteration
Jan 26, 2024
3cca675
update
Jan 29, 2024
f112a07
Merge remote-tracking branch 'origin/main' into feature
Jan 29, 2024
10edc37
add jira software support
Mar 28, 2024
054886a
add jira software support
Apr 19, 2024
7072239
add jira software support
Apr 22, 2024
64c2c46
add jira software support
Apr 23, 2024
4ec9712
add jira software support
May 6, 2024
35fe065
add jira software support
May 10, 2024
efd5a82
[maven-release-plugin] prepare release v3.4.0
May 10, 2024
a23001e
[maven-release-plugin] prepare for next development iteration
May 10, 2024
df666e8
add jira software support
May 10, 2024
5397573
add jira software support
May 10, 2024
59d52a5
add jira software support
May 10, 2024
6b2df46
add jira software support
May 11, 2024
5383a26
update
Aug 20, 2024
346e52c
update
Aug 27, 2024
b2afeac
update
Aug 28, 2024
24b2eff
fixed
Sep 5, 2024
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
update
  • Loading branch information
shiyindaxiaojie committed Mar 2, 2023
commit d73e78d47779eb482438efb8146c0b7b647f4f08
23 changes: 8 additions & 15 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,20 +1,13 @@
FROM maven:3.8.4-openjdk-8 as mavenrepo
FROM tomcat:8.5.78-jdk8

WORKDIR /app
COPY cat-alarm cat-alarm
COPY cat-consumer cat-consumer
COPY cat-hadoop cat-hadoop
COPY cat-client cat-client
COPY cat-core cat-core
COPY cat-home cat-home
COPY pom.xml pom.xml
RUN mvn clean package -DskipTests

FROM tomcat:8.5.41-jre8-alpine
ENV TZ=Asia/Shanghai
COPY --from=mavenrepo /app/cat-home/target/cat-home.war /usr/local/tomcat/webapps/cat.war
COPY cat-home/target/cat-home.war /usr/local/tomcat/webapps/cat.war
COPY docker/client.xml /data/appdatas/cat/client.xml
COPY docker/client.sh client.sh
COPY docker/datasources.xml /data/appdatas/cat/datasources.xml
COPY docker/datasources.sh datasources.sh
RUN sed -i "s/port=\"8080\"/port=\"8080\"\ URIEncoding=\"utf-8\"/g" $CATALINA_HOME/conf/server.xml && chmod +x datasources.sh
RUN sed -i "s/port=\"8080\"/port=\"8080\"\ URIEncoding=\"utf-8\"/g" $CATALINA_HOME/conf/server.xml \
&& chmod +x datasources.sh \
&& chmod +x client.sh

CMD ["/bin/sh", "-c", "./datasources.sh && catalina.sh run"]
CMD ["/bin/sh", "-c", "./datasources.sh", "./client.sh", "catalina.sh run"]
2 changes: 2 additions & 0 deletions docker/client.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/usr/bin/env bash
sed -i "s/SERVER_URL/${SERVER_URL}/g" /data/appdatas/cat/client.xml;
2 changes: 1 addition & 1 deletion docker/client.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<config mode="client">
<servers>
<server ip="127.0.0.1" port="2280" http-port="8080"/>
<server ip="SERVER_URL" port="2280" http-port="8080"/>
</servers>
</config>