From f11179e0e9339c64da481ea1edd9443074a70634 Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Wed, 2 Jul 2025 09:35:09 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=88=A0=E9=99=A4nubizadvisoryinfo?=
=?UTF-8?q?=E5=A4=9A=E4=BD=99=E5=AD=97=E6=AE=B5=202=E3=80=81=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0=E7=BA=BF=E4=B8=8A=E4=B8=9A=E5=8A=A1102=E9=85=8D?=
=?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../entity/NuBizAdvisoryInfo.java | 21 -
.../src/main/resources/application-uat102.yml | 407 ++++++++++++++++++
pom.xml | 16 +-
3 files changed, 421 insertions(+), 23 deletions(-)
create mode 100644 nursing-unit-system/nu-system-start/src/main/resources/application-uat102.yml
diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBizAdvisoryInfo/entity/NuBizAdvisoryInfo.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBizAdvisoryInfo/entity/NuBizAdvisoryInfo.java
index fe60e75..3fb9884 100644
--- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBizAdvisoryInfo/entity/NuBizAdvisoryInfo.java
+++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/nuBizAdvisoryInfo/entity/NuBizAdvisoryInfo.java
@@ -106,27 +106,6 @@ public class NuBizAdvisoryInfo implements Serializable {
private java.lang.String reimbType;
/**护理单元*/
private java.lang.String nuId;
- /**民族*/
- private java.lang.String national;
- /**出生日期*/
- @DateTimeFormat(pattern="yyyy-MM-dd")
- private Date birthDate;
- /**住址*/
- private java.lang.String address;
- /**身份证*/
- private java.lang.String idCard;
- /**签发机关*/
- private java.lang.String issuingAuthority;
- /**有效开始日期*/
- @DateTimeFormat(pattern="yyyy-MM-dd")
- private Date startTime;
- /**有效结束日期*/
- @DateTimeFormat(pattern="yyyy-MM-dd")
- private Date endTime;
- /**身份证正面*/
- private java.lang.String cardZmPath;
- /**身份证反面*/
- private java.lang.String cardFmPath;
@TableField(exist = false)
diff --git a/nursing-unit-system/nu-system-start/src/main/resources/application-uat102.yml b/nursing-unit-system/nu-system-start/src/main/resources/application-uat102.yml
new file mode 100644
index 0000000..6470ac4
--- /dev/null
+++ b/nursing-unit-system/nu-system-start/src/main/resources/application-uat102.yml
@@ -0,0 +1,407 @@
+server:
+ port: 8083
+ tomcat:
+ max-swallow-size: -1
+ error:
+ include-exception: true
+ include-stacktrace: ALWAYS
+ include-message: ALWAYS
+ servlet:
+ context-path: /biz102
+ compression:
+ enabled: true
+ min-response-size: 1024
+ mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*
+
+management:
+ endpoints:
+ web:
+ exposure:
+ include: metrics,jeecghttptrace
+
+spring:
+ application:
+ name: nursing-unit-102
+ config:
+ import:
+ - optional:nacos:${spring.application.name}.yaml # 你的服务专属配置
+ - optional:nacos:common-db.yaml
+ cloud:
+ nacos:
+ discovery:
+ server-addr: nacos:8848 # 直接写死IP(或保留${config.server-addr})
+ namespace: public
+ group: DEFAULT_GROUP
+ config:
+ server-addr: nacos:8848
+ namespace: public
+ group: DEFAULT_GROUP
+ file-extension: yaml
+ # flyway配置
+ flyway:
+ # 是否启用flyway
+ enabled: false
+ # 编码格式,默认UTF-8
+ encoding: UTF-8
+ # 迁移sql脚本文件存放路径,官方默认db/migration
+ locations: classpath:flyway/sql/mysql
+ # 迁移sql脚本文件名称的前缀,默认V
+ sql-migration-prefix: V
+ # 迁移sql脚本文件名称的分隔符,默认2个下划线__
+ sql-migration-separator: __
+ # 避免带${}sql执行失败
+ placeholder-prefix: '#('
+ placeholder-suffix: )
+ # 迁移sql脚本文件名称的后缀
+ sql-migration-suffixes: .sql
+ # 迁移时是否进行校验,默认true
+ validate-on-migrate: true
+ # 当迁移发现数据库非空且存在没有元数据的表时,自动执行基准迁移,新建schema_version表
+ baseline-on-migrate: true
+ # 是否关闭要清除已有库下的表功能,生产环境必须为true,否则会删库,非常重要!!!
+ clean-disabled: true
+ servlet:
+ multipart:
+ max-file-size: 100MB
+ max-request-size: 100MB
+ mail:
+ # 定时任务发送邮件
+ timeJobSend: false
+ host: smtp.163.com
+ username: jeecgos@163.com
+ password: ??
+ properties:
+ mail:
+ smtp:
+ auth: true
+ starttls:
+ enable: true
+ required: true
+ ## quartz定时任务,采用数据库方式
+ quartz:
+ job-store-type: jdbc
+ initialize-schema: embedded
+ #定时任务启动开关,true-开 false-关
+ auto-startup: true
+ #延迟1秒启动定时任务
+ startup-delay: 1s
+ #启动时更新己存在的Job
+ overwrite-existing-jobs: true
+ properties:
+ org:
+ quartz:
+ scheduler:
+ instanceName: MyScheduler
+ instanceId: AUTO
+ jobStore:
+ class: org.springframework.scheduling.quartz.LocalDataSourceJobStore
+ driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate
+ tablePrefix: QRTZ_
+ isClustered: false
+ misfireThreshold: 12000
+ clusterCheckinInterval: 0 #心跳检查 之前是15000
+ acquireTriggersWithinLock: false # 减少锁竞争
+ threadPool:
+ class: org.quartz.simpl.SimpleThreadPool
+ threadCount: 10
+ threadPriority: 5
+ threadsInheritContextClassLoaderOfInitializingThread: true
+ #json 时间戳统一转换
+ jackson:
+ date-format: yyyy-MM-dd HH:mm:ss
+ time-zone: GMT+8
+ jpa:
+ open-in-view: false
+ aop:
+ proxy-target-class: true
+ #配置freemarker
+ freemarker:
+ # 设置模板后缀名
+ suffix: .ftl
+ # 设置文档类型
+ content-type: text/html
+ # 设置页面编码格式
+ charset: UTF-8
+ # 设置页面缓存
+ cache: false
+ prefer-file-system-access: false
+ # 设置ftl文件路径
+ template-loader-path:
+ - classpath:/templates
+ template_update_delay: 0
+ # 设置静态文件路径,js,css等
+ mvc:
+ static-path-pattern: /**
+ #Spring Boot 2.6+后映射匹配的默认策略已从AntPathMatcher更改为PathPatternParser,需要手动指定为ant-path-matcher
+ pathmatch:
+ matching-strategy: ant_path_matcher
+ resource:
+ static-locations: classpath:/static/,classpath:/public/
+ autoconfigure:
+ exclude:
+ - com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
+ - org.springframework.boot.autoconfigure.flyway.FlywayAutoConfiguration
+ datasource:
+ druid:
+ stat-view-servlet:
+ enabled: true
+ loginUsername: admin
+ loginPassword: 123456
+ allow:
+ web-stat-filter:
+ enabled: true
+ dynamic:
+ druid: # 全局druid参数,绝大部分值和默认保持一致。(现已支持的参数如下,不清楚含义不要乱设置)
+ # 连接池的配置信息
+ # 初始化大小,最小,最大
+ initial-size: 5
+ min-idle: 5
+ maxActive: 1000
+ # 配置获取连接等待超时的时间
+ maxWait: 60000
+ # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位是毫秒
+ timeBetweenEvictionRunsMillis: 60000
+ # 配置一个连接在池中最小生存的时间,单位是毫秒
+ minEvictableIdleTimeMillis: 3600000
+ validationQuery: SELECT 1
+ testWhileIdle: true
+ testOnBorrow: false
+ testOnReturn: false
+ # 打开PSCache,并且指定每个连接上PSCache的大小
+ poolPreparedStatements: true
+ maxPoolPreparedStatementPerConnectionSize: 20
+ # 配置监控统计拦截的filters,去掉后监控界面sql无法统计,'wall'用于防火墙
+ filters: stat,wall,slf4j
+ # 允许SELECT语句的WHERE子句是一个永真条件
+ wall:
+ selectWhereAlwayTrueCheck: false
+ # 打开mergeSql功能;慢SQL记录
+ stat:
+ merge-sql: true
+ slow-sql-millis: 5000
+ datasource:
+ master:
+ url: jdbc:mysql://mysql8-prod:3306/nursing_unit_001?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+ username: fw8864sshdang
+ password: uGDBkM25I6nZCNM2
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ # 多数据源配置-运维系统
+ multi-datasource1:
+ url: jdbc:mysql://mysql8-prod:3306/nursing_unit?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+ username: fw8864sshdang
+ password: uGDBkM25I6nZCNM2
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ # 多数据源配置-试验田 TODO 需要创建对应只读账号 不同服务器间需要更改ip端口 另外注意是否采用了VPC
+ nuro:
+ url: jdbc:mysql://mysql8-prod:3306/nursing_unit_001?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+ username: fw8864sshdang
+ password: uGDBkM25I6nZCNM2
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ #redis 配置
+ redis:
+ database: 0
+ host: redis
+ port: 6379
+ password: uUgrUus4JAYuwxzo
+ rabbitmq:
+ host: rabbitmq
+ prot: 5672
+ username: hldy
+ password: SJ+lhRn6nZ43KeXE
+ virtual-host: hldy
+#mybatis plus 设置
+mybatis-plus:
+ mapper-locations: classpath*:org/jeecg/**/xml/*Mapper.xml,classpath*:com/nu/**/xml/*Mapper.xml
+ global-config:
+ # 关闭MP3.0自带的banner
+ banner: false
+ db-config:
+ #主键类型 0:"数据库ID自增",1:"该类型为未设置主键类型", 2:"用户输入ID",3:"全局唯一ID (数字类型唯一ID)", 4:"全局唯一ID UUID",5:"字符串全局唯一ID (idWorker 的字符串表示)";
+ id-type: ASSIGN_ID
+ # 默认数据库表下划线命名
+ table-underline: true
+ configuration:
+ # 这个配置会将执行的sql打印出来,在开发或测试的时候可以用
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+ # 返回类型为Map,显示null对应的字段
+ call-setters-on-nulls: true
+#jeecg专用配置
+minidao:
+ base-package: org.jeecg.modules.jmreport.*,org.jeecg.modules.drag.*
+jeecg:
+ # AI集成
+ ai-chat:
+ enabled: true
+ model: deepseek-chat
+ apiKey: ??
+ apiHost: https://api.deepseek.com
+ timeout: 60
+ # 平台上线安全配置
+ firewall:
+ # 数据源安全 (开启后,Online报表和图表的数据源为必填)
+ dataSourceSafe: false
+ # 低代码模式(dev:开发模式,prod:发布模式——关闭所有在线开发配置能力)
+ lowCodeMode: dev
+ # 签名密钥串(前后端要一致,正式发布请自行修改)
+ signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a
+ #签名拦截接口
+ signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys,/sys/sendChangePwdSms,/sys/user/sendChangePhoneSms,/sys/sms,/desform/api/sendVerifyCode
+ # 本地:local、Minio:minio、阿里云:alioss
+ uploadType: local
+ # 前端访问地址
+ domainUrl:
+ pc: http://localhost:3100
+ app: http://localhost:8051
+ path:
+ #服务指令上传目录
+ directivepath: /opt/upFiles102/directive
+ #文件上传根目录 设置
+ upload: /opt/biz102/upFiles
+ #webapp文件路径
+ webapp: /opt/biz102/webapp
+ shiro:
+ excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/bigscreen/category/**,/bigscreen/visual/**,/bigscreen/map/**,/jmreport/bigscreen2/**
+ #阿里云oss存储和大鱼短信秘钥配置
+ oss:
+ accessKey: ??
+ secretKey: ??
+ endpoint: oss-cn-beijing.aliyuncs.com
+ bucketName: jeecgdev
+ # 短信模板
+ sms-template:
+ # 签名
+ signature:
+ # 模板code
+ templateCode:
+ # 登录短信、忘记密码模板编码
+ SMS_175435174:
+ # 修改密码短信模板编码
+ SMS_465391221:
+ # 注册账号短信模板编码
+ SMS_175430166:
+ # 在线预览文件服务器地址配置
+ file-view-domain: http://fileview.jeecg.com
+ # minio文件上传
+ minio:
+ minio_url: http://minio.jeecg.com
+ minio_name: ??
+ minio_pass: ??
+ bucketName: otatest
+ #大屏报表参数设置
+ jmreport:
+ #多租户模式,默认值为空(created:按照创建人隔离、tenant:按照租户隔离) (v1.6.2+ 新增)
+ saasMode:
+ # 平台上线安全配置(v1.6.2+ 新增)
+ firewall:
+ # 数据源安全 (开启后,不允许使用平台数据源、SQL解析加签并且不允许查询数据库)
+ dataSourceSafe: false
+ # 低代码开发模式(dev:开发模式,prod:发布模式—关闭在线报表设计功能,分配角色admin、lowdeveloper可以放开限制)
+ lowCodeMode: dev
+ #xxl-job配置
+ xxljob:
+ enabled: false
+ adminAddresses: http://127.0.0.1:9080/xxl-job-admin
+ appname: ${spring.application.name}
+ accessToken: ''
+ address: 127.0.0.1:30007
+ ip: 127.0.0.1
+ port: 30007
+ logPath: logs/jeecg/job/jobhandler/
+ logRetentionDays: 30
+ #分布式锁配置
+ redisson:
+ address: 127.0.0.1:6379
+ password:
+ type: STANDALONE
+ enabled: true
+ # 百度开放API配置
+ baidu-api:
+ app-id: ??
+ api-key: ??
+ secret-key: ??
+ # ElasticSearch 6设置
+ elasticsearch:
+ cluster-name: jeecg-ES
+ cluster-nodes: 127.0.0.1:9200
+ check-enabled: false
+#cas单点登录
+cas:
+ prefixUrl: http://cas.example.org:8443/cas
+#Mybatis输出sql日志
+logging:
+ level:
+ org.flywaydb: debug
+ org.jeecg.modules.system.mapper: info
+ com.nu.modules.system.mapper: info
+#swagger
+knife4j:
+ #开启增强配置
+ enable: true
+ #开启生产环境屏蔽
+ production: false
+ basic:
+ enable: false
+ username: jeecg
+ password: jeecg1314
+#第三方登录
+justauth:
+ enabled: true
+ type:
+ GITHUB:
+ client-id: ??
+ client-secret: ??
+ redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/github/callback
+ WECHAT_ENTERPRISE:
+ client-id: ??
+ client-secret: ??
+ redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_enterprise/callback
+ agent-id: ??
+ DINGTALK:
+ client-id: ??
+ client-secret: ??
+ redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/dingtalk/callback
+ WECHAT_OPEN:
+ client-id: ??
+ client-secret: ??
+ redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_open/callback
+ cache:
+ type: default
+ prefix: 'demo::'
+ timeout: 1h
+#tplink登录信息
+tplink:
+ tums:
+ url: https://121.36.88.64:8888
+ username: admin
+ password: Bl20230518
+ ftp:
+ ip: 1.92.152.160
+ port: 21
+ username: administrator
+ password: Root@123..
+ uploadpath: /
+
+#zmy
+aliyun:
+ ocr:
+ accessKeyId: LTAI5tMoCTt4sb9VQrcnZFsb
+ accessKeySecret: pQBMT6TlUWgRfvvDnOu0IKVYXCfKee
+#文件传输秘钥
+downloadkey: hP2K9Z!WLuj"M#8,
+
+# 微信支付
+wxpay:
+ # APIv3密钥
+ api-v3-key: asdfiuzwe3534565478WETDSAFRWEq1E
+ # APPID
+ appid: wx8fc3e4305d2fbf0b
+ # appsecret
+ appsecret: 3bf3dd4ec72f591432db6b28c2c044e5
+ # 商户ID
+ mch-id: 1717618860
+ # 商户API证书序列号
+ mch-serial-no: 3E51C9D24F64CE50E9273E544561D29684AB21C7
+ # 接收结果通知地址
+ notify-domain: https://www.focusnu.com/nursing-unit_0010507/weiXinPay/callback
+ # 商户私钥文件路径
+ private-key-path: /opt/nu001/apiclient_key.pem
diff --git a/pom.xml b/pom.xml
index 21e4970..281f993 100644
--- a/pom.xml
+++ b/pom.xml
@@ -458,7 +458,7 @@
dev
- false
+ true
@@ -470,13 +470,25 @@
uat
- true
+ false
uat
+
+
+ uat102
+
+
+ false
+
+
+
+ uat102
+
+
prod