diff --git a/.gitignore b/.gitignore index 8af7ad5..3685992 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,7 @@ # Logs *.log +**/logs/ # Env .env.local @@ -29,5 +30,5 @@ deploy/docker/.last-version # Build *.war *.jar -sql/ -docs.zip +sql/ +docs.zip diff --git a/deploy/docker/conf/application-docker.yml b/deploy/docker/conf/application-docker.yml index 16e0886..2889a84 100644 --- a/deploy/docker/conf/application-docker.yml +++ b/deploy/docker/conf/application-docker.yml @@ -2,7 +2,7 @@ server: port: 8095 redis: - host: 100.93.0.28 + host: host.docker.internal port: 6379 password: kaixinjiuhao timeout: 30000 @@ -17,12 +17,12 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource db1: - url: jdbc:mysql://100.93.0.28:3306/xiaoqu_comples_d?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true&allowPublicKeyRetrieval=true + url: jdbc:mysql://host.docker.internal:3306/xiaoqu_comples_d?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true&allowPublicKeyRetrieval=true username: root password: kaixinjiuhao driver-class-name: com.mysql.cj.jdbc.Driver db2: - url: jdbc:mysql://100.93.0.28:3306/xiaoqu_intellectual_d?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true&allowPublicKeyRetrieval=true + url: jdbc:mysql://host.docker.internal:3306/xiaoqu_intellectual_d?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true&allowPublicKeyRetrieval=true username: root password: kaixinjiuhao driver-class-name: com.mysql.cj.jdbc.Driver diff --git a/deploy/smartclean_full_dump_20260416.sql b/deploy/smartclean_full_dump_20260416.sql new file mode 100644 index 0000000..de74c16 --- /dev/null +++ b/deploy/smartclean_full_dump_20260416.sql @@ -0,0 +1,56 @@ +mysqldump: [Warning] Using a password on the command line interface can be insecure. +-- MySQL dump 10.13 Distrib 9.6.0, for macos15.7 (arm64) +-- +-- Host: 127.0.0.1 Database: xiaoqu_comples_d +-- ------------------------------------------------------ +-- Server version 9.6.0 + +/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; +/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; +/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; +/*!50503 SET NAMES utf8mb4 */; +/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; +/*!40103 SET TIME_ZONE='+00:00' */; +/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; +/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; +/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; +/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; + +-- +-- Current Database: `xiaoqu_comples_d` +-- + +CREATE DATABASE /*!32312 IF NOT EXISTS*/ `xiaoqu_comples_d` /*!40100 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci */ /*!80016 DEFAULT ENCRYPTION='N' */; + +USE `xiaoqu_comples_d`; + +-- +-- Table structure for table `accessory` +-- + +DROP TABLE IF EXISTS `accessory`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!50503 SET character_set_client = utf8mb4 */; +CREATE TABLE `accessory` ( + `id` bigint NOT NULL AUTO_INCREMENT, + `create_id` bigint DEFAULT '0' COMMENT '创建id', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `modify_id` bigint DEFAULT '0' COMMENT '修改id', + `modify_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间', + `soft_delete` int DEFAULT '0' COMMENT '数据状态', + `stock_no` varchar(32) DEFAULT '' COMMENT '库存编号', + `product_no` varchar(32) DEFAULT '' COMMENT '生成编号', + `show_status` int DEFAULT '0' COMMENT '显示状态', + `materiel_id` bigint DEFAULT '0' COMMENT '物料id', + `life_count` int DEFAULT '0' COMMENT '设计寿命', + `name` varchar(64) DEFAULT '' COMMENT '备件名称', + `code_status` int DEFAULT '0' COMMENT '是否有编码', + `order_by` int DEFAULT '99' COMMENT '排序', + PRIMARY KEY (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=22 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='备件'; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Dumping data for table `accessory` +-- + diff --git a/frontend/witcleansystem/.env.docker b/frontend/witcleansystem/.env.docker index 1db9fd8..50e4b64 100644 --- a/frontend/witcleansystem/.env.docker +++ b/frontend/witcleansystem/.env.docker @@ -1,4 +1,4 @@ //Docker模拟部署环境 NODE_ENV='production' VITE_APP_MODE='develop' -VITE_APP_API_ORIGIN = 'http://100.93.0.28:18095' +VITE_APP_API_ORIGIN = 'http://localhost:18095'