zgty/zt-qms
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: zgty:0b936b7b8f9a44c9f885d43189682ddd0ec01779
Branches Tags
zgty:test zgty:lims_dev
...
compare: zgty:53d40a4b2718963d26082ab1583406a36c2773ea
Branches Tags
zgty:test zgty:lims_dev

13 Commits
0b936b7b8f ... 53d40a4b27

Author SHA1 Message Date
FCL
53d40a4b27 Merge branch 'refs/heads/zt-test' into test 
# Conflicts:
#	pom.xml
#	zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/framework/datapermission/QMSMultiDataPermissionHandler.java
#	zt-module-qms/zt-module-qms-server/src/main/java/com/zt/plat/module/qms/framework/mybatis/QMSDataPermissionConfig.java
 2026-01-19 10:59:08 +08:00
ranke
7d8b8c55f1 修改私服地址 2026-01-15 10:03:48 +08:00
ranke
b529df9860 修改版本号,新增快照发布设置 2026-01-15 09:18:02 +08:00
FCL
34277c921a feat:qms阶段性提交 2026-01-13 11:21:28 +08:00
FCL
ccfa341429 fix:流程回调接口增加DeptDataPermissionIgnore注解 2026-01-09 14:10:20 +08:00
FCL
7e7295cb74 feat:qms阶段性提交 2026-01-09 11:26:52 +08:00
FCL
10716a0ec5 feat:qms阶段性提交 2026-01-07 11:00:12 +08:00
FCL
b7db2d34ac 部署调试 2026-01-04 18:48:53 +08:00
FCL
8fa11eb44c feat:qms阶段性更新 2026-01-04 16:53:52 +08:00
chenbowen
8c3a1bdff8 1. 升级版本 2025-12-23 10:50:23 +08:00
FCL
212a28059c feat:更新tio，支持redis指定用户名 2025-12-04 10:39:19 +08:00
FCL
9323bb3706 Merge remote-tracking branch 'origin/test' into test 2025-11-28 15:23:00 +08:00
FCL
b2c34982f9 feat:阶段性代码提交 2025-11-28 15:22:17 +08:00
3 changed files with 8 additions and 8 deletions
Expand all files Collapse all files

14
pom.xml
View File

@@ -17,7 +17,7 @@
<url>https://github.com/YunaiV/ruoyi-vue-pro</url> <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
<properties> <properties>
<revision>3.0.46</revision> <revision>3.0.47-SNAPSHOT</revision>
<!-- Maven 相关 --> <!-- Maven 相关 -->
<java.version>17</java.version> <java.version>17</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.source>${java.version}</maven.compiler.source>
@@ -143,7 +143,7 @@
<repository> <repository>
<id>ZT</id> <id>ZT</id>
<name>中铜 ZStack 私服</name> <name>中铜 ZStack 私服</name>
<url>http://172.16.46.63:30708/repository/test/</url> <url>http://172.16.46.63:30708/repository/zt-cloud/</url>
<releases> <releases>
<updatePolicy>always</updatePolicy> <updatePolicy>always</updatePolicy>
<checksumPolicy>warn</checksumPolicy> <checksumPolicy>warn</checksumPolicy>
@@ -161,11 +161,11 @@
<name>中铜 ZStack 私服</name> <name>中铜 ZStack 私服</name>
<url>http://172.16.46.63:30708/repository/test/</url> <url>http://172.16.46.63:30708/repository/test/</url>
</repository> </repository>
<!-- <snapshotRepository>--> <snapshotRepository>
<!-- <id>ZT</id>--> <id>ZT-snap</id>
<!-- <name>中铜 ZStack 私服</name>--> <name>中铜 ZStack 私服</name>
<!-- <url>https://your-nexus.example.com/repository/maven-snapshots/</url>--> <url>http://172.16.46.63:30708/repository/test-snap/</url>
<!-- </snapshotRepository>--> </snapshotRepository>
</distributionManagement> </distributionManagement>
<profiles> <profiles>

0
qms-server/src/main/resources/application-dev.yml → qms-server/src/main/resources/application-dev1.yml
View File

2
qms-server/src/main/resources/application.yml
View File

@@ -24,7 +24,7 @@ spring:
config: config:
import: import:
- optional:classpath:application-${spring.profiles.active}.yaml # 加载【本地】配置 # - optional:classpath:application-${spring.profiles.active}.yaml # 加载【本地】配置
- optional:nacos:${spring.application.name}-${spring.profiles.active}.yaml # 加载【Nacos】的配置 - optional:nacos:${spring.application.name}-${spring.profiles.active}.yaml # 加载【Nacos】的配置
# Servlet 配置 # Servlet 配置