提交20240809

This commit is contained in:
Mrking 2024-08-09 17:48:11 +08:00
parent 6e2e264e07
commit a31b37910f
17 changed files with 20 additions and 188 deletions

1
.gitignore vendored
View File

@ -87,3 +87,4 @@ __MACOSX
# 自定义目录
/logs
/.idea

8
.idea/.gitignore vendored
View File

@ -1,8 +0,0 @@
# 默认忽略的文件
/shelf/
/workspace.xml
# 基于编辑器的 HTTP 客户端请求
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml

View File

@ -1,46 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<annotationProcessing>
<profile default="true" name="Default" enabled="true" />
<profile name="Maven default annotation processors profile" enabled="true">
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
</profile>
<profile name="Annotation profile for hangtag" enabled="true">
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
<processorPath useClasspath="false">
<entry name="$PROJECT_DIR$/../../../maven/repository/org/springframework/boot/spring-boot-configuration-processor/2.7.18/spring-boot-configuration-processor-2.7.18.jar" />
<entry name="$PROJECT_DIR$/../../../maven/repository/org/projectlombok/lombok/1.18.30/lombok-1.18.30.jar" />
<entry name="$PROJECT_DIR$/../../../maven/repository/org/mapstruct/mapstruct-processor/1.5.5.Final/mapstruct-processor-1.5.5.Final.jar" />
<entry name="$PROJECT_DIR$/../../../maven/repository/org/mapstruct/mapstruct/1.5.5.Final/mapstruct-1.5.5.Final.jar" />
</processorPath>
<module name="hangtag-spring-boot-starter-biz-data-permission" />
<module name="hangtag-spring-boot-starter-job" />
<module name="hangtag-spring-boot-starter-redis" />
<module name="hangtag-spring-boot-starter-test" />
<module name="hangtag-spring-boot-starter-biz-ip" />
<module name="hangtag-spring-boot-starter-security" />
<module name="hangtag-module-system-api" />
<module name="hangtag-spring-boot-starter-protection" />
<module name="hangtag-module-infra-biz" />
<module name="hangtag-spring-boot-starter-web" />
<module name="hangtag-server" />
<module name="hangtag-spring-boot-starter-websocket" />
<module name="hangtag-spring-boot-starter-biz-tenant" />
<module name="hangtag-module-system-biz" />
<module name="hangtag-common" />
<module name="hangtag-module-oms-biz" />
<module name="hangtag-spring-boot-starter-mybatis" />
<module name="hangtag-spring-boot-starter-mq" />
<module name="hangtag-module-oms-api" />
<module name="hangtag-spring-boot-starter-excel" />
<module name="hangtag-spring-boot-starter-monitor" />
<module name="hangtag-module-infra-api" />
</profile>
</annotationProcessing>
</component>
</project>

View File

@ -1,61 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
<file url="file://$PROJECT_DIR$/hangtag-framework/hangtag-common/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-framework/hangtag-common/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-framework/hangtag-spring-boot-starter-biz-data-permission/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-framework/hangtag-spring-boot-starter-biz-data-permission/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-framework/hangtag-spring-boot-starter-biz-ip/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-framework/hangtag-spring-boot-starter-biz-ip/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-framework/hangtag-spring-boot-starter-biz-tenant/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-framework/hangtag-spring-boot-starter-biz-tenant/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-framework/hangtag-spring-boot-starter-excel/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-framework/hangtag-spring-boot-starter-excel/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-framework/hangtag-spring-boot-starter-job/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-framework/hangtag-spring-boot-starter-job/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-framework/hangtag-spring-boot-starter-monitor/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-framework/hangtag-spring-boot-starter-monitor/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-framework/hangtag-spring-boot-starter-mq/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-framework/hangtag-spring-boot-starter-mq/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-framework/hangtag-spring-boot-starter-mybatis/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-framework/hangtag-spring-boot-starter-mybatis/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-framework/hangtag-spring-boot-starter-protection/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-framework/hangtag-spring-boot-starter-protection/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-framework/hangtag-spring-boot-starter-redis/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-framework/hangtag-spring-boot-starter-redis/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-framework/hangtag-spring-boot-starter-security/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-framework/hangtag-spring-boot-starter-security/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-framework/hangtag-spring-boot-starter-test/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-framework/hangtag-spring-boot-starter-test/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-framework/hangtag-spring-boot-starter-web/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-framework/hangtag-spring-boot-starter-web/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-framework/hangtag-spring-boot-starter-websocket/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-framework/hangtag-spring-boot-starter-websocket/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-framework/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-framework/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-module-gkbiz/hangtag-module-gkbiz-biz/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-module-gkbiz/hangtag-module-gkbiz-biz/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-module-gkbiz/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-module-gkbiz/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-module-infra/hangtag-module-infra-api/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-module-infra/hangtag-module-infra-api/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-module-infra/hangtag-module-infra-biz/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-module-infra/hangtag-module-infra-biz/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-module-infra/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-module-infra/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-module-oms/hangtag-module-oms-api/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-module-oms/hangtag-module-oms-api/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-module-oms/hangtag-module-oms-biz/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-module-oms/hangtag-module-oms-biz/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-module-oms/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-module-oms/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-module-system/hangtag-module-system-api/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-module-system/hangtag-module-system-api/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-module-system/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-module-system/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-server/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-server/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
</component>
</project>

View File

@ -1,7 +0,0 @@
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Project Default" />
<inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="Stylelint" enabled="true" level="ERROR" enabled_by_default="true" />
</profile>
</component>

View File

@ -1,35 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RemoteRepositoriesConfiguration">
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Central Repository" />
<option name="url" value="https://repo.maven.apache.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="aliyunmaven" />
<option name="name" value="aliyun" />
<option name="url" value="https://maven.aliyun.com/repository/public" />
</remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Central Repository" />
<option name="url" value="http://maven.aliyun.com/nexus/content/repositories/central/" />
</remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Maven Central repository" />
<option name="url" value="https://repo1.maven.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="jboss.community" />
<option name="name" value="JBoss Community repository" />
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
</remote-repository>
<remote-repository>
<option name="id" value="huaweicloud" />
<option name="name" value="huawei" />
<option name="url" value="https://mirrors.huaweicloud.com/repository/maven/" />
</remote-repository>
</component>
</project>

View File

@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="MavenProjectsManager">
<option name="originalFiles">
<list>
<option value="$PROJECT_DIR$/pom.xml" />
<option value="$PROJECT_DIR$/hangtag-module-oms/hangtag-module-oms-api/pom.xml" />
</list>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
</project>

View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
<mapping directory="$PROJECT_DIR$/hangtag-ui" vcs="Git" />
</component>
</project>

View File

@ -45,6 +45,13 @@
<groupId>cn.hangtag</groupId>
<artifactId>hangtag-spring-boot-starter-excel</artifactId>
</dependency>
<dependency>
<groupId>cn.hangtag</groupId>
<artifactId>hangtag-module-infra-api</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>cn.hangtag</groupId>
<artifactId>hangtag-module-oms-api</artifactId>

View File

@ -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

View File

@ -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

View File

@ -39,7 +39,7 @@ onMounted(() => {
() => {
getUnreadCount()
},
1000 * 60 * 2
1000 * 60 * 1
)
})
</script>

View File

@ -93,6 +93,7 @@ const toDocument = () => {
</teleport>
</template>
<style scoped lang="scss">
.fade-bottom-enter-active,
.fade-bottom-leave-active {

View File

@ -1,6 +1,6 @@
--- 建表语句
-- 建表语句
DROP TABLE IF EXISTS oms_product_info;
CREATE TABLE oms_product_info(
id BIGINT(19) NOT NULL AUTO_INCREMENT COMMENT 'id' ,

View File

@ -2,7 +2,7 @@
-- 新增业务字典
INSERT INTO system_dict_type (name, type, status, remark, deleted_time, create_time, update_time, creator, updater)
VALUES ('语言地区标识', 'language_locale', 0, '', '1970-01-01T00:00', '2024-07-19T23:09:51.683', '2024-07-19T23:09:51.683', '1', '1')
VALUES ('语言地区标识', 'language_locale', 0, '', '1970-01-01T00:00', '2024-07-19T23:09:51.683', '2024-07-19T23:09:51.683', '1', '1');
INSERT INTO `system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1537, 1, '中国-汉语', 'zh-CN', 'language_locale', 0, 'default', '', '', '1', '2024-07-19 23:12:36', '1', '2024-07-20 00:16:37', b'0');
INSERT INTO `system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1538, 2, '中国-香港', 'zh-HK', 'language_locale', 0, 'default', '', '', '1', '2024-07-19 23:13:04', '1', '2024-07-19 23:14:16', b'0');
@ -40,7 +40,7 @@ VALUES
('基础资料', '', 1, 3, 0, '/base', 'fa:info', '', '', 0, true, true, true, '2024-07-19 22:29:45', '2024-07-19 22:29:45', '1', '1');
--- 菜单
-- 菜单
INSERT INTO `system_menu`(`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2759, '产品类型表 管理', '', 2, 0, 2758, 'product-type', '', 'base/producttype/index', 'ProductType', 0, b'1', b'1', b'1', '', '2024-07-19 22:55:18', '', '2024-07-19 22:55:18', b'0');
INSERT INTO `system_menu`(`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2760, '产品类型表 查询', 'base:product-type:query', 3, 1, 2759, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2024-07-19 22:55:18', '', '2024-07-19 22:55:18', b'0');
INSERT INTO `system_menu`(`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2761, '产品类型表 创建', 'base:product-type:create', 3, 2, 2759, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2024-07-19 22:55:18', '', '2024-07-19 22:55:18', b'0');

View File

@ -1,12 +1,12 @@
--- 新增业务字典
-- 新增业务字典
INSERT INTO `system_dict_type`(`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES (621, '品牌产业领域', 'brand_industry_field', 0, '', '1', '2024-07-20 09:51:30', '1', '2024-07-20 09:55:51', b'0', '1970-01-01 00:00:00');
INSERT INTO `system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1541, 1, '服务业', 'service_industry', 'brand_industry_field', 0, 'default', '', '', '1', '2024-07-20 09:53:36', '1', '2024-07-20 09:57:36', b'0');
INSERT INTO `system_dict_data`(`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1542, 2, '服装品牌', 'clothing_brand', 'brand_industry_field', 0, '', '', '', '1', '2024-07-20 09:54:36', '1', '2024-07-20 09:57:36', b'0');
--- 品牌管理 建表语句
-- 品牌管理 建表语句
DROP TABLE IF EXISTS oms_brand;
CREATE TABLE oms_brand(
id BIGINT(19) NOT NULL AUTO_INCREMENT COMMENT 'id' ,

View File

@ -19,7 +19,7 @@ INSERT INTO `system_coding_rules`(`id`, `name`, `config`, `remark`, `creator`, `
INSERT INTO `system_coding_rules`(`id`, `name`, `config`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `tenant_id`) VALUES (2, '品牌编码', '[{\"itemKey\":\"c1x1a\",\"type\":\"constant\",\"value\":\"BD-\",\"lastValue\":\"\",\"resetSerialNumber\":false,\"length\":0,\"step\":0,\"hasChanged\":false},{\"itemKey\":\"r1e1d\",\"type\":\"serialNumber\",\"value\":\"0\",\"lastValue\":\"000002\",\"resetSerialNumber\":false,\"length\":6,\"step\":1,\"hasChanged\":false}]', NULL, '1', '2024-07-20 15:43:46', '1', '2024-07-20 17:02:59', b'0', 1);
--- 菜单语句
-- 菜单语句
INSERT INTO `system_menu`(`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2783, '系统编码规则 管理', '', 2, 0, 2758, 'coding-rules', '', 'system/codingrules/index', 'CodingRules', 0, b'1', b'1', b'1', '', '2024-07-20 13:50:37', '', '2024-07-20 13:50:37', b'0');
INSERT INTO `system_menu`(`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2784, '系统编码规则 查询', 'system:coding-rules:query', 3, 1, 2783, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2024-07-20 13:50:37', '', '2024-07-20 13:50:37', b'0');
INSERT INTO `system_menu`(`id`, `name`, `permission`, `type`, `sort`, `parent_id`, `path`, `icon`, `component`, `component_name`, `status`, `visible`, `keep_alive`, `always_show`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (2785, '系统编码规则 创建', 'system:coding-rules:create', 3, 2, 2783, '', '', '', NULL, 0, b'1', b'1', b'1', '', '2024-07-20 13:50:37', '', '2024-07-20 13:50:37', b'0');