Compare commits
213 Commits
11205c7406
...
lims_dev
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
927731c217 | ||
| 2b60bd7c7b | |||
|
|
9a2b45e29c | ||
| 7c7e7b4761 | |||
|
|
39d720c1df | ||
|
|
d6fc03b199 | ||
|
|
04ac449897 | ||
|
|
eff36758c2 | ||
|
|
cb50244685 | ||
|
|
246e6391b8 | ||
| 4c129dee4e | |||
| 63fc44a7d1 | |||
| 9a4e50b081 | |||
|
|
7f1c4dd8c4 | ||
| 7a03bc6293 | |||
| 171de4c8d4 | |||
|
|
60bc01201b | ||
|
|
8fdeb65895 | ||
|
|
41b4e53db1 | ||
| 600e8bcd92 | |||
| 353a6dcb3e | |||
| ab505189f3 | |||
| 3b306b4137 | |||
| 9b99e41676 | |||
|
|
1dbbeba233 | ||
|
|
b92d61648f | ||
| b85eb7ea91 | |||
| 76069855ec | |||
| ea948a70bc | |||
| e133ec82c8 | |||
| be75cb4cf9 | |||
| b320d36181 | |||
|
|
172f04a260 | ||
| 821ce6a7cf | |||
|
|
c7fe2db73c | ||
| 984ae17431 | |||
| 4fd689c530 | |||
|
|
2c377a76ec | ||
|
|
2f71bc7fb1 | ||
| 30ce46ce4d | |||
|
|
d25658f202 | ||
|
|
8aa329d989 | ||
|
|
a3a31d8600 | ||
| daafd3ae37 | |||
| 91df898e09 | |||
|
|
baa7884fd7 | ||
|
|
c522cf5f8f | ||
|
|
46aa2c9692 | ||
|
|
411983986f | ||
|
|
94757f31de | ||
|
|
42afe2adb3 | ||
|
|
5657f8cf09 | ||
| a49bee0abd | |||
| d0673f36b1 | |||
|
|
eaea741480 | ||
|
|
44a6e11803 | ||
| cc79a15a16 | |||
| 1e82c22284 | |||
| c2d067e47c | |||
| 92ec9454ba | |||
|
|
57041e4adc | ||
|
|
a8580e1e30 | ||
|
|
82934c153d | ||
| 87fbd54692 | |||
| 918f8465a9 | |||
| 5ef620fa9a | |||
| 2b45f932dc | |||
| 6ca60e94cd | |||
| 8b3bfe2083 | |||
|
|
9037a27cb8 | ||
|
|
a26327d4e7 | ||
|
|
3028d478fe | ||
| c6c44828e0 | |||
| 1f8aebf598 | |||
| caba1edf4c | |||
|
|
3c70d53533 | ||
|
|
d814fae16d | ||
|
|
0e07b41c22 | ||
|
|
e6113058c0 | ||
| 5ec35399de | |||
|
|
49b6f956ff | ||
|
|
d80d5da026 | ||
|
|
c3f891095f | ||
|
|
ac2295cac9 | ||
|
|
36289be12b | ||
| c858ecf8b4 | |||
| 18e4245eff | |||
| 376902462b | |||
|
|
c80aeece47 | ||
|
|
12cd5a4d94 | ||
| 524ea2687f | |||
| 24a6e95f26 | |||
| dddf21c94f | |||
| 6e3e604fca | |||
|
|
4394c4ecf8 | ||
|
|
e0f6d288b1 | ||
| 6e0886ca5b | |||
| c79590d36e | |||
| 6e39ca51c5 | |||
| 0c13b35433 | |||
| 398fd2d303 | |||
| d7554b49dc | |||
| d9d63ab587 | |||
|
|
3afd68cbfe | ||
|
|
174f720f65 | ||
| f2fe7455ed | |||
| 3129b88a21 | |||
| 95b7b6e011 | |||
|
|
52ab580346 | ||
| da9db180ca | |||
| 182a1fb4a6 | |||
|
|
9ffc32d964 | ||
| c7bcf07f72 | |||
| d51637e44a | |||
| 23ee4831c7 | |||
|
|
dd2b7ac290 | ||
|
|
f13681ca8a | ||
|
|
6551a18d28 | ||
| a3cd8a0a55 | |||
|
|
3e40ed2e61 | ||
|
|
4897329644 | ||
|
|
498dd4cd8d | ||
| 9eb42b930f | |||
| 4440288479 | |||
| 78d80280e3 | |||
|
|
dafdefd378 | ||
|
|
166cb7304f | ||
| fb8706441b | |||
|
|
fc0d3f5da4 | ||
|
|
a4105aef49 | ||
| 09ca90355d | |||
|
|
b3e11fe92e | ||
|
|
536f971e8e | ||
| 56807cfdcf | |||
|
|
e75217009f | ||
| 9fb261cf12 | |||
|
|
b2e275a2d8 | ||
|
|
d218383a9a | ||
|
|
a084efdcdd | ||
| 04d9746fb7 | |||
| 8fa9f5fc69 | |||
| 308e2781bf | |||
| 7221f6bf1b | |||
| 4c9a4959c8 | |||
|
|
3782b3a7c6 | ||
| b75c389b84 | |||
| 7375539ede | |||
| d3ea0b5d31 | |||
|
|
b0c4a773af | ||
|
|
966d8a3cf7 | ||
|
|
c90169ab00 | ||
|
|
defb49748f | ||
|
|
92529782f8 | ||
| b60630b2cd | |||
| abd0ff713e | |||
| 313e80b1b2 | |||
| e225f7c1d1 | |||
|
|
2529349399 | ||
|
|
ec3e594951 | ||
| 52cff53c8f | |||
| 0435209d34 | |||
|
|
41cbab20e3 | ||
|
|
1dc0671cf0 | ||
|
|
b629e0358a | ||
| 6353b71192 | |||
| f0f4daac15 | |||
| 565b545968 | |||
|
|
c0ec5a7fc7 | ||
|
|
6286b0da30 | ||
|
|
5b32ff274f | ||
| 6d0e27996f | |||
| 71d5eb061d | |||
| 2db9525b4b | |||
|
|
910b997bc5 | ||
|
|
8e89318376 | ||
| 766a749d15 | |||
| 95f0a63c06 | |||
|
|
024673c75b | ||
|
|
11cb3426d4 | ||
|
|
ea135d3fb7 | ||
|
|
f9740ed667 | ||
|
|
ba4b7239ac | ||
| 62d76557fd | |||
|
|
bdd5636a47 | ||
|
|
3128dc4219 | ||
|
|
bf8aba849f | ||
| 730b1812aa | |||
| a7c079436b | |||
| 021f6c087b | |||
| 51c7748c8c | |||
|
|
797827afe2 | ||
|
|
5f7072cbd6 | ||
| 28cc5a9157 | |||
| 7fdb79d32a | |||
|
|
e03410ba17 | ||
|
|
da2d97caf5 | ||
|
|
1773769979 | ||
| 0dd61c6867 | |||
| 7fd6bb5e29 | |||
| 4df7931523 | |||
| ad667e6fb4 | |||
| c7a673b88a | |||
| 1721a201ff | |||
| 09fd13af72 | |||
|
|
e80a5437df | ||
| 7603f8c6c3 | |||
|
|
848015ad26 | ||
|
|
e556fb9397 | ||
| b42265dc81 | |||
| 9a82e22131 | |||
|
|
8dedb9854c | ||
| 1b6e9f5dcb | |||
| 42ec7fc228 |
@@ -11,7 +11,7 @@ metadata:
|
|||||||
description: DESC_PLACEHOLDER
|
description: DESC_PLACEHOLDER
|
||||||
rollout.kubernetes.io/change-cause: "DESC_PLACEHOLDER:VERSION_PLACEHOLDER"
|
rollout.kubernetes.io/change-cause: "DESC_PLACEHOLDER:VERSION_PLACEHOLDER"
|
||||||
spec:
|
spec:
|
||||||
replicas: 1
|
replicas: 2
|
||||||
selector:
|
selector:
|
||||||
matchLabels:
|
matchLabels:
|
||||||
app: qms-server
|
app: qms-server
|
||||||
@@ -23,18 +23,21 @@ spec:
|
|||||||
containers:
|
containers:
|
||||||
- name: qms-server
|
- name: qms-server
|
||||||
image: 172.16.46.66:10043/yudao/qms-server:VERSION_PLACEHOLDER
|
image: 172.16.46.66:10043/yudao/qms-server:VERSION_PLACEHOLDER
|
||||||
|
env:
|
||||||
|
- name: TZ
|
||||||
|
value: Asia/Shanghai
|
||||||
readinessProbe:
|
readinessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /actuator/health
|
path: /actuator/health
|
||||||
port: 48104
|
port: 48104
|
||||||
initialDelaySeconds: 10
|
initialDelaySeconds: 50
|
||||||
periodSeconds: 5
|
periodSeconds: 5
|
||||||
failureThreshold: 3
|
failureThreshold: 3
|
||||||
livenessProbe:
|
livenessProbe:
|
||||||
httpGet:
|
httpGet:
|
||||||
path: /actuator/health
|
path: /actuator/health
|
||||||
port: 48104
|
port: 48104
|
||||||
initialDelaySeconds: 30
|
initialDelaySeconds: 50
|
||||||
periodSeconds: 10
|
periodSeconds: 10
|
||||||
failureThreshold: 5
|
failureThreshold: 5
|
||||||
resources:
|
resources:
|
||||||
@@ -61,11 +64,23 @@ spec:
|
|||||||
selector:
|
selector:
|
||||||
app: qms-server
|
app: qms-server
|
||||||
ports:
|
ports:
|
||||||
- protocol: TCP
|
- name: http-health
|
||||||
|
protocol: TCP
|
||||||
port: 48104
|
port: 48104
|
||||||
targetPort: 48104
|
targetPort: 48104
|
||||||
nodePort: 30100
|
nodePort: 30100
|
||||||
- protocol: TCP
|
- name: tcp-9999
|
||||||
|
protocol: TCP
|
||||||
port: 9999
|
port: 9999
|
||||||
targetPort: 9999
|
targetPort: 9999
|
||||||
nodePort: 30200
|
nodePort: 30194
|
||||||
|
- name: websocket-8320
|
||||||
|
protocol: TCP
|
||||||
|
port: 8320
|
||||||
|
targetPort: 8320
|
||||||
|
nodePort: 30320
|
||||||
|
- name: tcp-8330
|
||||||
|
protocol: TCP
|
||||||
|
port: 8330
|
||||||
|
targetPort: 8330
|
||||||
|
nodePort: 30330
|
||||||
|
|||||||
158
doc/中铜技术文档/Seata分布式事务集成参考.md
Normal file
158
doc/中铜技术文档/Seata分布式事务集成参考.md
Normal file
File diff suppressed because it is too large
Load Diff
BIN
doc/中铜技术文档/api 平台使用说明.pdf
Normal file
BIN
doc/中铜技术文档/api 平台使用说明.pdf
Normal file
Binary file not shown.
212
doc/中铜技术文档/计量单位转换使用文档.md
Normal file
212
doc/中铜技术文档/计量单位转换使用文档.md
Normal file
File diff suppressed because it is too large
Load Diff
290
doc/外部对接/iwork/iwork电子用印后回调.md
Normal file
290
doc/外部对接/iwork/iwork电子用印后回调.md
Normal file
File diff suppressed because it is too large
Load Diff
BIN
doc/外部对接/iwork/iwork电子用印后回调.pdf
Normal file
BIN
doc/外部对接/iwork/iwork电子用印后回调.pdf
Normal file
Binary file not shown.
21
pom.xml
21
pom.xml
@@ -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.41</revision>
|
<revision>3.0.45</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>
|
||||||
@@ -145,8 +145,13 @@
|
|||||||
<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>
|
||||||
<releases>
|
<releases>
|
||||||
<enabled>false</enabled>
|
<updatePolicy>always</updatePolicy>
|
||||||
|
<checksumPolicy>warn</checksumPolicy>
|
||||||
</releases>
|
</releases>
|
||||||
|
<snapshots>
|
||||||
|
<enabled>true</enabled>
|
||||||
|
<updatePolicy>always</updatePolicy>
|
||||||
|
</snapshots>
|
||||||
</repository>
|
</repository>
|
||||||
</repositories>
|
</repositories>
|
||||||
|
|
||||||
@@ -172,8 +177,8 @@
|
|||||||
<config.server-addr>172.16.46.63:30848</config.server-addr>
|
<config.server-addr>172.16.46.63:30848</config.server-addr>
|
||||||
<config.namespace>dev</config.namespace>
|
<config.namespace>dev</config.namespace>
|
||||||
<config.group>DEFAULT_GROUP</config.group>
|
<config.group>DEFAULT_GROUP</config.group>
|
||||||
<config.username/>
|
<config.username>nacos</config.username>
|
||||||
<config.password/>
|
<config.password>P@ssword25</config.password>
|
||||||
<config.version>1.0.0</config.version>
|
<config.version>1.0.0</config.version>
|
||||||
</properties>
|
</properties>
|
||||||
</profile>
|
</profile>
|
||||||
@@ -185,8 +190,8 @@
|
|||||||
<config.server-addr>172.16.46.63:30848</config.server-addr>
|
<config.server-addr>172.16.46.63:30848</config.server-addr>
|
||||||
<config.namespace>prod</config.namespace>
|
<config.namespace>prod</config.namespace>
|
||||||
<config.group>DEFAULT_GROUP</config.group>
|
<config.group>DEFAULT_GROUP</config.group>
|
||||||
<config.username/>
|
<config.username>nacos</config.username>
|
||||||
<config.password/>
|
<config.password>P@ssword25</config.password>
|
||||||
<config.version>1.0.0</config.version>
|
<config.version>1.0.0</config.version>
|
||||||
</properties>
|
</properties>
|
||||||
</profile>
|
</profile>
|
||||||
@@ -198,8 +203,8 @@
|
|||||||
<config.server-addr>172.16.46.63:30848</config.server-addr>
|
<config.server-addr>172.16.46.63:30848</config.server-addr>
|
||||||
<config.namespace>local</config.namespace>
|
<config.namespace>local</config.namespace>
|
||||||
<config.group>DEFAULT_GROUP</config.group>
|
<config.group>DEFAULT_GROUP</config.group>
|
||||||
<config.username/>
|
<config.username>nacos</config.username>
|
||||||
<config.password/>
|
<config.password>P@ssword25</config.password>
|
||||||
<config.version>1.0.0</config.version>
|
<config.version>1.0.0</config.version>
|
||||||
</properties>
|
</properties>
|
||||||
</profile>
|
</profile>
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
FROM 172.16.46.66:10043/base-service/report-base:x86_64-ubuntu_22-jre21-2.0.0
|
FROM 172.16.46.66:10043/base-service/report-base:x86_64-ubuntu_22-jre21-2.0.0
|
||||||
|
#ARG BASE_IMAGE=172.16.46.66:10043/base-service/skywalking-agent-jre:9.7.0
|
||||||
|
#FROM ${BASE_IMAGE}
|
||||||
RUN mkdir -p /appdata/server
|
RUN mkdir -p /appdata/server
|
||||||
WORKDIR /appdata/server
|
WORKDIR /appdata/server
|
||||||
## 将后端项目的 Jar 文件,复制到镜像中
|
## 将后端项目的 Jar 文件,复制到镜像中
|
||||||
@@ -6,9 +8,14 @@ COPY ./target/qms-server.jar app.jar
|
|||||||
|
|
||||||
## 设置 TZ 时区
|
## 设置 TZ 时区
|
||||||
ENV TZ=Asia/Shanghai
|
ENV TZ=Asia/Shanghai
|
||||||
|
ENV JAVA_OPTS="-Xms512m -Xmx512m"
|
||||||
|
#ENV SW_AGENT_HOME=/opt/skywalking/agent
|
||||||
|
#ENV SW_AGENT_NAME=qms-server
|
||||||
|
#ENV SW_AGENT_COLLECTOR_BACKEND_SERVICES=172.16.46.63:30201
|
||||||
|
#ENV AGENT_JAVA_OPTS="-javaagent:${SW_AGENT_HOME}/skywalking-agent.jar -Dskywalking.agent.service_name=${SW_AGENT_NAME} -Dskywalking.collector.backend_service=${SW_AGENT_COLLECTOR_BACKEND_SERVICES}"
|
||||||
|
|
||||||
# 暴露端口
|
# 暴露端口
|
||||||
EXPOSE 48205
|
EXPOSE 48205
|
||||||
|
|
||||||
## 启动后端项目
|
## 启动后端项目
|
||||||
ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
|
CMD java ${AGENT_JAVA_OPTS} ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar app.jar
|
||||||
|
|||||||
11
qms-server/build-docker-push.bat
Normal file
11
qms-server/build-docker-push.bat
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
call docker build -t zgty-qms:v6.0.0 .
|
||||||
|
|
||||||
|
call docker tag zgty-qms:v6.0.0 192.168.26.103:8075/zgty/zgty-qms:v6.0.0
|
||||||
|
|
||||||
|
call docker push 192.168.26.103:8075/zgty/zgty-qms:v6.0.0
|
||||||
|
|
||||||
|
call docker rmi 192.168.26.103:8075/zgty/zgty-qms:v6.0.0
|
||||||
|
|
||||||
|
call docker rmi zgty-qms:v6.0.0
|
||||||
|
|
||||||
|
pause
|
||||||
@@ -105,3 +105,87 @@ justauth:
|
|||||||
prefix: 'social_auth_state:' # 缓存前缀,目前只对 Redis 缓存生效,默认 JUSTAUTH::STATE::
|
prefix: 'social_auth_state:' # 缓存前缀,目前只对 Redis 缓存生效,默认 JUSTAUTH::STATE::
|
||||||
timeout: 24h # 超时时长,目前只对 Redis 缓存生效,默认 3 分钟
|
timeout: 24h # 超时时长,目前只对 Redis 缓存生效,默认 3 分钟
|
||||||
|
|
||||||
|
|
||||||
|
--- #################### liteflow相关配置 ####################
|
||||||
|
liteflow:
|
||||||
|
#规则文件路径
|
||||||
|
rule-source: el_xml:com.zt.plat.module.qms.core.liteflow.parser.QmsXmlFlowELParser
|
||||||
|
#-----------------以下非必须-----------------
|
||||||
|
#liteflow是否开启,默认为true
|
||||||
|
enable: true
|
||||||
|
#liteflow的banner打印是否开启,默认为true
|
||||||
|
print-banner: true
|
||||||
|
#上下文的初始数量槽,默认值为1024,这个值不用刻意配置,这个值会自动扩容
|
||||||
|
slot-size: 1024
|
||||||
|
#FlowExecutor的execute2Future的线程数,默认为64
|
||||||
|
main-executor-works: 64
|
||||||
|
#FlowExecutor的execute2Future的自定义线程池Builder,LiteFlow提供了默认的Builder
|
||||||
|
main-executor-class: com.yomahub.liteflow.thread.LiteFlowDefaultMainExecutorBuilder
|
||||||
|
#自定义请求ID的生成类,LiteFlow提供了默认的生成类
|
||||||
|
request-id-generator-class: com.yomahub.liteflow.flow.id.DefaultRequestIdGenerator
|
||||||
|
#全局异步节点线程池大小,默认为64
|
||||||
|
global-thread-pool-size: 64
|
||||||
|
#全局异步节点线程池队列大小,默认为512
|
||||||
|
global-thread-pool-queue-size: 512
|
||||||
|
#全局异步节点线程池自定义Builder,LiteFlow提供了默认的线程池Builder
|
||||||
|
global-thread-pool-executor-class: com.yomahub.liteflow.thread.LiteFlowDefaultGlobalExecutorBuilder
|
||||||
|
#异步线程最长的等待时间(只用于when),默认值为15000
|
||||||
|
when-max-wait-time: 15000
|
||||||
|
#异步线程最长的等待时间(只用于when),默认值为MILLISECONDS,毫秒
|
||||||
|
when-max-wait-time-unit: MILLISECONDS
|
||||||
|
#每个WHEN是否用单独的线程池
|
||||||
|
when-thread-pool-isolate: false
|
||||||
|
#设置解析模式,一共有三种模式,PARSE_ALL_ON_START | PARSE_ALL_ON_FIRST_EXEC | PARSE_ONE_ON_FIRST_EXEC
|
||||||
|
parse-mode: PARSE_ONE_ON_FIRST_EXEC
|
||||||
|
#全局重试次数,默认为0
|
||||||
|
retry-count: 0
|
||||||
|
#是否支持不同类型的加载方式混用,默认为false
|
||||||
|
support-multiple-type: false
|
||||||
|
#全局默认节点执行器
|
||||||
|
node-executor-class: com.yomahub.liteflow.flow.executor.DefaultNodeExecutor
|
||||||
|
#是否打印执行中过程中的日志,默认为true
|
||||||
|
print-execution-log: true
|
||||||
|
#是否开启本地文件监听,默认为false
|
||||||
|
enable-monitor-file: false
|
||||||
|
#是否开启快速解析模式,默认为false
|
||||||
|
fast-load: false
|
||||||
|
#是否开启Node节点实例ID持久化,默认为false
|
||||||
|
enable-node-instance-id: false
|
||||||
|
#是否开启虚拟线程(只在JDK21+环境有效),默认为true
|
||||||
|
enable-virtual-thread: true
|
||||||
|
#简易监控配置选项
|
||||||
|
monitor:
|
||||||
|
#监控是否开启,默认不开启
|
||||||
|
enable-log: false
|
||||||
|
#监控队列存储大小,默认值为200
|
||||||
|
queue-limit: 200
|
||||||
|
#监控一开始延迟多少执行,默认值为300000毫秒,也就是5分钟
|
||||||
|
delay: 300000
|
||||||
|
#监控日志打印每过多少时间执行一次,默认值为300000毫秒,也就是5分钟
|
||||||
|
period: 300000
|
||||||
|
|
||||||
|
zzjc:
|
||||||
|
druid:
|
||||||
|
sql-log: true
|
||||||
|
snowflake:
|
||||||
|
data-center-id: 30
|
||||||
|
tio:
|
||||||
|
server:
|
||||||
|
# port
|
||||||
|
port: 8320
|
||||||
|
# 心跳时间
|
||||||
|
heartbeat-timeout: 20000
|
||||||
|
websocket:
|
||||||
|
# enable websocket default false
|
||||||
|
enable: true
|
||||||
|
# websocket port
|
||||||
|
port: 8330
|
||||||
|
# 集群配置 默认关闭,集群开启需要redis
|
||||||
|
cluster:
|
||||||
|
enabled: true
|
||||||
|
group: true
|
||||||
|
redis:
|
||||||
|
mode: single
|
||||||
|
ip: 172.16.46.63 # 地址
|
||||||
|
port: 30379 # 端口
|
||||||
|
database: 0 # 数据库索引
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user