合并 qms 代码

This commit is contained in:
Administrator
2025-09-04 00:51:20 +00:00
committed by chenbowen
parent 81f651388f
commit 75a20dcf56
574 changed files with 35454 additions and 3394 deletions

View File

@@ -1,13 +1,14 @@
FROM openjdk:17-jre-slim
FROM 172.16.46.66:10043/base-service/report-base:x86_64-ubuntu_22-jre21-2.0.0
RUN mkdir -p /appdata/server
WORKDIR /appdata/server
## 将后端项目的 Jar 文件,复制到镜像中
COPY ./target/qms-server.jar app.jar
# 设置应用目录
WORKDIR /app
# 复制应用文件
COPY target/qms-server.jar /app/qms-server.jar
## 设置 TZ 时区
ENV TZ=Asia/Shanghai
# 暴露端口
EXPOSE 48205
# 运行应用
ENTRYPOINT ["java", "-jar", "/app/qms-server.jar"]
## 启动后端项目
ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]

View File

@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>cn.iocoder.cloud</groupId>
<artifactId>yudao</artifactId>
<artifactId>dsc-qms</artifactId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -27,32 +27,7 @@
</dependency>
<dependency>
<groupId>cn.iocoder.cloud</groupId>
<artifactId>yudao-module-jy-business-server</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>cn.iocoder.cloud</groupId>
<artifactId>yudao-module-jy-manage-server</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>cn.iocoder.cloud</groupId>
<artifactId>yudao-module-jy-resource-server</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>cn.iocoder.cloud</groupId>
<artifactId>yudao-module-jy-office-server</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>cn.iocoder.cloud</groupId>
<artifactId>yudao-module-jy-report-server</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>cn.iocoder.cloud</groupId>
<artifactId>yudao-module-jy-iot-server</artifactId>
<artifactId>yudao-module-qms-server</artifactId>
<version>${revision}</version>
</dependency>
<dependency>

View File

@@ -1,12 +1,13 @@
package cn.iocoder.yudao.qms.controller.qms;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
/**

View File

@@ -37,12 +37,12 @@ spring:
primary: master
datasource:
master:
url: jdbc:dm://172.16.46.247:1050?schema=RUOYI-VUE-PRO
url: jdbc:dm://172.16.46.247:1050?schema=ZGTY-QMS-DEV
username: SYSDBA
password: pgbsci6ddJ6Sqj@e
slave: # 模拟从库,可根据自己需要修改 # 模拟从库,可根据自己需要修改
lazy: true # 开启懒加载,保证启动速度
url: jdbc:dm://172.16.46.247:1050?schema=RUOYI-VUE-PRO
url: jdbc:dm://172.16.46.247:1050?schema=ZGTY-QMS-DEV
username: SYSDBA
password: pgbsci6ddJ6Sqj@e

View File

@@ -39,12 +39,12 @@ spring:
primary: master
datasource:
master:
url: jdbc:dm://172.16.46.247:1050?schema=RUOYI-VUE-PRO
url: jdbc:dm://172.16.46.247:1050?schema=ZGTY-QMS-DEV
username: SYSDBA
password: pgbsci6ddJ6Sqj@e
slave: # 模拟从库,可根据自己需要修改 # 模拟从库,可根据自己需要修改
lazy: true # 开启懒加载,保证启动速度
url: jdbc:dm://172.16.46.247:1050?schema=RUOYI-VUE-PRO
url: jdbc:dm://172.16.46.247:1050?schema=ZGTY-QMS-DEV
username: SYSDBA
password: pgbsci6ddJ6Sqj@e

View File

@@ -1,7 +1,6 @@
spring:
application:
name: qms-server
profiles:
active: ${env.name}
#统一nacos配置使用 profile 管理
@@ -22,6 +21,7 @@ spring:
allow-circular-references: true # 允许循环依赖,因为项目是三层架构,无法避免这个情况。
allow-bean-definition-overriding: true # 允许 Bean 覆盖,例如说 Feign 等会存在重复定义的服务
config:
import:
- optional:classpath:application-${spring.profiles.active}.yaml # 加载【本地】配置
@@ -104,7 +104,7 @@ xxl:
yudao:
info:
version: 1.0.0
base-package: cn.iocoder.yudao.module
base-package: cn.iocoder.yudao
web:
admin-ui:
url: http://dashboard.yudao.iocoder.cn # Admin 管理后台 UI 的地址