From 91b12bb0c96698a8a9c7a89fe84f933b4fc079cb Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 19 八月 2025 15:45:03 +0800
Subject: [PATCH] docker基础配置
---
Dockerfile | 53 ++++++++++++++++++++++++++
ruoyi-admin/src/main/java/com/ruoyi/PlusCodeGenerator.java | 6 +-
README.md | 31 +++++++++++++++
3 files changed, 87 insertions(+), 3 deletions(-)
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..3a57541
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,53 @@
+FROM maven:3.8.8-eclipse-temurin-17 AS builder
+
+# 璁剧疆宸ヤ綔鐩綍
+WORKDIR /app
+
+# 浼犲叆鏋勫缓鍙傛暟锛堢敤鏉ユ墦鐮寸紦瀛橈級
+ARG TIMESTAMP=unknown
+RUN echo "Build timestamp: $TIMESTAMP"
+
+# 瀹夎 git
+RUN apt-get update && apt-get install -y git && rm -rf /var/lib/apt/lists/*
+
+# 瀹氫箟鏋勫缓鍙傛暟锛堢敤鎴峰悕銆佸瘑鐮併�佸垎鏀級
+ARG GIT_USER
+ARG GIT_PASS
+ARG GIT_REPO=http://114.132.189.42:9002/r/zd-after.git
+ARG GIT_BRANCH=master
+
+# 鍏嬮殕绉佹湁浠撳簱鎸囧畾鍒嗘敮
+RUN git clone -b ${GIT_BRANCH} http://${GIT_USER}:${GIT_PASS}@114.132.189.42:9002/r/zd-after.git zd-after
+
+# 杩涘叆椤圭洰骞跺鍒堕厤缃枃浠�
+WORKDIR /app/zd-after
+RUN cp ruoyi-admin/src/main/resources/application.yml.example \
+ ruoyi-admin/src/main/resources/application.yml
+
+RUN cp ruoyi-admin/src/main/resources/application-docker.yml.example \
+ ruoyi-admin/src/main/resources/application-docker.yml
+
+RUN cp ruoyi-admin/src/main/resources/logback.xml.example \
+ ruoyi-admin/src/main/resources/logback.xml
+
+# 鎵撳寘椤圭洰锛堣烦杩囨祴璇曪級
+RUN mvn clean package -DskipTests
+
+
+FROM openjdk:17-jdk-slim
+
+WORKDIR /app
+
+# 浠� builder 闃舵澶嶅埗缂栬瘧濂界殑 jar 鍖�
+COPY --from=builder /app/zd-after/ruoyi-admin/target/ruoyi-admin.jar app.jar
+
+RUN chmod 644 /app/app.jar
+
+# 鏆撮湶绔彛锛堥粯璁� 8080锛屽彲鍦� application.yml 閲岄厤缃級
+EXPOSE 7016
+
+# 鍚姩鍛戒护
+ENTRYPOINT ["java", "-jar", "/app/app.jar"]
+
+
+
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..54d5447
--- /dev/null
+++ b/README.md
@@ -0,0 +1,31 @@
+# 閮ㄧ讲鎸囧崡
+
+## 姝ラ 1: 杩涘叆椤圭洰鐩綍
+```bash
+cd /home/docker/project/zd-after
+```
+
+## 姝ラ 2: 鏋勫缓闀滃儚
+浣跨敤 `docker build` 鏋勫缓闀滃儚锛屽苟浼犲叆蹇呰鐨勬瀯寤哄弬鏁般��
+娉ㄦ剰锛氫互涓嬪懡浠や腑鐨勮处鍙峰拰瀵嗙爜闇�瑕佹浛鎹负瀹為檯鍊硷紝杩欓噷宸查殣钘忋��
+
+```bash
+docker build \
+ --build-arg GIT_USER=<your-username> \
+ --build-arg GIT_PASS=<your-password> \
+ --build-arg GIT_BRANCH=master \
+ --build-arg TIMESTAMP=$(date +%s) \
+ -t zd-after-app .
+```
+
+## 姝ラ 3: 鍚姩鏈嶅姟
+浣跨敤 `docker-compose` 鍚姩鏈嶅姟锛�
+
+```bash
+docker-compose up -d
+```
+
+## 澶囨敞
+- 璇风‘淇濆凡瀹夎 **Docker** 鍜� **Docker Compose**銆�
+- 璐﹀彿瀵嗙爜璇峰湪鎵ц鍛戒护鏃舵浛鎹负鐪熷疄鍊笺��
+- `TIMESTAMP` 鐢ㄤ簬鎵撶牬缂撳瓨锛岀‘淇濇瘡娆℃瀯寤烘椂閮芥媺鍙栨渶鏂颁唬鐮併��
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/PlusCodeGenerator.java b/ruoyi-admin/src/main/java/com/ruoyi/PlusCodeGenerator.java
index e6b381b..1c2cc8c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/PlusCodeGenerator.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/PlusCodeGenerator.java
@@ -27,7 +27,7 @@
public class PlusCodeGenerator {
// 鏁版嵁搴撻厤缃�
- private static final String DB_URL = "jdbc:postgresql://192.168.1.35:5432/ruoyi-zd";
+ private static final String DB_URL = "jdbc:postgresql://127.0.0.1:5433/zd-02";
private static final String DB_USERNAME = "postgres";
private static final String DB_PASSWORD = "123456";
@@ -38,8 +38,8 @@
public static void main(String[] args) {
String projectPath = System.getProperty("user.dir"); // 鑾峰彇椤圭洰鏍硅矾寰�
String path = "main-business"; // 妯″潡鍚嶇О
- String table = "input_inventory_record,output_inventory_record,inventory_summary"; // 琛ㄥ悕锛屽涓〃閫楀彿闅斿紑
- String author = "chenhj";
+ String table = "equipment_usage_detail"; // 琛ㄥ悕,澶氫釜琛ㄩ�楀彿闅斿紑
+ String author = "ld";
// 浠ｇ爜杈撳嚭璺緞閰嶇疆
String outputBasePath = Paths.get(projectPath, path, "src", "main", "java").toString();
--
Gitblit v1.9.3