Compare commits

...

2 Commits
dev ... main

Author SHA1 Message Date
Mrking 1ee3ba0aad Merge branch 'main' of https://git.yfgame.vip/r/hangtag
# Conflicts:
#	.gitignore
2024-07-22 21:27:14 +08:00
Mrking e956c901e0 提交20240722 2024-07-22 21:24:33 +08:00
9 changed files with 19 additions and 243 deletions

76
.gitignore vendored
View File

@ -1,17 +1,17 @@
# ---> Java
# 编译后的类文件
# Compiled class file
*.class
# 日志文件
# Log file
*.log
# BlueJ 文件
# BlueJ files
*.ctxt
# 移动工具 for Java (J2ME)
# Mobile Tools for Java (J2ME)
.mtj.tmp/
# 包文件
# Package Files #
*.jar
*.war
*.nar
@ -20,70 +20,8 @@
*.tar.gz
*.rar
# 虚拟机崩溃日志,详见 http://www.java.com/en/download/help/error_hotspot.xml
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
replay_pid*
# 项目帮助文档
HELP.md
# Maven 生成的目标文件夹
/target/
/**/target/
# 保留 Maven wrapper 的 jar 文件
!.mvn/wrapper/maven-wrapper.jar
### STS (Spring Tool Suite) ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache
### IntelliJ IDEA ###
.idea/
*.iws
*.iml
*.ipr
### NetBeans ###
/nbproject/private/
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/
/build/
### VS Code ###
.vscode/
rebel-remote.xml
rebel.xml
### Vite 项目 ###
node_modules/
dist/
*.local
*.env.local
*.env.*.local
.vite/deps
### macOS 系统文件 ###
.DS_Store
.AppleDouble
.LSOverride
# 见 http://kb.mozillazine.org/Profiles.ini_file
\Icon
\Icon?
.DS_Store
._*
.Spotlight-V100
.Trashes
__MACOSX
*/.Spotlight-V100
*/.Trashes
# 自定义目录
/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,39 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<annotationProcessing>
<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$/../../Java/repository/org/springframework/boot/spring-boot-configuration-processor/2.7.18/spring-boot-configuration-processor-2.7.18.jar" />
<entry name="$PROJECT_DIR$/../../Java/repository/org/projectlombok/lombok/1.18.30/lombok-1.18.30.jar" />
<entry name="$PROJECT_DIR$/../../Java/repository/org/mapstruct/mapstruct-processor/1.5.5.Final/mapstruct-processor-1.5.5.Final.jar" />
<entry name="$PROJECT_DIR$/../../Java/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-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-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/hangtag-module-system-biz/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/hangtag-module-system/hangtag-module-system-biz/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,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,12 +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" />
</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

@ -47,14 +47,14 @@ spring:
primary: master
datasource:
master:
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 # MySQL Connector/J 8.X 连接的示例
username: test
password: test@123
url: jdbc:mysql://127.0.0.1:3306/hangtag?allowMultiQueries=true&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&useUnicode=true&characterEncoding=UTF-8 # MySQL Connector/J 8.X 连接的示例
username: root
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
username: test
password: test@123
url: jdbc:mysql://127.0.0.1:3306/hangtag?allowMultiQueries=true&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&useUnicode=true&characterEncoding=UTF-8
username: root
password: 123456
# Redis 配置。Redisson 默认的配置足够使用,一般不需要进行调优
redis:

View File

@ -47,14 +47,14 @@ spring:
primary: master
datasource:
master:
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 # MySQL Connector/J 8.X 连接的示例
username: test
password: test@123
url: jdbc:mysql://127.0.0.1:3306/hangtag?allowMultiQueries=true&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&useUnicode=true&characterEncoding=UTF-8 # MySQL Connector/J 8.X 连接的示例
username: root
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
username: test
password: test@123
url: jdbc:mysql://127.0.0.1:3306/hangtag?allowMultiQueries=true&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&useUnicode=true&characterEncoding=UTF-8
username: root
password: 123456
# Redis 配置。Redisson 默认的配置足够使用,一般不需要进行调优
redis: