Merge branch 'master' of https://gitee.com/hdka/FURNITURE-OA

gear-admin/src/main/resources/application-docker.yml

@@ -1,174 +1,108 @@
---- # 临时文件存储位置 避免临时文件被系统清理报错
+# --- 临时文件存储位置
-spring.servlet.multipart.location: /ruoyi/server/temp
+spring.servlet.multipart.location: ${APP_TEMP_DIR:/ruoyi/server/temp}
 
---- # 监控中心配置
+# --- 监控中心（Spring Boot Admin Client）
-spring.boot.admin.client:
+spring.boot:
-  # 增加客户端开关
+  admin:
-  enabled: true
+    client:
-  url: http://localhost:9090/admin
+      enabled: ${ADMIN_CLIENT_ENABLED:true}
+      url: ${ADMIN_SERVER_URL:http://admin:9090/admin}
       instance:
         service-host-type: IP
-  username: ruoyi
+      username: ${ADMIN_USERNAME:ruoyi}
-  password: 123456
+      password: ${ADMIN_PASSWORD:123456}
 
---- # xxl-job 配置
+# --- xxl-job 配置
-xxl.job:
+xxl:
-  # 执行器开关
+  job:
-  enabled: false
+    enabled: ${XXL_ENABLED:false}
-  # 调度中心地址：如调度中心集群部署存在多个地址则用逗号分隔。
+    admin-addresses: ${XXL_ADMIN_ADDR:http://xxl-job-admin:9100/xxl-job-admin}
-  admin-addresses: http://localhost:9100/xxl-job-admin
+    access-token: ${XXL_ACCESS_TOKEN:xxl-job}
-  # 执行器通讯TOKEN：非空时启用
-  access-token: xxl-job
     executor:
-    # 执行器AppName：执行器心跳注册分组依据；为空则关闭自动注册
+      appname: ${XXL_APPNAME:xxl-job-executor}
-    appname: xxl-job-executor
+      port: ${XXL_PORT:9101}
-    # 执行器端口号 执行器从9101开始往后写
+      address: ${XXL_ADDRESS:}
-    port: 9101
+      ip: ${XXL_IP:}
-    # 执行器注册：默认IP:PORT
+      logpath: ${XXL_LOGPATH:./logs/xxl-job}
-    address:
+      logretentiondays: ${XXL_LOG_RETENTION_DAYS:30}
-    # 执行器IP：默认自动获取IP
-    ip:
-    # 执行器运行日志文件存储磁盘路径
-    logpath: ./logs/xxl-job
-    # 执行器日志文件保存天数：大于3生效
-    logretentiondays: 30
 
---- # 数据源配置
+# --- 数据源（动态数据源 + Hikari）
-spring:
+spring.datasource:
-  datasource:
   type: com.zaxxer.hikari.HikariDataSource
-    # 动态数据源文档 https://www.kancloud.cn/tracy5546/dynamic-datasource/content
   dynamic:
-      # 性能分析插件(有性能损耗 不建议生产环境使用)
+    p6spy: ${DS_P6SPY:false}
-      p6spy: false
+    primary: ${DS_PRIMARY:master}
-      # 设置默认的数据源或者数据源组,默认值即为 master
+    strict: ${DS_STRICT:true}
-      primary: master
-      # 严格模式 匹配不到数据源则报错
-      strict: true
     datasource:
-        # 主库数据源
       master:
         type: ${spring.datasource.type}
         driverClassName: com.mysql.cj.jdbc.Driver
-          # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
+        url: jdbc:mysql://${DB_HOST:mysql}:${DB_PORT:3306}/${DB_NAME:gear}?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=${DB_USE_SSL:false}&serverTimezone=${DB_TZ:Asia/Shanghai}&autoReconnect=true&rewriteBatchedStatements=true
-          # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
+        username: ${DB_USER:root}
-          url: jdbc:mysql://49.232.154.205:10080/gear?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+        password: ${DB_PASS:root}
-          username: root
-          password: Fuande@666
-        # 从库数据源
       slave:
-          lazy: true
+        lazy: ${DS_SLAVE_LAZY:true}
         type: ${spring.datasource.type}
         driverClassName: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://49.232.154.205:10080/gear?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
+        url: jdbc:mysql://${DB_SLAVE_HOST:${DB_HOST:mysql}}:${DB_SLAVE_PORT:${DB_PORT:3306}}/${DB_SLAVE_NAME:${DB_NAME:gear}}?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=${DB_USE_SSL:false}&serverTimezone=${DB_TZ:Asia/Shanghai}&autoReconnect=true&rewriteBatchedStatements=true
-          username: root
+        username: ${DB_SLAVE_USER:${DB_USER:root}}
-          password: Fuande@666
+        password: ${DB_SLAVE_PASS:${DB_PASS:root}}
-#        oracle:
-#          type: ${spring.datasource.type}
-#          driverClassName: oracle.jdbc.OracleDriver
-#          url: jdbc:oracle:thin:@//localhost:1521/XE
-#          username: ROOT
-#          password: root
-#          hikari:
-#            connectionTestQuery: SELECT 1 FROM DUAL
-#        postgres:
-#          type: ${spring.datasource.type}
-#          driverClassName: org.postgresql.Driver
-#          url: jdbc:postgresql://localhost:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true
-#          username: root
-#          password: root
-#        sqlserver:
-#          type: ${spring.datasource.type}
-#          driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
-#          url: jdbc:sqlserver://localhost:1433;DatabaseName=tempdb;SelectMethod=cursor;encrypt=false;rewriteBatchedStatements=true
-#          username: SA
-#          password: root
     hikari:
-        # 最大连接池数量
+      maxPoolSize: ${HIKARI_MAX_POOL:20}
-        maxPoolSize: 20
+      minIdle: ${HIKARI_MIN_IDLE:10}
-        # 最小空闲线程数量
+      connectionTimeout: ${HIKARI_CONN_TIMEOUT:30000}
-        minIdle: 10
+      validationTimeout: ${HIKARI_VALID_TIMEOUT:5000}
-        # 配置获取连接等待超时的时间
+      idleTimeout: ${HIKARI_IDLE_TIMEOUT:600000}
-        connectionTimeout: 30000
+      maxLifetime: ${HIKARI_MAX_LIFETIME:1800000}
-        # 校验超时时间
+      connectionTestQuery: ${HIKARI_TEST_QUERY:SELECT 1}
-        validationTimeout: 5000
+      keepaliveTime: ${HIKARI_KEEPALIVE:30000}
-        # 空闲连接存活最大时间，默认10分钟
-        idleTimeout: 600000
-        # 此属性控制池中连接的最长生命周期，值0表示无限生命周期，默认30分钟
-        maxLifetime: 1800000
-        # 连接测试query（配置检测连接是否有效）
-        connectionTestQuery: SELECT 1
-        # 多久检查一次连接的活性
-        keepaliveTime: 30000
 
---- # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
+# --- Redis（单机）
 spring:
   redis:
-    # 地址
+    host: ${REDIS_HOST:redis}
-    host: redis_gear
+    port: ${REDIS_PORT:6379}
-    # 端口，默认为6379
+    database: ${REDIS_DB:0}
-    port: 6379
+    # password: ${REDIS_PASSWORD:}     # 有密码再开启
-    # 数据库索引
+    timeout: ${REDIS_TIMEOUT:10s}
-    database: 0
+    ssl: ${REDIS_SSL:false}
-    # 密码(如没有密码请注释掉)
-    # password:
-    # 连接超时时间
-    timeout: 10s
-    # 是否开启ssl
-    ssl: false
 
 redisson:
-  # redis key前缀
+  keyPrefix: ${REDIS_KEY_PREFIX:}
-  keyPrefix:
+  threads: ${REDIS_THREADS:16}
-  # 线程池数量
+  nettyThreads: ${REDIS_NETTY_THREADS:32}
-  threads: 16
-  # Netty线程池数量
-  nettyThreads: 32
-  # 单节点配置
   singleServerConfig:
-    # 客户端名称
+    clientName: ${APP_NAME:ruoyi}
-    clientName: ${ruoyi.name}
+    connectionMinimumIdleSize: ${REDIS_MIN_IDLE:32}
-    # 最小空闲连接数
+    connectionPoolSize: ${REDIS_POOL_SIZE:64}
-    connectionMinimumIdleSize: 32
+    idleConnectionTimeout: ${REDIS_IDLE_TIMEOUT:10000}
-    # 连接池大小
+    timeout: ${REDIS_CMD_TIMEOUT:3000}
-    connectionPoolSize: 64
+    subscriptionConnectionPoolSize: ${REDIS_SUB_POOL:50}
-    # 连接空闲超时，单位：毫秒
-    idleConnectionTimeout: 10000
-    # 命令等待超时，单位：毫秒
-    timeout: 3000
-    # 发布和订阅连接池大小
-    subscriptionConnectionPoolSize: 50
 
---- # mail 邮件发送
+# --- Mail
 mail:
-  enabled: false
+  enabled: ${MAIL_ENABLED:false}
-  host: smtp.163.com
+  host: ${MAIL_HOST:smtp.163.com}
-  port: 465
+  port: ${MAIL_PORT:465}
-  # 是否需要用户名密码验证
+  auth: ${MAIL_AUTH:true}
-  auth: true
+  from: ${MAIL_FROM:xxx@163.com}
-  # 发送方，遵循RFC-822标准
+  user: ${MAIL_USER:xxx@163.com}
-  from: xxx@163.com
+  pass: ${MAIL_PASS:xxxxxxxxxx}
-  # 用户名（注意：如果使用foxmail邮箱，此处user为qq号）
+  starttlsEnable: ${MAIL_STARTTLS:true}
-  user: xxx@163.com
+  sslEnable: ${MAIL_SSL:true}
-  # 密码（注意，某些邮箱需要为SMTP服务单独设置密码，详情查看相关帮助）
+  timeout: ${MAIL_TIMEOUT:0}
-  pass: xxxxxxxxxx
+  connectionTimeout: ${MAIL_CONN_TIMEOUT:0}
-  # 使用 STARTTLS安全连接，STARTTLS是对纯文本通信协议的扩展。
-  starttlsEnable: true
-  # 使用SSL安全连接
-  sslEnable: true
-  # SMTP超时时长，单位毫秒，缺省值不超时
-  timeout: 0
-  # Socket连接超时值，单位毫秒，缺省值不超时
-  connectionTimeout: 0
 
---- # sms 短信
+# --- SMS
 sms:
-  enabled: false
+  enabled: ${SMS_ENABLED:false}
-  # 阿里云 dysmsapi.aliyuncs.com
+  endpoint: ${SMS_ENDPOINT:dysmsapi.aliyuncs.com}
-  # 腾讯云 sms.tencentcloudapi.com
+  accessKeyId: ${SMS_AK:xxxxxxx}
-  endpoint: "dysmsapi.aliyuncs.com"
+  accessKeySecret: ${SMS_SK:xxxxxx}
-  accessKeyId: xxxxxxx
+  signName: ${SMS_SIGN:测试}
-  accessKeySecret: xxxxxx
+
-  signName: 测试
+# --- 其他常用可调
-  # 腾讯专用
+server:
-  sdkAppId:
+  port: ${SERVER_PORT:8080}
+  tomcat:
+    max-threads: ${TOMCAT_MAX_THREADS:200}

gear-oa/src/main/java/com/gear/oa/domain/bo/GearPurchasePlanDetailBo.java

@@ -5,9 +5,7 @@ import com.gear.common.core.validate.EditGroup;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import javax.validation.constraints.*;
-
 import java.util.Date;
-
 import java.math.BigDecimal;
 import com.gear.common.core.domain.BaseEntity;
 
@@ -62,20 +60,13 @@ public class GearPurchasePlanDetailBo extends BaseEntity {
      */
     private BigDecimal unitPrice;
 
-    /**
-     * 总金额
-     */
-    private BigDecimal totalAmount;
-
     /**
      * 附件
      */
     private String annex;
 
     /**
-     * 状态（0=新建，1=在途
+     * 状态（0=新建，1=在途，2=到货，3=待审核，4=采购完成）
-，2=到货
-，3=待审核，4=采购完成）
      */
     private Integer status;
 
@@ -83,6 +74,4 @@ public class GearPurchasePlanDetailBo extends BaseEntity {
      * 备注
      */
     private String remark;
-
-
 }