Browse Source

生成环境相关配置修改

chenjun 1 năm trước cách đây
mục cha
commit
69bd52487e

+ 3 - 0
zjugis-business/src/main/java/com/zjugis/business/flow/commoncost/controller/vo/CommonCostDetailBaseVO.java

@@ -47,4 +47,7 @@ public class CommonCostDetailBaseVO {
 
     @Schema(description = "备注")
     private String bz1;
+
+    @Schema(description = "排序序号")
+    private Integer indexCode;
 }

+ 4 - 4
zjugis-business/src/main/resources/application-prod.yaml

@@ -43,10 +43,10 @@ spring:
           username: ZJUGIS_BUSINESS
           password: Zjugis1402
 serviceUrl:
-  sysUrl: http://oa.zjugis.com:28080/business
-  UI: http://oa.zjugis.com:28080/workflow
-  ui_version: http://oa.zjugis.com:28080/workflow
-  z_workflow: http://oa.zjugis.com:28080/workflow
+  sysUrl: https://oa.zjugis.com:28080/business
+  UI: https://oa.zjugis.com:28080/workflow
+  ui_version: https://oa.zjugis.com:28080/workflow
+  z_workflow: https://oa.zjugis.com:28080/workflow
 
 # 日志文件配置
 logging:

+ 0 - 183
zjugis-gateway/src/main/resources/application-prod.yaml

@@ -1,183 +0,0 @@
---- #################### 数据库相关配置 ####################
-spring:
-  # 数据源配置项
-  autoconfigure:
-    exclude:
-      - com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure # 排除 Druid 的自动配置,使用 dynamic-datasource-spring-boot-starter 配置多数据源
-  datasource:
-    druid: # Druid 【监控】相关的全局配置
-      web-stat-filter:
-        enabled: true
-      stat-view-servlet:
-        enabled: true
-        allow: # 设置白名单,不填则允许所有访问
-        url-pattern: /druid/*
-        login-username: # 控制台管理用户名和密码
-        login-password:
-      filter:
-        stat:
-          enabled: true
-          log-slow-sql: true # 慢 SQL 记录
-          slow-sql-millis: 100
-          merge-sql: true
-        wall:
-          config:
-            multi-statement-allow: true
-    dynamic: # 多数据源配置
-      druid: # Druid 【连接池】相关的全局配置
-        initial-size: 1 # 初始连接数
-        min-idle: 1 # 最小连接池数量
-        max-active: 20 # 最大连接池数量
-        max-wait: 600000 # 配置获取连接等待超时的时间,单位:毫秒
-        time-between-eviction-runs-millis: 60000 # 配置间隔多久才进行一次检测,检测需要关闭的空闲连接,单位:毫秒
-        min-evictable-idle-time-millis: 300000 # 配置一个连接在池中最小生存的时间,单位:毫秒
-        max-evictable-idle-time-millis: 900000 # 配置一个连接在池中最大生存的时间,单位:毫秒
-        validation-query: SELECT 1 FROM DUAL # 配置检测连接是否有效
-        test-while-idle: true
-        test-on-borrow: false
-        test-on-return: false
-      primary: master
-      datasource:
-        master:
-          name: zjugis-oa
-          #          url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
-          #          url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.master.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例
-          #          url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.master.name} # PostgreSQL 连接的示例
-          url: jdbc:oracle:thin:@10.10.10.8:1521:ORCL # Oracle 连接的示例
-          #          url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.master.name} # SQLServer 连接的示例
-          username: ZJUGIS_OA
-          password: zdww1402!
-        #          username: sa
-        #          password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W
-        slave: # 模拟从库,可根据自己需要修改
-          name: zjugis-oa
-          #          url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?allowMultiQueries=true&useUnicode=true&useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true&nullCatalogMeansCurrent=true # MySQL Connector/J 8.X 连接的示例
-          #          url: jdbc:mysql://127.0.0.1:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8&serverTimezone=CTT # MySQL Connector/J 5.X 连接的示例
-          #          url: jdbc:postgresql://127.0.0.1:5432/${spring.datasource.dynamic.datasource.slave.name} # PostgreSQL 连接的示例
-          url: jdbc:oracle:thin:@10.10.10.8:1521:ORCL # Oracle 连接的示例
-          #          url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=${spring.datasource.dynamic.datasource.slave.name} # SQLServer 连接的示例
-          username: ZJUGIS_OA
-          password: zdww1402!
-  #          username: sa
-  #          password: JSm:g(*%lU4ZAkz06cd52KqT3)i1?H7W
-
-  # Redis 配置。Redisson 默认的配置足够使用,一般不需要进行调优
-  redis:
-    host: 10.10.10.8 # 地址
-    port: 6379 # 端口
-    database: 0 # 数据库索引
-    password: zdww1402 # 密码,建议生产环境开启
-
---- #################### MQ 消息队列相关配置 ####################
-spring:
-  rabbitmq:
-    host: 10.10.10.7
-    port: 5672
-    username: zjww
-    password: zjww1402!
-    virtual-host: platform3
-    publisher-confirm-type: correlated #消息确认回调
-    publisher-returns: true #消息返回回调
-    listener:
-      simple:
-        acknowledge-mode: manual #手动确认
-        concurrency: 20          #每个消费者可并行处理的数量
-        max-concurrency: 100
-  cloud:
-    stream:
-      #      rocketmq:
-      #        # RocketMQ Binder 配置项,对应 RocketMQBinderConfigurationProperties 类
-      #        binder:
-      #          name-server: 127.0.0.1:9876 # RocketMQ Namesrv 地址
-      #          enabled: false
-      #      binding-retry-interval: 7200 # 消息绑定重试间隔时间,单位:秒,默认为 30 秒。考虑到本地可能不启动 RocketMQ 服务,设置为 2 小时
-      binders:
-        rabbitmq:
-          type: rabbit
-          environment:
-            spring:
-              rabbitmq:
-                host: 10.10.10.7
-                port: 5672
-                username: zjww
-                password: zjww1402!
-                virtual-host: platform3
-                publisher-confirms: true #消息确认回调
-                publisher-returns: true #消息返回回调
-                listener:
-                  simple:
-                    acknowledge-mode: manual #手动确认
-                    concurrency: 20          #每个消费者可并行处理的数量
-                    max-concurrency: 100
-
---- #################### 定时任务相关配置 ####################
-
-xxl:
-  job:
-    enabled: true # 是否开启调度中心,默认为 true 开启
-    admin:
-      addresses: http://10.10.10.7:18080/xxl-job-admin # 调度中心部署跟地址
-
---- #################### 服务保障相关配置 ####################
-
-# Lock4j 配置项
-lock4j:
-  acquire-timeout: 3000 # 获取分布式锁超时时间,默认为 3000 毫秒
-  expire: 30000 # 分布式锁的超时时间,默认为 30 毫秒
-
---- #################### 监控相关配置 ####################
-
-# Actuator 监控端点的配置项
-management:
-  endpoints:
-    web:
-      base-path: /actuator # Actuator 提供的 API 接口的根目录。默认为 /actuator
-      exposure:
-        include: '*' # 需要开放的端点。默认值只打开 health 和 info 两个端点。通过设置 * ,可以开放所有端点。
-
-# Spring Boot Admin 配置项
-spring:
-  boot:
-    admin:
-      # Spring Boot Admin Client 客户端的相关配置
-      client:
-        instance:
-          service-host-type: IP # 注册实例时,优先使用 IP [IP, HOST_NAME, CANONICAL_HOST_NAME]
-
-# 日志文件配置
-logging:
-  level:
-    # 配置自己写的 MyBatis Mapper 打印日志
-    com.zjugis.module.adm.dal.mysql: info
-    com.zjugis.module.adm: warn
-
-
---- #################### 海康门禁相关配置 ####################
-hcnet:
-  strDllPath: /home/oa_test/zjugis-adm/lib/libhcnetsdk.so # HCNetSDK地址
-  strPath1: /home/oa_test/zjugis-adm/lib/libcrypto.so.1.1 # linux系统下必须 libcrypto.so.1.1地址
-  strPath2: /home/oa_test/zjugis-adm/lib/libssl.so.1.1 # linux系统下必须 libssl.so.1.1地址
-  strPathCom: /home/oa_test/zjugis-adm/lib # linux系统下必须 lib包路径
---- #################### 万维相关配置 ####################
-
-# 万维配置项,设置当前项目所有自定义的配置
-zjugis:
-  env: # 多环境的配置项
-  security:
-    mock-enable: true
-  xss:
-    enable: false
-    exclude-urls: # 如下两个 url,仅仅是为了演示,去掉配置也没关系
-      - ${spring.boot.admin.context-path}/** # 不处理 Spring Boot Admin 的请求
-      - ${management.endpoints.web.base-path}/** # 不处理 Actuator 的请求
-  access-log: # 访问日志的配置项
-    enable: false
-  error-code: # 错误码相关配置项
-    enable: false
-  demo: false # 关闭演示模式
-
-
-#  mybatis-plus配置控制台打印完整带参数SQL语句
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl

+ 1 - 1
zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/service/report/ReportDingServiceImpl.java

@@ -55,7 +55,7 @@ public class ReportDingServiceImpl {
     @Resource
     private ReportMapper reportMapper;
 
-    private static final String URL = "http://oa.zjugis.com:28080/html_h5";
+    private static final String URL = "https://oa.zjugis.com:28080/html_h5";
 
     /**
      * 发送报告钉钉消息

+ 5 - 5
zjugis-report/src/main/resources/application-prod.yaml

@@ -10,8 +10,8 @@ spring:
     type: com.zaxxer.hikari.HikariDataSource
 
 serviceUrl:
-  sysUrl: http://oa.zjugis.com:28080/report
-  UI: http://oa.zjugis.com:28080/workflow
-  ui_version: http://oa.zjugis.com:28080/workflow
-  z_workflow: http://oa.zjugis.com:28080/workflow
-  report: http://oa.zjugis.com:28080/report
+  sysUrl: https://oa.zjugis.com:28080/report
+  UI: https://oa.zjugis.com:28080/workflow
+  ui_version: https://oa.zjugis.com:28080/workflow
+  z_workflow: https://oa.zjugis.com:28080/workflow
+  report: https://oa.zjugis.com:28080/report

+ 6 - 6
zjugis-workflow/src/main/resources/application-prod.yaml

@@ -44,15 +44,15 @@ spring:
 websocket:
   post: 26091
   path: "/ws"
-  url: http://oa.zjugis.com:28080/ws/
+  url: https://oa.zjugis.com:28080/ws/
 
 serviceUrl:
-  sysUrl: http://oa.zjugis.com:28080/workflow
-  UI: http://oa.zjugis.com:28080/workflow
-  ui_version: http://oa.zjugis.com:28080/UI
-  z_workflow: http://oa.zjugis.com:28080/workflow
+  sysUrl: https://oa.zjugis.com:28080/workflow
+  UI: https://oa.zjugis.com:28080/workflow
+  ui_version: https://oa.zjugis.com:28080/UI
+  z_workflow: https://oa.zjugis.com:28080/workflow
   z_file_management: http://114.215.200.79:81/z_file_management/
-  reportUrl: http://oa.zjugis.com:28080/report
+  reportUrl: https://oa.zjugis.com:28080/report
 
 
 logging: