From 6b37e2f4e29cbe1c8dca6021752b9307642e481e Mon Sep 17 00:00:00 2001 From: Mrking <782276617@qq.com> Date: Sun, 30 Jun 2024 17:57:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/hangtag/module/biz/framework/web/package-info.java | 4 ---- .../hangtag/module/{biz => oms}/framework/package-info.java | 2 +- .../framework/web/config/ProductWebConfiguration.java | 2 +- .../cn/hangtag/module/oms/framework/web/package-info.java | 4 ++++ .../java/cn/hangtag/module/{biz => oms}/package-info.java | 2 +- hangtag-server/src/test/java/cn/hangtag/ProjectReactor.java | 4 ++-- hangtag-ui/.env | 2 +- pom.xml | 2 +- script/docker/docker-compose.yml | 2 +- script/docker/docker.env | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/biz/framework/web/package-info.java rename hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/{biz => oms}/framework/package-info.java (66%) rename hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/{biz => oms}/framework/web/config/ProductWebConfiguration.java (91%) create mode 100644 hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/framework/web/package-info.java rename hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/{biz => oms}/package-info.java (89%) diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/biz/framework/web/package-info.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/biz/framework/web/package-info.java deleted file mode 100644 index 0b08053..0000000 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/biz/framework/web/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * product 模块的 web 配置 - */ -package cn.hangtag.module.biz.framework.web; diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/biz/framework/package-info.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/framework/package-info.java similarity index 66% rename from hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/biz/framework/package-info.java rename to hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/framework/package-info.java index 231991b..8377e40 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/biz/framework/package-info.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/framework/package-info.java @@ -3,4 +3,4 @@ * * @author 芋道源码 */ -package cn.hangtag.module.biz.framework; +package cn.hangtag.module.oms.framework; diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/biz/framework/web/config/ProductWebConfiguration.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/framework/web/config/ProductWebConfiguration.java similarity index 91% rename from hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/biz/framework/web/config/ProductWebConfiguration.java rename to hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/framework/web/config/ProductWebConfiguration.java index baa0ae0..8564c81 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/biz/framework/web/config/ProductWebConfiguration.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/framework/web/config/ProductWebConfiguration.java @@ -1,4 +1,4 @@ -package cn.hangtag.module.biz.framework.web.config; +package cn.hangtag.module.oms.framework.web.config; import cn.hangtag.framework.swagger.config.HangtagSwaggerAutoConfiguration; import org.springdoc.core.GroupedOpenApi; diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/framework/web/package-info.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/framework/web/package-info.java new file mode 100644 index 0000000..3ed6c4c --- /dev/null +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/framework/web/package-info.java @@ -0,0 +1,4 @@ +/** + * product 模块的 web 配置 + */ +package cn.hangtag.module.oms.framework.web; diff --git a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/biz/package-info.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/package-info.java similarity index 89% rename from hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/biz/package-info.java rename to hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/package-info.java index 4041c08..60f6da4 100644 --- a/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/biz/package-info.java +++ b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/oms/package-info.java @@ -5,4 +5,4 @@ * 1. Controller URL：以 /product/ 开头，避免和其它 Module 冲突 * 2. DataObject 表名：以 product_ 开头，方便在数据库中区分 */ -package cn.hangtag.module.biz; +package cn.hangtag.module.oms; diff --git a/hangtag-server/src/test/java/cn/hangtag/ProjectReactor.java b/hangtag-server/src/test/java/cn/hangtag/ProjectReactor.java index 0737ecc..1d6f57f 100644 --- a/hangtag-server/src/test/java/cn/hangtag/ProjectReactor.java +++ b/hangtag-server/src/test/java/cn/hangtag/ProjectReactor.java @@ -28,7 +28,7 @@ public class ProjectReactor { private static final String GROUP_ID = "cn.hangtag"; private static final String ARTIFACT_ID = "hangtag"; private static final String PACKAGE_NAME = "cn.hangtag"; - private static final String TITLE = "OMS管理系统"; + private static final String TITLE = "嘉晋OMS系统"; /** * 白名单文件，不进行重写，避免出问题 @@ -46,7 +46,7 @@ public class ProjectReactor { String groupIdNew = "cn.hangtag"; String artifactIdNew = "hangtag"; String packageNameNew = "cn.hangtag"; - String titleNew = "OMS管理系统"; + String titleNew = "嘉晋OMS系统"; String projectBaseDirNew = projectBaseDir + "-new"; // 一键改名后，“新”项目所在的目录 log.info("[main][检测新项目目录 ({})是否存在]", projectBaseDirNew); if (FileUtil.exist(projectBaseDirNew)) { diff --git a/hangtag-ui/.env b/hangtag-ui/.env index 7c289d3..9772206 100644 --- a/hangtag-ui/.env +++ b/hangtag-ui/.env @@ -1,5 +1,5 @@ # 标题 -VITE_APP_TITLE=OMS管理系统 +VITE_APP_TITLE=嘉晋OMS系统 # 项目本地运行端口号 VITE_PORT=80 diff --git a/pom.xml b/pom.xml index b40db15..4769246 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ ${project.artifactId} - OMS管理系统 + 嘉晋OMS系统 2.1.0-jdk8-snapshot diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml index ff947f8..25cddaa 100644 --- a/script/docker/docker-compose.yml +++ b/script/docker/docker-compose.yml @@ -63,7 +63,7 @@ services: NODE_ENV: ENV=${NODE_ENV:-production} PUBLIC_PATH=${PUBLIC_PATH:-/} - VUE_APP_TITLE=${VUE_APP_TITLE:-OMS管理系统} + VUE_APP_TITLE=${VUE_APP_TITLE:-嘉晋OMS系统} VUE_APP_BASE_API=${VUE_APP_BASE_API:-/prod-api} VUE_APP_APP_NAME=${VUE_APP_APP_NAME:-/} VUE_APP_TENANT_ENABLE=${VUE_APP_TENANT_ENABLE:-true} diff --git a/script/docker/docker.env b/script/docker/docker.env index cf53fef..2cdc49e 100644 --- a/script/docker/docker.env +++ b/script/docker/docker.env @@ -16,7 +16,7 @@ REDIS_HOST=hangtag-redis ## admin NODE_ENV=production PUBLIC_PATH=/ -VUE_APP_TITLE=OMS管理系统 +VUE_APP_TITLE=嘉晋OMS系统 VUE_APP_BASE_API=/prod-api VUE_APP_APP_NAME=/ VUE_APP_TENANT_ENABLE=true