diff --git a/.flattened-pom.xml b/.flattened-pom.xml index ec7213c..6854656 100644 --- a/.flattened-pom.xml +++ b/.flattened-pom.xml @@ -7,14 +7,14 @@ 2.1.0-jdk8-snapshot pom ${project.artifactId} - 芋道项目基础脚手架 - https://github.com/YunaiV/ruoyi-vue-pro + OMS管理系统 hangtag-dependencies hangtag-framework hangtag-server hangtag-module-system hangtag-module-infra + hangtag-module-oms 1.18.30 diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 25984aa..d761f61 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -16,7 +16,6 @@ - @@ -28,6 +27,7 @@ + diff --git a/.idea/encodings.xml b/.idea/encodings.xml index e8d725d..af9b10c 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -43,6 +43,10 @@ + + + + diff --git a/hangtag-module-oms/.flattened-pom.xml b/hangtag-module-oms/.flattened-pom.xml new file mode 100644 index 0000000..26967ed --- /dev/null +++ b/hangtag-module-oms/.flattened-pom.xml @@ -0,0 +1,18 @@ + + + 4.0.0 + + cn.hangtag + hangtag + 2.1.0-jdk8-snapshot + + cn.hangtag + hangtag-module-oms + 2.1.0-jdk8-snapshot + pom + ${project.artifactId} + + hangtag-module-oms-biz + + diff --git a/hangtag-module-oms/hangtag-module-oms-biz/.flattened-pom.xml b/hangtag-module-oms/hangtag-module-oms-biz/.flattened-pom.xml new file mode 100644 index 0000000..4ca3710 --- /dev/null +++ b/hangtag-module-oms/hangtag-module-oms-biz/.flattened-pom.xml @@ -0,0 +1,36 @@ + + + 4.0.0 + + cn.hangtag + hangtag-module-oms + 2.1.0-jdk8-snapshot + + cn.hangtag + hangtag-module-oms-biz + 2.1.0-jdk8-snapshot + ${project.artifactId} + + + cn.hangtag + hangtag-spring-boot-starter-web + + + cn.hangtag + hangtag-spring-boot-starter-security + + + cn.hangtag + hangtag-spring-boot-starter-mybatis + + + cn.hangtag + hangtag-spring-boot-starter-test + + + cn.hangtag + hangtag-spring-boot-starter-excel + + + diff --git a/hangtag-module-gkbiz/hangtag-module-gkbiz-biz/pom.xml b/hangtag-module-oms/hangtag-module-oms-biz/pom.xml similarity index 93% rename from hangtag-module-gkbiz/hangtag-module-gkbiz-biz/pom.xml rename to hangtag-module-oms/hangtag-module-oms-biz/pom.xml index 0f49277..f45da67 100644 --- a/hangtag-module-gkbiz/hangtag-module-gkbiz-biz/pom.xml +++ b/hangtag-module-oms/hangtag-module-oms-biz/pom.xml @@ -4,11 +4,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> cn.hangtag - hangtag-module-gkbiz + hangtag-module-oms ${revision} 4.0.0 - hangtag-module-gkbiz-biz + hangtag-module-oms-biz jar ${project.artifactId} diff --git a/hangtag-module-gkbiz/hangtag-module-gkbiz-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/biz/framework/package-info.java similarity index 100% rename from hangtag-module-gkbiz/hangtag-module-gkbiz-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/biz/framework/package-info.java diff --git a/hangtag-module-gkbiz/hangtag-module-gkbiz-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/biz/framework/web/config/ProductWebConfiguration.java similarity index 100% rename from hangtag-module-gkbiz/hangtag-module-gkbiz-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/biz/framework/web/config/ProductWebConfiguration.java diff --git a/hangtag-module-gkbiz/hangtag-module-gkbiz-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 similarity index 100% rename from hangtag-module-gkbiz/hangtag-module-gkbiz-biz/src/main/java/cn/hangtag/module/biz/framework/web/package-info.java rename to hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/biz/framework/web/package-info.java diff --git a/hangtag-module-gkbiz/hangtag-module-gkbiz-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/biz/package-info.java similarity index 100% rename from hangtag-module-gkbiz/hangtag-module-gkbiz-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/biz/package-info.java diff --git a/hangtag-module-gkbiz/pom.xml b/hangtag-module-oms/pom.xml similarity index 83% rename from hangtag-module-gkbiz/pom.xml rename to hangtag-module-oms/pom.xml index 5068843..7d61a2f 100644 --- a/hangtag-module-gkbiz/pom.xml +++ b/hangtag-module-oms/pom.xml @@ -10,9 +10,9 @@ pom ${project.artifactId} - hangtag-module-gkbiz + hangtag-module-oms - hangtag-module-gkbiz-biz + hangtag-module-oms-biz \ No newline at end of file diff --git a/hangtag-server/src/test/java/cn/hangtag/ProjectReactor.java b/hangtag-server/src/test/java/cn/hangtag/ProjectReactor.java index 2c7424f..0737ecc 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 = "挂卡管理系统"; + 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 = "挂卡管理系统"; + 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 76f2ac4..7c289d3 100644 --- a/hangtag-ui/.env +++ b/hangtag-ui/.env @@ -1,5 +1,5 @@ # 标题 -VITE_APP_TITLE=挂卡管理系统 +VITE_APP_TITLE=OMS管理系统 # 项目本地运行端口号 VITE_PORT=80 diff --git a/hangtag-ui/src/api/business/order/index.ts b/hangtag-ui/src/api/oms/order/index.ts similarity index 100% rename from hangtag-ui/src/api/business/order/index.ts rename to hangtag-ui/src/api/oms/order/index.ts diff --git a/hangtag-ui/src/api/business/order/index.vue b/hangtag-ui/src/api/oms/order/index.vue similarity index 100% rename from hangtag-ui/src/api/business/order/index.vue rename to hangtag-ui/src/api/oms/order/index.vue diff --git a/hangtag-ui/src/views/business/order/index.vue b/hangtag-ui/src/views/oms/order/index.vue similarity index 100% rename from hangtag-ui/src/views/business/order/index.vue rename to hangtag-ui/src/views/oms/order/index.vue diff --git a/pom.xml b/pom.xml index be751fb..b40db15 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ hangtag-module-system hangtag-module-infra - hangtag-module-gkbiz + hangtag-module-oms @@ -27,7 +27,7 @@ ${project.artifactId} - 挂卡管理系统 + OMS管理系统 2.1.0-jdk8-snapshot diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml index 9a28013..ff947f8 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:-挂卡管理系统} + 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 2355c21..cf53fef 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=挂卡管理系统 +VUE_APP_TITLE=OMS管理系统 VUE_APP_BASE_API=/prod-api VUE_APP_APP_NAME=/ VUE_APP_TENANT_ENABLE=true