From a31b37910f5e7175a82abfe6307ddbfd5c12d3c5 Mon Sep 17 00:00:00 2001
From: Mrking <782276617@qq.com>
Date: Fri, 9 Aug 2024 17:48:11 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=8F=90=E4=BA=A420240809?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitignore | 1 +
.idea/.gitignore | 8 ---
.idea/compiler.xml | 46 --------------
.idea/encodings.xml | 61 -------------------
.idea/inspectionProfiles/Project_Default.xml | 7 ---
.idea/jarRepositories.xml | 35 -----------
.idea/misc.xml | 13 ----
.idea/vcs.xml | 7 ---
.../hangtag-module-oms-biz/pom.xml | 7 +++
.../src/main/resources/application-local.yaml | 4 +-
.../target/classes/application-local.yaml | 4 +-
.../layout/components/Message/src/Message.vue | 2 +-
.../components/UserInfo/src/UserInfo.vue | 1 +
sql/mysql/20240720/产品管理.sql | 2 +-
sql/mysql/20240720/产品类型.sql | 4 +-
sql/mysql/20240720/品牌管理.sql | 4 +-
sql/mysql/20240720/系统编码.sql | 2 +-
17 files changed, 20 insertions(+), 188 deletions(-)
delete mode 100644 .idea/.gitignore
delete mode 100644 .idea/compiler.xml
delete mode 100644 .idea/encodings.xml
delete mode 100644 .idea/inspectionProfiles/Project_Default.xml
delete mode 100644 .idea/jarRepositories.xml
delete mode 100644 .idea/misc.xml
delete mode 100644 .idea/vcs.xml
diff --git a/.gitignore b/.gitignore
index bb0968a..8a73858 100644
--- a/.gitignore
+++ b/.gitignore
@@ -87,3 +87,4 @@ __MACOSX
# 自定义目录
/logs
+/.idea
diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 35410ca..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# 默认忽略的文件
-/shelf/
-/workspace.xml
-# 基于编辑器的 HTTP 客户端请求
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index 830c0da..0000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index c46c49d..0000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 7c4836f..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
deleted file mode 100644
index b69e025..0000000
--- a/.idea/jarRepositories.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 71c74cf..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 78ba8ca..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/pom.xml b/hangtag-module-oms/hangtag-module-oms-biz/pom.xml
index d3c0913..34cc8e3 100644
--- a/hangtag-module-oms/hangtag-module-oms-biz/pom.xml
+++ b/hangtag-module-oms/hangtag-module-oms-biz/pom.xml
@@ -45,6 +45,13 @@
cn.hangtag
hangtag-spring-boot-starter-excel
+
+
+ cn.hangtag
+ hangtag-module-infra-api
+ ${revision}
+
+
cn.hangtag
hangtag-module-oms-api
diff --git a/hangtag-server/src/main/resources/application-local.yaml b/hangtag-server/src/main/resources/application-local.yaml
index aed7d11..32239c3 100644
--- a/hangtag-server/src/main/resources/application-local.yaml
+++ b/hangtag-server/src/main/resources/application-local.yaml
@@ -47,9 +47,9 @@ spring:
primary: master
datasource:
master:
- url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
+ url: jdbc:mysql://127.0.0.1:3306/hangtag?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
username: root
- password: Admin11039
+ password: 123456
# slave: # 模拟从库，可根据自己需要修改
# lazy: true # 开启懒加载，保证启动速度
# url: jdbc:mysql://43.136.71.164:3306/hangtag?allowMultiQueries=true&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&useUnicode=true&characterEncoding=UTF-8
diff --git a/hangtag-server/target/classes/application-local.yaml b/hangtag-server/target/classes/application-local.yaml
index aed7d11..32239c3 100644
--- a/hangtag-server/target/classes/application-local.yaml
+++ b/hangtag-server/target/classes/application-local.yaml
@@ -47,9 +47,9 @@ spring:
primary: master
datasource:
master:
- url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
+ url: jdbc:mysql://127.0.0.1:3306/hangtag?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
username: root
- password: Admin11039
+ password: 123456
# slave: # 模拟从库，可根据自己需要修改
# lazy: true # 开启懒加载，保证启动速度
# url: jdbc:mysql://43.136.71.164:3306/hangtag?allowMultiQueries=true&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&useUnicode=true&characterEncoding=UTF-8
diff --git a/hangtag-ui/src/layout/components/Message/src/Message.vue b/hangtag-ui/src/layout/components/Message/src/Message.vue
index 6bd7724..d238a8a 100644
--- a/hangtag-ui/src/layout/components/Message/src/Message.vue
+++ b/hangtag-ui/src/layout/components/Message/src/Message.vue
@@ -39,7 +39,7 @@ onMounted(() => {
() => {
getUnreadCount()
},
- 1000 * 60 * 2
+ 1000 * 60 * 1
)
})
diff --git a/hangtag-ui/src/layout/components/UserInfo/src/UserInfo.vue b/hangtag-ui/src/layout/components/UserInfo/src/UserInfo.vue
index 1fcbfca..58bb27e 100644
--- a/hangtag-ui/src/layout/components/UserInfo/src/UserInfo.vue
+++ b/hangtag-ui/src/layout/components/UserInfo/src/UserInfo.vue
@@ -93,6 +93,7 @@ const toDocument = () => {
+