From f8f5a09ce938392df01a2fb4ba101803876c6d74 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期二, 31 十月 2023 14:50:49 +0800
Subject: [PATCH] update .gitignore
---
src/main/java/com/gkhy/labRiskManage/domain/experiment/service/impl/ExperimentAssessLogServiceImpl.java | 52 ++++++------
.gitignore | 2
src/main/java/com/gkhy/labRiskManage/domain/experiment/service/ExperimentAssessLogService.java | 24 +++---
src/main/resources/config/application.yaml | 2
src/main/resources/config/redisson-gslab.yml | 42 ++++++++++
src/main/java/com/gkhy/labRiskManage/domain/experiment/repository/jpa/ExperimentAssessLogRepository.java | 32 ++++----
src/main/resources/config/application-gslab.yaml | 68 +++++++++++++++++
7 files changed, 167 insertions(+), 55 deletions(-)
diff --git a/.gitignore b/.gitignore
index f112f7f..bbae056 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,8 @@
# Other files and folders
.settings/
+target/
+.idea/
# Project files, i.e. `.project`, `.actionScriptProperties` and `.flexProperties`
# should NOT be excluded as they contain compiler settings and other important
diff --git a/src/main/java/com/gkhy/labRiskManage/domain/experiment/repository/jpa/ExperimentAssessLogRepository.java b/src/main/java/com/gkhy/labRiskManage/domain/experiment/repository/jpa/ExperimentAssessLogRepository.java
index 9c776fc..94347fc 100644
--- a/src/main/java/com/gkhy/labRiskManage/domain/experiment/repository/jpa/ExperimentAssessLogRepository.java
+++ b/src/main/java/com/gkhy/labRiskManage/domain/experiment/repository/jpa/ExperimentAssessLogRepository.java
@@ -1,16 +1,16 @@
-package com.gkhy.labRiskManage.domain.experiment.repository.jpa;
-
-import com.gkhy.labRiskManage.domain.experiment.entity.ExperimentAssessLog;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public interface ExperimentAssessLogRepository extends JpaRepository<ExperimentAssessLog, Long> {
-
- @Query(value = "select * from experiment_assess_log e where e.experiment_code = :experimentCode ",nativeQuery = true)
- List<ExperimentAssessLog> getAssessLogs(String experimentCode);
-
-}
+package com.gkhy.labRiskManage.domain.experiment.repository.jpa;
+
+import com.gkhy.labRiskManage.domain.experiment.entity.ExperimentAssessLog;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface ExperimentAssessLogRepository extends JpaRepository<ExperimentAssessLog, Long> {
+
+ @Query(value = "select * from experiment_assess_log e where e.experiment_code = :experimentCode ",nativeQuery = true)
+ List<ExperimentAssessLog> getAssessLogs(String experimentCode);
+
+}
diff --git a/src/main/java/com/gkhy/labRiskManage/domain/experiment/service/ExperimentAssessLogService.java b/src/main/java/com/gkhy/labRiskManage/domain/experiment/service/ExperimentAssessLogService.java
index 7648f97..6269b6f 100644
--- a/src/main/java/com/gkhy/labRiskManage/domain/experiment/service/ExperimentAssessLogService.java
+++ b/src/main/java/com/gkhy/labRiskManage/domain/experiment/service/ExperimentAssessLogService.java
@@ -1,12 +1,12 @@
-package com.gkhy.labRiskManage.domain.experiment.service;
-
-import com.gkhy.labRiskManage.domain.experiment.entity.ExperimentAssessLog;
-
-import java.util.List;
-
-public interface ExperimentAssessLogService {
-
- ExperimentAssessLog saveExperimentAssessLog(ExperimentAssessLog experimentAssessLog);
-
- List<ExperimentAssessLog> getAssessLogs(String experimentCode);
-}
+package com.gkhy.labRiskManage.domain.experiment.service;
+
+import com.gkhy.labRiskManage.domain.experiment.entity.ExperimentAssessLog;
+
+import java.util.List;
+
+public interface ExperimentAssessLogService {
+
+ ExperimentAssessLog saveExperimentAssessLog(ExperimentAssessLog experimentAssessLog);
+
+ List<ExperimentAssessLog> getAssessLogs(String experimentCode);
+}
diff --git a/src/main/java/com/gkhy/labRiskManage/domain/experiment/service/impl/ExperimentAssessLogServiceImpl.java b/src/main/java/com/gkhy/labRiskManage/domain/experiment/service/impl/ExperimentAssessLogServiceImpl.java
index 47099c0..cb9e320 100644
--- a/src/main/java/com/gkhy/labRiskManage/domain/experiment/service/impl/ExperimentAssessLogServiceImpl.java
+++ b/src/main/java/com/gkhy/labRiskManage/domain/experiment/service/impl/ExperimentAssessLogServiceImpl.java
@@ -1,26 +1,26 @@
-package com.gkhy.labRiskManage.domain.experiment.service.impl;
-
-import com.gkhy.labRiskManage.domain.experiment.entity.ExperimentAssessLog;
-import com.gkhy.labRiskManage.domain.experiment.repository.jpa.ExperimentAssessLogRepository;
-import com.gkhy.labRiskManage.domain.experiment.service.ExperimentAssessLogService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class ExperimentAssessLogServiceImpl implements ExperimentAssessLogService {
-
- @Autowired
- private ExperimentAssessLogRepository experimentAssessLogRepository;
-
- @Override
- public ExperimentAssessLog saveExperimentAssessLog(ExperimentAssessLog experimentAssessLog) {
- return experimentAssessLogRepository.save(experimentAssessLog);
- }
-
- @Override
- public List<ExperimentAssessLog> getAssessLogs(String experimentCode) {
- return experimentAssessLogRepository.getAssessLogs(experimentCode);
- }
-}
+package com.gkhy.labRiskManage.domain.experiment.service.impl;
+
+import com.gkhy.labRiskManage.domain.experiment.entity.ExperimentAssessLog;
+import com.gkhy.labRiskManage.domain.experiment.repository.jpa.ExperimentAssessLogRepository;
+import com.gkhy.labRiskManage.domain.experiment.service.ExperimentAssessLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class ExperimentAssessLogServiceImpl implements ExperimentAssessLogService {
+
+ @Autowired
+ private ExperimentAssessLogRepository experimentAssessLogRepository;
+
+ @Override
+ public ExperimentAssessLog saveExperimentAssessLog(ExperimentAssessLog experimentAssessLog) {
+ return experimentAssessLogRepository.save(experimentAssessLog);
+ }
+
+ @Override
+ public List<ExperimentAssessLog> getAssessLogs(String experimentCode) {
+ return experimentAssessLogRepository.getAssessLogs(experimentCode);
+ }
+}
diff --git a/src/main/resources/config/application-gslab.yaml b/src/main/resources/config/application-gslab.yaml
new file mode 100644
index 0000000..315b498
--- /dev/null
+++ b/src/main/resources/config/application-gslab.yaml
@@ -0,0 +1,68 @@
+server:
+ port: 16070
+
+spring:
+ # enable-logging: false
+ datasource:
+ type: com.alibaba.druid.pool.DruidDataSource
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://192.168.0.228:3306/laboratory_risk_manage?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&serverTimezone=Asia/Shanghai&useAffectedRows=true
+ username: root
+ password: Gslab@uss2021!
+ master:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://192.168.0.228:3306/laboratory_risk_manage?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&serverTimezone=Asia/Shanghai&useAffectedRows=true
+ username: root
+ password: Gslab@uss2021!
+ type: com.alibaba.druid.pool.DruidDataSource
+ jpa:
+ hibernate:
+ ddl-auto: none
+# ddl-auto: update #自动更新
+ show-sql: true #日志中显示sql语句
+
+ redis:
+# host: 192.168.0.52
+# port: 6371
+# password: SEF98uvs98dUAUEF90Udssa # Redis 服务器密码，默认为空。生产中，一定要设置 Redis 密码！
+# database: 0 # Redis 数据库号，默认为 0
+# timeout: 5000 # Redis 连接超时时间，单位：毫秒。
+ redisson:
+ file: classpath:config/redisson-gslab.yml
+ lettuce:
+ pool:
+ # 最大连接数
+ max-active: 8
+ min-active: 3
+ # 最大阻塞等待时间(负数表示没限制)
+ max-wait: -1
+ # 最小空闲
+ min-idle: 3
+ # 最大空闲
+ max-idle: 8
+ jackson:
+ default-property-inclusion: non_null
+ date-format: yyyy-MM-dd HH:mm:ss
+ time-zone: GMT+8
+
+
+system:
+ deployMode: standalone #单机部署
+# deployMode: cluster #集群部署
+ enableCors: true #跨域设置
+ token: #token 配置项
+ header: tk
+ expiration: 7200
+ refreshExpiration: 14400
+ loginUserHeader: uid
+
+file:
+ path:
+ #基础路径
+ dcPath: /home/upload/laboratoryRiskManage/
+ urlRootPath: /upload/
+ module:
+ #用户模块
+ accountPath: /account/user/
+
+
diff --git a/src/main/resources/config/application.yaml b/src/main/resources/config/application.yaml
index 0269a66..8c1be1d 100644
--- a/src/main/resources/config/application.yaml
+++ b/src/main/resources/config/application.yaml
@@ -2,5 +2,5 @@
application:
name: labRiskManage
profiles:
- active: dev
+ active: gslab
# active: online-uat
diff --git a/src/main/resources/config/redisson-gslab.yml b/src/main/resources/config/redisson-gslab.yml
new file mode 100644
index 0000000..12c0e72
--- /dev/null
+++ b/src/main/resources/config/redisson-gslab.yml
@@ -0,0 +1,42 @@
+singleServerConfig:
+ # 连接空闲超时，单位：毫秒
+ idleConnectionTimeout: 100000
+ # 连接超时，单位：毫秒
+ connectTimeout: 10000
+ # 命令等待超时，单位：毫秒
+ timeout: 3000
+ # 命令失败重试次数
+ retryAttempts: 3
+ # 命令重试发送时间间隔，单位：毫秒
+ retryInterval: 1500
+ # 密码
+ password: root
+ # 单个连接最大订阅数量
+ subscriptionsPerConnection: 5
+ # 客户端名称
+# clientName: null
+ # 节点地址
+ address: redis://127.0.0.1:6379
+# # 发布和订阅连接的最小空闲连接数
+# subscriptionConnectionMinimumIdleSize: 1
+# # 发布和订阅连接池大小
+# subscriptionConnectionPoolSize: 50
+ # 最小空闲连接数
+ connectionMinimumIdleSize: 4
+ # 连接池大小
+ connectionPoolSize: 8
+ # redis数据库编号
+ database: 1
+ # DNS监测时间间隔，单位：毫秒
+ dnsMonitoringInterval: 5000
+# 线程池数量
+threads: 8
+# Netty线程池数量
+nettyThreads: 4
+# 编码
+codec:
+ class: "org.redisson.codec.JsonJacksonCodec"
+# 传输模式
+transportMode: "NIO"
+# 配置看门狗的默认超时时间为30s，这里改为10s
+lockWatchdogTimeout: 10000
\ No newline at end of file
--
Gitblit v1.9.2