diff --git a/.idea/GitCommitMessageStorage.xml b/.idea/GitCommitMessageStorage.xml new file mode 100644 index 0000000..e4fd56a --- /dev/null +++ b/.idea/GitCommitMessageStorage.xml @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 29f6ae8..a9efd3a 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -85,6 +85,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.idea/misc.xml b/.idea/misc.xml index 1a46383..463551f 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -7,11 +7,6 @@ - diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..464630f --- /dev/null +++ b/Dockerfile @@ -0,0 +1,12 @@ +FROM alpine/java:17 + +WORKDIR /app + +RUN mkdir -p /app/server && mkdir -p /app/web + +COPY leopard-server/target/leopard-server-1.0.0.jar /app/server +COPY leopard-web/dist /app/web + +EXPOSE 9786 + +ENTRYPOINT [ "java", "-jar", "/app/server/leopard-server-1.0.0.jar", "--spring.profiles.active=image" ] diff --git a/leopard-server/leopard-server.iml b/leopard-server/leopard-server.iml deleted file mode 100644 index 20fc8ba..0000000 --- a/leopard-server/leopard-server.iml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/leopard-server/pom.xml b/leopard-server/pom.xml index 9065031..89ac7fc 100644 --- a/leopard-server/pom.xml +++ b/leopard-server/pom.xml @@ -6,7 +6,7 @@ com.lanyuanxiaoyao leopard - 1.0.0-SNAPSHOT + 1.0.0 leopard-server @@ -101,6 +101,14 @@ + + + package + + repackage + + + diff --git a/leopard-server/src/main/resources/application-image.yml b/leopard-server/src/main/resources/application-image.yml new file mode 100644 index 0000000..4a1fc2f --- /dev/null +++ b/leopard-server/src/main/resources/application-image.yml @@ -0,0 +1,4 @@ +spring: + web: + resources: + static-locations: file:/app/web diff --git a/leopard-server/src/main/resources/application.yml b/leopard-server/src/main/resources/application.yml index d703998..b7d2c86 100644 --- a/leopard-server/src/main/resources/application.yml +++ b/leopard-server/src/main/resources/application.yml @@ -1,5 +1,7 @@ server: port: 9786 + compression: + enabled: true spring: application: name: leopard-server @@ -14,4 +16,4 @@ spring: jpa: generate-ddl: true fenix: - print-banner: false \ No newline at end of file + print-banner: false diff --git a/leopard-web/src/util/amis.tsx b/leopard-web/src/util/amis.tsx index ada14d1..7a3cc7d 100644 --- a/leopard-web/src/util/amis.tsx +++ b/leopard-web/src/util/amis.tsx @@ -9,7 +9,7 @@ import {isEqual} from 'licia' export const commonInfo = { debug: isEqual(import.meta.env.MODE, 'development'), - baseUrl: 'http://localhost:9786', + baseUrl: isEqual(import.meta.env.MODE, 'development') ? 'http://localhost:9786' : '', } const __ = makeTranslator('zh') diff --git a/pom.xml b/pom.xml index 01a26ec..d085a7b 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.lanyuanxiaoyao leopard - 1.0.0-SNAPSHOT + 1.0.0 pom